diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/AutoSuggestBox/AutoSuggestBox.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/AutoSuggestBox/AutoSuggestBox.cs
index fc7bd5f5..428ea9b6 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/AutoSuggestBox/AutoSuggestBox.cs
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/AutoSuggestBox/AutoSuggestBox.cs
@@ -8,6 +8,7 @@
 using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Threading;
+using iNKORE.UI.WPF.Converters;
 using iNKORE.UI.WPF.Helpers;
 using iNKORE.UI.WPF.Modern.Common;
 using iNKORE.UI.WPF.Modern.Common.Converters;
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/AutoSuggestBox/AutoSuggestBoxHelper.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/AutoSuggestBox/AutoSuggestBoxHelper.cs
index d8fe9634..c5a88cbe 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/AutoSuggestBox/AutoSuggestBoxHelper.cs
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/AutoSuggestBox/AutoSuggestBoxHelper.cs
@@ -5,6 +5,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using iNKORE.UI.WPF.Converters;
 using iNKORE.UI.WPF.Modern.Common;
 using iNKORE.UI.WPF.Modern.Common.Converters;
 using iNKORE.UI.WPF.Modern.Controls.Helpers;
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/CommandBarFlyout/CommandBarFlyout.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/CommandBarFlyout/CommandBarFlyout.xaml
index 42b65a46..3854d2e9 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/CommandBarFlyout/CommandBarFlyout.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/CommandBarFlyout/CommandBarFlyout.xaml
@@ -4,11 +4,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
     xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <ui:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="Top" />
-            <ui:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="Bottom" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="Top" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="Bottom" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/ContentDialog/ContentDialog.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/ContentDialog/ContentDialog.xaml
index a2c19cb3..418a5fa6 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/ContentDialog/ContentDialog.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/ContentDialog/ContentDialog.xaml
@@ -3,10 +3,11 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Common">
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" 
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <ui:CornerRadiusFilterConverter x:Key="BottomCornerRadiusDoubleValueConverter" Filter="Bottom" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomCornerRadiusDoubleValueConverter" Filter="Bottom" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
@@ -81,7 +82,7 @@
                                                 <Border.CornerRadius>
                                                     <TemplateBinding Property="CornerRadius">
                                                         <TemplateBindingExtension.Converter>
-                                                            <ui:CornerRadiusFilterConverter x:Name="CornerConverter" Filter="Top"/>
+                                                            <ikw:CornerRadiusFilterConverter x:Name="CornerConverter" Filter="Top"/>
                                                         </TemplateBindingExtension.Converter>
                                                     </TemplateBinding>
                                                 </Border.CornerRadius>
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/FlipView/FlipView.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/FlipView/FlipView.xaml
index c6056fcd..bd5784ad 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/FlipView/FlipView.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/FlipView/FlipView.xaml
@@ -2,13 +2,14 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <ui:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
-            <ui:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left" />
-            <ui:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="Bottom" />
-            <ui:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="Top" />
+            <ikw:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
+            <ikw:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="Bottom" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="Top" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/ListView/GridView.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/ListView/GridView.xaml
index 7f184f0c..22203a60 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/ListView/GridView.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/ListView/GridView.xaml
@@ -2,11 +2,12 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <ui:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
-            <ui:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/ListView/ListView.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/ListView/ListView.xaml
index 506d4550..cb2a0031 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/ListView/ListView.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/ListView/ListView.xaml
@@ -3,11 +3,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <ui:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
-            <ui:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
             <ui:BindingProxy x:Key="ListViewItemSelectionIndicatorCornerRadiusProxy" Value="{DynamicResource ListViewItemSelectionIndicatorCornerRadius}" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/MediaPlayerElement/MediaTransportControls.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/MediaPlayerElement/MediaTransportControls.cs
index 464cfdd0..e1f21fff 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/MediaPlayerElement/MediaTransportControls.cs
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/MediaPlayerElement/MediaTransportControls.cs
@@ -1,4 +1,5 @@
-using iNKORE.UI.WPF.Helpers;
+using iNKORE.UI.WPF.Converters;
+using iNKORE.UI.WPF.Helpers;
 using iNKORE.UI.WPF.Modern.Common.Converters;
 using iNKORE.UI.WPF.Modern.Controls.Primitives;
 using iNKORE.UI.WPF.Modern.Helpers;
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/MediaPlayerElement/MediaTransportControls.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/MediaPlayerElement/MediaTransportControls.xaml
index f16fa57c..72ead78c 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/MediaPlayerElement/MediaTransportControls.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/MediaPlayerElement/MediaTransportControls.xaml
@@ -3,6 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Slider.xaml" />
@@ -13,7 +14,7 @@
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/CommandBar/CommandBar.xaml" />
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern.Controls;component/Controls/Flyout/FlyoutPresenter.xaml" />
         <ResourceDictionary>
-            <ui:DoubleProportionConverter x:Key="DoubleProportionConverter" />
+            <ikw:DoubleProportionConverter x:Key="DoubleProportionConverter" />
             <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/MessageBox/MessageBox.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/MessageBox/MessageBox.xaml
