diff --git a/Hyperbar.Controls.Windows/Hyperbar.Controls.Windows.csproj b/Hyperbar.Controls.Windows/Hyperbar.Controls.Windows.csproj
index a28294b..2d099ca 100644
--- a/Hyperbar.Controls.Windows/Hyperbar.Controls.Windows.csproj
+++ b/Hyperbar.Controls.Windows/Hyperbar.Controls.Windows.csproj
@@ -17,7 +17,7 @@
 	  <None Remove="bin/Debug/net8.0-windows10.0.19041.0/Hyperbar.Windows.Controls.pri" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240124002-experimental2" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240205001-preview1" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" />
 	</ItemGroup>
 	<ItemGroup>
diff --git a/Hyperbar.UI.Windows/Hyperbar.UI.Windows.csproj b/Hyperbar.UI.Windows/Hyperbar.UI.Windows.csproj
index ec11b2b..8879832 100644
--- a/Hyperbar.UI.Windows/Hyperbar.UI.Windows.csproj
+++ b/Hyperbar.UI.Windows/Hyperbar.UI.Windows.csproj
@@ -9,7 +9,7 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240124002-experimental2" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240205001-preview1" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" />
 		<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
 	</ItemGroup>
diff --git a/Hyperbar.Widget.MediaController.Windows/Hyperbar.Widget.MediaController.Windows.csproj b/Hyperbar.Widget.MediaController.Windows/Hyperbar.Widget.MediaController.Windows.csproj
index bdc5404..dbcfbe4 100644
--- a/Hyperbar.Widget.MediaController.Windows/Hyperbar.Widget.MediaController.Windows.csproj
+++ b/Hyperbar.Widget.MediaController.Windows/Hyperbar.Widget.MediaController.Windows.csproj
@@ -12,10 +12,10 @@
 		<PackageReference Include="CommunityToolkit.WinUI" Version="7.1.2" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
 		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240124002-experimental2" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240205001-preview1" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" />
 		<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.1.24080.9" />
 		<PackageReference Include="CustomExtensions.WinUI" Version="0.1.10-beta" />
 	</ItemGroup>
 	<ItemGroup>
diff --git a/Hyperbar.Widget.Primary.Windows/Hyperbar.Widget.Primary.Windows.csproj b/Hyperbar.Widget.Primary.Windows/Hyperbar.Widget.Primary.Windows.csproj
index 459e51f..678fcd1 100644
--- a/Hyperbar.Widget.Primary.Windows/Hyperbar.Widget.Primary.Windows.csproj
+++ b/Hyperbar.Widget.Primary.Windows/Hyperbar.Widget.Primary.Windows.csproj
@@ -6,8 +6,8 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-		<PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.1.24080.9" />
+		<PackageReference Include="System.Runtime.Caching" Version="9.0.0-preview.1.24080.9" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Hyperbar.Widget\Hyperbar.Widget.csproj" />
diff --git a/Hyperbar.Widget.Windows/Hyperbar.Widget.Windows.csproj b/Hyperbar.Widget.Windows/Hyperbar.Widget.Windows.csproj
index 550e850..23ae60f 100644
--- a/Hyperbar.Widget.Windows/Hyperbar.Widget.Windows.csproj
+++ b/Hyperbar.Widget.Windows/Hyperbar.Widget.Windows.csproj
@@ -8,12 +8,12 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-	  <None Remove="WidgetConfigurationNavigationView.xaml" />
-	  <None Remove="WidgetConfigurationView.xaml" />
-	  <None Remove="WidgetNavigationView.xaml" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240124002-experimental2" />
+		<PackageReference Include="CommunityToolkit.Common" Version="8.2.2" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.0.240109" />
+		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
+		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.240109" />
+		<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.0.240109" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240205001-preview1" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" />
 		<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
 	</ItemGroup>
@@ -23,18 +23,4 @@
 		<ProjectReference Include="..\Hyperbar.Widget\Hyperbar.Widget.csproj" />
 		<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
 	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="WidgetConfigurationNavigationView.xaml">
-	    <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-	    <SubType>Designer</SubType>
-	  </Page>
-	  <Page Update="WidgetNavigationView.xaml">
-	    <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-	    <SubType>Designer</SubType>
-	  </Page>
-	  <Page Update="WidgetConfigurationView.xaml">
-	    <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-	    <SubType>Designer</SubType>
-	  </Page>
-	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Hyperbar.Widget.Windows/IServiceCollectionExtensions.cs b/Hyperbar.Widget.Windows/IServiceCollectionExtensions.cs
index 21224db..27a86d8 100644
--- a/Hyperbar.Widget.Windows/IServiceCollectionExtensions.cs
+++ b/Hyperbar.Widget.Windows/IServiceCollectionExtensions.cs
@@ -38,6 +38,8 @@ public static class IServiceCollectionExtensions
 
                 services.AddContentTemplate<WidgetConfigurationNavigationViewModel, WidgetConfigurationNavigationView>();
                 services.AddContentTemplate<WidgetConfigurationViewModel, WidgetConfigurationView>("WidgetSettings");
