diff --git a/CloudflareSolverRe.Captcha.dll b/CloudflareSolverRe.Captcha.dll
new file mode 100644
index 0000000..ae5bd46
Binary files /dev/null and b/CloudflareSolverRe.Captcha.dll differ
diff --git a/CloudflareSolverRe.dll b/CloudflareSolverRe.dll
new file mode 100644
index 0000000..ee41a91
Binary files /dev/null and b/CloudflareSolverRe.dll differ
diff --git a/Extreme.Net.dll b/Extreme.Net.dll
index 872c305..0b1c5d0 100644
Binary files a/Extreme.Net.dll and b/Extreme.Net.dll differ
diff --git a/OpenBullet.sln b/OpenBullet.sln
index 7faa0cf..d518d6d 100644
--- a/OpenBullet.sln
+++ b/OpenBullet.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2036
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29509.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenBullet", "OpenBullet\OpenBullet.csproj", "{99E40E7F-00A4-4FB1-9441-B05A56C47C08}"
 EndProject
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RuriLib", "RuriLib\RuriLib.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenBulletCLI", "OpenBulletCLI\OpenBulletCLI.csproj", "{0B6D8B01-861E-4CAF-B1C9-6670884381DB}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginFramework", "PluginFramework\PluginFramework.csproj", "{E1DD89D0-EC1D-4849-A2B6-ADB261DFA3CE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,10 @@ Global
 		{0B6D8B01-861E-4CAF-B1C9-6670884381DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0B6D8B01-861E-4CAF-B1C9-6670884381DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0B6D8B01-861E-4CAF-B1C9-6670884381DB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1DD89D0-EC1D-4849-A2B6-ADB261DFA3CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1DD89D0-EC1D-4849-A2B6-ADB261DFA3CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1DD89D0-EC1D-4849-A2B6-ADB261DFA3CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1DD89D0-EC1D-4849-A2B6-ADB261DFA3CE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/OpenBullet/App.config b/OpenBullet/App.config
index b203939..a24c5e9 100644
--- a/OpenBullet/App.config
+++ b/OpenBullet/App.config
@@ -12,7 +12,7 @@
          </dependentAssembly>
          <dependentAssembly>
             <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+            <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
          </dependentAssembly>
          <dependentAssembly>
             <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
diff --git a/OpenBullet/Extensions.cs b/OpenBullet/Extensions.cs
index aaccf01..775b362 100644
--- a/OpenBullet/Extensions.cs
+++ b/OpenBullet/Extensions.cs
@@ -8,10 +8,25 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Media;
+using PluginFramework;
+using RuriLib;
 using RuriLib.Models;
 
 namespace OpenBullet
 {
+    public static class BlocksExtensions
+    {
+        public static IEnumerable<BlockBase> OnlyPlugins(this IEnumerable<BlockBase> blocks)
+        {
+            return blocks.Where(b => b.IsPlugin());
+        }
+
+        public static bool IsPlugin(this BlockBase block)
+        {
+            return block.GetType().GetInterface(nameof(IBlockPlugin)) == typeof(IBlockPlugin);
+        }
+    }
+
     public static class EnumerableExtensions
     {
         public static void SaveToFile<T>(this IEnumerable<T> items, string fileName, Func<T, string> mapping)
diff --git a/OpenBullet/LSDoc.xml b/OpenBullet/LSDoc.xml
index 149ebd2..b469c2b 100644
--- a/OpenBullet/LSDoc.xml
+++ b/OpenBullet/LSDoc.xml
@@ -171,39 +171,39 @@ ELEMENT LOCATOR "STRING" [INDEX]
 
 Allowed Actions:
 ## Spawn a div with a given id to a (x,y) absolute position, so you can use it as element hook for mouse movement
-SPAWN "ID" X Y
+SPAWN "ID" "X" "Y"
 CLICK [ELEMENT]
 CLICKANDHOLD [ELEMENT]
 RIGHTCLICK [ELEMENT]
 DOUBLECLICK [ELEMENT]
 DRAGANDDROP ELEMENT -> ELEMENT
-DRAGANDDROPWITHOFFSET X Y ELEMENT
+DRAGANDDROPWITHOFFSET "X" "Y" ELEMENT
 KEYDOWN "KEY" [ELEMENT]
 KEYUP "KEY" [ELEMENT]
-MOVEBY X Y
+MOVEBY "X" "Y"
 MOVETO ELEMENT
 RELEASE [ELEMENT]
 SENDKEYS "KEYS" [ELEMENT]
 ## Draws random points in a square starting from the top left corner and with the given width and height
 DRAWPOINTS MAXW MAXH AMOUNT
-DRAWLINE (X1 Y2 -> X2 Y2 / ELEMENT -> ELEMENT) : AMOUNT
-DRAWLINEHUMAN (X1 Y1 -> X2 Y2 / ELEMENT -> ELEMENT) : AMOUNT [GRAVITY WIND]
+DRAWLINE ("X1" "Y1" -> "X2" "Y2" / ELEMENT -> ELEMENT) : AMOUNT
+DRAWLINEHUMAN ("X1" "Y1" -> "X2" "Y2" / ELEMENT -> ELEMENT) : AMOUNT [GRAVITY WIND]
 
 Examples:
 ## Moving to an element and clicking 100 pixels right of it
 MOUSEACTION
   MOVETO ELEMENT CLASS "testclass" 1
-  MOVEBY 100 0
+  MOVEBY "100" "0"
   CLICK
 
 ## Moving to a specific set of coordinates on the page
 MOUSEACTION
-  SPAWN "target" 100 150
+  SPAWN "target" "100" "150"
   MOVETO ELEMENT ID "target"
   
 ## Moving like a human from point A (0,0) to point B (700,700). The lower the AMOUNT, the faster the line is drawn
 MOUSEACTION
-  DRAWLINEHUMAN 0 0 -> 700 700 : 150 1 1
+  DRAWLINEHUMAN "0" "0" -> "700" "700" : 150 1 1
 
 ## Moving like a human from element with id="one" to element with id="two", 20 points and default gravity/wind
 MOUSEACTION
@@ -239,7 +239,7 @@ FUNCTION Translate StopAfterFirstMatch=True
 FUNCTION DateToUnixTime "format" "input" -> VAR "DATE"
 FUNCTION Replace "what" "with" UseRegex=True "input" -> VAR "REPLACED"
 FUNCTION RegexMatch "pattern" "input" -> VAR "MATCHED"
-FUNCTION RandomNum 0 100 -> VAR "RANDOM"
+FUNCTION RandomNum "0" "100" -> VAR "RANDOM"
 FUNCTION CountOccurrences "tofind" "input" -> VAR "COUNT"
 FUNCTION CharAt "index" "input" -> VAR "CHAR"
 FUNCTION Substring "startindex" "length" "input" -> VAR "SUBSTRING"
diff --git a/OpenBullet/MainWindow.xaml b/OpenBullet/MainWindow.xaml
index 6d66cc5..c5aaf99 100644
--- a/OpenBullet/MainWindow.xaml
+++ b/OpenBullet/MainWindow.xaml
@@ -88,6 +88,7 @@
                 <Label x:Name="menuOptionConfigCreator" Content="Configs" MouseDown="menuOptionConfigCreator_MouseDown" />
                 <Label x:Name="menuOptionHitsDatabase" Content="Hits DB" MouseDown="menuOptionHitsDatabase_MouseDown" />
                 <Label x:Name="menuOptionTools" Content="Tools" MouseDown="menuOptionTools_MouseDown" />
+                <Label x:Name="menuOptionPlugins" Content="Plugins" MouseDown="menuOptionPlugins_MouseDown" />
                 <Label x:Name="menuOptionSettings" Content="Settings" MouseDown="menuOptionSettings_MouseDown" />
                 <Label x:Name="menuOptionAbout" Content="About" MouseDown="menuOptionAbout_MouseDown" />
             </StackPanel>
diff --git a/OpenBullet/MainWindow.xaml.cs b/OpenBullet/MainWindow.xaml.cs
index 93348bc..02f4e19 100644
--- a/OpenBullet/MainWindow.xaml.cs
+++ b/OpenBullet/MainWindow.xaml.cs
@@ -19,6 +19,11 @@ using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
+using OpenBullet.Plugins;
+using System.Collections.Generic;
+using OpenBullet.Views.UserControls;
+using OpenBullet.Views.StackerBlocks;
+using RuriLib.LS;
 
 namespace OpenBullet
 {
@@ -38,6 +43,7 @@ namespace OpenBullet
         public HitsDB HitsDBPage { get; set; }
         public Settings OBSettingsPage { get; set; }
         public ToolsSection ToolsPage { get; set; }
+        public PluginsSection PluginsPage { get; set; }
         public About AboutPage { get; set; }
         public Rectangle Bounds { get; private set; }
 
@@ -59,8 +65,8 @@ namespace OpenBullet
             titleLabel.Content = title;
 
             // Make sure all folders are there or recreate them
-            var folders = new string[] { "Captchas", "ChromeExtensions", "Configs", "DB", "Screenshots", "Settings", "Sounds", "Wordlists" };
-            foreach (var folder in folders.Select(f => System.IO.Path.Combine(Directory.GetCurrentDirectory(), f)))
+            var folders = new string[] { "Captchas", "ChromeExtensions", "Configs", "DB", "Plugins", "Screenshots", "Settings", "Sounds", "Wordlists" };
+            foreach (var folder in folders.Select(f => Path.Combine(Directory.GetCurrentDirectory(), f)))
             {
                 if (!Directory.Exists(folder))
                     Directory.CreateDirectory(folder);
@@ -73,13 +79,15 @@ namespace OpenBullet
             }
             catch
             {
-                MessageBox.Show("Could not find / parse the Environment Settings file. Please fix the issue and try again.");
+                OB.Logger.LogError(Components.Main, 
+                    "Could not find / parse the Environment Settings file. Please fix the issue and try again.", true);
                 Environment.Exit(0);
             }
 
             if (OB.Settings.Environment.WordlistTypes.Count == 0 || OB.Settings.Environment.CustomKeychains.Count == 0)
             {
-                MessageBox.Show("At least one WordlistType and one CustomKeychain must be defined in the Environment Settings file.");
+                OB.Logger.LogError(Components.Main, 
+                    "At least one WordlistType and one CustomKeychain must be defined in the Environment Settings file.", true);
                 Environment.Exit(0);
             }
 
@@ -140,6 +148,46 @@ namespace OpenBullet
 
             Topmost = OB.OBSettings.General.AlwaysOnTop;
 
+            // Load Plugins
+            var (plugins, blockPlugins) = Loader.LoadPlugins(OB.pluginsFolder);
+            OB.BlockPlugins = blockPlugins.ToList();
+
+            // Set mappings
+            OB.BlockMappings = new List<(Type, Type, System.Windows.Media.Color)>()
+            {
+                ( typeof(BlockBypassCF),        typeof(PageBlockBypassCF),          Colors.DarkSalmon ),
+                ( typeof(BlockImageCaptcha),    typeof(PageBlockCaptcha),           Colors.DarkOrange ),
+                ( typeof(BlockFunction),        typeof(PageBlockFunction),          Colors.YellowGreen ),
+                ( typeof(BlockKeycheck),        typeof(PageBlockKeycheck),          Colors.DodgerBlue ),
+                ( typeof(BlockLSCode),          typeof(PageBlockLSCode),            Colors.White ),
+                ( typeof(BlockParse),           typeof(PageBlockParse),             Colors.Gold ),
+                ( typeof(BlockRecaptcha),       typeof(PageBlockRecaptcha),         Colors.Turquoise ),
+                ( typeof(BlockRequest),         typeof(PageBlockRequest),           Colors.LimeGreen ),
+                ( typeof(BlockTCP),             typeof(PageBlockTCP),               Colors.MediumPurple ),
+                ( typeof(BlockUtility),         typeof(PageBlockUtility),           Colors.Wheat ),
+                ( typeof(SBlockBrowserAction),  typeof(PageSBlockBrowserAction),    Colors.Green ),
+                ( typeof(SBlockElementAction),  typeof(PageSBlockElementAction),    Colors.Firebrick ),
+                ( typeof(SBlockExecuteJS),      typeof(PageSBlockExecuteJS),        Colors.Indigo ),
+                ( typeof(SBlockNavigate),       typeof(PageSBlockNavigate),         Colors.RoyalBlue )
+            };
+
+            // Add block plugins to mappings
+            foreach (var plugin in blockPlugins)
+            {
+                try
+                {
+                    var color = (System.Windows.Media.Color)System.Windows.Media.ColorConverter.ConvertFromString(plugin.Color);
+                    OB.BlockMappings.Add((plugin.GetType(), typeof(BlockPluginPage), color));
+                    BlockParser.BlockMappings.Add(plugin.Name, plugin.GetType());
+                    OB.Logger.LogInfo(Components.Main, $"Initialized {plugin.Name} block plugin");
+                }
+                catch 
+                {
+                    OB.Logger.LogError(Components.Main, $"The color {plugin.Color} in block plugin {plugin.Name} is invalid", true);
+                    Environment.Exit(0);
+                }
+            }
+
             // ViewModels
             OB.RunnerManager = new RunnerManagerViewModel();
             OB.ProxyManager = new ProxyManagerViewModel();
@@ -164,6 +212,8 @@ namespace OpenBullet
             OB.Logger.LogInfo(Components.Main, "Initialized Settings");
             ToolsPage = new ToolsSection();
             OB.Logger.LogInfo(Components.Main, "Initialized Tools");
+            PluginsPage = new PluginsSection(plugins);
+            OB.Logger.LogInfo(Components.Main, "Initialized Plugins");
             AboutPage = new About();
 
             menuOptionRunner_MouseDown(this, null);
@@ -284,6 +334,12 @@ namespace OpenBullet
             menuOptionSelected(menuOptionTools);
         }
 
+        private void menuOptionPlugins_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            Main.Content = PluginsPage;
+            menuOptionSelected(menuOptionPlugins);
+        }
+
         private void menuOptionSettings_MouseDown(object sender, MouseButtonEventArgs e)
         {
             Main.Content = OBSettingsPage;
diff --git a/OpenBullet/OB.cs b/OpenBullet/OB.cs
index e1dd783..acee7bb 100644
--- a/OpenBullet/OB.cs
+++ b/OpenBullet/OB.cs
@@ -1,6 +1,11 @@
 using OpenBullet.ViewModels;
+using PluginFramework;
+using RuriLib;
 using RuriLib.Interfaces;
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Media;
 
 namespace OpenBullet
 {
@@ -20,7 +25,14 @@ namespace OpenBullet
         };
 
         public static string Version => "1.2.0";
-        public static Random Random { get; } = new Random();
+
+        // Block Mappings (including Plugins)
+        public static List<(Type, Type, Color)> BlockMappings = new List<(Type, Type, Color)>();
+
+        // Block Plugins
+        // HACK: Find a better way to do this and a better place to put them
+        public static List<IBlockPlugin> BlockPlugins;
+        public static IEnumerable<BlockBase> BlockPluginsAsBase => BlockPlugins.Cast<BlockBase>();
 
         // Windows
         // TODO: Remove these from here, everything should only depend on the ViewModels not on the Views!
@@ -48,5 +60,6 @@ namespace OpenBullet
         public static readonly string licenseFile = @"Settings/License.txt";
         public static readonly string logFile = @"Log.txt";
         public static readonly string configFolder = @"Configs";
+        public static readonly string pluginsFolder = @"Plugins";
     }
 }
diff --git a/OpenBullet/OBIOManager.cs b/OpenBullet/OBIOManager.cs
index e49b198..45caf7f 100644
--- a/OpenBullet/OBIOManager.cs
+++ b/OpenBullet/OBIOManager.cs
@@ -1,6 +1,10 @@
 using Newtonsoft.Json;
 using OpenBullet.ViewModels;
+using RuriLib;
+using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 
 namespace OpenBullet
 {
@@ -17,5 +21,16 @@ namespace OpenBullet
         {
             return JsonConvert.DeserializeObject<OBSettingsViewModel>(File.ReadAllText(settingsFile));
         }
+
+        public static void CheckRequiredPlugins(IEnumerable<string> available, Config config)
+        {
+            foreach (var required in config.Settings.RequiredPlugins)
+            {
+                if (!available.Contains(required))
+                {
+                    throw new Exception($"This config requires the plugin {required} which is missing from the Plugins folder and hence cannot be opened!");
+                }
+            }
+        }
     }
 }
diff --git a/OpenBullet/OpenBullet.csproj b/OpenBullet/OpenBullet.csproj
index 54e6ee9..f556201 100644
--- a/OpenBullet/OpenBullet.csproj
+++ b/OpenBullet/OpenBullet.csproj
@@ -71,8 +71,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Extreme.Net.dll</HintPath>
     </Reference>
-    <Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
-      <HintPath>..\packages\AvalonEdit.5.0.4\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
+    <Reference Include="ICSharpCode.AvalonEdit, Version=6.0.1.278, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
+      <HintPath>..\packages\AvalonEdit.6.0.1\lib\net45\ICSharpCode.AvalonEdit.dll</HintPath>
     </Reference>
     <Reference Include="IronPython, Version=2.7.9.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
       <HintPath>..\packages\IronPython.2.7.9\lib\net45\IronPython.dll</HintPath>
@@ -102,7 +102,7 @@
       <HintPath>..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Scripting.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework.Aero2" />
     <Reference Include="ProxySocket, Version=1.1.2.0, Culture=neutral, PublicKeyToken=966874d7118d1436, processorArchitecture=MSIL">
@@ -121,13 +121,13 @@
     <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
+    <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
@@ -147,8 +147,8 @@
     <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Encoding.CodePages, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encoding.CodePages.4.5.1\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
+    <Reference Include="System.Text.Encoding.CodePages, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encoding.CodePages.4.7.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
     </Reference>
     <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Controls.Input.Toolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -179,20 +179,20 @@
     <Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Infragistics.Themes.MetroDark.Wpf.1.0.0\lib\net40\WPFToolkit.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.1\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.1\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=3.8.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.8.1\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -213,6 +213,10 @@
       <DependentUpon>LogWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="OpenBulletApp.cs" />
+    <Compile Include="Plugins\Build.cs" />
+    <Compile Include="Plugins\Check.cs" />
+    <Compile Include="Plugins\IControl.cs" />
+    <Compile Include="Plugins\Loader.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="Views\Dialogs\DialogLSDoc.xaml.cs">
       <DependentUpon>DialogLSDoc.xaml</DependentUpon>
@@ -235,6 +239,48 @@
     <Compile Include="LoadingWindow.xaml.cs">
       <DependentUpon>LoadingWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Main\PluginsSection.xaml.cs">
+      <DependentUpon>PluginsSection.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserControls\ButtonContainer.xaml.cs">
+      <DependentUpon>ButtonContainer.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\StackerBlocks\BlockPluginPage.xaml.cs">
+      <DependentUpon>BlockPluginPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserControls\PluginControl.xaml.cs">
+      <DependentUpon>PluginControl.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserControls\UserControlCheckbox.xaml.cs">
+      <DependentUpon>UserControlCheckbox.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserControls\UserControlContainer.xaml.cs">
+      <DependentUpon>UserControlContainer.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserControls\UserControlDropdown.xaml.cs">
+      <DependentUpon>UserControlDropdown.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserControls\UserControlConfig.xaml.cs">
+      <DependentUpon>UserControlConfig.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserControls\UserControlInfoText.xaml.cs">
+      <DependentUpon>UserControlInfoText.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserControls\UserControlWordlist.xaml.cs">
+      <DependentUpon>UserControlWordlist.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserControls\UserControlFilePicker.xaml.cs">
+      <DependentUpon>UserControlFilePicker.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserControls\UserControlNumeric.xaml.cs">
+      <DependentUpon>UserControlNumeric.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserControls\UserControlText.xaml.cs">
+      <DependentUpon>UserControlText.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserControls\UserControlTextMulti.xaml.cs">
+      <DependentUpon>UserControlTextMulti.xaml</DependentUpon>
+    </Compile>
     <None Include="LSHighlighting.xshd">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
@@ -381,8 +427,8 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Views\Main\Tools.xaml.cs">
-      <DependentUpon>Tools.xaml</DependentUpon>
+    <Compile Include="Views\Main\ToolsSection.xaml.cs">
+      <DependentUpon>ToolsSection.xaml</DependentUpon>
     </Compile>
     <Compile Include="Views\Main\Tools\ListGenerator.xaml.cs">
       <DependentUpon>ListGenerator.xaml</DependentUpon>
@@ -511,6 +557,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Main\PluginsSection.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Main\RunnerManager.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -690,7 +740,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\Main\Tools.xaml">
+    <Page Include="Views\Main\ToolsSection.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -702,6 +752,58 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\UserControls\ButtonContainer.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\StackerBlocks\BlockPluginPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\UserControls\PluginControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\UserControls\UserControlCheckbox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\UserControls\UserControlContainer.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\UserControls\UserControlDropdown.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\UserControls\UserControlConfig.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\UserControls\UserControlInfoText.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\UserControls\UserControlWordlist.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\UserControls\UserControlFilePicker.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\UserControls\UserControlNumeric.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\UserControls\UserControlText.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\UserControls\UserControlTextMulti.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -813,6 +915,10 @@
     <Resource Include="Images\Icons\log.png" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\PluginFramework\PluginFramework.csproj">
+      <Project>{E1DD89D0-EC1D-4849-A2B6-ADB261DFA3CE}</Project>
+      <Name>PluginFramework</Name>
+    </ProjectReference>
     <ProjectReference Include="..\RuriLib\RuriLib.csproj">
       <Project>{17e95d0b-c1fd-445c-9fdf-244af7299a67}</Project>
       <Name>RuriLib</Name>
@@ -852,15 +958,16 @@
     <PropertyGroup>
       <ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets'))" />
-    <Error Condition="!Exists('..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets'))" />
-    <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.78.0.3904.10500\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.78.0.3904.10500\build\Selenium.WebDriver.ChromeDriver.targets'))" />
     <Error Condition="!Exists('..\packages\Selenium.WebDriver.GeckoDriver.Win64.0.26.0\build\Selenium.WebDriver.GeckoDriver.Win64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.GeckoDriver.Win64.0.26.0\build\Selenium.WebDriver.GeckoDriver.Win64.targets'))" />
+    <Error Condition="!Exists('..\packages\Selenium.Chrome.WebDriver.79.0.0\build\Selenium.Chrome.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Chrome.WebDriver.79.0.0\build\Selenium.Chrome.WebDriver.targets'))" />
+    <Error Condition="!Exists('..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets'))" />
+    <Error Condition="!Exists('..\packages\Selenium.WebDriver.ChromeDriver.80.0.3987.10600\build\Selenium.WebDriver.ChromeDriver.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Selenium.WebDriver.ChromeDriver.80.0.3987.10600\build\Selenium.WebDriver.ChromeDriver.targets'))" />
   </Target>
   <PropertyGroup>
     <PostBuildEvent>if not exist "$(TargetDir)bin" mkdir "$(TargetDir)bin"
 if $(ConfigurationName) == Release move "$(TargetDir)*.dll" "$(TargetDir)bin\"
 if $(ConfigurationName) == Release move "$(TargetDir)*driver.exe" "$(TargetDir)bin\"
+if exist "$(TargetDir)cs-CZ" RD /S /Q "$(TargetDir)cs-CZ"
 if exist "$(TargetDir)de" RD /S /Q "$(TargetDir)de"
 if exist "$(TargetDir)es" RD /S /Q "$(TargetDir)es"
 if exist "$(TargetDir)fr" RD /S /Q "$(TargetDir)fr"
@@ -877,8 +984,8 @@ if not exist "$(TargetDir)Sounds" mkdir "$(TargetDir)Sounds"
 copy "$(ProjectDir)Sounds\rifle_hit.wav" "$(TargetDir)Sounds\rifle_hit.wav"
 copy "$(ProjectDir)Sounds\rifle_reload.wav" "$(TargetDir)Sounds\rifle_reload.wav"</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets" Condition="Exists('..\packages\Selenium.Chrome.WebDriver.76.0.0\build\Selenium.Chrome.WebDriver.targets')" />
-  <Import Project="..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets" Condition="Exists('..\packages\Selenium.Firefox.WebDriver.0.24.0\build\Selenium.Firefox.WebDriver.targets')" />
-  <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.78.0.3904.10500\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.78.0.3904.10500\build\Selenium.WebDriver.ChromeDriver.targets')" />
   <Import Project="..\packages\Selenium.WebDriver.GeckoDriver.Win64.0.26.0\build\Selenium.WebDriver.GeckoDriver.Win64.targets" Condition="Exists('..\packages\Selenium.WebDriver.GeckoDriver.Win64.0.26.0\build\Selenium.WebDriver.GeckoDriver.Win64.targets')" />
+  <Import Project="..\packages\Selenium.Chrome.WebDriver.79.0.0\build\Selenium.Chrome.WebDriver.targets" Condition="Exists('..\packages\Selenium.Chrome.WebDriver.79.0.0\build\Selenium.Chrome.WebDriver.targets')" />
+  <Import Project="..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets" Condition="Exists('..\packages\Selenium.Firefox.WebDriver.0.26.0\build\Selenium.Firefox.WebDriver.targets')" />
+  <Import Project="..\packages\Selenium.WebDriver.ChromeDriver.80.0.3987.10600\build\Selenium.WebDriver.ChromeDriver.targets" Condition="Exists('..\packages\Selenium.WebDriver.ChromeDriver.80.0.3987.10600\build\Selenium.WebDriver.ChromeDriver.targets')" />
 </Project>
\ No newline at end of file
diff --git a/OpenBullet/Plugins/Build.cs b/OpenBullet/Plugins/Build.cs
new file mode 100644
index 0000000..d873fba
--- /dev/null
+++ b/OpenBullet/Plugins/Build.cs
@@ -0,0 +1,72 @@
+using OpenBullet.Views.UserControls;
+using PluginFramework;
+using PluginFramework.Attributes;
+using System;
+using System.Reflection;
+
+namespace OpenBullet.Plugins
+{
+    public static class Build
+    {
+        public static UserControlContainer InputField(object plugin, PropertyInfo property)
+        {
+            // Get the first attribute
+            var attribute = property.GetCustomAttribute<InputField>();
+
+            IControl control;
+            var defaultValue = (dynamic)Convert.ChangeType(property.GetValue(plugin), property.PropertyType);
+
+            switch (attribute)
+            {
+                case InfoText a:
+                    control = new UserControlInfoText(defaultValue);
+                    break;
+
+                case Text a:
+                    control = new UserControlText(defaultValue);
+                    break;
+
+                case Numeric a:
+                    control = new UserControlNumeric(defaultValue, a.minimum, a.maximum);
+                    break;
+
+                case Checkbox a:
+                    control = new UserControlCheckbox(defaultValue);
+                    break;
+
+                case TextMulti a:
+                    control = new UserControlTextMulti(defaultValue);
+                    break;
+
+                case FilePicker a:
+                    control = new UserControlFilePicker(defaultValue, a.filter);
+                    break;
+
+                case Dropdown a:
+                    control = new UserControlDropdown(defaultValue, a.options);
+                    break;
+
+                case WordlistPicker a:
+                    control = new UserControlWordlist();
+                    break;
+
+                case ConfigPicker a:
+                    control = new UserControlConfig();
+                    break;
+
+                default:
+                    throw new NotImplementedException();
+            }
+
+            return new UserControlContainer(property.Name, control, attribute.label, attribute.tooltip);
+        }
+
+        public static ButtonContainer Button(MethodInfo method, PluginControl pluginControl)
+        {
+            // Get the first attribute
+            var attribute = method.GetCustomAttribute<Button>();
+
+            return new ButtonContainer(attribute.text, method.Name, pluginControl);
+        }
+    }
+}
diff --git a/OpenBullet/Plugins/Check.cs b/OpenBullet/Plugins/Check.cs
new file mode 100644
index 0000000..421dbf3
--- /dev/null
+++ b/OpenBullet/Plugins/Check.cs
@@ -0,0 +1,91 @@
+using PluginFramework;
+using PluginFramework.Attributes;
+using RuriLib.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace OpenBullet.Plugins
+{
+    public static class Check
+    {
+        private static Dictionary<Type, Type> _requiredPropertyTypes = new Dictionary<Type, Type>()
+        {
+            { typeof(InfoText), typeof(string) },
+            { typeof(Text), typeof(string) },
+            { typeof(Numeric), typeof(int) },
+            { typeof(Checkbox), typeof(bool) },
+            { typeof(TextMulti), typeof(string[]) },
+            { typeof(FilePicker), typeof(string) },
+            { typeof(Dropdown), typeof(string) },
+            { typeof(WordlistPicker), typeof(RuriLib.Models.Wordlist) },
+            { typeof(ConfigPicker), typeof(RuriLib.ViewModels.ConfigViewModel) }
+        };
+
+        public static bool InputProperty(PropertyInfo property)
+        {
+            // Check if it has one and only one InputField
+            if (property.GetCustomAttributes().Count(a => a is InputField) != 1)
+            {
+                return false;
+            }
+
+            /*
+            * HERE we know for certain that the property was meant to be used as an input field, so we will start throwing exceptions
+            * if there is something that doesn't meet the criteria
+            */
+
+            // Get the first attribute
+            var attribute = property.GetCustomAttribute<InputField>();
+
+            // Check if the attribute type exists in the dictionary
+            if (!_requiredPropertyTypes.ContainsKey(attribute.GetType()))
+            {
+                throw new Exception($"Unknown attribute type {attribute.GetType()}");
+            }
+
+            var requiredType = _requiredPropertyTypes[attribute.GetType()];
+
+            // Check if the property type is correct
+            if (property.PropertyType != requiredType)
+            {
+                throw new Exception($"The property {property.Name} must be of type {requiredType}");
+            }
+
+            return true;
+        }
+
+        public static bool Method(IPlugin plugin, MethodInfo method)
+        {
+            // Check if it has one and only one Button attribute
+            if (method.GetCustomAttributes().Count(a => a is Button) != 1)
+            {
+                return false;
+            }
+
+            /*
+            * HERE we know for certain that the method was meant to be used as a button, so we will start throwing exceptions
+            * if there is something that doesn't meet the criteria
+            */
+
+            // Get the first attribute
+            var attribute = method.GetCustomAttribute<Button>();
+            var parameters = method.GetParameters();
+
+            // Check if it accepts 0 or 1 parameters
+            if (parameters.Length > 1)
+            {
+                return false;
+            }
+
+            // If the method accepts 1 parameter, check that its type is IApplication
+            if (parameters.Length == 1 && !parameters.Any(p => p.ParameterType == typeof(IApplication)))
+            {
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/OpenBullet/Plugins/IControl.cs b/OpenBullet/Plugins/IControl.cs
new file mode 100644
index 0000000..70bb39b
--- /dev/null
+++ b/OpenBullet/Plugins/IControl.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenBullet.Plugins
+{
+    public interface IControl
+    {
+        string Name { get; set; }
+        dynamic GetValue();
+        void SetValue(dynamic value);
+    }
+}
diff --git a/OpenBullet/Plugins/Loader.cs b/OpenBullet/Plugins/Loader.cs
new file mode 100644
index 0000000..126a80b
--- /dev/null
+++ b/OpenBullet/Plugins/Loader.cs
@@ -0,0 +1,128 @@
+using OpenBullet.Views.UserControls;
+using PluginFramework;
+using RuriLib;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+namespace OpenBullet.Plugins
+{
+    public static class Loader
+    {
+        /// <summary>
+        /// Loads the plugins in a folder one by one.
+        /// </summary>
+        /// <param name="folder">The folder where plugins are located</param>
+        /// <returns>A tuple with the collection of plugin controls and block plugin controls.</returns>
+        public static (IEnumerable<PluginControl>, IEnumerable<IBlockPlugin>) LoadPlugins(string folder)
+        {
+            var plugins = new List<PluginControl>();
+            var blockPlugins = new List<IBlockPlugin>();
+
+            foreach (var dll in Directory.GetFiles(folder, "*.dll"))
+            {
+                var asm = Assembly.LoadFrom(dll);
+
+                // Hook the dependency folder (a folder with the name of the DLL) if it exists
+                var depFolder = Path.Combine(OB.pluginsFolder, Path.GetFileNameWithoutExtension(dll));
+                if (Directory.Exists(depFolder))
+                {
+                    Hook(new string[] { depFolder });
+                }
+
+                // Load the dependencies
+                LoadDependencies(asm.GetReferencedAssemblies());
+
+                // Search all the types in the assembly
+                foreach (var type in asm.GetTypes())
+                {
+                    // If it implements the IPlugin interface
+                    if (type.GetInterface(nameof(IPlugin)) == typeof(IPlugin))
+                    {
+                        plugins.Add(new PluginControl(type, OB.App));
+                    }
+                    // If it implements the IBlockPlugin interface and derives from BlockBase
+                    else if (type.GetInterface(nameof(IBlockPlugin)) == typeof(IBlockPlugin) 
+                        && type.GetTypeInfo().IsSubclassOf(typeof(BlockBase)))
+                    {
+                        blockPlugins.Add(Activator.CreateInstance(type) as IBlockPlugin);
+                    }
+                }
+            }
+
+            return (plugins, blockPlugins);
+        }
+
+        /// <summary>
+        /// Loads dependencies recursively in a greedy fashion.
+        /// </summary>
+        /// <param name="assemblies">The assemblies for which to load dependencies.</param>
+        public static void LoadDependencies(IEnumerable<AssemblyName> assemblies)
+        {
+            foreach (var asm in assemblies)
+            {
+                // Make sure we didn't load it yet
+                if (!AppDomain.CurrentDomain.GetAssemblies().Any(a => a.GetName().FullName == asm.FullName))
+                {
+                    try
+                    {
+                        AppDomain.CurrentDomain.Load(asm);
+
+                        // Load more dependencies recursively
+                        LoadDependencies(Assembly.Load(asm).GetReferencedAssemblies());
+                    }
+                    catch { }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Hooks folders to the AssemblyResolve of the current AppDomain.
+        /// </summary>
+        /// <param name="folders">The folders where to search for assemblies</param>
+        // Found on https://stackoverflow.com/questions/33975073/proper-way-to-resolving-assemblies-from-subfolders
+        public static void Hook(params string[] folders)
+        {
+            AppDomain.CurrentDomain.AssemblyResolve += (sender, args) =>
+            {
+                // Check if the requested assembly is part of the loaded assemblies
+                var loadedAssembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(a => a.FullName == args.Name);
+                if (loadedAssembly != null)
+                    return loadedAssembly;
+
+                // This resolver is called when an loaded control tries to load a generated XmlSerializer - We need to discard it.
+                // http://connect.microsoft.com/VisualStudio/feedback/details/88566/bindingfailure-an-assembly-failed-to-load-while-using-xmlserialization
+
+                var n = new AssemblyName(args.Name);
+
+                if (n.Name.EndsWith(".xmlserializers", StringComparison.OrdinalIgnoreCase))
+                    return null;
+
+                // http://stackoverflow.com/questions/4368201/appdomain-currentdomain-assemblyresolve-asking-for-a-appname-resources-assembl
+
+                if (n.Name.EndsWith(".resources", StringComparison.OrdinalIgnoreCase))
+                    return null;
+
+                string assy = null;
+
+                // Find the corresponding assembly file
+                foreach (var dir in folders)
+                {
+                    assy = new[] { "*.dll", "*.exe" }.SelectMany(g => Directory.EnumerateFiles(dir, g)).FirstOrDefault(f =>
+                    {
+                        try { return n.Name.Equals(AssemblyName.GetAssemblyName(f).Name, StringComparison.OrdinalIgnoreCase); }
+                        catch (BadImageFormatException) { return false; /* Bypass assembly is not a .net exe */ }
+                        catch (Exception ex) { throw new ApplicationException("Error loading assembly " + f, ex); }
+                    });
+
+                    if (assy != null)
+                        return Assembly.LoadFrom(assy);
+                }
+
+                throw new ApplicationException("Assembly " + args.Name + " not found");
+            };
+        }
+    }
+}
diff --git a/OpenBullet/Repositories/ConfigRepository.cs b/OpenBullet/Repositories/ConfigRepository.cs
index fb1d6fd..4a30018 100644
--- a/OpenBullet/Repositories/ConfigRepository.cs
+++ b/OpenBullet/Repositories/ConfigRepository.cs
@@ -31,7 +31,6 @@ namespace OpenBullet.Repositories
                 Directory.CreateDirectory(Path.Combine(BaseFolder, entity.Category));
             }
 
-
             if (!File.Exists(path))
             {
                 IOManager.SaveConfig(entity.Config, path);
diff --git a/OpenBullet/ViewModels/ConfigManagerViewModel.cs b/OpenBullet/ViewModels/ConfigManagerViewModel.cs
index ba4f716..8c37627 100644
--- a/OpenBullet/ViewModels/ConfigManagerViewModel.cs
+++ b/OpenBullet/ViewModels/ConfigManagerViewModel.cs
@@ -1,9 +1,11 @@
 using Extreme.Net;
 using OpenBullet.Models;
 using OpenBullet.Repositories;
+using PluginFramework;
 using RuriLib;
 using RuriLib.Functions.Formats;
 using RuriLib.Interfaces;
+using RuriLib.LS;
 using RuriLib.ViewModels;
 using System;
 using System.Collections.Generic;
@@ -62,6 +64,16 @@ namespace OpenBullet.ViewModels
             Rescan();
         }
 
+        public IEnumerable<string> GetRequiredPlugins(ConfigViewModel config)
+        {
+            return new LoliScript(config.Config.Script)
+                .ToBlocks()
+                .OnlyPlugins()
+                .Cast<IBlockPlugin>()
+                .Select(p => p.Name)
+                .Distinct();
+        }
+
         #region Filters
         private string searchString = "";
         public string SearchString 
diff --git a/OpenBullet/ViewModels/KeyViewModel.cs b/OpenBullet/ViewModels/KeyViewModel.cs
index a50568c..7aeb3ca 100644
--- a/OpenBullet/ViewModels/KeyViewModel.cs
+++ b/OpenBullet/ViewModels/KeyViewModel.cs
@@ -1,4 +1,4 @@
-using OpenBullet.Pages.StackerBlocks;
+using OpenBullet.Views.StackerBlocks;
 using RuriLib;
 using RuriLib.Functions.Conditions;
 using RuriLib.Models;
diff --git a/OpenBullet/ViewModels/RunnerManagerViewModel.cs b/OpenBullet/ViewModels/RunnerManagerViewModel.cs
index 627243a..5be0ea9 100644
--- a/OpenBullet/ViewModels/RunnerManagerViewModel.cs
+++ b/OpenBullet/ViewModels/RunnerManagerViewModel.cs
@@ -55,7 +55,7 @@ namespace OpenBullet.ViewModels
         public RunnerInstance(int id)
         {
             Id = id;
-            ViewModel = new RunnerViewModel(OB.Settings.Environment, OB.Settings.RLSettings, OB.Random);
+            ViewModel = new RunnerViewModel(OB.Settings.Environment, OB.Settings.RLSettings);
             View = new Runner(ViewModel);
         }
     }
diff --git a/OpenBullet/ViewModels/StackerBlockViewModel.cs b/OpenBullet/ViewModels/StackerBlockViewModel.cs
index 9931409..07547f0 100644
--- a/OpenBullet/ViewModels/StackerBlockViewModel.cs
+++ b/OpenBullet/ViewModels/StackerBlockViewModel.cs
@@ -1,7 +1,10 @@
-using OpenBullet.Pages.StackerBlocks;
+using OpenBullet.Views.StackerBlocks;
+using PluginFramework;
 using RuriLib;
 using RuriLib.ViewModels;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Controls;
 using System.Windows.Media;
 
@@ -10,92 +13,63 @@ namespace OpenBullet.ViewModels
     public class StackerBlockViewModel : ViewModelBase
     {
         private int id;
-        public int Id { get { return id; } set { id = value; OnPropertyChanged("Id"); } }
+        public int Id { get => id; set { id = value; OnPropertyChanged(); } }
 
         private bool selected = false;
-        public bool Selected { get { return selected; } set { selected = value; OnPropertyChanged("Selected"); OnPropertyChanged("BorderColor"); } }
-        public SolidColorBrush BorderColor { get { return new SolidColorBrush(Selected ? Colors.White : Colors.Black); } }
+        public bool Selected { get => selected; set { selected = value; OnPropertyChanged(); OnPropertyChanged(nameof(BorderColor)); } }
+        public SolidColorBrush BorderColor => new SolidColorBrush(Selected ? Colors.White : Colors.Black);
 
-        public SolidColorBrush Color { get { return new SolidColorBrush(Block.Disabled ? Colors.Gray : GetBlockColor()); } }
-        public SolidColorBrush Foreground { get { return new SolidColorBrush(Block.IsSelenium ? Colors.White : Colors.Black); } }
+        public SolidColorBrush Color => new SolidColorBrush(Block.Disabled ? Colors.Gray : GetBlockColor()); 
+        public SolidColorBrush Foreground => new SolidColorBrush(Block.IsSelenium ? Colors.White : Colors.Black);
 
         private int height;
-        public int Height { get { return height; } set { height = value; OnPropertyChanged("Height"); OnPropertyChanged("FontSize"); } }
-        public int FontSize { get { return (int)(Height / 3); } }
+        public int Height { get => height; set { height = value; OnPropertyChanged(); OnPropertyChanged(nameof(FontSize)); } }
+        public int FontSize => Height / 3;
 
         private Page page;
-        public Page Page { get { return page; } set { page = value; OnPropertyChanged("Page"); } }
+        public Page Page { get => page; set { page = value; OnPropertyChanged(); } }
 
         private BlockBase block;
-        public BlockBase Block { get { return block; } set { block = value; OnPropertyChanged("Block"); } }
+        public BlockBase Block { get => block; set { block = value; OnPropertyChanged(); } }
 
         public void Disable()
         {
             if (block.GetType() == typeof(BlockLSCode)) return;
             Block.Disabled = !Block.Disabled;
-            OnPropertyChanged("Color");
+            OnPropertyChanged(nameof(Color));
         }
 
         public void UpdateHeight(int height)
         {
             Height = height;
-            OnPropertyChanged("Height");
-            OnPropertyChanged("FontSize");
+            OnPropertyChanged(nameof(Height));
+            OnPropertyChanged(nameof(FontSize));
         }
 
         public StackerBlockViewModel(BlockBase block, Random rand)
         {
             Id = rand.Next();
             Block = block;
-            OnPropertyChanged("Label");
-            OnPropertyChanged("Color");
+            OnPropertyChanged(nameof(Block.Label));
+            OnPropertyChanged(nameof(Color));
 
-            // Define mapping scheme
-            var ts = new TypeSwitch()
-                .Case((BlockParse x) => Page = new PageBlockParse(x))
-                .Case((BlockKeycheck x) => Page = new PageBlockKeycheck(x))
-                .Case((BlockRequest x) => Page = new PageBlockRequest(x))
-                .Case((BlockRecaptcha x) => Page = new PageBlockRecaptcha(x))
-                .Case((BlockFunction x) => Page = new PageBlockFunction(x))
-                .Case((BlockImageCaptcha x) => Page = new PageBlockCaptcha(x))
-                .Case((BlockBypassCF x) => Page = new PageBlockBypassCF(x))
-                .Case((BlockUtility x) => Page = new PageBlockUtility(x))
-                .Case((BlockLSCode x) => Page = new PageBlockLSCode(x))
-                .Case((BlockTCP x) => Page = new PageBlockTCP(x))
-                .Case((SBlockNavigate x) => Page = new PageSBlockNavigate(x))
-                .Case((SBlockBrowserAction x) => Page = new PageSBlockBrowserAction(x))
-                .Case((SBlockElementAction x) => Page = new PageSBlockElementAction(x))
-                .Case((SBlockExecuteJS x) => Page = new PageSBlockExecuteJS(x));
-
-            ts.Switch(Block);
+            // Initialize the page
+            if (OB.BlockMappings.Any(m => m.Item1 == block.GetType()))
+            {
+                Page = Activator.CreateInstance(
+                    OB.BlockMappings.First(m => m.Item1 == block.GetType()).Item2,
+                    new object[] { block }) as Page;
+            }
+            else
+            {
+                throw new Exception($"Tried to initialize a page for the block type {block.GetType().Name} but it wasn't found in the mappings");
+            }
         }
 
         
         public Color GetBlockColor()
         {
-            Color color = Colors.Black;
-
-            // Define mapping scheme
-            var ts = new TypeSwitch()
-                .Case((BlockParse x) => color = Colors.Gold)
-                .Case((BlockKeycheck x) => color = Colors.DodgerBlue)
-                .Case((BlockRequest x) => color = Colors.LimeGreen)
-                .Case((BlockRecaptcha x) => color = Colors.Turquoise)
-                .Case((BlockFunction x) => color = Colors.YellowGreen)
-                .Case((BlockImageCaptcha x) => color = Colors.DarkOrange)
-                .Case((BlockBypassCF x) => color = Colors.DarkSalmon)
-                .Case((BlockUtility x) => color = Colors.Wheat)
-                .Case((BlockLSCode x) => color = Colors.White)
-                .Case((BlockTCP x) => color = Colors.MediumPurple)
-                .Case((SBlockNavigate x) => color = Colors.RoyalBlue)
-                .Case((SBlockBrowserAction x) => color = Colors.Green)
-                .Case((SBlockElementAction x) => color = Colors.Firebrick)
-                .Case((SBlockExecuteJS x) => color = Colors.Indigo);
-
-            // Execute type check to set color data
-            ts.Switch(Block);
-
-            return color;
+            return OB.BlockMappings.First(m => m.Item1 == block.GetType()).Item3;
         }
     }
 }
diff --git a/OpenBullet/ViewModels/StackerViewModel.cs b/OpenBullet/ViewModels/StackerViewModel.cs
index 6041082..12189ba 100644
--- a/OpenBullet/ViewModels/StackerViewModel.cs
+++ b/OpenBullet/ViewModels/StackerViewModel.cs
@@ -1,5 +1,6 @@
 using Extreme.Net;
-using OpenBullet.Pages.StackerBlocks;
+using OpenBullet.Views.StackerBlocks;
+using PluginFramework;
 using RuriLib;
 using RuriLib.LS;
 using RuriLib.ViewModels;
@@ -47,6 +48,7 @@ namespace OpenBullet.ViewModels
         public List<BlockBase> GetList()
         {
             ConvertKeychains();
+            ConvertPlugins();
             return Stack.Select(x => x.Block).ToList();
         }
 
@@ -67,6 +69,16 @@ namespace OpenBullet.ViewModels
             }
         }
 
+        public void ConvertPlugins()
+        {
+            // For each plugin block in the stack
+            foreach (StackerBlockViewModel stackerBlock in Stack.Where(sb => sb.Block.IsPlugin()))
+            {
+                var page = stackerBlock.Page as BlockPluginPage;
+                page.SetPropertyValues();
+            }
+        }
+
         public StackerBlockViewModel GetBlockById(int id)
         {
             return Stack.Where(x => x.Id == id).First();
diff --git a/OpenBullet/Views/Dialogs/DialogAddBlock.xaml b/OpenBullet/Views/Dialogs/DialogAddBlock.xaml
index f281a7e..efc94ab 100644
--- a/OpenBullet/Views/Dialogs/DialogAddBlock.xaml
+++ b/OpenBullet/Views/Dialogs/DialogAddBlock.xaml
@@ -5,49 +5,80 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:OpenBullet.Views.Dialogs"
       mc:Ignorable="d" 
-      d:DesignHeight="340" d:DesignWidth="510"
       Title="DialogAddBlock">
+    <Page.Resources>
+        <Style TargetType="{x:Type Button}">
+            <Setter Property="FontFamily" Value="pack://application:,,,/Fonts/#Century Gothic"/>
+            <Setter Property="FontSize" Value="16"/>
+            <Setter Property="FontWeight" Value="Regular" />
+            <Setter Property="BorderThickness" Value="3"/>
+            <Setter Property="BorderBrush" Value="Black"/>
+            <Setter Property="Margin" Value="1"/>
+            <Setter Property="Width" Value="165" />
+            <Setter Property="Height" Value="55" />
+        </Style>
+    </Page.Resources>
 
-    <Grid Height="330" Width="500" Margin="5">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="*" />
-                <RowDefinition Height="*" />
-                <RowDefinition Height="20" />
-                <RowDefinition Height="*" />
-                <RowDefinition Height="*" />
-            </Grid.RowDefinitions>
+    <Grid Margin="5">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
 
-            <Grid.Resources>
-                <Style TargetType="{x:Type Button}">
-                    <Setter Property="FontFamily" Value="pack://application:,,,/Fonts/#Century Gothic"/>
-                    <Setter Property="FontSize" Value="16"/>
-                    <Setter Property="FontWeight" Value="Regular" />
-                    <Setter Property="BorderThickness" Value="3"/>
-                    <Setter Property="BorderBrush" Value="Black"/>
-                    <Setter Property="Margin" Value="1"/>
+        <StackPanel Grid.Row="0" Orientation="Horizontal">
+            <Label Content="Current set:" />
+            <Label x:Name="defaultSetLabel" Content="Default" FontWeight="Bold" MouseDown="defaultSetLabel_MouseDown" />
+            <Label x:Name="pluginsSetLabel" Content="Plugins" FontWeight="Bold" MouseDown="pluginsSetLabel_MouseDown" />
+        </StackPanel>
+        
+        <TabControl Grid.Row="1" x:Name="blockSetTabControl" Background="Transparent" BorderThickness="0">
+            <TabControl.ItemContainerStyle>
+                <Style TargetType="{x:Type TabItem}">
+                    <Setter Property="Visibility" Value="Collapsed"/>
                 </Style>
-            </Grid.Resources>
-            <Button Grid.Column="0" Grid.Row="0" x:Name="blockRequestButton" Background="LimeGreen" Content="REQUEST" Click="blockRequestButton_Click"/>
-            <Button Grid.Column="1" Grid.Row="0" x:Name="blockUtilityButton" Background="Wheat" Content="UTILITY" Click="blockUtilityButton_Click"/>
-            <Button Grid.Column="2" Grid.Row="0" x:Name="blockKeycheckButton" Background="DodgerBlue" Content="KEY CHECK" Click="blockKeycheckButton_Click"/>
-            <Button Grid.Column="0" Grid.Row="1" x:Name="blockParseButton" Background="Gold" Content="PARSE" Click="blockParseButton_Click"/>
-            <Button Grid.Column="1" Grid.Row="1" x:Name="blockFunctionButton" Background="YellowGreen" Content="FUNCTION" Click="blockFunctionButton_Click"/>
-            <Button Grid.Column="2" Grid.Row="1" x:Name="blockRecaptchaButton" Background="Turquoise" Content="RECAPTCHA" Click="blockRecaptchaButton_Click"/>
-            <Button Grid.Column="0" Grid.Row="2" x:Name="blockCaptchaButton" Background="DarkOrange" Content="CAPTCHA" Click="blockCaptchaButton_Click"/>
-            <Button Grid.Column="1" Grid.Row="2" x:Name="blockBypassCFButton" Background="DarkSalmon" Content="BYPASS CF" Click="blockBypassCFButton_Click"/>
-            <Button Grid.Column="2" Grid.Row="2" x:Name="blockTCPButton" Background="MediumPurple" Content="TCP" Click="blockTCPButton_Click"/>
+            </TabControl.ItemContainerStyle>
+            <TabItem>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto" />
+                        <ColumnDefinition Width="auto" />
+                        <ColumnDefinition Width="auto" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="20" />
+                        <RowDefinition Height="auto" />
+                        <RowDefinition Height="auto" />
+                    </Grid.RowDefinitions>
+
+                    <Button Grid.Column="0" Grid.Row="0" x:Name="blockRequestButton" Background="LimeGreen" Content="REQUEST" Click="blockRequestButton_Click"/>
+                    <Button Grid.Column="1" Grid.Row="0" x:Name="blockUtilityButton" Background="Wheat" Content="UTILITY" Click="blockUtilityButton_Click"/>
+                    <Button Grid.Column="2" Grid.Row="0" x:Name="blockKeycheckButton" Background="DodgerBlue" Content="KEY CHECK" Click="blockKeycheckButton_Click"/>
+                    <Button Grid.Column="0" Grid.Row="1" x:Name="blockParseButton" Background="Gold" Content="PARSE" Click="blockParseButton_Click"/>
+                    <Button Grid.Column="1" Grid.Row="1" x:Name="blockFunctionButton" Background="YellowGreen" Content="FUNCTION" Click="blockFunctionButton_Click"/>
+                    <Button Grid.Column="2" Grid.Row="1" x:Name="blockRecaptchaButton" Background="Turquoise" Content="RECAPTCHA" Click="blockRecaptchaButton_Click"/>
+                    <Button Grid.Column="0" Grid.Row="2" x:Name="blockCaptchaButton" Background="DarkOrange" Content="CAPTCHA" Click="blockCaptchaButton_Click"/>
+                    <Button Grid.Column="1" Grid.Row="2" x:Name="blockBypassCFButton" Background="DarkSalmon" Content="BYPASS CF" Click="blockBypassCFButton_Click"/>
+                    <Button Grid.Column="2" Grid.Row="2" x:Name="blockTCPButton" Background="MediumPurple" Content="TCP" Click="blockTCPButton_Click"/>
+
+                    <Button Grid.Column="0" Grid.Row="4" x:Name="blockNavigateButton" Background="RoyalBlue" Foreground="Gainsboro" Content="NAVIGATE" Click="blockNavigateButton_Click"/>
+                    <Button Grid.Column="1" Grid.Row="4" x:Name="blockBrowserActionButton" Background="Green" Foreground="Gainsboro" Content="BROWSER ACTION" Click="blockBrowserActionButton_Click"/>
+                    <Button Grid.Column="2" Grid.Row="4" x:Name="blockElementActionButton" Background="Firebrick" Foreground="Gainsboro" Content="ELEMENT ACTION" Click="blockElementActionButton_Click"/>
+                    <Button Grid.Column="0" Grid.Row="5" x:Name="blockExecuteJSButton" Background="Indigo" Foreground="Gainsboro" Content="EXECUTE JS" Click="blockExecuteJSButton_Click"/>
+                </Grid>
+            </TabItem>
+            <TabItem>
+                <Grid x:Name="pluginsGrid" >
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto" />
+                        <ColumnDefinition Width="auto" />
+                        <ColumnDefinition Width="auto" />
+                    </Grid.ColumnDefinitions>
+                </Grid>
+            </TabItem>
+        </TabControl>
 
-            <Button Grid.Column="0" Grid.Row="4" x:Name="blockNavigateButton" Background="RoyalBlue" Foreground="Gainsboro" Content="NAVIGATE" Click="blockNavigateButton_Click"/>
-            <Button Grid.Column="1" Grid.Row="4" x:Name="blockBrowserActionButton" Background="Green" Foreground="Gainsboro" Content="BROWSER ACTION" Click="blockBrowserActionButton_Click"/>
-            <Button Grid.Column="2" Grid.Row="4" x:Name="blockElementActionButton" Background="Firebrick" Foreground="Gainsboro" Content="ELEMENT ACTION" Click="blockElementActionButton_Click"/>
-            <Button Grid.Column="0" Grid.Row="5" x:Name="blockExecuteJSButton" Background="Indigo" Foreground="Gainsboro" Content="EXECUTE JS" Click="blockExecuteJSButton_Click"/>
-        </Grid>
     </Grid>
 </Page>
diff --git a/OpenBullet/Views/Dialogs/DialogAddBlock.xaml.cs b/OpenBullet/Views/Dialogs/DialogAddBlock.xaml.cs
index 05cf238..b19faa0 100644
--- a/OpenBullet/Views/Dialogs/DialogAddBlock.xaml.cs
+++ b/OpenBullet/Views/Dialogs/DialogAddBlock.xaml.cs
@@ -1,7 +1,11 @@
 using OpenBullet.Views.Main.Configs;
 using RuriLib;
+using System;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
 
 namespace OpenBullet.Views.Dialogs
 {
@@ -16,6 +20,35 @@ namespace OpenBullet.Views.Dialogs
         {
             InitializeComponent();
             Caller = caller;
+
+            // Add rows to the grid
+            for(var i = 0; i < OB.BlockPlugins.Count; i += 3)
+            {
+                pluginsGrid.RowDefinitions.Add(new RowDefinition() { Height = GridLength.Auto });
+            }
+
+            // Create the buttons and fill the grid
+            for(var i = 0; i < OB.BlockPlugins.Count; i++)
+            {
+                var plugin = OB.BlockPlugins[i];
+                var button = new Button();
+                button.Background = new SolidColorBrush((Color)ColorConverter.ConvertFromString(plugin.Color));
+                if (plugin.LightForeground) button.Foreground = new SolidColorBrush(Colors.Gainsboro);
+                button.Content = plugin.Name;
+                button.SetValue(Grid.ColumnProperty, i % 3);
+                button.SetValue(Grid.RowProperty, i / 3);
+                button.Tag = plugin.GetType();
+                button.Click += pluginButton_Click;
+                pluginsGrid.Children.Add(button);
+            }
+
+            defaultSetLabel_MouseDown(this, null);
+        }
+
+        private void pluginButton_Click(object sender, RoutedEventArgs e)
+        {
+            var type = (e.OriginalSource as Button).Tag as Type;
+            SendBack(Activator.CreateInstance(type) as BlockBase);
         }
 
         private void blockRequestButton_Click(object sender, RoutedEventArgs e)
@@ -91,5 +124,19 @@ namespace OpenBullet.Views.Dialogs
             }
             ((MainDialog)Parent).Close();
         }
+
+        private void defaultSetLabel_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            defaultSetLabel.Foreground = Utils.GetBrush("ForegroundMenuSelected");
+            pluginsSetLabel.Foreground = Utils.GetBrush("ForegroundMain");
+            blockSetTabControl.SelectedIndex = 0;
+        }
+
+        private void pluginsSetLabel_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            defaultSetLabel.Foreground = Utils.GetBrush("ForegroundMain");
+            pluginsSetLabel.Foreground = Utils.GetBrush("ForegroundMenuSelected");
+            blockSetTabControl.SelectedIndex = 1;
+        }
     }
 }
