diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index c9d2869..19e4e54 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -1,51 +1,51 @@
-<Project>
-  <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- Avalonia packages -->
-    <!-- Important: keep version in sync! -->
-    <PackageVersion Include="Avalonia" Version="11.3.9" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.9" />
-    <PackageVersion Include="Avalonia.LinuxFramebuffer" Version="11.3.9" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.9" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.9" />
-    <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.9" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.9" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.9" />
-    <PackageVersion Include="Avalonia.iOS" Version="11.3.9" />
-    <PackageVersion Include="Avalonia.Browser" Version="11.3.9" />
-    <PackageVersion Include="Avalonia.Android" Version="11.3.9" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.9" />
-    <PackageVersion Include="DesktopNotifications" Version="1.3.1" />
-    <PackageVersion Include="DesktopNotifications.Avalonia" Version="1.3.1" />
-    <PackageVersion Include="DesktopNotifications.FreeDesktop" Version="1.3.1" />
-    <PackageVersion Include="DesktopNotifications.Windows" Version="1.3.1" />
-    <PackageVersion Include="FastEndpoints" Version="6.2.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageVersion>
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
-    <PackageVersion Include="NAudio" Version="2.2.1" />
-    <PackageVersion Include="NetCoreAudio" Version="2.0.0" />
-    <PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.5.1" />
-    <PackageVersion Include="Serilog" Version="4.3.0" />
-    <PackageVersion Include="Serilog.Extensions" Version="8.0.3" />
-    <PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.1" />
-    <PackageVersion Include="Serilog.Sinks.BrowserConsole" Version="8.0.0" />
-    <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
-    <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
-    <PackageVersion Include="Splat.Microsoft.Extensions.DependencyInjection" Version="15.3.1" />
-    <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
-	<PackageVersion Include="SkiaSharp" Version="3.119.1" />
-	<PackageVersion Include="SkiaSharp.HarfBuzz" Version="3.119.1" />
-	<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.1" />
-	<PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.1" />
-	<PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="3.119.1" />
-  </ItemGroup>
-</Project>
+<Project>
+  <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Avalonia packages -->
+    <!-- Important: keep version in sync! -->
+    <PackageVersion Include="Avalonia" Version="11.3.10" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.10" />
+    <PackageVersion Include="Avalonia.LinuxFramebuffer" Version="11.3.10" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.10" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.10" />
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.10" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.10" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.10" />
+    <PackageVersion Include="Avalonia.iOS" Version="11.3.10" />
+    <PackageVersion Include="Avalonia.Browser" Version="11.3.10" />
+    <PackageVersion Include="Avalonia.Android" Version="11.3.10" />
+    <PackageVersion Include="DesktopNotifications" Version="1.3.1" />
+    <PackageVersion Include="DesktopNotifications.Avalonia" Version="1.3.1" />
+    <PackageVersion Include="DesktopNotifications.FreeDesktop" Version="1.3.1" />
+    <PackageVersion Include="DesktopNotifications.Windows" Version="1.3.1" />
+    <PackageVersion Include="FastEndpoints" Version="6.2.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageVersion>
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
+    <PackageVersion Include="NAudio" Version="2.2.1" />
+    <PackageVersion Include="NetCoreAudio" Version="2.0.0" />
+    <PackageVersion Include="ReactiveUI.Avalonia" Version="11.3.8" />
+    <PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.5.1" />
+    <PackageVersion Include="Serilog" Version="4.3.0" />
+    <PackageVersion Include="Serilog.Extensions" Version="8.0.3" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
+    <PackageVersion Include="Serilog.Sinks.BrowserConsole" Version="8.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
+    <PackageVersion Include="Splat.Microsoft.Extensions.DependencyInjection" Version="17.1.1" />
+    <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
+    <PackageVersion Include="SkiaSharp" Version="3.119.1" />
+    <PackageVersion Include="SkiaSharp.HarfBuzz" Version="3.119.1" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.1" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.1" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="3.119.1" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/client/presentation/EasyFocus.Android/MainActivity.cs b/src/client/presentation/EasyFocus.Android/MainActivity.cs
index 5d741ee..2ce56bf 100644
--- a/src/client/presentation/EasyFocus.Android/MainActivity.cs
+++ b/src/client/presentation/EasyFocus.Android/MainActivity.cs
@@ -2,7 +2,7 @@
 using Android.Content.PM;
 using Avalonia;
 using Avalonia.Android;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using Microsoft.Extensions.Hosting;
 using ReactiveUI;
 using Serilog;