index 8074f171..a2642754 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/MessageBox/MessageBox.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/MessageBox/MessageBox.xaml
@@ -2,10 +2,11 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <ui:CornerRadiusFilterConverter x:Key="BottomCornerRadiusDoubleValueConverter" Filter="Bottom" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomCornerRadiusDoubleValueConverter" Filter="Bottom" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/NavigationView/NavigationView.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/NavigationView/NavigationView.xaml
index 48ffa878..1b3e5b14 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/NavigationView/NavigationView.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/NavigationView/NavigationView.xaml
@@ -4,14 +4,15 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
     xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Button.xaml" />
         <ResourceDictionary>
             <ui:BindingProxy x:Key="OverlayCornerRadiusProxy" Value="{DynamicResource OverlayCornerRadius}" />
-            <ui:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
-            <ui:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
-            <ui:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/NumberBox/NumberBox.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/NumberBox/NumberBox.xaml
index f72a2134..aa1af82e 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/NumberBox/NumberBox.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/NumberBox/NumberBox.xaml
@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
 
     <ResourceDictionary.MergedDictionaries>
@@ -10,8 +11,8 @@
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/TextBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <ui:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left" />
-    <ui:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
+    <ikw:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left" />
+    <ikw:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
 
     <Thickness x:Key="NumberBoxPopupIndicatorMargin">0,0,8,0</Thickness>
 
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/ProgressBar/ProgressBar.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/ProgressBar/ProgressBar.xaml
index b11bf0f1..cba21f51 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/ProgressBar/ProgressBar.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/ProgressBar/ProgressBar.xaml
@@ -4,11 +4,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <ui:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
-            <ui:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/RadioMenuItem/RadioMenuItem.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/RadioMenuItem/RadioMenuItem.xaml
index fe0d3b07..4b2377e5 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/RadioMenuItem/RadioMenuItem.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/RadioMenuItem/RadioMenuItem.xaml
@@ -3,9 +3,10 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
 
-    <ui:SharedSizeGroupConverter x:Key="SharedSizeGroupConverter" />
+    <ikw:SharedSizeGroupConverter x:Key="SharedSizeGroupConverter" />
 
     <Style TargetType="local:RadioMenuItem">
         <Setter Property="Background" Value="{DynamicResource MenuFlyoutItemRevealBackground}" />
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SplitButton/SplitButton.cs b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SplitButton/SplitButton.cs
index 7dbd26ec..e807af7c 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SplitButton/SplitButton.cs
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SplitButton/SplitButton.cs
@@ -8,6 +8,7 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
+using iNKORE.UI.WPF.Converters;
 using iNKORE.UI.WPF.Modern.Automation.Peers;
 using iNKORE.UI.WPF.Modern.Common;
 using iNKORE.UI.WPF.Modern.Common.Converters;
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SplitButton/SplitButton.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SplitButton/SplitButton.xaml
index 669a036a..5c4252c0 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/SplitButton/SplitButton.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/SplitButton/SplitButton.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
 
     <ResourceDictionary.MergedDictionaries>
@@ -13,8 +14,8 @@
     <sys:Double x:Key="SplitButtonPrimaryButtonSize">32</sys:Double>
     <sys:Double x:Key="SplitButtonSecondaryButtonSize">32</sys:Double>
 
-    <ui:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left" />
-    <ui:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
+    <ikw:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left" />
+    <ikw:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
 
     <Style x:Key="SplitButtonStyle" TargetType="local:SplitButton">
         <Setter Property="Background" Value="{DynamicResource SplitButtonBackground}" />
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/Controls/TeachingTip/TeachingTip.xaml b/source/iNKORE.UI.WPF.Modern.Controls/Controls/TeachingTip/TeachingTip.xaml
index fa075d7b..86f69a35 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/Controls/TeachingTip/TeachingTip.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Controls/Controls/TeachingTip/TeachingTip.xaml
@@ -2,11 +2,12 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <ui:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="Top" />
-            <ui:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="Bottom" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="Top" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="Bottom" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj b/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj
index 9731956e..177d2bd9 100644
--- a/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj
+++ b/source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj
@@ -78,7 +78,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="iNKORE.UI.WPF" Version="1.1.0.2" />
+	  <PackageReference Include="iNKORE.UI.WPF" Version="1.2.1" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/AddValueConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/AddValueConverter.cs
deleted file mode 100644
index 999d558f..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/AddValueConverter.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Data;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    public class AddValueConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            double sum = 0;
-            foreach (var v in values)
-            {
-                var isInvalid = v == DependencyProperty.UnsetValue;
-                if (isInvalid) continue;
-
-                var value = (double)v;
-                sum += value;
-            }
-            return sum;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/BrushTranslationConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/BrushTranslationConverter.cs
deleted file mode 100644
index bef46d02..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/BrushTranslationConverter.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-using System.Windows.Media;
-using System.Windows;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    public class BrushTranslationConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (values.Any(o => o == DependencyProperty.UnsetValue || o == null)) return new TranslateTransform(0, 0);
-
-            var parent = values[0] as UIElement;
-            var ctrl = values[1] as UIElement;
-            //var pointerPos = (Point)values[2];
-            var relativePos = parent.TranslatePoint(new Point(0, 0), ctrl);
-
-            return new TranslateTransform(relativePos.X, relativePos.Y);
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/ClipInnerRectConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/ClipInnerRectConverter.cs
deleted file mode 100644
index 4e867d31..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/ClipInnerRectConverter.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-using System.Windows.Media;
-using System.Windows;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    public class ClipInnerRectConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (values.Any(o => o == DependencyProperty.UnsetValue || o == null)) return null;
-
-            var width = (double)values[0];
-            var height = (double)values[1];
-            var outerMargin = (double)values[2];
-
-            var cornerRadius = new CornerRadius(0);
-            if (values.Length >= 4 && values[3] is CornerRadius)
-                cornerRadius = (CornerRadius)values[3];
-
-            var region = DrawRoundedRectangle(new Rect(-outerMargin, -outerMargin, width + outerMargin * 2, height + outerMargin * 2), cornerRadius);
-            var clip = DrawRoundedRectangle(new Rect(0, 0, width, height), cornerRadius);
-
-            var group = new GeometryGroup();
-            group.Children.Add(region);
-            group.Children.Add(clip);
-
-            return group;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            return null;
-        }
-
-        /// <summary>
-        /// Draws a rounded rectangle with four individual corner radius
-        /// </summary>
-        public static StreamGeometry DrawRoundedRectangle(Rect rect, CornerRadius cornerRadius)
-        {
-            var geometry = new StreamGeometry();
-            using (var context = geometry.Open())
-            {
-                bool isStroked = false;
-                bool isSmoothJoin = true;
-
-                context.BeginFigure(rect.TopLeft + new Vector(0, cornerRadius.TopLeft), true, true);
-                context.ArcTo(new Point(rect.TopLeft.X + cornerRadius.TopLeft, rect.TopLeft.Y),
-                    new Size(cornerRadius.TopLeft, cornerRadius.TopLeft),
-                    90, false, SweepDirection.Clockwise, isStroked, isSmoothJoin);
-                context.LineTo(rect.TopRight - new Vector(cornerRadius.TopRight, 0), isStroked, isSmoothJoin);
-                context.ArcTo(new Point(rect.TopRight.X, rect.TopRight.Y + cornerRadius.TopRight),
-                    new Size(cornerRadius.TopRight, cornerRadius.TopRight),
-                    90, false, SweepDirection.Clockwise, isStroked, isSmoothJoin);
-                context.LineTo(rect.BottomRight - new Vector(0, cornerRadius.BottomRight), isStroked, isSmoothJoin);
-                context.ArcTo(new Point(rect.BottomRight.X - cornerRadius.BottomRight, rect.BottomRight.Y),
-                    new Size(cornerRadius.BottomRight, cornerRadius.BottomRight),
-                    90, false, SweepDirection.Clockwise, isStroked, isSmoothJoin);
-                context.LineTo(rect.BottomLeft + new Vector(cornerRadius.BottomLeft, 0), isStroked, isSmoothJoin);
-                context.ArcTo(new Point(rect.BottomLeft.X, rect.BottomLeft.Y - cornerRadius.BottomLeft),
-                    new Size(cornerRadius.BottomLeft, cornerRadius.BottomLeft),
-                    90, false, SweepDirection.Clockwise, isStroked, isSmoothJoin);
-
-                context.Close();
-            }
-
-            return geometry;
-        }
-    }
-
-    public class ClipOuterRectConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (values.Any(o => o == DependencyProperty.UnsetValue || o == null)) return null;
-
-            var width = (double)values[0];
-            var height = (double)values[1];
-            var margin = (double)values[2];
-
-            var cornerRadius = new CornerRadius(0);
-            if (values.Length >= 4 && values[3] is CornerRadius)
-                cornerRadius = (CornerRadius)values[3];
-
-
-            return ClipInnerRectConverter.DrawRoundedRectangle(new Rect(margin, margin, width, height), cornerRadius);
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    internal class NegativeMarginConverter : IValueConverter
-    {
-        public double Multiple { get; set; } = -1d;
-
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            var margin = (double)value;
-
-            return new Thickness(margin * Multiple);
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/ColorToBrushConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/ColorToBrushConverter.cs
deleted file mode 100644
index eb472ca9..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/ColorToBrushConverter.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    public class ColorToBrushConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is Color color)
-            {
-                return new SolidColorBrush(color);
-            }
-            return null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is SolidColorBrush brush)
-            {
-                return brush.Color;
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/CornerRadiusFilterConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/CornerRadiusFilterConverter.cs
deleted file mode 100644
index e4b66ec8..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/CornerRadiusFilterConverter.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    public class CornerRadiusFilterConverter : DependencyObject, IValueConverter
-    {
-        public CornerRadiusFilterKind Filter { get; set; }
-
-        public double Scale { get; set; } = 1.0;
-
-        public static CornerRadius Convert(CornerRadius radius, CornerRadiusFilterKind filterKind)
-        {
-            CornerRadius result = radius;
-
-            switch (filterKind)
-            {
-                case CornerRadiusFilterKind.Top:
-                    result.BottomLeft = 0;
-                    result.BottomRight = 0;
-                    break;
-                case CornerRadiusFilterKind.Right:
-                    result.TopLeft = 0;
-                    result.BottomLeft = 0;
-                    break;
-                case CornerRadiusFilterKind.Bottom:
-                    result.TopLeft = 0;
-                    result.TopRight = 0;
-                    break;
-                case CornerRadiusFilterKind.Left:
-                    result.TopRight = 0;
-                    result.BottomRight = 0;
-                    break;
-            }
-
-            return result;
-        }
-
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            var cornerRadius = (CornerRadius)value;
-
-            var scale = Scale;
-            if (!double.IsNaN(scale))
-            {
-                cornerRadius.TopLeft *= scale;
-                cornerRadius.TopRight *= scale;
-                cornerRadius.BottomRight *= scale;
-                cornerRadius.BottomLeft *= scale;
-            }
-
-            var filterType = Filter;
-            if (filterType == CornerRadiusFilterKind.TopLeftValue ||
-                filterType == CornerRadiusFilterKind.BottomRightValue)
-            {
-                return GetDoubleValue(cornerRadius, filterType);
-            }
-
-            return Convert(cornerRadius, filterType);
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-
-        private double GetDoubleValue(CornerRadius radius, CornerRadiusFilterKind filterKind)
-        {
-            switch (filterKind)
-            {
-                case CornerRadiusFilterKind.TopLeftValue:
-                    return radius.TopLeft;
-                case CornerRadiusFilterKind.BottomRightValue:
-                    return radius.BottomRight;
-            }
-            return 0;
-        }
-    }
-
-    public enum CornerRadiusFilterKind
-    {
-        None,
-        Top,
-        Right,
-        Bottom,
-        Left,
-        TopLeftValue,
-        BottomRightValue
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/DoubleProportionConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/DoubleProportionConverter.cs
deleted file mode 100644
index 95f97933..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/DoubleProportionConverter.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    public class DoubleProportionConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is double)
-            {
-                double result = (double)value;
-                if (parameter != null)
-                {
-                    var zoom = System.Convert.ToDouble(parameter);
-                    result = (double)value * zoom;
-                }
-                if (targetType == typeof(string))
-                {
-                    return string.Format("{0:0.##}", result);
-                }
-                return result;
-            }
-            return value;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is double)
-            {
-                if (parameter != null)
-                {
-                    var zoom = System.Convert.ToDouble(parameter);
-                    return (double)value / zoom;
-                }
-            }
-            return value;
-        }
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/IconSourceToIconElementConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/IconSourceToIconElementConverter.cs
new file mode 100644
index 00000000..0cf06d83
--- /dev/null
+++ b/source/iNKORE.UI.WPF.Modern/Common/Converters/IconSourceToIconElementConverter.cs
@@ -0,0 +1,26 @@
+using iNKORE.UI.WPF.Modern.Controls;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using iNKORE.UI.WPF.Converters;
+using System.Windows.Controls;
+
+namespace iNKORE.UI.WPF.Modern.Common.Converters
+{
+    public class IconSourceToIconElementConverter : AdvancedValueConverterBase<IconSource, IconElement>
+    {
+        public override IconElement DoConvert(IconSource from)
+        {
+            return from.CreateIconElement();
+        }
+
+        public override IconSource DoConvertBack(IconElement to)
+        {
+            return to.CreateIconSource();
+        }
+    }
+}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/IsGridViewConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/IsGridViewConverter.cs
deleted file mode 100644
index 0e2693e6..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/IsGridViewConverter.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    public class IsGridViewConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value is System.Windows.Controls.GridView;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/OrConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/OrConverter.cs
deleted file mode 100644
index f4d444ea..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/OrConverter.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    public class OrConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            for (int i = 0; i < values.Length; i++)
-            {
-                if (values[i] is bool b && b)
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/PlacementRectangleConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/PlacementRectangleConverter.cs
deleted file mode 100644
index cc772924..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/PlacementRectangleConverter.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    public class PlacementRectangleConverter : IMultiValueConverter
-    {
-        public Thickness Margin { get; set; }
-
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (values.Length == 2 &&
-                values[0] is double width &&
-                values[1] is double height)
-            {
-                var margin = Margin;
-                var topLeft = new Point(margin.Left, margin.Top);
-                var bottomRight = new Point(width - margin.Right, height - margin.Bottom);
-                var rect = new Rect(topLeft, bottomRight);
-                return rect;
-            }
-
-            return Rect.Empty;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/RelativeToAbsoluteConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/RelativeToAbsoluteConverter.cs
deleted file mode 100644
index dce7ff9a..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/RelativeToAbsoluteConverter.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    public class RelativeToAbsoluteConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value != null)
-            {
-                if (parameter is string)
-                {
-                    return new Uri(Path.Combine((string)parameter, value.ToString()));
-                }
-                else
-                {
-                    return new Uri(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, value.ToString().Replace("/", @"\")));
-                }
-            }
-            return value;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/RoundConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/RoundConverter.cs
deleted file mode 100644
index 830730ba..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/RoundConverter.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    [ValueConversion(typeof(double), typeof(double[]))]
-    public class RoundMathConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (values.Length < 2)
-            {
-                throw new NotImplementedException();
-            }
-            double.TryParse(values[0].ToString(), out double d1);
-            double.TryParse(values[1].ToString(), out double d2);
-            if (d1 * d2 == 0)
-            {
-                return double.NaN;
-            }
-            return Math.Min(d1, d2);
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    [ValueConversion(typeof(System.Windows.CornerRadius), typeof(double[]))]
-    public class RoundRadiusConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (values.Length < 2)
-            {
-                throw new NotImplementedException();
-            }
-            double.TryParse(values[0].ToString(), out double d1);
-            double.TryParse(values[1].ToString(), out double d2);
-            double ratio = 1;
-            if (values.Length >= 3)
-            {
-                double.TryParse(values[2].ToString(), out ratio);
-            }
-            return new System.Windows.CornerRadius(Math.Min(d1, d2) * ratio / 2);
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/SharedSizeGroupConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/SharedSizeGroupConverter.cs
deleted file mode 100644
index 63fddcb5..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/SharedSizeGroupConverter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    public class SharedSizeGroupConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return (Visibility)value != Visibility.Collapsed ? (string)parameter : null;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/SizeToRectConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/SizeToRectConverter.cs
deleted file mode 100644
index 3ee5c365..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/SizeToRectConverter.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Data;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    internal class SizeToRectConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            double a = values[0] is double ? (double)values[0] : 0;
-            double b = values[1] is double ? (double)values[1] : 0;
-            double c = values[2] is double ? (double)values[2] : 0;
-            double d = values[3] is double ? (double)values[3] : 0;
-            return new Rect(a, b, c, d);
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            Rect rect = value is Rect ? (Rect)value : new Rect(0, 0, 0, 0);
-            return new object[] { rect.TopLeft.X, rect.TopLeft.Y, rect.BottomRight.X, rect.BottomRight.Y };
-        }
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Common/Converters/ThicknessFilterConverter.cs b/source/iNKORE.UI.WPF.Modern/Common/Converters/ThicknessFilterConverter.cs
deleted file mode 100644
index 080f0b55..00000000
--- a/source/iNKORE.UI.WPF.Modern/Common/Converters/ThicknessFilterConverter.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-
-namespace iNKORE.UI.WPF.Modern.Common.Converters
-{
-    public class ThicknessFilterConverter : DependencyObject, IValueConverter
-    {
-        public ThicknessFilterKind Filter { get; set; }
-
-        public double Scale { get; set; } = 1.0;
-
-        public static Thickness Convert(Thickness thickness, ThicknessFilterKind filterKind)
-        {
-            Thickness result = thickness;
-
-            if (!filterKind.HasFlag(ThicknessFilterKind.Top))
-            {
-                result.Top = 0;
-            }
-            if (!filterKind.HasFlag(ThicknessFilterKind.Left))
-            {
-                result.Left = 0;
-            }
-            if (!filterKind.HasFlag(ThicknessFilterKind.Right))
-            {
-                result.Right = 0;
-            }
-            if (!filterKind.HasFlag(ThicknessFilterKind.Bottom))
-            {
-                result.Bottom = 0;
-            }
-
-
-            return result;
-        }
-
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            var thickness = (Thickness)value;
-
-            var scale = Scale;
-            if (!double.IsNaN(scale))
-            {
-                thickness.Left *= scale;
-                thickness.Right *= scale;
-                thickness.Bottom *= scale;
-                thickness.Top *= scale;
-            }
-
-            var filterType = Filter;
-
-            return Convert(thickness, filterType);
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-
-    }
-
-    [Flags]
-    public enum ThicknessFilterKind
-    {
-        None,
-        Top,
-        Right,
-        Bottom,
-        Left,
-
-        TopAndLeft = Top | Left,
-        BottomAndRight = Bottom | Right,
-        LeftAndRight = Left | Right,
-        TopAndBottom = Top | Bottom,
-
-        ExcludeTop = Left | Right | Bottom,
-        ExcludeLeft = Top | Right | Bottom,
-        ExcludeRight = Left | Bottom | Top,
-        ExcludeBottom = Top | Left | Right,
-    }
-}
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/AcrylicPanel.xaml b/source/iNKORE.UI.WPF.Modern/Controls/AcrylicPanel.xaml
index c83f58bb..3c7c0d36 100644
--- a/source/iNKORE.UI.WPF.Modern/Controls/AcrylicPanel.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Controls/AcrylicPanel.xaml
@@ -5,12 +5,13 @@
     xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives"
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <converters:BrushTranslationConverter x:Key="BrushTranslationConverter" />
-            <converters:ColorToBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+            <ikw:BrushTranslationConverter x:Key="BrushTranslationConverter" />
+            <ikw:ColorToBrushConverter x:Key="ColorToSolidColorBrushConverter" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/ClippingBorder.cs b/source/iNKORE.UI.WPF.Modern/Controls/ClippingBorder.cs
index 17f2896d..3f78352d 100644
--- a/source/iNKORE.UI.WPF.Modern/Controls/ClippingBorder.cs
+++ b/source/iNKORE.UI.WPF.Modern/Controls/ClippingBorder.cs
@@ -7,6 +7,7 @@
 using System.Windows.Media;
 using System.Windows;
 using iNKORE.UI.WPF.Modern.Common.Converters;
+using iNKORE.UI.WPF.Converters;
 
 namespace iNKORE.UI.WPF.Modern.Controls
 {
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/DropShadowPanel.cs b/source/iNKORE.UI.WPF.Modern/Controls/DropShadowPanel.cs
index aa09d365..7ac19aa8 100644
--- a/source/iNKORE.UI.WPF.Modern/Controls/DropShadowPanel.cs
+++ b/source/iNKORE.UI.WPF.Modern/Controls/DropShadowPanel.cs
@@ -1,4 +1,5 @@
-using iNKORE.UI.WPF.Modern.Common.Converters;
+using iNKORE.UI.WPF.Converters;
+using iNKORE.UI.WPF.Modern.Common.Converters;
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/Helpers/ClipHelper.cs b/source/iNKORE.UI.WPF.Modern/Controls/Helpers/ClipHelper.cs
index cd6c5a82..665054ab 100644
--- a/source/iNKORE.UI.WPF.Modern/Controls/Helpers/ClipHelper.cs
+++ b/source/iNKORE.UI.WPF.Modern/Controls/Helpers/ClipHelper.cs
@@ -1,4 +1,5 @@
-using iNKORE.UI.WPF.Modern.Common.Converters;
+using iNKORE.UI.WPF.Converters;
+using iNKORE.UI.WPF.Modern.Common.Converters;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/Helpers/ComboBoxHelper.cs b/source/iNKORE.UI.WPF.Modern/Controls/Helpers/ComboBoxHelper.cs
index b36ab294..76050ca3 100644
--- a/source/iNKORE.UI.WPF.Modern/Controls/Helpers/ComboBoxHelper.cs
+++ b/source/iNKORE.UI.WPF.Modern/Controls/Helpers/ComboBoxHelper.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using iNKORE.UI.WPF.Converters;
 using iNKORE.UI.WPF.Modern.Common.Converters;
 using System.Windows;
 using System.Windows.Controls;
diff --git a/source/iNKORE.UI.WPF.Modern/Controls/ImageIcon.cs b/source/iNKORE.UI.WPF.Modern/Controls/ImageIcon.cs
index 540e86bf..6cb00fa5 100644
--- a/source/iNKORE.UI.WPF.Modern/Controls/ImageIcon.cs
+++ b/source/iNKORE.UI.WPF.Modern/Controls/ImageIcon.cs
@@ -78,7 +78,7 @@ private void ApplySource()
 
         private Image _image;
 
-        public override IconSource CreateIconSourceCore()
+        protected override IconSource CreateIconSourceCore()
         {
             var iconSource = new ImageIconSource();
 
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Generic.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Generic.xaml
index ab803f0f..7cac6c01 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Generic.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Generic.xaml
@@ -3,6 +3,7 @@
                     xmlns:ui="clr-namespace:iNKORE.UI.WPF.Modern.Controls" 
                     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common"
                     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
+                    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
                     xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives">
 
     <ResourceDictionary.MergedDictionaries>
@@ -18,9 +19,9 @@
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Controls/AcrylicPanel.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <converters:AddValueConverter x:Key="addValueConverter" />
-    <converters:CornerRadiusFilterConverter x:Key="cornerRadiusFilterConverter_Bottom" Filter="Bottom"/>
-    <converters:ThicknessFilterConverter x:Key="thicknessFilterConverter_ExcludeTop" Filter="ExcludeTop"/>
+    <ikw:AddValueConverter x:Key="addValueConverter" />
+    <ikw:CornerRadiusFilterConverter x:Key="cornerRadiusFilterConverter_Bottom" Filter="Bottom"/>
+    <ikw:ThicknessFilterConverter x:Key="thicknessFilterConverter_ExcludeTop" Filter="ExcludeTop"/>
 
     <Style TargetType="ui:ElevationBorder">
         <Style.Setters>
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/AutoSuggestBox.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/AutoSuggestBox.xaml
index f6ed6cc5..1569abe4 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/AutoSuggestBox.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/AutoSuggestBox.xaml
@@ -7,6 +7,7 @@
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common"
     xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives"
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/iNKORE.UI.WPF.Modern;component/Themes/Styles/Button.xaml" />
@@ -47,7 +48,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="TextBox">
                     <ControlTemplate.Resources>
-                        <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
+                        <ikw:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
                         <Style TargetType="ContentControl">
                             <Setter Property="HorizontalContentAlignment" Value="Left" />
                             <Setter Property="VerticalContentAlignment" Value="Top" />
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/Calendar.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/Calendar.xaml
index b59a949e..e651478e 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/Calendar.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/Calendar.xaml
@@ -5,14 +5,15 @@
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
     xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common"
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Button.xaml" />
         <ResourceDictionary>
-            <converters:RoundMathConverter x:Key="RoundMathConverter" />
-            <converters:RoundRadiusConverter x:Key="RoundRadiusConverter" />
+            <ikw:RoundMathConverter x:Key="RoundMathConverter" />
+            <ikw:RoundRadiusConverter x:Key="RoundRadiusConverter" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/CheckBox.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/CheckBox.xaml
index 2d800474..096e766c 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/CheckBox.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/CheckBox.xaml
@@ -7,11 +7,12 @@
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <converters:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
-            <converters:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/ComboBox.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/ComboBox.xaml
index 59019077..a3d6781a 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/ComboBox.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/ComboBox.xaml
@@ -7,13 +7,14 @@
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="TextBox.xaml" />
         <ResourceDictionary>
             <primitives:BindingProxy x:Key="ComboBoxItemPillCornerRadiusProxy" Value="{DynamicResource ComboBoxItemPillCornerRadius}" />
-            <converters:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
-            <converters:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
@@ -517,7 +518,7 @@
                             <Popup.PlacementRectangle>
                                 <MultiBinding>
                                     <MultiBinding.Converter>
-                                        <converters:PlacementRectangleConverter Margin="0,1,0,1" />
+                                        <ikw:PlacementRectangleConverter Margin="0,1,0,1" />
                                     </MultiBinding.Converter>
                                     <Binding ElementName="Background" Path="ActualWidth" />
                                     <Binding ElementName="Background" Path="ActualHeight" />
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/DatePicker.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/DatePicker.xaml
index 842e6dbb..38c0dc90 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/DatePicker.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/DatePicker.xaml
@@ -7,6 +7,7 @@
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
 
     <Style x:Key="DefaultDatePickerTextBoxStyle" TargetType="DatePickerTextBox">
@@ -195,7 +196,7 @@
                             <Popup.PlacementRectangle>
                                 <MultiBinding>
                                     <MultiBinding.Converter>
-                                        <converters:PlacementRectangleConverter Margin="0,-4" />
+                                        <ikw:PlacementRectangleConverter Margin="0,-4" />
                                     </MultiBinding.Converter>
                                     <Binding ElementName="PART_Root" Path="ActualWidth" />
                                     <Binding ElementName="PART_Root" Path="ActualHeight" />
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/Expander.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/Expander.xaml
index 8552c989..bb9461bb 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/Expander.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/Expander.xaml
@@ -7,13 +7,14 @@
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <converters:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="Top" />
-            <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
-            <converters:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="Bottom" />
-            <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="Top" />
+            <ikw:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="Bottom" />
+            <ikw:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
@@ -456,9 +457,9 @@
                                     Glyph="{DynamicResource ExpanderChevronChevronRightGlyph}"
                                     RenderTransformOrigin="0.5, 0.5"
                                     SnapsToDevicePixels="false">
-                                    <local:FontIcon.RenderTransform>
+                                    <FrameworkElement.RenderTransform>
                                         <RotateTransform x:Name="ExpandCollapseChevronRotateTransform" Angle="0" />
-                                    </local:FontIcon.RenderTransform>
+                                    </FrameworkElement.RenderTransform>
                                 </local:FontIcon>
                             </Border>
                         </Grid>
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/ListView.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/ListView.xaml
index 17bc86af..b4e68ac2 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/ListView.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/ListView.xaml
@@ -7,11 +7,12 @@
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <converters:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
-            <converters:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
             <primitives:BindingProxy x:Key="ListViewItemSelectionIndicatorCornerRadiusProxy" Value="{DynamicResource ListViewItemSelectionIndicatorCornerRadius}" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
@@ -429,7 +430,7 @@
         BasedOn="{StaticResource BaseListViewStyle}"
         TargetType="ListView">
         <Style.Resources>
-            <converters:IsGridViewConverter x:Key="IsGridViewConverter" />
+            <ikw:IsGridViewConverter x:Key="IsGridViewConverter" />
         </Style.Resources>
         <Style.Triggers>
             <DataTrigger Binding="{Binding View, RelativeSource={RelativeSource Self}, Converter={StaticResource IsGridViewConverter}}" Value="True">
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/MenuItem.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/MenuItem.xaml
index 0b0444a6..4b0d8f70 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/MenuItem.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/MenuItem.xaml
@@ -6,12 +6,13 @@
     xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives"
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <converters:SharedSizeGroupConverter x:Key="SharedSizeGroupConverter" />
+            <ikw:SharedSizeGroupConverter x:Key="SharedSizeGroupConverter" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
@@ -317,7 +318,7 @@
                     <Popup.PlacementRectangle>
                         <MultiBinding>
                             <MultiBinding.Converter>
-                                <converters:PlacementRectangleConverter Margin="4,-1" />
+                                <ikw:PlacementRectangleConverter Margin="4,-1" />
                             </MultiBinding.Converter>
                             <Binding ElementName="LayoutRoot" Path="ActualWidth" />
                             <Binding ElementName="LayoutRoot" Path="ActualHeight" />
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/PasswordBox.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/PasswordBox.xaml
index ef8355bb..bba8ecb2 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/PasswordBox.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/PasswordBox.xaml
@@ -4,10 +4,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Controls"
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <converters:OrConverter x:Key="OrConverter" />
+            <ikw:OrConverter x:Key="OrConverter" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
     <Style x:Key="DefaultPasswordBoxStyle" TargetType="PasswordBox">
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/Pivot.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/Pivot.xaml
index dc05b304..e6a2df63 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/Pivot.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/Pivot.xaml
@@ -5,12 +5,13 @@
     xmlns:primitives="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Primitives"
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <converters:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
-            <converters:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/ProgressBar.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/ProgressBar.xaml
index ce79d6a8..deae305d 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/ProgressBar.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/ProgressBar.xaml
@@ -7,12 +7,13 @@
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:animation="clr-namespace:iNKORE.UI.WPF.Modern.Media.Animation"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <converters:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
-            <converters:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
             <primitives:BindingProxy x:Key="ProgressBarTrackCornerRadiusProxy" Value="{DynamicResource ProgressBarTrackCornerRadius}" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/ScrollBar.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/ScrollBar.xaml
index d6195f82..db75657a 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/ScrollBar.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/ScrollBar.xaml
@@ -10,28 +10,29 @@
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common"
     xmlns:vstates="clr-namespace:iNKORE.UI.WPF.Modern.Common"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:root="clr-namespace:iNKORE.UI.WPF.Modern">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
-            <converters:CornerRadiusFilterConverter
+            <ikw:CornerRadiusFilterConverter
                 x:Key="TopLeftCornerRadiusDoubleValueConverter8x"
                 Filter="TopLeftValue"
                 Scale="8" />
-            <converters:CornerRadiusFilterConverter
+            <ikw:CornerRadiusFilterConverter
                 x:Key="BottomRightCornerRadiusDoubleValueConverter8x"
                 Filter="BottomRightValue"
                 Scale="8" />
-            <converters:CornerRadiusFilterConverter
+            <ikw:CornerRadiusFilterConverter
                 x:Key="TopLeftCornerRadiusDoubleValueConverter2x"
                 Filter="TopLeftValue"
                 Scale="2" />
-            <converters:CornerRadiusFilterConverter
+            <ikw:CornerRadiusFilterConverter
                 x:Key="BottomRightCornerRadiusDoubleValueConverter2x"
                 Filter="BottomRightValue"
                 Scale="2" />
-            <converters:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
-            <converters:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/Slider.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/Slider.xaml
index aa111df1..4c79b080 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/Slider.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/Slider.xaml
@@ -7,12 +7,13 @@
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="ToolTip.xaml" />
         <ResourceDictionary>
-            <converters:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
-            <converters:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/TabControl.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/TabControl.xaml
index 835af76b..421c75e9 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/TabControl.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/TabControl.xaml
@@ -7,14 +7,15 @@
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary>
             <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-            <converters:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="Top" />
-            <converters:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
-            <converters:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="Bottom" />
-            <converters:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopCornerRadiusFilterConverter" Filter="Top" />
+            <ikw:CornerRadiusFilterConverter x:Key="RightCornerRadiusFilterConverter" Filter="Right" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomCornerRadiusFilterConverter" Filter="Bottom" />
+            <ikw:CornerRadiusFilterConverter x:Key="LeftCornerRadiusFilterConverter" Filter="Left" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
diff --git a/source/iNKORE.UI.WPF.Modern/Themes/Styles/ToolBar.xaml b/source/iNKORE.UI.WPF.Modern/Themes/Styles/ToolBar.xaml
index 78fabac3..88720d1d 100644
--- a/source/iNKORE.UI.WPF.Modern/Themes/Styles/ToolBar.xaml
+++ b/source/iNKORE.UI.WPF.Modern/Themes/Styles/ToolBar.xaml
@@ -6,6 +6,7 @@
     xmlns:converters="clr-namespace:iNKORE.UI.WPF.Modern.Common.Converters"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:chelper="clr-namespace:iNKORE.UI.WPF.Modern.Controls.Helpers"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Common">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Button.xaml" />
@@ -14,8 +15,8 @@
         <ResourceDictionary Source="RadioButton.xaml" />
         <ResourceDictionary Source="ToggleButton.xaml" />
         <ResourceDictionary>
-            <converters:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
-            <converters:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="TopLeftCornerRadiusDoubleValueConverter" Filter="TopLeftValue" />
+            <ikw:CornerRadiusFilterConverter x:Key="BottomRightCornerRadiusDoubleValueConverter" Filter="BottomRightValue" />
         </ResourceDictionary>
     </ResourceDictionary.MergedDictionaries>
 
@@ -544,7 +545,7 @@
                                     <Popup.PlacementRectangle>
                                         <MultiBinding>
                                             <MultiBinding.Converter>
-                                                <converters:PlacementRectangleConverter Margin="0,1,0,1" />
+                                                <ikw:PlacementRectangleConverter Margin="0,1,0,1" />
                                             </MultiBinding.Converter>
                                             <Binding ElementName="MoreButton" Path="ActualWidth" />
                                             <Binding ElementName="MoreButton" Path="ActualHeight" />
diff --git a/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj b/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj
index c66bc7da..7c0b7a78 100644
--- a/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj
+++ b/source/iNKORE.UI.WPF.Modern/iNKORE.UI.WPF.Modern.csproj
@@ -77,7 +77,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="iNKORE.UI.WPF" Version="1.1.0.2" />
+	  <PackageReference Include="iNKORE.UI.WPF" Version="1.2.1" />
 	</ItemGroup>
 
 	<ItemGroup>