diff --git a/src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs b/src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs
index ddc78a1bd..ecc266164 100644
--- a/src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs
+++ b/src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs
@@ -29,7 +29,7 @@ using Greenshot.Core.Enums;
 
 namespace Greenshot.Addon.Box.Configuration.Impl
 {
-    public class BoxConfigurationImpl : IniSectionBase<IBoxConfiguration>, IBoxConfiguration
+    internal class BoxConfigurationImpl : IniSectionBase<IBoxConfiguration>, IBoxConfiguration
     {
         #region Implementation of IFileConfiguration
 
diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
index 653e8dd99..4c92e96ce 100644
--- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
+++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
@@ -49,7 +49,7 @@
     <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.Confluence/Configuration/Impl/ConfluenceConfigurationImpl.cs b/src/Greenshot.Addon.Confluence/Configuration/Impl/ConfluenceConfigurationImpl.cs
index 5d81feca2..0c04f17ce 100644
--- a/src/Greenshot.Addon.Confluence/Configuration/Impl/ConfluenceConfigurationImpl.cs
+++ b/src/Greenshot.Addon.Confluence/Configuration/Impl/ConfluenceConfigurationImpl.cs
@@ -26,7 +26,7 @@ using Greenshot.Core.Enums;
 
 namespace Greenshot.Addon.Confluence.Configuration.Impl
 {
-    public class ConfluenceConfigurationImpl : IniSectionBase<IConfluenceConfiguration>, IConfluenceConfiguration
+    internal class ConfluenceConfigurationImpl : IniSectionBase<IConfluenceConfiguration>, IConfluenceConfiguration
     {
         #region Implementation of IConfluenceConfiguration
 
diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
index e959b8bf6..7eeabed04 100644
--- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
+++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
@@ -55,7 +55,7 @@
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Dapplo.Confluence" Version="0.8.14" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
index b7be56489..28f9794a4 100644
--- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
+++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
@@ -51,7 +51,7 @@
     <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.ExternalCommand/Configuration/Impl/ExternalCommandConfigurationImpl.cs b/src/Greenshot.Addon.ExternalCommand/Configuration/Impl/ExternalCommandConfigurationImpl.cs
index 5f4c84286..1c6ac8333 100644
--- a/src/Greenshot.Addon.ExternalCommand/Configuration/Impl/ExternalCommandConfigurationImpl.cs
+++ b/src/Greenshot.Addon.ExternalCommand/Configuration/Impl/ExternalCommandConfigurationImpl.cs
@@ -28,7 +28,7 @@ using Greenshot.Core.Enums;
 
 namespace Greenshot.Addon.ExternalCommand.Configuration.Impl
 {
-    public class ExternalCommandConfigurationImpl : IniSectionBase<IExternalCommandConfiguration>, IExternalCommandConfiguration
+    internal class ExternalCommandConfigurationImpl : IniSectionBase<IExternalCommandConfiguration>, IExternalCommandConfiguration
     {
         #region Overrides of IniSectionBase<IExternalCommandConfiguration>
 
diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
index ee3c4d4fa..267c3cfc2 100644
--- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
+++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
@@ -40,7 +40,7 @@
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
     <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
 	<PackageReference Include="CliWrap" Version="2.1.0" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrConfigurationImpl.cs b/src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrConfigurationImpl.cs
index 404531ee3..c45483262 100644
--- a/src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrConfigurationImpl.cs
+++ b/src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrConfigurationImpl.cs
@@ -28,7 +28,7 @@ using Greenshot.Core.Enums;
 
 namespace Greenshot.Addon.Flickr.Configuration.Impl
 {
-    public class FlickrConfigurationImpl : IniSectionBase<IFlickrConfiguration>, IFlickrConfiguration
+    internal class FlickrConfigurationImpl : IniSectionBase<IFlickrConfiguration>, IFlickrConfiguration
     {
         #region Implementation of IFileConfiguration
 
diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
index dc815cb75..d05a80acb 100644
--- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
+++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
@@ -49,7 +49,7 @@
     <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosConfigurationImpl.cs b/src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosConfigurationImpl.cs
index 1d122826c..0ddeb83d4 100644
--- a/src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosConfigurationImpl.cs
+++ b/src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosConfigurationImpl.cs
@@ -29,7 +29,7 @@ using Greenshot.Core.Enums;
 
 namespace Greenshot.Addon.GooglePhotos.Configuration.Impl
 {
-    public class GooglePhotosConfigurationImpl : IniSectionBase<IGooglePhotosConfiguration>, IGooglePhotosConfiguration
+    internal class GooglePhotosConfigurationImpl : IniSectionBase<IGooglePhotosConfiguration>, IGooglePhotosConfiguration
     {
         #region Implementation of IFileConfiguration
 
diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
index 67ea3a3df..3146812cf 100644
--- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
+++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
@@ -49,7 +49,7 @@
     <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurConfigurationImpl.cs b/src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurConfigurationImpl.cs
index bc0c805e1..f24bdc4d2 100644
--- a/src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurConfigurationImpl.cs
+++ b/src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurConfigurationImpl.cs
@@ -31,7 +31,7 @@ using Greenshot.Core.Enums;
 
 namespace Greenshot.Addon.Imgur.Configuration.Impl
 {
-    public class ImgurConfigurationImpl : IniSectionBase<IImgurConfiguration>, IImgurConfiguration
+    internal class ImgurConfigurationImpl : IniSectionBase<IImgurConfiguration>, IImgurConfiguration
     {
         #region Implementation of IFileConfiguration
 
diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
index 549cdb47f..321d9452c 100644
--- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
+++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
@@ -50,7 +50,7 @@
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
index 62c2d4e89..8a42ccd19 100644
--- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
+++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
@@ -30,10 +30,10 @@
   
   <ItemGroup>
     <PackageReference Include="Dapplo.Windows">
-      <Version>0.7.21</Version>
+      <Version>0.7.24</Version>
     </PackageReference>
     <PackageReference Include="Dapplo.Windows.Com">
-      <Version>0.7.21</Version>
+      <Version>0.7.24</Version>
     </PackageReference>
     <PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
   </ItemGroup>
diff --git a/src/Greenshot.Addon.Jira/Configuration/Impl/JiraConfigurationImpl.cs b/src/Greenshot.Addon.Jira/Configuration/Impl/JiraConfigurationImpl.cs
index bd0598a9c..8356e2f3a 100644
--- a/src/Greenshot.Addon.Jira/Configuration/Impl/JiraConfigurationImpl.cs
+++ b/src/Greenshot.Addon.Jira/Configuration/Impl/JiraConfigurationImpl.cs
@@ -26,7 +26,7 @@ using Greenshot.Core.Enums;
 
 namespace Greenshot.Addon.Jira.Configuration.Impl
 {
-    public class JiraConfigurationImpl : IniSectionBase<IJiraConfiguration>, IJiraConfiguration
+    internal class JiraConfigurationImpl : IniSectionBase<IJiraConfiguration>, IJiraConfiguration
     {
         #region Implementation of IFileConfiguration
 
diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
index 8be7b7424..8f8789981 100644
--- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
+++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
@@ -53,7 +53,7 @@
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Utils" Version="1.1.9" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
 	<PackageReference Include="Dapplo.Jira" Version="0.8.7" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
index fc01ad2dc..0afe9b0af 100644
--- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
+++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
@@ -136,8 +136,8 @@
     <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
     <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
-    <PackageReference Include="Dapplo.Windows.Icons" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
+    <PackageReference Include="Dapplo.Windows.Icons" Version="0.7.24" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.Lutim/Configuration/Impl/LutimConfigurationImpl.cs b/src/Greenshot.Addon.Lutim/Configuration/Impl/LutimConfigurationImpl.cs
index 36aab443b..cd0481f3c 100644
--- a/src/Greenshot.Addon.Lutim/Configuration/Impl/LutimConfigurationImpl.cs
+++ b/src/Greenshot.Addon.Lutim/Configuration/Impl/LutimConfigurationImpl.cs
@@ -28,7 +28,7 @@ using Greenshot.Core.Enums;
 
 namespace Greenshot.Addon.Lutim.Configuration.Impl
 {
-    public class LutimConfigurationImpl : IniSectionBase<ILutimConfiguration>, ILutimConfiguration
+    internal class LutimConfigurationImpl : IniSectionBase<ILutimConfiguration>, ILutimConfiguration
     {
         #region Implementation of IFileConfiguration
 
diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
index d83c51dda..7bf3fc45b 100644
--- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
+++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
@@ -50,7 +50,7 @@
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
 	<PackageReference Include="MahApps.Metro" Version="1.6.5" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Greenshot.Addon.OCR/Configuration/Impl/OcrConfigurationImpl.cs b/src/Greenshot.Addon.OCR/Configuration/Impl/OcrConfigurationImpl.cs
index 7530d1637..c37107396 100644
--- a/src/Greenshot.Addon.OCR/Configuration/Impl/OcrConfigurationImpl.cs
+++ b/src/Greenshot.Addon.OCR/Configuration/Impl/OcrConfigurationImpl.cs
@@ -25,7 +25,7 @@ using Dapplo.Config.Ini;
 
 namespace Greenshot.Addon.OCR.Configuration.Impl
 {
-    public class OcrConfigurationImpl : IniSectionBase<IOcrConfiguration>, IOcrConfiguration
+    internal class OcrConfigurationImpl : IniSectionBase<IOcrConfiguration>, IOcrConfiguration
     {
         #region Implementation of IOcrConfiguration
 
diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
index 081dc2098..8b40bc513 100644
--- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
+++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
@@ -40,7 +40,7 @@
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
     <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.Office/Configuration/Impl/OfficeConfigurationImpl.cs b/src/Greenshot.Addon.Office/Configuration/Impl/OfficeConfigurationImpl.cs
index 731d5bdff..e8c1fd02b 100644
--- a/src/Greenshot.Addon.Office/Configuration/Impl/OfficeConfigurationImpl.cs
+++ b/src/Greenshot.Addon.Office/Configuration/Impl/OfficeConfigurationImpl.cs
@@ -31,7 +31,7 @@ namespace Greenshot.Addon.Office.Configuration.Impl
     /// This implements IOfficeConfiguration and takes care of storing, all setters are replaced via AutoProperties.Fody
     /// </summary>
 #pragma warning disable CS1591
-    public class OfficeConfigurationImpl : IniSectionBase<IOfficeConfiguration>, IOfficeConfiguration
+    internal class OfficeConfigurationImpl : IniSectionBase<IOfficeConfiguration>, IOfficeConfiguration
     {
         #region Implementation of IOfficeConfiguration
 
diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
index 0c36e3904..e47084b1c 100644
--- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
+++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
@@ -47,7 +47,7 @@
     <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
     <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0" />
     <PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1000" />
     <PackageReference Include="Microsoft.Office.Interop.Outlook" Version="15.0.4797.1003" />
diff --git a/src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveConfigurationImpl.cs b/src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveConfigurationImpl.cs
index 98fa47bac..6a09a13b8 100644
--- a/src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveConfigurationImpl.cs
+++ b/src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveConfigurationImpl.cs
@@ -29,7 +29,7 @@ using Greenshot.Core.Enums;
 
 namespace Greenshot.Addon.OneDrive.Configuration.Impl
 {
-    public class OneDriveConfigurationImpl : IniSectionBase<IOneDriveConfiguration>, IOneDriveConfiguration
+    internal class OneDriveConfigurationImpl : IniSectionBase<IOneDriveConfiguration>, IOneDriveConfiguration
     {
         #region Implementation of IFileConfiguration
 
diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
index 2d74973e2..2e94f8e20 100644
--- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
+++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
@@ -50,7 +50,7 @@
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
 	<PackageReference Include="MahApps.Metro" Version="1.6.5" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketConfigurationImpl.cs b/src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketConfigurationImpl.cs
index 15ee02729..ffe5a28cb 100644
--- a/src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketConfigurationImpl.cs
+++ b/src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketConfigurationImpl.cs
@@ -28,7 +28,7 @@ using Greenshot.Core.Enums;
 
 namespace Greenshot.Addon.Photobucket.Configuration.Impl
 {
-    public class PhotobucketConfigurationImpl : IniSectionBase<IPhotobucketConfiguration>, IPhotobucketConfiguration
+    internal class PhotobucketConfigurationImpl : IniSectionBase<IPhotobucketConfiguration>, IPhotobucketConfiguration
     {
         #region Implementation of IFileConfiguration
 
diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
index 290358220..7ddbe8311 100644
--- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
+++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
@@ -49,7 +49,7 @@
     <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/src/Greenshot.Addon.Tfs/Configuration/Impl/TfsConfigurationImpl.cs b/src/Greenshot.Addon.Tfs/Configuration/Impl/TfsConfigurationImpl.cs
index 28739c9de..82611e9f3 100644
--- a/src/Greenshot.Addon.Tfs/Configuration/Impl/TfsConfigurationImpl.cs
+++ b/src/Greenshot.Addon.Tfs/Configuration/Impl/TfsConfigurationImpl.cs
@@ -27,7 +27,7 @@ using Greenshot.Core.Enums;
 
 namespace Greenshot.Addon.Tfs.Configuration.Impl
 {
-    public class TfsConfigurationImpl : IniSectionBase<ITfsConfiguration>, ITfsConfiguration
+    internal class TfsConfigurationImpl : IniSectionBase<ITfsConfiguration>, ITfsConfiguration
     {
         #region Implementation of IFileConfiguration
 
diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
index 1c55b0d12..3b8496371 100644
--- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
+++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
@@ -50,7 +50,7 @@
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
     <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
 	<PackageReference Include="MahApps.Metro" Version="1.6.5" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
index 2b498e8e6..7a883c1ed 100644
--- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
+++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
@@ -52,6 +52,6 @@
   <ItemGroup>
     <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Greenshot.Addons/Config/Impl/CoreConfigurationImpl.cs b/src/Greenshot.Addons/Config/Impl/CoreConfigurationImpl.cs
index a722525bf..1eac3c3e4 100644
--- a/src/Greenshot.Addons/Config/Impl/CoreConfigurationImpl.cs
+++ b/src/Greenshot.Addons/Config/Impl/CoreConfigurationImpl.cs
@@ -1,4 +1,27 @@
-using System;
+#region Greenshot GNU General Public License
+
+// Greenshot - a free and open source screenshot tool
+// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
+// 
+// For more information see: http://getgreenshot.org/
+// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 1 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows;
diff --git a/src/Greenshot.Addons/Config/Impl/GreenshotLanguageImpl.cs b/src/Greenshot.Addons/Config/Impl/GreenshotLanguageImpl.cs
index 0ec3e58ef..19ebfaaba 100644
--- a/src/Greenshot.Addons/Config/Impl/GreenshotLanguageImpl.cs
+++ b/src/Greenshot.Addons/Config/Impl/GreenshotLanguageImpl.cs
@@ -1,4 +1,27 @@
-using System.Diagnostics.CodeAnalysis;
+#region Greenshot GNU General Public License
+
+// Greenshot - a free and open source screenshot tool
+// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
+// 
+// For more information see: http://getgreenshot.org/
+// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 1 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+using System.Diagnostics.CodeAnalysis;
 using Dapplo.Config.Language;
 
 namespace Greenshot.Addons.Config.Impl
diff --git a/src/Greenshot.Addons/Config/Impl/HttpConfigurationImpl.cs b/src/Greenshot.Addons/Config/Impl/HttpConfigurationImpl.cs
index a9cfce4d7..bf1a2f62e 100644
--- a/src/Greenshot.Addons/Config/Impl/HttpConfigurationImpl.cs
+++ b/src/Greenshot.Addons/Config/Impl/HttpConfigurationImpl.cs
@@ -1,4 +1,27 @@
-using System;
+#region Greenshot GNU General Public License
+
+// Greenshot - a free and open source screenshot tool
+// Copyright (C) 2007-2018 Thomas Braun, Jens Klingen, Robin Krom
+// 
+// For more information see: http://getgreenshot.org/
+// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 1 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#endregion
+
+using System;
 using System.Net;
 using System.Net.Cache;
 using System.Net.Http;
@@ -47,7 +70,7 @@ namespace Greenshot.Addons.Config.Impl
 
         IHttpSettings IHttpSettings.ShallowClone()
         {
-            throw new NotImplementedException();
+            return ShallowClone() as IHttpSettings;
         }
     }
 }
diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj
index 6fc856937..9b238867e 100644
--- a/src/Greenshot.Addons/Greenshot.Addons.csproj
+++ b/src/Greenshot.Addons/Greenshot.Addons.csproj
@@ -63,10 +63,10 @@
       <Version>0.9.15</Version>
     </PackageReference>
     <PackageReference Include="Dapplo.Windows.Clipboard">
-      <Version>0.7.21</Version>
+      <Version>0.7.24</Version>
     </PackageReference>
     <PackageReference Include="Dapplo.Windows.Icons">
-      <Version>0.7.21</Version>
+      <Version>0.7.24</Version>
     </PackageReference>
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Greenshot.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj
index 0feabab9e..6bdc5ec70 100644
--- a/src/Greenshot.Core/Greenshot.Core.csproj
+++ b/src/Greenshot.Core/Greenshot.Core.csproj
@@ -29,7 +29,7 @@
   
   <ItemGroup>
     <PackageReference Include="Dapplo.Windows.Icons">
-      <Version>0.7.21</Version>
+      <Version>0.7.24</Version>
     </PackageReference>
   </ItemGroup>
 
diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj
index 10d3bf75c..cd891f370 100644
--- a/src/Greenshot.Tests/Greenshot.Tests.csproj
+++ b/src/Greenshot.Tests/Greenshot.Tests.csproj
@@ -67,7 +67,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.2.849" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.11.2" />
     <PackageReference Include="CommandLineParser" Version="2.3.0" />
     <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index 5cd16afdb..189857fc5 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -89,9 +89,9 @@
     <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
     <PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />
     <PackageReference Include="Dapplo.Log.Loggers" Version="1.3.11" />
-    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
-    <PackageReference Include="Dapplo.Windows.Icons" Version="0.7.21" />
-    <PackageReference Include="Dapplo.Windows.Multimedia" Version="0.7.21" />
+    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
+    <PackageReference Include="Dapplo.Windows.Icons" Version="0.7.24" />
+    <PackageReference Include="Dapplo.Windows.Multimedia" Version="0.7.24" />
     <PackageReference Include="Fody" Version="3.2.17">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>