diff --git a/ModernKeePass/ViewModels/ViewModelLocator.cs b/ModernKeePass/ViewModels/ViewModelLocator.cs
index b2dc799..f5959ca 100644
--- a/ModernKeePass/ViewModels/ViewModelLocator.cs
+++ b/ModernKeePass/ViewModels/ViewModelLocator.cs
@@ -14,13 +14,7 @@
 
 using System;
 using CommonServiceLocator;
-using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Ioc;
-using GalaSoft.MvvmLight.Views;
-using MediatR;
-using Microsoft.Extensions.DependencyInjection;
-using ModernKeePass.Application.Common.Interfaces;
-using ModernKeePass.ViewModels.ListItems;
 
 namespace ModernKeePass.ViewModels
 {
@@ -28,71 +22,22 @@ namespace ModernKeePass.ViewModels
     /// This class contains static references to all the view models in the
     /// application and provides an entry point for the bindings.
     /// </summary>
-    public class ViewModelLocator
+    public class ViewModelLocator: ViewModelLocatorCommon
     {
         /// <summary>
         /// Initializes a new instance of the ViewModelLocator class.
         /// </summary>
         public ViewModelLocator()
         {
-            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
-
-            if (ViewModelBase.IsInDesignModeStatic)
-            {
-                // Create design time view services and models
-                //SimpleIoc.Default.Register<IDataService, DesignDataService>();
-            }
-            else
-            {
-                // Create run time view services and models
-                //SimpleIoc.Default.Register<IDataService, DataService>();IDataService
-                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IMediator>());
-                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IRecentProxy>());
-                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IResourceProxy>());
-                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<ISettingsProxy>());
-                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<ICredentialsProxy>());
-                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IDialogService>());
-                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<INavigationService>());
-                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<INotificationService>());
-            }
-            
             SimpleIoc.Default.Register<SettingsVm>();
-            SimpleIoc.Default.Register<SettingsDatabaseVm>();
-            SimpleIoc.Default.Register<SettingsNewVm>();
-            SimpleIoc.Default.Register<SettingsSaveVm>();
-            SimpleIoc.Default.Register<SettingsSecurityVm>();
-            SimpleIoc.Default.Register<OpenDatabaseControlVm>();
-            SimpleIoc.Default.Register<SetCredentialsVm>();
-            SimpleIoc.Default.Register<TopMenuVm>();
             SimpleIoc.Default.Register<MainVm>();
-            SimpleIoc.Default.Register<NewVm>();
-            SimpleIoc.Default.Register<OpenVm>();
-            SimpleIoc.Default.Register<RecentVm>();
-            SimpleIoc.Default.Register<SaveVm>();
             SimpleIoc.Default.Register<GroupDetailVm>();
             SimpleIoc.Default.Register<EntryDetailVm>();
         }
         
         public MainVm Main => ServiceLocator.Current.GetInstance<MainVm>(Guid.NewGuid().ToString());
         public SettingsVm Settings => ServiceLocator.Current.GetInstance<SettingsVm>(Guid.NewGuid().ToString());
-        public SettingsDatabaseVm SettingsDatabase => ServiceLocator.Current.GetInstance<SettingsDatabaseVm>(Guid.NewGuid().ToString());
-        public SettingsNewVm SettingsNew => ServiceLocator.Current.GetInstance<SettingsNewVm>(Guid.NewGuid().ToString());
-        public SettingsSaveVm SettingsSave => ServiceLocator.Current.GetInstance<SettingsSaveVm>(Guid.NewGuid().ToString());
-        public SettingsSecurityVm SettingsSecurity => ServiceLocator.Current.GetInstance<SettingsSecurityVm>(Guid.NewGuid().ToString());
-        public OpenDatabaseControlVm OpenDatabaseControl => ServiceLocator.Current.GetInstance<OpenDatabaseControlVm>(Guid.NewGuid().ToString());
-        public SetCredentialsVm SetCredentials => ServiceLocator.Current.GetInstance<SetCredentialsVm>(Guid.NewGuid().ToString());
-        public TopMenuVm TopMenu => ServiceLocator.Current.GetInstance<TopMenuVm>(Guid.NewGuid().ToString());
-        public NewVm New => ServiceLocator.Current.GetInstance<NewVm>(Guid.NewGuid().ToString());
-        public OpenVm Open => ServiceLocator.Current.GetInstance<OpenVm>(Guid.NewGuid().ToString());
-        public RecentVm Recent => ServiceLocator.Current.GetInstance<RecentVm>(Guid.NewGuid().ToString());
-        public SaveVm Save => ServiceLocator.Current.GetInstance<SaveVm>(Guid.NewGuid().ToString());
         public GroupDetailVm Group => ServiceLocator.Current.GetInstance<GroupDetailVm>(Guid.NewGuid().ToString());
         public EntryDetailVm Entry => ServiceLocator.Current.GetInstance<EntryDetailVm>(Guid.NewGuid().ToString());
-
-        public static void Cleanup()
-        {
-            // TODO Clear the ViewModels
-            SimpleIoc.Default.Reset();
-        }
     }
 }
\ No newline at end of file
diff --git a/WinAppCommon/ViewModels/ViewModelLocatorCommon.cs b/WinAppCommon/ViewModels/ViewModelLocatorCommon.cs
new file mode 100644
index 0000000..9c92ef8
--- /dev/null
+++ b/WinAppCommon/ViewModels/ViewModelLocatorCommon.cs
@@ -0,0 +1,90 @@
+/*
+  In App.xaml:
+  <Application.Resources>
+      <vm:ViewModelLocator xmlns:vm="clr-namespace:ModernKeePass"
+                           x:Key="Locator" />
+  </Application.Resources>
+  
+  In the View:
+  DataContext="{Binding Source={StaticResource Locator}, Path=ViewModelName}"
+
+  You can also use Blend to do all this with the tool's support.
+  See http://www.galasoft.ch/mvvm
+*/
+
+using System;
+using CommonServiceLocator;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Ioc;
+using GalaSoft.MvvmLight.Views;
+using MediatR;
+using Microsoft.Extensions.DependencyInjection;
+using ModernKeePass.Application.Common.Interfaces;
+using ModernKeePass.ViewModels.ListItems;
+
+namespace ModernKeePass.ViewModels
+{
+    /// <summary>
+    /// This class contains static references to all the view models in the
+    /// application and provides an entry point for the bindings.
+    /// </summary>
+    public class ViewModelLocatorCommon
+    {
+        /// <summary>
+        /// Initializes a new instance of the ViewModelLocator class.
+        /// </summary>
+        public ViewModelLocatorCommon()
+        {
+            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
+
+            if (ViewModelBase.IsInDesignModeStatic)
+            {
+                // Create design time view services and models
+                //SimpleIoc.Default.Register<IDataService, DesignDataService>();
+            }
+            else
+            {
+                // Create run time view services and models
+                //SimpleIoc.Default.Register<IDataService, DataService>();IDataService
+                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IMediator>());
+                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IRecentProxy>());
+                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IResourceProxy>());
+                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<ISettingsProxy>());
+                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<ICredentialsProxy>());
+                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<IDialogService>());
+                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<INavigationService>());
+                SimpleIoc.Default.Register(() => App.Services.GetRequiredService<INotificationService>());
+            }
+            
+            SimpleIoc.Default.Register<SettingsDatabaseVm>();
+            SimpleIoc.Default.Register<SettingsNewVm>();
+            SimpleIoc.Default.Register<SettingsSaveVm>();
+            SimpleIoc.Default.Register<SettingsSecurityVm>();
+            SimpleIoc.Default.Register<OpenDatabaseControlVm>();
+            SimpleIoc.Default.Register<SetCredentialsVm>();
+            SimpleIoc.Default.Register<TopMenuVm>();
+            SimpleIoc.Default.Register<NewVm>();
+            SimpleIoc.Default.Register<OpenVm>();
+            SimpleIoc.Default.Register<RecentVm>();
+            SimpleIoc.Default.Register<SaveVm>();
+        }
+        
+        public SettingsDatabaseVm SettingsDatabase => ServiceLocator.Current.GetInstance<SettingsDatabaseVm>(Guid.NewGuid().ToString());
+        public SettingsNewVm SettingsNew => ServiceLocator.Current.GetInstance<SettingsNewVm>(Guid.NewGuid().ToString());
+        public SettingsSaveVm SettingsSave => ServiceLocator.Current.GetInstance<SettingsSaveVm>(Guid.NewGuid().ToString());
+        public SettingsSecurityVm SettingsSecurity => ServiceLocator.Current.GetInstance<SettingsSecurityVm>(Guid.NewGuid().ToString());
+        public OpenDatabaseControlVm OpenDatabaseControl => ServiceLocator.Current.GetInstance<OpenDatabaseControlVm>(Guid.NewGuid().ToString());
+        public SetCredentialsVm SetCredentials => ServiceLocator.Current.GetInstance<SetCredentialsVm>(Guid.NewGuid().ToString());
+        public TopMenuVm TopMenu => ServiceLocator.Current.GetInstance<TopMenuVm>(Guid.NewGuid().ToString());
+        public NewVm New => ServiceLocator.Current.GetInstance<NewVm>(Guid.NewGuid().ToString());
+        public OpenVm Open => ServiceLocator.Current.GetInstance<OpenVm>(Guid.NewGuid().ToString());
+        public RecentVm Recent => ServiceLocator.Current.GetInstance<RecentVm>(Guid.NewGuid().ToString());
+        public SaveVm Save => ServiceLocator.Current.GetInstance<SaveVm>(Guid.NewGuid().ToString());
+
+        public static void Cleanup()
+        {
+            // TODO Clear the ViewModels
+            SimpleIoc.Default.Reset();
+        }
+    }
+}
\ No newline at end of file
diff --git a/WinAppCommon/WinAppCommon.projitems b/WinAppCommon/WinAppCommon.projitems
index aea74a8..5fce321 100644
--- a/WinAppCommon/WinAppCommon.projitems
+++ b/WinAppCommon/WinAppCommon.projitems
@@ -42,6 +42,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)TemplateSelectors\FirstItemDataTemplateSelector.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)TemplateSelectors\SelectableDataTemplateSelector.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\AboutVm.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ViewModels\ViewModelLocatorCommon.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Items\ListMenuItemVm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Items\MainMenuItemVm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\Items\RecentItemVm.cs" />