diff --git a/AvaloniaReferences.props b/AvaloniaReferences.props
index 616920df..adddb809 100644
--- a/AvaloniaReferences.props
+++ b/AvaloniaReferences.props
@@ -20,5 +20,6 @@
 		<PackageReference Include="Avalonia.Desktop" Condition="!Exists('vendor\AvaloniaUI\Avalonia.props')" />
 		<PackageReference Condition="'$(Configuration)' == 'Debug' And !Exists('vendor\AvaloniaUI\Avalonia.props')" Include="Avalonia.Diagnostics" />
 		<PackageReference Include="Avalonia.ReactiveUI" Condition="!Exists('vendor\AvaloniaUI\Avalonia.props')" />
+		<PackageReference Include="Avalonia.Themes.Fluent" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4e0d2475..d80c46d3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -52,7 +52,6 @@
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
     <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
     <PackageVersion Include="WebViewControl-Avalonia" Version="2.106.7" />
-    <PackageVersion Include="XamlNameReferenceGenerator" Version="1.6.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
     <PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
     <PackageVersion Include="xunit" Version="2.7.0" />
diff --git a/src/RoadCaptain.App.RouteBuilder/RoadCaptain.App.RouteBuilder.csproj b/src/RoadCaptain.App.RouteBuilder/RoadCaptain.App.RouteBuilder.csproj
index c94194be..347c705c 100644
--- a/src/RoadCaptain.App.RouteBuilder/RoadCaptain.App.RouteBuilder.csproj
+++ b/src/RoadCaptain.App.RouteBuilder/RoadCaptain.App.RouteBuilder.csproj
@@ -30,12 +30,10 @@
 		</None>
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia.Themes.Fluent" />
 		<PackageReference Include="Codenizer.Avalonia.Map" />
 		<PackageReference Include="JetBrains.Annotations" />
 		<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
 		<PackageReference Include="Serilog.Sinks.Debug" />
-		<PackageReference Include="XamlNameReferenceGenerator" />
 		<PackageReference Include="Autofac" />
 		<PackageReference Include="Autofac.Extensions.DependencyInjection" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
diff --git a/src/RoadCaptain.App.Runner/RoadCaptain.App.Runner.csproj b/src/RoadCaptain.App.Runner/RoadCaptain.App.Runner.csproj
index 9ec7defc..f4654708 100644
--- a/src/RoadCaptain.App.Runner/RoadCaptain.App.Runner.csproj
+++ b/src/RoadCaptain.App.Runner/RoadCaptain.App.Runner.csproj
@@ -32,10 +32,8 @@
 	<Import Project="..\..\AvaloniaReferences.props" />
 
 	<ItemGroup>
-		<PackageReference Include="Avalonia.Themes.Fluent" />
 		<PackageReference Include="Codenizer.Avalonia.Map" />
 		<PackageReference Include="JetBrains.Annotations" />
-		<PackageReference Include="XamlNameReferenceGenerator" />
 		<PackageReference Include="Autofac" />
 		<PackageReference Include="Autofac.Extensions.DependencyInjection" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" />