diff --git a/samples/FlyoutExample/FlyoutExample.csproj b/samples/FlyoutExample/FlyoutExample.csproj
index de770319..2f3c5760 100644
--- a/samples/FlyoutExample/FlyoutExample.csproj
+++ b/samples/FlyoutExample/FlyoutExample.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.4" />
-    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.28" />
+    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.7.1" />
+    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.29" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/NavigationViewExample/NavigationViewExample.csproj b/samples/NavigationViewExample/NavigationViewExample.csproj
index 459fade1..2f3c5760 100644
--- a/samples/NavigationViewExample/NavigationViewExample.csproj
+++ b/samples/NavigationViewExample/NavigationViewExample.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.5" />
+    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.7.1" />
     <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.29" />
   </ItemGroup>
 
diff --git a/samples/SettingsPageExample/SettingsPageExample.csproj b/samples/SettingsPageExample/SettingsPageExample.csproj
index d1428f4c..56663324 100644
--- a/samples/SettingsPageExample/SettingsPageExample.csproj
+++ b/samples/SettingsPageExample/SettingsPageExample.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.26.3" />
+    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.29" />
   </ItemGroup>
 
 </Project>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/App.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/App.xaml
index 8c3be20f..44b8ed9c 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/App.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/App.xaml
@@ -5,6 +5,7 @@
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Common"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:presets="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Presets"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
@@ -81,7 +82,7 @@
                 <Setter Property="sc:AutoPanningMode.IsEnabled" Value="True" />
             </Style>
 
-            <Style x:Key="OptionsPanelStyle" TargetType="ui:SimpleStackPanel">
+            <Style x:Key="OptionsPanelStyle" TargetType="ikw:SimpleStackPanel">
                 <Setter Property="Spacing" Value="12" />
                 <Style.Resources>
                     <Style BasedOn="{StaticResource {x:Type ComboBox}}" TargetType="ComboBox">
@@ -98,7 +99,7 @@
 
             <Thickness x:Key="ControlPageContentMargin">24,0,24,20</Thickness>
 
-            <Style x:Key="ControlPageContentPanelStyle" TargetType="ui:SimpleStackPanel">
+            <Style x:Key="ControlPageContentPanelStyle" TargetType="ikw:SimpleStackPanel">
                 <Setter Property="Margin" Value="{StaticResource ControlPageContentMargin}" />
                 <Setter Property="Spacing" Value="16" />
             </Style>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContentDialogTestContent.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContentDialogTestContent.xaml
index 5428d024..19ad1350 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContentDialogTestContent.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContentDialogTestContent.xaml
@@ -5,12 +5,12 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.ControlPages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
     <Grid Margin="12">
-        <ui:SimpleStackPanel
+        <ikw:SimpleStackPanel
             HorizontalAlignment="Left"
             VerticalAlignment="Center"
             Spacing="12">
@@ -18,7 +18,7 @@
             <Button Click="ShowParentedDialogPopup" Content="Show parented ContentDialog (Popup)" />
             <Button Click="ShowParentedDialogInPlace" Content="Show parented ContentDialog (InPlace)" />
             <Button Click="OpenNewWindow" Content="Open a new window" />
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
 
         <local:TestContentDialog x:Name="ParentedDialog" PrimaryButtonText="Toggle theme" />
     </Grid>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContentDialogTestWindow.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContentDialogTestWindow.xaml
index 0745fbaa..76345138 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContentDialogTestWindow.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContentDialogTestWindow.xaml
@@ -5,6 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     Title="Content Dialog Test Window"
     Width="800"
     Height="640"
@@ -12,12 +13,12 @@
     Background="{DynamicResource ApplicationPageBackgroundThemeBrush}"
     mc:Ignorable="d">
     <Grid>
-        <ui:SimpleStackPanel
+        <ikw:SimpleStackPanel
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Spacing="12">
             <Button Click="ShowDialogInThisWindow" Content="Show content dialog in this window" />
             <Button Click="ShowDialogInMainWindow" Content="Show content dialog in main window" />
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </Grid>
 </Window>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContextMenuPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContextMenuPage.xaml
index a87984e8..e5e8b112 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContextMenuPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContextMenuPage.xaml
@@ -6,10 +6,11 @@
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
 
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HeaderText="A ContextMenu with checkable MenuItems and Separator.">
             <Button Content="Options">
                 <Button.ContextMenu>
@@ -132,5 +133,5 @@
         <local:ControlExample HeaderText="Text control ContextMenu.">
             <TextBox MinWidth="150" Text="Some text" />
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ControlPaletteTestContent.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ControlPaletteTestContent.xaml
index c38f2563..acbda6b6 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ControlPaletteTestContent.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ControlPaletteTestContent.xaml
@@ -6,6 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     x:Name="Root"
     Foreground="{DynamicResource SystemControlPageTextBaseHighBrush}"
     mc:Ignorable="d">
@@ -26,7 +27,7 @@
             </Setter>
         </Style>
 
-        <Style TargetType="ui:SimpleStackPanel">
+        <Style TargetType="ikw:SimpleStackPanel">
             <Setter Property="Spacing" Value="12" />
         </Style>
     </UserControl.Resources>
@@ -43,7 +44,7 @@
         </Border>
 
         <HeaderedContentControl Header="Buttons">
-            <ui:SimpleStackPanel>
+            <ikw:SimpleStackPanel>
                 <Button x:Name="Button" Content="Enabled button" />
                 <Button Content="Disabled button" IsEnabled="False" />
                 <ToggleButton Content="Toggle button" />
@@ -53,11 +54,11 @@
                     Content="Disabled accent button"
                     IsEnabled="False"
                     Style="{DynamicResource AccentButtonStyle}" />
-            </ui:SimpleStackPanel>
+            </ikw:SimpleStackPanel>
         </HeaderedContentControl>
 
         <HeaderedContentControl Header="Checkbox">
-            <ui:SimpleStackPanel>
+            <ikw:SimpleStackPanel>
                 <CheckBox Content="Unchecked" />
                 <CheckBox Content="Checked" IsChecked="True" />
                 <CheckBox
@@ -68,11 +69,11 @@
                     Content="Disabled"
                     IsChecked="True"
                     IsEnabled="False" />
-            </ui:SimpleStackPanel>
+            </ikw:SimpleStackPanel>
         </HeaderedContentControl>
 
         <HeaderedContentControl Header="Radio button">
-            <ui:SimpleStackPanel>
+            <ikw:SimpleStackPanel>
                 <RadioButton
                     Content="Unchecked"
                     GroupName="Test1"
@@ -88,11 +89,11 @@
                     Initialized="RadioButton_Initialized"
                     IsChecked="True"
                     IsEnabled="False" />
-            </ui:SimpleStackPanel>
+            </ikw:SimpleStackPanel>
         </HeaderedContentControl>
 
         <HeaderedContentControl Header="Combo box">
-            <ui:SimpleStackPanel>
+            <ikw:SimpleStackPanel>
                 <ComboBox Width="200">
                     <ComboBoxItem Content="Item 1" IsSelected="True" />
                     <ComboBoxItem Content="Item 2" />
