diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 6e1abed21..9f52f2b33 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -15,11 +15,11 @@
     <FileVersion>1.0.0</FileVersion>
     <AssemblySearchPaths Condition="'$(TargetFramework)' == 'net472'">{HintPathFromItem};{TargetFrameworkDirectory};{RawFileName};{GAC};</AssemblySearchPaths>
     <UseWPF>true</UseWPF>
-    <UseWindowsForms>false</UseWindowsForms>
+    <UseWindowsForms>true</UseWindowsForms>
     <OsProductName>$(registry:HKEY_LOCAL_MACHINE\Software\Microsoft\Windows NT\CurrentVersion@ProductName)</OsProductName>
     <!--RuntimeIdentifiers>win10-x64;win10-x86;win-x64;win-x86</RuntimeIdentifiers-->
     <ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
-    <ExtrasEnableWinFormsProjectSetup>false</ExtrasEnableWinFormsProjectSetup>
+    <ExtrasEnableWinFormsProjectSetup>true</ExtrasEnableWinFormsProjectSetup>
   </PropertyGroup>
   
   <PropertyGroup Condition="'$(Configuration)' != 'Debug' And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">
@@ -48,7 +48,7 @@
     <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
 
-  <!--<ItemGroup Condition="!$(MSBuildProjectName.Contains('Tests'))">
+  <ItemGroup Condition="!$(MSBuildProjectName.Contains('Tests')) And $(MSBuildProjectName.StartsWith('Greenshot'))">
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.3.105">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
@@ -57,7 +57,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-  </ItemGroup>-->
+  </ItemGroup>
 
   <Target Name="PostBuild" BeforeTargets="PostBuildEvent" Condition="$(MSBuildProjectName.Contains('Addon.')) And !$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">
     <Exec Command="
diff --git a/src/Greenshot.Addon.Imgur/Entities/ImgurData.cs b/src/Greenshot.Addon.Imgur/Entities/ImgurData.cs
index 47fd0f1f5..79ed742ef 100644
--- a/src/Greenshot.Addon.Imgur/Entities/ImgurData.cs
+++ b/src/Greenshot.Addon.Imgur/Entities/ImgurData.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 Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
@@ -10,33 +33,63 @@ namespace Greenshot.Addon.Imgur.Entities
     /// </summary>
     public class ImgurData
     {
+        /// <summary>
+        /// Id of the image
+        /// </summary>
         [JsonProperty("id")]
         public string Id { get; set; }
 
+        /// <summary>
+        /// Title of the image
+        /// </summary>
         [JsonProperty("title")]
         public string Title { get; set; }
 
+        /// <summary>
+        /// Description of the image
+        /// </summary>
         [JsonProperty("description")]
         public string Description { get; set; }
 
+        /// <summary>
+        /// Date created
+        /// </summary>
         [JsonProperty("datetime"), JsonConverter(typeof(UnixDateTimeConverter))]
         public DateTime Datetime { get; set; }
 
+        /// <summary>
+        /// Type of image
+        /// </summary>
         [JsonProperty("type")]
         public string Type { get; set; }
 
+        /// <summary>
+        /// Specifies if the image is animated
+        /// </summary>
         [JsonProperty("animated")]
         public bool Animated { get; set; }
 
+        /// <summary>
+        /// The width of the image
+        /// </summary>
         [JsonProperty("width")]
         public long Width { get; set; }
 
+        /// <summary>
+        /// The height of the image
+        /// </summary>
         [JsonProperty("height")]
         public long Height { get; set; }
 
+        /// <summary>
+        /// The size of the image
+        /// </summary>
         [JsonProperty("size")]
         public long Size { get; set; }
 
+        /// <summary>
+        /// How many times is this image viewed
+        /// </summary>
         [JsonProperty("views")]
         public long Views { get; set; }
 
diff --git a/src/Greenshot.Addon.Imgur/Entities/ImgurImage.cs b/src/Greenshot.Addon.Imgur/Entities/ImgurImage.cs
index afb723e4c..26e64732d 100644
--- a/src/Greenshot.Addon.Imgur/Entities/ImgurImage.cs
+++ b/src/Greenshot.Addon.Imgur/Entities/ImgurImage.cs
@@ -1,23 +1,46 @@
-using System.Windows.Media;
-using Newtonsoft.Json;
-
-namespace Greenshot.Addon.Imgur.Entities
-{
+#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.Windows.Media;
+using Newtonsoft.Json;
+
+namespace Greenshot.Addon.Imgur.Entities
+{
     /// <summary>
     /// Information on the imgur image
-    /// </summary>
-    public class ImgurImage
-    {
-        [JsonIgnore]
-        public ImageSource Image { get; set; }
-
-        [JsonProperty("data")]
-        public ImgurData Data { get; set; }
-
-        [JsonProperty("success")]
-        public bool Success { get; set; }
-
-        [JsonProperty("status")]
-        public long Status { get; set; }
-    }
-}
+    /// </summary>
+    public class ImgurImage
+    {
+        [JsonIgnore]
+        public ImageSource Image { get; set; }
+
+        [JsonProperty("data")]
+        public ImgurData Data { get; set; }
+
+        [JsonProperty("success")]
+        public bool Success { get; set; }
+
+        [JsonProperty("status")]
+        public long Status { get; set; }
+    }
+}