diff --git a/OpenBullet/Views/Dialogs/DialogSelectConfig.xaml.cs b/OpenBullet/Views/Dialogs/DialogSelectConfig.xaml.cs
index b1a495f..09978a2 100644
--- a/OpenBullet/Views/Dialogs/DialogSelectConfig.xaml.cs
+++ b/OpenBullet/Views/Dialogs/DialogSelectConfig.xaml.cs
@@ -1,5 +1,6 @@
 using OpenBullet.ViewModels;
 using OpenBullet.Views.Main.Runner;
+using OpenBullet.Views.UserControls;
 using RuriLib;
 using RuriLib.ViewModels;
 using System.ComponentModel;
@@ -40,6 +41,10 @@ namespace OpenBullet
                 if (OB.OBSettings.General.LiveConfigUpdates) runner.SetConfig(config);
                 else runner.SetConfig(IOManager.CloneConfig(config));
             }
+            else if (Caller.GetType() == typeof(UserControlConfig))
+            {
+                ((UserControlConfig)Caller).Config = (ConfigViewModel)configsListView.SelectedItem;
+            }
             ((MainDialog)Parent).Close();
         }
 
diff --git a/OpenBullet/Views/Dialogs/DialogSelectWordlist.xaml.cs b/OpenBullet/Views/Dialogs/DialogSelectWordlist.xaml.cs
index b246467..a6a2251 100644
--- a/OpenBullet/Views/Dialogs/DialogSelectWordlist.xaml.cs
+++ b/OpenBullet/Views/Dialogs/DialogSelectWordlist.xaml.cs
@@ -1,4 +1,5 @@
 using OpenBullet.Views.Main.Runner;
+using OpenBullet.Views.UserControls;
 using RuriLib.Models;
 using System.ComponentModel;
 using System.IO;
@@ -33,6 +34,10 @@ namespace OpenBullet
             {
                 ((Runner)Caller).SetWordlist((Wordlist)wordlistsListView.SelectedItem);
             }
+            else if (Caller.GetType() == typeof(UserControlWordlist))
+            {
+                ((UserControlWordlist)Caller).Wordlist = (Wordlist)wordlistsListView.SelectedItem;
+            }
             ((MainDialog)Parent).Close();
         }
 
diff --git a/OpenBullet/Views/Main/Configs/ConfigManager.xaml.cs b/OpenBullet/Views/Main/Configs/ConfigManager.xaml.cs
index b222acb..f336050 100644
--- a/OpenBullet/Views/Main/Configs/ConfigManager.xaml.cs
+++ b/OpenBullet/Views/Main/Configs/ConfigManager.xaml.cs
@@ -173,6 +173,7 @@ namespace OpenBullet.Views.Main.Configs
 
             var stacker = OB.Stacker;
             stacker.ConvertKeychains();
+            stacker.ConvertPlugins();
 
             if (stacker.View == StackerView.Blocks)
                 stacker.LS.FromBlocks(stacker.GetList());
@@ -183,6 +184,7 @@ namespace OpenBullet.Views.Main.Configs
 
             vm.CurrentConfig.Config.Settings.LastModified = DateTime.Now;
             vm.CurrentConfig.Config.Settings.Version = OB.Version;
+            vm.CurrentConfig.Config.Settings.RequiredPlugins = vm.GetRequiredPlugins(vm.CurrentConfig).ToArray();
             OB.Logger.LogInfo(Components.ConfigManager, "Converted the unbinded observables and set the Last Modified date");
 
             // Save to file
@@ -203,7 +205,18 @@ namespace OpenBullet.Views.Main.Configs
         {
             if (config == null)
             {
-                OB.Logger.LogError(Components.ConfigManager, "The config to load cannot be null");
+                OB.Logger.LogError(Components.ConfigManager, "The config to load cannot be null", true);
+                return;
+            }
+
+            try
+            {
+                OBIOManager.CheckRequiredPlugins(OB.BlockPlugins.Select(b => b.Name), config.Config);
+            }
+            catch (Exception ex)
+            {
+                OB.Logger.LogError(Components.ConfigManager, ex.Message, true);
+                return;
             }
 
             // Set the config as current
diff --git a/OpenBullet/Views/Main/Configs/OtherOptions/General.xaml b/OpenBullet/Views/Main/Configs/OtherOptions/General.xaml
index 980b33d..faf7104 100644
--- a/OpenBullet/Views/Main/Configs/OtherOptions/General.xaml
+++ b/OpenBullet/Views/Main/Configs/OtherOptions/General.xaml
@@ -25,6 +25,8 @@
                 <Label Content="Maximum CPM to avoid overloading the website (0 = infinite)" />
                 <xctk:IntegerUpDown Background="Transparent" Width="100" Margin="10 0 0 0" Value="{Binding MaxCPM}" Foreground="{DynamicResource ForegroundMain}" HorizontalAlignment="Left" Minimum="0" Maximum="100000"/>
             </DockPanel>
+            <CheckBox Content="Save empty captures" IsChecked="{Binding SaveEmptyCaptures}" VerticalContentAlignment="Center"/>
+            <CheckBox Content="Continue after Custom Status" IsChecked="{Binding ContinueOnCustom}" VerticalContentAlignment="Center"/>
         </StackPanel>
     </Grid>
 </Page>
diff --git a/OpenBullet/Views/Main/Configs/OtherOptions/Selenium.xaml b/OpenBullet/Views/Main/Configs/OtherOptions/Selenium.xaml
index 25161c0..9fc9f2d 100644
--- a/OpenBullet/Views/Main/Configs/OtherOptions/Selenium.xaml
+++ b/OpenBullet/Views/Main/Configs/OtherOptions/Selenium.xaml
@@ -15,10 +15,9 @@
         </Grid.ColumnDefinitions>
 
         <StackPanel Grid.Column="0">
-            <DockPanel Margin="5">
-                <CheckBox DockPanel.Dock="Top" Content="Always Open browser at the start" IsChecked="{Binding AlwaysOpen}" VerticalContentAlignment="Center"/>
-                <CheckBox DockPanel.Dock="Top" Content="Always Quit browser at the end" IsChecked="{Binding AlwaysQuit}" VerticalContentAlignment="Center"/>
-            </DockPanel>
+            <CheckBox Content="Always Open browser at the start" IsChecked="{Binding AlwaysOpen}" VerticalContentAlignment="Center"/>
+            <CheckBox Content="Always Quit browser at the end" IsChecked="{Binding AlwaysQuit}" VerticalContentAlignment="Center"/>
+            <CheckBox Content="Quit browser only on BAN or RETRY" IsChecked="{Binding QuitOnBanRetry}" VerticalContentAlignment="Center"/>
         </StackPanel>
         <StackPanel Grid.Column="1">
             <DockPanel Margin="5">
diff --git a/OpenBullet/Views/Main/Configs/Stacker.xaml.cs b/OpenBullet/Views/Main/Configs/Stacker.xaml.cs
index 7e42ffd..3b207a1 100644
--- a/OpenBullet/Views/Main/Configs/Stacker.xaml.cs
+++ b/OpenBullet/Views/Main/Configs/Stacker.xaml.cs
@@ -344,7 +344,7 @@ namespace OpenBullet.Views.Main.Configs
             // Initialize BotData and Reset LS
             var cData = new CData(vm.TestData, OB.Settings.Environment.GetWordlistType(vm.TestDataType));
 
-            vm.BotData = new BotData(OB.Settings.RLSettings, vm.Config.Config.Settings, cData, proxy, vm.UseProxy, OB.Random);
+            vm.BotData = new BotData(OB.Settings.RLSettings, vm.Config.Config.Settings, cData, proxy, vm.UseProxy, new Random());
             vm.LS.Reset();
 
             // Ask for user input
@@ -416,7 +416,7 @@ namespace OpenBullet.Views.Main.Configs
             }
 
             // Quit Browser if Always Quit
-            if (vm.Config.Config.Settings.AlwaysQuit)
+            if (vm.Config.Config.Settings.AlwaysQuit || (vm.Config.Config.Settings.QuitOnBanRetry && (vm.BotData.Status == BotStatus.BAN || vm.BotData.Status == BotStatus.RETRY)))
             {
                 try {
                     vm.BotData.Driver.Quit();
diff --git a/OpenBullet/Views/Main/PluginsSection.xaml b/OpenBullet/Views/Main/PluginsSection.xaml
new file mode 100644
index 0000000..a7bdbbb
--- /dev/null
+++ b/OpenBullet/Views/Main/PluginsSection.xaml
@@ -0,0 +1,32 @@
+<Page x:Class="OpenBullet.Views.Main.PluginsSection"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:OpenBullet.Views.Main"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="Plugins">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="30" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <TextBlock Grid.Row="0" Foreground="{DynamicResource ForegroundCustom}" Margin="0 0 0 10" >
+            <Span>Remember that some plugins might contain </Span>
+            <Span FontWeight="Bold" Foreground="{DynamicResource ForegroundBad}">MALICIOUS CODE</Span>
+            <Span>that runs even without clicking any buttons!</Span>
+            <Span TextDecorations="Underline" FontWeight="Bold">Only load plugins you can trust!</Span>
+        </TextBlock>
+
+        <StackPanel Grid.Row="1" x:Name="topMenu" Orientation="Horizontal">
+            <Label Content="Selected Plugin:" />
+            <ComboBox x:Name="pluginSelector" Width="200" Margin="5 0 0 0" SelectionChanged="pluginSelector_SelectionChanged" />
+        </StackPanel>
+
+        <Frame Grid.Row="2" x:Name="Main" NavigationUIVisibility="Hidden" />
+    </Grid>
+</Page>
diff --git a/OpenBullet/Views/Main/PluginsSection.xaml.cs b/OpenBullet/Views/Main/PluginsSection.xaml.cs
new file mode 100644
index 0000000..a412f85
--- /dev/null
+++ b/OpenBullet/Views/Main/PluginsSection.xaml.cs
@@ -0,0 +1,47 @@
+using OpenBullet.Views.UserControls;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace OpenBullet.Views.Main
+{
+    /// <summary>
+    /// Logica di interazione per PluginsSection.xaml
+    /// </summary>
+    public partial class PluginsSection : Page
+    {
+        private List<PluginControl> controls;
+
+        public PluginsSection(IEnumerable<PluginControl> controls)
+        {
+            InitializeComponent();
+            this.controls = controls.ToList();
+
+            foreach (var control in this.controls)
+            {
+                pluginSelector.Items.Add(control.Plugin.Name);
+            }
+
+            if (this.controls.Count > 0)
+            {
+                pluginSelector.SelectedIndex = 0;
+            }
+        }
+
+        private void pluginSelector_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            Main.Content = controls.First(c => c.Plugin.Name == (string)pluginSelector.SelectedValue);
+        }
+    }
+}
diff --git a/OpenBullet/Views/Main/Runner/Runner.xaml.cs b/OpenBullet/Views/Main/Runner/Runner.xaml.cs
index e119517..8cc99e5 100644
--- a/OpenBullet/Views/Main/Runner/Runner.xaml.cs
+++ b/OpenBullet/Views/Main/Runner/Runner.xaml.cs
@@ -102,20 +102,16 @@ namespace OpenBullet.Views.Main.Runner
 
         private void RegisterHit(IRunnerMessaging sender, Hit hit)
         {
-            OB.Logger.LogInfo(Components.Runner, $"Adding {hit.Type} hit " + hit.Data + " to the DB");
-            try
+            Application.Current.Dispatcher.Invoke(new Action(() =>
             {
-                using (var db = new LiteDatabase(OB.dataBaseFile))
+                try
                 {
-                    App.Current.Dispatcher.Invoke(new Action(() =>
-                    {
-                        OB.HitsDB.Add(hit);
-                        OB.MainWindow.HitsDBPage.AddConfigToFilter(vm.ConfigName);
-                    }));
-                    db.GetCollection<Hit>("hits").Insert(hit);
+                    OB.Logger.LogInfo(Components.Runner, $"Adding {hit.Type} hit " + hit.Data + " to the DB");
+                    OB.HitsDB.Add(hit);
+                    OB.MainWindow.HitsDBPage.AddConfigToFilter(vm.ConfigName);
                 }
-            }
-            catch (Exception ex) { OB.Logger.LogError(Components.Runner, $"Failed to add {hit.Type} hit " + hit.Data + $" to the DB - {ex.Message}"); }
+                catch (Exception ex) { OB.Logger.LogError(Components.Runner, $"Failed to add {hit.Type} hit " + hit.Data + $" to the DB - {ex.Message}"); }
+            }));
         }
 
         private void PlayHitSound(IRunnerMessaging sender, Hit hit)
@@ -204,6 +200,18 @@ namespace OpenBullet.Views.Main.Runner
             switch (vm.Master.Status)
             {
                 case WorkerStatus.Idle:
+
+                    // Check if the required plugins are present
+                    try
+                    {
+                        OBIOManager.CheckRequiredPlugins(OB.BlockPlugins.Select(b => b.Name), vm.Config);
+                    }
+                    catch (Exception ex)
+                    {
+                        OB.Logger.LogError(Components.Runner, ex.Message, true);
+                        return;
+                    }
+
                     SetupSoundPlayers();
                     ThreadPool.SetMinThreads(vm.BotsAmount * 2 + 1, vm.BotsAmount * 2 + 1);
                     ServicePointManager.DefaultConnectionLimit = 10000; // This sets the default connection limit for requests on the whole application
diff --git a/OpenBullet/Views/Main/Settings/RuriLib/General.xaml b/OpenBullet/Views/Main/Settings/RuriLib/General.xaml
index 4ff025e..68a302c 100644
--- a/OpenBullet/Views/Main/Settings/RuriLib/General.xaml
+++ b/OpenBullet/Views/Main/Settings/RuriLib/General.xaml
@@ -35,6 +35,7 @@
             <ComboBox DockPanel.Dock="Top" x:Name="botsDisplayModeCombobox" SelectionChanged="botsDisplayModeCombobox_SelectionChanged"/>
             <CheckBox Content="Enable Bot Log (slow, RAM-heavy)" IsChecked="{Binding EnableBotLog}" VerticalAlignment="Center" VerticalContentAlignment="Center" />
             <CheckBox Content="Save Last Response Source (RAM-heavy)" IsChecked="{Binding SaveLastSource}" VerticalAlignment="Center" VerticalContentAlignment="Center" />
+            <CheckBox Content="Send data in process to ToCheck on abort" IsChecked="{Binding SendToCheckOnAbort}" VerticalAlignment="Center" VerticalContentAlignment="Center" />
             <Label FontWeight="Bold" Content="Hits Webhook" />
             <CheckBox Content="Enabled" IsChecked="{Binding WebhookEnabled}" />
             <Label Content="URL:" />
diff --git a/OpenBullet/Views/Main/Tools.xaml b/OpenBullet/Views/Main/ToolsSection.xaml
similarity index 100%
rename from OpenBullet/Views/Main/Tools.xaml
rename to OpenBullet/Views/Main/ToolsSection.xaml
diff --git a/OpenBullet/Views/Main/Tools.xaml.cs b/OpenBullet/Views/Main/ToolsSection.xaml.cs
similarity index 100%
rename from OpenBullet/Views/Main/Tools.xaml.cs
rename to OpenBullet/Views/Main/ToolsSection.xaml.cs
diff --git a/OpenBullet/Views/StackerBlocks/BlockPluginPage.xaml b/OpenBullet/Views/StackerBlocks/BlockPluginPage.xaml
new file mode 100644
index 0000000..87ed646
--- /dev/null
+++ b/OpenBullet/Views/StackerBlocks/BlockPluginPage.xaml
@@ -0,0 +1,10 @@
+<Page        x:Class="OpenBullet.Views.StackerBlocks.BlockPluginPage"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <ItemsControl Grid.Row="1" ItemsSource="{Binding Controls}" Margin="5"/>
+</Page>
diff --git a/OpenBullet/Views/StackerBlocks/BlockPluginPage.xaml.cs b/OpenBullet/Views/StackerBlocks/BlockPluginPage.xaml.cs
new file mode 100644
index 0000000..cb6a65b
--- /dev/null
+++ b/OpenBullet/Views/StackerBlocks/BlockPluginPage.xaml.cs
@@ -0,0 +1,54 @@
+using OpenBullet.Plugins;
+using OpenBullet.Views.UserControls;
+using PluginFramework;
+using RuriLib;
+using RuriLib.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Windows.Controls;
+
+namespace OpenBullet.Views.StackerBlocks
+{
+    /// <summary>
+    /// Logica di interazione per BlockPluginControl.xaml
+    /// </summary>
+    public partial class BlockPluginPage : Page
+    {
+        public IBlockPlugin BlockPlugin { get; set; }
+        public BlockBase Block => BlockPlugin as BlockBase;
+        public ObservableCollection<UserControl> Controls { get; set; } = new ObservableCollection<UserControl>();
+        private List<PropertyInfo> ValidProperties { get; set; } = new List<PropertyInfo>();
+
+        public BlockPluginPage(IBlockPlugin blockPlugin)
+        {
+            InitializeComponent();
+            DataContext = this;
+
+            BlockPlugin = blockPlugin;
+
+            // For each valid property, add input field
+            foreach (var p in BlockPlugin.GetType().GetProperties().Where(p => Check.InputProperty(p)))
+            {
+                ValidProperties.Add(p);
+                Controls.Add(Build.InputField(BlockPlugin, p));
+            }
+        }
+
+        public void SetPropertyValues()
+        {
+            foreach (var property in ValidProperties)
+            {
+                // Retrieve and set the value
+                var value = Controls
+                    .Where(c => c is UserControlContainer)
+                    .Select(c => c as UserControlContainer)
+                    .First(c => c.PropertyName == property.Name).GetValue();
+                
+                property.SetValue(BlockPlugin, value);
+            }
+        }
+    }
+}
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockBypassCF.xaml b/OpenBullet/Views/StackerBlocks/PageBlockBypassCF.xaml
index 80fd175..5ca16cb 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockBypassCF.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageBlockBypassCF.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageBlockBypassCF"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageBlockBypassCF"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:OpenBullet.Pages.StackerBlocks"
+      xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
       mc:Ignorable="d" 
       d:DesignHeight="500" d:DesignWidth="400"
       Title="PageBlockBypassCF">
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockBypassCF.xaml.cs b/OpenBullet/Views/StackerBlocks/PageBlockBypassCF.xaml.cs
index 102ff2b..1b3e5af 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockBypassCF.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageBlockBypassCF.xaml.cs
@@ -1,7 +1,7 @@
 using RuriLib;
 using System.Windows.Controls;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageBlockBypassCF.xaml
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockCaptcha.xaml b/OpenBullet/Views/StackerBlocks/PageBlockCaptcha.xaml
index 867c5a4..02ed3c0 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockCaptcha.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageBlockCaptcha.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageBlockCaptcha"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageBlockCaptcha"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:OpenBullet.Pages.StackerBlocks"
+      xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
       mc:Ignorable="d" 
       d:DesignHeight="500" d:DesignWidth="400"
       Title="PageBlockCaptcha">
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockCaptcha.xaml.cs b/OpenBullet/Views/StackerBlocks/PageBlockCaptcha.xaml.cs
index 7c5ad28..10fc757 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockCaptcha.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageBlockCaptcha.xaml.cs
@@ -1,7 +1,7 @@
 using RuriLib;
 using System.Windows.Controls;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageBlockCaptcha.xaml
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockFunction.xaml b/OpenBullet/Views/StackerBlocks/PageBlockFunction.xaml
index 515c65b..a7401bf 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockFunction.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageBlockFunction.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageBlockFunction"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageBlockFunction"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:OpenBullet.Pages.StackerBlocks"
+      xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
       xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
       mc:Ignorable="d" 
       d:DesignHeight="500" d:DesignWidth="400"
@@ -116,11 +116,14 @@
             <TabItem x:Name="randomNumberTab">
                 <StackPanel>
                     <DockPanel>
-                        <Label Content="Min:"/>
-                        <xctk:IntegerUpDown Value="{Binding RandomMin}" Minimum="0" Maximum="2147483647" Width="80" HorizontalAlignment="Left"/>
-                        <Label Content="Max:"/>
-                        <xctk:IntegerUpDown Value="{Binding RandomMax}" Minimum="0" Maximum="2147483647" Width="80" HorizontalAlignment="Left"/>
+                        <Label Content="Minimum:"/>
+                        <TextBox Text="{Binding RandomMin, UpdateSourceTrigger=PropertyChanged}"/>
                     </DockPanel>
+                    <DockPanel>
+                        <Label Content="Maximum:"/>
+                        <TextBox Text="{Binding RandomMax, UpdateSourceTrigger=PropertyChanged}"/>
+                    </DockPanel>
+                    <CheckBox Content="Pad with zeros on the left" IsChecked="{Binding RandomZeroPad}" VerticalContentAlignment="Center"/>
                 </StackPanel>
             </TabItem>
             <TabItem x:Name="countOccurrencesTab">
@@ -131,19 +134,28 @@
                     </DockPanel>
                 </StackPanel>
             </TabItem>
-            <TabItem x:Name="rsaTab">
+            <TabItem x:Name="rsaEncTab">
                 <StackPanel>
-                    <DockPanel>
-                        <Label Content="Key:"/>
-                        <TextBox Text="{Binding RsaKey, UpdateSourceTrigger=PropertyChanged}"/>
+                    <DockPanel Margin="0 5 0 0">
+                        <Label Content="Public Key Modulus (n):"/>
+                        <TextBox Text="{Binding RsaN, UpdateSourceTrigger=PropertyChanged}"/>
                     </DockPanel>
                     <DockPanel Margin="0 5 0 0">
-                        <Label Content="Modulus:"/>
-                        <TextBox Text="{Binding RsaMod, UpdateSourceTrigger=PropertyChanged}"/>
+                        <Label Content="Public Key Exponent (e):"/>
+                        <TextBox Text="{Binding RsaE, UpdateSourceTrigger=PropertyChanged}"/>
+                    </DockPanel>
+                    <CheckBox Content="Use OAEP instead of PKCS v1.5" IsChecked="{Binding RsaOAEP}" VerticalContentAlignment="Center"/>
+                </StackPanel>
+            </TabItem>
+            <TabItem x:Name="rsaDecTab">
+                <StackPanel>
+                    <DockPanel Margin="0 5 0 0">
+                        <Label Content="Public Key Modulus (n):"/>
+                        <TextBox Text="{Binding RsaN, UpdateSourceTrigger=PropertyChanged}"/>
                     </DockPanel>
                     <DockPanel Margin="0 5 0 0">
-                        <Label Content="Exponent:"/>
-                        <TextBox Text="{Binding RsaExp, UpdateSourceTrigger=PropertyChanged}"/>
+                        <Label Content="Private Key Exponent (d):"/>
+                        <TextBox Text="{Binding RsaD, UpdateSourceTrigger=PropertyChanged}"/>
                     </DockPanel>
                     <CheckBox Content="Use OAEP instead of PKCS v1.5" IsChecked="{Binding RsaOAEP}" VerticalContentAlignment="Center"/>
                 </StackPanel>
@@ -168,6 +180,18 @@
                     </DockPanel>
                 </StackPanel>
             </TabItem>
+            <TabItem x:Name="randomUATab">
+                <StackPanel>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <CheckBox Grid.Column="0" Content="Generate only for" IsChecked="{Binding UserAgentSpecifyBrowser}" VerticalContentAlignment="Center" Margin="0 0 10 0"/>
+                        <ComboBox Grid.Column="1" x:Name="randomUABrowserCombobox" SelectionChanged="randomUABrowserCombobox_SelectionChanged"/>
+                    </Grid>
+                </StackPanel>
+            </TabItem>
             <TabItem x:Name="aesTab">
                 <StackPanel>
                     <DockPanel Margin="0 5 0 0">
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockFunction.xaml.cs b/OpenBullet/Views/StackerBlocks/PageBlockFunction.xaml.cs
index be7567b..4fff818 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockFunction.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageBlockFunction.xaml.cs
@@ -1,13 +1,14 @@
 using OpenBullet.Views.Main.Runner;
 using RuriLib;
 using RuriLib.Functions.Crypto;
+using RuriLib.Functions.UserAgent;
 using System;
 using System.Collections.Generic;
 using System.Security.Cryptography;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageBlockFunction.xaml
@@ -38,6 +39,13 @@ namespace OpenBullet.Pages.StackerBlocks
             hmacHashTypeCombobox.SelectedIndex = (int)vm.HashType;
             kdfAlgorithmCombobox.SelectedIndex = (int)vm.KdfAlgorithm;
 
+            foreach (var b in Enum.GetNames(typeof(UserAgent.Browser)))
+            {
+                randomUABrowserCombobox.Items.Add(b);
+            }
+
+            randomUABrowserCombobox.SelectedIndex = (int)vm.UserAgentBrowser;
+
             foreach (var m in Enum.GetNames(typeof(CipherMode)))
             {
                 aesModeCombobox.Items.Add(m);
@@ -99,25 +107,34 @@ namespace OpenBullet.Pages.StackerBlocks
                     break;
 
                 case BlockFunction.Function.RSAEncrypt:
-                case BlockFunction.Function.RSADecrypt:
                     functionTabControl.SelectedIndex = 9;
                     break;
 
-                case BlockFunction.Function.CharAt:
+                    /*
+                case BlockFunction.Function.RSADecrypt:
                     functionTabControl.SelectedIndex = 10;
                     break;
+                    */
+
+                case BlockFunction.Function.CharAt:
+                    functionTabControl.SelectedIndex = 11;
+                    break;
 
                 case BlockFunction.Function.Substring:
-                    functionTabControl.SelectedIndex = 11;
+                    functionTabControl.SelectedIndex = 12;
+                    break;
+
+                case BlockFunction.Function.GetRandomUA:
+                    functionTabControl.SelectedIndex = 13;
                     break;
 
                 case BlockFunction.Function.AESEncrypt:
                 case BlockFunction.Function.AESDecrypt:
-                    functionTabControl.SelectedIndex = 12;
+                    functionTabControl.SelectedIndex = 14;
                     break;
 
                 case BlockFunction.Function.PBKDF2PKCS5:
-                    functionTabControl.SelectedIndex = 13;
+                    functionTabControl.SelectedIndex = 15;
                     break;
             }
         }