@@ -103,7 +104,7 @@
                     <ComboBoxItem Content="Editable item 2" />
                     <ComboBoxItem Content="Editable item 3" />
                 </ComboBox>
-            </ui:SimpleStackPanel>
+            </ikw:SimpleStackPanel>
         </HeaderedContentControl>
 
         <HeaderedContentControl Header="Textbox">
@@ -114,10 +115,10 @@
         </HeaderedContentControl>
 
         <HeaderedContentControl Header="Toggle switch">
-            <ui:SimpleStackPanel>
+            <ikw:SimpleStackPanel>
                 <ui:ToggleSwitch IsOn="False" />
                 <ui:ToggleSwitch IsOn="True" />
-            </ui:SimpleStackPanel>
+            </ikw:SimpleStackPanel>
         </HeaderedContentControl>
 
         <HeaderedContentControl Header="Slider">
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/DataGridPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/DataGridPage.xaml
index e3a9cc5c..ad035f6e 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/DataGridPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/DataGridPage.xaml
@@ -7,6 +7,7 @@
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
 
@@ -141,7 +142,7 @@
             </local:ControlExample.Example>
             <local:ControlExample.Options>
                 <ui:ScrollViewerEx Width="300" Margin="-16">
-                    <ui:SimpleStackPanel Margin="16" Style="{StaticResource OptionsPanelStyle}">
+                    <ikw:SimpleStackPanel Margin="16" Style="{StaticResource OptionsPanelStyle}">
                         <TextBlock
                             x:Name="LoadTimeTextBlock"
                             MouseLeftButtonUp="LoadTimeTextBlock_MouseLeftButtonUp"
@@ -204,7 +205,7 @@
                             ui:ControlHelper.Header="SelectionMode"
                             ItemsSource="{Binding Source={x:Type DataGridSelectionMode}, Converter={StaticResource EnumValuesConverter}}"
                             SelectedItem="{Binding ElementName=dataGrid, Path=SelectionMode}" />
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
                 </ui:ScrollViewerEx>
             </local:ControlExample.Options>
         </local:ControlExample>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/DatePickerPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/DatePickerPage.xaml
index f9715ed3..5bc0caeb 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/DatePickerPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/DatePickerPage.xaml
@@ -5,11 +5,12 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
 
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HeaderText="DatePicker with a header and placeholder text.">
             <local:ControlExample.Example>
                 <DatePicker
@@ -19,7 +20,7 @@
                     ui:ControlHelper.PlaceholderText="Pick a date" />
             </local:ControlExample.Example>
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <TextBox ui:ControlHelper.Header="Header" Text="{Binding ElementName=datePicker, Path=(ui:ControlHelper.Header), UpdateSourceTrigger=PropertyChanged}" />
 
                     <TextBox ui:ControlHelper.Header="PlaceholderText" Text="{Binding ElementName=datePicker, Path=(ui:ControlHelper.PlaceholderText), UpdateSourceTrigger=PropertyChanged}" />
@@ -37,9 +38,9 @@
                     <Button Click="BlackoutDatesInPast" Content="Blackout dates in the past" />
 
                     <CheckBox Content="IsEnabled" IsChecked="{Binding ElementName=datePicker, Path=IsEnabled}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/FlyoutPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/FlyoutPage.xaml
index d6cea9bf..2a4ffff4 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/FlyoutPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/FlyoutPage.xaml
@@ -5,6 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     Title="Flyout"
@@ -32,12 +33,12 @@
                 </ui:FlyoutService.Flyout>
             </Button>
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <ui:RadioButtons
                         Header="Placement"
                         ItemsSource="{Binding Source={x:Type ui:FlyoutPlacementMode}, Converter={StaticResource EnumValuesConverter}}"
                         SelectedItem="{Binding ElementName=Flyout1, Path=Placement}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
             <local:ControlExample.Xaml>
                 <sys:String xml:space="preserve">
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/GridSplitterPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/GridSplitterPage.xaml
index c1e85a35..1c753db3 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/GridSplitterPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/GridSplitterPage.xaml
@@ -5,10 +5,11 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
 
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HorizontalContentAlignment="Stretch" HeaderText="A simple GridSplitter.">
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -34,10 +35,10 @@
                     Text="Column 2" />
             </Grid>
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <CheckBox Content="ShowsPreview" IsChecked="{Binding ElementName=ColumnGridSplitter, Path=ShowsPreview}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/GroupBoxPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/GroupBoxPage.xaml
index 946d0aa1..9e17aa25 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/GroupBoxPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/GroupBoxPage.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.ControlPages"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
@@ -21,7 +22,7 @@
         </Style>
     </Page.Resources>
 
-    <ui:SimpleStackPanel
+    <ikw:SimpleStackPanel
         Width="404"
         HorizontalAlignment="Left"
         Spacing="0">
@@ -64,5 +65,5 @@
                 </ComboBox>
             </StackPanel>
         </GroupBox>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/InfoBadgePage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/InfoBadgePage.xaml
index 9b638c38..ed084fbe 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/InfoBadgePage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/InfoBadgePage.xaml
@@ -6,6 +6,7 @@
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     Title="InfoBadge Page"
     d:DesignHeight="450"
@@ -101,7 +102,7 @@
             HorizontalContentAlignment="Stretch"
             HeaderText="Different InfoBadge Styles">
             <local:ControlExample.Example>
-                <ui:SimpleStackPanel
+                <ikw:SimpleStackPanel
                     HorizontalAlignment="Center"
                     Orientation="Horizontal"
                     Spacing="20">
@@ -118,7 +119,7 @@
                         x:Name="infoBadge4"
                         VerticalAlignment="Center"
                         Style="{DynamicResource AttentionDotInfoBadgeStyle}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
 
             </local:ControlExample.Example>
             <local:ControlExample.Options>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ItemsRepeaterPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ItemsRepeaterPage.xaml
index 7ca09244..d7e78d9e 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ItemsRepeaterPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ItemsRepeaterPage.xaml
@@ -5,6 +5,7 @@
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Common"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:l="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.ControlPages"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
@@ -201,7 +202,7 @@
         </TabControl.Resources>
 
         <TabItem Header="Overview">
-            <ui:SimpleStackPanel Spacing="16">
+            <ikw:SimpleStackPanel Spacing="16">
                 <local:ControlExample HeaderText="Basic, non-interactive items laid out by ItemsRepeater">
                     <ui:ItemsRepeaterScrollHost MaxHeight="500">
                         <ui:ScrollViewerEx HorizontalScrollBarVisibility="Auto">
@@ -212,7 +213,7 @@
                         </ui:ScrollViewerEx>
                     </ui:ItemsRepeaterScrollHost>
                     <local:ControlExample.Options>
-                        <ui:SimpleStackPanel Spacing="12">
+                        <ikw:SimpleStackPanel Spacing="12">
                             <Button
                                 x:Name="AddBtn"
                                 MinWidth="150"
@@ -244,7 +245,7 @@
                                 Content="UniformGridLayout"
                                 GroupName="Sample1Layouts"
                                 Tag="UniformGridLayout" />
-                        </ui:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </local:ControlExample.Options>
                 </local:ControlExample>
 
@@ -271,7 +272,7 @@
                     </ui:ItemsRepeaterScrollHost>
 
                     <local:ControlExample.Options>
