diff --git a/Directory.Build.props b/Directory.Build.props
index f4b0b33..c8e0a5c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,5 +4,6 @@
     	<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<GenerateSerializationAssemblies>False</GenerateSerializationAssemblies>
     	<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    	<GenerateDocumentationFile>True</GenerateDocumentationFile>
 	</PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Pilz.Plugins.Advanced.UI.Telerik/Pilz.Plugins.Advanced.UI.Telerik.csproj b/Pilz.Plugins.Advanced.UI.Telerik/Pilz.Plugins.Advanced.UI.Telerik.csproj
index 9a763e6..615a31c 100644
--- a/Pilz.Plugins.Advanced.UI.Telerik/Pilz.Plugins.Advanced.UI.Telerik.csproj
+++ b/Pilz.Plugins.Advanced.UI.Telerik/Pilz.Plugins.Advanced.UI.Telerik.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <Version>1.4.0</Version>
+    <Version>1.4.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,9 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="RadPluginModuleUI.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Update="RadPluginModuleUI.cs" />
   </ItemGroup>
 
 </Project>
diff --git a/Pilz.Plugins.Advanced.UI.Telerik/RadPluginModuleUI.cs b/Pilz.Plugins.Advanced.UI.Telerik/RadPluginModuleUI.cs
index 4fa576f..6f1231e 100644
--- a/Pilz.Plugins.Advanced.UI.Telerik/RadPluginModuleUI.cs
+++ b/Pilz.Plugins.Advanced.UI.Telerik/RadPluginModuleUI.cs
@@ -1,4 +1,5 @@
-using Pilz.UI.Telerik.Dialogs;
+using Pilz.UI;
+using Pilz.UI.Telerik.Dialogs;
 
 namespace Pilz.Plugins.Advanced.UI.Telerik;
 
diff --git a/Pilz.Plugins.Advanced.UI/Pilz.Plugins.Advanced.UI.csproj b/Pilz.Plugins.Advanced.UI/Pilz.Plugins.Advanced.UI.csproj
index 8e58470..6d4dbe5 100644
--- a/Pilz.Plugins.Advanced.UI/Pilz.Plugins.Advanced.UI.csproj
+++ b/Pilz.Plugins.Advanced.UI/Pilz.Plugins.Advanced.UI.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>1.5.0</Version>
+    <Version>1.5.1</Version>
   </PropertyGroup>
   
   <ItemGroup>
diff --git a/Pilz.Plugins.Advanced.UI/PluginModuleUI.cs b/Pilz.Plugins.Advanced.UI/PluginModuleUI.cs
index e567dde..554266b 100644
--- a/Pilz.Plugins.Advanced.UI/PluginModuleUI.cs
+++ b/Pilz.Plugins.Advanced.UI/PluginModuleUI.cs
@@ -1,4 +1,5 @@
-using Pilz.UI.Dialogs;
+using Pilz.UI;
+using Pilz.UI.Dialogs;
 
 namespace Pilz.Plugins.Advanced.UI;
 
diff --git a/Pilz.UI.Telerik/Dialogs/ILoadContent.cs b/Pilz.UI.Telerik/Dialogs/ILoadContent.cs
deleted file mode 100644
index 46992bd..0000000
--- a/Pilz.UI.Telerik/Dialogs/ILoadContent.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace Pilz.UI.Telerik.Dialogs;
-
-public interface ILoadContent
-{
-    void LoadContent();
-}
diff --git a/Pilz.UI.Telerik/Pilz.UI.Telerik.csproj b/Pilz.UI.Telerik/Pilz.UI.Telerik.csproj
index 2fadd89..8a7aa39 100644
--- a/Pilz.UI.Telerik/Pilz.UI.Telerik.csproj
+++ b/Pilz.UI.Telerik/Pilz.UI.Telerik.csproj
@@ -6,11 +6,15 @@
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <PropertyGroup>
-    <Version>2.4.1</Version>
+    <Version>2.5.0</Version>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="UI.for.WinForms.AllControls.Net70" Version="2024.1.312">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Pilz.UI\Pilz.UI.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Pilz.UI/Dialogs/ILoadContent.cs b/Pilz.UI/ILoadContent.cs
similarity index 66%
rename from Pilz.UI/Dialogs/ILoadContent.cs
rename to Pilz.UI/ILoadContent.cs
index 26f841f..b410bc8 100644
--- a/Pilz.UI/Dialogs/ILoadContent.cs
+++ b/Pilz.UI/ILoadContent.cs
@@ -1,4 +1,4 @@
-namespace Pilz.UI.Dialogs;
+namespace Pilz.UI;
 
 public interface ILoadContent
 {
diff --git a/Pilz.UI/Pilz.UI.csproj b/Pilz.UI/Pilz.UI.csproj
index 058b77a..9f2e9f4 100644
--- a/Pilz.UI/Pilz.UI.csproj
+++ b/Pilz.UI/Pilz.UI.csproj
@@ -7,9 +7,10 @@
     <DefaultItemExcludes>$(DefaultItemExcludes);$(ProjectDir)**\*.vb</DefaultItemExcludes>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <PropertyGroup>
-    <Version>2.1.1</Version>
+    <Version>2.2.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />