diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml.bak
similarity index 100%
rename from .github/workflows/CI.yml
rename to .github/workflows/CI.yml.bak
diff --git a/ref/Avalonia.Image2 b/ref/Avalonia.Image2
index 1a3bd5d68..2d76bcb6e 160000
--- a/ref/Avalonia.Image2
+++ b/ref/Avalonia.Image2
@@ -1 +1 @@
-Subproject commit 1a3bd5d68afc21678efb597dbaddf39b05b2f570
+Subproject commit 2d76bcb6e9203d0d26d16e32879d1be2a15b1830
diff --git a/ref/Common b/ref/Common
index cafaaf981..bcc2eae21 160000
--- a/ref/Common
+++ b/ref/Common
@@ -1 +1 @@
-Subproject commit cafaaf981a7ba9faa800eb188de1956f4fbc9c04
+Subproject commit bcc2eae21829ddd72f2e8b263469269168dcdc39
diff --git a/ref/DirectoryPackages b/ref/DirectoryPackages
index b9868ebb7..6a71bec5d 160000
--- a/ref/DirectoryPackages
+++ b/ref/DirectoryPackages
@@ -1 +1 @@
-Subproject commit b9868ebb7466e5a88157fe453b3e9c593731dac8
+Subproject commit 6a71bec5d42c3189908f6ba10e3ca01ab4662160
diff --git a/ref/WTTS.MicroServices.ClientSDK b/ref/WTTS.MicroServices.ClientSDK
index 1a379f40e..add56bff7 160000
--- a/ref/WTTS.MicroServices.ClientSDK
+++ b/ref/WTTS.MicroServices.ClientSDK
@@ -1 +1 @@
-Subproject commit 1a379f40e41104a30fc0b038f8a9bd966a7d2ec5
+Subproject commit add56bff75acb5c99971625e93e6ead933c1561e
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/AcceleratorPathAskBox.axaml.cs b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/AcceleratorPathAskBox.axaml.cs
index 16ac0b92c..6993e08c7 100644
--- a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/AcceleratorPathAskBox.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/AcceleratorPathAskBox.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Platform.Storage;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using BD.WTTS.Helpers;
 
 namespace BD.WTTS.UI.Views.Controls;
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameAccelerator.axaml.cs b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameAccelerator.axaml.cs
index 5292e7a5a..e188ef46c 100644
--- a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameAccelerator.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameAccelerator.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Controls;
 
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameAppItem.axaml.cs b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameAppItem.axaml.cs
index 5210d05c7..9466566f5 100644
--- a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameAppItem.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameAppItem.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using System.CommandLine;
 
 namespace BD.WTTS.UI.Views.Controls;
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameDetail.axaml.cs b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameDetail.axaml.cs
index c1cd34893..0c08d1903 100644
--- a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameDetail.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Controls/GameDetail.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Controls;
 
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/GameInfoPage.axaml.cs b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/GameInfoPage.axaml.cs
index d18580a9a..4cbf8771c 100644
--- a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/GameInfoPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/GameInfoPage.axaml.cs
@@ -1,4 +1,4 @@
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Pages;
 
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ProxySettingsPage.axaml.cs b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ProxySettingsPage.axaml.cs
index 8a1db2daf..e13480472 100644
--- a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ProxySettingsPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ProxySettingsPage.axaml.cs
@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Pages;
 
diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ScriptStorePage.axaml.cs b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ScriptStorePage.axaml.cs
index f77e94e2c..9ef2025c3 100644
--- a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ScriptStorePage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ScriptStorePage.axaml.cs
@@ -1,4 +1,4 @@
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Pages;
 
diff --git a/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/UI/Views/Pages/ArchiSteamFarmPage.axaml.cs b/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/UI/Views/Pages/ArchiSteamFarmPage.axaml.cs
index 51870d553..5668187e1 100644
--- a/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/UI/Views/Pages/ArchiSteamFarmPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.ArchiSteamFarmPlus/UI/Views/Pages/ArchiSteamFarmPage.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using BD.WTTS.UI.Views.Controls;
 
 namespace BD.WTTS.UI.Views.Pages;
diff --git a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorGeneralImportPage.axaml.cs b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorGeneralImportPage.axaml.cs
index f2332e6d3..fdf40d848 100644
--- a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorGeneralImportPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorGeneralImportPage.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Pages;
 
diff --git a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorImportPage.axaml.cs b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorImportPage.axaml.cs
index 4e9d4a7ea..44e6f6f69 100644
--- a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorImportPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/AuthenticatorImportPage.axaml.cs
@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using BD.WTTS.UI.Views.Controls;
 using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Media.Animation;
diff --git a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/SteamGuardImportPage.axaml.cs b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/SteamGuardImportPage.axaml.cs
index fd58b47bb..3c4abfb4f 100644
--- a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/SteamGuardImportPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/SteamGuardImportPage.axaml.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Pages;
 
