diff --git a/Application/FeedCenter.csproj b/Application/FeedCenter.csproj
index 2786575..2e2b300 100644
--- a/Application/FeedCenter.csproj
+++ b/Application/FeedCenter.csproj
@@ -127,17 +127,17 @@
     <ProjectReference Include="..\..\..\Public\namebasedgrid\src\NameBasedGrid\NameBasedGrid.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ChrisKaczor.ApplicationUpdate" Version="1.0.1" />
-    <PackageReference Include="ChrisKaczor.GenericSettingsProvider" Version="1.0.1" />
-    <PackageReference Include="ChrisKaczor.InstalledBrowsers" Version="1.0.1" />
-    <PackageReference Include="ChrisKaczor.Wpf.Application.SingleInstance" Version="1.0.3" />
-    <PackageReference Include="ChrisKaczor.Wpf.Application.StartWithWindows" Version="1.0.1" />
-    <PackageReference Include="ChrisKaczor.Wpf.Controls.HtmlTextBlock" Version="1.0.1" />
-    <PackageReference Include="ChrisKaczor.Wpf.Controls.Link" Version="1.0.2" />
-    <PackageReference Include="ChrisKaczor.Wpf.Controls.Toolbar" Version="1.0.1" />
-    <PackageReference Include="ChrisKaczor.Wpf.Validation" Version="1.0.1" />
-    <PackageReference Include="ChrisKaczor.Wpf.Windows.ControlBox" Version="1.0.1" />
-    <PackageReference Include="ChrisKaczor.Wpf.Windows.SnappingWindow" Version="1.0.1" />
+    <PackageReference Include="ChrisKaczor.ApplicationUpdate" Version="1.0.2" />
+    <PackageReference Include="ChrisKaczor.GenericSettingsProvider" Version="1.0.2" />
+    <PackageReference Include="ChrisKaczor.InstalledBrowsers" Version="1.0.2" />
+    <PackageReference Include="ChrisKaczor.Wpf.Application.SingleInstance" Version="1.0.4" />
+    <PackageReference Include="ChrisKaczor.Wpf.Application.StartWithWindows" Version="1.0.2" />
+    <PackageReference Include="ChrisKaczor.Wpf.Controls.HtmlTextBlock" Version="1.0.2" />
+    <PackageReference Include="ChrisKaczor.Wpf.Controls.Link" Version="1.0.3" />
+    <PackageReference Include="ChrisKaczor.Wpf.Controls.Toolbar" Version="1.0.2" />
+    <PackageReference Include="ChrisKaczor.Wpf.Validation" Version="1.0.2" />
+    <PackageReference Include="ChrisKaczor.Wpf.Windows.ControlBox" Version="1.0.2" />
+    <PackageReference Include="ChrisKaczor.Wpf.Windows.SnappingWindow" Version="1.0.2" />
     <PackageReference Include="Dapper" Version="2.0.123" />
     <PackageReference Include="DebounceThrottle" Version="2.0.0" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
@@ -146,7 +146,7 @@
       <NoWarn>NU1701</NoWarn>
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0" />
-    <PackageReference Include="Realm" Version="10.20.0" />
+    <PackageReference Include="Realm" Version="10.21.0" />
     <PackageReference Include="Serilog" Version="2.12.0" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
diff --git a/Application/FeedChooserWindow.xaml b/Application/FeedChooserWindow.xaml
index 25fafef..283c049 100644
--- a/Application/FeedChooserWindow.xaml
+++ b/Application/FeedChooserWindow.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:my="clr-namespace:FeedCenter.Properties"
-        xmlns:controlBox="clr-namespace:ChrisKaczor.Wpf.Windows;assembly=Wpf.Windows.ControlBox"
+        xmlns:controlBox="clr-namespace:ChrisKaczor.Wpf.Windows;assembly=ChrisKaczor.Wpf.Windows.ControlBox"
         mc:Ignorable="d"
         Title="{x:Static my:Resources.FeedChooserWindow}"
         Height="247.297"
diff --git a/Application/FeedErrorWindow.xaml b/Application/FeedErrorWindow.xaml
index 9ee56b2..cf00383 100644
--- a/Application/FeedErrorWindow.xaml
+++ b/Application/FeedErrorWindow.xaml
@@ -1,8 +1,8 @@
 <Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:my="clr-namespace:FeedCenter.Properties"
-        xmlns:linkControl="clr-namespace:ChrisKaczor.Wpf.Controls;assembly=Wpf.Controls.Link"
-        xmlns:controlBox="clr-namespace:ChrisKaczor.Wpf.Windows;assembly=Wpf.Windows.ControlBox"
+        xmlns:linkControl="clr-namespace:ChrisKaczor.Wpf.Controls;assembly=ChrisKaczor.Wpf.Controls.Link"
+        xmlns:controlBox="clr-namespace:ChrisKaczor.Wpf.Windows;assembly=ChrisKaczor.Wpf.Windows.ControlBox"
         x:Class="FeedCenter.FeedErrorWindow"
         Title="{x:Static my:Resources.FeedErrorWindow}"
         Height="300"
diff --git a/Application/MainWindow/MainWindow.xaml b/Application/MainWindow/MainWindow.xaml
index 9da86e2..00f3b9f 100644
--- a/Application/MainWindow/MainWindow.xaml
+++ b/Application/MainWindow/MainWindow.xaml
@@ -2,13 +2,13 @@
                         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                         xmlns:properties="clr-namespace:FeedCenter.Properties"
-                        xmlns:windows="clr-namespace:ChrisKaczor.Wpf.Windows;assembly=Wpf.Windows.SnappingWindow"
-                        xmlns:toolbar="clr-namespace:ChrisKaczor.Wpf.Controls.Toolbar;assembly=Wpf.Controls.Toolbar"
-                        xmlns:splitButton="clr-namespace:ChrisKaczor.Wpf.Controls.Toolbar;assembly=Wpf.Controls.Toolbar"
-                        xmlns:htmlTextBlock="clr-namespace:ChrisKaczor.Wpf.Controls;assembly=Wpf.Controls.HtmlTextBlock"
+                        xmlns:windows="clr-namespace:ChrisKaczor.Wpf.Windows;assembly=ChrisKaczor.Wpf.Windows.SnappingWindow"
+                        xmlns:toolbar="clr-namespace:ChrisKaczor.Wpf.Controls.Toolbar;assembly=ChrisKaczor.Wpf.Controls.Toolbar"
+                        xmlns:splitButton="clr-namespace:ChrisKaczor.Wpf.Controls.Toolbar;assembly=ChrisKaczor.Wpf.Controls.Toolbar"
+                        xmlns:htmlTextBlock="clr-namespace:ChrisKaczor.Wpf.Controls;assembly=ChrisKaczor.Wpf.Controls.HtmlTextBlock"
                         xmlns:system="clr-namespace:System;assembly=mscorlib"
                         xmlns:nameBasedGrid="clr-namespace:NameBasedGrid;assembly=NameBasedGrid"
-                        xmlns:controls="clr-namespace:ChrisKaczor.Wpf.Controls;assembly=Wpf.Controls.Link"
+                        xmlns:controls="clr-namespace:ChrisKaczor.Wpf.Controls;assembly=ChrisKaczor.Wpf.Controls.Link"
                         Title="MainWindow"
                         Height="360"
                         Width="252"
diff --git a/Application/Options/BulkFeedWindow.xaml b/Application/Options/BulkFeedWindow.xaml
index e31aefd..d26aae1 100644
--- a/Application/Options/BulkFeedWindow.xaml
+++ b/Application/Options/BulkFeedWindow.xaml
@@ -6,7 +6,7 @@
         Width="500"
         xmlns:my="clr-namespace:FeedCenter.Properties"
         xmlns:feedCenter="clr-namespace:FeedCenter"
-        xmlns:controls="clr-namespace:ChrisKaczor.Wpf.Controls;assembly=Wpf.Controls.Link"
+        xmlns:controls="clr-namespace:ChrisKaczor.Wpf.Controls;assembly=ChrisKaczor.Wpf.Controls.Link"
         WindowStartupLocation="CenterOwner"
         Icon="/FeedCenter;component/Resources/Application.ico"
         FocusManager.FocusedElement="{Binding ElementName=FeedLinkFilterText}">
diff --git a/Application/Options/CategoryWindow.xaml b/Application/Options/CategoryWindow.xaml
index eea8dfe..5d89236 100644
--- a/Application/Options/CategoryWindow.xaml
+++ b/Application/Options/CategoryWindow.xaml
@@ -6,8 +6,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:validation="clr-namespace:ChrisKaczor.Wpf.Validation;assembly=Wpf.Validation"
-        xmlns:controls="clr-namespace:ChrisKaczor.Wpf.Windows;assembly=Wpf.Windows.ControlBox"
+        xmlns:validation="clr-namespace:ChrisKaczor.Wpf.Validation;assembly=ChrisKaczor.Wpf.Validation"
+        xmlns:controls="clr-namespace:ChrisKaczor.Wpf.Windows;assembly=ChrisKaczor.Wpf.Windows.ControlBox"
         d:DataContext="{d:DesignInstance Type=feedCenter:Category}"
         Title="CategoryWindow"
         Width="300"
diff --git a/Application/Options/FeedWindow.xaml b/Application/Options/FeedWindow.xaml
index 8fd68f4..b2390e2 100644
--- a/Application/Options/FeedWindow.xaml
+++ b/Application/Options/FeedWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         d:DataContext="{d:DesignInstance Type=feedCenter:Feed}"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:validation="clr-namespace:ChrisKaczor.Wpf.Validation;assembly=Wpf.Validation"
+        xmlns:validation="clr-namespace:ChrisKaczor.Wpf.Validation;assembly=ChrisKaczor.Wpf.Validation"
         mc:Ignorable="d"
         Title="FeedWindow"
         Height="300"
diff --git a/Application/Options/FeedsOptionsPanel.xaml b/Application/Options/FeedsOptionsPanel.xaml
index 10b41f6..16607e6 100644
--- a/Application/Options/FeedsOptionsPanel.xaml
+++ b/Application/Options/FeedsOptionsPanel.xaml
@@ -5,7 +5,7 @@
                           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                           xmlns:options="clr-namespace:FeedCenter.Options"
                           xmlns:properties="clr-namespace:FeedCenter.Properties"
-                          xmlns:controls="clr-namespace:ChrisKaczor.Wpf.Controls;assembly=Wpf.Controls.Link"
+                          xmlns:controls="clr-namespace:ChrisKaczor.Wpf.Controls;assembly=ChrisKaczor.Wpf.Controls.Link"
                           mc:Ignorable="d"
                           d:DesignHeight="311"
                           d:DesignWidth="425">