diff --git a/src/Ursa.Themes.Semi/Controls/AutoCompleteBox.axaml b/src/Ursa.Themes.Semi/Controls/AutoCompleteBox.axaml
index cd5718f..5f56b87 100644
--- a/src/Ursa.Themes.Semi/Controls/AutoCompleteBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/AutoCompleteBox.axaml
@@ -2,7 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa"
-    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
+    xmlns:iri="https://irihi.tech/shared">
     <ControlTheme x:Key="{x:Type u:AutoCompleteBox}" TargetType="u:AutoCompleteBox">
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
@@ -14,7 +14,7 @@
                         Name="PART_TextBox"
                         MinHeight="{TemplateBinding MinHeight}"
                         VerticalAlignment="Stretch"
-                        helpers:ClassHelper.ClassSource="{TemplateBinding}"
+                        iri:ClassHelper.ClassSource="{TemplateBinding}"
                         DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                         InnerLeftContent="{TemplateBinding InnerLeftContent}"
                         InnerRightContent="{TemplateBinding InnerRightContent}"
diff --git a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
index b8196fd..c016ed1 100644
--- a/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DateRangePicker.axaml
@@ -1,8 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:contracts="https://irihi.tech/shared"
     xmlns:u="https://irihi.tech/ursa"
+    xmlns:iri="https://irihi.tech/shared"
     x:CompileBindings="True">
     <ControlTheme x:Key="{x:Type u:DateRangePicker}" TargetType="u:DateRangePicker">
         <Setter Property="Background" Value="{DynamicResource TextBoxDefaultBackground}" />
@@ -73,7 +73,7 @@
                                 Theme="{DynamicResource InnerIconButton}" />
                         </Grid>
                         <Popup
-                            Name="{x:Static contracts:PartNames.PART_Popup}"
+                            Name="{x:Static iri:PartNames.PART_Popup}"
                             OverlayInputPassThroughElement="{Binding #PART_PassThroughElement}"
                             HorizontalOffset="-4"
                             IsLightDismissEnabled="True"
diff --git a/src/Ursa.Themes.Semi/Controls/Dialog.axaml b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
index 22b0874..7cf04fc 100644
--- a/src/Ursa.Themes.Semi/Controls/Dialog.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Dialog.axaml
@@ -1,8 +1,8 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared"
-    xmlns:u="https://irihi.tech/ursa">
+    xmlns:u="https://irihi.tech/ursa"
+    xmlns:iri="https://irihi.tech/shared">
 
     <ControlTheme x:Key="{x:Type u:OverlayDialogHost}" TargetType="u:OverlayDialogHost">
         <Setter Property="OverlayMaskBrush" Value="{DynamicResource OverlayDialogMaskBrush}" />
@@ -230,24 +230,24 @@
         </Style>
         <Style Selector="^ /template/ Button#PART_CancelButton">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_NoButton">
             <Setter Property="Grid.Column" Value="1" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_YesButton">
             <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_OKButton">
             <Setter Property="Grid.Column" Value="3" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
@@ -259,16 +259,16 @@
                 <Setter Property="Margin" Value="24 24 0 0" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Info]">
@@ -278,16 +278,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Warning]">
@@ -297,19 +297,19 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Warning" />
                 <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Warning" />
                 <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
                 <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Error]">
@@ -319,16 +319,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Question]">
@@ -338,16 +338,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Success]">
@@ -357,16 +357,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Success" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Success" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^ /template/ Panel#PART_TitleArea">
@@ -595,24 +595,24 @@
         </Setter>
         <Style Selector="^ /template/ Button#PART_CancelButton">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_NoButton">
             <Setter Property="Grid.Column" Value="1" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_YesButton">
             <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_OKButton">
             <Setter Property="Grid.Column" Value="3" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
@@ -624,16 +624,16 @@
                 <Setter Property="Margin" Value="24 24 0 0" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Info]">
@@ -643,16 +643,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Warning]">
@@ -662,19 +662,19 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiOrange6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Warning" />
                 <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Warning" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Warning" />
                 <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
                 <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Error]">
@@ -684,16 +684,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiRed6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Question]">
@@ -703,16 +703,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiBlue6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
         <Style Selector="^[Mode=Success]">
@@ -722,16 +722,16 @@
                 <Setter Property="Foreground" Value="{DynamicResource SemiGreen6}" />
             </Style>
             <Style Selector="^ /template/ Button#PART_OKButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Success" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_YesButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Success" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Success" />
             </Style>
             <Style Selector="^ /template/ Button#PART_NoButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             </Style>
             <Style Selector="^ /template/ Button#PART_CancelButton">
-                <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+                <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             </Style>
         </Style>
     </ControlTheme>
diff --git a/src/Ursa.Themes.Semi/Controls/Drawer.axaml b/src/Ursa.Themes.Semi/Controls/Drawer.axaml
index c058303..f85aebf 100644
--- a/src/Ursa.Themes.Semi/Controls/Drawer.axaml
+++ b/src/Ursa.Themes.Semi/Controls/Drawer.axaml
@@ -2,8 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:c="clr-namespace:Ursa.Themes.Semi.Converters"
-    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared"
-    xmlns:u="https://irihi.tech/ursa">
+    xmlns:u="https://irihi.tech/ursa"
+    xmlns:iri="https://irihi.tech/shared">
     <ControlTheme x:Key="{x:Type u:CustomDrawerControl}" TargetType="u:CustomDrawerControl">
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
@@ -181,24 +181,24 @@
         </Setter>
         <Style Selector="^ /template/ Button#PART_CancelButton">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_NoButton">
             <Setter Property="Grid.Column" Value="1" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_YesButton">
             <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_OKButton">
             <Setter Property="Grid.Column" Value="3" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
diff --git a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
index 2e2a3fb..d438616 100644
--- a/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
+++ b/src/Ursa.Themes.Semi/Controls/DualBadge.axaml
@@ -2,7 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa"
-    xmlns:converters="clr-namespace:Ursa.Converters;assembly=Ursa">
+    xmlns:iri="https://irihi.tech/shared">
     <ControlTheme x:Key="{x:Type u:DualBadge}" TargetType="u:DualBadge">
         <Setter Property="CornerRadius" Value="{DynamicResource DualBadgeDefaultCornerRadius}" />
         <Setter Property="FontSize" Value="{DynamicResource DualBadgeDefaultFontSize}" />
@@ -33,7 +33,7 @@
                                 Height="{DynamicResource DualBadgeIconHeight}"
                                 IsVisible="{TemplateBinding Icon,Converter={x:Static ObjectConverters.IsNotNull}}"
                                 Foreground="{TemplateBinding IconForeground}"
-                                Margin="{TemplateBinding Padding, Converter={x:Static converters:ThicknessExcludeConverter.Right}}"
+                                Margin="{TemplateBinding Padding, Converter={iri:ThicknessMixerConverter 'Vertical,Left'}}"
                                 Content="{TemplateBinding Icon}"
                                 ContentTemplate="{TemplateBinding IconTemplate}" />
                             <ContentPresenter
diff --git a/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml b/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml
index a432209..ebc8126 100644
--- a/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml
+++ b/src/Ursa.Themes.Semi/Controls/EnumSelector.axaml
@@ -2,14 +2,14 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa"
-    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
+    xmlns:iri="https://irihi.tech/shared">
     <ControlTheme x:Key="{x:Type u:EnumSelector}" TargetType="u:EnumSelector">
         <Setter Property="HorizontalAlignment" Value="Left" />
         <Setter Property="Template">
             <ControlTemplate TargetType="u:EnumSelector">
                 <ComboBox
                     Width="{TemplateBinding Width}"
-                    helpers:ClassHelper.ClassSource="{TemplateBinding}"
+                    iri:ClassHelper.ClassSource="{TemplateBinding}"
                     HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                     VerticalAlignment="{TemplateBinding VerticalAlignment}"
                     Name="PART_ComboBox"
diff --git a/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml b/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
index 0a0dfa9..757fe9d 100644
--- a/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
+++ b/src/Ursa.Themes.Semi/Controls/KeyGestureInput.axaml
@@ -2,8 +2,8 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:converters="using:Avalonia.Controls.Converters"
-    xmlns:ursaConverters="using:Ursa.Converters"
-    xmlns:u="https://irihi.tech/ursa">
+    xmlns:u="https://irihi.tech/ursa"
+    xmlns:iri="https://irihi.tech/shared">
     <converters:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
 
     <ControlTheme x:Key="{x:Type u:KeyGestureInput}" TargetType="u:KeyGestureInput">
@@ -28,7 +28,7 @@
                         <Grid ColumnDefinitions="Auto, *, Auto" >
                             <ContentPresenter Grid.Column="0"
                                 Content="{TemplateBinding InnerLeftContent}"
-                                Padding="{TemplateBinding Padding, Converter={x:Static ursaConverters:ThicknessIncludeConverter.Right}}"
+                                Padding="{TemplateBinding Padding, Converter={iri:ThicknessMixerConverter Right}}"
                                 DockPanel.Dock="Left"
                                 VerticalAlignment="Stretch"
                                 VerticalContentAlignment="Center"
@@ -39,7 +39,7 @@
                                 Grid.Column="2"
                                 Content="{TemplateBinding InnerRightContent}"
                                 DockPanel.Dock="Right"
-                                Padding="{TemplateBinding Padding, Converter={x:Static ursaConverters:ThicknessIncludeConverter.Left}}"
+                                Padding="{TemplateBinding Padding, Converter={iri:ThicknessMixerConverter Left}}"
                                 VerticalAlignment="Stretch"
                                 VerticalContentAlignment="Center"
                                 Foreground="{DynamicResource TextBoxInnerForeground}"
diff --git a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
index 050af3c..42d1a02 100644
--- a/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
+++ b/src/Ursa.Themes.Semi/Controls/MessageBox.axaml
@@ -2,7 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:u="https://irihi.tech/ursa"
-    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
+    xmlns:iri="https://irihi.tech/shared">
     <Design.PreviewWith>
         <StackPanel Margin="20">
             <u:MessageBoxControl
@@ -128,24 +128,24 @@
         </Setter>
         <Style Selector="^ /template/ Button#PART_CancelButton">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_NoButton">
             <Setter Property="Grid.Column" Value="1" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_YesButton">
             <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_OKButton">
             <Setter Property="Grid.Column" Value="3" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
@@ -282,24 +282,24 @@
         </Style>
         <Style Selector="^ /template/ Button#PART_CancelButton">
             <Setter Property="Grid.Column" Value="0" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_CANCEL}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_NoButton">
             <Setter Property="Grid.Column" Value="1" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Danger" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Danger" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_NO}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_YesButton">
             <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_YES}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
         <Style Selector="^ /template/ Button#PART_OKButton">
             <Setter Property="Grid.Column" Value="3" />
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
             <Setter Property="Content" Value="{DynamicResource STRING_MENU_DIALOG_OK}" />
             <Setter Property="Theme" Value="{DynamicResource SolidButton}" />
         </Style>
diff --git a/src/Ursa.Themes.Semi/Controls/PopConfirm.axaml b/src/Ursa.Themes.Semi/Controls/PopConfirm.axaml
index 849f658..fc86c79 100644
--- a/src/Ursa.Themes.Semi/Controls/PopConfirm.axaml
+++ b/src/Ursa.Themes.Semi/Controls/PopConfirm.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:u="https://irihi.tech/ursa"
-                    xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
+                    xmlns:iri="https://irihi.tech/shared">
     <ControlTheme x:Key="{x:Type u:PopConfirm}"
                   TargetType="u:PopConfirm">
         <Setter Property="Placement" Value="BottomEdgeAlignedLeft" />
@@ -99,11 +99,11 @@
         </Setter>
 
         <Style Selector="^ /template/ Button#PART_CancelButton">
-            <Setter Property="helpers:ClassHelper.Classes" Value="Tertiary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Tertiary" />
         </Style>
 
         <Style Selector="^ /template/ Button#PART_ConfirmButton">
-            <Setter Property="helpers:ClassHelper.Classes" Value="Primary" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Primary" />
         </Style>
 
         <Style Selector="^.Information">
diff --git a/src/Ursa.Themes.Semi/Styles/PinCode.axaml b/src/Ursa.Themes.Semi/Styles/PinCode.axaml
index 997cb60..a5f40e6 100644
--- a/src/Ursa.Themes.Semi/Styles/PinCode.axaml
+++ b/src/Ursa.Themes.Semi/Styles/PinCode.axaml
@@ -1,7 +1,7 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:u="https://irihi.tech/ursa"
-        xmlns:helpers="clr-namespace:Irihi.Avalonia.Shared.Helpers;assembly=Irihi.Avalonia.Shared">
+        xmlns:iri="https://irihi.tech/shared">
     <Style Selector="u|PinCode">
         <Style Selector="^ u|PinCodeItem:nth-last-child(n+2)">
             <Setter Property="Margin" Value="0 0 8 0" />
@@ -9,7 +9,7 @@
     </Style>
     <Style Selector="u|PinCode.Small">
         <Style Selector="^ u|PinCodeItem">
-            <Setter Property="helpers:ClassHelper.Classes" Value="Small" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Small" />
             <Style Selector="^:nth-last-child(n+2)">
                 <Setter Property="Margin" Value="0 0 6 0" />
             </Style>
@@ -17,7 +17,7 @@
     </Style>
     <Style Selector="u|PinCode.Large">
         <Style Selector="^ u|PinCodeItem">
-            <Setter Property="helpers:ClassHelper.Classes" Value="Large" />
+            <Setter Property="iri:ClassHelper.Classes" Value="Large" />
             <Style Selector="^:nth-last-child(n+2)">
                 <Setter Property="Margin" Value="0 0 12 0" />
             </Style>
diff --git a/src/Ursa/Converters/CornerRadiusConverter.cs b/src/Ursa/Converters/CornerRadiusConverter.cs
index 759a1c7..7a1fda9 100644
--- a/src/Ursa/Converters/CornerRadiusConverter.cs
+++ b/src/Ursa/Converters/CornerRadiusConverter.cs
@@ -4,6 +4,7 @@ using Avalonia.Data.Converters;
 
 namespace Ursa.Converters;
 
+[Obsolete("This converter is deprecated. Use CornerRadiusMixerConverter instead.")]
 [Flags]
 public enum CornerRadiusPosition
 {
@@ -17,6 +18,7 @@ public enum CornerRadiusPosition
     Bottom = 12,
 }
 
+[Obsolete("This converter is deprecated. Use CornerRadiusMixerConverter instead.")]
 public class CornerRadiusIncludeConverter(CornerRadiusPosition position) : IValueConverter
 {
     public static CornerRadiusIncludeConverter TopLeft { get; } = new( CornerRadiusPosition.TopLeft );
@@ -47,6 +49,7 @@ public class CornerRadiusIncludeConverter(CornerRadiusPosition position) : IValu
     }
 }
 
+[Obsolete("This converter is deprecated. Use CornerRadiusMixerConverter instead.")]
 public class CornerRadiusExcludeConverter : IValueConverter
 {
     public static CornerRadiusExcludeConverter TopLeft { get; } = new( CornerRadiusPosition.TopLeft );
diff --git a/src/Ursa/Converters/ThicknessConverter.cs b/src/Ursa/Converters/ThicknessConverter.cs
index 17616b0..4cce92c 100644
--- a/src/Ursa/Converters/ThicknessConverter.cs
+++ b/src/Ursa/Converters/ThicknessConverter.cs
@@ -4,6 +4,7 @@ using Avalonia.Data.Converters;
 
 namespace Ursa.Converters;
 
+[Obsolete("This converter is deprecated. Use ThicknessMixerConverter instead.")]
 [Flags]
 public enum ThicknessPosition
 {
@@ -17,6 +18,7 @@ public enum ThicknessPosition
     BottomRight = 12,
 }
 
+[Obsolete("This converter is deprecated. Use ThicknessMixerConverter instead.")]
 public class ThicknessExcludeConverter(ThicknessPosition position) : IValueConverter
 {
     public static ThicknessExcludeConverter Left { get; } = new( ThicknessPosition.Left );
@@ -48,6 +50,7 @@ public class ThicknessExcludeConverter(ThicknessPosition position) : IValueConve
     }
 }
 
+[Obsolete("This converter is deprecated. Use ThicknessMixerConverter instead.")]
 public class ThicknessIncludeConverter(ThicknessPosition position) : IValueConverter
 {
     public static ThicknessIncludeConverter Left { get; } = new( ThicknessPosition.Left );
diff --git a/src/Ursa/Ursa.csproj b/src/Ursa/Ursa.csproj
index 1cc157a..723b07e 100644
--- a/src/Ursa/Ursa.csproj
+++ b/src/Ursa/Ursa.csproj
@@ -15,8 +15,8 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
-        <PackageReference Include="Irihi.Avalonia.Shared" Version="0.2.3" />
-        <PackageReference Include="Irihi.Avalonia.Shared.Contracts" Version="0.2.3" />
+        <PackageReference Include="Irihi.Avalonia.Shared" Version="0.3.0" />
+        <PackageReference Include="Irihi.Avalonia.Shared.Contracts" Version="0.3.0" />
     </ItemGroup>
 
     <ItemGroup>