-                        <ui:SimpleStackPanel Spacing="12">
+                        <ikw:SimpleStackPanel Spacing="12">
                             <RadioButton
                                 Click="LayoutBtn_Click"
                                 Content="Uniform grid"
@@ -283,7 +284,7 @@
                                 GroupName="Sample2Layouts"
                                 IsChecked="True"
                                 Tag="MyFeedLayout" />
-                        </ui:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </local:ControlExample.Options>
                 </local:ControlExample>
 
@@ -316,7 +317,7 @@
                     </ui:ItemsRepeater>
                 </local:ControlExample>
 
-            </ui:SimpleStackPanel>
+            </ikw:SimpleStackPanel>
         </TabItem>
 
         <TabItem Header="StackLayout">
@@ -336,7 +337,7 @@
                 </ui:ItemsRepeaterScrollHost>
 
                 <local:ControlExample.Options>
-                    <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                    <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                         <ui:NumberBox Header="Spacing" Value="{Binding Source={StaticResource stackLayout}, Path=Spacing, Converter={StaticResource SpacingConverter}}" />
                         <Button
                             x:Name="changeFirstItemButton"
@@ -346,7 +347,7 @@
                             x:Name="modifyFirstItemButton"
                             Click="ModifyFirstItemButton_Click"
                             Content="Modify first item" />
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
                 </local:ControlExample.Options>
             </local:ControlExample>
         </TabItem>
@@ -384,7 +385,7 @@
 
                 <local:ControlExample.Options>
                     <ui:ScrollViewerEx Margin="-16">
-                        <ui:SimpleStackPanel Margin="16" Style="{StaticResource OptionsPanelStyle}">
+                        <ikw:SimpleStackPanel Margin="16" Style="{StaticResource OptionsPanelStyle}">
                             <ui:NumberBox Header="MinItemWidth" Value="{Binding Source={StaticResource uniformGridLayout}, Path=MinItemWidth}" />
                             <ui:NumberBox Header="MinItemHeight" Value="{Binding Source={StaticResource uniformGridLayout}, Path=MinItemHeight}" />
                             <ui:NumberBox Header="MinRowSpacing" Value="{Binding Source={StaticResource uniformGridLayout}, Path=MinRowSpacing}" />
@@ -405,7 +406,7 @@
                                 Header="Orientation"
                                 ItemsSource="{Binding Source={x:Type Orientation}, Converter={StaticResource EnumValuesConverter}}"
                                 SelectedItem="{Binding Source={StaticResource uniformGridLayout}, Path=Orientation}" />
-                        </ui:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </ui:ScrollViewerEx>
                 </local:ControlExample.Options>
             </local:ControlExample>
@@ -440,7 +441,7 @@
 
                 <local:ControlExample.Options>
                     <ui:ScrollViewerEx Margin="-16">
-                        <ui:SimpleStackPanel Margin="16" Style="{StaticResource OptionsPanelStyle}">
+                        <ikw:SimpleStackPanel Margin="16" Style="{StaticResource OptionsPanelStyle}">
                             <ui:RadioButtons
                                 Header="Orientation"
                                 ItemsSource="{Binding Source={x:Type Orientation}, Converter={StaticResource EnumValuesConverter}}"
@@ -451,7 +452,7 @@
                                 Header="LineAlignment"
                                 ItemsSource="{Binding Source={x:Type ui:FlowLayoutLineAlignment}, Converter={StaticResource EnumValuesConverter}}"
                                 SelectedItem="{Binding Source={StaticResource flowLayout}, Path=LineAlignment}" />
-                        </ui:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
                     </ui:ScrollViewerEx>
                 </local:ControlExample.Options>
             </local:ControlExample>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ListViewPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ListViewPage.xaml
index 36e3b835..23cb678f 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ListViewPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ListViewPage.xaml
@@ -5,6 +5,7 @@
     xmlns:cm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
     xmlns:controlpages="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.ControlPages"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
@@ -77,14 +78,14 @@
                     VirtualizingPanel.VirtualizationMode="Recycling" />
 
                 <local:ControlExample.Options>
-                    <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                    <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                         <sc:LayoutDensitySelector TargetElement="{Binding Source={x:Reference listView1}}" />
                         <ui:RadioButtons
                             Header="SelectionMode"
                             ItemsSource="{Binding Source={x:Type SelectionMode}, Converter={StaticResource EnumValuesConverter}}"
                             SelectedItem="{Binding Source={x:Reference listView1}, Path=SelectionMode}" />
                         <CheckBox Content="IsEnabled" IsChecked="{Binding Source={x:Reference listView1}, Path=IsEnabled}" />
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
                 </local:ControlExample.Options>
             </local:ControlExample>
         </TabItem>
@@ -109,14 +110,14 @@
                 </ListView>
 
                 <local:ControlExample.Options>
-                    <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                    <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                         <!--<controls:LayoutDensitySelector TargetElement="{Binding Source={x:Reference listView2}}" />-->
                         <!--<ui:RadioButtons
                                 Header="SelectionMode"
                                 ItemsSource="{Binding Source={x:Type SelectionMode}, Converter={StaticResource EnumValuesConverter}}"
                                 SelectedItem="{Binding Source={x:Reference listView2}, Path=SelectionMode}" />-->
                         <CheckBox Content="IsEnabled" IsChecked="{Binding Source={x:Reference listView2}, Path=IsEnabled}" />
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
                 </local:ControlExample.Options>
             </local:ControlExample>
         </TabItem>
@@ -156,7 +157,7 @@
                 </ListView>
 
                 <local:ControlExample.Options>
-                    <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                    <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                         <CheckBox Content="AllowsColumnReorder" IsChecked="{Binding Source={x:Reference gridView}, Path=AllowsColumnReorder}" />
                         <sc:LayoutDensitySelector TargetElement="{Binding Source={x:Reference listView3}}" />
                         <!--<ui:RadioButtons
@@ -164,7 +165,7 @@
                                 ItemsSource="{Binding Source={x:Type SelectionMode}, Converter={StaticResource EnumValuesConverter}}"
                                 SelectedItem="{Binding Source={x:Reference listView3}, Path=SelectionMode}" />-->
                         <CheckBox Content="IsEnabled" IsChecked="{Binding Source={x:Reference listView3}, Path=IsEnabled}" />
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
                 </local:ControlExample.Options>
             </local:ControlExample>
         </TabItem>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/MenuPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/MenuPage.xaml
index 2a1e5bed..be15b098 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/MenuPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/MenuPage.xaml
@@ -5,9 +5,10 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HeaderText="A simple Menu">
             <Menu>
                 <MenuItem Header="File">
@@ -93,5 +94,5 @@
                 </MenuItem>
             </Menu>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/NumberBoxPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/NumberBoxPage.xaml
index 13af7f40..10335908 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/NumberBoxPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/NumberBoxPage.xaml
@@ -4,10 +4,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HeaderText="A NumberBox that evaluates expressions.">
             <ui:NumberBox
                 AcceptsExpression="True"
@@ -26,12 +27,12 @@
                 Value="10" />
 
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <ui:RadioButtons Header="SpinButton Placement" SelectedItem="{Binding ElementName=NumberBoxSpinButtonPlacementExample, Path=SpinButtonPlacementMode}">
                         <ui:NumberBoxSpinButtonPlacementMode>Inline</ui:NumberBoxSpinButtonPlacementMode>
                         <ui:NumberBoxSpinButtonPlacementMode>Compact</ui:NumberBoxSpinButtonPlacementMode>
                     </ui:RadioButtons>
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
         </local:ControlExample>
 
@@ -54,7 +55,7 @@
                 SpinButtonPlacementMode="Compact" />
 
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <ui:NumberBox Header="Minimum" Value="{Binding ElementName=NumberBox1, Path=Minimum}" />
                     <ui:NumberBox Header="Maximum" Value="{Binding ElementName=NumberBox1, Path=Maximum}" />
                     <ui:NumberBox
@@ -100,8 +101,8 @@
                         SpinButtonPlacementMode="Inline"
                         ValueChanged="PopupVerticalOffset_ValueChanged"
                         Value="{DynamicResource NumberBoxPopupVerticalOffset}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PasswordBoxPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PasswordBoxPage.xaml
index c10d3b9d..5ddf5ec4 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PasswordBoxPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PasswordBoxPage.xaml
@@ -3,11 +3,12 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HeaderText="A simple PasswordBox.">
             <PasswordBox Width="300" />
         </local:ControlExample>
@@ -21,13 +22,13 @@
                 PasswordChar="#" />
 
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <ui:RadioButtons
                         Header="PasswordRevealMode"
                         ItemsSource="{Binding Source={x:Type ui:PasswordRevealMode}, Converter={StaticResource EnumValuesConverter}}"
                         SelectedItem="{Binding ElementName=passwordBox, Path=(ui:PasswordBoxHelper.PasswordRevealMode)}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PersonPicturePage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PersonPicturePage.xaml
index c8e87c86..aaa8e030 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PersonPicturePage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PersonPicturePage.xaml
@@ -4,10 +4,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample x:Name="Example1" HeaderText="Select different looks for the person picture.">
 
             <local:ControlExample.Example>
@@ -52,7 +53,7 @@
             </local:ControlExample.Example>
 
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <TextBox ui:ControlHelper.Header="BadgeGlyph" Text="{Binding ElementName=personPicture2, Path=BadgeGlyph, UpdateSourceTrigger=PropertyChanged}" />
                     <ui:NumberBox
                         Header="BadgeNumber"
@@ -66,8 +67,8 @@
                         x:Name="ProfileImageCheck"
                         Content="Profile Image"
                         IsChecked="True" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PivotPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PivotPage.xaml
index 93cca53d..2f5ca5ab 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PivotPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PivotPage.xaml
@@ -4,10 +4,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample Margin="0,0,24,0" HeaderText="A basic pivot.">
             <TabControl
                 MinHeight="400"
@@ -27,5 +28,5 @@
                 </TabItem>
             </TabControl>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PopupPlacementPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PopupPlacementPage.xaml
index 145d2cf7..bd57a006 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PopupPlacementPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/PopupPlacementPage.xaml
@@ -4,10 +4,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HeaderText="Popup placement">
             <Grid>
                 <ToggleButton
@@ -34,13 +35,13 @@
                 </Popup>
             </Grid>
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <ui:RadioButtons
                         Header="Placement"
                         ItemsSource="{Binding Source={x:Type PlacementMode}, Converter={StaticResource EnumValuesConverter}}"
                         SelectedItem="{Binding ElementName=Popup1, Path=Placement}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ProgressBarPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ProgressBarPage.xaml
index a6873dd0..e9ec868c 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ProgressBarPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ProgressBarPage.xaml
@@ -7,8 +7,9 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     mc:Ignorable="d">
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HeaderText="An indeterminate progress bar.">
             <ui:ProgressBar
                 Width="130"
@@ -78,5 +79,5 @@
                     OnContent="Working" />
             </local:ControlExample.Options>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/RadioButtonsPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/RadioButtonsPage.xaml
index 07c4cfea..d082c325 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/RadioButtonsPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/RadioButtonsPage.xaml
@@ -4,11 +4,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HeaderText="A group of radio buttons.">
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -61,5 +62,5 @@
                     BorderThickness="10" />
             </StackPanel>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/RatingControlPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/RatingControlPage.xaml
index aea67601..2b579340 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/RatingControlPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/RatingControlPage.xaml
@@ -4,10 +4,11 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample x:Name="Example1" HeaderText="A simple RatingControl">
 
             <StackPanel VerticalAlignment="Top">
@@ -65,5 +66,5 @@
             </local:ControlExample.Options>
 
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/RichEditBoxPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/RichEditBoxPage.xaml
index 0becb937..d9e7fdee 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/RichEditBoxPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/RichEditBoxPage.xaml
@@ -4,13 +4,14 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
 
     <ScrollViewer>
-        <ui:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
+        <ikw:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
             <sc:ControlExample HeaderText="A simple text editor using RichTextBox.">
                 <RichTextBox
                     x:Name="richTextBox"
@@ -26,7 +27,7 @@
                     Height="105"
                     ui:ControlHelper.Header="Control header" />
                 <sc:ControlExample.Options>
-                    <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                    <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                         <CheckBox Content="AcceptsReturn" IsChecked="{Binding ElementName=textBox, Path=AcceptsReturn}" />
                         <CheckBox Content="IsReadOnly" IsChecked="{Binding ElementName=textBox, Path=IsReadOnly}" />
                         <CheckBox Content="IsReadOnlyCaretVisible" IsChecked="{Binding ElementName=textBox, Path=IsReadOnlyCaretVisible}" />
@@ -51,9 +52,9 @@
                             <sys:Double>0.4</sys:Double>
                             <sys:Double>1</sys:Double>
                         </ComboBox>
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
                 </sc:ControlExample.Options>
             </sc:ControlExample>
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </ScrollViewer>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ShadowPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ShadowPage.xaml
index bf595cc3..36558d83 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ShadowPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ShadowPage.xaml
@@ -4,11 +4,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
 
-    <ui:SimpleStackPanel Margin="{StaticResource ControlPageContentMargin}">
+    <ikw:SimpleStackPanel Margin="{StaticResource ControlPageContentMargin}">
         <sc:ControlExample
             HorizontalContentAlignment="Stretch"
             VerticalContentAlignment="Stretch"
@@ -30,7 +31,7 @@
             </Border>
 
             <sc:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <Slider
                         x:Name="DepthSlider"
                         ui:ControlHelper.Header="Depth"
@@ -40,8 +41,8 @@
                         Minimum="1"
                         Ticks="1,2,3,4,6,8,9,12,16,24,32,40,48,64,80,96"
                         Value="32" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </sc:ControlExample.Options>
         </sc:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/SliderPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/SliderPage.xaml
index b493a6ce..2050dd86 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/SliderPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/SliderPage.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
@@ -18,7 +19,7 @@
     </Page.Resources>
 
     <ScrollViewer>
-        <ui:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
+        <ikw:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
             <sc:ControlExample x:Name="Example1" HeaderText="A simple Slider.">
                 <StackPanel Orientation="Horizontal">
                     <Slider
@@ -98,7 +99,7 @@
                 </Grid>
 
                 <sc:ControlExample.Options>
-                    <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                    <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                         <CheckBox Content="IsSnapToTickEnabled" IsChecked="{Binding ElementName=slider, Path=IsSnapToTickEnabled}" />
                         <CheckBox
                             Content="IsSelectionRangeEnabled"
@@ -118,9 +119,9 @@
                             Header="Orientation"
                             ItemsSource="{Binding Source={x:Type Orientation}, Converter={StaticResource EnumValuesConverter}}"
                             SelectedItem="{Binding ElementName=slider, Path=Orientation}" />
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
                 </sc:ControlExample.Options>
             </sc:ControlExample>
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </ScrollViewer>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/SplitViewPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/SplitViewPage.xaml
index bd3ec273..5d1ce594 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/SplitViewPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/SplitViewPage.xaml
@@ -2,6 +2,7 @@
     x:Class="iNKORE.UI.WPF.Modern.Gallery.ControlPages.SplitViewPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.ControlPages"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
@@ -22,7 +23,7 @@
     </Page.Resources>
 
     <ScrollViewer>
-        <ui:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
+        <ikw:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
             <sc:ControlExample HeaderText="A basic SplitView.">
 
                 <Grid Height="300" VerticalAlignment="Top">
@@ -154,7 +155,7 @@
                     </StackPanel>
                 </sc:ControlExample.Options>
             </sc:ControlExample>
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup>
                 <VisualState x:Name="SystemControlBackgroundChromeMediumLowBrush" />
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/StackPanelPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/StackPanelPage.xaml
index 4a3e00c4..5728ba77 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/StackPanelPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/StackPanelPage.xaml
@@ -4,41 +4,42 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
     <ScrollViewer>
-        <ui:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
+        <ikw:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
             <sc:ControlExample x:Name="Example1" HeaderText="A SimpleStackPanel control.">
 
-                <ui:SimpleStackPanel
+                <ikw:SimpleStackPanel
                     x:Name="Control1"
                     VerticalAlignment="Top"
                     Orientation="Vertical">
-                    <ui:SimpleStackPanel.Resources>
+                    <ikw:SimpleStackPanel.Resources>
                         <Style TargetType="Rectangle">
                             <Setter Property="Height" Value="40" />
                             <Setter Property="Width" Value="40" />
                         </Style>
-                    </ui:SimpleStackPanel.Resources>
+                    </ikw:SimpleStackPanel.Resources>
                     <Rectangle Fill="Red" />
                     <Rectangle Fill="Blue" />
                     <Rectangle Fill="Green" />
                     <Rectangle Fill="Yellow" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
 
                 <sc:ControlExample.Options>
-                    <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                    <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                         <ui:RadioButtons ItemsSource="{Binding Source={x:Type Orientation}, Converter={StaticResource EnumValuesConverter}}" SelectedItem="{Binding ElementName=Control1, Path=Orientation}" />
                         <ui:NumberBox
                             Header="Spacing"
                             Minimum="0"
                             SpinButtonPlacementMode="Inline"
                             Value="{Binding ElementName=Control1, Path=Spacing}" />
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
                 </sc:ControlExample.Options>
 
             </sc:ControlExample>
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </ScrollViewer>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/StatusBarPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/StatusBarPage.xaml
index eba64206..6573c9d4 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/StatusBarPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/StatusBarPage.xaml
@@ -4,11 +4,12 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
 
-    <ui:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
+    <ikw:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
         <sc:ControlExample HeaderText="A StatusBar.">
             <StatusBar x:Name="statusBar" VerticalAlignment="Bottom">
                 <StatusBarItem>
@@ -51,5 +52,5 @@
                 <CheckBox Content="IsEnabled" IsChecked="{Binding ElementName=statusBar, Path=IsEnabled}" />
             </sc:ControlExample.Options>
         </sc:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TabViewPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TabViewPage.xaml
index 36788dfb..5a1eecc7 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TabViewPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TabViewPage.xaml
@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
@@ -15,7 +16,7 @@
         </Style>
     </Page.Resources>
 
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HeaderText="A basic TabControl">
             <TabControl x:Name="tabControl">
                 <ui:TabControlHelper.TabStripHeader>
@@ -37,13 +38,13 @@
             </TabControl>
 
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <ui:RadioButtons
                         Header="TabStripPlacement"
                         ItemsSource="{Binding Source={x:Type Dock}, Converter={StaticResource EnumValuesConverter}}"
                         SelectedItem="{Binding ElementName=tabControl, Path=TabStripPlacement}" />
                     <CheckBox x:Name="ShowHeaderAndFooterCheckBox" Content="Show header and footer" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
         </local:ControlExample>
 
@@ -145,5 +146,5 @@
                 </TabControl.ItemContainerStyle>
             </TabControl>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TestContentDialog.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TestContentDialog.xaml
index ea9dea80..c7baf263 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TestContentDialog.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TestContentDialog.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     x:Name="dialog"
@@ -20,7 +21,7 @@
     SecondaryButtonText="No"
     Style="{StaticResource ScrollableContentDialogStyle}"
     mc:Ignorable="d">
-    <ui:SimpleStackPanel Spacing="12">
+    <ikw:SimpleStackPanel Spacing="12">
         <TextBox
             ui:ControlHelper.Header="Title"
             AcceptsReturn="True"
@@ -43,5 +44,5 @@
                 Style="{StaticResource BodyTextBlockStyle}"
                 Visibility="Collapsed" />
         </StackPanel>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:ContentDialog>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TextBoxPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TextBoxPage.xaml
index ec73691b..bcfab6f0 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TextBoxPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TextBoxPage.xaml
@@ -3,12 +3,13 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample x:Name="Example1" HeaderText="A simple TextBox.">
             <TextBox AutomationProperties.Name="simple TextBox" />
         </local:ControlExample>
@@ -52,7 +53,7 @@
                     Collapsed="OptionsExpander_Collapsed"
                     Expanded="OptionsExpander_Expanded"
                     Header="Show options">
-                    <ui:SimpleStackPanel Margin="0,12,0,0" Style="{StaticResource OptionsPanelStyle}">
+                    <ikw:SimpleStackPanel Margin="0,12,0,0" Style="{StaticResource OptionsPanelStyle}">
                         <Button Click="ClearClipboard" Content="Clear clipboard" />
                         <CheckBox Content="AcceptsReturn" IsChecked="{Binding ElementName=textBox, Path=AcceptsReturn}" />
                         <CheckBox Content="IsReadOnly" IsChecked="{Binding ElementName=textBox, Path=IsReadOnly}" />
@@ -81,9 +82,9 @@
                             <sys:Double>0.4</sys:Double>
                             <sys:Double>1</sys:Double>
                         </ComboBox>
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
                 </Expander>
             </local:ControlExample.Options>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ThemesPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ThemesPage.xaml
index f6e5c49f..470b36c4 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ThemesPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ThemesPage.xaml
@@ -5,6 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:presets="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Presets"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
@@ -16,7 +17,7 @@
     </Page.Resources>
 
     <ScrollViewer>
-        <ui:SimpleStackPanel Margin="{StaticResource ControlPageContentMargin}" Spacing="24">
+        <ikw:SimpleStackPanel Margin="{StaticResource ControlPageContentMargin}" Spacing="24">
 
             <ui:RadioButtons Header="Theme Mode" SelectedItem="{Binding Source={x:Static sc:ThemeManagerProxy.Current}, Path=ApplicationTheme, Converter={StaticResource AppThemeConverter}}">
                 <ui:RadioButtons.ItemsSource>
@@ -96,7 +97,7 @@
                 <GroupBox.Resources>
                     <Thickness x:Key="GroupBoxHeaderMargin">24,4,24,20</Thickness>
                 </GroupBox.Resources>
-                <ui:SimpleStackPanel Spacing="24">
+                <ikw:SimpleStackPanel Spacing="24">
                     <TextBox
                         Width="{StaticResource ItemWidth}"
                         HorizontalAlignment="Left"
@@ -130,8 +131,8 @@
                         Header="High contrast"
                         IsEnabled="False"
                         IsOn="{Binding Path=(SystemParameters.HighContrast), Mode=OneWay}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </GroupBox>
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </ScrollViewer>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ThreadedUIPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ThreadedUIPage.xaml
index c86ae923..70e154d7 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ThreadedUIPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ThreadedUIPage.xaml
@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.ControlPages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
@@ -11,7 +12,7 @@
     mc:Ignorable="d">
 
     <ScrollViewer>
-        <ui:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
+        <ikw:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
             <sc:ControlExample
                 x:Name="ProgressBarExample"
                 VerticalContentAlignment="Center"
@@ -23,15 +24,15 @@
                     Visibility="{Binding IsVisible, Converter={StaticResource BooleanToVisibilityConverter}}" />
 
                 <sc:ControlExample.Options>
-                    <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                    <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                         <CheckBox Content="IsBusy" IsChecked="{Binding IsBusy}" />
                         <CheckBox Content="IsVisible" IsChecked="{Binding IsVisible}" />
                         <Button Click="LoadOrUnload" Content="Unload" />
                         <Button Click="ToggleChildType" Content="Toggle ChildType" />
                         <Button Click="BlockMainThread" Content="Block main thread" />
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
                 </sc:ControlExample.Options>
             </sc:ControlExample>
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </ScrollViewer>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ToggleSwitchPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ToggleSwitchPage.xaml
index bb3060ff..654a48a1 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ToggleSwitchPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ToggleSwitchPage.xaml
@@ -5,9 +5,10 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HeaderText="A simple ToggleSwitch.">
             <ui:ToggleSwitch AutomationProperties.Name="simple ToggleSwitch" />
         </local:ControlExample>
@@ -24,13 +25,13 @@
             </StackPanel>
 
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <CheckBox Content="IsOn" IsChecked="{Binding ElementName=toggleSwitch, Path=IsOn}" />
                     <TextBox ui:ControlHelper.Header="Header" Text="{Binding ElementName=toggleSwitch, Path=Header, UpdateSourceTrigger=PropertyChanged}" />
                     <TextBox ui:ControlHelper.Header="OnContent" Text="{Binding ElementName=toggleSwitch, Path=OnContent, UpdateSourceTrigger=PropertyChanged}" />
                     <TextBox ui:ControlHelper.Header="OffContent" Text="{Binding ElementName=toggleSwitch, Path=OffContent, UpdateSourceTrigger=PropertyChanged}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ToolTipPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ToolTipPage.xaml
index eb66e90a..57bb8bd8 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ToolTipPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ToolTipPage.xaml
@@ -4,12 +4,13 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
 
     <ScrollViewer>
-        <ui:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
+        <ikw:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
             <sc:ControlExample HeaderText="A button with a simple ToolTip.">
                 <Button Content="Button with a simple ToolTip." ToolTip="Simple ToolTip" />
             </sc:ControlExample>
@@ -40,6 +41,6 @@
                     </Image>
                 </sc:ControlExample.Example>
             </sc:ControlExample>
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </ScrollViewer>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TreeViewPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TreeViewPage.xaml
index 33f97ef7..d9685f46 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TreeViewPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/TreeViewPage.xaml
@@ -5,6 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.ControlPages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
@@ -33,7 +34,7 @@
     </Page.Resources>
 
     <ScrollViewer>
-        <ui:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
+        <ikw:SimpleStackPanel Style="{StaticResource ControlPageContentPanelStyle}">
             <sc:ControlExample HeaderText="A simple TreeView">
                 <Border
                     Height="400"
@@ -118,6 +119,6 @@
                     </Border>
                 </sc:ControlExample.Example>
             </sc:ControlExample>
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </ScrollViewer>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/WindowPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/WindowPage.xaml
index 57e6d8f6..4759ab92 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/WindowPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/WindowPage.xaml
@@ -5,11 +5,12 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     DataContext="{Binding RelativeSource={RelativeSource AncestorType=Window}}"
     mc:Ignorable="d">
 
     <ScrollViewer>
-        <ui:SimpleStackPanel Margin="{StaticResource ControlPageContentMargin}" Spacing="24">
+        <ikw:SimpleStackPanel Margin="{StaticResource ControlPageContentMargin}" Spacing="24">
 
             <CheckBox Content="Use modern window style" IsChecked="{Binding Path=(ui:WindowHelper.UseModernWindowStyle)}" />
 
@@ -35,11 +36,11 @@
             </ui:DropDownButton>
 
             <GroupBox Header="Title Bar">
-                <ui:SimpleStackPanel Spacing="12">
+                <ikw:SimpleStackPanel Spacing="12">
                     <Button Click="OpenWindow" Content="Open window with custom title bar" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </GroupBox>
 
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </ScrollViewer>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/Controls/ControlExample.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/Controls/ControlExample.xaml
index da2096da..bc6742cc 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/Controls/ControlExample.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/Controls/ControlExample.xaml
@@ -5,6 +5,7 @@
     xmlns:controls="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Controls"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     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">
 
     <common:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
@@ -145,7 +146,7 @@
                                     </StackPanel>
                                 </Expander>
 
-                                <ui:SimpleStackPanel
+                                <ikw:SimpleStackPanel
                                     x:Name="ScreenshotControls"
                                     Grid.Row="2"
                                     Margin="0,6,0,0"
@@ -176,7 +177,7 @@
                                         x:Name="ControlPaddingBox"
                                         Width="150"
                                         AutomationProperties.LabeledBy="{Binding ElementName=PaddingLabel}" />
-                                </ui:SimpleStackPanel>
+                                </ikw:SimpleStackPanel>
                             </Grid>
                         </Border>
                         <VisualStateManager.VisualStateGroups>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/Controls/UserControls/DocumentationPromotion.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/Controls/UserControls/DocumentationPromotion.xaml
index 0e337338..9fceb3c8 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/Controls/UserControls/DocumentationPromotion.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/Controls/UserControls/DocumentationPromotion.xaml
@@ -3,7 +3,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Controls.UserControls" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+             xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Controls.UserControls" 
+             xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+             xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
              d:DesignWidth="640"
              mc:Ignorable="d" >
     <Grid>
@@ -18,13 +20,13 @@
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
 
-                <ui:SimpleStackPanel Orientation="Horizontal" Spacing="8" TextElement.Foreground="{DynamicResource {x:Static ui:ThemeKeys.AccentTextFillColorPrimaryBrushKey}}"
+                <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="8" TextElement.Foreground="{DynamicResource {x:Static ui:ThemeKeys.AccentTextFillColorPrimaryBrushKey}}"
                                                      Margin="0,3,0,0">
                     <ui:FontIcon Icon="{x:Static ui:FluentSystemIcons.TextBulletListSquareEdit_24_Regular}" FontSize="24"/>
                     <TextBlock FontSize="16" VerticalAlignment="Center" FontWeight="SemiBold">It's time for a brand-new docmentation set!</TextBlock>
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
 
-                <ui:SimpleStackPanel Orientation="Vertical" Spacing="12" Grid.Row="1" Margin="5,10">
+                <ikw:SimpleStackPanel Orientation="Vertical" Spacing="12" Grid.Row="1" Margin="5,10">
                     <FrameworkElement.Resources>
                         <Style TargetType="TextBlock">
                             <Setter Property="LineHeight" Value="21"/>
@@ -50,9 +52,9 @@
                                         <Run>to hang out with us.</Run>
                     </TextBlock>
                     <Separator Opacity="0.2"/>
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
 
-                <ui:SimpleStackPanel Grid.Row="3" Orientation="Horizontal" Spacing="10">
+                <ikw:SimpleStackPanel Grid.Row="3" Orientation="Horizontal" Spacing="10">
 
                     <ui:HyperlinkButton x:Name="HyperlinkButton_Repository" Content="Repository" Click="HyperlinkButton_Repository_Click"/>
                     <ui:HyperlinkButton x:Name="HyperlinkButton_Package" Content="Package" Click="HyperlinkButton_Package_Click"/>
@@ -60,7 +62,7 @@
                     <ui:HyperlinkButton x:Name="HyperlinkButton_DocRepository" Content="Docs Repository" Click="Hyperlink_DoucmentationRepo_Click"/>
                     <ui:HyperlinkButton x:Name="HyperlinkButton_Facebook" Content="Follow us on Facebook!" Click="HyperlinkButton_Facebook_Click"/>
 
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </Grid>
         </Border>
 
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ItemPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ItemPage.xaml
index 76b73acd..daa1d37b 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ItemPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ItemPage.xaml
@@ -6,6 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:datamodel="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.DataModel"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:str="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Properties"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
@@ -68,7 +69,7 @@
                             <ColumnDefinition />
                         </Grid.ColumnDefinitions>
 
-                        <ui:SimpleStackPanel
+                        <ikw:SimpleStackPanel
                             x:Name="SourcePanel"
                             Grid.Row="0"
                             Grid.ColumnSpan="3"
@@ -86,7 +87,7 @@
                             <ui:HyperlinkButton x:Name="PageCodeGitHubLink" ToolTipService.ToolTip="{Binding RelativeSource={RelativeSource Self}, Path=NavigateUri}">
                                 <TextBlock Text="C# source code" />
                             </ui:HyperlinkButton>
-                        </ui:SimpleStackPanel>
+                        </ikw:SimpleStackPanel>
 
                         <StackPanel
                             x:Name="DocumentationPanel"
@@ -148,7 +149,7 @@
                                             visually on the contained TextBlock.
                                         -->
                                         <ui:HyperlinkButton AutomationProperties.Name="{Binding}" Click="OnRelatedControlClick">
-                                            <ui:SimpleStackPanel Orientation="Horizontal">
+                                            <ikw:SimpleStackPanel Orientation="Horizontal">
                                                 <!--
                                                     Now that the HyperlinkButton has a helpful accessible name, it serves no
                                                     useful purpose for the contained Image, (which is purely decorative,) or
@@ -168,7 +169,7 @@
                                                     Foreground="{DynamicResource HyperlinkButtonForeground}"
                                                     Text="{Binding}"
                                                     TextWrapping="Wrap" />
-                                            </ui:SimpleStackPanel>
+                                            </ikw:SimpleStackPanel>
                                         </ui:HyperlinkButton>
                                     </DataTemplate>
                                 </ItemsControl.ItemTemplate>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ItemTemplates.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ItemTemplates.xaml
index a83583fc..c2a17cf8 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/ItemTemplates.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/ItemTemplates.xaml
@@ -2,6 +2,7 @@
     x:Class="iNKORE.UI.WPF.Modern.Gallery.ItemTemplates"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern">
     <DataTemplate x:Key="ControlItemTemplate">
         <UserControl>
@@ -35,7 +36,7 @@
                     </Border>
 
 
-                    <ui:SimpleStackPanel
+                    <ikw:SimpleStackPanel
                         Grid.Column="1"
                         Grid.ColumnSpan="2"
                         Margin="16,6,0,0">
@@ -50,7 +51,7 @@
                             Style="{StaticResource CaptionTextBlockStyle}"
                             Text="{Binding Subtitle}"
                             TextTrimming="CharacterEllipsis" />
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
 
                     <Border
                         Grid.Column="2"
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml.cs b/source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml.cs
index 5adfbd78..1f1e1cb3 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml.cs
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/MainWindow.xaml.cs
@@ -48,7 +48,7 @@ private async void InitialzeApp()
                 {
                     NavigationRootPage NavigationRootPage = new NavigationRootPage();
                     Content = NavigationRootPage;
-                    MicaHelper.Apply(this, BackdropType.Mica, true);
+                    BackdropHelper.Apply(this, BackdropType.Mica, true);
                 });
             }).Start();
         }
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/NewControlsPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/NewControlsPage.xaml
index 5e5bf097..c8637885 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/NewControlsPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/NewControlsPage.xaml
@@ -6,7 +6,9 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:uc="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Controls.UserControls"
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" 
+    xmlns:uc="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Controls.UserControls"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     Title="New Controls"
     d:DesignWidth="800" FontSize="14"
     mc:Ignorable="d">
@@ -72,7 +74,7 @@
                             Visibility="Visible" />
                     </StackPanel>
                     
-                    <ui:SimpleStackPanel x:Name="HeaderTileOuterGrid" Margin="0,287,0,0" Orientation="Vertical" Spacing="10">
+                    <ikw:SimpleStackPanel x:Name="HeaderTileOuterGrid" Margin="0,287,0,0" Orientation="Vertical" Spacing="10">
 
                         <uc:DocumentationPromotion/>
                         <StackPanel Orientation="Horizontal">
@@ -98,7 +100,7 @@
                                     Source="/Assets/template_studio.png" />
                             </WrapPanel>
                         </StackPanel>
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
                 </Grid>
             </ui:ListViewHelper.Header>
 
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleCompactSizingPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleCompactSizingPage.xaml
index 71908184..ebc2f56d 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleCompactSizingPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleCompactSizingPage.xaml
@@ -5,7 +5,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.SamplePages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" 
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     Title="SampleCompactSizingPage"
     d:DesignHeight="450"
     d:DesignWidth="800"
@@ -15,11 +16,11 @@
     </Page.Resources>
 
     <Grid Background="{DynamicResource ApplicationPageBackgroundThemeBrush}">
-        <ui:SimpleStackPanel Spacing="8">
-            <ui:SimpleStackPanel.Resources>
+        <ikw:SimpleStackPanel Spacing="8">
+            <ikw:SimpleStackPanel.Resources>
                 <Thickness x:Key="TextBoxTopHeaderMargin">0,2,0,2</Thickness>
                 <Thickness x:Key="PasswordBoxTopHeaderMargin">0,2,0,2</Thickness>
-            </ui:SimpleStackPanel.Resources>
+            </ikw:SimpleStackPanel.Resources>
             <TextBlock
                 x:Name="HeaderBlock"
                 FontSize="18"
@@ -29,6 +30,6 @@
             <PasswordBox x:Name="password" ui:ControlHelper.Header="Password:" />
             <PasswordBox x:Name="confirmPassword" ui:ControlHelper.Header="Confirm Password:" />
             <DatePicker x:Name="chosenDate" ui:ControlHelper.Header="Pick a date" />
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </Grid>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleStandardSizingPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleStandardSizingPage.xaml
index 3a6df117..2f0104d7 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleStandardSizingPage.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleStandardSizingPage.xaml
@@ -5,13 +5,13 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.SamplePages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     Title="SampleStandardSizingPage"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
     <Grid Background="{DynamicResource ApplicationPageBackgroundThemeBrush}">
-        <ui:SimpleStackPanel x:Name="CompactPanel" Spacing="16">
+        <ikw:SimpleStackPanel x:Name="CompactPanel" Spacing="16">
             <TextBlock
                 x:Name="HeaderBlock"
                 FontSize="18"
@@ -21,6 +21,6 @@
             <PasswordBox x:Name="password" ui:ControlHelper.Header="Password:" />
             <PasswordBox x:Name="confirmPassword" ui:ControlHelper.Header="Confirm Password:" />
             <DatePicker x:Name="chosenDate" ui:ControlHelper.Header="Pick a date" />
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </Grid>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleSystemBackdropsWindow.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleSystemBackdropsWindow.xaml
index e1293143..8f8626eb 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleSystemBackdropsWindow.xaml
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/SamplePages/SampleSystemBackdropsWindow.xaml
@@ -5,7 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.SamplePages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     Title="System Backdrops Window"
     Width="800"
     Height="450"
@@ -16,7 +16,7 @@
     mc:Ignorable="d">
     <Grid>
         <StackPanel>
-            <ui:SimpleStackPanel Margin="20" Spacing="10">
+            <ikw:SimpleStackPanel Margin="20" Spacing="10">
                 <StackPanel Orientation="Horizontal">
                     <TextBlock Text="Current backdrop: " />
                     <TextBlock x:Name="tbCurrentBackdrop" />
@@ -27,7 +27,7 @@
                     Click="ChangeBackdropButton_Click"
                     Content="Change Backdrop" />
                 <TextBlock x:Name="tbChangeStatus" />
-            </ui:SimpleStackPanel>
+            </ikw:SimpleStackPanel>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/iNKORE.UI.WPF.Modern.Gallery.csproj b/source/iNKORE.UI.WPF.Modern.Gallery/iNKORE.UI.WPF.Modern.Gallery.csproj
index dae2af45..996132d9 100644
--- a/source/iNKORE.UI.WPF.Modern.Gallery/iNKORE.UI.WPF.Modern.Gallery.csproj
+++ b/source/iNKORE.UI.WPF.Modern.Gallery/iNKORE.UI.WPF.Modern.Gallery.csproj
@@ -268,6 +268,7 @@
 
   <ItemGroup>
     <PackageReference Include="ColorCodeStandard" Version="1.0.0" />
+    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.7.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/source/samples/SamplesCommon/NonClippingStackPanel.cs b/source/samples/SamplesCommon/NonClippingStackPanel.cs
index aa7a24c5..6050ffa8 100644
--- a/source/samples/SamplesCommon/NonClippingStackPanel.cs
+++ b/source/samples/SamplesCommon/NonClippingStackPanel.cs
@@ -1,6 +1,7 @@
 using iNKORE.UI.WPF.Modern.Controls;
 using System.Windows;
 using System.Windows.Media;
+using iNKORE.UI.WPF.Controls;
 
 namespace SamplesCommon
 {
diff --git a/source/samples/SamplesCommon/SamplePages/SampleCompactSizingPage.xaml b/source/samples/SamplesCommon/SamplePages/SampleCompactSizingPage.xaml
index 242030dd..2c36a2fa 100644
--- a/source/samples/SamplesCommon/SamplePages/SampleCompactSizingPage.xaml
+++ b/source/samples/SamplesCommon/SamplePages/SampleCompactSizingPage.xaml
@@ -15,7 +15,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     mc:Ignorable="d">
 
     <Page.Resources>
@@ -23,7 +23,7 @@
     </Page.Resources>
 
     <Grid Background="{DynamicResource ApplicationPageBackgroundThemeBrush}">
-        <ui:SimpleStackPanel Spacing="4">
+        <ikw:SimpleStackPanel Spacing="4">
             <TextBlock
                 x:Name="HeaderBlock"
                 FontSize="18"
@@ -39,6 +39,6 @@
             <DatePicker
                 HorizontalAlignment="Stretch"
                 ui:ControlHelper.Header="Pick a date" />
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </Grid>
 </ui:Page>
diff --git a/source/samples/SamplesCommon/SamplePages/SampleStandardSizingPage.xaml b/source/samples/SamplesCommon/SamplePages/SampleStandardSizingPage.xaml
index 0e56a3d4..720a3459 100644
--- a/source/samples/SamplesCommon/SamplePages/SampleStandardSizingPage.xaml
+++ b/source/samples/SamplesCommon/SamplePages/SampleStandardSizingPage.xaml
@@ -15,17 +15,17 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     mc:Ignorable="d">
 
     <Grid Background="{DynamicResource ApplicationPageBackgroundThemeBrush}">
-        <ui:SimpleStackPanel x:Name="CompactPanel" Spacing="16">
+        <ikw:SimpleStackPanel x:Name="CompactPanel" Spacing="16">
             <TextBlock x:Name="HeaderBlock" Text="Standard Size" FontSize="18"/>
             <TextBox ui:ControlHelper.Header="First Name:" x:Name="txtfirstName" />
             <TextBox ui:ControlHelper.Header="Last Name:" x:Name="txtLastName"  />
             <PasswordBox ui:ControlHelper.Header="Password:" />
             <PasswordBox ui:ControlHelper.Header="Confirm Password:" />
             <DatePicker ui:ControlHelper.Header="Pick a date" HorizontalAlignment="Stretch" />
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </Grid>
 </ui:Page>
diff --git a/source/samples/SamplesCommon/SamplesCommon.csproj b/source/samples/SamplesCommon/SamplesCommon.csproj
index 90dff219..26e25ef6 100644
--- a/source/samples/SamplesCommon/SamplesCommon.csproj
+++ b/source/samples/SamplesCommon/SamplesCommon.csproj
@@ -21,5 +21,9 @@
       <Generator>MSBuild:Compile</Generator>
     </None>
   </ItemGroup>
+	
+  <ItemGroup>
+    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.7.1" />
+  </ItemGroup>
 
 </Project>