@@ -168,5 +185,10 @@ namespace OpenBullet.Pages.StackerBlocks
         {
             vm.KdfAlgorithm = (Hash)((ComboBox)e.OriginalSource).SelectedIndex;
         }
+
+        private void randomUABrowserCombobox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            vm.UserAgentBrowser = (UserAgent.Browser)((ComboBox)e.OriginalSource).SelectedIndex;
+        }
     }
 }
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockKeycheck.xaml b/OpenBullet/Views/StackerBlocks/PageBlockKeycheck.xaml
index 6e5ba1c..2a86821 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockKeycheck.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageBlockKeycheck.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageBlockKeycheck"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageBlockKeycheck"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:OpenBullet.Pages.StackerBlocks"
+      xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
       mc:Ignorable="d" 
       d:DesignHeight="500" d:DesignWidth="400"
       Title="PageBlockKeycheck">
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockKeycheck.xaml.cs b/OpenBullet/Views/StackerBlocks/PageBlockKeycheck.xaml.cs
index 120ac36..55289c8 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockKeycheck.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageBlockKeycheck.xaml.cs
@@ -7,7 +7,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageBlockKeycheck.xaml
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockLSCode.xaml b/OpenBullet/Views/StackerBlocks/PageBlockLSCode.xaml
index 95c4245..81cca2b 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockLSCode.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageBlockLSCode.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageBlockLSCode"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageBlockLSCode"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:OpenBullet.Pages.StackerBlocks"
+      xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
       xmlns:avalonEdit="http://icsharpcode.net/sharpdevelop/avalonedit"
       mc:Ignorable="d" 
       d:DesignHeight="500" d:DesignWidth="400"
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockLSCode.xaml.cs b/OpenBullet/Views/StackerBlocks/PageBlockLSCode.xaml.cs
index 1d38214..6f3c249 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockLSCode.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageBlockLSCode.xaml.cs
@@ -17,7 +17,7 @@ using System.Windows.Navigation;
 using System.Windows.Shapes;
 using System.Xml;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageBlockLSCode.xaml
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockParse.xaml b/OpenBullet/Views/StackerBlocks/PageBlockParse.xaml
index 56927ac..fb145cb 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockParse.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageBlockParse.xaml
@@ -1,4 +1,4 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageBlockParse"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageBlockParse"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockParse.xaml.cs b/OpenBullet/Views/StackerBlocks/PageBlockParse.xaml.cs
index c9ada69..f18d3bf 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockParse.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageBlockParse.xaml.cs
@@ -6,7 +6,7 @@ using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Input;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageBlockParse.xaml
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockRecaptcha.xaml b/OpenBullet/Views/StackerBlocks/PageBlockRecaptcha.xaml
index 8b95483..97bedda 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockRecaptcha.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageBlockRecaptcha.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageBlockRecaptcha"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageBlockRecaptcha"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:OpenBullet.Pages.StackerBlocks"
+      xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
       mc:Ignorable="d" 
       d:DesignHeight="500" d:DesignWidth="400"
       Title="PageBlockRecaptcha">
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockRecaptcha.xaml.cs b/OpenBullet/Views/StackerBlocks/PageBlockRecaptcha.xaml.cs
index 4f4bdd8..a3f54cb 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockRecaptcha.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageBlockRecaptcha.xaml.cs
@@ -5,7 +5,7 @@ using System.Text.RegularExpressions;
 using System.Windows;
 using System.Windows.Controls;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageBlockRecaptcha.xaml
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockRequest.xaml b/OpenBullet/Views/StackerBlocks/PageBlockRequest.xaml
index a9419c1..a02e4e8 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockRequest.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageBlockRequest.xaml
@@ -1,4 +1,4 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageBlockRequest"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageBlockRequest"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockRequest.xaml.cs b/OpenBullet/Views/StackerBlocks/PageBlockRequest.xaml.cs
index a80e1cc..79d817a 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockRequest.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageBlockRequest.xaml.cs
@@ -4,7 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Controls;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageBlockRequest.xaml
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockTCP.xaml b/OpenBullet/Views/StackerBlocks/PageBlockTCP.xaml
index 112fa8e..282708e 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockTCP.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageBlockTCP.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageBlockTCP"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageBlockTCP"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:OpenBullet.Pages.StackerBlocks"
+      xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
       mc:Ignorable="d" 
       d:DesignHeight="500" d:DesignWidth="400"
       Title="PageBlockTCP">
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockTCP.xaml.cs b/OpenBullet/Views/StackerBlocks/PageBlockTCP.xaml.cs
index 62362f7..5721d19 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockTCP.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageBlockTCP.xaml.cs
@@ -14,7 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageBlockTCP.xaml
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockUtility.xaml b/OpenBullet/Views/StackerBlocks/PageBlockUtility.xaml
index dc13af1..00fdb0f 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockUtility.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageBlockUtility.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageBlockUtility"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageBlockUtility"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:OpenBullet.Pages.StackerBlocks"
+      xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
       mc:Ignorable="d" 
       d:DesignHeight="500" d:DesignWidth="400"
       Title="PageBlockUtility">
@@ -104,6 +104,19 @@
                                 </DockPanel>
                             </StackPanel>
                         </TabItem>
+                        <TabItem x:Name="removeValuesTab">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="auto" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+
+                                <Label Grid.Column="0" Content="Remove element if" />
+                                <ComboBox Grid.Column="1" x:Name="removeComparerCombobox" SelectionChanged="removeComparerCombobox_SelectionChanged"/>
+                                <TextBox Grid.Column="2" Text="{Binding ListComparisonTerm, UpdateSourceTrigger=PropertyChanged}"/>
+                            </Grid>
+                        </TabItem>
                     </TabControl>
 
                 </StackPanel>
diff --git a/OpenBullet/Views/StackerBlocks/PageBlockUtility.xaml.cs b/OpenBullet/Views/StackerBlocks/PageBlockUtility.xaml.cs
index e39a9f1..b673b6a 100644
--- a/OpenBullet/Views/StackerBlocks/PageBlockUtility.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageBlockUtility.xaml.cs
@@ -1,9 +1,10 @@
 using RuriLib;
+using RuriLib.Functions.Conditions;
 using RuriLib.Functions.Conversions;
 using System;
 using System.Windows.Controls;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per Pagexaml
@@ -47,6 +48,11 @@ namespace OpenBullet.Pages.StackerBlocks
                 fileActionCombobox.Items.Add(a);
 
             fileActionCombobox.SelectedIndex = (int)block.FileAction;
+
+            foreach (var c in Enum.GetNames(typeof(Comparer)))
+                removeComparerCombobox.Items.Add(c);
+
+            removeComparerCombobox.SelectedIndex = (int)block.ListElementComparer;
         }
 
         private void groupCombobox_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -111,6 +117,10 @@ namespace OpenBullet.Pages.StackerBlocks
                 case ListAction.Remove:
                     listActionTabControl.SelectedIndex = 5;
                     break;
+
+                case ListAction.RemoveValues:
+                    listActionTabControl.SelectedIndex = 6;
+                    break;
             }
         }
 
@@ -129,6 +139,11 @@ namespace OpenBullet.Pages.StackerBlocks
             block.FileAction = (FileAction)((ComboBox)e.OriginalSource).SelectedIndex;
         }
 
+        private void removeComparerCombobox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            block.ListElementComparer = (Comparer)((ComboBox)e.OriginalSource).SelectedIndex;
+        }
+
         private void varActionCombobox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             block.VarAction = (VarAction)((ComboBox)e.OriginalSource).SelectedIndex;
diff --git a/OpenBullet/Views/StackerBlocks/PageSBlockBrowserAction.xaml b/OpenBullet/Views/StackerBlocks/PageSBlockBrowserAction.xaml
index 072e77c..66d1fae 100644
--- a/OpenBullet/Views/StackerBlocks/PageSBlockBrowserAction.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageSBlockBrowserAction.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageSBlockBrowserAction"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageSBlockBrowserAction"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:OpenBullet.Pages.StackerBlocks"
+      xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
       mc:Ignorable="d" 
       d:DesignHeight="500" d:DesignWidth="400"
       Title="PageSBlockBrowserAction">
diff --git a/OpenBullet/Views/StackerBlocks/PageSBlockBrowserAction.xaml.cs b/OpenBullet/Views/StackerBlocks/PageSBlockBrowserAction.xaml.cs
index 0c4d127..9fe3bf8 100644
--- a/OpenBullet/Views/StackerBlocks/PageSBlockBrowserAction.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageSBlockBrowserAction.xaml.cs
@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Controls;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageSBlockBrowserAction.xaml
diff --git a/OpenBullet/Views/StackerBlocks/PageSBlockElementAction.xaml b/OpenBullet/Views/StackerBlocks/PageSBlockElementAction.xaml
index 37bfbcc..98179c1 100644
--- a/OpenBullet/Views/StackerBlocks/PageSBlockElementAction.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageSBlockElementAction.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageSBlockElementAction"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageSBlockElementAction"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:OpenBullet.Pages.StackerBlocks"
+      xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
       xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
       mc:Ignorable="d" 
       d:DesignHeight="500" d:DesignWidth="400"
diff --git a/OpenBullet/Views/StackerBlocks/PageSBlockElementAction.xaml.cs b/OpenBullet/Views/StackerBlocks/PageSBlockElementAction.xaml.cs
index 074426d..1d3dd96 100644
--- a/OpenBullet/Views/StackerBlocks/PageSBlockElementAction.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageSBlockElementAction.xaml.cs
@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Controls;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageSBlockElementAction.xaml
diff --git a/OpenBullet/Views/StackerBlocks/PageSBlockExecuteJS.xaml b/OpenBullet/Views/StackerBlocks/PageSBlockExecuteJS.xaml
index f725a15..f34293f 100644
--- a/OpenBullet/Views/StackerBlocks/PageSBlockExecuteJS.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageSBlockExecuteJS.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageSBlockExecuteJS"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageSBlockExecuteJS"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:OpenBullet.Pages.StackerBlocks"
+      xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
       xmlns:avalonEdit="http://icsharpcode.net/sharpdevelop/avalonedit"
       mc:Ignorable="d" 
       d:DesignHeight="500" d:DesignWidth="400"
diff --git a/OpenBullet/Views/StackerBlocks/PageSBlockExecuteJS.xaml.cs b/OpenBullet/Views/StackerBlocks/PageSBlockExecuteJS.xaml.cs
index a95aee1..917a048 100644
--- a/OpenBullet/Views/StackerBlocks/PageSBlockExecuteJS.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageSBlockExecuteJS.xaml.cs
@@ -3,7 +3,7 @@ using RuriLib;
 using System;
 using System.Windows.Controls;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageSBlockExecuteJS.xaml
diff --git a/OpenBullet/Views/StackerBlocks/PageSBlockNavigate.xaml b/OpenBullet/Views/StackerBlocks/PageSBlockNavigate.xaml
index 48a0bff..10578dd 100644
--- a/OpenBullet/Views/StackerBlocks/PageSBlockNavigate.xaml
+++ b/OpenBullet/Views/StackerBlocks/PageSBlockNavigate.xaml
@@ -1,9 +1,9 @@
-<Page x:Class="OpenBullet.Pages.StackerBlocks.PageSBlockNavigate"
+<Page x:Class="OpenBullet.Views.StackerBlocks.PageSBlockNavigate"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:OpenBullet.Pages.StackerBlocks"
+      xmlns:local="clr-namespace:OpenBullet.Views.StackerBlocks"
       xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
       mc:Ignorable="d" 
       d:DesignHeight="500" d:DesignWidth="400"
diff --git a/OpenBullet/Views/StackerBlocks/PageSBlockNavigate.xaml.cs b/OpenBullet/Views/StackerBlocks/PageSBlockNavigate.xaml.cs
index b145404..db3bb51 100644
--- a/OpenBullet/Views/StackerBlocks/PageSBlockNavigate.xaml.cs
+++ b/OpenBullet/Views/StackerBlocks/PageSBlockNavigate.xaml.cs
@@ -1,7 +1,7 @@
 using RuriLib;
 using System.Windows.Controls;
 
-namespace OpenBullet.Pages.StackerBlocks
+namespace OpenBullet.Views.StackerBlocks
 {
     /// <summary>
     /// Logica di interazione per PageSBlockNavigate.xaml
diff --git a/OpenBullet/Views/UserControls/ButtonContainer.xaml b/OpenBullet/Views/UserControls/ButtonContainer.xaml
new file mode 100644
index 0000000..ffd9082
--- /dev/null
+++ b/OpenBullet/Views/UserControls/ButtonContainer.xaml
@@ -0,0 +1,10 @@
+<UserControl x:Class="OpenBullet.Views.UserControls.ButtonContainer"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OpenBullet.Views.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Button x:Name="SubmitButton" Content="{Binding Text}" Margin="5" Padding="5" Click="SubmitButton_Click" />
+</UserControl>
diff --git a/OpenBullet/Views/UserControls/ButtonContainer.xaml.cs b/OpenBullet/Views/UserControls/ButtonContainer.xaml.cs
new file mode 100644
index 0000000..2f65769
--- /dev/null
+++ b/OpenBullet/Views/UserControls/ButtonContainer.xaml.cs
@@ -0,0 +1,30 @@
+using System.Windows;
+using System.Windows.Controls;
+
+namespace OpenBullet.Views.UserControls
+{
+    /// <summary>
+    /// Logica di interazione per ButtonContainer.xaml
+    /// </summary>
+    public partial class ButtonContainer : UserControl
+    {
+        public string Text { get; set; }
+        private string MethodName { get; set; }
+        private PluginControl PluginControl { get; set; }
+
+        public ButtonContainer(string text, string methodName, PluginControl pluginControl)
+        {
+            InitializeComponent();
+            DataContext = this;
+
+            Text = text;
+            MethodName = methodName;
+            PluginControl = pluginControl;
+        }
+
+        private void SubmitButton_Click(object sender, RoutedEventArgs e)
+        {
+            PluginControl.RunMethod(MethodName);
+        }
+    }
+}
diff --git a/OpenBullet/Views/UserControls/PluginControl.xaml b/OpenBullet/Views/UserControls/PluginControl.xaml
new file mode 100644
index 0000000..e0d37b6
--- /dev/null
+++ b/OpenBullet/Views/UserControls/PluginControl.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="OpenBullet.Views.UserControls.PluginControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OpenBullet.Views.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid Margin="5">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+        </Grid.RowDefinitions>
+
+        <Label Grid.Row="0" FontWeight="Bold" Content="{Binding Plugin.Name}" />
+        <ItemsControl Grid.Row="1" ItemsSource="{Binding Controls}" Padding="5"/>
+    </Grid>
+</UserControl>
diff --git a/OpenBullet/Views/UserControls/PluginControl.xaml.cs b/OpenBullet/Views/UserControls/PluginControl.xaml.cs
new file mode 100644
index 0000000..6ba970b
--- /dev/null
+++ b/OpenBullet/Views/UserControls/PluginControl.xaml.cs
@@ -0,0 +1,77 @@
+using OpenBullet.Plugins;
+using PluginFramework;
+using RuriLib.Interfaces;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Windows.Controls;
+
+namespace OpenBullet.Views.UserControls
+{
+    /// <summary>
+    /// Logica di interazione per PluginControl.xaml
+    /// </summary>
+    public partial class PluginControl : UserControl
+    {
+        public IPlugin Plugin { get; set; }
+        public ObservableCollection<UserControl> Controls { get; set; } = new ObservableCollection<UserControl>();
+        private List<PropertyInfo> ValidProperties { get; set; } = new List<PropertyInfo>();
+
+        public PluginControl(Type type, IApplication app)
+        {
+            InitializeComponent();
+            DataContext = this;
+
+            var constructorParams = new object[] { };
+
+            // If the constructor supports IApplication
+            if (type.GetConstructors()
+                .Any(c => c.GetParameters()
+                    .Any(p => p.ParameterType == typeof(IApplication))))
+            {
+                constructorParams = new object[] { app };
+            }
+            
+            Plugin = Activator.CreateInstance(type, constructorParams) as IPlugin;
+
+            // For each valid property, add input field
+            foreach (var p in type.GetProperties().Where(p => Check.InputProperty(p)))
+            {
+                ValidProperties.Add(p);
+                Controls.Add(Build.InputField(Plugin, p));
+            }
+
+            // For each valid method, add button
+            foreach (var m in type.GetMethods().Where(m => Check.Method(Plugin, m)))
+            {
+                Controls.Add(Build.Button(m, this));
+            }
+        }
+
+        public void RunMethod(string methodName)
+        {
+            foreach (var property in ValidProperties)
+            {
+                // Retrieve and set the value
+                property.SetValue(Plugin, Controls
+                    .Where(c => c is UserControlContainer)
+                    .Select(c => c as UserControlContainer)
+                    .First(c => c.PropertyName == property.Name).GetValue());
+            }
+
+            var method = Plugin.GetType().GetMethod(methodName);
+            var parameters = method.GetParameters();
+            var passed = new object[] { };
+
+            // If the method supports 1 paramters of type IApplication
+            if (parameters.Length == 1 && parameters.First().ParameterType == typeof(IApplication))
+            {
+                passed = new object[] { OB.App };
+            }
+
+            method.Invoke(Plugin, passed);
+        }
+    }
+}
diff --git a/OpenBullet/Views/UserControls/UserControlCheckbox.xaml b/OpenBullet/Views/UserControls/UserControlCheckbox.xaml
new file mode 100644
index 0000000..f093e1c
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlCheckbox.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="OpenBullet.Views.UserControls.UserControlCheckbox"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OpenBullet.Views.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <CheckBox Grid.Column="0" IsChecked="{Binding Value}" VerticalContentAlignment="Center" VerticalAlignment="Center"/>
+    </Grid>
+</UserControl>
diff --git a/OpenBullet/Views/UserControls/UserControlCheckbox.xaml.cs b/OpenBullet/Views/UserControls/UserControlCheckbox.xaml.cs
new file mode 100644
index 0000000..4fa0596
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlCheckbox.xaml.cs
@@ -0,0 +1,31 @@
+using OpenBullet.Plugins;
+using System.Windows.Controls;
+
+namespace OpenBullet.Views.UserControls
+{
+    /// <summary>
+    /// Logica di interazione per UserControlCheckbox.xaml
+    /// </summary>
+    public partial class UserControlCheckbox : UserControl, IControl
+    {
+        public bool Value { get; set; }
+
+        public UserControlCheckbox(bool value)
+        {
+            InitializeComponent();
+            DataContext = this;
+
+            Value = value;
+        }
+
+        public dynamic GetValue()
+        {
+            return Value;
+        }
+
+        public void SetValue(dynamic value)
+        {
+            Value = (bool)value;
+        }
+    }
+}
diff --git a/OpenBullet/Views/UserControls/UserControlConfig.xaml b/OpenBullet/Views/UserControls/UserControlConfig.xaml
new file mode 100644
index 0000000..cb07aa4
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlConfig.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="OpenBullet.Views.UserControls.UserControlConfig"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OpenBullet.Views.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="auto" />
+        </Grid.ColumnDefinitions>
+
+        <TextBox x:Name="ConfigName" Grid.Column="0" IsReadOnly="True" VerticalContentAlignment="Center" />
+        <Button x:Name="Choose" Grid.Column="1" Content="Choose" Click="Choose_Click" Padding="10 0" />
+    </Grid>
+</UserControl>
diff --git a/OpenBullet/Views/UserControls/UserControlConfig.xaml.cs b/OpenBullet/Views/UserControls/UserControlConfig.xaml.cs
new file mode 100644
index 0000000..6cbfab9
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlConfig.xaml.cs
@@ -0,0 +1,42 @@
+using Microsoft.Win32;
+using OpenBullet.Plugins;
+using RuriLib.Models;
+using RuriLib.ViewModels;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace OpenBullet.Views.UserControls
+{
+    /// <summary>
+    /// Logica di interazione per UserControlConfig.xaml
+    /// </summary>
+    public partial class UserControlConfig : UserControl, IControl
+    {
+        public ConfigViewModel Config { get; set; } = null;
+
+        public UserControlConfig()
+        {
+            InitializeComponent();
+            DataContext = this;
+        }
+
+        public dynamic GetValue()
+        {
+            return Config;
+        }
+
+        public void SetValue(dynamic value)
+        {
+            Config = (ConfigViewModel)value;
+        }
+
+        private void Choose_Click(object sender, RoutedEventArgs e)
+        {
+            new MainDialog(new DialogSelectConfig(this), "Select a Config").ShowDialog();
+            if (Config != null)
+            {
+                ConfigName.Text = Config.Name;
+            }
+        }
+    }
+}
diff --git a/OpenBullet/Views/UserControls/UserControlContainer.xaml b/OpenBullet/Views/UserControls/UserControlContainer.xaml
new file mode 100644
index 0000000..89f88fe
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlContainer.xaml
@@ -0,0 +1,23 @@
+<UserControl x:Class="OpenBullet.Views.UserControls.UserControlContainer"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OpenBullet.Views.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid x:Name="Grid" Margin="0 0 0 5">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <Label Grid.Column="0" Content="{Binding Label}">
+            <Label.ToolTip>
+                <TextBlock Text="{Binding Tooltip}" />
+            </Label.ToolTip>
+        </Label>
+
+        <!-- Specific user control goes here -->
+    </Grid>
+</UserControl>
diff --git a/OpenBullet/Views/UserControls/UserControlContainer.xaml.cs b/OpenBullet/Views/UserControls/UserControlContainer.xaml.cs
new file mode 100644
index 0000000..ab74b6c
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlContainer.xaml.cs
@@ -0,0 +1,43 @@
+using OpenBullet.Plugins;
+using System.Windows.Controls;
+
+namespace OpenBullet.Views.UserControls
+{
+    /// <summary>
+    /// Logica di interazione per UserControlContainer.xaml
+    /// </summary>
+    public partial class UserControlContainer : UserControl, IControl
+    {
+        public string PropertyName { get; set; }
+        public IControl UserControl { get; set; }
+
+        public string Label { get; set; }
+        public string Tooltip { get; set; }
+
+        public UserControlContainer(string propertyName, IControl userControl, string label, string tooltip)
+        {
+            InitializeComponent();
+            DataContext = this;
+
+            PropertyName = propertyName;
+            UserControl = userControl;
+
+            var uc = UserControl as UserControl;
+            uc.SetValue(Grid.ColumnProperty, 1);
+            Grid.Children.Add(UserControl as UserControl);
+
+            Label = label;
+            Tooltip = tooltip;
+        }
+
+        public dynamic GetValue()
+        {
+            return UserControl.GetValue();
+        }
+
+        public void SetValue(dynamic value)
+        {
+            UserControl.SetValue(value);
+        }
+    }
+}
diff --git a/OpenBullet/Views/UserControls/UserControlDropdown.xaml b/OpenBullet/Views/UserControls/UserControlDropdown.xaml
new file mode 100644
index 0000000..7ef6135
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlDropdown.xaml
@@ -0,0 +1,17 @@
+<UserControl x:Class="OpenBullet.Views.UserControls.UserControlDropdown"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OpenBullet.Views.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <ComboBox Grid.Column="0" Width="250" x:Name="Dropdown" VerticalContentAlignment="Center" />
+    </Grid>
+</UserControl>
diff --git a/OpenBullet/Views/UserControls/UserControlDropdown.xaml.cs b/OpenBullet/Views/UserControls/UserControlDropdown.xaml.cs
new file mode 100644
index 0000000..4bc8d55
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlDropdown.xaml.cs
@@ -0,0 +1,34 @@
+using OpenBullet.Plugins;
+using System.Windows.Controls;
+
+namespace OpenBullet.Views.UserControls
+{
+    /// <summary>
+    /// Logica di interazione per UserControlDropdown.xaml
+    /// </summary>
+    public partial class UserControlDropdown : UserControl, IControl
+    {
+        public UserControlDropdown(string value, string[] options)
+        {
+            InitializeComponent();
+            DataContext = this;
+
+            foreach (var option in options)
+            {
+                Dropdown.Items.Add(option);
+            }
+
+            SetValue(value);
+        }
+
+        public dynamic GetValue()
+        {
+            return Dropdown.SelectedValue;
+        }
+
+        public void SetValue(dynamic value)
+        {
+            Dropdown.SelectedValue = (string)value;
+        }
+    }
+}
diff --git a/OpenBullet/Views/UserControls/UserControlFilePicker.xaml b/OpenBullet/Views/UserControls/UserControlFilePicker.xaml
new file mode 100644
index 0000000..47c3f6f
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlFilePicker.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="OpenBullet.Views.UserControls.UserControlFilePicker"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OpenBullet.Views.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="auto" />
+        </Grid.ColumnDefinitions>
+
+        <TextBox x:Name="Location" Grid.Column="0" IsReadOnly="True" VerticalContentAlignment="Center" />
+        <Button x:Name="Choose" Grid.Column="1" Content="Choose" Click="Choose_Click" Padding="10 0" />
+    </Grid>
+</UserControl>
diff --git a/OpenBullet/Views/UserControls/UserControlFilePicker.xaml.cs b/OpenBullet/Views/UserControls/UserControlFilePicker.xaml.cs
new file mode 100644
index 0000000..1cc2f6c
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlFilePicker.xaml.cs
@@ -0,0 +1,47 @@
+using Microsoft.Win32;
+using OpenBullet.Plugins;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace OpenBullet.Views.UserControls
+{
+    /// <summary>
+    /// Logica di interazione per UserControlFilePicker.xaml
+    /// </summary>
+    public partial class UserControlFilePicker : UserControl, IControl
+    {
+        public string Filter { get; set; }
+
+        public UserControlFilePicker(string location, string filter)
+        {
+            InitializeComponent();
+            DataContext = this;
+
+            Filter = filter;
+            SetValue(location);
+        }
+
+        public dynamic GetValue()
+        {
+            return Location.Text;
+        }
+
+        public void SetValue(dynamic value)
+        {
+            Location.Text = (string)value;
+        }
+
+        private void Choose_Click(object sender, RoutedEventArgs e)
+        {
+            OpenFileDialog ofd = new OpenFileDialog();
+            ofd.Filter = Filter;
+
+            var result = ofd.ShowDialog();
+
+            if (result.HasValue && result.Value)
+            {
+                SetValue(ofd.FileName);
+            }
+        }
+    }
+}
diff --git a/OpenBullet/Views/UserControls/UserControlInfoText.xaml b/OpenBullet/Views/UserControls/UserControlInfoText.xaml
new file mode 100644
index 0000000..2c477a3
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlInfoText.xaml
@@ -0,0 +1,10 @@
+<UserControl x:Class="OpenBullet.Views.UserControls.UserControlInfoText"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OpenBullet.Views.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Label Content="{Binding Path=Value, Mode=OneWay}" />
+</UserControl>
diff --git a/OpenBullet/Views/UserControls/UserControlInfoText.xaml.cs b/OpenBullet/Views/UserControls/UserControlInfoText.xaml.cs
new file mode 100644
index 0000000..88a5829
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlInfoText.xaml.cs
@@ -0,0 +1,44 @@
+using OpenBullet.Plugins;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace OpenBullet.Views.UserControls
+{
+    /// <summary>
+    /// Logica di interazione per UserControlInfoText.xaml
+    /// </summary>
+    public partial class UserControlInfoText : IControl
+    {
+        public string Value { get; set; }
+
+        public UserControlInfoText(string defaultValue)
+        {
+            InitializeComponent();
+            DataContext = this;
+
+            Value = defaultValue;
+        }
+
+        public dynamic GetValue()
+        {
+            return Value;
+        }
+
+        public void SetValue(dynamic value)
+        {
+            Value = (string)value;
+        }
+    }
+}
diff --git a/OpenBullet/Views/UserControls/UserControlNumeric.xaml b/OpenBullet/Views/UserControls/UserControlNumeric.xaml
new file mode 100644
index 0000000..e8b5a5d
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlNumeric.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="OpenBullet.Views.UserControls.UserControlNumeric"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             xmlns:local="clr-namespace:OpenBullet.Views.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <xctk:IntegerUpDown Grid.Column="0" Width="100" Name="myUpDownControl" Value="{Binding Value}" Minimum="{Binding Minimum}" Maximum="{Binding Maximum}" />
+    </Grid>
+</UserControl>
diff --git a/OpenBullet/Views/UserControls/UserControlNumeric.xaml.cs b/OpenBullet/Views/UserControls/UserControlNumeric.xaml.cs
new file mode 100644
index 0000000..3d7f81d
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlNumeric.xaml.cs
@@ -0,0 +1,35 @@
+using OpenBullet.Plugins;
+using System.Windows.Controls;
+
+namespace OpenBullet.Views.UserControls
+{
+    /// <summary>
+    /// Logica di interazione per UserControlNumeric.xaml
+    /// </summary>
+    public partial class UserControlNumeric : UserControl, IControl
+    {
+        public int Value { get; set; }
+        public int Minimum { get; set; }
+        public int Maximum { get; set; }
+
+        public UserControlNumeric(int defaultValue, int minimum, int maximum)
+        {
+            InitializeComponent();
+            DataContext = this;
+
+            Value = defaultValue;
+            Minimum = minimum;
+            Maximum = maximum;
+        }
+
+        public dynamic GetValue()
+        {
+            return Value;
+        }
+
+        public void SetValue(dynamic value)
+        {
+            Value = (int)value;
+        }
+    }
+}
diff --git a/OpenBullet/Views/UserControls/UserControlText.xaml b/OpenBullet/Views/UserControls/UserControlText.xaml
new file mode 100644
index 0000000..019f041
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlText.xaml
@@ -0,0 +1,10 @@
+<UserControl x:Class="OpenBullet.Views.UserControls.UserControlText"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OpenBullet.Views.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <TextBox Text="{Binding Path=Value, Mode=TwoWay}" VerticalContentAlignment="Center" />
+</UserControl>
diff --git a/OpenBullet/Views/UserControls/UserControlText.xaml.cs b/OpenBullet/Views/UserControls/UserControlText.xaml.cs
new file mode 100644
index 0000000..3d77f7f
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlText.xaml.cs
@@ -0,0 +1,30 @@
+using OpenBullet.Plugins;
+
+namespace OpenBullet.Views.UserControls
+{
+    /// <summary>
+    /// Logica di interazione per UserControlText.xaml
+    /// </summary>
+    public partial class UserControlText : IControl
+    {
+        public string Value { get; set; }
+
+        public UserControlText(string defaultValue)
+        {
+            InitializeComponent();
+            DataContext = this;
+
+            Value = defaultValue;
+        }
+
+        public dynamic GetValue()
+        {
+            return Value;
+        }
+
+        public void SetValue(dynamic value)
+        {
+            Value = (string)value;
+        }
+    }
+}
diff --git a/OpenBullet/Views/UserControls/UserControlTextMulti.xaml b/OpenBullet/Views/UserControls/UserControlTextMulti.xaml
new file mode 100644
index 0000000..63cbb0e
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlTextMulti.xaml
@@ -0,0 +1,10 @@
+<UserControl x:Class="OpenBullet.Views.UserControls.UserControlTextMulti"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OpenBullet.Views.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <TextBox x:Name="Box" TextWrapping="Wrap" AcceptsReturn="True" Height="100" />
+</UserControl>
diff --git a/OpenBullet/Views/UserControls/UserControlTextMulti.xaml.cs b/OpenBullet/Views/UserControls/UserControlTextMulti.xaml.cs
new file mode 100644
index 0000000..258b05c
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlTextMulti.xaml.cs
@@ -0,0 +1,31 @@
+using OpenBullet.Plugins;
+using System;
+using System.Windows.Controls;
+
+namespace OpenBullet.Views.UserControls
+{
+    /// <summary>
+    /// Logica di interazione per UserControlTextMulti.xaml
+    /// </summary>
+    public partial class UserControlTextMulti : UserControl, IControl
+    {
+        public UserControlTextMulti(string[] value)
+        {
+            InitializeComponent();
+            DataContext = this;
+
+            SetValue(value);
+        }
+
+        public dynamic GetValue()
+        {
+            return Box.Text.Split(new string[] { "\r\n", "\n" }, StringSplitOptions.None);
+        }
+
+        public void SetValue(dynamic value)
+        {
+            var val = (string[])value;
+            Box.Text = string.Join(Environment.NewLine, val);
+        }
+    }
+}
diff --git a/OpenBullet/Views/UserControls/UserControlWordlist.xaml b/OpenBullet/Views/UserControls/UserControlWordlist.xaml
new file mode 100644
index 0000000..73a3fa5
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlWordlist.xaml
@@ -0,0 +1,18 @@
+<UserControl x:Class="OpenBullet.Views.UserControls.UserControlWordlist"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OpenBullet.Views.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="auto" />
+        </Grid.ColumnDefinitions>
+
+        <TextBox x:Name="WordlistName" Grid.Column="0" IsReadOnly="True" VerticalContentAlignment="Center" />
+        <Button x:Name="Choose" Grid.Column="1" Content="Choose" Click="Choose_Click" Padding="10 0" />
+    </Grid>
+</UserControl>
diff --git a/OpenBullet/Views/UserControls/UserControlWordlist.xaml.cs b/OpenBullet/Views/UserControls/UserControlWordlist.xaml.cs
new file mode 100644
index 0000000..4ef0ec7
--- /dev/null
+++ b/OpenBullet/Views/UserControls/UserControlWordlist.xaml.cs
@@ -0,0 +1,41 @@
+using Microsoft.Win32;
+using OpenBullet.Plugins;
+using RuriLib.Models;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace OpenBullet.Views.UserControls
+{
+    /// <summary>
+    /// Logica di interazione per UserControlWordlist.xaml
+    /// </summary>
+    public partial class UserControlWordlist : UserControl, IControl
+    {
+        public Wordlist Wordlist { get; set; } = null;
+
+        public UserControlWordlist()
+        {
+            InitializeComponent();
+            DataContext = this;
+        }
+
+        public dynamic GetValue()
+        {
+            return Wordlist;
+        }
+
+        public void SetValue(dynamic value)
+        {
+            Wordlist = (Wordlist)value;
+        }
+
+        private void Choose_Click(object sender, RoutedEventArgs e)
+        {
+            new MainDialog(new DialogSelectWordlist(this), "Select a Wordlist").ShowDialog();
+            if (Wordlist != null)
+            {
+                WordlistName.Text = Wordlist.Name;
+            }
+        }
+    }
+}
diff --git a/OpenBullet/packages.config b/OpenBullet/packages.config
index 5425162..4c2abbe 100644
--- a/OpenBullet/packages.config
+++ b/OpenBullet/packages.config
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AngleSharp" version="0.13.0" targetFramework="net472" />
-  <package id="AvalonEdit" version="5.0.4" targetFramework="net461" />
+  <package id="AvalonEdit" version="6.0.1" targetFramework="net472" />
   <package id="DynamicLanguageRuntime" version="1.2.2" targetFramework="net461" />
-  <package id="Extended.Wpf.Toolkit" version="3.5.0" targetFramework="net461" />
+  <package id="Extended.Wpf.Toolkit" version="3.8.1" targetFramework="net472" />
   <package id="Infragistics.Themes.MetroDark.Wpf" version="1.0.0" targetFramework="net461" />
   <package id="IronPython" version="2.7.9" targetFramework="net461" />
   <package id="Jint" version="2.11.58" targetFramework="net461" />
   <package id="LiteDB" version="4.1.4" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
   <package id="ProxySocket" version="1.1.2" targetFramework="net461" />
-  <package id="Selenium.Chrome.WebDriver" version="76.0.0" targetFramework="net461" />
-  <package id="Selenium.Firefox.WebDriver" version="0.24.0" targetFramework="net461" />
+  <package id="Selenium.Chrome.WebDriver" version="79.0.0" targetFramework="net472" />
+  <package id="Selenium.Firefox.WebDriver" version="0.26.0" targetFramework="net472" />
   <package id="Selenium.Support" version="3.141.0" targetFramework="net461" />
   <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net461" />
-  <package id="Selenium.WebDriver.ChromeDriver" version="78.0.3904.10500" targetFramework="net472" />
+  <package id="Selenium.WebDriver.ChromeDriver" version="80.0.3987.10600" targetFramework="net472" />
   <package id="Selenium.WebDriver.GeckoDriver.Win64" version="0.26.0" targetFramework="net472" />
   <package id="System.IO" version="4.3.0" targetFramework="net472" />
   <package id="System.Net.Http" version="4.3.4" targetFramework="net461" />
-  <package id="System.Runtime" version="4.3.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net472" />
+  <package id="System.Runtime" version="4.3.1" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net472" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net472" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net472" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net472" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net461" />
-  <package id="System.Text.Encoding.CodePages" version="4.5.1" targetFramework="net472" />
+  <package id="System.Text.Encoding.CodePages" version="4.7.0" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/OpenBulletCLI/App.config b/OpenBulletCLI/App.config
index 3cd322c..ae677c5 100644
--- a/OpenBulletCLI/App.config
+++ b/OpenBulletCLI/App.config
@@ -8,7 +8,7 @@
         <probing privatePath="bin" />
          <dependentAssembly>
             <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+            <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
          </dependentAssembly>
       </assemblyBinding>
     </runtime>
diff --git a/OpenBulletCLI/OpenBulletCLI.csproj b/OpenBulletCLI/OpenBulletCLI.csproj
index fec5a17..3ed423d 100644
--- a/OpenBulletCLI/OpenBulletCLI.csproj
+++ b/OpenBulletCLI/OpenBulletCLI.csproj
@@ -52,11 +52,11 @@
     <ApplicationIcon>OBlogoIcon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Colorful.Console, Version=1.2.9.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Colorful.Console.1.2.9\lib\net461\Colorful.Console.dll</HintPath>
+    <Reference Include="Colorful.Console, Version=1.2.10.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Colorful.Console.1.2.10\lib\net461\Colorful.Console.dll</HintPath>
     </Reference>
-    <Reference Include="CommandLine, Version=2.6.0.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
-      <HintPath>..\packages\CommandLineParser.2.6.0\lib\net461\CommandLine.dll</HintPath>
+    <Reference Include="CommandLine, Version=2.7.82.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommandLineParser.2.7.82\lib\net461\CommandLine.dll</HintPath>
     </Reference>
     <Reference Include="Extreme.Net, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/OpenBulletCLI/packages.config b/OpenBulletCLI/packages.config
index fefcc95..fcb5092 100644
--- a/OpenBulletCLI/packages.config
+++ b/OpenBulletCLI/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Colorful.Console" version="1.2.9" targetFramework="net461" />
-  <package id="CommandLineParser" version="2.6.0" targetFramework="net472" />
+  <package id="Colorful.Console" version="1.2.10" targetFramework="net472" />
+  <package id="CommandLineParser" version="2.7.82" targetFramework="net472" />
 </packages>
\ No newline at end of file
diff --git a/PluginFramework/Attributes/Button.cs b/PluginFramework/Attributes/Button.cs
new file mode 100644
index 0000000..bdd1ca7
--- /dev/null
+++ b/PluginFramework/Attributes/Button.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PluginFramework.Attributes
+{
+    [AttributeUsage(AttributeTargets.Method)]
+    public class Button : Attribute
+    {
+        public string text;
+
+        public Button(string text)
+        {
+            this.text = text;
+        }
+    }
+}
diff --git a/PluginFramework/Attributes/Checkbox.cs b/PluginFramework/Attributes/Checkbox.cs
new file mode 100644
index 0000000..85508a9
--- /dev/null
+++ b/PluginFramework/Attributes/Checkbox.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PluginFramework.Attributes
+{
+    public class Checkbox : InputField
+    {
+        public Checkbox(string label, string tooltip = "") : base(label, tooltip) { }
+    }
+}
diff --git a/PluginFramework/Attributes/ConfigPicker.cs b/PluginFramework/Attributes/ConfigPicker.cs
new file mode 100644
index 0000000..02c2681
--- /dev/null
+++ b/PluginFramework/Attributes/ConfigPicker.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PluginFramework.Attributes
+{
+    public class ConfigPicker : InputField
+    {
+        public ConfigPicker(string label, string tooltip = "") : base(label, tooltip) { }
+    }
+}
diff --git a/PluginFramework/Attributes/Dropdown.cs b/PluginFramework/Attributes/Dropdown.cs
new file mode 100644
index 0000000..f28d959
--- /dev/null
+++ b/PluginFramework/Attributes/Dropdown.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PluginFramework.Attributes
+{
+    public class Dropdown : InputField
+    {
+        public string[] options = new string[] { };
+
+        public Dropdown(string label, string tooltip = "") : base(label, tooltip) { }
+    }
+}
diff --git a/PluginFramework/Attributes/FilePicker.cs b/PluginFramework/Attributes/FilePicker.cs
new file mode 100644
index 0000000..92c5278
--- /dev/null
+++ b/PluginFramework/Attributes/FilePicker.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PluginFramework.Attributes
+{
+    public class FilePicker : InputField
+    {
+        public string filter = "Text Files|*.txt";
+
+        public FilePicker(string label, string tooltip = "") : base(label, tooltip) { }
+    }
+}
diff --git a/PluginFramework/Attributes/InfoText.cs b/PluginFramework/Attributes/InfoText.cs
new file mode 100644
index 0000000..0422d39
--- /dev/null
+++ b/PluginFramework/Attributes/InfoText.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PluginFramework.Attributes
+{
+    public class InfoText : InputField
+    {
+        public InfoText(string label, string tooltip = "") : base(label, tooltip) { }
+    }
+}
diff --git a/PluginFramework/Attributes/InputField.cs b/PluginFramework/Attributes/InputField.cs
new file mode 100644
index 0000000..c00452d
--- /dev/null
+++ b/PluginFramework/Attributes/InputField.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PluginFramework.Attributes
+{
+    [AttributeUsage(AttributeTargets.Property)]
+    public class InputField : Attribute
+    {
+        public string label;
+        public string tooltip;
+
+        public InputField(string label, string tooltip = "")
+        {
+            this.label = label;
+            this.tooltip = tooltip;
+        }
+    }
+}
diff --git a/PluginFramework/Attributes/Numeric.cs b/PluginFramework/Attributes/Numeric.cs
new file mode 100644
index 0000000..504db5b
--- /dev/null
+++ b/PluginFramework/Attributes/Numeric.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PluginFramework.Attributes
+{
+    public class Numeric : InputField
+    {
+        public int minimum = int.MinValue;
+        public int maximum = int.MaxValue;
+
+        public Numeric(string label, string tooltip = "") : base(label, tooltip) { }
+    }
+}
diff --git a/PluginFramework/Attributes/Text.cs b/PluginFramework/Attributes/Text.cs
new file mode 100644
index 0000000..c6159e5
--- /dev/null
+++ b/PluginFramework/Attributes/Text.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PluginFramework.Attributes
+{
+    public class Text : InputField
+    {
+        public Text(string label, string tooltip = "") : base(label, tooltip) { }
+    }
+}
diff --git a/PluginFramework/Attributes/TextMulti.cs b/PluginFramework/Attributes/TextMulti.cs
new file mode 100644
index 0000000..8b76031
--- /dev/null
+++ b/PluginFramework/Attributes/TextMulti.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PluginFramework.Attributes
+{
+    public class TextMulti : InputField
+    {
+        public TextMulti(string label, string tooltip = "") : base(label, tooltip) { }
+    }
+}
diff --git a/PluginFramework/Attributes/WordlistPicker.cs b/PluginFramework/Attributes/WordlistPicker.cs
new file mode 100644
index 0000000..99e4e7c
--- /dev/null
+++ b/PluginFramework/Attributes/WordlistPicker.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PluginFramework.Attributes
+{
+    public class WordlistPicker : InputField
+    {
+        public WordlistPicker(string label, string tooltip = "") : base(label, tooltip) { }
+    }
+}
diff --git a/PluginFramework/IBlockPlugin.cs b/PluginFramework/IBlockPlugin.cs
new file mode 100644
index 0000000..195844a
--- /dev/null
+++ b/PluginFramework/IBlockPlugin.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PluginFramework
+{
+    public interface IBlockPlugin
+    {
+        string Name { get; }
+
+        string Color { get; }
+
+        bool LightForeground { get; }
+    }
+}
diff --git a/PluginFramework/IPlugin.cs b/PluginFramework/IPlugin.cs
new file mode 100644
index 0000000..6d7b616
--- /dev/null
+++ b/PluginFramework/IPlugin.cs
@@ -0,0 +1,7 @@
+namespace PluginFramework
+{
+    public interface IPlugin
+    {
+        string Name { get; }
+    }
+}
diff --git a/PluginFramework/PluginFramework.csproj b/PluginFramework/PluginFramework.csproj
new file mode 100644
index 0000000..ab5cba8
--- /dev/null
+++ b/PluginFramework/PluginFramework.csproj
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{E1DD89D0-EC1D-4849-A2B6-ADB261DFA3CE}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PluginFramework</RootNamespace>
+    <AssemblyName>PluginFramework</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Attributes\Button.cs" />
+    <Compile Include="Attributes\ConfigPicker.cs" />
+    <Compile Include="Attributes\InfoText.cs" />
+    <Compile Include="Attributes\WordlistPicker.cs" />
+    <Compile Include="Attributes\Checkbox.cs" />
+    <Compile Include="Attributes\Dropdown.cs" />
+    <Compile Include="Attributes\FilePicker.cs" />
+    <Compile Include="Attributes\InputField.cs" />
+    <Compile Include="Attributes\Numeric.cs" />
+    <Compile Include="Attributes\Text.cs" />
+    <Compile Include="Attributes\TextMulti.cs" />
+    <Compile Include="IBlockPlugin.cs" />
+    <Compile Include="IPlugin.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/PluginFramework/Properties/AssemblyInfo.cs b/PluginFramework/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..2627a9c
--- /dev/null
+++ b/PluginFramework/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Le informazioni generali relative a un assembly sono controllate dal seguente 
+// set di attributi. Modificare i valori di questi attributi per modificare le informazioni
+// associate a un assembly.
+[assembly: AssemblyTitle("PluginFramework")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PluginFramework")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Se si imposta ComVisible su false, i tipi in questo assembly non saranno visibili
+// ai componenti COM. Se è necessario accedere a un tipo in questo assembly da
+// COM, impostare su true l'attributo ComVisible per tale tipo.
+[assembly: ComVisible(false)]
+
+// Se il progetto viene esposto a COM, il GUID seguente verrà utilizzato come ID della libreria dei tipi
+[assembly: Guid("e1dd89d0-ec1d-4849-a2b6-adb261dfa3ce")]
+
+// Le informazioni sulla versione di un assembly sono costituite dai seguenti quattro valori:
+//
+//      Versione principale
+//      Versione secondaria
+//      Numero di build
+//      Revisione
+//
+// È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build
+// usando l'asterisco '*' come illustrato di seguito:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/RuriLib/Blocks/BlockBase.cs b/RuriLib/Blocks/BlockBase.cs
index e22c846..72749d6 100644
--- a/RuriLib/Blocks/BlockBase.cs
+++ b/RuriLib/Blocks/BlockBase.cs
@@ -301,7 +301,42 @@ namespace RuriLib
             data.Address = data.Driver.Url;
             data.ResponseSource = data.Driver.PageSource;
         }
-        
+
+        #region Variable Insertion
+        /// <summary>
+        /// Adds a single variable with the given value.
+        /// </summary>
+        /// <param name="data">The BotData used for variable replacement and insertion</param>
+        /// <param name="isCapture">Whether the variable should be marked for Capture</param>
+        /// <param name="value">The value of the variable</param>
+        /// <param name="variableName">The name of the variable to create</param>
+        /// <param name="prefix">The string to add at the start of the value</param>
+        /// <param name="suffix">The string to add at the end of the value</param>
+        /// <param name="urlEncode">Whether to URLencode the values before creating the variables</param>
+        /// <param name="createEmpty">Whether to create an empty (single) variable if the list of values is empty</param>
+        public static void InsertVariable(BotData data, bool isCapture, string value, string variableName,
+            string prefix = "", string suffix = "", bool urlEncode = false, bool createEmpty = true)
+        {
+            InsertVariable(data, isCapture, false, new string[] { value }, variableName, prefix, suffix, urlEncode, createEmpty);
+        }
+
+        /// <summary>
+        /// Adds a list variable with the given value.
+        /// </summary>
+        /// <param name="data">The BotData used for variable replacement and insertion</param>
+        /// <param name="isCapture">Whether the variable should be marked for Capture</param>
+        /// <param name="values">The list of values</param>
+        /// <param name="variableName">The name of the variable to create</param>
+        /// <param name="prefix">The string to add at the start of the value</param>
+        /// <param name="suffix">The string to add at the end of the value</param>
+        /// <param name="urlEncode">Whether to URLencode the values before creating the variables</param>
+        /// <param name="createEmpty">Whether to create an empty (single) variable if the list of values is empty</param>
+        public static void InsertVariable(BotData data, bool isCapture, IEnumerable<string> values, string variableName,
+            string prefix = "", string suffix = "", bool urlEncode = false, bool createEmpty = true)
+        {
+            InsertVariable(data, isCapture, true, values, variableName, prefix, suffix, urlEncode, createEmpty);
+        }
+
         /// <summary>
         /// Adds a single or list variable with the given value.
         /// </summary>
@@ -314,10 +349,11 @@ namespace RuriLib
         /// <param name="suffix">The string to add at the end of the value</param>
         /// <param name="urlEncode">Whether to URLencode the values before creating the variables</param>
         /// <param name="createEmpty">Whether to create an empty (single) variable if the list of values is empty</param>
-        public static void InsertVariables(BotData data, bool isCapture, bool recursive, List<string> values, string variableName, string prefix, string suffix, bool urlEncode, bool createEmpty)
+        internal static void InsertVariable(BotData data, bool isCapture, bool recursive, IEnumerable<string> values, string variableName, 
+            string prefix = "", string suffix = "", bool urlEncode = false, bool createEmpty = true)
         {
             var list = values.Select(v => ReplaceValues(prefix, data) + v.Trim() + ReplaceValues(suffix, data)).ToList();
-            if (urlEncode) list = list.Select(v => System.Uri.EscapeDataString(v)).ToList();
+            if (urlEncode) list = list.Select(v => Uri.EscapeDataString(v)).ToList();
 
             CVar variable = null;
             if (recursive)
@@ -349,6 +385,13 @@ namespace RuriLib
                 }
             }
 
+            // If we don't want to save empty captures, and it's a capture, and the list is either an empty string or a list made of an empty string
+            if (!data.ConfigSettings.SaveEmptyCaptures && isCapture && 
+                (list.Count == 0 || list.Count > 0 && string.IsNullOrWhiteSpace(list.First())))
+            {
+                variable = null;
+            }
+
             if (variable != null)
             {
                 data.Variables.Set(variable);
@@ -359,9 +402,10 @@ namespace RuriLib
                 data.Log(new LogEntry("Could not parse any data. The variable was not created.", Colors.White));
             }
         }
+        #endregion
 
         #region File Utilities
-        
+
 
         /// <summary>
         /// Truncates a string to fit a given size and adds ' [...]' (5 characters) at the end to display that the string would be longer.
diff --git a/RuriLib/Blocks/BlockBypassCF.cs b/RuriLib/Blocks/BlockBypassCF.cs
index b0a45fa..c95d069 100644
--- a/RuriLib/Blocks/BlockBypassCF.cs
+++ b/RuriLib/Blocks/BlockBypassCF.cs
@@ -1,14 +1,13 @@
 using RuriLib.LS;
 using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
 using System.Windows.Media;
-using System.Threading;
-using Jint;
-using Leaf.xNet;
 using System.Net;
-using Leaf.xNet.Services.Cloudflare;
-using Leaf.xNet.Services.Captcha;
+using CloudflareSolverRe;
+using CloudflareSolverRe.Types;
+using CloudflareSolverRe.CaptchaProviders;
+using System.Net.Http;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace RuriLib
 {
@@ -21,7 +20,7 @@ namespace RuriLib
         /// <summary>The URL of the Cloudflare-protected website.</summary>
         public string Url { get { return url; } set { url = value; OnPropertyChanged(); } }
 
-        private string userAgent = "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko";
+        private string userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36";
         /// <summary>The User-Agent header to use when solving the challenge.</summary>
         public string UserAgent { get { return userAgent; } set { userAgent = value; OnPropertyChanged(); } }
 
@@ -58,12 +57,12 @@ namespace RuriLib
 
             Url = LineParser.ParseLiteral(ref input, "URL");
 
-            if (input != string.Empty && LineParser.Lookahead(ref input) == TokenType.Literal)
+            if (input != "" && LineParser.Lookahead(ref input) == TokenType.Literal)
             {
                 UserAgent = LineParser.ParseLiteral(ref input, "UA");
             }
 
-            while (input != string.Empty)
+            while (input != "")
             {
                 LineParser.SetBool(ref input, this);
             }
@@ -93,88 +92,137 @@ namespace RuriLib
             // If the clearance info is already set and we're not getting it fresh each time, skip
             if (data.UseProxies)
             {
-                if (data.Proxy.Clearance != string.Empty && !data.GlobalSettings.Proxies.AlwaysGetClearance)
+                if (data.Proxy.Clearance != "" && !data.GlobalSettings.Proxies.AlwaysGetClearance)
                 {
                     data.Log(new LogEntry("Skipping CF Bypass because there is already a valid cookie", Colors.White));
                     data.Cookies["cf_clearance"] = data.Proxy.Clearance;
+                    data.Cookies["__cfduid"] = data.Proxy.Cfduid;
                     return;
                 }
             }
 
             var localUrl = ReplaceValues(url, data);
             var uri = new Uri(localUrl);
-            
+
             var timeout = data.GlobalSettings.General.RequestTimeout * 1000;
 
-            var request = new HttpRequest();
-            request.IgnoreProtocolErrors = true;
-            request.ConnectTimeout = timeout;
-            request.ReadWriteTimeout = timeout;
-            request.Cookies = new CookieStorage();
-            foreach (var cookie in data.Cookies)
-                request.Cookies.Add(new Cookie(cookie.Key, cookie.Value, "/", uri.Host));
+            // Initialize the captcha provider
+            // TODO: Add more providers by implementing the ICaptchaProvider interface on the missing ones
+            ICaptchaProvider provider = null;
+            switch (data.GlobalSettings.Captchas.CurrentService)
+            {
+                case CaptchaServices.ServiceType.AntiCaptcha:
+                    provider = new AntiCaptchaProvider(data.GlobalSettings.Captchas.AntiCapToken);
+                    break;
 
+                case CaptchaServices.ServiceType.TwoCaptcha:
+                    provider = new TwoCaptchaProvider(data.GlobalSettings.Captchas.TwoCapToken);
+                    break;
+            }
+
+            // Initialize the Cloudflare Solver
+            CloudflareSolver cf = new CloudflareSolver(provider, ReplaceValues(UserAgent, data))
+            {
+                ClearanceDelay = 3000,
+                MaxCaptchaTries = 1,
+                MaxTries = 3
+            };
+
+            // Create the cookie container
+            CookieContainer cookies = new CookieContainer();
+            foreach (var cookie in data.Cookies)
+            {
+                cookies.Add(new Cookie(cookie.Key, cookie.Value, "/", uri.Host));
+            }
+
+            // Initialize the http handler
+            HttpClientHandler handler = new HttpClientHandler
+            {
+                AllowAutoRedirect = true,
+                CookieContainer = cookies,
+                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+            };
+
+            // Assign the proxy to the inner handler if necessary
             if (data.UseProxies)
             {
-                switch (data.Proxy.Type)
+                if (data.Proxy.Type != Extreme.Net.ProxyType.Http)
                 {
-                    case Extreme.Net.ProxyType.Http:
-                        request.Proxy = HttpProxyClient.Parse(data.Proxy.Proxy);
-                        break;
-
-                    case Extreme.Net.ProxyType.Socks4:
-                        request.Proxy = Socks4ProxyClient.Parse(data.Proxy.Proxy);
-                        break;
-
-                    case Extreme.Net.ProxyType.Socks4a:
-                        request.Proxy = Socks4AProxyClient.Parse(data.Proxy.Proxy);
-                        break;
-
-                    case Extreme.Net.ProxyType.Socks5:
-                        request.Proxy = Socks5ProxyClient.Parse(data.Proxy.Proxy);
-                        break;
-
-                    case Extreme.Net.ProxyType.Chain:
-                        throw new Exception("The Chain Proxy Type is not supported in Leaf.xNet (used for CF Bypass).");
+                    throw new Exception($"The proxy type {data.Proxy.Type} is not supported by this block yet");
                 }
 
-                request.Proxy.ReadWriteTimeout = timeout;
-                request.Proxy.ConnectTimeout = timeout;
-                request.Proxy.Username = data.Proxy.Username;
-                request.Proxy.Password = data.Proxy.Password;
+                handler.Proxy = new WebProxy(data.Proxy.Proxy, false);
+                handler.UseProxy = true;
+
+                if (!string.IsNullOrEmpty(data.Proxy.Username))
+                {
+                    handler.DefaultProxyCredentials = new NetworkCredential(data.Proxy.Username, data.Proxy.Password);
+                }
             }
 
-            request.UserAgent = ReplaceValues(userAgent, data);
+            // Initialize the http client
+            HttpClient http = new HttpClient(handler);
+            http.Timeout = TimeSpan.FromMinutes(timeout);
+            http.DefaultRequestHeaders.Add("User-Agent", ReplaceValues(UserAgent, data));
 
-            var cs = data.GlobalSettings.Captchas;
-            if (cs.TwoCapToken != string.Empty)
+            var result = cf.Solve(http, handler, uri, ReplaceValues(UserAgent, data)).Result;
+
+            if (result.Success)
             {
-                request.CaptchaSolver = new TwoCaptchaSolver() { ApiKey = cs.TwoCapToken };
+                data.Log(new LogEntry($"[Success] Protection bypassed: {result.DetectResult.Protection}", Colors.GreenYellow));
+            }
+            else if (result.DetectResult.Protection == CloudflareProtection.Unknown)
+            {
+                data.Log(new LogEntry($"Unknown protection, skipping the bypass!", Colors.Tomato));
+            }
+            else
+            {
+                throw new Exception($"CF Bypass Failed: {result.FailReason}");
             }
 
-            var response = request.GetThroughCloudflare(new Uri(localUrl));
-            var responseString = response.ToString();
-
-            // Save the cookies
-            var ck = response.Cookies.GetCookies(localUrl);
-
-            var clearance = "";
-            var cfduid = "";
-
+            // Now that we got the cookies, proceed with the normal request
+            HttpResponseMessage response = null;
             try
             {
-                clearance = ck["cf_clearance"].Value;
-                cfduid = ck["__cfduid"].Value;
+                response = http.GetAsync(uri).Result;
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(ex.Message);
+            }
+            finally
+            {
+                handler.Dispose();
+                http.Dispose();
             }
-            catch { }
 
+            var responseString = response.Content.ReadAsStringAsync().Result;
+
+            // Save the cloudflare cookies
+            var clearance = "";
+            var cfduid = "";
+            foreach (Cookie cookie in cookies.GetCookies(uri))
+            {
+                switch (cookie.Name)
+                {
+                    case "cf_clearance":
+                        clearance = cookie.Value;
+                        break;
+
+                    case "__cfduid":
+                        cfduid = cookie.Value;
+                        break;
+                }
+            }
+
+            // Save the cookies in the proxy
             if (data.UseProxies)
             {
                 data.Proxy.Clearance = clearance;
                 data.Proxy.Cfduid = cfduid;
             }
 
-            if (clearance != string.Empty)
+            if (clearance != "")
             {
                 data.Log(new LogEntry("Got Cloudflare clearance!", Colors.GreenYellow));
                 data.Log(new LogEntry(clearance + Environment.NewLine + cfduid + Environment.NewLine, Colors.White));
@@ -186,15 +234,16 @@ namespace RuriLib
 
             // Get headers
             if (PrintResponseInfo) data.Log(new LogEntry("Received headers:", Colors.DeepPink));
-            var receivedHeaders = response.EnumerateHeaders();
             data.ResponseHeaders.Clear();
-            while (receivedHeaders.MoveNext())
+            foreach (var header in response.Headers)
             {
-                var header = receivedHeaders.Current;
-                data.ResponseHeaders.Add(header.Key, header.Value);
-                if (PrintResponseInfo) data.Log(new LogEntry($"{header.Key}: {header.Value}", Colors.LightPink));
+                var h = new KeyValuePair<string, string>(header.Key, header.Value.First());
+                data.ResponseHeaders.Add(h.Key, h.Value);
+                if (PrintResponseInfo) data.Log(new LogEntry($"{h.Key}: {h.Value}", Colors.LightPink));
             }
-            if (!response.ContainsHeader(HttpHeader.ContentLength))
+
+            // Add the Content-Length header if it was not sent by the server
+            if (!data.ResponseHeaders.ContainsKey("Content-Length"))
             {
                 if (data.ResponseHeaders.ContainsKey("Content-Encoding") && data.ResponseHeaders["Content-Encoding"].Contains("gzip"))
                 {
@@ -210,13 +259,13 @@ namespace RuriLib
 
             // Get cookies
             if (PrintResponseInfo) data.Log(new LogEntry("Received cookies:", Colors.Goldenrod));
-            foreach (Cookie cookie in response.Cookies.GetCookies(localUrl))
+            foreach (Cookie cookie in cookies.GetCookies(uri))
             {
-                if (data.Cookies.ContainsKey(cookie.Name)) data.Cookies[cookie.Name] = cookie.Value;
-                else data.Cookies.Add(cookie.Name, cookie.Value);
+                data.Cookies[cookie.Name] = cookie.Value;
                 if (PrintResponseInfo) data.Log(new LogEntry($"{cookie.Name}: {cookie.Value}", Colors.LightGoldenrodYellow));
             }
 
+            // Print source
             data.ResponseSource = responseString;
             if (PrintResponseInfo)
             {
@@ -224,7 +273,8 @@ namespace RuriLib
                 data.Log(new LogEntry(data.ResponseSource, Colors.GreenYellow));
             }
 
-            if (ErrorOn302 && data.ResponseCode.Contains("302"))
+            // Error on 302 status
+            if (ErrorOn302 && response.StatusCode == HttpStatusCode.Redirect)
             {
                 data.Status = BotStatus.ERROR;
             }
diff --git a/RuriLib/Blocks/BlockFunction.cs b/RuriLib/Blocks/BlockFunction.cs
index 7a3e26b..cc55a73 100644
--- a/RuriLib/Blocks/BlockFunction.cs
+++ b/RuriLib/Blocks/BlockFunction.cs
@@ -1,7 +1,7 @@
-using Extreme.Net;
-using RuriLib.Functions.Crypto;
+using RuriLib.Functions.Crypto;
 using RuriLib.Functions.Formats;
 using RuriLib.Functions.Time;
+using RuriLib.Functions.UserAgent;
 using RuriLib.LS;
 using System;
 using System.Collections.Generic;
@@ -114,8 +114,8 @@ namespace RuriLib
             /// <summary>Encrypts a string with RSA.</summary>
             RSAEncrypt,
 
-            /// <summary>Decrypts a string with RSA.</summary>
-            RSADecrypt,
+            // <summary>Decrypts a string with RSA.</summary>
+            // RSADecrypt,
 
             /// <summary>Waits a given amount of milliseconds.</summary>
             Delay,
@@ -210,13 +210,17 @@ namespace RuriLib
         public string RegexMatch { get { return regexMatch; } set { regexMatch = value; OnPropertyChanged(); } }
 
         // -- Random Number
-        private int randomMin = 0;
-        /// <summary>The minimum random number that can be generated.</summary>
-        public int RandomMin { get { return randomMin; } set { randomMin = value; OnPropertyChanged(); } }
+        private string randomMin = "0";
+        /// <summary>The minimum random number that can be generated (inclusive).</summary>
+        public string RandomMin { get { return randomMin; } set { randomMin = value; OnPropertyChanged(); } }
 
-        private int randomMax = 0;
-        /// <summary>The maximum random number that can be generated.</summary>
-        public int RandomMax { get { return randomMax; } set { randomMax = value; OnPropertyChanged(); } }
+        private string randomMax = "0";
+        /// <summary>The maximum random number that can be generated (exclusive).</summary>
+        public string RandomMax { get { return randomMax; } set { randomMax = value; OnPropertyChanged(); } }
+
+        private bool randomZeroPad = false;
+        /// <summary>Whether to pad with zeros on the left to match the length of the maximum provided.</summary>
+        public bool RandomZeroPad { get { return randomZeroPad; } set { randomZeroPad = value; OnPropertyChanged(); } }
 
         // -- CountOccurrences
         private string stringToFind = "";
@@ -224,17 +228,17 @@ namespace RuriLib
         public string StringToFind { get { return stringToFind; } set { stringToFind = value; OnPropertyChanged(); } }
 
         // -- RSA
-        private string rsaKey = "";
-        /// <summary>The RSA private key as a base64 string.</summary>
-        public string RsaKey { get { return rsaKey; } set { rsaKey = value; OnPropertyChanged(); } }
-
-        private string rsaMod = "";
+        private string rsaN = "";
         /// <summary>The modulus of the RSA public key as a base64 string.</summary>
-        public string RsaMod { get { return rsaMod; } set { rsaMod = value; OnPropertyChanged(); } }
+        public string RsaN { get { return rsaN; } set { rsaN = value; OnPropertyChanged(); } }
 
-        private string rsaExp = "";
+        private string rsaE = "";
         /// <summary>The exponent of the RSA public key as a base64 string.</summary>
-        public string RsaExp { get { return rsaExp; } set { rsaExp = value; OnPropertyChanged(); } }
+        public string RsaE { get { return rsaE; } set { rsaE = value; OnPropertyChanged(); } }
+
+        private string rsaD = "";
+        /// <summary>The exponent of the RSA private key as a base64 string.</summary>
+        public string RsaD { get { return rsaD; } set { rsaD = value; OnPropertyChanged(); } }
 
         private bool rsaOAEP = true;
         /// <summary>Whether to use OAEP padding instead of PKCS v1.5.</summary>
@@ -254,6 +258,15 @@ namespace RuriLib
         /// <summary>The length of the wanted substring.</summary>
         public string SubstringLength { get { return substringLength; } set { substringLength = value; OnPropertyChanged(); } }
 
+        // -- User Agent
+        private bool userAgentSpecifyBrowser = false;
+        /// <summary>Whether to only limit the UA generation to a certain browser.</summary>
+        public bool UserAgentSpecifyBrowser { get { return userAgentSpecifyBrowser; } set { userAgentSpecifyBrowser = value; OnPropertyChanged(); } }
+
+        private UserAgent.Browser userAgentBrowser = UserAgent.Browser.Chrome;
+        /// <summary>The browser for which the User Agent should be generated.</summary>
+        public UserAgent.Browser UserAgentBrowser { get { return userAgentBrowser; } set { userAgentBrowser = value; OnPropertyChanged(); } }
+
         // -- AES
         private string aesKey = "";
         /// <summary>The keys used for AES encryption and decryption as a base64 string.</summary>
@@ -374,8 +387,20 @@ namespace RuriLib
                     break;
 
                 case Function.RandomNum:
-                    RandomMin = LineParser.ParseInt(ref input, "Minimum");
-                    RandomMax = LineParser.ParseInt(ref input, "Maximum");
+                    if (LineParser.Lookahead(ref input) == TokenType.Literal)
+                    {
+                        RandomMin = LineParser.ParseLiteral(ref input, "Minimum");
+                        RandomMax = LineParser.ParseLiteral(ref input, "Maximum");
+                    }
+                    // Support for old integer definition of Min and Max
+                    else
+                    {
+                        RandomMin = LineParser.ParseInt(ref input, "Minimum").ToString();
+                        RandomMax = LineParser.ParseInt(ref input, "Maximum").ToString();
+                    }
+                    
+                    if (LineParser.Lookahead(ref input) == TokenType.Boolean)
+                        LineParser.SetBool(ref input, this);
                     break;
 
                 case Function.CountOccurrences:
@@ -392,14 +417,30 @@ namespace RuriLib
                     break;
 
                 case Function.RSAEncrypt:
-                case Function.RSADecrypt:
-                    RsaKey = LineParser.ParseLiteral(ref input, "Private Key");
-                    RsaMod = LineParser.ParseLiteral(ref input, "Public Key Modulus");
-                    RsaExp = LineParser.ParseLiteral(ref input, "Public Key Exponent");
+                    RsaN = LineParser.ParseLiteral(ref input, "Public Key Modulus");
+                    RsaE = LineParser.ParseLiteral(ref input, "Public Key Exponent");
                     if (LineParser.Lookahead(ref input) == TokenType.Boolean)
                         LineParser.SetBool(ref input, this);
                     break;
 
+                    /*
+                case Function.RSADecrypt:
+                    RsaN = LineParser.ParseLiteral(ref input, "Public Key Modulus");
+                    RsaD = LineParser.ParseLiteral(ref input, "Private Key Exponent");
+                    if (LineParser.Lookahead(ref input) == TokenType.Boolean)
+                        LineParser.SetBool(ref input, this);
+                    break;
+                    */
+
+                case Function.GetRandomUA:
+                    if (LineParser.ParseToken(ref input, TokenType.Parameter, false, false) == "BROWSER")
+                    {
+                        LineParser.EnsureIdentifier(ref input, "BROWSER");
+                        UserAgentSpecifyBrowser = true;
+                        UserAgentBrowser = LineParser.ParseEnum(ref input, "BROWSER", typeof(UserAgent.Browser));
+                    };
+                    break;
+
                 case Function.AESDecrypt:
                 case Function.AESEncrypt:
                     AesKey = LineParser.ParseLiteral(ref input, "Key");
@@ -501,8 +542,9 @@ namespace RuriLib
 
                 case Function.RandomNum:
                     writer
-                        .Integer(RandomMin)
-                        .Integer(RandomMax);
+                        .Literal(RandomMin)
+                        .Literal(RandomMax)
+                        .Boolean(RandomZeroPad, "RandomZeroPad");
                     break;
 
                 case Function.CountOccurrences:
@@ -522,13 +564,29 @@ namespace RuriLib
                     break;
 
                 case Function.RSAEncrypt:
+                    writer
+                        .Literal(RsaN)
+                        .Literal(RsaE)
+                        .Boolean(RsaOAEP, "RsaOAEP");
+                    break;
+
+                    /*
                 case Function.RSADecrypt:
                     writer
-                        .Literal(RsaKey)
-                        .Literal(RsaMod)
-                        .Literal(RsaExp)
+                        .Literal(RsaN)
+                        .Literal(RsaD)
                         .Boolean(RsaOAEP, "RsaOAEP");
                     break;
+                    */
+
+                case Function.GetRandomUA:
+                    if (UserAgentSpecifyBrowser)
+                    {
+                        writer
+                            .Token("BROWSER")
+                            .Token(UserAgentBrowser);
+                    }
+                    break;
 
                 case Function.AESDecrypt:
                 case Function.AESEncrypt:
@@ -672,25 +730,22 @@ namespace RuriLib
                         break;
 
                     case Function.RandomNum:
-                        lock (data.RandomLocker)
-                        {
-                            outputString = data.Random.Next(randomMin, randomMax).ToString();
-                        }
+                        var min = int.Parse(ReplaceValues(randomMin, data));
+                        var max = int.Parse(ReplaceValues(randomMax, data));
+                        var randomNumString = data.random.Next(min, max).ToString();
+                        outputString = randomZeroPad ? randomNumString.PadLeft(max.ToString().Length, '0') : randomNumString;
                         break;
 
                     case Function.RandomString:
                         outputString = localInputString;
-                        lock (data.RandomLocker)
-                        {
-                            outputString = Regex.Replace(outputString, @"\?l", m => _lowercase[data.Random.Next(_lowercase.Length)].ToString());
-                            outputString = Regex.Replace(outputString, @"\?u", m => _uppercase[data.Random.Next(_uppercase.Length)].ToString());
-                            outputString = Regex.Replace(outputString, @"\?d", m => _digits[data.Random.Next(_digits.Length)].ToString());
-                            outputString = Regex.Replace(outputString, @"\?s", m => _symbols[data.Random.Next(_symbols.Length)].ToString());
-                            outputString = Regex.Replace(outputString, @"\?h", m => _hex[data.Random.Next(_hex.Length)].ToString());
-                            outputString = Regex.Replace(outputString, @"\?a", m => _allChars[data.Random.Next(_allChars.Length)].ToString());
-                            outputString = Regex.Replace(outputString, @"\?m", m => _udChars[data.Random.Next(_udChars.Length)].ToString());
-                            outputString = Regex.Replace(outputString, @"\?i", m => _ludChars[data.Random.Next(_ludChars.Length)].ToString());
-                        }
+                        outputString = Regex.Replace(outputString, @"\?l", m => _lowercase[data.random.Next(_lowercase.Length)].ToString());
+                        outputString = Regex.Replace(outputString, @"\?u", m => _uppercase[data.random.Next(_uppercase.Length)].ToString());
+                        outputString = Regex.Replace(outputString, @"\?d", m => _digits[data.random.Next(_digits.Length)].ToString());
+                        outputString = Regex.Replace(outputString, @"\?s", m => _symbols[data.random.Next(_symbols.Length)].ToString());
+                        outputString = Regex.Replace(outputString, @"\?h", m => _hex[data.random.Next(_hex.Length)].ToString());
+                        outputString = Regex.Replace(outputString, @"\?a", m => _allChars[data.random.Next(_allChars.Length)].ToString());
+                        outputString = Regex.Replace(outputString, @"\?m", m => _udChars[data.random.Next(_udChars.Length)].ToString());
+                        outputString = Regex.Replace(outputString, @"\?i", m => _ludChars[data.random.Next(_ludChars.Length)].ToString());
                         break;
 
                     case Function.Ceil:
@@ -720,22 +775,22 @@ namespace RuriLib
                     case Function.RSAEncrypt:
                         outputString = Crypto.RSAEncrypt(
                             localInputString,
-                            ReplaceValues(RsaKey, data),
-                            ReplaceValues(RsaMod, data),
-                            ReplaceValues(RsaExp, data),
+                            ReplaceValues(RsaN, data),
+                            ReplaceValues(RsaE, data),
                             RsaOAEP
                             );
                         break;
 
+                        /*
                     case Function.RSADecrypt:
                         outputString = Crypto.RSADecrypt(
                             localInputString,
-                            ReplaceValues(RsaKey, data),
-                            ReplaceValues(RsaMod, data),
-                            ReplaceValues(RsaExp, data),
+                            ReplaceValues(RsaN, data),
+                            ReplaceValues(RsaD, data),
                             RsaOAEP
                             );
                         break;
+                        */
 
                     case Function.Delay:
                         try { Thread.Sleep(int.Parse(localInputString)); } catch { }
@@ -760,9 +815,13 @@ namespace RuriLib
                         break;
 
                     case Function.GetRandomUA:
-                        lock (data.RandomLocker)
+                        if (UserAgentSpecifyBrowser)
                         {
-                            outputString = RandomUserAgent(data.Random);
+                            outputString = UserAgent.ForBrowser(UserAgentBrowser);
+                        }
+                        else
+                        {
+                            outputString = UserAgent.Random(data.random);
                         }
                         break;
 
@@ -786,7 +845,7 @@ namespace RuriLib
             }
 
             var isList = outputs.Count > 1 || InputString.Contains("[*]") || InputString.Contains("(*)") || InputString.Contains("{*}");
-            InsertVariables(data, isCapture, isList, outputs, variableName, "", "", false, true);
+            InsertVariable(data, isCapture, isList, outputs, variableName, "", "", false, true);
         }
 
         /// <summary>
@@ -912,41 +971,6 @@ namespace RuriLib
         }
         #endregion
 
-        #region RandomUA
-
-        // All credits for this method goes to the Leaf.xNet fork of Extreme.NET
-        // https://github.com/csharp-leaf/Leaf.xNet
-
-        /// <summary>
-        /// Gets a random User-Agent header.
-        /// </summary>
-        /// <param name="rand">A random number generator</param>
-        /// <returns>A randomly generated User-Agent header</returns>
-        public static string RandomUserAgent(Random rand)
-        {
-            int random = rand.Next(99) + 1;
-
-            // Chrome = 70%
-            if (random >= 1 && random <= 70)
-                return Http.ChromeUserAgent();
-
-            // Firefox = 15%
-            if (random > 70 && random <= 85)
-                return Http.FirefoxUserAgent();
-
-            // IE = 6%
-            if (random > 85 && random <= 91)
-                return Http.IEUserAgent();
-
-            // Opera 12 = 5%
-            if (random > 91 && random <= 96)
-                return Http.OperaUserAgent();
-
-            // Opera mini = 4%
-            return Http.OperaMiniUserAgent();
-        }
-        #endregion
-
         #region Others
         /// <summary>
         /// Splits a string in chunks of a given size.
diff --git a/RuriLib/Blocks/BlockParse.cs b/RuriLib/Blocks/BlockParse.cs
index 4ab52b8..6e376d6 100644
--- a/RuriLib/Blocks/BlockParse.cs
+++ b/RuriLib/Blocks/BlockParse.cs
@@ -303,7 +303,7 @@ namespace RuriLib
                     break;
             }
 
-            InsertVariables(data, isCapture, recursive, list, variableName, prefix, suffix, encodeOutput, createEmpty);
+            InsertVariable(data, isCapture, recursive, list, variableName, prefix, suffix, encodeOutput, createEmpty);
         }
     }
 }
diff --git a/RuriLib/Blocks/BlockRequest.cs b/RuriLib/Blocks/BlockRequest.cs
index c9e5e8e..a58100b 100644
--- a/RuriLib/Blocks/BlockRequest.cs
+++ b/RuriLib/Blocks/BlockRequest.cs
@@ -89,7 +89,7 @@ namespace RuriLib
 
         /// <summary>The custom headers that are sent in the HTTP request.</summary>
         public Dictionary<string, string> CustomHeaders { get; set; } = new Dictionary<string, string>() {
-            { "User-Agent", "Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko" },
+            { "User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.169 Safari/537.36" },
             { "Pragma", "no-cache" },
             { "Accept", "*/*" }
         };
@@ -285,7 +285,7 @@ namespace RuriLib
                     break;
 
                 case RequestType.Standard:
-                    if (Request.CanContainBody(method))
+                    if (HttpRequest.CanContainRequestBody(method))
                     {
                         writer
                             .Token("CONTENT")
@@ -367,7 +367,7 @@ namespace RuriLib
             switch (RequestType)
             {
                 case RequestType.Standard:
-                    request.SetStandardContent(ReplaceValues(PostData, data), ReplaceValues(ContentType, data), Method, EncodeContent, data.LogBuffer);
+                    request.SetStandardContent(ReplaceValues(PostData, data), ReplaceValues(ContentType, data), Method, EncodeContent, GetLogBuffer(data));
                     break;
 
                 case RequestType.BasicAuth:
@@ -383,7 +383,7 @@ namespace RuriLib
                             ContentType = ReplaceValues(m.Value, data),
                             Type = m.Type
                         });
-                    request.SetMultipartContent(contents, ReplaceValues(MultipartBoundary, data), data.LogBuffer);
+                    request.SetMultipartContent(contents, ReplaceValues(MultipartBoundary, data), GetLogBuffer(data));
                     break;
             }
 
@@ -398,7 +398,7 @@ namespace RuriLib
             var headers = CustomHeaders.Select( h =>
                     new KeyValuePair<string, string> (ReplaceValues(h.Key, data), ReplaceValues(h.Value, data))
                 ).ToDictionary(h => h.Key, h => h.Value);
-            request.SetHeaders(headers, AcceptEncoding, data.LogBuffer);
+            request.SetHeaders(headers, AcceptEncoding, GetLogBuffer(data));
 
             // Set cookies
             data.Log(new LogEntry("Sent Cookies:", Colors.MediumTurquoise));
@@ -406,19 +406,19 @@ namespace RuriLib
             foreach (var cookie in CustomCookies) // Add new user-defined custom cookies to the bot's cookie jar
                 data.Cookies[ReplaceValues(cookie.Key, data)] = ReplaceValues(cookie.Value, data);
 
-            request.SetCookies(data.Cookies, data.LogBuffer);
+            request.SetCookies(data.Cookies, GetLogBuffer(data));
 
             // End the request part
             data.LogNewLine();
 
             // Perform the request
-            (data.Address, data.ResponseCode, data.ResponseHeaders, data.Cookies) = request.Perform(localUrl, Method, data.ConfigSettings.IgnoreResponseErrors, data.LogBuffer);
+            (data.Address, data.ResponseCode, data.ResponseHeaders, data.Cookies) = request.Perform(localUrl, Method, data.ConfigSettings.IgnoreResponseErrors, GetLogBuffer(data));
 
             // Save the response content
             switch (ResponseType)
             {
                 case ResponseType.String:
-                    data.ResponseSource = request.SaveString(ReadResponseSource, data.ResponseHeaders, data.LogBuffer);
+                    data.ResponseSource = request.SaveString(ReadResponseSource, data.ResponseHeaders, GetLogBuffer(data));
                     break;
 
                 case ResponseType.File:
@@ -429,7 +429,7 @@ namespace RuriLib
                     }
                     else
                     {
-                        request.SaveFile(ReplaceValues(DownloadPath, data), data.LogBuffer);
+                        request.SaveFile(ReplaceValues(DownloadPath, data), GetLogBuffer(data));
                     }
                     break;
 
@@ -541,5 +541,7 @@ namespace RuriLib
         }
 
         #endregion
+
+        private List<LogEntry> GetLogBuffer(BotData data) => data.GlobalSettings.General.EnableBotLog || data.IsDebug ? data.LogBuffer : null;
     }
 }
diff --git a/RuriLib/Blocks/BlockTCP.cs b/RuriLib/Blocks/BlockTCP.cs
index 237ad80..59e5e09 100644
--- a/RuriLib/Blocks/BlockTCP.cs
+++ b/RuriLib/Blocks/BlockTCP.cs
@@ -171,9 +171,9 @@ namespace RuriLib
         public override void Process(BotData data)
         {
             // Get easy handles
-            var tcp = data.TCPClient;
-            var net = data.NETStream;
-            var ssl = data.SSLStream;
+            var tcp = data.GetCustomObject("TCPClient") as TcpClient;
+            var net = data.GetCustomObject("NETStream") as NetworkStream;
+            var ssl = data.GetCustomObject("SSLStream") as SslStream;
             byte[] buffer = new byte[2048];
             int bytes = -1;
             string response = "";
@@ -189,7 +189,6 @@ namespace RuriLib
                     tcp = new TcpClient();
                     tcp.Connect(h, p);
 
-
                     if (tcp.Connected)
                     {
                         net = tcp.GetStream();
@@ -211,10 +210,10 @@ namespace RuriLib
                         }
 
                         // Save the TCP client and the streams
-                        data.TCPClient = tcp;
-                        data.NETStream = net;
-                        data.SSLStream = ssl;
-                        data.TCPSSL = UseSSL;
+                        data.CustomObjects["TCPClient"] = tcp;
+                        data.CustomObjects["NETStream"] = net;
+                        data.CustomObjects["SSLStream"] = ssl;
+                        data.CustomObjects["TCPSSL"] = UseSSL;
 
                         data.Log(new LogEntry($"Succesfully connected to host {h} on port {p}. The server says:", Colors.Green));
                         data.Log(new LogEntry(response, Colors.GreenYellow));
@@ -304,7 +303,8 @@ namespace RuriLib
                     }
                     data.Log(new LogEntry("> " + msg, Colors.White));
 
