diff --git a/KeyManager.Library.KeyStore.LCP.UI/KeyManager.Library.KeyStore.LCP.UI.csproj b/KeyManager.Library.KeyStore.LCP.UI/KeyManager.Library.KeyStore.LCP.UI.csproj
index 44028af..12fda31 100644
--- a/KeyManager.Library.KeyStore.LCP.UI/KeyManager.Library.KeyStore.LCP.UI.csproj
+++ b/KeyManager.Library.KeyStore.LCP.UI/KeyManager.Library.KeyStore.LCP.UI.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Leosac.WpfApp" Version="1.17.0">
+    <PackageReference Include="Leosac.WpfApp" Version="1.18.0">
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
     <PackageReference Include="MaterialDesignThemes" Version="4.9.0">
diff --git a/KeyManager.Library.KeyStore.NXP_SAM.UI/KeyManager.Library.KeyStore.NXP_SAM.UI.csproj b/KeyManager.Library.KeyStore.NXP_SAM.UI/KeyManager.Library.KeyStore.NXP_SAM.UI.csproj
index eff432b..f695005 100644
--- a/KeyManager.Library.KeyStore.NXP_SAM.UI/KeyManager.Library.KeyStore.NXP_SAM.UI.csproj
+++ b/KeyManager.Library.KeyStore.NXP_SAM.UI/KeyManager.Library.KeyStore.NXP_SAM.UI.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Leosac.WpfApp" Version="1.17.0">
+    <PackageReference Include="Leosac.WpfApp" Version="1.18.0">
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
     <PackageReference Include="MaterialDesignThemes" Version="4.9.0">
diff --git a/KeyManager.Library.KeyStore.SAM_SE.UI/KeyManager.Library.KeyStore.SAM_SE.UI.csproj b/KeyManager.Library.KeyStore.SAM_SE.UI/KeyManager.Library.KeyStore.SAM_SE.UI.csproj
index 0fefeb4..60eb64d 100644
--- a/KeyManager.Library.KeyStore.SAM_SE.UI/KeyManager.Library.KeyStore.SAM_SE.UI.csproj
+++ b/KeyManager.Library.KeyStore.SAM_SE.UI/KeyManager.Library.KeyStore.SAM_SE.UI.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Leosac.WpfApp" Version="1.17.0">
+    <PackageReference Include="Leosac.WpfApp" Version="1.18.0">
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
     <PackageReference Include="MaterialDesignThemes" Version="4.9.0">
diff --git a/KeyManager.Library.UI/Favorites.cs b/KeyManager.Library.UI/Favorites.cs
index ea200c1..37ec1c1 100644
--- a/KeyManager.Library.UI/Favorites.cs
+++ b/KeyManager.Library.UI/Favorites.cs
@@ -1,4 +1,4 @@
-using Leosac.WpfApp;
+using Leosac.SharedServices;
 using System.Collections.ObjectModel;
 using System.Text;
 
diff --git a/KeyManager.Library.UI/KMSettings.cs b/KeyManager.Library.UI/KMSettings.cs
index 7f4f0ed..dddf191 100644
--- a/KeyManager.Library.UI/KMSettings.cs
+++ b/KeyManager.Library.UI/KMSettings.cs
@@ -1,4 +1,4 @@
-using Leosac.WpfApp;
+using Leosac.SharedServices;
 
 namespace Leosac.KeyManager.Library.UI
 {
diff --git a/KeyManager.Library.UI/KeyManager.Library.UI.csproj b/KeyManager.Library.UI/KeyManager.Library.UI.csproj
index 3691578..5fe83dc 100644
--- a/KeyManager.Library.UI/KeyManager.Library.UI.csproj
+++ b/KeyManager.Library.UI/KeyManager.Library.UI.csproj
@@ -31,7 +31,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Leosac.WpfApp" Version="1.17.0" />
+    <PackageReference Include="Leosac.WpfApp" Version="1.18.0" />
     <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
     <PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.0.5" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/KeyManager.Setup/Product.wxs b/KeyManager.Setup/Product.wxs
index f7305f5..2fc3473 100644
--- a/KeyManager.Setup/Product.wxs
+++ b/KeyManager.Setup/Product.wxs
@@ -306,6 +306,9 @@
       <Component Id="SecretSharingDotNetComponent">
         <File Id="___var.SecretSharingDotNet.dll_" Source="$(var.KeyManager.TargetDir)\SecretSharingDotNet.dll" />
       </Component>
+      <Component Id="SharedServicesComponent">
+        <File Id="___var.SharedServices.dll_" Source="$(var.KeyManager.TargetDir)\SharedServices.dll" />
+      </Component>
       <Component Id="SkiaSharpComponent">
         <File Id="___var.SkiaSharp.dll_" Source="$(var.KeyManager.TargetDir)\SkiaSharp.dll" />
       </Component>
diff --git a/KeyManager/App.xaml.cs b/KeyManager/App.xaml.cs
index f7e100b..abdbee6 100644
--- a/KeyManager/App.xaml.cs
+++ b/KeyManager/App.xaml.cs
@@ -1,8 +1,8 @@
 using Leosac.KeyManager.Library.Plugin;
 using Leosac.KeyManager.Library.UI;
+using Leosac.SharedServices;
 using Leosac.WpfApp;
 using Newtonsoft.Json;
-using System.Configuration;
 using System.Linq;
 using System.Windows;
 
diff --git a/KeyManager/EditKeyStoreControl.xaml.cs b/KeyManager/EditKeyStoreControl.xaml.cs
index 1022c66..b98112b 100644
--- a/KeyManager/EditKeyStoreControl.xaml.cs
+++ b/KeyManager/EditKeyStoreControl.xaml.cs
@@ -1,24 +1,9 @@
 using Leosac.KeyManager.Domain;
-using Leosac.KeyManager.Library;
-using Leosac.KeyManager.Library.KeyStore;
 using Leosac.KeyManager.Library.UI;
-using Leosac.KeyManager.Library.UI.Domain;
+using Leosac.SharedServices;
 using Leosac.WpfApp;
-using MaterialDesignThemes.Wpf;
-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 Leosac.KeyManager
 {
@@ -88,7 +73,7 @@ private async void BtnPublish_Click(object sender, RoutedEventArgs e)
                 }
                 else
                 {
-                    MaintenancePlan.OpenRegistration();
+                    MaintenancePlanHelper.OpenRegistration();
                 }
             }
         }
@@ -104,7 +89,7 @@ private async void BtnDiff_Click(object sender, RoutedEventArgs e)
                 }
                 else
                 {
-                    MaintenancePlan.OpenRegistration();
+                    MaintenancePlanHelper.OpenRegistration();
                 }
             }
         }
diff --git a/KeyManager/KMLeosacAppInfo.cs b/KeyManager/KMLeosacAppInfo.cs
index fbb597e..3c845d5 100644
--- a/KeyManager/KMLeosacAppInfo.cs
+++ b/KeyManager/KMLeosacAppInfo.cs
@@ -12,7 +12,7 @@
 
 namespace Leosac.KeyManager
 {
-    public class KMLeosacAppInfo : LeosacAppInfo
+    public class KMLeosacAppInfo : LeosacWinAppInfo
     {
         private static readonly log4net.ILog log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod()?.DeclaringType);
 
diff --git a/KeyManager/KeyManager.csproj b/KeyManager/KeyManager.csproj
index 5cc1c89..b9aaaf4 100644
--- a/KeyManager/KeyManager.csproj
+++ b/KeyManager/KeyManager.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Leosac.WpfApp" Version="1.17.0" />
+    <PackageReference Include="Leosac.WpfApp" Version="1.18.0" />
     <PackageReference Include="log4net" Version="2.0.17" />
     <PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />