diff --git a/Hyperbar.Desktop.Contextual/ContextualCommandBuilder.cs b/Hyperbar.Desktop.Contextual/ContextualCommandBuilder.cs
deleted file mode 100644
index 0d1c942..0000000
--- a/Hyperbar.Desktop.Contextual/ContextualCommandBuilder.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using Hyperbar.Lifecycles;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Hyperbar.Desktop.Contextual;
-
-public class ContextualCommandBuilder : 
-    ICommandBuilder
-{
-    public void Create(IServiceCollection services)
-    {
-        services.AddCommandTemplate<ContextualCommandViewModel, ContextualCommandView>();
-    }
-}
diff --git a/Hyperbar.Desktop.Controls/Hyperbar.Desktop.Controls.csproj b/Hyperbar.Desktop.Controls/Hyperbar.Desktop.Controls.csproj
deleted file mode 100644
index 68bdadf..0000000
--- a/Hyperbar.Desktop.Controls/Hyperbar.Desktop.Controls.csproj
+++ /dev/null
@@ -1,35 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<RootNamespace>Hyperbar.Desktop.Controls</RootNamespace>
-		<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
-		<UseWinUI>true</UseWinUI>
-		<UseRidGraph>true</UseRidGraph>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.231202003-experimental1" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
-	</ItemGroup>
-	<ItemGroup>
-	  <ProjectReference Include="..\Hyperbar.Desktop.Win32\Hyperbar.Desktop.Win32.csproj" />
-	</ItemGroup>
-	<ItemGroup>
-	  <None Update="CommandFlyout\CommandFlyoutPresenter.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </None>
-	  <None Update="Themes\Generic.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </None>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="CommandFlyout\CommandFlyoutPresenter.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="Themes\Generic.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-</Project>
diff --git a/Hyperbar.Desktop.Primary/PrimaryCommandBuilder.cs b/Hyperbar.Desktop.Primary/PrimaryCommandBuilder.cs
deleted file mode 100644
index af612f9..0000000
--- a/Hyperbar.Desktop.Primary/PrimaryCommandBuilder.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using Hyperbar.Lifecycles;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Hyperbar.Desktop.Primary;
-
-public class PrimaryCommandBuilder :
-    ICommandBuilder
-{
-    public void Create(IServiceCollection services)
-    {
-        services.AddCommandTemplate<PrimaryCommandViewModel, PrimaryCommandView>();
-    }
-}
-
diff --git a/Hyperbar.Desktop.Primary/PrimaryCommandView.xaml.cs b/Hyperbar.Desktop.Primary/PrimaryCommandView.xaml.cs
deleted file mode 100644
index a4dbd6e..0000000
--- a/Hyperbar.Desktop.Primary/PrimaryCommandView.xaml.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using Microsoft.UI.Xaml.Controls;
-
-namespace Hyperbar.Desktop.Primary;
-
-public sealed partial class PrimaryCommandView : Page
-{
-    public PrimaryCommandView() => InitializeComponent();
-}
diff --git a/Hyperbar.Desktop.Primary/PrimaryCommandViewModel.cs b/Hyperbar.Desktop.Primary/PrimaryCommandViewModel.cs
deleted file mode 100644
index b9263fb..0000000
--- a/Hyperbar.Desktop.Primary/PrimaryCommandViewModel.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Hyperbar.Lifecycles;
-using Hyperbar.Templates;
-
-namespace Hyperbar.Desktop.Primary;
-
-public class PrimaryCommandConfiguration
-{
-
-}
-
-public class PrimaryCommandViewModel(ITemplateFactory templateFactory) :
-    ICommandViewModel,
-    ITemplatedViewModel
-{
-    public ITemplateFactory TemplateFactory { get; } = templateFactory;
-}
-
diff --git a/Hyperbar.Windows.Contextual/ContextualCommandWidgetBuilder.cs b/Hyperbar.Windows.Contextual/ContextualCommandWidgetBuilder.cs
new file mode 100644
index 0000000..03bdb78
--- /dev/null
+++ b/Hyperbar.Windows.Contextual/ContextualCommandWidgetBuilder.cs
@@ -0,0 +1,15 @@
+using Hyperbar.Lifecycles;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Hyperbar.Windows.Contextual;
+
+public class ContextualCommandWidgetBuilder : 
+    ICommandWidgetBuilder
+{
+    public void Create(IServiceCollection services)
+    {
+        services
+            .AddWritableConfiguration<ContextualCommandWidgetConfiguration>()
+            .AddCommandTemplate<ContextualCommandWidgetViewModel, ContextualCommandWidgetView>();
+    }
+}
diff --git a/Hyperbar.Windows.Contextual/ContextualCommandWidgetConfiguration.cs b/Hyperbar.Windows.Contextual/ContextualCommandWidgetConfiguration.cs
new file mode 100644
index 0000000..90f0ddf
--- /dev/null
+++ b/Hyperbar.Windows.Contextual/ContextualCommandWidgetConfiguration.cs
@@ -0,0 +1,5 @@
+namespace Hyperbar.Windows.Contextual;
+
+public class ContextualCommandWidgetConfiguration
+{ 
+}
diff --git a/Hyperbar.Desktop.Contextual/ContextualCommandView.xaml b/Hyperbar.Windows.Contextual/ContextualCommandWidgetView.xaml
similarity index 60%
rename from Hyperbar.Desktop.Contextual/ContextualCommandView.xaml
rename to Hyperbar.Windows.Contextual/ContextualCommandWidgetView.xaml
index ad58c7c..191d57a 100644
--- a/Hyperbar.Desktop.Contextual/ContextualCommandView.xaml
+++ b/Hyperbar.Windows.Contextual/ContextualCommandWidgetView.xaml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Page
-    x:Class="Hyperbar.Desktop.Contextual.ContextualCommandView"
+    x:Class="Hyperbar.Windows.Contextual.ContextualCommandWidgetView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Grid>
-        <Button Content="This is a test" Click="Button_Click"/>
+        <Button Click="Button_Click" Content="This is a test" />
     </Grid>
 </Page>
diff --git a/Hyperbar.Desktop.Contextual/ContextualCommandView.xaml.cs b/Hyperbar.Windows.Contextual/ContextualCommandWidgetView.xaml.cs
similarity index 54%
rename from Hyperbar.Desktop.Contextual/ContextualCommandView.xaml.cs
rename to Hyperbar.Windows.Contextual/ContextualCommandWidgetView.xaml.cs
index 1adf492..b1fa097 100644
--- a/Hyperbar.Desktop.Contextual/ContextualCommandView.xaml.cs
+++ b/Hyperbar.Windows.Contextual/ContextualCommandWidgetView.xaml.cs
@@ -1,12 +1,12 @@
-using Hyperbar.Desktop.Win32;
+using Hyperbar.Windows.Win32;
 using Microsoft.UI.Xaml.Controls;
 using Windows.System;
 
-namespace Hyperbar.Desktop.Contextual;
+namespace Hyperbar.Windows.Contextual;
 
-public sealed partial class ContextualCommandView : Page
+public sealed partial class ContextualCommandWidgetView : Page
 {
-    public ContextualCommandView() => InitializeComponent();
+    public ContextualCommandWidgetView() => InitializeComponent();
 
     private void Button_Click(object sender, Microsoft.UI.Xaml.RoutedEventArgs e)
     {
diff --git a/Hyperbar.Desktop.Contextual/ContextualCommandViewModel.cs b/Hyperbar.Windows.Contextual/ContextualCommandWidgetViewModel.cs
similarity index 51%
rename from Hyperbar.Desktop.Contextual/ContextualCommandViewModel.cs
rename to Hyperbar.Windows.Contextual/ContextualCommandWidgetViewModel.cs
index 08e3e99..93cfcb5 100644
--- a/Hyperbar.Desktop.Contextual/ContextualCommandViewModel.cs
+++ b/Hyperbar.Windows.Contextual/ContextualCommandWidgetViewModel.cs
@@ -1,10 +1,10 @@
 using Hyperbar.Lifecycles;
 using Hyperbar.Templates;
 
-namespace Hyperbar.Desktop.Contextual;
+namespace Hyperbar.Windows.Contextual;
 
-public class ContextualCommandViewModel(ITemplateFactory templateFactory) :
-    ICommandViewModel,
+public class ContextualCommandWidgetViewModel(ITemplateFactory templateFactory) :
+    ICommandWidgetViewModel,
     ITemplatedViewModel
 {
     public ITemplateFactory TemplateFactory { get; } = templateFactory;
diff --git a/Hyperbar.Desktop.Contextual/Hyperbar.Desktop.Contextual.csproj b/Hyperbar.Windows.Contextual/Hyperbar.Windows.Contextual.csproj
similarity index 76%
rename from Hyperbar.Desktop.Contextual/Hyperbar.Desktop.Contextual.csproj
rename to Hyperbar.Windows.Contextual/Hyperbar.Windows.Contextual.csproj
index 15d233c..4291d89 100644
--- a/Hyperbar.Desktop.Contextual/Hyperbar.Desktop.Contextual.csproj
+++ b/Hyperbar.Windows.Contextual/Hyperbar.Windows.Contextual.csproj
@@ -2,10 +2,12 @@
 	<PropertyGroup>
 		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<RootNamespace>Hyperbar.Desktop.Contextual</RootNamespace>
+		<RootNamespace>Hyperbar.Windows.Contextual</RootNamespace>
 		<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
 		<UseWinUI>true</UseWinUI>
 		<UseRidGraph>true</UseRidGraph>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
@@ -13,7 +15,7 @@
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\Hyperbar.Desktop.Win32\Hyperbar.Desktop.Win32.csproj" />
+		<ProjectReference Include="..\Hyperbar.Windows.Win32\Hyperbar.Windows.Win32.csproj" />
 		<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyout.cs b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyout.cs
similarity index 97%
rename from Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyout.cs
rename to Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyout.cs
index eb11ab1..0b2285a 100644
--- a/Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyout.cs
+++ b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyout.cs
@@ -1,6 +1,6 @@
 using Microsoft.UI.Xaml;
 
-namespace Hyperbar.Desktop.Controls;
+namespace Hyperbar.Windows.Controls;
 
 public class DesktopFlyout :
     DependencyObject
diff --git a/Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutHost.cs b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutHost.cs
similarity index 94%
rename from Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutHost.cs
rename to Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutHost.cs
index ef60620..505e2de 100644
--- a/Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutHost.cs
+++ b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutHost.cs
@@ -1,17 +1,15 @@
 using Microsoft.UI.Xaml;
-using Hyperbar.Desktop.Win32;
+using Hyperbar.Windows.Win32;
 using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Controls;
-using Windows.Foundation;
-using Microsoft.UI.Xaml.Media;
 
-namespace Hyperbar.Desktop.Controls;
+namespace Hyperbar.Windows.Controls;
 
 internal class DesktopFlyoutHost : Window
 {
     private readonly DesktopFlyoutPresenter presenter;
     private DesktopFlyoutPlacement placement;
-    private Popup popup;
+    private Popup? popup;
 
     public DesktopFlyoutHost(DesktopFlyoutPresenter presenter)
     {
diff --git a/Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPlacement.cs b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPlacement.cs
similarity index 66%
rename from Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPlacement.cs
rename to Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPlacement.cs
index 9e45cd2..5404818 100644
--- a/Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPlacement.cs
+++ b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPlacement.cs
@@ -1,4 +1,4 @@
-namespace Hyperbar.Desktop.Controls;
+namespace Hyperbar.Windows.Controls;
 
 public enum DesktopFlyoutPlacement
 {
diff --git a/Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPresenter.cs b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.cs
similarity index 97%
rename from Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPresenter.cs
rename to Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.cs
index 8dcec12..b2cf70a 100644
--- a/Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPresenter.cs
+++ b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.cs
@@ -2,7 +2,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;
 
-namespace Hyperbar.Desktop.Controls;
+namespace Hyperbar.Windows.Controls;
 
 public class DesktopFlyoutPresenter :
     ContentControl
diff --git a/Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPresenter.xaml b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.xaml
similarity index 99%
rename from Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPresenter.xaml
rename to Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.xaml
index 5b63031..b799301 100644
--- a/Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPresenter.xaml
+++ b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.xaml
@@ -2,7 +2,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Hyperbar.Desktop.Controls">
+    xmlns:controls="using:Hyperbar.Windows.Controls">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
             <StaticResource x:Key="CommandBarFlyoutBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
diff --git a/Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPresenterTemplateSettings.cs b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenterTemplateSettings.cs
similarity index 97%
rename from Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPresenterTemplateSettings.cs
rename to Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenterTemplateSettings.cs
index 16b33ed..4ce8906 100644
--- a/Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPresenterTemplateSettings.cs
+++ b/Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenterTemplateSettings.cs
@@ -1,6 +1,6 @@
 using Microsoft.UI.Xaml;
 
-namespace Hyperbar.Desktop.Controls;
+namespace Hyperbar.Windows.Controls;
 
 public class DesktopFlyoutPresenterTemplateSettings : DependencyObject
 {
diff --git a/Hyperbar.Windows.Controls/Hyperbar.Windows.Controls.csproj b/Hyperbar.Windows.Controls/Hyperbar.Windows.Controls.csproj
new file mode 100644
index 0000000..8258829
--- /dev/null
+++ b/Hyperbar.Windows.Controls/Hyperbar.Windows.Controls.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
+		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+		<RootNamespace>Hyperbar.Windows.Controls</RootNamespace>
+		<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
+		<UseWinUI>true</UseWinUI>
+		<UseRidGraph>true</UseRidGraph>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.231202003-experimental1" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.25936-preview" />
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\Hyperbar.Windows.Win32\Hyperbar.Windows.Win32.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/Hyperbar.Desktop.Controls/Themes/Generic.xaml b/Hyperbar.Windows.Controls/Themes/Generic.xaml
similarity index 82%
rename from Hyperbar.Desktop.Controls/Themes/Generic.xaml
rename to Hyperbar.Windows.Controls/Themes/Generic.xaml
index 6b3f471..f1cbb84 100644
--- a/Hyperbar.Desktop.Controls/Themes/Generic.xaml
+++ b/Hyperbar.Windows.Controls/Themes/Generic.xaml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="ms-appx:///Hyperbar.Desktop.Controls/DesktopFlyout/DesktopFlyoutPresenter.xaml" />
+        <ResourceDictionary Source="ms-appx:///Hyperbar.Windows.Controls/DesktopFlyout/DesktopFlyoutPresenter.xaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/Hyperbar.Desktop.Primary/Hyperbar.Desktop.Primary.csproj b/Hyperbar.Windows.Primary/Hyperbar.Windows.Primary.csproj
similarity index 89%
rename from Hyperbar.Desktop.Primary/Hyperbar.Desktop.Primary.csproj
rename to Hyperbar.Windows.Primary/Hyperbar.Windows.Primary.csproj
index ebdcde3..c0401e1 100644
--- a/Hyperbar.Desktop.Primary/Hyperbar.Desktop.Primary.csproj
+++ b/Hyperbar.Windows.Primary/Hyperbar.Windows.Primary.csproj
@@ -2,10 +2,12 @@
 	<PropertyGroup>
 		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<RootNamespace>Hyperbar.Desktop.Primary</RootNamespace>
+		<RootNamespace>Hyperbar.Windows.Primary</RootNamespace>
 		<RuntimeIdentifiers>win10-x86;win10-x64;win10-arm64</RuntimeIdentifiers>
 		<UseWinUI>true</UseWinUI>
 		<UseRidGraph>true</UseRidGraph>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 	  <IsAotCompatible>True</IsAotCompatible>
diff --git a/Hyperbar.Windows.Primary/IPrimaryCommand.cs b/Hyperbar.Windows.Primary/IPrimaryCommand.cs
new file mode 100644
index 0000000..c9bd96f
--- /dev/null
+++ b/Hyperbar.Windows.Primary/IPrimaryCommand.cs
@@ -0,0 +1,7 @@
+namespace Hyperbar.Windows.Primary;
+
+public interface IPrimaryCommand
+{
+
+}
+
diff --git a/Hyperbar.Windows.Primary/KeyAcceleratorCommand.cs b/Hyperbar.Windows.Primary/KeyAcceleratorCommand.cs
new file mode 100644
index 0000000..de0699a
--- /dev/null
+++ b/Hyperbar.Windows.Primary/KeyAcceleratorCommand.cs
@@ -0,0 +1,12 @@
+namespace Hyperbar.Windows.Primary;
+
+public class KeyAcceleratorCommand : 
+    IPrimaryCommand
+{
+    public string? Icon { get; set; }
+
+    public string? Key { get; set; }
+
+    public string[]? Modifiers { get; set; }
+}
+
diff --git a/Hyperbar.Windows.Primary/PrimaryCommandConfiguration.cs b/Hyperbar.Windows.Primary/PrimaryCommandConfiguration.cs
new file mode 100644
index 0000000..8f777ef
--- /dev/null
+++ b/Hyperbar.Windows.Primary/PrimaryCommandConfiguration.cs
@@ -0,0 +1,7 @@
+namespace Hyperbar.Windows.Primary;
+
+public class PrimaryCommandConfiguration : List<IPrimaryCommand>
+{
+
+}
+
diff --git a/Hyperbar.Windows.Primary/PrimaryCommandWidgetBuilder.cs b/Hyperbar.Windows.Primary/PrimaryCommandWidgetBuilder.cs
new file mode 100644
index 0000000..2f8e98e
--- /dev/null
+++ b/Hyperbar.Windows.Primary/PrimaryCommandWidgetBuilder.cs
@@ -0,0 +1,15 @@
+using Hyperbar.Lifecycles;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Hyperbar.Windows.Primary;
+
+public class PrimaryCommandWidgetBuilder :
+    ICommandWidgetBuilder
+{
+    public void Create(IServiceCollection services)
+    {
+        services.AddWritableConfiguration<PrimaryCommandConfiguration>()
+            .AddCommandTemplate<PrimaryCommandWidgetViewModel, PrimaryCommandWidgetView>();
+    }
+}
+
diff --git a/Hyperbar.Desktop.Primary/PrimaryCommandView.xaml b/Hyperbar.Windows.Primary/PrimaryCommandWidgetView.xaml
similarity index 79%
rename from Hyperbar.Desktop.Primary/PrimaryCommandView.xaml
rename to Hyperbar.Windows.Primary/PrimaryCommandWidgetView.xaml
index a02d28a..e903c48 100644
--- a/Hyperbar.Desktop.Primary/PrimaryCommandView.xaml
+++ b/Hyperbar.Windows.Primary/PrimaryCommandWidgetView.xaml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Page
-    x:Class="Hyperbar.Desktop.Primary.PrimaryCommandView"
+    x:Class="Hyperbar.Windows.Primary.PrimaryCommandWidgetView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Grid>
diff --git a/Hyperbar.Windows.Primary/PrimaryCommandWidgetView.xaml.cs b/Hyperbar.Windows.Primary/PrimaryCommandWidgetView.xaml.cs
new file mode 100644
index 0000000..fe9f5b2
--- /dev/null
+++ b/Hyperbar.Windows.Primary/PrimaryCommandWidgetView.xaml.cs
@@ -0,0 +1,8 @@
+using Microsoft.UI.Xaml.Controls;
+
+namespace Hyperbar.Windows.Primary;
+
+public sealed partial class PrimaryCommandWidgetView : Page
+{
+    public PrimaryCommandWidgetView() => InitializeComponent();
+}
diff --git a/Hyperbar.Windows.Primary/PrimaryCommandWidgetViewModel.cs b/Hyperbar.Windows.Primary/PrimaryCommandWidgetViewModel.cs
new file mode 100644
index 0000000..45c610b
--- /dev/null
+++ b/Hyperbar.Windows.Primary/PrimaryCommandWidgetViewModel.cs
@@ -0,0 +1,23 @@
+using Hyperbar.Lifecycles;
+using Hyperbar.Templates;
+using Windows.System;
+
+namespace Hyperbar.Windows.Primary;
+
+public class PrimaryCommandWidgetViewModel :
+    ICommandWidgetViewModel,
+    ITemplatedViewModel
+{
+    public PrimaryCommandWidgetViewModel(ITemplateFactory templateFactory, 
+        IWritableConfiguration<PrimaryCommandConfiguration> configuration)
+    {
+        TemplateFactory = templateFactory;
+
+        configuration.Write(args => { args.Add(new KeyAcceleratorCommand { Key = $"138" , Modifiers = [$"{VirtualKey.LeftWindows}"] }); });
+        configuration.Write(args => { args.Add(new KeyAcceleratorCommand { Key = $"{VirtualKey.Tab}", Modifiers = [$"{VirtualKey.LeftWindows}"] }); });
+        configuration.Write(args => { args.Add(new KeyAcceleratorCommand { Key = $"{VirtualKey.L}", Modifiers = [$"{VirtualKey.LeftWindows}", $"{VirtualKey.Control}"] }); });
+    }
+
+    public ITemplateFactory TemplateFactory { get; }
+}
+
diff --git a/Hyperbar.Desktop.Win32/Extensions/HwndExtensions.cs b/Hyperbar.Windows.Win32/Extensions/HwndExtensions.cs
similarity index 99%
rename from Hyperbar.Desktop.Win32/Extensions/HwndExtensions.cs
rename to Hyperbar.Windows.Win32/Extensions/HwndExtensions.cs
index ba1e155..b905883 100644
--- a/Hyperbar.Desktop.Win32/Extensions/HwndExtensions.cs
+++ b/Hyperbar.Windows.Win32/Extensions/HwndExtensions.cs
@@ -5,7 +5,7 @@ using Windows.Win32.Graphics.Gdi;
 using System.Runtime.InteropServices;
 using Windows.Win32.UI.WindowsAndMessaging;
 
-namespace Hyperbar.Desktop.Win32;
+namespace Hyperbar.Windows.Win32;
 
 public static class HwndExtensions
 {
diff --git a/Hyperbar.Desktop.Win32/Extensions/WindowExtensions.cs b/Hyperbar.Windows.Win32/Extensions/WindowExtensions.cs
similarity index 97%
rename from Hyperbar.Desktop.Win32/Extensions/WindowExtensions.cs
rename to Hyperbar.Windows.Win32/Extensions/WindowExtensions.cs
index 69214d6..4dd9222 100644
--- a/Hyperbar.Desktop.Win32/Extensions/WindowExtensions.cs
+++ b/Hyperbar.Windows.Win32/Extensions/WindowExtensions.cs
@@ -4,7 +4,7 @@ using System;
 using Windows.UI.Popups;
 using WinRT.Interop;
 
-namespace Hyperbar.Desktop.Win32;
+namespace Hyperbar.Windows.Win32;
 
 public static class WindowExtensions
 {
diff --git a/Hyperbar.Desktop.Win32/Extensions/WindowPlacement.cs b/Hyperbar.Windows.Win32/Extensions/WindowPlacement.cs
similarity index 66%
rename from Hyperbar.Desktop.Win32/Extensions/WindowPlacement.cs
rename to Hyperbar.Windows.Win32/Extensions/WindowPlacement.cs
index d484825..f38d4cc 100644
--- a/Hyperbar.Desktop.Win32/Extensions/WindowPlacement.cs
+++ b/Hyperbar.Windows.Win32/Extensions/WindowPlacement.cs
@@ -1,4 +1,4 @@
-namespace Hyperbar.Desktop.Win32;
+namespace Hyperbar.Windows.Win32;
 
 public enum WindowPlacement
 {
diff --git a/Hyperbar.Desktop.Win32/Extensions/WindowStyle.cs b/Hyperbar.Windows.Win32/Extensions/WindowStyle.cs
similarity index 95%
rename from Hyperbar.Desktop.Win32/Extensions/WindowStyle.cs
rename to Hyperbar.Windows.Win32/Extensions/WindowStyle.cs
index ae0d33a..3889390 100644
--- a/Hyperbar.Desktop.Win32/Extensions/WindowStyle.cs
+++ b/Hyperbar.Windows.Win32/Extensions/WindowStyle.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Hyperbar.Desktop.Win32;
+namespace Hyperbar.Windows.Win32;
 
 [Flags]
 public enum WindowStyle
diff --git a/Hyperbar.Desktop.Win32/Hyperbar.Desktop.Win32.csproj b/Hyperbar.Windows.Win32/Hyperbar.Windows.Win32.csproj
similarity index 100%
rename from Hyperbar.Desktop.Win32/Hyperbar.Desktop.Win32.csproj
rename to Hyperbar.Windows.Win32/Hyperbar.Windows.Win32.csproj
diff --git a/Hyperbar.Desktop.Win32/Internals/PInvoke.cs b/Hyperbar.Windows.Win32/Internals/PInvoke.cs
similarity index 100%
rename from Hyperbar.Desktop.Win32/Internals/PInvoke.cs
rename to Hyperbar.Windows.Win32/Internals/PInvoke.cs
diff --git a/Hyperbar.Desktop.Win32/KeyIntrop.cs b/Hyperbar.Windows.Win32/KeyIntrop.cs
similarity index 98%
rename from Hyperbar.Desktop.Win32/KeyIntrop.cs
rename to Hyperbar.Windows.Win32/KeyIntrop.cs
index c2c5f3b..8706fd3 100644
--- a/Hyperbar.Desktop.Win32/KeyIntrop.cs
+++ b/Hyperbar.Windows.Win32/KeyIntrop.cs
@@ -5,7 +5,7 @@ using Windows.System;
 using Windows.Win32;
 using Windows.Win32.UI.KeyboardAndMouseInput;
 
-namespace Hyperbar.Desktop.Win32;
+namespace Hyperbar.Windows.Win32;
 
 public class KeyInterop
 {
diff --git a/Hyperbar.Desktop.Win32/NativeMethods.txt b/Hyperbar.Windows.Win32/NativeMethods.txt
similarity index 100%
rename from Hyperbar.Desktop.Win32/NativeMethods.txt
rename to Hyperbar.Windows.Win32/NativeMethods.txt
diff --git a/Hyperbar.Desktop/App.xaml b/Hyperbar.Windows/App.xaml
similarity index 88%
rename from Hyperbar.Desktop/App.xaml
rename to Hyperbar.Windows/App.xaml
index f31e216..434a123 100644
--- a/Hyperbar.Desktop/App.xaml
+++ b/Hyperbar.Windows/App.xaml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Application
-    x:Class="Hyperbar.Desktop.App"
+    x:Class="Hyperbar.Windows.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:desktop="using:Hyperbar.Desktop">
+    xmlns:desktop="using:Hyperbar.Windows">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
diff --git a/Hyperbar.Desktop/App.xaml.cs b/Hyperbar.Windows/App.xaml.cs
similarity index 70%
rename from Hyperbar.Desktop/App.xaml.cs
rename to Hyperbar.Windows/App.xaml.cs
index 3c9e866..c7512de 100644
--- a/Hyperbar.Desktop/App.xaml.cs
+++ b/Hyperbar.Windows/App.xaml.cs
@@ -1,21 +1,15 @@
-using Hyperbar.Desktop.Contextual;
-using Hyperbar.Desktop.Controls;
-using Hyperbar.Desktop.Primary;
+using Hyperbar.Windows.Contextual;
+using Hyperbar.Windows.Controls;
+using Hyperbar.Windows.Primary;
 using Hyperbar.Lifecycles;
 using Hyperbar.Templates;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.UI.Xaml;
-using System;
-using System.Collections.Generic;
 
-namespace Hyperbar.Desktop;
+namespace Hyperbar.Windows;
 
-public class AppConfiguration
-{
-
-}
 public partial class App : 
     Application
 {
@@ -46,17 +40,17 @@ public partial class App :
 
                 services.AddDataTemplate<CommandViewModel, CommandView>();
 
-                services.AddCommand<ContextualCommandBuilder>("");
-                services.AddCommand<PrimaryCommandBuilder>("");
+                services.AddCommand<ContextualCommandWidgetBuilder>("");
+                services.AddCommand<PrimaryCommandWidgetBuilder>("");
 
                 services.AddTransient(provider =>
                 {
-                    static IEnumerable<ICommandViewModel> Resolve(IServiceProvider services)
+                    static IEnumerable<ICommandWidgetViewModel> Resolve(IServiceProvider services)
                     {
-                        foreach (ICommandContext commandContext in services.GetServices<ICommandContext>())
+                        foreach (ICommandWidgetContext commandContext in services.GetServices<ICommandWidgetContext>())
                         {
-                            if (commandContext.ServiceProvider.GetService<ICommandViewModel>() is 
-                                ICommandViewModel commandViewModel)
+                            if (commandContext.ServiceProvider.GetService<ICommandWidgetViewModel>() is 
+                                ICommandWidgetViewModel commandViewModel)
                             {
                                 yield return commandViewModel;
                             }
@@ -65,11 +59,9 @@ public partial class App :
 
                     return Resolve(provider);                
                 });
-
-                services.ConfigureWritableOptions<AppConfiguration>();
-
             })
             .Build();
+
         await host.RunAsync();
     }
 }
diff --git a/Hyperbar.Desktop/Assets/LockScreenLogo.scale-200.png b/Hyperbar.Windows/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from Hyperbar.Desktop/Assets/LockScreenLogo.scale-200.png
rename to Hyperbar.Windows/Assets/LockScreenLogo.scale-200.png
diff --git a/Hyperbar.Desktop/Assets/SplashScreen.scale-200.png b/Hyperbar.Windows/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from Hyperbar.Desktop/Assets/SplashScreen.scale-200.png
rename to Hyperbar.Windows/Assets/SplashScreen.scale-200.png
diff --git a/Hyperbar.Desktop/Assets/Square150x150Logo.scale-200.png b/Hyperbar.Windows/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from Hyperbar.Desktop/Assets/Square150x150Logo.scale-200.png
rename to Hyperbar.Windows/Assets/Square150x150Logo.scale-200.png
diff --git a/Hyperbar.Desktop/Assets/Square44x44Logo.scale-200.png b/Hyperbar.Windows/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from Hyperbar.Desktop/Assets/Square44x44Logo.scale-200.png
rename to Hyperbar.Windows/Assets/Square44x44Logo.scale-200.png
diff --git a/Hyperbar.Desktop/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Hyperbar.Windows/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from Hyperbar.Desktop/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to Hyperbar.Windows/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/Hyperbar.Desktop/Assets/StoreLogo.png b/Hyperbar.Windows/Assets/StoreLogo.png
similarity index 100%
rename from Hyperbar.Desktop/Assets/StoreLogo.png
rename to Hyperbar.Windows/Assets/StoreLogo.png
diff --git a/Hyperbar.Desktop/Assets/Wide310x150Logo.scale-200.png b/Hyperbar.Windows/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from Hyperbar.Desktop/Assets/Wide310x150Logo.scale-200.png
rename to Hyperbar.Windows/Assets/Wide310x150Logo.scale-200.png
diff --git a/Hyperbar.Desktop/Hyperbar.Desktop.csproj b/Hyperbar.Windows/Hyperbar.Windows.csproj
similarity index 83%
rename from Hyperbar.Desktop/Hyperbar.Desktop.csproj
rename to Hyperbar.Windows/Hyperbar.Windows.csproj
index 65df773..3243e98 100644
--- a/Hyperbar.Desktop/Hyperbar.Desktop.csproj
+++ b/Hyperbar.Windows/Hyperbar.Windows.csproj
@@ -3,7 +3,7 @@
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<RootNamespace>Hyperbar.Desktop</RootNamespace>
+		<RootNamespace>Hyperbar.Windows</RootNamespace>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<Platforms>x86;x64;ARM64</Platforms>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
@@ -11,6 +11,7 @@
 		<UseRidGraph>true</UseRidGraph>
 		<UseWinUI>true</UseWinUI>
 		<EnableMsixTooling>true</EnableMsixTooling>
+		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
@@ -36,9 +37,9 @@
 		<ProjectCapability Include="Msix" />
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\Hyperbar.Desktop.Contextual\Hyperbar.Desktop.Contextual.csproj" />
-		<ProjectReference Include="..\Hyperbar.Desktop.Controls\Hyperbar.Desktop.Controls.csproj" />
-		<ProjectReference Include="..\Hyperbar.Desktop.Primary\Hyperbar.Desktop.Primary.csproj" />
+		<ProjectReference Include="..\Hyperbar.Windows.Contextual\Hyperbar.Windows.Contextual.csproj" />
+		<ProjectReference Include="..\Hyperbar.Windows.Controls\Hyperbar.Windows.Controls.csproj" />
+		<ProjectReference Include="..\Hyperbar.Windows.Primary\Hyperbar.Windows.Primary.csproj" />
 		<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
 	</ItemGroup>
 	<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
diff --git a/Hyperbar.Desktop/Lifecycles/AppInitializer.cs b/Hyperbar.Windows/Lifecycles/AppInitializer.cs
similarity index 89%
rename from Hyperbar.Desktop/Lifecycles/AppInitializer.cs
rename to Hyperbar.Windows/Lifecycles/AppInitializer.cs
index aff4d1f..afd5838 100644
--- a/Hyperbar.Desktop/Lifecycles/AppInitializer.cs
+++ b/Hyperbar.Windows/Lifecycles/AppInitializer.cs
@@ -1,9 +1,9 @@
-using Hyperbar.Desktop.Controls;
+using Hyperbar.Windows.Controls;
 using Hyperbar.Lifecycles;
 using Microsoft.Extensions.DependencyInjection;
 using System.Threading.Tasks;
 
-namespace Hyperbar.Desktop;
+namespace Hyperbar.Windows;
 
 public class AppInitializer([FromKeyedServices(nameof(CommandViewModel))] CommandView view,
     [FromKeyedServices(nameof(CommandViewModel))] CommandViewModel viewModel,
diff --git a/Hyperbar.Desktop/Lifecycles/IServiceCollectionExtensions.cs b/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs
similarity index 82%
rename from Hyperbar.Desktop/Lifecycles/IServiceCollectionExtensions.cs
rename to Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs
index cb3c62d..6653389 100644
--- a/Hyperbar.Desktop/Lifecycles/IServiceCollectionExtensions.cs
+++ b/Hyperbar.Windows/Lifecycles/IServiceCollectionExtensions.cs
@@ -3,14 +3,14 @@ using Hyperbar.Templates;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace Hyperbar.Desktop
+namespace Hyperbar.Windows
 {
     public static class IServiceCollectionExtensions
     {
         public static IServiceCollection AddCommand<TCommandBuilder>(this IServiceCollection services, 
             string key)
             where TCommandBuilder :
-            ICommandBuilder, new()
+            ICommandWidgetBuilder, new()
         {
             TCommandBuilder builder = new();
             IHost? host = new HostBuilder()
@@ -22,7 +22,7 @@ namespace Hyperbar.Desktop
                     builder.Create(isolatedServices);
                 }).Build();
 
-            services.AddTransient<ICommandContext>(provider => new CommandContext(host.Services));
+            services.AddTransient<ICommandWidgetContext>(provider => new CommandWidgetContext(host.Services));
             return services;
         }
     }
diff --git a/Hyperbar.Desktop/Package.appxmanifest b/Hyperbar.Windows/Package.appxmanifest
similarity index 93%
rename from Hyperbar.Desktop/Package.appxmanifest
rename to Hyperbar.Windows/Package.appxmanifest
index 5d642c5..8760c12 100644
--- a/Hyperbar.Desktop/Package.appxmanifest
+++ b/Hyperbar.Windows/Package.appxmanifest
@@ -15,7 +15,7 @@
   <mp:PhoneIdentity PhoneProductId="24ccddba-447f-4d37-891d-523e8d820f45" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
-    <DisplayName>Hyperbar.Desktop</DisplayName>
+    <DisplayName>Hyperbar.Windows</DisplayName>
     <PublisherDisplayName>dan_c</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
@@ -34,8 +34,8 @@
       Executable="$targetnametoken$.exe"
       EntryPoint="$targetentrypoint$">
       <uap:VisualElements
-        DisplayName="Hyperbar.Desktop"
-        Description="Hyperbar.Desktop"
+        DisplayName="Hyperbar.Windows"
+        Description="Hyperbar.Windows"
         BackgroundColor="transparent"
         Square150x150Logo="Assets\Square150x150Logo.png"
         Square44x44Logo="Assets\Square44x44Logo.png">
diff --git a/Hyperbar.Desktop/Properties/launchSettings.json b/Hyperbar.Windows/Properties/launchSettings.json
similarity index 57%
rename from Hyperbar.Desktop/Properties/launchSettings.json
rename to Hyperbar.Windows/Properties/launchSettings.json
index 297b2aa..3365549 100644
--- a/Hyperbar.Desktop/Properties/launchSettings.json
+++ b/Hyperbar.Windows/Properties/launchSettings.json
@@ -1,9 +1,9 @@
 {
   "profiles": {
-    "Hyperbar.Desktop (Package)": {
+    "Hyperbar.Windows (Package)": {
       "commandName": "MsixPackage"
     },
-    "Hyperbar.Desktop (Unpackaged)": {
+    "Hyperbar.Windows (Unpackaged)": {
       "commandName": "Project"
     }
   }
diff --git a/Hyperbar.Desktop/Templates/ITemplateGeneratorFactory.cs b/Hyperbar.Windows/Templates/ITemplateGeneratorFactory.cs
similarity index 82%
rename from Hyperbar.Desktop/Templates/ITemplateGeneratorFactory.cs
rename to Hyperbar.Windows/Templates/ITemplateGeneratorFactory.cs
index 8657ac4..ec1b20b 100644
--- a/Hyperbar.Desktop/Templates/ITemplateGeneratorFactory.cs
+++ b/Hyperbar.Windows/Templates/ITemplateGeneratorFactory.cs
@@ -1,6 +1,6 @@
 using Microsoft.UI.Xaml;
 
-namespace Hyperbar.Desktop
+namespace Hyperbar.Windows
 {
 
     public interface ITemplateGeneratorFactory
diff --git a/Hyperbar.Desktop/Templates/TemplateFactory.cs b/Hyperbar.Windows/Templates/TemplateFactory.cs
similarity index 97%
rename from Hyperbar.Desktop/Templates/TemplateFactory.cs
rename to Hyperbar.Windows/Templates/TemplateFactory.cs
index 17f4dc5..d37954f 100644
--- a/Hyperbar.Desktop/Templates/TemplateFactory.cs
+++ b/Hyperbar.Windows/Templates/TemplateFactory.cs
@@ -6,7 +6,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Hyperbar.Desktop;
+namespace Hyperbar.Windows;
 
 public class TemplateFactory(ITemplateGeneratorFactory factory,
     IEnumerable<IDataTemplateDescriptor> descriptors,
diff --git a/Hyperbar.Desktop/Templates/TemplateGeneratorControl.cs b/Hyperbar.Windows/Templates/TemplateGeneratorControl.cs
similarity index 95%
rename from Hyperbar.Desktop/Templates/TemplateGeneratorControl.cs
rename to Hyperbar.Windows/Templates/TemplateGeneratorControl.cs
index d8b22ce..ef3ca80 100644
--- a/Hyperbar.Desktop/Templates/TemplateGeneratorControl.cs
+++ b/Hyperbar.Windows/Templates/TemplateGeneratorControl.cs
@@ -2,7 +2,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
-namespace Hyperbar.Desktop;
+namespace Hyperbar.Windows;
 
 public class TemplateGeneratorControl : 
     ContentControl
diff --git a/Hyperbar.Desktop/Templates/TemplateGeneratorFactory.cs b/Hyperbar.Windows/Templates/TemplateGeneratorFactory.cs
similarity index 82%
rename from Hyperbar.Desktop/Templates/TemplateGeneratorFactory.cs
rename to Hyperbar.Windows/Templates/TemplateGeneratorFactory.cs
index b580cbe..05c46e6 100644
--- a/Hyperbar.Desktop/Templates/TemplateGeneratorFactory.cs
+++ b/Hyperbar.Windows/Templates/TemplateGeneratorFactory.cs
@@ -1,7 +1,7 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Markup;
 
-namespace Hyperbar.Desktop;
+namespace Hyperbar.Windows;
 
 public class TemplateGeneratorFactory : 
     ITemplateGeneratorFactory
@@ -10,7 +10,7 @@ public class TemplateGeneratorFactory :
     {
         string xamlString = @"
                 <DataTemplate xmlns='http://schemas.microsoft.com/winfx/2006/xaml/presentation' 
-                                xmlns:desktop='using:Hyperbar.Desktop'>
+                                xmlns:desktop='using:Hyperbar.Windows'>
                     <desktop:TemplateGeneratorControl />
                 </DataTemplate>";
 
diff --git a/Hyperbar.Desktop/Views/CommandView.xaml b/Hyperbar.Windows/Views/CommandView.xaml
similarity index 91%
rename from Hyperbar.Desktop/Views/CommandView.xaml
rename to Hyperbar.Windows/Views/CommandView.xaml
index 64d9024..c889038 100644
--- a/Hyperbar.Desktop/Views/CommandView.xaml
+++ b/Hyperbar.Windows/Views/CommandView.xaml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Page
-    x:Class="Hyperbar.Desktop.CommandView"
+    x:Class="Hyperbar.Windows.CommandView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ItemsControl ItemTemplateSelector="{Binding TemplateFactory}" ItemsSource="{Binding}">
diff --git a/Hyperbar.Desktop/Views/CommandView.xaml.cs b/Hyperbar.Windows/Views/CommandView.xaml.cs
similarity index 90%
rename from Hyperbar.Desktop/Views/CommandView.xaml.cs
rename to Hyperbar.Windows/Views/CommandView.xaml.cs
index f80310c..26947db 100644
--- a/Hyperbar.Desktop/Views/CommandView.xaml.cs
+++ b/Hyperbar.Windows/Views/CommandView.xaml.cs
@@ -1,7 +1,7 @@
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 
-namespace Hyperbar.Desktop;
+namespace Hyperbar.Windows;
 
 public sealed partial class CommandView : Page
 {
diff --git a/Hyperbar.Desktop/Views/CommandViewModel.cs b/Hyperbar.Windows/Views/CommandViewModel.cs
similarity index 69%
rename from Hyperbar.Desktop/Views/CommandViewModel.cs
rename to Hyperbar.Windows/Views/CommandViewModel.cs
index 66b3220..04a77ac 100644
--- a/Hyperbar.Desktop/Views/CommandViewModel.cs
+++ b/Hyperbar.Windows/Views/CommandViewModel.cs
@@ -2,20 +2,17 @@
 using Hyperbar.Templates;
 using System.Collections.Generic;
 
-namespace Hyperbar.Desktop;
+namespace Hyperbar.Windows;
 
 public partial class CommandViewModel : 
     ObservableCollectionViewModel,
     ITemplatedViewModel
 {
     public CommandViewModel(ITemplateFactory templateFactory, 
-        IEnumerable<ICommandViewModel> commands,
-        IWritableConfiguration<AppConfiguration> options)
+        IEnumerable<ICommandWidgetViewModel> commands)
     {
         TemplateFactory = templateFactory;
         AddRange(commands);
-
-        options.Update(args => { });
     }
 
     public ITemplateFactory TemplateFactory { get; }
diff --git a/Hyperbar.Desktop/app.manifest b/Hyperbar.Windows/app.manifest
similarity index 93%
rename from Hyperbar.Desktop/app.manifest
rename to Hyperbar.Windows/app.manifest
index 35bf8a1..6cbc973 100644
--- a/Hyperbar.Desktop/app.manifest
+++ b/Hyperbar.Windows/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="Hyperbar.Desktop.app"/>
+  <assemblyIdentity version="1.0.0.0" name="Hyperbar.Windows.app"/>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
diff --git a/Hyperbar.sln b/Hyperbar.sln
index d3664bc..bba82e6 100644
--- a/Hyperbar.sln
+++ b/Hyperbar.sln
@@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34330.188
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbar.Desktop", "Hyperbar.Desktop\Hyperbar.Desktop.csproj", "{5C4824EE-23AB-495C-B55A-1F7C2A489698}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbar.Windows", "Hyperbar.Windows\Hyperbar.Windows.csproj", "{5C4824EE-23AB-495C-B55A-1F7C2A489698}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbar.Desktop.Controls", "Hyperbar.Desktop.Controls\Hyperbar.Desktop.Controls.csproj", "{48ECC6A3-94FF-405D-9DB5-46A725C1B117}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbar.Windows.Controls", "Hyperbar.Windows.Controls\Hyperbar.Windows.Controls.csproj", "{48ECC6A3-94FF-405D-9DB5-46A725C1B117}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbar.Desktop.Win32", "Hyperbar.Desktop.Win32\Hyperbar.Desktop.Win32.csproj", "{8A4BBC50-970C-4FA8-9F21-0FA63269222F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbar.Windows.Win32", "Hyperbar.Windows.Win32\Hyperbar.Windows.Win32.csproj", "{8A4BBC50-970C-4FA8-9F21-0FA63269222F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbar", "Hyperbar\Hyperbar.csproj", "{E5795878-C7E3-4386-86FA-33681BCF8D5B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbar.Desktop.Contextual", "Hyperbar.Desktop.Contextual\Hyperbar.Desktop.Contextual.csproj", "{C32D4073-2A9B-4257-8895-09951FAD8E7A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbar.Windows.Contextual", "Hyperbar.Windows.Contextual\Hyperbar.Windows.Contextual.csproj", "{C32D4073-2A9B-4257-8895-09951FAD8E7A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbar.Desktop.Primary", "Hyperbar.Desktop.Primary\Hyperbar.Desktop.Primary.csproj", "{AFB8A3EB-8831-4041-AE05-3E0EF672887C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hyperbar.Windows.Primary", "Hyperbar.Windows.Primary\Hyperbar.Windows.Primary.csproj", "{AFB8A3EB-8831-4041-AE05-3E0EF672887C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Hyperbar/Configuration/ConfigurationWriter.cs b/Hyperbar/Configuration/ConfigurationWriter.cs
index 76a150a..330fa58 100644
--- a/Hyperbar/Configuration/ConfigurationWriter.cs
+++ b/Hyperbar/Configuration/ConfigurationWriter.cs
@@ -23,15 +23,16 @@ public class ConfigurationWriter<TConfiguration>(string path,
 
     private readonly JsonSerializerOptions? serializerOptions = serializerOptions ??= DefaultSerializerOptions();
 
-    public void Write(Action<TConfiguration?>? updateDelegate = null)
+    public void Write(Action<TConfiguration> updateDelegate)
     {
-        TConfiguration? updatedValue = TryGet(out TConfiguration? value) ? value : new TConfiguration();
-
-        updateDelegate?.Invoke(updatedValue);
-        Write(updatedValue);
+        if ((TryGet(out TConfiguration? value) ? value : new TConfiguration()) is TConfiguration updatedValue)
+        {
+            updateDelegate?.Invoke(updatedValue);
+            Write(updatedValue);
+        }
     }
 
-    public void Write(TConfiguration? value)
+    public void Write(TConfiguration value)
     {
         if (!File.Exists(path))
         {
@@ -81,7 +82,7 @@ public class ConfigurationWriter<TConfiguration>(string path,
         stream.SetLength(stream.Position);
     }
 
-    private bool TryGet<T>(out T? value)
+    private bool TryGet(out TConfiguration? value)
     {
         if (File.Exists(path))
         {
@@ -90,7 +91,7 @@ public class ConfigurationWriter<TConfiguration>(string path,
             using JsonDocument jsonDocument = JsonDocument.Parse(jsonContent);
             if (jsonDocument.RootElement.TryGetProperty(section, out JsonElement sectionValue))
             {
-                value = JsonSerializer.Deserialize<T>(sectionValue.ToString(), serializerOptions);
+                value = JsonSerializer.Deserialize<TConfiguration>(sectionValue.ToString(), serializerOptions);
                 return true;
             }
         }
diff --git a/Hyperbar/Configuration/IConfigurationWriter.cs b/Hyperbar/Configuration/IConfigurationWriter.cs
index 7426659..79d0c00 100644
--- a/Hyperbar/Configuration/IConfigurationWriter.cs
+++ b/Hyperbar/Configuration/IConfigurationWriter.cs
@@ -5,8 +5,8 @@ namespace Hyperbar.Options
         where TConfiguration : 
         class, new()
     {
-        void Write(Action<TConfiguration?>? updateDelegate = null);
+        void Write(Action<TConfiguration> updateDelegate);
 
-        void Write(TConfiguration? value);
+        void Write(TConfiguration value);
     }
 }
\ No newline at end of file
diff --git a/Hyperbar/Configuration/IWritableConfiguration.cs b/Hyperbar/Configuration/IWritableConfiguration.cs
index f0e74f1..e1fb54c 100644
--- a/Hyperbar/Configuration/IWritableConfiguration.cs
+++ b/Hyperbar/Configuration/IWritableConfiguration.cs
@@ -7,6 +7,6 @@ public interface IWritableConfiguration<out TConfiguration> :
     where TConfiguration :
     class, new()
 {
-    void Update(Action<TConfiguration?> updateAction, 
+    void Write(Action<TConfiguration> updateAction, 
         bool reload = true);
 }
diff --git a/Hyperbar/Configuration/WritableConfiguration.cs b/Hyperbar/Configuration/WritableConfiguration.cs
index 8f84103..d0ce0e8 100644
--- a/Hyperbar/Configuration/WritableConfiguration.cs
+++ b/Hyperbar/Configuration/WritableConfiguration.cs
@@ -15,7 +15,7 @@ public class WritableConfiguration<TConfiguration>(IConfigurationWriter<TConfigu
 
     public TConfiguration Get(string? name) => options.Get(name);
 
-    public void Update(Action<TConfiguration?> updateDelegate, 
+    public void Write(Action<TConfiguration> updateDelegate, 
         bool reload = true)
     {
         writer.Write(updateDelegate);
diff --git a/Hyperbar/Extensions/IServiceCollectionExtensions.cs b/Hyperbar/Extensions/IServiceCollectionExtensions.cs
index 66bf49b..d6b5c4c 100644
--- a/Hyperbar/Extensions/IServiceCollectionExtensions.cs
+++ b/Hyperbar/Extensions/IServiceCollectionExtensions.cs
@@ -1,7 +1,6 @@
 using Hyperbar.Lifecycles;
 using Hyperbar.Options;
 using Hyperbar.Templates;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Hosting;
@@ -11,16 +10,15 @@ using System.Text.Json;
 namespace Hyperbar;
 public static class IServiceCollectionExtensions
 {
-    public static IServiceCollection ConfigureWritableOptions<TConfiguration>(this IServiceCollection services,
-        string path = "Settings.json",
-        Func<JsonSerializerOptions>? defaultSerializerOptions = null)
+    public static IServiceCollection AddWritableConfiguration<TConfiguration>(this IServiceCollection services,
+        string path = "Settings.json")
         where TConfiguration :
         class, new()
     {
-        return services.ConfigureWritableOptions<TConfiguration>(typeof(TConfiguration).Name, path);
+        return services.AddWritableConfiguration<TConfiguration>(typeof(TConfiguration).Name, path);
     }
 
-    public static IServiceCollection ConfigureWritableOptions<TConfiguration>(this IServiceCollection services,
+    public static IServiceCollection AddWritableConfiguration<TConfiguration>(this IServiceCollection services,
         string section,
         string path = "Settings.json",
         Action<JsonSerializerOptions>? serializerDelegate = null) 
@@ -59,16 +57,16 @@ public static class IServiceCollectionExtensions
 
     public static IServiceCollection AddCommandTemplate<TCommand, TCommandTemplate>(this IServiceCollection services)
         where TCommand :
-        ICommandViewModel
+        ICommandWidgetViewModel
     {
         Type dataType = typeof(TCommand);
         Type templateType = typeof(TCommandTemplate);
 
         string key = dataType.Name;
         
-        services.AddTransient(typeof(ICommandViewModel), dataType);
+        services.AddTransient(typeof(ICommandWidgetViewModel), dataType);
         services.AddTransient(templateType);
-        services.AddKeyedTransient(typeof(ICommandViewModel), key, dataType);
+        services.AddKeyedTransient(typeof(ICommandWidgetViewModel), key, dataType);
         services.AddKeyedTransient(templateType, key);
         
         services.AddTransient<IDataTemplateDescriptor>(provider => new DataTemplateDescriptor
diff --git a/Hyperbar/Lifecycles/CommandContext.cs b/Hyperbar/Lifecycles/CommandWidgetContext.cs
similarity index 51%
rename from Hyperbar/Lifecycles/CommandContext.cs
rename to Hyperbar/Lifecycles/CommandWidgetContext.cs
index 0dbf143..43163ef 100644
--- a/Hyperbar/Lifecycles/CommandContext.cs
+++ b/Hyperbar/Lifecycles/CommandWidgetContext.cs
@@ -1,7 +1,7 @@
 namespace Hyperbar.Lifecycles;
 
-public class CommandContext(IServiceProvider serviceProvider) :
-    ICommandContext
+public class CommandWidgetContext(IServiceProvider serviceProvider) :
+    ICommandWidgetContext
 {
     public IServiceProvider ServiceProvider => serviceProvider;
-}
+}
\ No newline at end of file
diff --git a/Hyperbar/Lifecycles/ICommandBuilder.cs b/Hyperbar/Lifecycles/ICommandWidgetBuilder.cs
similarity index 77%
rename from Hyperbar/Lifecycles/ICommandBuilder.cs
rename to Hyperbar/Lifecycles/ICommandWidgetBuilder.cs
index 601e8d7..8550fd0 100644
--- a/Hyperbar/Lifecycles/ICommandBuilder.cs
+++ b/Hyperbar/Lifecycles/ICommandWidgetBuilder.cs
@@ -2,7 +2,7 @@
 
 namespace Hyperbar.Lifecycles;
 
-public interface ICommandBuilder
+public interface ICommandWidgetBuilder
 {
     void Create(IServiceCollection services);
 }
diff --git a/Hyperbar/Lifecycles/ICommandContext.cs b/Hyperbar/Lifecycles/ICommandWidgetContext.cs
similarity index 68%
rename from Hyperbar/Lifecycles/ICommandContext.cs
rename to Hyperbar/Lifecycles/ICommandWidgetContext.cs
index 50f8ea3..5c0062c 100644
--- a/Hyperbar/Lifecycles/ICommandContext.cs
+++ b/Hyperbar/Lifecycles/ICommandWidgetContext.cs
@@ -1,6 +1,6 @@
 namespace Hyperbar.Lifecycles;
 
-public interface ICommandContext
+public interface ICommandWidgetContext
 {
     IServiceProvider ServiceProvider { get; }
 }
diff --git a/Hyperbar/Lifecycles/ICommandViewModel.cs b/Hyperbar/Lifecycles/ICommandWidgetViewModel.cs
similarity index 50%
rename from Hyperbar/Lifecycles/ICommandViewModel.cs
rename to Hyperbar/Lifecycles/ICommandWidgetViewModel.cs
index fe4dac7..d11e196 100644
--- a/Hyperbar/Lifecycles/ICommandViewModel.cs
+++ b/Hyperbar/Lifecycles/ICommandWidgetViewModel.cs
@@ -1,6 +1,6 @@
 namespace Hyperbar.Lifecycles;
 
-public interface ICommandViewModel
+public interface ICommandWidgetViewModel
 {
 
 }