diff --git a/src/client/presentation/EasyFocus.Browser/Program.cs b/src/client/presentation/EasyFocus.Browser/Program.cs
index 637ba83..99aca32 100644
--- a/src/client/presentation/EasyFocus.Browser/Program.cs
+++ b/src/client/presentation/EasyFocus.Browser/Program.cs
@@ -1,9 +1,9 @@
 using Avalonia;
 using Avalonia.Browser;
-using Avalonia.ReactiveUI;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using ReactiveUI;
+using ReactiveUI.Avalonia;
 using Serilog;
 using Splat;
 using Splat.Microsoft.Extensions.DependencyInjection;
diff --git a/src/client/presentation/EasyFocus.Linux/Program.cs b/src/client/presentation/EasyFocus.Linux/Program.cs
index 60b409b..a6b968c 100644
--- a/src/client/presentation/EasyFocus.Linux/Program.cs
+++ b/src/client/presentation/EasyFocus.Linux/Program.cs
@@ -1,5 +1,5 @@
 using Avalonia;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using ReactiveUI;
diff --git a/src/client/presentation/EasyFocus.Windows/Program.cs b/src/client/presentation/EasyFocus.Windows/Program.cs
index cc1f134..52db441 100644
--- a/src/client/presentation/EasyFocus.Windows/Program.cs
+++ b/src/client/presentation/EasyFocus.Windows/Program.cs
@@ -1,8 +1,8 @@
 using Avalonia;
-using Avalonia.ReactiveUI;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using ReactiveUI;
+using ReactiveUI.Avalonia;
 using Serilog;
 using Splat;
 using Splat.Microsoft.Extensions.DependencyInjection;
diff --git a/src/client/presentation/EasyFocus.iOS/AppDelegate.cs b/src/client/presentation/EasyFocus.iOS/AppDelegate.cs
index 9e969da..8a534a0 100644
--- a/src/client/presentation/EasyFocus.iOS/AppDelegate.cs
+++ b/src/client/presentation/EasyFocus.iOS/AppDelegate.cs
@@ -1,6 +1,6 @@
 using Avalonia;
 using Avalonia.iOS;
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 using Foundation;
 
 namespace EasyFocus.iOS;
diff --git a/src/client/presentation/EasyFocus/EasyFocus.csproj b/src/client/presentation/EasyFocus/EasyFocus.csproj
index c5aa08c..877e1b1 100644
--- a/src/client/presentation/EasyFocus/EasyFocus.csproj
+++ b/src/client/presentation/EasyFocus/EasyFocus.csproj
@@ -29,10 +29,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>none</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Avalonia.ReactiveUI" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="NetCoreAudio" />
+    <PackageReference Include="ReactiveUI.Avalonia" />
     <PackageReference Include="ReactiveUI.SourceGenerators">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -40,7 +40,7 @@
     <PackageReference Include="Serilog" />
     <PackageReference Include="Serilog.Extensions.Logging" />	
 	<PackageReference Include="SkiaSharp" />
-	<PackageReference Include="SkiaSharp.HarfBuzz"  />
+	<PackageReference Include="SkiaSharp.HarfBuzz" />
 
   </ItemGroup>
 
diff --git a/src/client/presentation/EasyFocus/Features/MainWindow.axaml.cs b/src/client/presentation/EasyFocus/Features/MainWindow.axaml.cs
index 4c54dc6..03e0d8b 100644
--- a/src/client/presentation/EasyFocus/Features/MainWindow.axaml.cs
+++ b/src/client/presentation/EasyFocus/Features/MainWindow.axaml.cs
@@ -1,8 +1,8 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
-using Avalonia.ReactiveUI;
 using Avalonia.VisualTree;
+using ReactiveUI.Avalonia;
 
 namespace EasyFocus.Features;
 
diff --git a/src/client/presentation/EasyFocus/Features/Pomodoro/PomodoroView.axaml.cs b/src/client/presentation/EasyFocus/Features/Pomodoro/PomodoroView.axaml.cs
index 4dc6bfe..0c1b1ca 100644
--- a/src/client/presentation/EasyFocus/Features/Pomodoro/PomodoroView.axaml.cs
+++ b/src/client/presentation/EasyFocus/Features/Pomodoro/PomodoroView.axaml.cs
@@ -1,12 +1,12 @@
 using Avalonia.Controls;
 using Avalonia.Media;
-using Avalonia.ReactiveUI;
 using Avalonia.VisualTree;
 using EasyFocus.Domain.Entities;
 using ReactiveUI;
+using ReactiveUI.Avalonia;
 using Serilog;
 using System;
-using System.Reactive.Disposables;
+using System.Reactive.Disposables.Fluent;
 
 namespace EasyFocus.Features.Pomodoro;
 
diff --git a/src/client/presentation/EasyFocus/Features/Settings/Background/BackgroundView.axaml.cs b/src/client/presentation/EasyFocus/Features/Settings/Background/BackgroundView.axaml.cs
index 50f25bd..a884c0c 100644
--- a/src/client/presentation/EasyFocus/Features/Settings/Background/BackgroundView.axaml.cs
+++ b/src/client/presentation/EasyFocus/Features/Settings/Background/BackgroundView.axaml.cs
@@ -1,7 +1,7 @@
-using Avalonia.ReactiveUI;
 using ReactiveUI;
+using ReactiveUI.Avalonia;
 using System;
-using System.Reactive.Disposables;
+using System.Reactive.Disposables.Fluent;
 using System.Reactive.Linq;
 
 namespace EasyFocus.Features.Settings.Background;
diff --git a/src/client/presentation/EasyFocus/Features/Settings/HomeSettings/HomeSettingsView.axaml.cs b/src/client/presentation/EasyFocus/Features/Settings/HomeSettings/HomeSettingsView.axaml.cs
index d15a8a9..d7fc6a6 100644
--- a/src/client/presentation/EasyFocus/Features/Settings/HomeSettings/HomeSettingsView.axaml.cs
+++ b/src/client/presentation/EasyFocus/Features/Settings/HomeSettings/HomeSettingsView.axaml.cs
@@ -1,4 +1,4 @@
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace EasyFocus.Features.Settings.HomeSettings;
 
diff --git a/src/client/presentation/EasyFocus/Features/Settings/Notifications/NotificationsView.axaml.cs b/src/client/presentation/EasyFocus/Features/Settings/Notifications/NotificationsView.axaml.cs
index 11daf85..58dca9f 100644
--- a/src/client/presentation/EasyFocus/Features/Settings/Notifications/NotificationsView.axaml.cs
+++ b/src/client/presentation/EasyFocus/Features/Settings/Notifications/NotificationsView.axaml.cs
@@ -1,9 +1,9 @@
-using Avalonia.ReactiveUI;
 using EasyFocus.Domain.Entities;
 using ReactiveUI;
+using ReactiveUI.Avalonia;
 using Serilog;
 using System;
-using System.Reactive.Disposables;
+using System.Reactive.Disposables.Fluent;
 
 namespace EasyFocus.Features.Settings.Notifications;
 
diff --git a/src/client/presentation/EasyFocus/Features/Settings/Tags/TagsView.axaml.cs b/src/client/presentation/EasyFocus/Features/Settings/Tags/TagsView.axaml.cs
index bd4199e..3f774d0 100644
--- a/src/client/presentation/EasyFocus/Features/Settings/Tags/TagsView.axaml.cs
+++ b/src/client/presentation/EasyFocus/Features/Settings/Tags/TagsView.axaml.cs
@@ -1,4 +1,4 @@
-using Avalonia.ReactiveUI;
+using ReactiveUI.Avalonia;
 
 namespace EasyFocus.Features.Settings.Tags;