diff --git a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/SteamLoginImportPage.axaml.cs b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/SteamLoginImportPage.axaml.cs
index d982d3b3e..52e0b623d 100644
--- a/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/SteamLoginImportPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.Authenticator/UI/Views/Pages/SteamLoginImportPage.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using BD.WTTS.UI.Views.Controls;
 using KeyEventArgs = Avalonia.Input.KeyEventArgs;
 
diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Controls/AccountItems.axaml.cs b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Controls/AccountItems.axaml.cs
index d7674ba0e..e81cc5e96 100644
--- a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Controls/AccountItems.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Controls/AccountItems.axaml.cs
@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using BD.SteamClient.Helpers;
 using FluentAvalonia.UI.Controls;
 
diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Pages/SteamFamilyShareManagePage.axaml.cs b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Pages/SteamFamilyShareManagePage.axaml.cs
index 3b4912d57..b1e5993d2 100644
--- a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Pages/SteamFamilyShareManagePage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Pages/SteamFamilyShareManagePage.axaml.cs
@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Pages;
 
diff --git a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/DownloadPage.axaml.cs b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/DownloadPage.axaml.cs
index 6eea8b748..e9767a42c 100644
--- a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/DownloadPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/DownloadPage.axaml.cs
@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Pages;
 
diff --git a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/EditAppInfoPage.axaml.cs b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/EditAppInfoPage.axaml.cs
index 5d96f2f25..6aef95582 100644
--- a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/EditAppInfoPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/EditAppInfoPage.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using Avalonia.VisualTree;
 using BD.SteamClient.Enums.SteamGridDB;
 using BD.SteamClient.Models.SteamGridDB;
diff --git a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/HideAppsPage.axaml.cs b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/HideAppsPage.axaml.cs
index 9c7edde73..71880aaad 100644
--- a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/HideAppsPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/HideAppsPage.axaml.cs
@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Pages;
 
diff --git a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Windows/AchievementWindow.axaml.cs b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Windows/AchievementWindow.axaml.cs
index c4e300d54..c492cd462 100644
--- a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Windows/AchievementWindow.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Windows/AchievementWindow.axaml.cs
@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Windows;
 
diff --git a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Windows/CloudArchiveWindow.axaml.cs b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Windows/CloudArchiveWindow.axaml.cs
index 83647bab5..464dbcdaf 100644
--- a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Windows/CloudArchiveWindow.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Windows/CloudArchiveWindow.axaml.cs
@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Windows;
 
diff --git a/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/IdleSteamLoginPage.axaml.cs b/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/IdleSteamLoginPage.axaml.cs
index 9bc001884..9f1c38d79 100644
--- a/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/IdleSteamLoginPage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/IdleSteamLoginPage.axaml.cs
@@ -1,5 +1,5 @@
 using Avalonia.Controls;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace BD.WTTS.UI.Views.Pages;
 
diff --git a/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/MainFramePage.axaml.cs b/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/MainFramePage.axaml.cs
index d5371e323..cdca70302 100644
--- a/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/MainFramePage.axaml.cs
+++ b/src/BD.WTTS.Client.Plugins.SteamIdleCard/UI/Views/Pages/MainFramePage.axaml.cs
@@ -1,6 +1,6 @@
 using Avalonia.Controls;
 using Avalonia.Interactivity;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using BD.SteamClient.Models;
 
 namespace BD.WTTS.UI.Views.Pages;
diff --git a/src/BD.WTTS.Client/BD.WTTS.Client.csproj b/src/BD.WTTS.Client/BD.WTTS.Client.csproj
index 70e06fc6e..96ceb25b0 100644
--- a/src/BD.WTTS.Client/BD.WTTS.Client.csproj
+++ b/src/BD.WTTS.Client/BD.WTTS.Client.csproj
@@ -127,7 +127,8 @@
 		<!--<PackageReference Include="Portable.BouncyCastle" />-->
 		<PackageReference Include="ReactiveUI.Fody" />
 		<PackageReference Include="dotnetCampus.Ipc" />
-		<PackageReference Include="fusillade" />
+		<!--<PackageReference Include="fusillade" />-->
+		<PackageReference Include="BD.Common.fusillade" />
 		<PackageReference Include="Splat.Drawing" />
 		<PackageReference Include="System.Drawing.Common" />
 		<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" />
diff --git a/src/ImplicitUsings.Avalonia.cs b/src/ImplicitUsings.Avalonia.cs
index bf4e17314..197dab5fe 100644
--- a/src/ImplicitUsings.Avalonia.cs
+++ b/src/ImplicitUsings.Avalonia.cs
@@ -41,7 +41,7 @@ global using Avalonia.Skia;
 global using Avalonia.Layout;
 global using Avalonia.LogicalTree;
 global using Avalonia.Rendering;
-global using Avalonia.ReactiveUI;
+global using ReactiveUI.Avalonia;
 global using Avalonia.Platform.Storage;
 global using Cursor = Avalonia.Input.Cursor;
 global using KeyboardNavigation = Avalonia.Input.KeyboardNavigation;