+
+                services.AddContentTemplate<WidgetConfigurationViewModel<WidgetAvailability, bool>, WidgetAvailabilityConfigurationView>();
             })));
 
         return services;
diff --git a/Hyperbar.Widget.Windows/WidgetAvailabilityConfigurationView.xaml b/Hyperbar.Widget.Windows/WidgetAvailabilityConfigurationView.xaml
new file mode 100644
index 0000000..41980bc
--- /dev/null
+++ b/Hyperbar.Widget.Windows/WidgetAvailabilityConfigurationView.xaml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<controls:SettingsCard
+    x:Class="Hyperbar.Widget.Windows.WidgetAvailabilityConfigurationView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+    Description="foo foo foo" />
diff --git a/Hyperbar.Widget.Windows/WidgetAvailabilityConfigurationView.xaml.cs b/Hyperbar.Widget.Windows/WidgetAvailabilityConfigurationView.xaml.cs
new file mode 100644
index 0000000..fb057c1
--- /dev/null
+++ b/Hyperbar.Widget.Windows/WidgetAvailabilityConfigurationView.xaml.cs
@@ -0,0 +1,10 @@
+using CommunityToolkit.WinUI.Controls;
+
+namespace Hyperbar.Widget.Windows;
+
+public sealed partial class WidgetAvailabilityConfigurationView :
+    SettingsCard
+{
+    public WidgetAvailabilityConfigurationView() => 
+        InitializeComponent();
+}
diff --git a/Hyperbar.Widget.Windows/WidgetConfigurationView.xaml b/Hyperbar.Widget.Windows/WidgetConfigurationView.xaml
index c28adff..50d4165 100644
--- a/Hyperbar.Widget.Windows/WidgetConfigurationView.xaml
+++ b/Hyperbar.Widget.Windows/WidgetConfigurationView.xaml
@@ -3,5 +3,5 @@
     x:Class="Hyperbar.Widget.Windows.WidgetConfigurationView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ListBox ItemsSource="{Binding Mode=TwoWay}" />
+    <ItemsControl ItemTemplateSelector="{Binding ViewModelTemplateSelector}" ItemsSource="{Binding Mode=TwoWay}" />
 </UserControl>
diff --git a/Hyperbar.Windows/Dispatcher.cs b/Hyperbar.Windows/Dispatcher.cs
index d76e1ac..f9efa9a 100644
--- a/Hyperbar.Windows/Dispatcher.cs
+++ b/Hyperbar.Windows/Dispatcher.cs
@@ -1,4 +1,5 @@
-using CommunityToolkit.WinUI;
+
+using CommunityToolkit.WinUI;
 using Microsoft.UI.Dispatching;
 
 namespace Hyperbar.Windows;
@@ -6,6 +7,8 @@ namespace Hyperbar.Windows;
 public class Dispatcher(DispatcherQueue dispatcherQueue) :
     IDispatcher
 {
-    public async Task InvokeAsync(Action action) => 
+    public async Task InvokeAsync(Action action)
+    {
         await dispatcherQueue.EnqueueAsync(action.Invoke);
+    }
 }
diff --git a/Hyperbar.Windows/Hyperbar.Windows.csproj b/Hyperbar.Windows/Hyperbar.Windows.csproj
index c43ebcc..7c34aac 100644
--- a/Hyperbar.Windows/Hyperbar.Windows.csproj
+++ b/Hyperbar.Windows/Hyperbar.Windows.csproj
@@ -32,12 +32,12 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-		<PackageReference Include="CommunityToolkit.WinUI" Version="7.1.2" />
-		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
-		<PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2" />
-		<PackageReference Include="CustomExtensions.WinUI" Version="0.1.10-beta" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240124002-experimental2" />
+		<PackageReference Include="CommunityToolkit.Common" Version="8.2.2" />
+		<PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.240109" />
+		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.0.240109" />
+		<PackageReference Include="CommunityToolkit.WinUI.Triggers" Version="8.0.240109" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.1.24080.9" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240205001-preview1" />
 		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26031-preview" />
 		<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />		
 		<Manifest Include="$(ApplicationManifest)" />
@@ -56,35 +56,4 @@
 		<ProjectReference Include="..\Hyperbar.Widget\Hyperbar.Widget.csproj" />
 		<ProjectReference Include="..\Hyperbar\Hyperbar.csproj" />
 	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="GeneralSettingsNavigationView.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="SettingsView.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="SettingsButtonView.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="SecondaryView.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="PrimaryView.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </Page>
-	</ItemGroup>
-	<ItemGroup>
-	  <Page Update="ApplicationBarView.xaml">
-	    <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-	    <SubType>Designer</SubType>
-	  </Page>
-	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Hyperbar/Hyperbar.csproj b/Hyperbar/Hyperbar.csproj
index 1850150..e27f1b3 100644
--- a/Hyperbar/Hyperbar.csproj
+++ b/Hyperbar/Hyperbar.csproj
@@ -6,7 +6,7 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-preview.1.24080.9" />
 		<PackageReference Include="System.Reactive" Version="6.0.1-preview.1" />
 	</ItemGroup>
 </Project>