diff --git a/ControlR.Viewer.Avalonia/ControlR.Viewer.Avalonia.csproj b/ControlR.Viewer.Avalonia/ControlR.Viewer.Avalonia.csproj
index bf15a4f37..8936436b3 100644
--- a/ControlR.Viewer.Avalonia/ControlR.Viewer.Avalonia.csproj
+++ b/ControlR.Viewer.Avalonia/ControlR.Viewer.Avalonia.csproj
@@ -23,10 +23,9 @@
     <PackageReference Include="Bitbound.SimpleMessenger" />
     <PackageReference Include="CommunityToolkit.Diagnostics" />
     <PackageReference Include="CommunityToolkit.Mvvm" />
-    <PackageReference Include="Devolutions.AvaloniaControls" />
-    <PackageReference Include="Devolutions.AvaloniaTheme.DevExpress" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
     <PackageReference Include="SkiaSharp" />
+    <PackageReference Include="System.Reactive" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ControlR.ApiClient\ControlR.ApiClient.csproj" />
diff --git a/Directory.Packages.props b/Directory.Packages.props
index f51f865ee..a3c20ee46 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -23,10 +23,7 @@
     <PackageVersion Include="ControlR.ApiClient" Version="0.23.17" />
     <PackageVersion Include="ControlR.Viewer.Avalonia" Version="0.23.17" />
     <PackageVersion Include="coverlet.collector" Version="10.0.1" />
-    <PackageVersion Include="Devolutions.AvaloniaControls" Version="2026.7.6" />
     <PackageVersion Include="Devolutions.AvaloniaTheme.DevExpress" Version="2026.7.6" />
-    <PackageVersion Include="Devolutions.AvaloniaTheme.Linux" Version="2026.7.6" />
-    <PackageVersion Include="Devolutions.AvaloniaTheme.MacOS" Version="2026.7.6" />
     <PackageVersion Include="Devolutions.Cadeau" Version="2026.6.18" />
     <PackageVersion Include="Extensions.MudBlazor.StaticInput" Version="4.1.0" />
     <PackageVersion Include="HotAvalonia" Version="3.1.3" />
@@ -111,6 +108,7 @@
     <PackageVersion Include="System.Drawing.Common" Version="10.0.9" />
     <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
     <PackageVersion Include="System.Net.Http.Json" Version="10.0.3" />
+    <PackageVersion Include="System.Reactive" Version="6.1.0" />
     <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="10.0.9" />
     <PackageVersion Include="Testcontainers.PostgreSql" Version="4.13.0" />
     <!-- Avalonia has transient dependencies built against this version of Tmds.DBus. -->
diff --git a/Examples/ControlR.AvaloniaViewerExample/ControlR.AvaloniaViewerExample.csproj b/Examples/ControlR.AvaloniaViewerExample/ControlR.AvaloniaViewerExample.csproj
index 4f6ece34a..e9437c111 100644
--- a/Examples/ControlR.AvaloniaViewerExample/ControlR.AvaloniaViewerExample.csproj
+++ b/Examples/ControlR.AvaloniaViewerExample/ControlR.AvaloniaViewerExample.csproj
@@ -23,6 +23,7 @@
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="CommunityToolkit.Mvvm" />
+    <PackageReference Include="Devolutions.AvaloniaTheme.DevExpress" />
     <PackageReference Include="HotAvalonia" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />