A bit of refactoring to be able to find some issue...

Greenshot/Configuration/EditorConfiguration.cs

@@ -24,9 +24,11 @@ using System.Drawing;
 
 using Greenshot.Drawing.Fields;
 using GreenshotPlugin.UnmanagedHelpers;
-using Greenshot.IniFile;
 using GreenshotPlugin.Effects;
+using GreenshotPlugin.IniFile;
 using GreenshotPlugin.Interfaces.Drawing;
+using GreenshotPlugin.UnmanagedHelpers.Enums;
+using GreenshotPlugin.UnmanagedHelpers.Structs;
 
 namespace Greenshot.Configuration {
 	/// <summary>

Greenshot/Controls/ContextMenuToolStripProfessionalRenderer.cs

@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using Greenshot.IniFile;
 using GreenshotPlugin.Core;
 using System.Drawing;
 using System.Windows.Forms;
+using GreenshotPlugin.IniFile;
 
 namespace Greenshot.Controls {
 	/// <summary>

Greenshot/Controls/Pipette.cs

@@ -24,6 +24,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using Greenshot.Forms;
 using GreenshotPlugin.UnmanagedHelpers;
+using GreenshotPlugin.UnmanagedHelpers.Enums;
 
 namespace Greenshot.Controls {
 	/// <summary>

Greenshot/Destinations/ClipboardDestination.cs

@@ -24,7 +24,7 @@ using System.Windows.Forms;
 
 using Greenshot.Configuration;
 using GreenshotPlugin.Core;
-using Greenshot.Plugin;
+using GreenshotPlugin.Interfaces;
 
 namespace Greenshot.Destinations {
 	/// <summary>

Greenshot/Destinations/EditorDestination.cs

@@ -23,8 +23,9 @@ using System.Collections.Generic;
 using System.Drawing;
 using Greenshot.Configuration;
 using GreenshotPlugin.Core;
-using Greenshot.Plugin;
-using Greenshot.IniFile;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Forms;
 using log4net;
 
 namespace Greenshot.Destinations {

Greenshot/Destinations/EmailDestination.cs

@@ -24,8 +24,8 @@ using System.Windows.Forms;
 
 using Greenshot.Configuration;
 using Greenshot.Helpers;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.Interfaces;
 
 namespace Greenshot.Destinations {
 	/// <summary>

Greenshot/Destinations/FileDestination.cs

@@ -25,9 +25,10 @@ using System.Windows.Forms;
 
 using Greenshot.Configuration;
 using GreenshotPlugin.Core;
-using Greenshot.Plugin;
-using Greenshot.IniFile;
 using GreenshotPlugin.Controls;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 using log4net;
 
 namespace Greenshot.Destinations {

Greenshot/Destinations/FileWithDialogDestination.cs

@@ -24,8 +24,8 @@ using System.Windows.Forms;
 
 using Greenshot.Configuration;
 using GreenshotPlugin.Core;
-using Greenshot.Plugin;
-using Greenshot.IniFile;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
 
 namespace Greenshot.Destinations {
 	/// <summary>

Greenshot/Destinations/PickerDestination.cs

@@ -22,8 +22,8 @@
 using System.Collections.Generic;
 using Greenshot.Configuration;
 using GreenshotPlugin.Core;
-using Greenshot.Plugin;
 using Greenshot.Helpers;
+using GreenshotPlugin.Interfaces;
 
 namespace Greenshot.Destinations {
 	/// <summary>

Greenshot/Destinations/PrinterDestination.cs

@@ -27,8 +27,8 @@ using System.Windows.Forms;
 
 using Greenshot.Configuration;
 using GreenshotPlugin.Core;
-using Greenshot.Plugin;
 using Greenshot.Helpers;
+using GreenshotPlugin.Interfaces;
 
 namespace Greenshot.Destinations {
 	/// <summary>

Greenshot/Drawing/Adorners/AbstractAdorner.cs

@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using Greenshot.Plugin.Drawing;
-using Greenshot.Plugin.Drawing.Adorners;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Windows.Forms;
+using GreenshotPlugin.Interfaces.Drawing;
+using GreenshotPlugin.Interfaces.Drawing.Adorners;
 
 namespace Greenshot.Drawing.Adorners
 {

Greenshot/Drawing/Adorners/MoveAdorner.cs

@@ -20,10 +20,10 @@
  */
 
 using Greenshot.Helpers;
-using Greenshot.Plugin.Drawing;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Windows.Forms;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing.Adorners
 {

Greenshot/Drawing/Adorners/ResizeAdorner.cs

@@ -20,10 +20,10 @@
  */
 
 using Greenshot.Helpers;
-using Greenshot.Plugin.Drawing;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Windows.Forms;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing.Adorners
 {

Greenshot/Drawing/Adorners/TargetAdorner.cs

@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using Greenshot.Plugin.Drawing;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Windows.Forms;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing.Adorners
 {

Greenshot/Drawing/ArrowContainer.cs

@@ -23,7 +23,7 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 
 using Greenshot.Drawing.Fields;
-using Greenshot.Plugin.Drawing;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing {
 	/// <summary>

Greenshot/Drawing/CropContainer.cs

@@ -23,7 +23,6 @@ using System.Drawing;
 using System.Runtime.Serialization;
 using Greenshot.Drawing.Fields;
 using Greenshot.Helpers;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing {

Greenshot/Drawing/CursorContainer.cs

@@ -22,11 +22,10 @@ using System;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-
-using Greenshot.Plugin.Drawing;
 using System.Drawing.Drawing2D;
 using log4net;
 using System.Runtime.Serialization;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing {
 	/// <summary>

Greenshot/Drawing/DrawableContainer.cs

@@ -24,11 +24,7 @@ using Greenshot.Drawing.Adorners;
 using Greenshot.Drawing.Fields;
 using Greenshot.Drawing.Filters;
 using Greenshot.Helpers;
-using Greenshot.IniFile;
 using Greenshot.Memento;
-using Greenshot.Plugin;
-using Greenshot.Plugin.Drawing;
-using Greenshot.Plugin.Drawing.Adorners;
 using GreenshotPlugin.Interfaces.Drawing;
 using log4net;
 using System;
@@ -38,6 +34,9 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Runtime.Serialization;
 using System.Windows.Forms;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Drawing.Adorners;
 
 namespace Greenshot.Drawing
 {

Greenshot/Drawing/DrawableContainerList.cs

@@ -21,8 +21,6 @@
 
 using Greenshot.Configuration;
 using Greenshot.Memento;
-using Greenshot.Plugin;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.Interfaces.Drawing;
 using System;
@@ -32,6 +30,7 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Threading;
 using System.Windows.Forms;
+using GreenshotPlugin.Interfaces;
 
 namespace Greenshot.Drawing {
 	/// <summary>

Greenshot/Drawing/EllipseContainer.cs

@@ -24,7 +24,7 @@ using System.Drawing.Drawing2D;
 
 using Greenshot.Drawing.Fields;
 using Greenshot.Helpers;
-using Greenshot.Plugin.Drawing;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing {
 	/// <summary>

Greenshot/Drawing/Fields/AbstractFieldHolder.cs

@@ -25,7 +25,7 @@ using System.Drawing;
 using System.Runtime.Serialization;
 
 using Greenshot.Configuration;
-using Greenshot.IniFile;
+using GreenshotPlugin.IniFile;
 using log4net;
 using GreenshotPlugin.Interfaces.Drawing;
 

Greenshot/Drawing/Fields/Binding/BidirectionalBinding.cs

@@ -129,7 +129,7 @@ namespace Greenshot.Drawing.Fields.Binding {
 						targetPropertyInfo.SetValue(targetObject, bValue, null);
 					}
 				} catch (Exception e) {
-					throw new MemberAccessException("Could not set property '"+targetProperty+"' to '"+bValue+"' ["+(bValue?.GetType().Name ?? "")+"] on "+targetObject+". Probably other type than expected, IBindingCoverter to the rescue.", e);
+					throw new MemberAccessException("Could not set property '"+targetProperty+"' to '"+bValue+"' ["+(bValue?.GetType().Name ?? string.Empty)+"] on "+targetObject+". Probably other type than expected, IBindingCoverter to the rescue.", e);
 				}
 				
 			}

Greenshot/Drawing/Fields/FieldAggregator.cs

@@ -21,13 +21,12 @@
 
 using System;
 using Greenshot.Configuration;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Interfaces.Drawing;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
 
 namespace Greenshot.Drawing.Fields
 {

Greenshot/Drawing/FilterContainer.cs

@@ -22,9 +22,9 @@ using System;
 using System.Drawing;
 using Greenshot.Drawing.Fields;
 using Greenshot.Helpers;
-using Greenshot.Plugin.Drawing;
 using System.Drawing.Drawing2D;
 using System.Runtime.Serialization;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing {
 	/// <summary>

Greenshot/Drawing/Filters/AbstractFilter.cs

@@ -23,7 +23,7 @@ using System.ComponentModel;
 using System.Drawing;
 
 using Greenshot.Drawing.Fields;
-using Greenshot.Plugin.Drawing;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing.Filters {
 	/// <summary>

Greenshot/Drawing/Filters/BlurFilter.cs

@@ -22,10 +22,10 @@
 using System;
 using System.Drawing;
 using Greenshot.Drawing.Fields;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.UnmanagedHelpers;
 using System.Drawing.Drawing2D;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing.Filters {
 	[Serializable] 

Greenshot/Drawing/Filters/BrightnessFilter.cs

@@ -21,10 +21,10 @@
 using System;
 using System.Drawing;
 using Greenshot.Drawing.Fields;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Core;
 using System.Drawing.Imaging;
 using System.Drawing.Drawing2D;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing.Filters {
 	[Serializable()] 

Greenshot/Drawing/Filters/GrayscaleFilter.cs

@@ -21,9 +21,9 @@
 using System;
 using System.Drawing;
 using GreenshotPlugin.Core;
-using Greenshot.Plugin.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing.Filters {
 	/// <summary>

Greenshot/Drawing/Filters/HighlightFilter.cs

@@ -21,9 +21,9 @@
 using System;
 using System.Drawing;
 using Greenshot.Drawing.Fields;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Core;
 using System.Drawing.Drawing2D;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing.Filters {
 	[Serializable()] 

Greenshot/Drawing/Filters/IFilter.cs

@@ -21,7 +21,6 @@
 
 using System.ComponentModel;
 using System.Drawing;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing.Filters

Greenshot/Drawing/Filters/MagnifierFilter.cs

@@ -21,9 +21,9 @@
 using System;
 using System.Drawing;
 using Greenshot.Drawing.Fields;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Core;
 using System.Drawing.Drawing2D;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing.Filters {
 	[Serializable] 

Greenshot/Drawing/Filters/PixelizationFilter.cs

@@ -24,8 +24,8 @@ using System.Drawing;
 
 using Greenshot.Drawing.Fields;
 using Greenshot.Helpers;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing.Filters {
 	[Serializable()] 

Greenshot/Drawing/FreehandContainer.cs

@@ -21,12 +21,12 @@
 
 using Greenshot.Drawing.Fields;
 using Greenshot.Helpers;
-using Greenshot.Plugin.Drawing;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Runtime.Serialization;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing {
 	/// <summary>

Greenshot/Drawing/IconContainer.cs

@@ -21,10 +21,10 @@
 using System;
 using System.Drawing;
 using System.IO;
-using Greenshot.Plugin.Drawing;
 using System.Drawing.Drawing2D;
 using log4net;
 using System.Runtime.Serialization;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing {
 	/// <summary>

Greenshot/Drawing/ImageContainer.cs

@@ -22,7 +22,6 @@ using System;
 using System.Drawing;
 using System.IO;
 using Greenshot.Drawing.Fields;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Core;
 using System.Drawing.Drawing2D;
 using log4net;

Greenshot/Drawing/LineContainer.cs

@@ -25,8 +25,8 @@ using System.Runtime.Serialization;
 
 using Greenshot.Drawing.Fields;
 using Greenshot.Helpers;
-using Greenshot.Plugin.Drawing;
 using Greenshot.Drawing.Adorners;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing {
 	/// <summary>

Greenshot/Drawing/RectangleContainer.cs

@@ -24,8 +24,8 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using Greenshot.Drawing.Fields;
 using Greenshot.Helpers;
-using Greenshot.Plugin.Drawing;
 using System.Runtime.Serialization;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing {
 	/// <summary>

Greenshot/Drawing/SpeechbubbleContainer.cs

@@ -21,12 +21,12 @@
 
 using Greenshot.Drawing.Fields;
 using Greenshot.Helpers;
-using Greenshot.Plugin.Drawing;
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Text;
 using System.Runtime.Serialization;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Drawing
 {

Greenshot/Drawing/StepLabelContainer.cs

@@ -21,7 +21,6 @@
 
 using Greenshot.Drawing.Fields;
 using Greenshot.Helpers;
-using Greenshot.Plugin.Drawing;
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;

Greenshot/Drawing/Surface.cs

@@ -22,11 +22,7 @@
 using Greenshot.Configuration;
 using Greenshot.Drawing.Fields;
 using Greenshot.Helpers;
-using Greenshot.IniFile;
 using Greenshot.Memento;
-using Greenshot.Plugin;
-using Greenshot.Plugin.Drawing;
-using Greenshot.Plugin.Drawing.Adorners;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.Interfaces.Drawing;
@@ -41,6 +37,9 @@ using System.IO;
 using System.Runtime.Serialization.Formatters.Binary;
 using System.Windows.Forms;
 using GreenshotPlugin.Effects;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Drawing.Adorners;
 
 namespace Greenshot.Drawing
 {

Greenshot/Drawing/TextContainer.cs

@@ -22,7 +22,6 @@
 using Greenshot.Drawing.Fields;
 using Greenshot.Helpers;
 using Greenshot.Memento;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Interfaces.Drawing;
 using System;
 using System.ComponentModel;
@@ -511,7 +510,7 @@ namespace Greenshot.Drawing
                     prevSpacePos = _textBox.Text.LastIndexOf(' ', selStart - 1);
                 }
                 _textBox.Select(prevSpacePos + 1, _textBox.SelectionStart - prevSpacePos - 1);
-                _textBox.SelectedText = "";
+                _textBox.SelectedText = string.Empty;
             }
         }
 

Greenshot/Forms/AboutForm.cs

@@ -32,8 +32,8 @@ using System.Drawing.Drawing2D;
 using Greenshot.Helpers;
 using Greenshot.Configuration;
 using GreenshotPlugin.Core;
-using Greenshot.IniFile;
 using System.Security.Permissions;
+using GreenshotPlugin.IniFile;
 using log4net;
 
 namespace Greenshot {

Greenshot/Forms/CaptureForm.cs

@@ -21,8 +21,6 @@
 
 using Greenshot.Drawing;
 using Greenshot.Helpers;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.UnmanagedHelpers;
@@ -35,6 +33,8 @@ using System.Drawing.Imaging;
 using System.Globalization;
 using System.Security.Permissions;
 using System.Windows.Forms;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
 
 namespace Greenshot.Forms {
 	/// <summary>

Greenshot/Forms/ColorDialog.cs

@@ -21,13 +21,13 @@
 
 using Greenshot.Configuration;
 using Greenshot.Controls;
-using Greenshot.IniFile;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Globalization;
 using System.Threading;
 using System.Windows.Forms;
+using GreenshotPlugin.IniFile;
 
 namespace Greenshot {
 	/// <summary>
@@ -164,7 +164,7 @@ namespace Greenshot {
 				return;
 			}
 			TextBox textBox = (TextBox)sender;
-			string text = textBox.Text.Replace("#", "");
+			string text = textBox.Text.Replace("#", string.Empty);
             Color c;
 			if (int.TryParse(text, NumberStyles.AllowHexSpecifier, Thread.CurrentThread.CurrentCulture, out var i)) {
 				c = Color.FromArgb(i);

Greenshot/Forms/ImageEditorForm.cs

@@ -34,14 +34,15 @@ using Greenshot.Drawing.Fields.Binding;
 using Greenshot.Forms;
 using Greenshot.Help;
 using Greenshot.Helpers;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.Effects;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
 using GreenshotPlugin.Interfaces.Drawing;
+using GreenshotPlugin.Interfaces.Forms;
 using GreenshotPlugin.UnmanagedHelpers;
+using GreenshotPlugin.UnmanagedHelpers.Structs;
 using log4net;
 
 namespace Greenshot {
@@ -905,7 +906,7 @@ namespace Greenshot {
 			bool canUndo = _surface.CanUndo;
 			btnUndo.Enabled = canUndo;
 			undoToolStripMenuItem.Enabled = canUndo;
-			string undoAction = "";
+			string undoAction = string.Empty;
 			if (canUndo) {
 				if (_surface.UndoActionLanguageKey != LangKey.none) {
 					undoAction = Language.GetString(_surface.UndoActionLanguageKey);
@@ -918,7 +919,7 @@ namespace Greenshot {
 			bool canRedo = _surface.CanRedo;
 			btnRedo.Enabled = canRedo;
 			redoToolStripMenuItem.Enabled = canRedo;
-			string redoAction = "";
+			string redoAction = string.Empty;
 			if (canRedo) {
 				if (_surface.RedoActionLanguageKey != LangKey.none) {
 					redoAction = Language.GetString(_surface.RedoActionLanguageKey);

Greenshot/Forms/MainForm.cs

@@ -36,16 +36,18 @@ using Greenshot.Experimental;
 using Greenshot.Forms;
 using Greenshot.Help;
 using Greenshot.Helpers;
-using Greenshot.Plugin;
 using GreenshotPlugin.UnmanagedHelpers;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
-using Greenshot.IniFile;
 using Greenshot.Destinations;
 using Greenshot.Drawing;
 using log4net;
 using Timer = System.Timers.Timer;
 using System.Threading.Tasks;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
+using GreenshotPlugin.UnmanagedHelpers.Enums;
 
 namespace Greenshot {
 	/// <summary>
@@ -837,7 +839,7 @@ namespace Greenshot {
 				captureScreenMenuItem.DropDownItems.Add(captureScreenItem);
 				foreach (Screen screen in Screen.AllScreens) {
 					Screen screenToCapture = screen;
-					string deviceAlignment = "";
+					string deviceAlignment = string.Empty;
 					if(screen.Bounds.Top == allScreensBounds.Top && screen.Bounds.Bottom != allScreensBounds.Bottom) {
 						deviceAlignment += " " + Language.GetString(LangKey.contextmenu_capturefullscreen_top);
 					} else if(screen.Bounds.Top != allScreensBounds.Top && screen.Bounds.Bottom == allScreensBounds.Bottom) {

Greenshot/Forms/MovableShowColorForm.cs

@@ -47,10 +47,10 @@ namespace Greenshot.Forms {
 			Color c = GetPixelColor(screenCoordinates);
 			preview.BackColor = c;
 			html.Text = "#" + c.Name.Substring(2).ToUpper();
-			red.Text = "" + c.R;
-			blue.Text = "" + c.B;
-			green.Text = "" + c.G;
-			alpha.Text = "" + c.A;
+			red.Text = string.Empty + c.R;
+			blue.Text = string.Empty + c.B;
+			green.Text = string.Empty + c.G;
+			alpha.Text = string.Empty + c.A;
 
 			Size cursorSize = Cursor.Current.Size;
 			Point hotspot = Cursor.Current.HotSpot;

Greenshot/Forms/PrintOptionsDialog.cs

@@ -20,7 +20,7 @@
  */
 using System;
 using System.Windows.Forms;
-using Greenshot.IniFile;
+using GreenshotPlugin.IniFile;
 
 namespace Greenshot.Forms {
 	/// <summary>

Greenshot/Forms/SettingsForm.cs

@@ -34,9 +34,11 @@ using Greenshot.Helpers;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.UnmanagedHelpers;
-using Greenshot.Plugin;
-using Greenshot.IniFile;
 using System.Text.RegularExpressions;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
+using GreenshotPlugin.UnmanagedHelpers.Enums;
 using log4net;
 
 namespace Greenshot {

Greenshot/Forms/ToolStripMenuSelectList.cs

@@ -19,13 +19,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using Greenshot.IniFile;
 using GreenshotPlugin.Core;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
+using GreenshotPlugin.IniFile;
 
 namespace Greenshot.Forms {
 	/// <summary>

Greenshot/Helpers/CaptureHelper.cs

@@ -23,8 +23,6 @@ using Greenshot.Configuration;
 using Greenshot.Destinations;
 using Greenshot.Drawing;
 using Greenshot.Forms;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
 using GreenshotPlugin.UnmanagedHelpers;
 using log4net;
@@ -35,6 +33,9 @@ using System.Drawing;
 using System.IO;
 using System.Threading;
 using System.Windows.Forms;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.UnmanagedHelpers.Enums;
 
 namespace Greenshot.Helpers {
 	/// <summary>

Greenshot/Helpers/CopyData.cs

@@ -465,7 +465,7 @@ namespace Greenshot.Helpers {
 				if (ChannelName.Length > 0) {
 					RemoveChannel();
 				}
-				ChannelName = "";
+				ChannelName = string.Empty;
 			}
 		}
 

Greenshot/Helpers/DestinationHelper.cs

@@ -22,9 +22,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
-using Greenshot.IniFile;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
 using log4net;
 
 namespace Greenshot.Helpers {

Greenshot/Helpers/EnvironmentInfo.cs

@@ -24,7 +24,7 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows.Forms;
-using Greenshot.IniFile;
+using GreenshotPlugin.IniFile;
 using GreenshotPlugin.UnmanagedHelpers;
 
 namespace Greenshot.Helpers

Greenshot/Helpers/IECaptureHelper.cs

@@ -26,13 +26,14 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using Greenshot.Configuration;
 using Greenshot.Helpers.IEInterop;
-using Greenshot.Interop;
-using Greenshot.Interop.IE;
-using Greenshot.Plugin;
 using GreenshotPlugin.UnmanagedHelpers;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
-using Greenshot.IniFile;
+using GreenshotPlugin.IEInterop;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interop;
+using GreenshotPlugin.UnmanagedHelpers.Enums;
 using log4net;
 
 namespace Greenshot.Helpers {

Greenshot/Helpers/IEInterop/IEContainer.cs

@@ -25,9 +25,9 @@ using System.Globalization;
 using System.Runtime.InteropServices;
 
 using GreenshotPlugin.Core;
-using Greenshot.Interop.IE;
+using GreenshotPlugin.IEInterop;
 using log4net;
-using IServiceProvider = Greenshot.Interop.IServiceProvider;
+using IServiceProvider = GreenshotPlugin.Interop.IServiceProvider;
 
 namespace Greenshot.Helpers.IEInterop {
 	public class DocumentContainer {

Greenshot/Helpers/MailHelper.cs

@@ -19,8 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
 using log4net;
 using System;
@@ -30,6 +28,9 @@ using System.IO;
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 
 namespace Greenshot.Helpers {
 	/// <summary>

Greenshot/Helpers/PluginHelper.cs

@@ -26,9 +26,10 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
-using Greenshot.IniFile;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 using log4net;
 
 namespace Greenshot.Helpers {

Greenshot/Helpers/PrintHelper.cs

@@ -25,10 +25,11 @@ using System.Windows.Forms;
 
 using Greenshot.Configuration;
 using Greenshot.Forms;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
-using Greenshot.IniFile;
 using GreenshotPlugin.Effects;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 using log4net;
 
 namespace Greenshot.Helpers {

Greenshot/Helpers/ProcessorHelper.cs

@@ -20,9 +20,8 @@
  */
 using System;
 using System.Collections.Generic;
-
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.Interfaces;
 using log4net;
 
 namespace Greenshot.Helpers {

Greenshot/Helpers/SoundHelper.cs

@@ -25,9 +25,9 @@ using System.Runtime.InteropServices;
 
 using GreenshotPlugin.UnmanagedHelpers;
 using GreenshotPlugin.Core;
-using Greenshot.IniFile;
 using System.IO;
-
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.UnmanagedHelpers.Enums;
 using log4net;
 
 namespace Greenshot.Helpers {

Greenshot/Helpers/UpdateHelper.cs

@@ -26,7 +26,7 @@ using System.Windows.Forms;
 
 using Greenshot.Configuration;
 using GreenshotPlugin.Core;
-using Greenshot.IniFile;
+using GreenshotPlugin.IniFile;
 using log4net;
 
 namespace Greenshot.Experimental {

Greenshot/Memento/AddElementMemento.cs

@@ -20,7 +20,7 @@
  */
 using System;
 using Greenshot.Drawing;
-using Greenshot.Plugin.Drawing;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Memento {
 	/// <summary>

Greenshot/Memento/AddElementsMemento.cs

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 using Greenshot.Drawing;
-using Greenshot.Plugin.Drawing;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Memento
 {

Greenshot/Memento/ChangeFieldHolderMemento.cs

@@ -19,7 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Memento

Greenshot/Memento/DeleteElementMemento.cs

@@ -20,7 +20,7 @@
  */
 using System;
 using Greenshot.Drawing;
-using Greenshot.Plugin.Drawing;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Memento {
 	/// <summary>

Greenshot/Memento/DeleteElementsMemento.cs

@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 using Greenshot.Drawing;
-using Greenshot.Plugin.Drawing;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Memento
 {

Greenshot/Memento/DrawableContainerBoundsChangeMemento.cs

@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 using Greenshot.Drawing;
-using Greenshot.Plugin.Drawing;
 using GreenshotPlugin.Core;
 using System.Collections.Generic;
 using System.Drawing;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Memento
 {

Greenshot/Memento/SurfaceBackgroundChangeMemento.cs

@@ -22,6 +22,7 @@
 using Greenshot.Drawing;
 using System.Drawing;
 using System.Drawing.Drawing2D;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Memento {
 	/// <summary>

Greenshot/Memento/TextChangeMemento.cs

@@ -20,6 +20,7 @@
  */
 
 using Greenshot.Drawing;
+using GreenshotPlugin.Interfaces.Drawing;
 
 namespace Greenshot.Memento {
 	/// <summary>

Greenshot/Processors/TitleFixProcessor.cs

@@ -21,10 +21,9 @@
 
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
-using Greenshot.IniFile;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
 using log4net;
 
 namespace Greenshot.Processors  {
@@ -67,7 +66,7 @@ namespace Greenshot.Processors  {
 				title = title.Trim();
 				foreach(string titleIdentifier in config.ActiveTitleFixes) {
 					string regexpString = config.TitleFixMatcher[titleIdentifier];
-					string replaceString = config.TitleFixReplacer[titleIdentifier] ?? "";
+					string replaceString = config.TitleFixReplacer[titleIdentifier] ?? string.Empty;
                     
                     if (string.IsNullOrEmpty(regexpString)) continue;
 

GreenshotBoxPlugin/BoxConfiguration.cs

@@ -20,9 +20,9 @@
  */
 
 using System.Windows.Forms;
-using Greenshot.IniFile;
 using GreenshotPlugin.Core;
 using System;
+using GreenshotPlugin.IniFile;
 
 namespace GreenshotBoxPlugin {
 	/// <summary>

GreenshotBoxPlugin/BoxDestination.cs

@@ -20,8 +20,8 @@
  */
 using System.ComponentModel;
 using System.Drawing;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.Interfaces;
 
 namespace GreenshotBoxPlugin {
 	public class BoxDestination : AbstractDestination {

GreenshotBoxPlugin/BoxPlugin.cs

@@ -23,10 +23,11 @@ using System.ComponentModel;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 
 namespace GreenshotBoxPlugin {
 	/// <summary>

GreenshotBoxPlugin/BoxUtils.cs

@@ -19,13 +19,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using Greenshot.IniFile;
 using GreenshotPlugin.Core;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Runtime.Serialization.Json;
 using System.Text;
+using GreenshotPlugin.IniFile;
 
 namespace GreenshotBoxPlugin {
 

GreenshotBoxPlugin/Properties/AssemblyInfo.cs

@@ -19,7 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-using Greenshot.Plugin;
 using System.Reflection;
 using System.Runtime.InteropServices;
 

GreenshotConfluencePlugin/Confluence.cs

@@ -21,10 +21,10 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using Greenshot.IniFile;
 using GreenshotConfluencePlugin;
 using GreenshotConfluencePlugin.confluence;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
 
 namespace Confluence {
     public class Page {
@@ -250,7 +250,7 @@ namespace Confluence {
 
 		public Page GetPage(long pageId) {
 			RemotePage page = null;
-			string cacheKey = "" + pageId;
+			string cacheKey = pageId.ToString();
 			
 			if (_pageCache.Contains(cacheKey)) {
 				page = _pageCache[cacheKey];

GreenshotConfluencePlugin/ConfluenceConfiguration.cs

@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 using System;
-using Greenshot.IniFile;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
 
 namespace GreenshotConfluencePlugin {
 	/// <summary>

GreenshotConfluencePlugin/ConfluenceDestination.cs

@@ -26,10 +26,11 @@ using System.IO;
 using System.Threading;
 using System.Windows;
 using Confluence;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 
 namespace GreenshotConfluencePlugin {
 	/// <summary>

GreenshotConfluencePlugin/ConfluencePlugin.cs

@@ -20,11 +20,11 @@
  */
 
 using Confluence;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
 using System;
 using System.Windows;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces.Plugin;
 using TranslationByMarkupExtension;
 
 namespace GreenshotConfluencePlugin {

GreenshotConfluencePlugin/Forms/ConfluenceSearch.xaml.cs

@@ -23,7 +23,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
-using Greenshot.IniFile;
+using GreenshotPlugin.IniFile;
 
 namespace GreenshotConfluencePlugin {
 	public partial class ConfluenceSearch

GreenshotDropboxPlugin/DropboxDestination.cs

@@ -20,9 +20,9 @@
  */
 using System.ComponentModel;
 using System.Drawing;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
 
 namespace GreenshotDropboxPlugin {
 	internal class DropboxDestination : AbstractDestination {

GreenshotDropboxPlugin/DropboxPlugin.cs

@@ -23,10 +23,11 @@ using System.ComponentModel;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 
 namespace GreenshotDropboxPlugin {
 	/// <summary>

GreenshotDropboxPlugin/DropboxPluginConfiguration.cs

@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 using System.Windows.Forms;
-using Greenshot.IniFile;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
 
 
 namespace GreenshotDropboxPlugin {

GreenshotDropboxPlugin/DropboxUtils.cs

@@ -21,9 +21,10 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 
 namespace GreenshotDropboxPlugin {
 	/// <summary>

GreenshotExternalCommandPlugin/ExternalCommandConfiguration.cs

@@ -22,8 +22,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using Greenshot.IniFile;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
 
 namespace GreenshotExternalCommandPlugin {
 	/// <summary>

GreenshotExternalCommandPlugin/ExternalCommandDestination.cs

@@ -26,9 +26,10 @@ using System.Diagnostics;
 using System.Drawing;
 using System.Text.RegularExpressions;
 using System.Threading;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 
 namespace GreenshotExternalCommandPlugin {
 	/// <summary>

GreenshotExternalCommandPlugin/ExternalCommandPlugin.cs

@@ -24,9 +24,10 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Windows.Forms;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 
 namespace GreenshotExternalCommandPlugin {
 	/// <summary>

GreenshotExternalCommandPlugin/IconCache.cs

@@ -22,8 +22,8 @@
 using System;
 using System.Drawing;
 using System.IO;
-using Greenshot.IniFile;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
 
 namespace GreenshotExternalCommandPlugin {
 	public static class IconCache {

GreenshotExternalCommandPlugin/SettingsForm.cs

@@ -22,7 +22,7 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using Greenshot.IniFile;
+using GreenshotPlugin.IniFile;
 
 namespace GreenshotExternalCommandPlugin {
 	/// <summary>

GreenshotExternalCommandPlugin/SettingsFormDetail.cs

@@ -23,8 +23,8 @@ using System;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using Greenshot.IniFile;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
 
 namespace GreenshotExternalCommandPlugin {
 	/// <summary>

GreenshotFlickrPlugin/FlickrConfiguration.cs

@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 using System.Windows.Forms;
-using Greenshot.IniFile;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
 
 namespace GreenshotFlickrPlugin {
 	public enum SafetyLevel {

GreenshotFlickrPlugin/FlickrDestination.cs

@@ -20,8 +20,8 @@
  */
 using System.ComponentModel;
 using System.Drawing;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.Interfaces;
 
 namespace GreenshotFlickrPlugin {
 	public class FlickrDestination : AbstractDestination {

GreenshotFlickrPlugin/FlickrPlugin.cs

@@ -24,10 +24,11 @@ using System.ComponentModel;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 using log4net;
 
 namespace GreenshotFlickrPlugin

GreenshotFlickrPlugin/FlickrUtils.cs

@@ -23,9 +23,10 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Xml;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 using log4net;
 
 namespace GreenshotFlickrPlugin {

GreenshotImgurPlugin/Forms/ImgurHistory.cs

@@ -25,7 +25,7 @@ using System.Windows.Forms;
 
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
-using Greenshot.IniFile;
+using GreenshotPlugin.IniFile;
 
 namespace GreenshotImgurPlugin {
 	/// <summary>

GreenshotImgurPlugin/ImgurConfiguration.cs

@@ -22,8 +22,8 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using Greenshot.IniFile;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
 
 namespace GreenshotImgurPlugin {
 	/// <summary>

GreenshotImgurPlugin/ImgurDestination.cs

@@ -20,8 +20,8 @@
  */
 using System.ComponentModel;
 using System.Drawing;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.Interfaces;
 
 namespace GreenshotImgurPlugin  {
 	/// <summary>

GreenshotImgurPlugin/ImgurPlugin.cs

@@ -24,10 +24,11 @@ using System.ComponentModel;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Controls;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 
 namespace GreenshotImgurPlugin {
 	/// <summary>

GreenshotImgurPlugin/ImgurUtils.cs

@@ -24,9 +24,10 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net;
-using Greenshot.IniFile;
-using Greenshot.Plugin;
 using GreenshotPlugin.Core;
+using GreenshotPlugin.IniFile;
+using GreenshotPlugin.Interfaces;
+using GreenshotPlugin.Interfaces.Plugin;
 
 namespace GreenshotImgurPlugin {
 	/// <summary>