From 36f9a6fd858568674cdceefcd4396ef21b0db984 Mon Sep 17 00:00:00 2001
From: Isaac Daly <isaac.daly@outlook.com>
Date: Tue, 26 Dec 2023 09:39:10 +1100
Subject: [PATCH] Bump Whim version to 0.3.0 (#743)

Bump version to 0.3.0
---
 src/Whim.Bar.Tests/Whim.Bar.Tests.csproj      |  98 ++---
 src/Whim.Bar/Whim.Bar.csproj                  |  97 ++--
 .../Whim.CommandPalette.Tests.csproj          |  98 ++---
 .../Whim.CommandPalette.csproj                | 162 ++++---
 .../Whim.FloatingLayout.Tests.csproj          |  98 ++---
 .../Whim.FloatingLayout.csproj                |  70 ++-
 .../Whim.FocusIndicator.csproj                |  89 ++--
 src/Whim.Gaps.Tests/Whim.Gaps.Tests.csproj    |  98 ++---
 src/Whim.Gaps/Whim.Gaps.csproj                |  59 ++-
 .../Whim.LayoutPreview.Tests.csproj           |  88 ++--
 .../Whim.LayoutPreview.csproj                 | 118 +++--
 src/Whim.Runner/Whim.Runner.csproj            | 416 ++++++++----------
 src/Whim.TestUtils/Whim.TestUtils.csproj      |  80 ++--
 src/Whim.Tests/Whim.Tests.csproj              | 102 +++--
 .../Whim.TreeLayout.Bar.Tests.csproj          | 100 ++---
 .../Whim.TreeLayout.Bar.csproj                | 102 +++--
 ...him.TreeLayout.CommandPalette.Tests.csproj |  91 ++--
 .../Whim.TreeLayout.CommandPalette.csproj     |  96 ++--
 .../Whim.TreeLayout.Tests.csproj              |  94 ++--
 src/Whim.TreeLayout/Whim.TreeLayout.csproj    |  88 ++--
 .../Whim.Updater.Tests.csproj                 |  98 ++---
 src/Whim.Updater/Whim.Updater.csproj          | 103 +++--
 src/Whim/Whim.csproj                          | 139 +++---
 23 files changed, 1216 insertions(+), 1368 deletions(-)

diff --git a/src/Whim.Bar.Tests/Whim.Bar.Tests.csproj b/src/Whim.Bar.Tests/Whim.Bar.Tests.csproj
index e1c1bbc16..e41c08bff 100644
--- a/src/Whim.Bar.Tests/Whim.Bar.Tests.csproj
+++ b/src/Whim.Bar.Tests/Whim.Bar.Tests.csproj
@@ -1,53 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="AutoFixture" />
-		<PackageReference Include="AutoFixture.AutoNSubstitute" />
-		<PackageReference Include="AutoFixture.Xunit2" />
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="FluentAssertions" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="NSubstitute" />
-		<PackageReference Include="NSubstitute.Analyzers.CSharp" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim.Bar\Whim.Bar.csproj" />
-		<ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="AutoFixture" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" />
+    <PackageReference Include="AutoFixture.Xunit2" />
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim.Bar\Whim.Bar.csproj" />
+    <ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.Bar/Whim.Bar.csproj b/src/Whim.Bar/Whim.Bar.csproj
index bc45d890d..0bed0a631 100644
--- a/src/Whim.Bar/Whim.Bar.csproj
+++ b/src/Whim.Bar/Whim.Bar.csproj
@@ -1,52 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<RootNamespace>Whim.Bar</RootNamespace>
-		<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<UseWinUI>true</UseWinUI>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-	<ItemGroup>
-		<None Remove="BarWindow.xaml" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="BarWindow.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-
-	<ItemGroup>
-		<InternalsVisibleTo Include="Whim.Bar.Tests" />
-		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-	</ItemGroup>
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <RootNamespace>Whim.Bar</RootNamespace>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <UseWinUI>true</UseWinUI>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="BarWindow.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="BarWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Whim.Bar.Tests" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.CommandPalette.Tests/Whim.CommandPalette.Tests.csproj b/src/Whim.CommandPalette.Tests/Whim.CommandPalette.Tests.csproj
index e9fa48934..203a09e61 100644
--- a/src/Whim.CommandPalette.Tests/Whim.CommandPalette.Tests.csproj
+++ b/src/Whim.CommandPalette.Tests/Whim.CommandPalette.Tests.csproj
@@ -1,53 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="AutoFixture" />
-		<PackageReference Include="AutoFixture.AutoNSubstitute" />
-		<PackageReference Include="AutoFixture.Xunit2" />
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="FluentAssertions" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="NSubstitute" />
-		<PackageReference Include="NSubstitute.Analyzers.CSharp" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim.CommandPalette\Whim.CommandPalette.csproj" />
-		<ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="AutoFixture" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" />
+    <PackageReference Include="AutoFixture.Xunit2" />
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim.CommandPalette\Whim.CommandPalette.csproj" />
+    <ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.CommandPalette/Whim.CommandPalette.csproj b/src/Whim.CommandPalette/Whim.CommandPalette.csproj
index e621a66bf..2a1ccc560 100644
--- a/src/Whim.CommandPalette/Whim.CommandPalette.csproj
+++ b/src/Whim.CommandPalette/Whim.CommandPalette.csproj
@@ -1,89 +1,77 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<UseWinUI>true</UseWinUI>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<None Remove="CommandPaletteWindow.xaml" />
-		<None Remove="Variants\FreeText\FreeTextVariantView.xaml" />
-		<None Remove="Variants\Menu\MenuVariantRowView.xaml" />
-		<None Remove="Variants\Menu\MenuVariantView.xaml" />
-		<None Remove="Variants\Select\SelectVariantRowView.xaml" />
-		<None Remove="Variants\Select\SelectVariantView.xaml" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<InternalsVisibleTo Include="Whim.CommandPalette.Tests" />
-		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="CommandPaletteWindow.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="Variants\FreeText\FreeTextVariantView.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="Variants\Menu\MenuVariantRowView.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="Variants\Menu\MenuVariantView.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="Variants\Select\SelectVariantRowView.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="Variants\Select\SelectVariantView.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <UseWinUI>true</UseWinUI>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="CommandPaletteWindow.xaml" />
+    <None Remove="Variants\FreeText\FreeTextVariantView.xaml" />
+    <None Remove="Variants\Menu\MenuVariantRowView.xaml" />
+    <None Remove="Variants\Menu\MenuVariantView.xaml" />
+    <None Remove="Variants\Select\SelectVariantRowView.xaml" />
+    <None Remove="Variants\Select\SelectVariantView.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Whim.CommandPalette.Tests" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="CommandPaletteWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Variants\FreeText\FreeTextVariantView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Variants\Menu\MenuVariantRowView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Variants\Menu\MenuVariantView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Variants\Select\SelectVariantRowView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="Variants\Select\SelectVariantView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.FloatingLayout.Tests/Whim.FloatingLayout.Tests.csproj b/src/Whim.FloatingLayout.Tests/Whim.FloatingLayout.Tests.csproj
index 0735d12f5..73aa29265 100644
--- a/src/Whim.FloatingLayout.Tests/Whim.FloatingLayout.Tests.csproj
+++ b/src/Whim.FloatingLayout.Tests/Whim.FloatingLayout.Tests.csproj
@@ -1,53 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="AutoFixture" />
-		<PackageReference Include="AutoFixture.AutoNSubstitute" />
-		<PackageReference Include="AutoFixture.Xunit2" />
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="FluentAssertions" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="NSubstitute" />
-		<PackageReference Include="NSubstitute.Analyzers.CSharp" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim.FloatingLayout\Whim.FloatingLayout.csproj" />
-		<ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="AutoFixture" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" />
+    <PackageReference Include="AutoFixture.Xunit2" />
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim.FloatingLayout\Whim.FloatingLayout.csproj" />
+    <ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.FloatingLayout/Whim.FloatingLayout.csproj b/src/Whim.FloatingLayout/Whim.FloatingLayout.csproj
index cb75bb785..880d101f0 100644
--- a/src/Whim.FloatingLayout/Whim.FloatingLayout.csproj
+++ b/src/Whim.FloatingLayout/Whim.FloatingLayout.csproj
@@ -1,38 +1,34 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<InternalsVisibleTo Include="Whim.FloatingLayout.Tests" />
-		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-	</ItemGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Whim.FloatingLayout.Tests" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.FocusIndicator/Whim.FocusIndicator.csproj b/src/Whim.FocusIndicator/Whim.FocusIndicator.csproj
index 0ad2028a9..273895970 100644
--- a/src/Whim.FocusIndicator/Whim.FocusIndicator.csproj
+++ b/src/Whim.FocusIndicator/Whim.FocusIndicator.csproj
@@ -1,48 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<RootNamespace>Whim.FocusIndicator</RootNamespace>
-		<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<UseWinUI>true</UseWinUI>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<None Remove="FocusIndicatorWindow.xaml" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="FocusIndicatorWindow.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <RootNamespace>Whim.FocusIndicator</RootNamespace>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <UseWinUI>true</UseWinUI>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="FocusIndicatorWindow.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="FocusIndicatorWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.Gaps.Tests/Whim.Gaps.Tests.csproj b/src/Whim.Gaps.Tests/Whim.Gaps.Tests.csproj
index 5d6fa6fef..ab7bfa0dc 100644
--- a/src/Whim.Gaps.Tests/Whim.Gaps.Tests.csproj
+++ b/src/Whim.Gaps.Tests/Whim.Gaps.Tests.csproj
@@ -1,53 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="AutoFixture" />
-		<PackageReference Include="AutoFixture.AutoNSubstitute" />
-		<PackageReference Include="AutoFixture.Xunit2" />
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="FluentAssertions" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="NSubstitute" />
-		<PackageReference Include="NSubstitute.Analyzers.CSharp" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim.Gaps\Whim.Gaps.csproj" />
-		<ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="AutoFixture" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" />
+    <PackageReference Include="AutoFixture.Xunit2" />
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim.Gaps\Whim.Gaps.csproj" />
+    <ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.Gaps/Whim.Gaps.csproj b/src/Whim.Gaps/Whim.Gaps.csproj
index 4ebdb032e..2b893824b 100644
--- a/src/Whim.Gaps/Whim.Gaps.csproj
+++ b/src/Whim.Gaps/Whim.Gaps.csproj
@@ -1,33 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.LayoutPreview.Tests/Whim.LayoutPreview.Tests.csproj b/src/Whim.LayoutPreview.Tests/Whim.LayoutPreview.Tests.csproj
index 8bede7dff..2014ba6f9 100644
--- a/src/Whim.LayoutPreview.Tests/Whim.LayoutPreview.Tests.csproj
+++ b/src/Whim.LayoutPreview.Tests/Whim.LayoutPreview.Tests.csproj
@@ -1,48 +1,44 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="FluentAssertions" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim.LayoutPreview\Whim.LayoutPreview.csproj" />
-		<ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim.LayoutPreview\Whim.LayoutPreview.csproj" />
+    <ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.LayoutPreview/Whim.LayoutPreview.csproj b/src/Whim.LayoutPreview/Whim.LayoutPreview.csproj
index 4b98045da..d374ca6b9 100644
--- a/src/Whim.LayoutPreview/Whim.LayoutPreview.csproj
+++ b/src/Whim.LayoutPreview/Whim.LayoutPreview.csproj
@@ -1,64 +1,56 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<RootNamespace>Whim.LayoutPreview</RootNamespace>
-		<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<UseWinUI>true</UseWinUI>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<None Remove="LayoutPreviewWindow.xaml" />
-		<None Remove="LayoutPreviewWindowItem.xaml" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<InternalsVisibleTo Include="Whim.LayoutPreview.Tests" />
-		<InternalsVisibleTo Include="Whim.LayoutPreview.Bar.Tests" />
-		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="LayoutPreviewWindowItem.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="LayoutPreviewWindow.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <RootNamespace>Whim.LayoutPreview</RootNamespace>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <UseWinUI>true</UseWinUI>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="LayoutPreviewWindow.xaml" />
+    <None Remove="LayoutPreviewWindowItem.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+  </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Whim.LayoutPreview.Tests" />
+    <InternalsVisibleTo Include="Whim.LayoutPreview.Bar.Tests" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="LayoutPreviewWindowItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="LayoutPreviewWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.Runner/Whim.Runner.csproj b/src/Whim.Runner/Whim.Runner.csproj
index a29155334..35008bae5 100644
--- a/src/Whim.Runner/Whim.Runner.csproj
+++ b/src/Whim.Runner/Whim.Runner.csproj
@@ -1,236 +1,186 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-		<ApplicationIcon>Assets\Icon.ico</ApplicationIcon>
-		<ApplicationManifest>app.manifest</ApplicationManifest>
-		<Authors>Isaac Daly</Authors>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-		<Nullable>enable</Nullable>
-		<OutputType>WinExe</OutputType>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<PublishProfile>win10-$(Platform).pubxml</PublishProfile>
-		<RootNamespace>Whim.Runner</RootNamespace>
-		<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<UseWinUI>true</UseWinUI>
-		<Version>0.2.0</Version>
-		<WinUISDKReferences>false</WinUISDKReferences>
-		<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-		<WindowsPackageType>None</WindowsPackageType>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Any CPU'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Any CPU'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Any CPU'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Any CPU'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Any CPU'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Any CPU'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
-		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
-	</PropertyGroup>
-	<ItemGroup>
-		<None Remove="ExceptionWindow.xaml" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Content Include="Assets\SplashScreen.scale-200.png" />
-		<Content Include="Assets\LockScreenLogo.scale-200.png" />
-		<Content Include="Assets\Square150x150Logo.scale-200.png" />
-		<Content Include="Assets\Square44x44Logo.scale-200.png" />
-		<Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-		<Content Include="Assets\Wide310x150Logo.scale-200.png" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.Scripting" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-		<Manifest Include="$(ApplicationManifest)" />
-	</ItemGroup>
-
-	<!-- Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <ApplicationIcon>Assets\Icon.ico</ApplicationIcon>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <Authors>Isaac Daly</Authors>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+    <Nullable>enable</Nullable>
+    <OutputType>WinExe</OutputType>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <PublishProfile>win10-$(Platform).pubxml</PublishProfile>
+    <RootNamespace>Whim.Runner</RootNamespace>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <UseWinUI>true</UseWinUI>
+    <Version>0.3.0</Version>
+    <WinUISDKReferences>false</WinUISDKReferences>
+    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+    <WindowsPackageType>None</WindowsPackageType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Any CPU'">
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Any CPU'">
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Any CPU'">
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Any CPU'">
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Any CPU'">
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Any CPU'">
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="ExceptionWindow.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Assets\SplashScreen.scale-200.png" />
+    <Content Include="Assets\LockScreenLogo.scale-200.png" />
+    <Content Include="Assets\Square150x150Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.scale-200.png" />
+    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Scripting" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+    <Manifest Include="$(ApplicationManifest)" />
+  </ItemGroup>
+  <!-- Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
 		Tools extension to be activated for this project even if the Windows App SDK Nuget
 		package has not yet been restored -->
-	<ItemGroup
-		Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
-		<ProjectCapability Include="Msix" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim.Bar\Whim.Bar.csproj" />
-		<ProjectReference Include="..\Whim.CommandPalette\Whim.CommandPalette.csproj" />
-		<ProjectReference Include="..\Whim.FloatingLayout\Whim.FloatingLayout.csproj" />
-		<ProjectReference Include="..\Whim.FocusIndicator\Whim.FocusIndicator.csproj" />
-		<ProjectReference Include="..\Whim.Gaps\Whim.Gaps.csproj" />
-		<ProjectReference Include="..\Whim.LayoutPreview\Whim.LayoutPreview.csproj" />
-		<ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
-		<ProjectReference Include="..\Whim.TreeLayout.Bar\Whim.TreeLayout.Bar.csproj" />
-		<ProjectReference
-			Include="..\Whim.TreeLayout.CommandPalette\Whim.TreeLayout.CommandPalette.csproj" />
-		<ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
-		<ProjectReference Include="..\Whim.Updater\Whim.Updater.csproj" />
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<None Update="Assets\StoreLogo.png">
-			<Pack>True</Pack>
-			<PackagePath>\</PackagePath>
-		</None>
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="ExceptionWindow.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
-
-	<!--Whim.Bar-->
-	<Target Name="CopyBarAfterBuild" AfterTargets="Build;Publish">
-		<ItemGroup>
-			<BarSourceFile Include="$(SolutionDir)\src\Whim.Bar\$(OutDir)\Whim.Bar\**\*" />
-			<BarDestinationFile
-				Include="@(BarSourceFile->'$(TargetDir)plugins\Whim.Bar\%(RecursiveDir)%(Filename)%(Extension)')" />
-		</ItemGroup>
-		<Copy SourceFiles="@(BarSourceFile)" DestinationFiles="@(BarDestinationFile)"
-			SkipUnchangedFiles="true" />
-		<Copy SourceFiles="$(SolutionDir)src\Whim.Bar\$(OutDir)Whim.Bar.dll"
-			DestinationFolder="$(TargetDir)plugins\Whim.Bar\" SkipUnchangedFiles="true" />
-	</Target>
-
-	<!--Whim.CommandPalette-->
-	<Target Name="CopyCommandPaletteAfterBuild" AfterTargets="Build;Publish">
-		<ItemGroup>
-			<CommandPaletteSourceFile
-				Include="$(SolutionDir)\src\Whim.CommandPalette\$(OutDir)\Whim.CommandPalette\**\*" />
-			<CommandPaletteDestinationFile
-				Include="@(CommandPaletteSourceFile->'$(TargetDir)plugins\Whim.CommandPalette\%(RecursiveDir)%(Filename)%(Extension)')" />
-		</ItemGroup>
-		<Copy SourceFiles="@(CommandPaletteSourceFile)"
-			DestinationFiles="@(CommandPaletteDestinationFile)" SkipUnchangedFiles="true" />
-		<Copy SourceFiles="$(SolutionDir)src\Whim.CommandPalette\$(OutDir)Whim.CommandPalette.dll"
-			DestinationFolder="$(TargetDir)plugins\Whim.CommandPalette\" SkipUnchangedFiles="true" />
-	</Target>
-
-	<!--Whim.FloatingLayout-->
-	<Target Name="CopyFloatingLayoutAfterBuild" AfterTargets="Build;Publish">
-		<Copy SourceFiles="$(SolutionDir)src\Whim.FloatingLayout\$(OutDir)Whim.FloatingLayout.dll"
-			DestinationFolder="$(TargetDir)plugins\Whim.FloatingLayout\" SkipUnchangedFiles="true" />
-	</Target>
-
-	<!--Whim.FocusIndicator-->
-	<Target Name="CopyFocusIndicatorAfterBuild" AfterTargets="Build;Publish">
-		<ItemGroup>
-			<FocusIndicatorSourceFile
-				Include="$(SolutionDir)\src\Whim.FocusIndicator\$(OutDir)\Whim.FocusIndicator\**\*" />
-			<FocusIndicatorDestinationFile
-				Include="@(FocusIndicatorSourceFile->'$(TargetDir)plugins\Whim.FocusIndicator\%(RecursiveDir)%(Filename)%(Extension)')" />
-		</ItemGroup>
-		<Copy SourceFiles="@(FocusIndicatorSourceFile)"
-			DestinationFiles="@(FocusIndicatorDestinationFile)" SkipUnchangedFiles="true" />
-		<Copy SourceFiles="$(SolutionDir)src\Whim.FocusIndicator\$(OutDir)Whim.FocusIndicator.dll"
-			DestinationFolder="$(TargetDir)plugins\Whim.FocusIndicator\" SkipUnchangedFiles="true" />
-	</Target>
-
-	<!--Whim.Gaps-->
-	<Target Name="CopyGapsAfterBuild" AfterTargets="Build;Publish">
-		<Copy SourceFiles="$(SolutionDir)src\Whim.Gaps\$(OutDir)Whim.Gaps.dll"
-			DestinationFolder="$(TargetDir)plugins\Whim.Gaps\" SkipUnchangedFiles="true" />
-	</Target>
-
-	<!--Whim.LayoutPreview-->
-	<Target Name="CopyLayoutPreviewAfterBuild" AfterTargets="Build;Publish">
-		<ItemGroup>
-			<LayoutPreviewSourceFile
-				Include="$(SolutionDir)\src\Whim.LayoutPreview\$(OutDir)\Whim.LayoutPreview\**\*" />
-			<LayoutPreviewDestinationFile
-				Include="@(LayoutPreviewSourceFile->'$(TargetDir)plugins\Whim.LayoutPreview\%(RecursiveDir)%(Filename)%(Extension)')" />
-		</ItemGroup>
-		<Copy SourceFiles="@(LayoutPreviewSourceFile)"
-			DestinationFiles="@(LayoutPreviewDestinationFile)" SkipUnchangedFiles="true" />
-		<Copy SourceFiles="$(SolutionDir)src\Whim.LayoutPreview\$(OutDir)Whim.LayoutPreview.dll"
-			DestinationFolder="$(TargetDir)plugins\Whim.LayoutPreview\" SkipUnchangedFiles="true" />
-	</Target>
-
-	<!--Whim.TreeLayout-->
-	<Target Name="CopyTreeLayoutAfterBuild" AfterTargets="Build;Publish">
-		<Copy SourceFiles="$(SolutionDir)src\Whim.TreeLayout\$(OutDir)Whim.TreeLayout.dll"
-			DestinationFolder="$(TargetDir)plugins\Whim.TreeLayout\" SkipUnchangedFiles="true" />
-	</Target>
-
-	<!--Whim.TreeLayout.Bar-->
-	<Target Name="CopyTreeLayoutBarAfterBuild"
-		AfterTargets="Build;Publish;CopyBarAfterBuild;CopyTreeLayoutAfterBuild">
-		<ItemGroup>
-			<TreeLayoutBarSourceFile
-				Include="$(SolutionDir)\src\Whim.TreeLayout.Bar\$(OutDir)\Whim.TreeLayout.Bar\**\*" />
-			<TreeLayoutBarDestinationFile
-				Include="@(TreeLayoutBarSourceFile->'$(TargetDir)plugins\Whim.TreeLayout.Bar\%(RecursiveDir)%(Filename)%(Extension)')" />
-		</ItemGroup>
-		<Copy SourceFiles="@(TreeLayoutBarSourceFile)"
-			DestinationFiles="@(TreeLayoutBarDestinationFile)" SkipUnchangedFiles="true" />
-		<Copy SourceFiles="$(SolutionDir)src\Whim.TreeLayout.Bar\$(OutDir)Whim.TreeLayout.Bar.dll"
-			DestinationFolder="$(TargetDir)plugins\Whim.TreeLayout.Bar\" SkipUnchangedFiles="true" />
-	</Target>
-
-	<!--Whim.TreeLayout.CommandPalette-->
-	<Target Name="CopyTreeLayoutCommandPaletteAfterBuild"
-		AfterTargets="Build;Publish;CopyCommandPaletteAfterBuild;CopyTreeLayoutAfterBuild">
-		<Copy
-			SourceFiles="$(SolutionDir)src\Whim.TreeLayout.CommandPalette\$(OutDir)Whim.TreeLayout.CommandPalette.dll"
-			DestinationFolder="$(TargetDir)plugins\Whim.TreeLayout.CommandPalette\"
-			SkipUnchangedFiles="true" />
-	</Target>
-
-	<!-- Whim.Updater -->
-	<Target Name="CopyUpdaterAfterBuild" AfterTargets="Build;Publish">
-		<ItemGroup>
-			<UpdaterSourceFile Include="$(SolutionDir)\src\Whim.Updater\$(OutDir)\Whim.Updater\**\*" />
-			<UpdaterDestinationFile
-				Include="@(UpdaterSourceFile->'$(TargetDir)plugins\Whim.Updater\%(RecursiveDir)%(Filename)%(Extension)')" />
-		</ItemGroup>
-		<Copy SourceFiles="@(UpdaterSourceFile)" DestinationFiles="@(UpdaterDestinationFile)"
-			SkipUnchangedFiles="true" />
-		<Copy SourceFiles="$(SolutionDir)src\Whim.Updater\$(OutDir)Whim.Updater.dll"
-			DestinationFolder="$(TargetDir)plugins\Whim.Updater\" SkipUnchangedFiles="true" />
-	</Target>
+  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnablePreviewMsixTooling)'=='true'">
+    <ProjectCapability Include="Msix" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim.Bar\Whim.Bar.csproj" />
+    <ProjectReference Include="..\Whim.CommandPalette\Whim.CommandPalette.csproj" />
+    <ProjectReference Include="..\Whim.FloatingLayout\Whim.FloatingLayout.csproj" />
+    <ProjectReference Include="..\Whim.FocusIndicator\Whim.FocusIndicator.csproj" />
+    <ProjectReference Include="..\Whim.Gaps\Whim.Gaps.csproj" />
+    <ProjectReference Include="..\Whim.LayoutPreview\Whim.LayoutPreview.csproj" />
+    <ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
+    <ProjectReference Include="..\Whim.TreeLayout.Bar\Whim.TreeLayout.Bar.csproj" />
+    <ProjectReference Include="..\Whim.TreeLayout.CommandPalette\Whim.TreeLayout.CommandPalette.csproj" />
+    <ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
+    <ProjectReference Include="..\Whim.Updater\Whim.Updater.csproj" />
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Assets\StoreLogo.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="ExceptionWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <!--Whim.Bar-->
+  <Target Name="CopyBarAfterBuild" AfterTargets="Build;Publish">
+    <ItemGroup>
+      <BarSourceFile Include="$(SolutionDir)\src\Whim.Bar\$(OutDir)\Whim.Bar\**\*" />
+      <BarDestinationFile Include="@(BarSourceFile-&gt;'$(TargetDir)plugins\Whim.Bar\%(RecursiveDir)%(Filename)%(Extension)')" />
+    </ItemGroup>
+    <Copy SourceFiles="@(BarSourceFile)" DestinationFiles="@(BarDestinationFile)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(SolutionDir)src\Whim.Bar\$(OutDir)Whim.Bar.dll" DestinationFolder="$(TargetDir)plugins\Whim.Bar\" SkipUnchangedFiles="true" />
+  </Target>
+  <!--Whim.CommandPalette-->
+  <Target Name="CopyCommandPaletteAfterBuild" AfterTargets="Build;Publish">
+    <ItemGroup>
+      <CommandPaletteSourceFile Include="$(SolutionDir)\src\Whim.CommandPalette\$(OutDir)\Whim.CommandPalette\**\*" />
+      <CommandPaletteDestinationFile Include="@(CommandPaletteSourceFile-&gt;'$(TargetDir)plugins\Whim.CommandPalette\%(RecursiveDir)%(Filename)%(Extension)')" />
+    </ItemGroup>
+    <Copy SourceFiles="@(CommandPaletteSourceFile)" DestinationFiles="@(CommandPaletteDestinationFile)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(SolutionDir)src\Whim.CommandPalette\$(OutDir)Whim.CommandPalette.dll" DestinationFolder="$(TargetDir)plugins\Whim.CommandPalette\" SkipUnchangedFiles="true" />
+  </Target>
+  <!--Whim.FloatingLayout-->
+  <Target Name="CopyFloatingLayoutAfterBuild" AfterTargets="Build;Publish">
+    <Copy SourceFiles="$(SolutionDir)src\Whim.FloatingLayout\$(OutDir)Whim.FloatingLayout.dll" DestinationFolder="$(TargetDir)plugins\Whim.FloatingLayout\" SkipUnchangedFiles="true" />
+  </Target>
+  <!--Whim.FocusIndicator-->
+  <Target Name="CopyFocusIndicatorAfterBuild" AfterTargets="Build;Publish">
+    <ItemGroup>
+      <FocusIndicatorSourceFile Include="$(SolutionDir)\src\Whim.FocusIndicator\$(OutDir)\Whim.FocusIndicator\**\*" />
+      <FocusIndicatorDestinationFile Include="@(FocusIndicatorSourceFile-&gt;'$(TargetDir)plugins\Whim.FocusIndicator\%(RecursiveDir)%(Filename)%(Extension)')" />
+    </ItemGroup>
+    <Copy SourceFiles="@(FocusIndicatorSourceFile)" DestinationFiles="@(FocusIndicatorDestinationFile)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(SolutionDir)src\Whim.FocusIndicator\$(OutDir)Whim.FocusIndicator.dll" DestinationFolder="$(TargetDir)plugins\Whim.FocusIndicator\" SkipUnchangedFiles="true" />
+  </Target>
+  <!--Whim.Gaps-->
+  <Target Name="CopyGapsAfterBuild" AfterTargets="Build;Publish">
+    <Copy SourceFiles="$(SolutionDir)src\Whim.Gaps\$(OutDir)Whim.Gaps.dll" DestinationFolder="$(TargetDir)plugins\Whim.Gaps\" SkipUnchangedFiles="true" />
+  </Target>
+  <!--Whim.LayoutPreview-->
+  <Target Name="CopyLayoutPreviewAfterBuild" AfterTargets="Build;Publish">
+    <ItemGroup>
+      <LayoutPreviewSourceFile Include="$(SolutionDir)\src\Whim.LayoutPreview\$(OutDir)\Whim.LayoutPreview\**\*" />
+      <LayoutPreviewDestinationFile Include="@(LayoutPreviewSourceFile-&gt;'$(TargetDir)plugins\Whim.LayoutPreview\%(RecursiveDir)%(Filename)%(Extension)')" />
+    </ItemGroup>
+    <Copy SourceFiles="@(LayoutPreviewSourceFile)" DestinationFiles="@(LayoutPreviewDestinationFile)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(SolutionDir)src\Whim.LayoutPreview\$(OutDir)Whim.LayoutPreview.dll" DestinationFolder="$(TargetDir)plugins\Whim.LayoutPreview\" SkipUnchangedFiles="true" />
+  </Target>
+  <!--Whim.TreeLayout-->
+  <Target Name="CopyTreeLayoutAfterBuild" AfterTargets="Build;Publish">
+    <Copy SourceFiles="$(SolutionDir)src\Whim.TreeLayout\$(OutDir)Whim.TreeLayout.dll" DestinationFolder="$(TargetDir)plugins\Whim.TreeLayout\" SkipUnchangedFiles="true" />
+  </Target>
+  <!--Whim.TreeLayout.Bar-->
+  <Target Name="CopyTreeLayoutBarAfterBuild" AfterTargets="Build;Publish;CopyBarAfterBuild;CopyTreeLayoutAfterBuild">
+    <ItemGroup>
+      <TreeLayoutBarSourceFile Include="$(SolutionDir)\src\Whim.TreeLayout.Bar\$(OutDir)\Whim.TreeLayout.Bar\**\*" />
+      <TreeLayoutBarDestinationFile Include="@(TreeLayoutBarSourceFile-&gt;'$(TargetDir)plugins\Whim.TreeLayout.Bar\%(RecursiveDir)%(Filename)%(Extension)')" />
+    </ItemGroup>
+    <Copy SourceFiles="@(TreeLayoutBarSourceFile)" DestinationFiles="@(TreeLayoutBarDestinationFile)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(SolutionDir)src\Whim.TreeLayout.Bar\$(OutDir)Whim.TreeLayout.Bar.dll" DestinationFolder="$(TargetDir)plugins\Whim.TreeLayout.Bar\" SkipUnchangedFiles="true" />
+  </Target>
+  <!--Whim.TreeLayout.CommandPalette-->
+  <Target Name="CopyTreeLayoutCommandPaletteAfterBuild" AfterTargets="Build;Publish;CopyCommandPaletteAfterBuild;CopyTreeLayoutAfterBuild">
+    <Copy SourceFiles="$(SolutionDir)src\Whim.TreeLayout.CommandPalette\$(OutDir)Whim.TreeLayout.CommandPalette.dll" DestinationFolder="$(TargetDir)plugins\Whim.TreeLayout.CommandPalette\" SkipUnchangedFiles="true" />
+  </Target>
+  <!-- Whim.Updater -->
+  <Target Name="CopyUpdaterAfterBuild" AfterTargets="Build;Publish">
+    <ItemGroup>
+      <UpdaterSourceFile Include="$(SolutionDir)\src\Whim.Updater\$(OutDir)\Whim.Updater\**\*" />
+      <UpdaterDestinationFile Include="@(UpdaterSourceFile-&gt;'$(TargetDir)plugins\Whim.Updater\%(RecursiveDir)%(Filename)%(Extension)')" />
+    </ItemGroup>
+    <Copy SourceFiles="@(UpdaterSourceFile)" DestinationFiles="@(UpdaterDestinationFile)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(SolutionDir)src\Whim.Updater\$(OutDir)Whim.Updater.dll" DestinationFolder="$(TargetDir)plugins\Whim.Updater\" SkipUnchangedFiles="true" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.TestUtils/Whim.TestUtils.csproj b/src/Whim.TestUtils/Whim.TestUtils.csproj
index 1b70f3cc1..7e1e3558c 100644
--- a/src/Whim.TestUtils/Whim.TestUtils.csproj
+++ b/src/Whim.TestUtils/Whim.TestUtils.csproj
@@ -1,44 +1,40 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<IsPackable>false</IsPackable>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="AutoFixture" />
-		<PackageReference Include="AutoFixture.AutoNSubstitute" />
-		<PackageReference Include="AutoFixture.Xunit2" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="NSubstitute" />
-		<PackageReference Include="NSubstitute.Analyzers.CSharp" />
-		<PackageReference Include="xunit" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <IsPackable>false</IsPackable>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="AutoFixture" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" />
+    <PackageReference Include="AutoFixture.Xunit2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" />
+    <PackageReference Include="xunit" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.Tests/Whim.Tests.csproj b/src/Whim.Tests/Whim.Tests.csproj
index ccff34b40..2ceb41a74 100644
--- a/src/Whim.Tests/Whim.Tests.csproj
+++ b/src/Whim.Tests/Whim.Tests.csproj
@@ -1,55 +1,51 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<IsPackable>false</IsPackable>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="AutoFixture" />
-		<PackageReference Include="AutoFixture.AutoNSubstitute" />
-		<PackageReference Include="AutoFixture.Xunit2" />
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="FluentAssertions" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="NSubstitute" />
-		<PackageReference Include="NSubstitute.Analyzers.CSharp" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.analyzers" />
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-		<ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <IsPackable>false</IsPackable>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="AutoFixture" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" />
+    <PackageReference Include="AutoFixture.Xunit2" />
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.analyzers" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+    <ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.TreeLayout.Bar.Tests/Whim.TreeLayout.Bar.Tests.csproj b/src/Whim.TreeLayout.Bar.Tests/Whim.TreeLayout.Bar.Tests.csproj
index 7d70f2bb9..0815fef1c 100644
--- a/src/Whim.TreeLayout.Bar.Tests/Whim.TreeLayout.Bar.Tests.csproj
+++ b/src/Whim.TreeLayout.Bar.Tests/Whim.TreeLayout.Bar.Tests.csproj
@@ -1,54 +1,50 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="AutoFixture" />
-		<PackageReference Include="AutoFixture.AutoNSubstitute" />
-		<PackageReference Include="AutoFixture.Xunit2" />
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="FluentAssertions" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="NSubstitute" />
-		<PackageReference Include="NSubstitute.Analyzers.CSharp" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
-		<ProjectReference Include="..\Whim.TreeLayout.Bar\Whim.TreeLayout.Bar.csproj" />
-		<ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="AutoFixture" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" />
+    <PackageReference Include="AutoFixture.Xunit2" />
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
+    <ProjectReference Include="..\Whim.TreeLayout.Bar\Whim.TreeLayout.Bar.csproj" />
+    <ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.TreeLayout.Bar/Whim.TreeLayout.Bar.csproj b/src/Whim.TreeLayout.Bar/Whim.TreeLayout.Bar.csproj
index a44c75160..af69c81a5 100644
--- a/src/Whim.TreeLayout.Bar/Whim.TreeLayout.Bar.csproj
+++ b/src/Whim.TreeLayout.Bar/Whim.TreeLayout.Bar.csproj
@@ -1,55 +1,51 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<RootNamespace>Whim.TreeLayout.Bar</RootNamespace>
-		<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<UseWinUI>true</UseWinUI>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-	<ItemGroup>
-		<None Remove="TreeLayoutEngineWidget.xaml" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-		<ProjectReference Include="..\Whim.Bar\Whim.Bar.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<InternalsVisibleTo Include="Whim.TreeLayout.Bar.Tests" />
-		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="TreeLayoutEngineWidget.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <RootNamespace>Whim.TreeLayout.Bar</RootNamespace>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <UseWinUI>true</UseWinUI>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="TreeLayoutEngineWidget.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+    <ProjectReference Include="..\Whim.Bar\Whim.Bar.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Whim.TreeLayout.Bar.Tests" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="TreeLayoutEngineWidget.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.TreeLayout.CommandPalette.Tests/Whim.TreeLayout.CommandPalette.Tests.csproj b/src/Whim.TreeLayout.CommandPalette.Tests/Whim.TreeLayout.CommandPalette.Tests.csproj
index e713b7f58..8206509dc 100644
--- a/src/Whim.TreeLayout.CommandPalette.Tests/Whim.TreeLayout.CommandPalette.Tests.csproj
+++ b/src/Whim.TreeLayout.CommandPalette.Tests/Whim.TreeLayout.CommandPalette.Tests.csproj
@@ -1,50 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="FluentAssertions" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
-		<ProjectReference
-			Include="..\Whim.TreeLayout.CommandPalette\Whim.TreeLayout.CommandPalette.csproj" />
-		<ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
+    <ProjectReference Include="..\Whim.TreeLayout.CommandPalette\Whim.TreeLayout.CommandPalette.csproj" />
+    <ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.TreeLayout.CommandPalette/Whim.TreeLayout.CommandPalette.csproj b/src/Whim.TreeLayout.CommandPalette/Whim.TreeLayout.CommandPalette.csproj
index a43ed5ed7..292151c20 100644
--- a/src/Whim.TreeLayout.CommandPalette/Whim.TreeLayout.CommandPalette.csproj
+++ b/src/Whim.TreeLayout.CommandPalette/Whim.TreeLayout.CommandPalette.csproj
@@ -1,52 +1,48 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<RootNamespace>Whim.TreeLayout.Bar</RootNamespace>
-		<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<UseWinUI>true</UseWinUI>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<InternalsVisibleTo Include="Whim.TreeLayout.CommandPalette.Tests" />
-		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-		<ProjectReference Include="..\Whim.CommandPalette\Whim.CommandPalette.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="TreeLayoutEngineWidget.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <RootNamespace>Whim.TreeLayout.Bar</RootNamespace>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <UseWinUI>true</UseWinUI>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+  </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Whim.TreeLayout.CommandPalette.Tests" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+    <ProjectReference Include="..\Whim.CommandPalette\Whim.CommandPalette.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="TreeLayoutEngineWidget.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.TreeLayout.Tests/Whim.TreeLayout.Tests.csproj b/src/Whim.TreeLayout.Tests/Whim.TreeLayout.Tests.csproj
index f46f02c66..a45fdd1ce 100644
--- a/src/Whim.TreeLayout.Tests/Whim.TreeLayout.Tests.csproj
+++ b/src/Whim.TreeLayout.Tests/Whim.TreeLayout.Tests.csproj
@@ -1,51 +1,47 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="FluentAssertions" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.analyzers" />
-		<PackageReference Include="xunit.runner.visualstudio">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
-		<ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
-		<ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.analyzers" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
+    <ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
+    <ProjectReference Include="..\Whim.TreeLayout\Whim.TreeLayout.csproj" />
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.TreeLayout/Whim.TreeLayout.csproj b/src/Whim.TreeLayout/Whim.TreeLayout.csproj
index c8f1f98c8..ef25e747c 100644
--- a/src/Whim.TreeLayout/Whim.TreeLayout.csproj
+++ b/src/Whim.TreeLayout/Whim.TreeLayout.csproj
@@ -1,48 +1,42 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<RootNamespace>Whim.TreeLayout</RootNamespace>
-		<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<UseWinUI>true</UseWinUI>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<InternalsVisibleTo Include="Whim.TreeLayout.Tests" />
-		<InternalsVisibleTo Include="Whim.TreeLayout.Bar.Tests" />
-		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-	</ItemGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <RootNamespace>Whim.TreeLayout</RootNamespace>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <UseWinUI>true</UseWinUI>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+  </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Whim.TreeLayout.Tests" />
+    <InternalsVisibleTo Include="Whim.TreeLayout.Bar.Tests" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.Updater.Tests/Whim.Updater.Tests.csproj b/src/Whim.Updater.Tests/Whim.Updater.Tests.csproj
index e87495f1e..998b4176f 100644
--- a/src/Whim.Updater.Tests/Whim.Updater.Tests.csproj
+++ b/src/Whim.Updater.Tests/Whim.Updater.Tests.csproj
@@ -1,53 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<ImplicitUsings>enable</ImplicitUsings>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="AutoFixture" />
-		<PackageReference Include="AutoFixture.AutoNSubstitute" />
-		<PackageReference Include="AutoFixture.Xunit2" />
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="FluentAssertions" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="NSubstitute" />
-		<PackageReference Include="NSubstitute.Analyzers.CSharp" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Whim.Updater\Whim.Updater.csproj" />
-		<ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="AutoFixture" />
+    <PackageReference Include="AutoFixture.AutoNSubstitute" />
+    <PackageReference Include="AutoFixture.Xunit2" />
+    <PackageReference Include="coverlet.collector">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="NSubstitute" />
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim.Updater\Whim.Updater.csproj" />
+    <ProjectReference Include="..\Whim.TestUtils\Whim.TestUtils.csproj" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim.Updater/Whim.Updater.csproj b/src/Whim.Updater/Whim.Updater.csproj
index 6a2d7af46..49cc2248b 100644
--- a/src/Whim.Updater/Whim.Updater.csproj
+++ b/src/Whim.Updater/Whim.Updater.csproj
@@ -1,54 +1,51 @@
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<RootNamespace>Whim.Updater</RootNamespace>
-		<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<UseWinUI>true</UseWinUI>
-		<Version>0.2.0</Version>
-	</PropertyGroup>
-	<ItemGroup>
-		<None Remove="UpdaterWindow.xaml" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Markdig" />
-		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-		<PackageReference Include="Octokit" />
-	</ItemGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Whim\Whim.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<InternalsVisibleTo Include="Whim.Updater.Tests" />
-		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Page Update="UpdaterWindow.xaml">
-			<Generator>MSBuild:Compile</Generator>
-		</Page>
-	</ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <RootNamespace>Whim.Updater</RootNamespace>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <UseWinUI>true</UseWinUI>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Remove="UpdaterWindow.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Markdig" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+    <PackageReference Include="Octokit" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Whim\Whim.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="Whim.Updater.Tests" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Update="UpdaterWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Whim/Whim.csproj b/src/Whim/Whim.csproj
index c028eed9d..c6ce6d1ab 100644
--- a/src/Whim/Whim.csproj
+++ b/src/Whim/Whim.csproj
@@ -1,73 +1,66 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<AnalysisModeDesign>All</AnalysisModeDesign>
-		<AnalysisModeDocumentation>All</AnalysisModeDocumentation>
-		<AnalysisModeGlobalization>None</AnalysisModeGlobalization>
-		<AnalysisModeInteroperability>All</AnalysisModeInteroperability>
-		<AnalysisModeMaintainability>All</AnalysisModeMaintainability>
-		<AnalysisModeNaming>All</AnalysisModeNaming>
-		<AnalysisModePerformance>All</AnalysisModePerformance>
-		<AnalysisModeReliability>All</AnalysisModeReliability>
-		<AnalysisModeSecurity>All</AnalysisModeSecurity>
-		<AnalysisModeSingleFile>All</AnalysisModeSingleFile>
-		<AnalysisModeStyle>All</AnalysisModeStyle>
-		<AnalysisModeUsage>All</AnalysisModeUsage>
-		<Authors>Isaac Daly</Authors>
-		<BuildInParallel>true</BuildInParallel>
-		<Description>An extensible window manager for Windows.</Description>
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-		<GenerateLibraryLayout>true</GenerateLibraryLayout>
-		<Nullable>enable</Nullable>
-		<Platforms>x64;arm64;Any CPU</Platforms>
-		<RootNamespace>Whim</RootNamespace>
-		<RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
-		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
-		<Version>0.2.0</Version>
-		<WarningsAsErrors>Nullable</WarningsAsErrors>
-
-		<!-- Required for VSCode debugging -->
-		<Platform>x64</Platform>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<Page Remove="Resources\Defaults.xaml" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.Scripting" />
-		<PackageReference Include="Microsoft.Win32.SystemEvents" />
-		<PackageReference Include="Microsoft.Windows.CsWin32">
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="Microsoft.WindowsAppSDK" />
-		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
-		<PackageReference Include="Serilog" />
-		<PackageReference Include="Serilog.Sinks.Async" />
-		<PackageReference Include="Serilog.Sinks.Debug" />
-		<PackageReference Include="Serilog.Sinks.File" />
-		<PackageReference Include="System.Drawing.Common" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
-		<InternalsVisibleTo Include="Whim.FloatingLayout.Tests" />
-		<InternalsVisibleTo Include="Whim.Gaps.Tests" />
-		<InternalsVisibleTo Include="Whim.LayoutPreview.Tests" />
-		<InternalsVisibleTo Include="Whim.Tests" />
-		<InternalsVisibleTo Include="Whim.TestUtils" />
-		<InternalsVisibleTo Include="Whim.TreeLayout.Tests" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<EmbeddedResource Include="Template\whim.config.csx" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<None Update="Resources\Defaults.xaml">
-			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <AnalysisModeDesign>All</AnalysisModeDesign>
+    <AnalysisModeDocumentation>All</AnalysisModeDocumentation>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <AnalysisModeInteroperability>All</AnalysisModeInteroperability>
+    <AnalysisModeMaintainability>All</AnalysisModeMaintainability>
+    <AnalysisModeNaming>All</AnalysisModeNaming>
+    <AnalysisModePerformance>All</AnalysisModePerformance>
+    <AnalysisModeReliability>All</AnalysisModeReliability>
+    <AnalysisModeSecurity>All</AnalysisModeSecurity>
+    <AnalysisModeSingleFile>All</AnalysisModeSingleFile>
+    <AnalysisModeStyle>All</AnalysisModeStyle>
+    <AnalysisModeUsage>All</AnalysisModeUsage>
+    <Authors>Isaac Daly</Authors>
+    <BuildInParallel>true</BuildInParallel>
+    <Description>An extensible window manager for Windows.</Description>
+    <EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateLibraryLayout>true</GenerateLibraryLayout>
+    <Nullable>enable</Nullable>
+    <Platforms>x64;arm64;Any CPU</Platforms>
+    <RootNamespace>Whim</RootNamespace>
+    <RuntimeIdentifiers>win10-x64;win10-arm64</RuntimeIdentifiers>
+    <TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
+    <Version>0.3.0</Version>
+    <WarningsAsErrors>Nullable</WarningsAsErrors>
+    <!-- Required for VSCode debugging -->
+    <Platform>x64</Platform>
+  </PropertyGroup>
+  <ItemGroup>
+    <Page Remove="Resources\Defaults.xaml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Scripting" />
+    <PackageReference Include="Microsoft.Win32.SystemEvents" />
+    <PackageReference Include="Microsoft.Windows.CsWin32">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.WindowsAppSDK" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" />
+    <PackageReference Include="Serilog" />
+    <PackageReference Include="Serilog.Sinks.Async" />
+    <PackageReference Include="Serilog.Sinks.Debug" />
+    <PackageReference Include="Serilog.Sinks.File" />
+    <PackageReference Include="System.Drawing.Common" />
+  </ItemGroup>
+  <ItemGroup>
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
+    <InternalsVisibleTo Include="Whim.FloatingLayout.Tests" />
+    <InternalsVisibleTo Include="Whim.Gaps.Tests" />
+    <InternalsVisibleTo Include="Whim.LayoutPreview.Tests" />
+    <InternalsVisibleTo Include="Whim.Tests" />
+    <InternalsVisibleTo Include="Whim.TestUtils" />
+    <InternalsVisibleTo Include="Whim.TreeLayout.Tests" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Template\whim.config.csx" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Resources\Defaults.xaml">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file