diff --git a/src/MainDemo.Wpf/Buttons.xaml b/src/MainDemo.Wpf/Buttons.xaml
index 7702f7878e..c5a8b6b33f 100644
--- a/src/MainDemo.Wpf/Buttons.xaml
+++ b/src/MainDemo.Wpf/Buttons.xaml
@@ -2,13 +2,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:domain="clr-namespace:MaterialDesignDemo.Domain"
+             xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
-             d:DataContext="{d:DesignInstance domain:ButtonsViewModel}"
+             d:DataContext="{d:DesignInstance sharedDomain:ButtonsViewModel}"
              d:DesignHeight="2000"
              d:DesignWidth="800"
              mc:Ignorable="d">
diff --git a/src/MainDemo.Wpf/ColorTool.xaml b/src/MainDemo.Wpf/ColorTool.xaml
index e5c14dc92e..582b92f14c 100644
--- a/src/MainDemo.Wpf/ColorTool.xaml
+++ b/src/MainDemo.Wpf/ColorTool.xaml
@@ -3,13 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:converters="clr-namespace:MaterialDesignDemo.Shared.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
+             xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
              xmlns:local="clr-namespace:MaterialDesignDemo"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:materialDesignColors="clr-namespace:MaterialDesignColors;assembly=MaterialDesignColors"
              xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             d:DataContext="{d:DesignInstance Type=domain:ColorToolViewModel}"
+             d:DataContext="{d:DesignInstance Type=sharedDomain:ColorToolViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="600"
              mc:Ignorable="d">
diff --git a/src/MainDemo.Wpf/ComboBoxes.xaml b/src/MainDemo.Wpf/ComboBoxes.xaml
index 77a6a6c8cb..386e7e92b4 100644
--- a/src/MainDemo.Wpf/ComboBoxes.xaml
+++ b/src/MainDemo.Wpf/ComboBoxes.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="MaterialDesignDemo.ComboBoxes"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:colorsDomain="clr-namespace:MaterialDesignDemo.Domain"
+             xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
              xmlns:converters="clr-namespace:MaterialDesignDemo.Shared.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:demoAppDomain="clr-namespace:MaterialDesignDemo.Domain"
@@ -9,7 +9,7 @@
              xmlns:materialDesignDemo="clr-namespace:MaterialDesignDemo"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
-             d:DataContext="{d:DesignInstance colorsDomain:ComboBoxesViewModel,
+             d:DataContext="{d:DesignInstance sharedDomain:ComboBoxesViewModel,
                                               IsDesignTimeCreatable=False}"
              d:DesignHeight="1080"
              d:DesignWidth="1920"
diff --git a/src/MainDemo.Wpf/Domain/DocumentationLinks.xaml b/src/MainDemo.Wpf/Domain/DocumentationLinks.xaml
index 27ad1aecd6..d08590bb98 100644
--- a/src/MainDemo.Wpf/Domain/DocumentationLinks.xaml
+++ b/src/MainDemo.Wpf/Domain/DocumentationLinks.xaml
@@ -3,9 +3,10 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
+             xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             d:DataContext="{d:DesignInstance domain:DemoItem,
+             d:DataContext="{d:DesignInstance sharedDomain:DemoItem,
                                               IsDesignTimeCreatable=True}"
              d:DesignHeight="300"
              d:DesignWidth="300"
diff --git a/src/MainDemo.Wpf/MainWindow.xaml b/src/MainDemo.Wpf/MainWindow.xaml
index d88dbb49c5..9e3f53fb09 100644
--- a/src/MainDemo.Wpf/MainWindow.xaml
+++ b/src/MainDemo.Wpf/MainWindow.xaml
@@ -7,6 +7,7 @@
         xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:system="clr-namespace:System;assembly=mscorlib"
+        xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain"
         Title="Material Design in XAML"
         Width="1150"
         d:DataContext="{d:DesignInstance domain:MainWindowViewModel}"
@@ -78,7 +79,7 @@
               <Style TargetType="ScrollBar" BasedOn="{StaticResource MaterialDesignScrollBarMinimal}" />
             </ListBox.Resources>
             <ListBox.ItemTemplate>
-              <DataTemplate DataType="domain:DemoItem">
+              <DataTemplate DataType="sharedDomain:DemoItem">
                 <TextBlock Margin="24,4,0,4"
                            AutomationProperties.AutomationId="DemoItemPage"
                            Text="{Binding Name}" />
diff --git a/src/MaterialDesign3.Demo.Wpf/Buttons.xaml b/src/MaterialDesign3.Demo.Wpf/Buttons.xaml
index e9febec682..265bb03e9b 100644
--- a/src/MaterialDesign3.Demo.Wpf/Buttons.xaml
+++ b/src/MaterialDesign3.Demo.Wpf/Buttons.xaml
@@ -2,13 +2,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:domain="clr-namespace:MaterialDesign3Demo.Domain"
+             xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
-             d:DataContext="{d:DesignInstance domain:ButtonsViewModel}"
+             d:DataContext="{d:DesignInstance sharedDomain:ButtonsViewModel}"
              d:DesignHeight="1200"
              d:DesignWidth="800"
              mc:Ignorable="d">
diff --git a/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml b/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml
index 40800b0f76..2042d4a322 100644
--- a/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml
+++ b/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml
@@ -3,13 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"             
              xmlns:converters="clr-namespace:MaterialDesignDemo.Shared.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:domain="clr-namespace:MaterialDesign3Demo.Domain"
+             xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
              xmlns:local="clr-namespace:MaterialDesign3Demo"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:materialDesignColors="clr-namespace:MaterialDesignColors;assembly=MaterialDesignColors"
              xmlns:materialDesignConverters="clr-namespace:MaterialDesignThemes.Wpf.Converters;assembly=MaterialDesignThemes.Wpf"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             d:DataContext="{d:DesignInstance Type=domain:ColorToolViewModel}"
+             d:DataContext="{d:DesignInstance Type=sharedDomain:ColorToolViewModel}"
              d:DesignHeight="600"
              d:DesignWidth="600"
              mc:Ignorable="d">
diff --git a/src/MaterialDesign3.Demo.Wpf/ComboBoxes.xaml b/src/MaterialDesign3.Demo.Wpf/ComboBoxes.xaml
index e3117e3f47..a5101a2923 100644
--- a/src/MaterialDesign3.Demo.Wpf/ComboBoxes.xaml
+++ b/src/MaterialDesign3.Demo.Wpf/ComboBoxes.xaml
@@ -1,13 +1,13 @@
 <UserControl x:Class="MaterialDesign3Demo.ComboBoxes"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:colorsDomain="clr-namespace:MaterialDesign3Demo.Domain"
+             xmlns:sharedDomain="clr-namespace:MaterialDesignDemo.Shared.Domain;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:demoAppDomain="clr-namespace:MaterialDesign3Demo.Domain"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:smtx="clr-namespace:ShowMeTheXAML;assembly=ShowMeTheXAML"
-             d:DataContext="{d:DesignInstance colorsDomain:ComboBoxesViewModel,
+             d:DataContext="{d:DesignInstance sharedDomain:ComboBoxesViewModel,
                                               IsDesignTimeCreatable=False}"
              d:DesignHeight="300"
              d:DesignWidth="600"