-                    if (data.TCPSSL)
+                    var TCPSSL = data.GetCustomObject("TCPSSL") as bool?;
+                    if (TCPSSL.HasValue && TCPSSL.Value)
                     {
                         ssl.Write(b);
                         bytes = ssl.Read(buffer, 0, buffer.Length);
diff --git a/RuriLib/Blocks/BlockUtility.cs b/RuriLib/Blocks/BlockUtility.cs
index 1084012..0194f5d 100644
--- a/RuriLib/Blocks/BlockUtility.cs
+++ b/RuriLib/Blocks/BlockUtility.cs
@@ -1,4 +1,5 @@
-using RuriLib.Functions.Conversions;
+using RuriLib.Functions.Conditions;
+using RuriLib.Functions.Conversions;
 using RuriLib.LS;
 using RuriLib.Models;
 using RuriLib.ViewModels;
@@ -68,14 +69,20 @@ namespace RuriLib
         /// <summary>Adds an element to a list variable.</summary>
         Add,
 
-        /// <summary>Removes an element from a list variable.</summary>
+        /// <summary>Removes an element from a list variable given its index.</summary>
         Remove,
 
+        /// <summary>Removes one ore more elements from a list variable given their value.</summary>
+        RemoveValues,
+
         /// <summary>Removes duplicate elements from a list variable, keeping only the first one.</summary>
         RemoveDuplicates,
 
         /// <summary>Picks a random element from a list variable.</summary>
-        Random
+        Random,
+
+        /// <summary>Randomizes the order of elements in a list.</summary>
+        Shuffle
     }
 
     /// <summary>
@@ -157,6 +164,14 @@ namespace RuriLib
         private string listIndex = "-1"; // Add (-1 = end, 0 = start)
         /// <summary>The list index where an item can be added/removed. -1 = end, 0 = start.</summary>
         public string ListIndex { get { return listIndex; } set { listIndex = value; OnPropertyChanged(); } }
+
+        private Comparer listElementComparer = Comparer.EqualTo;
+        /// <summary>The comparer to use when removing or modifying one or more elements of a list.</summary>
+        public Comparer ListElementComparer { get { return listElementComparer; } set { listElementComparer = value; OnPropertyChanged(); } }
+
+        private string listComparisonTerm = "";
+        /// <summary>The string that elements in a list should be compared to.</summary>
+        public string ListComparisonTerm { get { return listComparisonTerm; } set { listComparisonTerm = value; OnPropertyChanged(); } }
         #endregion
 
         // Variables
@@ -246,6 +261,11 @@ namespace RuriLib
                         case ListAction.Remove:
                             ListIndex = LineParser.ParseLiteral(ref input, "Index");
                             break;
+
+                        case ListAction.RemoveValues:
+                            ListElementComparer = LineParser.ParseEnum(ref input, "Comparer", typeof(Comparer));
+                            ListComparisonTerm = LineParser.ParseLiteral(ref input, "Comparison Term");
+                            break;
                     }
                     break;
 
@@ -349,6 +369,12 @@ namespace RuriLib
                             writer
                                 .Literal(ListIndex);
                             break;
+
+                        case ListAction.RemoveValues:
+                            writer
+                                .Token(ListElementComparer)
+                                .Literal(ListComparisonTerm);
+                            break;
                     }
                     break;
 
@@ -460,6 +486,7 @@ namespace RuriLib
                                 break;
 
                             case ListAction.Add:
+                                // TODO: Refactor this
                                 variable = data.Variables.Get(listName, CVar.VarType.List);
                                 if (variable == null) variable = data.GlobalVariables.Get(listName, CVar.VarType.List);
                                 if (variable == null) break;
@@ -469,6 +496,7 @@ namespace RuriLib
                                 break;
 
                             case ListAction.Remove:
+                                // TODO: Refactor this
                                 variable = data.Variables.Get(listName, CVar.VarType.List);
                                 if (variable == null) variable = data.GlobalVariables.Get(listName, CVar.VarType.List);
                                 if (variable == null) break;
@@ -477,22 +505,34 @@ namespace RuriLib
                                 variable.Value.RemoveAt(index);
                                 break;
 
+                            case ListAction.RemoveValues:
+                                data.Variables.Set(new CVar(variableName, list.Where(l => !Condition.Verify(new KeycheckCondition
+                                {
+                                    Left = ReplaceValues(l, data),
+                                    Comparer = ListElementComparer,
+                                    Right = ListComparisonTerm
+                                })).ToList(), isCapture));
+                                break;
+
                             case ListAction.RemoveDuplicates:
                                 data.Variables.Set(new CVar(variableName, list.Distinct().ToList(), isCapture));
                                 break;
 
                             case ListAction.Random:
-                                lock (data.RandomLocker)
-                                {
-                                    data.Variables.Set(new CVar(variableName, list[data.Random.Next(list.Count)], isCapture));
-                                }
+                                data.Variables.Set(new CVar(variableName, list[data.random.Next(list.Count)], isCapture));
+                                break;
+
+                            case ListAction.Shuffle:
+                                // This makes a copy of the original list
+                                var listCopy = list.ToArray().ToList();
+                                listCopy.Shuffle(data.random);
+                                data.Variables.Set(new CVar(variableName, listCopy, isCapture));
                                 break;
 
                             default:
                                 break;
                         }
-
-                        data.Log(new LogEntry(string.Format("Executed action {0} on list {1}", listAction, listName), Colors.White));
+                        data.Log(new LogEntry($"Executed action {listAction} on file {listName}", Colors.White));
                         break;
 
                     case UtilityGroup.Variable:
@@ -504,13 +544,13 @@ namespace RuriLib
                                 data.Variables.Set(new CVar(variableName, single.Split(new string[] { ReplaceValues(splitSeparator, data) }, StringSplitOptions.None).ToList(), isCapture));
                                 break;
                         }
-                        data.Log(new LogEntry(string.Format("Executed action {0} on variable {1}", varAction, varName), Colors.White));
+                        data.Log(new LogEntry($"Executed action {varAction} on variable {varName}", Colors.White));
                         break;
 
                     case UtilityGroup.Conversion:
                         byte[] convertedBytes = ReplaceValues(inputString, data).ConvertFrom(conversionFrom);
                         data.Variables.Set(new CVar(variableName, convertedBytes.ConvertTo(conversionTo), isCapture));
-                        data.Log(new LogEntry(string.Format("Converted input from {0} to {1}", conversionFrom, conversionTo), Colors.White));
+                        data.Log(new LogEntry($"Converted input {conversionFrom} to {conversionTo}", Colors.White));
                         break;
 
                     case UtilityGroup.File:
@@ -543,6 +583,7 @@ namespace RuriLib
                                 File.AppendAllLines(file, inputs);
                                 break;
                         }
+                        data.Log(new LogEntry($"Executed action {fileAction} on file {file}", Colors.White));
                         break;
 
                     default:
diff --git a/RuriLib/Blocks/SBlockBrowserAction.cs b/RuriLib/Blocks/SBlockBrowserAction.cs
index 1a8672e..59e454e 100644
--- a/RuriLib/Blocks/SBlockBrowserAction.cs
+++ b/RuriLib/Blocks/SBlockBrowserAction.cs
@@ -3,6 +3,7 @@ using OpenQA.Selenium.Chrome;
 using OpenQA.Selenium.Firefox;
 using OpenQA.Selenium.Interactions;
 using RuriLib.Functions.Files;
+using RuriLib.Functions.UserAgent;
 using RuriLib.LS;
 using RuriLib.ViewModels;
 using System;
@@ -47,6 +48,12 @@ namespace RuriLib
         /// <summary>Scrolls down by a given number of pixels from the top of the page.</summary>
         Scroll,
 
+        /// <summary>Opens a new tab.</summary>
+        OpenNewTab,
+
+        /// <summary>Closes the current tab.</summary>
+        CloseCurrentTab,
+
         /// <summary>Switches to the browser tab with a given index.</summary>
         SwitchToTab,
 
@@ -161,6 +168,7 @@ namespace RuriLib
             }
 
             var replacedInput = ReplaceValues(input, data);
+            Actions keyActions = null;
 
             switch (action)
             {
@@ -184,33 +192,33 @@ namespace RuriLib
                     break;
 
                 case BrowserAction.SendKeys:
-                    var action = new Actions(data.Driver);
+                    keyActions = new Actions(data.Driver);
                     foreach(var s in replacedInput.Split(new string[] { "||" }, StringSplitOptions.None))
                     {
                         switch (s)
                         {
                             case "<TAB>":
-                                action.SendKeys(OpenQA.Selenium.Keys.Tab);
+                                keyActions.SendKeys(Keys.Tab);
                                 break;
 
                             case "<ENTER>":
-                                action.SendKeys(OpenQA.Selenium.Keys.Enter);
+                                keyActions.SendKeys(Keys.Enter);
                                 break;
 
                             case "<BACKSPACE>":
-                                action.SendKeys(OpenQA.Selenium.Keys.Backspace);
+                                keyActions.SendKeys(Keys.Backspace);
                                 break;
 
                             case "<ESC>":
-                                action.SendKeys(OpenQA.Selenium.Keys.Escape);
+                                keyActions.SendKeys(Keys.Escape);
                                 break;
 
                             default:
-                                action.SendKeys(s);
+                                keyActions.SendKeys(s);
                                 break;
                         }
                     }
-                    action.Perform();
+                    keyActions.Perform();
                     Thread.Sleep(1000);
                     if(replacedInput.Contains("<ENTER>") || replacedInput.Contains("<BACKSPACE>")) // These might lead to a page change
                         UpdateSeleniumData(data);
@@ -221,11 +229,20 @@ namespace RuriLib
                     Files.SaveScreenshot(image, data);
                     break;
 
+                case BrowserAction.OpenNewTab:
+                    ((IJavaScriptExecutor)data.Driver).ExecuteScript("window.open();");
+                    data.Driver.SwitchTo().Window(data.Driver.WindowHandles.Last());
+                    break;
+
                 case BrowserAction.SwitchToTab:
                     data.Driver.SwitchTo().Window(data.Driver.WindowHandles[int.Parse(replacedInput)]);
                     UpdateSeleniumData(data);
                     break;
 
+                case BrowserAction.CloseCurrentTab:
+                    ((IJavaScriptExecutor)data.Driver).ExecuteScript("window.close();");
+                    break;
+
                 case BrowserAction.Refresh:
                     data.Driver.Navigate().Refresh();
                     break;
@@ -322,7 +339,7 @@ namespace RuriLib
                                     .Select(ext => Directory.GetCurrentDirectory() + "\\ChromeExtensions\\" + ext));
                             if (data.ConfigSettings.DisableNotifications) chromeop.AddArgument("--disable-notifications");
                             if (data.ConfigSettings.CustomCMDArgs != string.Empty) chromeop.AddArgument(data.ConfigSettings.CustomCMDArgs);
-                            if (data.ConfigSettings.RandomUA) lock (data.RandomLocker) { chromeop.AddArgument("--user-agent=" + BlockFunction.RandomUserAgent(data.Random)); }
+                            if (data.ConfigSettings.RandomUA) chromeop.AddArgument("--user-agent=" + UserAgent.Random(data.random));
                             else if (data.ConfigSettings.CustomUserAgent != string.Empty) chromeop.AddArgument("--user-agent=" + data.ConfigSettings.CustomUserAgent);
 
                             if (data.UseProxies) chromeop.AddArgument("--proxy-server=" + data.Proxy.Type.ToString().ToLower() + "://" + data.Proxy.Proxy);
@@ -347,7 +364,7 @@ namespace RuriLib
                             if (data.GlobalSettings.Selenium.Headless || data.ConfigSettings.ForceHeadless) fireop.AddArgument("--headless");
                             if (data.ConfigSettings.DisableNotifications) fireprofile.SetPreference("dom.webnotifications.enabled", false);
                             if (data.ConfigSettings.CustomCMDArgs != string.Empty) fireop.AddArgument(data.ConfigSettings.CustomCMDArgs);
-                            if (data.ConfigSettings.RandomUA) lock (data.RandomLocker) { fireprofile.SetPreference("general.useragent.override", BlockFunction.RandomUserAgent(data.Random)); }
+                            if (data.ConfigSettings.RandomUA) fireprofile.SetPreference("general.useragent.override", UserAgent.Random(data.random));
                             else if (data.ConfigSettings.CustomUserAgent != string.Empty) fireprofile.SetPreference("general.useragent.override", data.ConfigSettings.CustomUserAgent);
 
                             if (data.UseProxies)
diff --git a/RuriLib/Blocks/SBlockElementAction.cs b/RuriLib/Blocks/SBlockElementAction.cs
index 3da54ac..ad3fab5 100644
--- a/RuriLib/Blocks/SBlockElementAction.cs
+++ b/RuriLib/Blocks/SBlockElementAction.cs
@@ -364,7 +364,7 @@ namespace RuriLib
 
             if (outputs.Count != 0)
             {
-                InsertVariables(data, isCapture, recursive, outputs, outputVariable, "", "", false, true);
+                InsertVariable(data, isCapture, recursive, outputs, outputVariable, "", "", false, true);
             }
         }
 
diff --git a/RuriLib/Blocks/SBlockExecuteJS.cs b/RuriLib/Blocks/SBlockExecuteJS.cs
index 4faa8ab..9d9d828 100644
--- a/RuriLib/Blocks/SBlockExecuteJS.cs
+++ b/RuriLib/Blocks/SBlockExecuteJS.cs
@@ -105,7 +105,7 @@ namespace RuriLib
             {
                 try
                 {
-                    InsertVariables(data, isCapture, false, new List<string>() { returned.ToString() }, outputVariable, "", "", false, true);
+                    InsertVariable(data, isCapture, false, new List<string>() { returned.ToString() }, outputVariable, "", "", false, true);
                 }
                 catch
                 {
diff --git a/RuriLib/CaptchaServices/CustomTwoCaptcha.cs b/RuriLib/CaptchaServices/CustomTwoCaptcha.cs
index f978538..0e975ea 100644
--- a/RuriLib/CaptchaServices/CustomTwoCaptcha.cs
+++ b/RuriLib/CaptchaServices/CustomTwoCaptcha.cs
@@ -69,7 +69,7 @@ namespace RuriLib.CaptchaServices
             {
                 if (Timeout > 0) client.Timeout = Timeout;
                 client.Headers.Add(HttpRequestHeader.ContentType, "application/x-www-form-urlencoded");
-                var response = client.UploadString($"http://{Domain}{Port}/in.php",
+                var response = client.UploadString($"http://{Domain}:{Port}/in.php",
                     $"key={ApiKey}&method=base64&regsense=1&body={EscapeLongString(GetBase64(bitmap, ImageFormat.Bmp))}");
                 if (!response.StartsWith("OK")) throw new Exception(response);
                 TaskId = response.Split('|')[1];
diff --git a/RuriLib/Extensions.cs b/RuriLib/Extensions.cs
new file mode 100644
index 0000000..6987162
--- /dev/null
+++ b/RuriLib/Extensions.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RuriLib
+{
+    /// <summary>
+    /// Extension methods for lists.
+    /// </summary>
+    public static class ListExtensions
+    {
+        /// <summary>
+        /// Randomizes the elements in a list.
+        /// </summary>
+        /// <param name="list">The list to shuffle</param>
+        /// <param name="rng">The random number generator</param>
+        public static void Shuffle<T>(this IList<T> list, Random rng)
+        {
+            int n = list.Count;
+            while (n > 1)
+            {
+                n--;
+                int k = rng.Next(n + 1);
+                T value = list[k];
+                list[k] = list[n];
+                list[n] = value;
+            }
+        }
+    }
+}
diff --git a/RuriLib/Functions/Crypto/Crypto.cs b/RuriLib/Functions/Crypto/Crypto.cs
index 6e1e6e7..08119ce 100644
--- a/RuriLib/Functions/Crypto/Crypto.cs
+++ b/RuriLib/Functions/Crypto/Crypto.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace RuriLib.Functions.Crypto
 {
@@ -273,19 +271,17 @@ namespace RuriLib.Functions.Crypto
         /// Encrypts a string using RSA.
         /// </summary>
         /// <param name="data">The data to encrypt as a base64 string</param>
-        /// <param name="password">The private key as a base64 string</param>
-        /// <param name="modulus">The public key's modulus as a base64 string</param>
-        /// <param name="exponent">The public key's exponent as a base64 string</param>
+        /// <param name="n">The public key's modulus as a base64 string</param>
+        /// <param name="e">The public key's exponent as a base64 string</param>
         /// <param name="oaep">Whether to use OAEP-SHA1 padding mode instead of PKCS1</param>
         /// <returns>The encrypted data encoded as base64.</returns>
-        public static string RSAEncrypt(string data, string password, string modulus, string exponent, bool oaep)
+        public static string RSAEncrypt(string data, string n, string e, bool oaep)
         {
             return RSAEncrypt(
                 data,
                 new RSAParameters { 
-                    D = Encoding.UTF8.GetBytes(password),
-                    Modulus = Encoding.UTF8.GetBytes(modulus),
-                    Exponent = Encoding.UTF8.GetBytes(exponent)
+                    Modulus = Encoding.UTF8.GetBytes(n),
+                    Exponent = Encoding.UTF8.GetBytes(e)
                 },
                 oaep
             );
@@ -295,20 +291,18 @@ namespace RuriLib.Functions.Crypto
         /// Decrypts a string using RSA.
         /// </summary>
         /// <param name="data">The data to decrypt as a base64 string</param>
-        /// <param name="password">The private key as a base64 string</param>
-        /// <param name="modulus">The public key's modulus as a base64 string</param>
-        /// <param name="exponent">The public key's exponent as a base64 string</param>
+        /// <param name="n">The public key's modulus as a base64 string</param>
+        /// <param name="d">The private key's exponent as a base64 string</param>
         /// <param name="oaep">Whether to use OAEP-SHA1 padding mode instead of PKCS v1.5</param>
         /// <returns>The decrypted data encoded as base64.</returns>
-        public static string RSADecrypt(string data, string password, string modulus, string exponent, bool oaep)
+        public static string RSADecrypt(string data, string n, string d, bool oaep)
         {
             return RSADecrypt(
                 data,
                 new RSAParameters
                 {
-                    D = Encoding.UTF8.GetBytes(password),
-                    Modulus = Encoding.UTF8.GetBytes(modulus),
-                    Exponent = Encoding.UTF8.GetBytes(exponent)
+                    D = Encoding.UTF8.GetBytes(d),
+                    Modulus = Encoding.UTF8.GetBytes(n)
                 },
                 oaep
             );
diff --git a/RuriLib/Functions/Requests/Request.cs b/RuriLib/Functions/Requests/Request.cs
index df9935a..ebaf550 100644
--- a/RuriLib/Functions/Requests/Request.cs
+++ b/RuriLib/Functions/Requests/Request.cs
@@ -76,7 +76,7 @@ namespace RuriLib.Functions.Requests
             this.contentType = contentType;
             var pData = Regex.Replace(postData, @"(?<!\\)\\n", Environment.NewLine).Replace(@"\\n", @"\n");
 
-            if (CanContainBody(method))
+            if (HttpRequest.CanContainRequestBody(method))
             {
                 if (encodeContent)
                 {
@@ -389,16 +389,6 @@ namespace RuriLib.Functions.Requests
             }
             return $"------WebKitFormBoundary{builder.ToString().ToLower()}";
         }
-
-        /// <summary>
-        /// Checks if an HTTP method can have a body.
-        /// </summary>
-        /// <param name="method">The HTTP method</param>
-        /// <returns>True if the method allows a body</returns>
-        public static bool CanContainBody(HttpMethod method)
-        {
-            return method == HttpMethod.POST || method == HttpMethod.PUT || method == HttpMethod.DELETE;
-        }
     }
 
     /// <summary>
diff --git a/RuriLib/Functions/UserAgent/UserAgent.cs b/RuriLib/Functions/UserAgent/UserAgent.cs
new file mode 100644
index 0000000..e698770
--- /dev/null
+++ b/RuriLib/Functions/UserAgent/UserAgent.cs
@@ -0,0 +1,97 @@
+using Extreme.Net;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace RuriLib.Functions.UserAgent
+{
+    /// <summary>
+    /// Provides methods to generate User Agents.
+    /// </summary>
+    public static class UserAgent
+    {
+        /// <summary>
+        /// Enumerates browsers for which a User Agent can be generated.
+        /// </summary>
+        public enum Browser
+        {
+            /// <summary>The Google Chrome browser.</summary>
+            Chrome,
+
+            /// <summary>The Mozilla Firefox browser.</summary>
+            Firefox,
+
+            /// <summary>The Internet Explorer browser.</summary>
+            InternetExplorer,
+
+            /// <summary>The Opera browser.</summary>
+            Opera,
+
+            /// <summary>The Opera Mini mobile browser.</summary>
+            OperaMini
+        }
+
+        /// <summary>
+        /// Generates a User Agent for a specific Browser.
+        /// </summary>
+        /// <param name="browser">The Browser</param>
+        /// <returns>A User Agent for the given browser</returns>
+        public static string ForBrowser(Browser browser)
+        {
+            switch (browser)
+            {
+                case Browser.Chrome:
+                    return Http.ChromeUserAgent();
+
+                case Browser.Firefox:
+                    return Http.FirefoxUserAgent();
+
+                case Browser.InternetExplorer:
+                    return Http.IEUserAgent();
+
+                case Browser.Opera:
+                    return Http.OperaUserAgent();
+
+                case Browser.OperaMini:
+                    return Http.OperaMiniUserAgent();
+
+                default:
+                    throw new Exception("Browser not supported");
+            }
+        }
+
+        /// <summary>
+        /// Gets a random User-Agent header.
+        /// </summary>
+        /// <param name="rand">A random number generator</param>
+        /// <returns>A randomly generated User-Agent header</returns>
+        public static string Random(Random rand)
+        {
+            // All credits for this method go to the Leaf.xNet fork of Extreme.NET
+            // https://github.com/csharp-leaf/Leaf.xNet
+
+            int random = rand.Next(99) + 1;
+
+            // Chrome = 70%
+            if (random >= 1 && random <= 70)
+                return Http.ChromeUserAgent();
+
+            // Firefox = 15%
+            if (random > 70 && random <= 85)
+                return Http.FirefoxUserAgent();
+
+            // IE = 6%
+            if (random > 85 && random <= 91)
+                return Http.IEUserAgent();
+
+            // Opera 12 = 5%
+            if (random > 91 && random <= 96)
+                return Http.OperaUserAgent();
+
+            // Opera mini = 4%
+            return Http.OperaMiniUserAgent();
+        }
+    }
+}
diff --git a/RuriLib/IOManager.cs b/RuriLib/IOManager.cs
index 9f76461..ed7ad4c 100644
--- a/RuriLib/IOManager.cs
+++ b/RuriLib/IOManager.cs
@@ -139,14 +139,9 @@ namespace RuriLib
         /// <param name="config">The viewmodel of the config to save</param>
         /// <param name="fileName">The path of the file where the Config will be saved</param>
         /// <returns>Whether the file has been saved successfully</returns>
-        public static bool SaveConfig(Config config, string fileName)
+        public static void SaveConfig(Config config, string fileName)
         {
-            try
-            {
-                File.WriteAllText(fileName, SerializeConfig(config));
-                return true;
-            }
-            catch { return false; }
+            File.WriteAllText(fileName, SerializeConfig(config));
         }
 
         /// <summary>
@@ -239,19 +234,33 @@ namespace RuriLib
                 var prop = type.GetProperty(pair[0]);
                 var propObj = prop.GetValue(obj);
                 dynamic value = null;
-                var ts = new TypeSwitch()
-                    .Case((String x) => value = pair[1])
-                    .Case((Int32 x) => value = Int32.Parse(pair[1]))
-                    .Case((Boolean x) => value = Boolean.Parse(pair[1]))
-                    .Case((List<String> x) => value = pair[1].Split(',').ToList())
-                    .Case((Color x) => value = Color.FromRgb(
-                        System.Drawing.Color.FromName(pair[1]).R,
-                        System.Drawing.Color.FromName(pair[1]).G,
-                        System.Drawing.Color.FromName(pair[1]).B
-                    ))
-                ;
 
-                ts.Switch(propObj);
+                switch (propObj)
+                {
+                    case string x:
+                        value = pair[1];
+                        break;
+
+                    case int x:
+                        value = int.Parse(pair[1]);
+                        break;
+
+                    case bool x:
+                        value = bool.Parse(pair[1]);
+                        break;
+
+                    case List<string> x:
+                        value = pair[1].Split(',').ToList();
+                        break;
+
+                    case Color x:
+                        value = Color.FromRgb(
+                            System.Drawing.Color.FromName(pair[1]).R,
+                            System.Drawing.Color.FromName(pair[1]).G,
+                            System.Drawing.Color.FromName(pair[1]).B);
+                        break;
+                }
+                
                 prop.SetValue(obj, value);
             }
             return obj;
diff --git a/RuriLib/LoliScript/LoliScript.cs b/RuriLib/LoliScript/LoliScript.cs
index 693e099..5fb8ab5 100644
--- a/RuriLib/LoliScript/LoliScript.cs
+++ b/RuriLib/LoliScript/LoliScript.cs
@@ -215,7 +215,10 @@ namespace RuriLib.LS
             // Clean the inner Log
             data.LogBuffer.Clear();
 
-            if (data.Status != BotStatus.NONE && data.Status != BotStatus.SUCCESS)
+            // TODO: Refactor this with a properly written policy
+            // If we have a custom status without forced continue OR we have a status that is not NONE or SUCCESS or CUSTOM
+            if ((data.Status == BotStatus.CUSTOM && !data.ConfigSettings.ContinueOnCustom) ||
+                (data.Status != BotStatus.NONE && data.Status != BotStatus.SUCCESS && data.Status != BotStatus.CUSTOM))
             {
                 i = lines.Count(); // Go to the end
                 return;
diff --git a/RuriLib/LoliScript/Parser/BlockParser.cs b/RuriLib/LoliScript/Parser/BlockParser.cs
index c66c916..66c1ba1 100644
--- a/RuriLib/LoliScript/Parser/BlockParser.cs
+++ b/RuriLib/LoliScript/Parser/BlockParser.cs
@@ -15,47 +15,22 @@ namespace RuriLib.LS
         /// <summary>
         /// The allowed block identifiers.
         /// </summary>
-        public enum BlockName
+        public static Dictionary<string, Type> BlockMappings { get; set; } = new Dictionary<string, Type>()
         {
-            /// <summary>The BYPASSCF block.</summary>
-            BYPASSCF,
-
-            /// <summary>The CAPTCHA block.</summary>
-            CAPTCHA,
-
-            /// <summary>The FUNCTION block.</summary>
-            FUNCTION,
-
-            /// <summary>The KEYCHECK block.</summary>
-            KEYCHECK,
-
-            /// <summary>The PARSE block.</summary>
-            PARSE,
-
-            /// <summary>The RECAPTCHA block.</summary>
-            RECAPTCHA,
-
-            /// <summary>The REQUEST block.</summary>
-            REQUEST,
-
-            /// <summary>The TCP block.</summary>
-            TCP,
-
-            /// <summary>The UTILITY block.</summary>
-            UTILITY,
-
-            /// <summary>The BROWSERACTION block.</summary>
-            BROWSERACTION,
-
-            /// <summary>The ELEMENTACTION block.</summary>
-            ELEMENTACTION,
-
-            /// <summary>The EXECUTEJS block.</summary>
-            EXECUTEJS,
-
-            /// <summary>The NAVIGATE block.</summary>
-            NAVIGATE
-        }
+            { "BYPASSCF", typeof(BlockBypassCF) },
+            { "CAPTCHA", typeof(BlockImageCaptcha) },
+            { "FUNCTION", typeof(BlockFunction) },
+            { "KEYCHECK", typeof(BlockKeycheck) },
+            { "PARSE", typeof(BlockParse) },
+            { "RECAPTCHA", typeof(BlockRecaptcha) },
+            { "REQUEST", typeof(BlockRequest) },
+            { "TCP", typeof(BlockTCP) },
+            { "UTILITY", typeof(BlockUtility) },
+            { "BROWSERACTION", typeof(SBlockBrowserAction) },
+            { "ELEMENTACTION", typeof(SBlockElementAction) },
+            { "EXECUTEJS", typeof(SBlockExecuteJS) },
+            { "NAVIGATE", typeof(SBlockNavigate) }
+        };
 
         /// <summary>
         /// Tests if a line is parsable as a block.
@@ -64,7 +39,8 @@ namespace RuriLib.LS
         /// <returns>Whether the line contains a block or not.</returns>
         public static bool IsBlock(string line)
         {
-            return Enum.GetNames(typeof(BlockName))
+            return BlockMappings
+                .Keys
                 .Select(n => n.ToUpper())
                 .Contains(GetBlockType(line).ToUpper());
         }
@@ -104,65 +80,9 @@ namespace RuriLib.LS
             try { identifier = LineParser.ParseToken(ref input, TokenType.Parameter, true); }
             catch { throw new ArgumentException("Missing identifier"); }
 
-            BlockBase block = null;
-            switch ((BlockName)Enum.Parse(typeof(BlockName), identifier, true))
-            {
-                case BlockName.FUNCTION:
-                    block = (new BlockFunction()).FromLS(input);
-                    break;
-
-                case BlockName.KEYCHECK:
-                    block = (new BlockKeycheck()).FromLS(input);
-                    break;
-
-                case BlockName.RECAPTCHA:
-                    block = (new BlockRecaptcha()).FromLS(input);
-                    break;
-
-                case BlockName.REQUEST:
-                    block = (new BlockRequest()).FromLS(input);
-                    break;
-
-                case BlockName.PARSE:
-                    block = (new BlockParse()).FromLS(input);
-                    break;
-
-                case BlockName.CAPTCHA:
-                    block = (new BlockImageCaptcha()).FromLS(input);
-                    break;
-
-                case BlockName.BYPASSCF:
-                    block = (new BlockBypassCF()).FromLS(input);
-                    break;
-
-                case BlockName.UTILITY:
-                    block = (new BlockUtility()).FromLS(input);
-                    break;
-
-                case BlockName.TCP:
-                    block = (new BlockTCP()).FromLS(input);
-                    break;
-
-                case BlockName.NAVIGATE:
-                    block = (new SBlockNavigate()).FromLS(input);
-                    break;
-
-                case BlockName.BROWSERACTION:
-                    block = (new SBlockBrowserAction()).FromLS(input);
-                    break;
-
-                case BlockName.ELEMENTACTION:
-                    block = (new SBlockElementAction()).FromLS(input);
-                    break;
-
-                case BlockName.EXECUTEJS:
-                    block = (new SBlockExecuteJS()).FromLS(input);
-                    break;
-                    
-                default:
-                    throw new ArgumentException($"Invalid identifier '{identifier}'");
-            }
-
+            // Create the actual block from the identifier
+            BlockBase block = (Activator.CreateInstance(BlockMappings[identifier]) as BlockBase).FromLS(input);
+            
             // Set disabled
             if (block != null) block.Disabled = disabled;
 
diff --git a/RuriLib/LoliScript/Parser/MouseActionParser.cs b/RuriLib/LoliScript/Parser/MouseActionParser.cs
index d8070e8..f2645e7 100644
--- a/RuriLib/LoliScript/Parser/MouseActionParser.cs
+++ b/RuriLib/LoliScript/Parser/MouseActionParser.cs
@@ -57,7 +57,17 @@ namespace RuriLib.LS
                 {
                     case "SPAWN":
                         // Spawn a div in a certain position so you can hook to it later via id
-                        SpawnDiv(data.Driver, LineParser.ParseInt(ref input, "X"), LineParser.ParseInt(ref input, "Y"), LineParser.ParseLiteral(ref input, "ID"));
+                        if (LineParser.Lookahead(ref input) == TokenType.Integer)
+                        {
+                            point1X = LineParser.ParseInt(ref input, "X");
+                            point1Y = LineParser.ParseInt(ref input, "Y");
+                        }
+                        else if (LineParser.Lookahead(ref input) == TokenType.Literal)
+                        {
+                            point1X = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "X"), data));
+                            point1Y = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "Y"), data));
+                        }
+                        SpawnDiv(data.Driver, point1X, point1Y, LineParser.ParseLiteral(ref input, "ID"));
                         break;
 
                     case "CLICK":
@@ -96,8 +106,16 @@ namespace RuriLib.LS
                         break;
 
                     case "DRAGANDDROPWITHOFFSET":
-                        offsetX = LineParser.ParseInt(ref input, "OFFSET X");
-                        offsetY = LineParser.ParseInt(ref input, "OFFSET Y");
+                        if (LineParser.Lookahead(ref input) == TokenType.Integer)
+                        {
+                            offsetX = LineParser.ParseInt(ref input, "OFFSET X");
+                            offsetY = LineParser.ParseInt(ref input, "OFFSET Y");
+                        }
+                        else if (LineParser.Lookahead(ref input) == TokenType.Literal)
+                        {
+                            offsetX = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "OFFSET X"), data));
+                            offsetY = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "OFFSET Y"), data));
+                        }
                         actions.DragAndDropToOffset(ParseElement(ref input, data), offsetX, offsetY);
                         break;
 
@@ -118,8 +136,16 @@ namespace RuriLib.LS
                         break;
 
                     case "MOVEBY":
-                        offsetX = LineParser.ParseInt(ref input, "OFFSET X");
-                        offsetY = LineParser.ParseInt(ref input, "OFFSET Y");
+                        if (LineParser.Lookahead(ref input) == TokenType.Integer)
+                        {
+                            offsetX = LineParser.ParseInt(ref input, "OFFSET X");
+                            offsetY = LineParser.ParseInt(ref input, "OFFSET Y");
+                        }
+                        else if (LineParser.Lookahead(ref input) == TokenType.Literal)
+                        {
+                            offsetX = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "OFFSET X"), data));
+                            offsetY = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "OFFSET Y"), data));
+                        }
                         actions.MoveByOffset(offsetX, offsetY);
                         break;
 
@@ -166,6 +192,7 @@ namespace RuriLib.LS
                         break;
 
                     case "DRAWLINE":
+                        // DRAWLINE 10 10 -> 20 20
                         if (LineParser.Lookahead(ref input) == TokenType.Integer)
                         {
                             point1X = LineParser.ParseInt(ref input, "X1");
@@ -174,6 +201,15 @@ namespace RuriLib.LS
                             point2X = LineParser.ParseInt(ref input, "X2");
                             point2Y = LineParser.ParseInt(ref input, "Y2");
                         }
+                        // DRAWLINE "10" "20" -> "<MY_X>" "<MY_Y>"
+                        else if (LineParser.Lookahead(ref input) == TokenType.Literal)
+                        {
+                            point1X = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "X1"), data));
+                            point1Y = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "Y1"), data));
+                            LineParser.ParseToken(ref input, TokenType.Arrow, true);
+                            point2X = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "X2"), data));
+                            point2Y = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "Y2"), data));
+                        }
                         else
                         {
                             elem1 = ParseElement(ref input, data);
@@ -198,6 +234,7 @@ namespace RuriLib.LS
                         break;
 
                     case "DRAWLINEHUMAN":
+                        // DRAWLINEHUMAN 10 10 -> 20 20
                         if (LineParser.Lookahead(ref input) == TokenType.Integer)
                         {
                             point1X = LineParser.ParseInt(ref input, "X1");
@@ -206,6 +243,15 @@ namespace RuriLib.LS
                             point2X = LineParser.ParseInt(ref input, "X2");
                             point2Y = LineParser.ParseInt(ref input, "Y2");
                         }
+                        // DRAWLINEHUMAN "10" "20" -> "<MY_X>" "<MY_Y>"
+                        else if (LineParser.Lookahead(ref input) == TokenType.Literal)
+                        {
+                            point1X = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "X1"), data));
+                            point1Y = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "Y1"), data));
+                            LineParser.ParseToken(ref input, TokenType.Arrow, true);
+                            point2X = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "X2"), data));
+                            point2Y = int.Parse(BlockBase.ReplaceValues(LineParser.ParseLiteral(ref input, "Y2"), data));
+                        }
                         else
                         {
                             elem1 = ParseElement(ref input, data);
diff --git a/RuriLib/Models/BotData.cs b/RuriLib/Models/BotData.cs
index 5ef227e..3967f40 100644
--- a/RuriLib/Models/BotData.cs
+++ b/RuriLib/Models/BotData.cs
@@ -43,10 +43,7 @@ namespace RuriLib
     public class BotData
     {
         /// <summary>A random number generator.</summary>
-        public Random Random = new Random();
-
-        /// <summary>An object to use to lock <see cref="Random"/> in order to avoid the generation of the same random number if executed in rapid succession.</summary>
-        public object RandomLocker = new object();
+        public Random random;
 
         /// <summary>The Status of the Bot.</summary>
         public BotStatus Status { get; set; }
@@ -68,18 +65,9 @@ namespace RuriLib
 
         /// <summary>Whether the browser is open or not.</summary>
         public bool BrowserOpen { get; set; }
-        
-        /// <summary>The TCP Client used for TCP blocks.</summary>
-        public TcpClient TCPClient { get; set; }
 
-        /// <summary>The NET Stream used for TCP blocks with unencrypted connection.</summary>
-        public NetworkStream NETStream { get; set; }
-
-        /// <summary>The SSL Stream used for TCP blocks with encrypted connection.</summary>
-        public SslStream SSLStream { get; set; }
-
-        /// <summary>Whether to use SSL for the current TCPClient.</summary>
-        public bool TCPSSL { get; set; } = true;
+        /// <summary>A dictionary of object that can be used for keeping session-based objects through different blocks.</summary>
+        public Dictionary<string, object> CustomObjects { get; set; }
 
         /// <summary>The wrapped data line that needs to be checked.</summary>
         public CData Data { get; set; }
@@ -171,7 +159,7 @@ namespace RuriLib
             Data = data;
             Proxy = proxy;
             UseProxies = useProxies;
-            Random = random;
+            this.random = new Random(random.Next(0, int.MaxValue)); // Create a new local RNG seeded with a random seed from the global RNG
             Status = BotStatus.NONE;
             BotNumber = BotNumber;
             GlobalSettings = globalSettings;
@@ -195,6 +183,8 @@ namespace RuriLib
             BrowserOpen = false;
             IsDebug = isDebug;
             BotNumber = botNumber;
+
+            CustomObjects = new Dictionary<string, object>();
         }
 
         /// <summary>
@@ -207,6 +197,15 @@ namespace RuriLib
                 LogBuffer.Add(entry);
         }
 
+        /// <summary>
+        /// Adds a new message to the LogBuffer with white text.
+        /// </summary>
+        /// <param name="message">The message to log</param>
+        public void Log(string message)
+        {
+            Log(new LogEntry(message, Colors.White));
+        }
+
         /// <summary>
         /// Adds multiple new LogEntry objects to the LogBuffer.
         /// </summary>
@@ -224,5 +223,15 @@ namespace RuriLib
         {
             LogBuffer.Add(new LogEntry("", Colors.White));
         }
+
+        /// <summary>
+        /// Retrieves a custom object from the 
+        /// </summary>
+        /// <param name="key">The key of the object in the dictionary</param>
+        /// <returns>The object or null if the key was not found</returns>
+        public object GetCustomObject(string key)
+        {
+            return CustomObjects.ContainsKey(key) ? CustomObjects[key] : null;
+        }
     }
 }
diff --git a/RuriLib/Models/CVar.cs b/RuriLib/Models/CVar.cs
index 10794ca..33088c2 100644
--- a/RuriLib/Models/CVar.cs
+++ b/RuriLib/Models/CVar.cs
@@ -141,6 +141,14 @@ namespace RuriLib.Models
         {
             if (Type != VarType.List) return null;
             var list = Value as List<string>;
+
+            // If the index is negative, start from the end
+            if (index < 0)
+            {
+                // For example in a [1,2,3] list, the element at -1 is at index 3-1 = 2 which is element '3'
+                index = list.Count + index;
+            }
+
             if (index > list.Count - 1 || index < 0) return null;
             return list[index];
         }
diff --git a/RuriLib/Models/ConfigSettings.cs b/RuriLib/Models/ConfigSettings.cs
index af1a5a0..cd7ae2b 100644
--- a/RuriLib/Models/ConfigSettings.cs
+++ b/RuriLib/Models/ConfigSettings.cs
@@ -1,4 +1,5 @@
-using RuriLib.Models;
+using Newtonsoft.Json;
+using RuriLib.Models;
 using RuriLib.ViewModels;
 using System;
 using System.Collections.Generic;
@@ -33,6 +34,14 @@ namespace RuriLib
         /// <summary>Additional information on the Config usage.</summary>
         public string AdditionalInfo { get { return additionalInfo; } set { additionalInfo = value; OnPropertyChanged(); } }
 
+        private string[] requiredPlugins = new string[] { };
+        /// <summary>The plugins that are necessary in order for this config to run.</summary>
+        public string[] RequiredPlugins { get { return requiredPlugins; } set { requiredPlugins = value; OnPropertyChanged(); OnPropertyChanged(nameof(RequiredPluginsString)); } }
+
+        /// <summary>The required plugins list as a comma separated string.</summary>
+        [JsonIgnore]
+        public string RequiredPluginsString => string.Join(", ", RequiredPlugins);
+
         private string author = "";
         /// <summary>The name of the Author of the Config.</summary>
         public string Author { get { return author; } set { author = value; OnPropertyChanged(); } }
@@ -40,6 +49,14 @@ namespace RuriLib
         private string version = "1.2.0";
         /// <summary>The version of RuriLib the Config was made with.</summary>
         public string Version { get { return version; } set { version = value; OnPropertyChanged(); } }
+
+        private bool saveEmptyCaptures = false;
+        /// <summary>Whether to remove the empty captures before saving the hits to the database.</summary>
+        public bool SaveEmptyCaptures { get { return saveEmptyCaptures; } set { saveEmptyCaptures = value; OnPropertyChanged(); } }
+
+        private bool continueOnCustom = false;
+        /// <summary>Whether to continue execution after a Custom status has been reached.</summary>
+        public bool ContinueOnCustom { get { return continueOnCustom; } set { continueOnCustom = value; OnPropertyChanged(); } }
         #endregion
 
         #region Requests
@@ -109,6 +126,10 @@ namespace RuriLib
         /// <summary>Whether to always quit the browser and dispose of the WebDriver at the end of the checking process (if any browser is open).</summary>
         public bool AlwaysQuit { get { return alwaysQuit; } set { alwaysQuit = value; OnPropertyChanged(); } }
 
+        private bool quitOnBanRetry = false;
+        /// <summary>Whether to quit the browser and dispose of the WebDriver at the end of the checking process (if any browser is open) on a BAN or RETRY status.</summary>
+        public bool QuitOnBanRetry { get { return quitOnBanRetry; } set { quitOnBanRetry = value; OnPropertyChanged(); } }
+
         private bool disableNotifications = false;
         /// <summary>Whether to disable notifications the lock the page and make it impossible to proceed.</summary>
         public bool DisableNotifications { get { return disableNotifications; } set { disableNotifications = value; OnPropertyChanged(); } }
diff --git a/RuriLib/Runner/RunnerViewModel.cs b/RuriLib/Runner/RunnerViewModel.cs
index f4907ab..18f4a3a 100644
--- a/RuriLib/Runner/RunnerViewModel.cs
+++ b/RuriLib/Runner/RunnerViewModel.cs
@@ -44,11 +44,11 @@ namespace RuriLib.Runner
         /// <param name="environment">The environment settings</param>
         /// <param name="settings">The RuriLib settings</param>
         /// <param name="random">A reference to the global random generator</param>
-        public RunnerViewModel(EnvironmentSettings environment, RLSettingsViewModel settings, Random random)
+        public RunnerViewModel(EnvironmentSettings environment, RLSettingsViewModel settings, Random random = null)
         {
             Env = environment;
             Settings = settings;
-            Random = random;
+            this.random = random != null ? random : new Random();
             OnPropertyChanged("Busy");
             OnPropertyChanged("ControlsEnabled");
         }
@@ -57,7 +57,8 @@ namespace RuriLib.Runner
         #region Settings
         private RLSettingsViewModel Settings { get; set; }
         private EnvironmentSettings Env { get; set; }
-        private Random Random { get; set; }
+        private Random random;
+        private object randomLocker = new object();
         #endregion
 
         #region Workers
@@ -635,6 +636,18 @@ namespace RuriLib.Runner
         // Executed when the Master Worker has finished its job
         private void RunCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
+            if (Settings.General.SendToCheckOnAbort)
+            {
+                foreach (var bot in Bots.Where(b => b.Worker.IsBusy))
+                {
+                    ValidData validData = new ValidData(bot.Data, bot.Proxy, ProxyType.Http, BotStatus.NONE, "NONE", "", "", new List<LogEntry>());
+                    ToCheckList.Add(validData);
+                    UpdateStats();
+                    var hit = new Hit(bot.Data, new VariableList(), bot.Proxy, "NONE", ConfigName, WordlistName);
+                    RaiseFoundHit(hit);
+                }
+            }
+
             if (e.Error != null) RaiseMessageArrived(LogLevel.Error, "The Master Worker has encountered an error: " + e.Error.Message, true);
             Master.Status = WorkerStatus.Idle;
             OnPropertyChanged("Busy");
@@ -729,7 +742,11 @@ namespace RuriLib.Runner
                 var proxyUsedText = currentProxy == null ? "NONE" : $"{currentProxy.Proxy} ({currentProxy.Type})";
 
                 // Initialize the Bot Data
-                BotData botData = new BotData(Settings, Config.Settings, currentData, currentProxy, UseProxies, Random, bot.Id, false);
+                BotData botData = null;
+                lock (randomLocker)
+                {
+                    botData = new BotData(Settings, Config.Settings, currentData, currentProxy, UseProxies, random, bot.Id, false);
+                }
                 botData.Driver = bot.Driver;
                 botData.BrowserOpen = bot.IsDriverOpen;
                 List<LogEntry> BotLog = new List<LogEntry>();
@@ -836,7 +853,7 @@ namespace RuriLib.Runner
                 RaiseMessageArrived(LogLevel.Info, $"[{bot.Id}][{bot.Data}][{proxyUsedText}] Ended with result {botData.StatusString}", false);
 
                 // Quit Browser if Always Quit
-                if (Config.Settings.AlwaysQuit)
+                if (Config.Settings.AlwaysQuit || (Config.Settings.QuitOnBanRetry && (botData.Status == BotStatus.BAN || botData.Status == BotStatus.RETRY)))
                     try { botData.Driver.Quit(); botData.BrowserOpen = false; } catch { }
 
                 // Save Browser Status
diff --git a/RuriLib/RuriLib.csproj b/RuriLib/RuriLib.csproj
index b861392..bcb6638 100644
--- a/RuriLib/RuriLib.csproj
+++ b/RuriLib/RuriLib.csproj
@@ -43,6 +43,12 @@
     <Reference Include="AntiCaptcha, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\AntiCaptchaAPI.1.1.0\lib\netstandard2.0\AntiCaptcha.dll</HintPath>
     </Reference>
+    <Reference Include="CloudflareSolverRe">
+      <HintPath>..\CloudflareSolverRe.dll</HintPath>
+    </Reference>
+    <Reference Include="CloudflareSolverRe.Captcha">
+      <HintPath>..\CloudflareSolverRe.Captcha.dll</HintPath>
+    </Reference>
     <Reference Include="Extreme.Net, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Extreme.Net.dll</HintPath>
@@ -62,20 +68,17 @@
     <Reference Include="Jint, Version=0.0.0.0, Culture=neutral, PublicKeyToken=2e92ba9c8d81157f, processorArchitecture=MSIL">
       <HintPath>..\packages\Jint.2.11.58\lib\net451\Jint.dll</HintPath>
     </Reference>
-    <Reference Include="Leaf.xNet, Version=5.1.83.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Leaf.xNet.5.1.83\lib\net472\Leaf.xNet.dll</HintPath>
-    </Reference>
     <Reference Include="LiteDB, Version=4.1.4.0, Culture=neutral, PublicKeyToken=4ee40123013c9f27, processorArchitecture=MSIL">
       <HintPath>..\packages\LiteDB.4.1.4\lib\net40\LiteDB.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Dynamic, Version=1.2.2.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
       <HintPath>..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Dynamic.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll</HintPath>
+    <Reference Include="Microsoft.Owin, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.4.1.0\lib\net45\Microsoft.Owin.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Security, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Owin.Security.4.0.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
+    <Reference Include="Microsoft.Owin.Security, Version=4.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Owin.Security.4.1.0\lib\net45\Microsoft.Owin.Security.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Scripting, Version=1.2.2.0, Culture=neutral, PublicKeyToken=7f709c5b713576e1, processorArchitecture=MSIL">
       <HintPath>..\packages\DynamicLanguageRuntime.1.2.2\lib\net45\Microsoft.Scripting.dll</HintPath>
@@ -89,7 +92,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
@@ -178,8 +181,8 @@
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
@@ -214,8 +217,8 @@
     <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Encoding.CodePages, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encoding.CodePages.4.5.1\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
+    <Reference Include="System.Text.Encoding.CodePages, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encoding.CodePages.4.7.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
     </Reference>
     <Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll</HintPath>
@@ -247,6 +250,7 @@
     <Compile Include="CaptchaServices\CustomTwoCaptcha.cs" />
     <Compile Include="CaptchaServices\RuCaptcha.cs" />
     <Compile Include="CaptchaServices\Service.cs" />
+    <Compile Include="Extensions.cs" />
     <Compile Include="Functions\Conversion\Conversion.cs" />
     <Compile Include="Functions\Crypto\Crypto.cs" />
     <Compile Include="Functions\Download\Download.cs" />
@@ -254,6 +258,7 @@
     <Compile Include="Functions\Files\Files.cs" />
     <Compile Include="Functions\Requests\Request.cs" />
     <Compile Include="Functions\Time\Time.cs" />
+    <Compile Include="Functions\UserAgent\UserAgent.cs" />
     <Compile Include="GZip.cs" />
     <Compile Include="Interfaces\IAlerter.cs" />
     <Compile Include="Interfaces\IApplication.cs" />
@@ -323,7 +328,6 @@
     <Compile Include="Runner\IRunnerMessaging.cs" />
     <Compile Include="Runner\RunnerBotViewModel.cs" />
     <Compile Include="Runner\RunnerViewModel.cs" />
-    <Compile Include="TypeSwitch.cs" />
     <Compile Include="Functions\Parsing\Parse.cs" />
     <Compile Include="ViewModels\ConfigViewModel.cs" />
     <Compile Include="Models\CProxy.cs" />
diff --git a/RuriLib/TypeSwitch.cs b/RuriLib/TypeSwitch.cs
deleted file mode 100644
index b73a4e3..0000000
--- a/RuriLib/TypeSwitch.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace RuriLib
-{
-    /// <summary>
-    /// Allows to make a switch statement on the Type of the object, and executes a different Action depending on its outcome.
-    /// </summary>
-    public class TypeSwitch
-    {
-        Dictionary<Type, Action<object>> matches = new Dictionary<Type, Action<object>>();
-
-        /// <summary>
-        /// Adds a case to the TypeSwitch.
-        /// </summary>
-        /// <typeparam name="T">The type</typeparam>
-        /// <param name="action">The action to perform</param>
-        /// <returns>The TypeSwitch itself</returns>
-        public TypeSwitch Case<T>(Action<T> action) { matches.Add(typeof(T), (x) => action((T)x)); return this; }
-
-        /// <summary>
-        /// Runs the switch statement on an object and executes the corresponding Action.
-        /// </summary>
-        /// <param name="x">The object on which you want to execute the switch statement</param>
-        public void Switch(object x) { matches[x.GetType()](x); }
-    }
-}
diff --git a/RuriLib/ViewModels/RLSettings/SettingsGeneral.cs b/RuriLib/ViewModels/RLSettings/SettingsGeneral.cs
index 0e355b7..ffa7265 100644
--- a/RuriLib/ViewModels/RLSettings/SettingsGeneral.cs
+++ b/RuriLib/ViewModels/RLSettings/SettingsGeneral.cs
@@ -47,6 +47,10 @@ namespace RuriLib.ViewModels
         /// <summary>Whether to store the last Response Source after a successful check.</summary>
         public bool SaveLastSource { get { return saveLastSource; } set { saveLastSource = value; OnPropertyChanged(); } }
 
+        private bool sendToCheckOnAbort = false;
+        /// <summary>Whether to save as ToCheck all the data lines that were being processed when the master worker was aborted.</summary>
+        public bool SendToCheckOnAbort { get { return sendToCheckOnAbort; } set { sendToCheckOnAbort = value; OnPropertyChanged(); } }
+
         private bool webhookEnabled = false;
         /// <summary>Whether to activate the hit webhook that gets called upon a SUCCESS or a custom result.</summary>
         public bool WebhookEnabled { get { return webhookEnabled; } set { webhookEnabled = value; OnPropertyChanged(); } }
diff --git a/RuriLib/app.config b/RuriLib/app.config
index 1942afd..47c5d10 100644
--- a/RuriLib/app.config
+++ b/RuriLib/app.config
@@ -5,7 +5,7 @@
       <probing privatePath="bin" />
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/RuriLib/packages.config b/RuriLib/packages.config
index 86b6d98..d861aca 100644
--- a/RuriLib/packages.config
+++ b/RuriLib/packages.config
@@ -6,14 +6,13 @@
   <package id="DynamicLanguageRuntime" version="1.2.2" targetFramework="net461" />
   <package id="IronPython" version="2.7.9" targetFramework="net461" />
   <package id="Jint" version="2.11.58" targetFramework="net461" />
-  <package id="Leaf.xNet" version="5.1.83" targetFramework="net472" />
   <package id="LiteDB" version="4.1.4" targetFramework="net461" />
-  <package id="Microsoft.NETCore.Platforms" version="2.2.3" targetFramework="net472" />
-  <package id="Microsoft.Owin" version="4.0.1" targetFramework="net461" />
-  <package id="Microsoft.Owin.Security" version="4.0.1" targetFramework="net461" />
+  <package id="Microsoft.NETCore.Platforms" version="3.1.0" targetFramework="net472" />
+  <package id="Microsoft.Owin" version="4.1.0" targetFramework="net472" />
+  <package id="Microsoft.Owin.Security" version="4.1.0" targetFramework="net472" />
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
   <package id="Owin" version="1.0" targetFramework="net461" />
   <package id="ProxySocket" version="1.1.2" targetFramework="net461" />
   <package id="Selenium.Support" version="3.141.0" targetFramework="net461" />
@@ -43,7 +42,7 @@
   <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime" version="4.3.1" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net472" />
   <package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net472" />
   <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net461" />
   <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net472" />
@@ -54,7 +53,7 @@
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net472" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net461" />
   <package id="System.Text.Encoding" version="4.3.0" targetFramework="net461" />
-  <package id="System.Text.Encoding.CodePages" version="4.5.1" targetFramework="net461" />
+  <package id="System.Text.Encoding.CodePages" version="4.7.0" targetFramework="net472" />
   <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net461" />
   <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net472" />
   <package id="System.Threading" version="4.3.0" targetFramework="net461" />