diff --git a/MaterialDesignToolkit.Full.sln b/MaterialDesignToolkit.Full.sln
index d94b8c2885..d27338256c 100644
--- a/MaterialDesignToolkit.Full.sln
+++ b/MaterialDesignToolkit.Full.sln
@@ -64,6 +64,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{18401177
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaterialDesign3Demo", "src\MaterialDesign3.Demo.Wpf\MaterialDesign3Demo.csproj", "{98627CBE-F009-482E-97E9-C69C7135E91F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaterialDesignDemo.Shared", "src\MaterialDesignDemo.Shared\MaterialDesignDemo.Shared.csproj", "{B39795A7-D66A-4F2F-9F41-050838D14048}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -236,6 +238,22 @@ Global
 		{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x64.Build.0 = Release|Any CPU
 		{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x86.ActiveCfg = Release|Any CPU
 		{98627CBE-F009-482E-97E9-C69C7135E91F}.Release|x86.Build.0 = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x64.Build.0 = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Debug|x86.Build.0 = Debug|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|ARM.Build.0 = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x64.ActiveCfg = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x64.Build.0 = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x86.ActiveCfg = Release|Any CPU
+		{B39795A7-D66A-4F2F-9F41-050838D14048}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -246,6 +264,7 @@ Global
 		{59CE50AC-D176-4CC0-B465-26F66054A15E} = {9E303A4A-3712-44B9-91EE-830FDC087795}
 		{18401177-A30E-4330-8F6B-101DF876CE99} = {55087897-5F09-45CA-8E12-12B36B45F262}
 		{98627CBE-F009-482E-97E9-C69C7135E91F} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
+		{B39795A7-D66A-4F2F-9F41-050838D14048} = {D34BE232-DE51-43C1-ABDC-B69003BB50FF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {730B2F9E-74AE-46CE-9E61-89AA5C6D5DD3}
diff --git a/src/MainDemo.Wpf/ColorTool.xaml b/src/MainDemo.Wpf/ColorTool.xaml
index c46472e262..0b4f008069 100644
--- a/src/MainDemo.Wpf/ColorTool.xaml
+++ b/src/MainDemo.Wpf/ColorTool.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="MaterialDesignDemo.ColorTool"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters"
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
              xmlns:local="clr-namespace:MaterialDesignDemo"
diff --git a/src/MainDemo.Wpf/ComboBoxes.xaml b/src/MainDemo.Wpf/ComboBoxes.xaml
index 7a1b7d7b0b..69d919fea3 100644
--- a/src/MainDemo.Wpf/ComboBoxes.xaml
+++ b/src/MainDemo.Wpf/ComboBoxes.xaml
@@ -2,7 +2,7 @@
              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:converters="clr-namespace:MaterialDesignDemo.Converters"
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:demoAppDomain="clr-namespace:MaterialDesignDemo.Domain"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
diff --git a/src/MainDemo.Wpf/Fields.xaml b/src/MainDemo.Wpf/Fields.xaml
index c5c4bac53b..bbfd5907cd 100644
--- a/src/MainDemo.Wpf/Fields.xaml
+++ b/src/MainDemo.Wpf/Fields.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="MaterialDesignDemo.Fields"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters"
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
              xmlns:domain1="clr-namespace:MaterialDesignDemo.Domain"
diff --git a/src/MainDemo.Wpf/IconPack.xaml b/src/MainDemo.Wpf/IconPack.xaml
index 592b9633a6..cae2407634 100644
--- a/src/MainDemo.Wpf/IconPack.xaml
+++ b/src/MainDemo.Wpf/IconPack.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="MaterialDesignDemo.IconPack"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters"
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:domain="clr-namespace:MaterialDesignDemo.Domain"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
diff --git a/src/MainDemo.Wpf/MaterialDesignDemo.csproj b/src/MainDemo.Wpf/MaterialDesignDemo.csproj
index 93879e9c65..bcd9ee7643 100644
--- a/src/MainDemo.Wpf/MaterialDesignDemo.csproj
+++ b/src/MainDemo.Wpf/MaterialDesignDemo.csproj
@@ -29,6 +29,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
+    <ProjectReference Include="..\MaterialDesignDemo.Shared\MaterialDesignDemo.Shared.csproj" />
     <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml b/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml
index 8fb3fc08ab..7c5cc80723 100644
--- a/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml
+++ b/src/MaterialDesign3.Demo.Wpf/ColorTool.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="MaterialDesign3Demo.ColorTool"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="clr-namespace:MaterialDesign3Demo.Converters"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"             
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:domain="clr-namespace:MaterialDesign3Demo.Domain"
              xmlns:local="clr-namespace:MaterialDesign3Demo"
diff --git a/src/MaterialDesign3.Demo.Wpf/Converters/BrushToHexConverter.cs b/src/MaterialDesign3.Demo.Wpf/Converters/BrushToHexConverter.cs
deleted file mode 100644
index 1f09a9b0af..0000000000
--- a/src/MaterialDesign3.Demo.Wpf/Converters/BrushToHexConverter.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Globalization;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace MaterialDesign3Demo.Converters;
-
-public class BrushToHexConverter : IValueConverter
-{
-    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        if (value is null) return null;
-        string lowerHexString(int i) => i.ToString("X2").ToLower();
-        var brush = (SolidColorBrush)value;
-        var hex = lowerHexString(brush.Color.R) +
-                  lowerHexString(brush.Color.G) +
-                  lowerHexString(brush.Color.B);
-        return "#" + hex;
-    }
-
-    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-        => throw new NotImplementedException();
-}
diff --git a/src/MaterialDesign3.Demo.Wpf/Converters/ColorToBrushConverter.cs b/src/MaterialDesign3.Demo.Wpf/Converters/ColorToBrushConverter.cs
deleted file mode 100644
index 8df61b4feb..0000000000
--- a/src/MaterialDesign3.Demo.Wpf/Converters/ColorToBrushConverter.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Globalization;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace MaterialDesign3Demo.Converters;
-
-[ValueConversion(typeof(Color), typeof(Brush))]
-public class ColorToBrushConverter : IValueConverter
-{
-    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        if (value is Color color)
-        {
-            return new SolidColorBrush(color);
-        }
-        return Binding.DoNothing;
-    }
-
-    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-    {
-        if (value is SolidColorBrush brush)
-        {
-            return brush.Color;
-        }
-        return default(Color);
-    }
-}
diff --git a/src/MaterialDesign3.Demo.Wpf/Converters/MultiValueEqualityConverter.cs b/src/MaterialDesign3.Demo.Wpf/Converters/MultiValueEqualityConverter.cs
deleted file mode 100644
index c7dafd1c81..0000000000
--- a/src/MaterialDesign3.Demo.Wpf/Converters/MultiValueEqualityConverter.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Globalization;
-using System.Windows.Data;
-
-namespace MaterialDesign3Demo.Converters;
-
-public class MultiValueEqualityConverter : IMultiValueConverter
-{
-    public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-    {
-        return values?.All(o => o?.Equals(values[0]) == true) == true || values?.All(o => o == null) == true;
-    }
-
-    public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
-}
diff --git a/src/MaterialDesign3.Demo.Wpf/Converters/StringJoinConverter.cs b/src/MaterialDesign3.Demo.Wpf/Converters/StringJoinConverter.cs
deleted file mode 100644
index 28b618f184..0000000000
--- a/src/MaterialDesign3.Demo.Wpf/Converters/StringJoinConverter.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System.Collections;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace MaterialDesign3Demo.Converters;
-
-public class StringJoinConverter : IValueConverter
-{
-    public string? Separator { get; set; }
-
-    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        IEnumerable values = value as IEnumerable ?? Array.Empty<object>();
-        return string.Join(Separator ?? "", values.OfType<object>());
-    }
-
-    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        throw new NotImplementedException();
-    }
-}
diff --git a/src/MaterialDesign3.Demo.Wpf/IconPack.xaml b/src/MaterialDesign3.Demo.Wpf/IconPack.xaml
index 96f85dd1d1..0dfb327535 100644
--- a/src/MaterialDesign3.Demo.Wpf/IconPack.xaml
+++ b/src/MaterialDesign3.Demo.Wpf/IconPack.xaml
@@ -1,7 +1,7 @@
 <UserControl x:Class="MaterialDesign3Demo.IconPack"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:converters="clr-namespace:MaterialDesign3Demo.Converters"
+             xmlns:converters="clr-namespace:MaterialDesignDemo.Converters;assembly=MaterialDesignDemo.Shared"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:domain="clr-namespace:MaterialDesign3Demo.Domain"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
@@ -212,4 +212,4 @@
       </StackPanel>
     </materialDesign:ColorZone>
   </Grid>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj b/src/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj
index 153434ae6e..28830a00ba 100644
--- a/src/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj
+++ b/src/MaterialDesign3.Demo.Wpf/MaterialDesign3Demo.csproj
@@ -29,6 +29,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
+    <ProjectReference Include="..\MaterialDesignDemo.Shared\MaterialDesignDemo.Shared.csproj" />
     <ProjectReference Include="..\MaterialDesignThemes.Wpf\MaterialDesignThemes.Wpf.csproj" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/MainDemo.Wpf/Converters/BooleanToDoubleConverter.cs b/src/MaterialDesignDemo.Shared/Converters/BooleanToDoubleConverter.cs
similarity index 100%
rename from src/MainDemo.Wpf/Converters/BooleanToDoubleConverter.cs
rename to src/MaterialDesignDemo.Shared/Converters/BooleanToDoubleConverter.cs
diff --git a/src/MainDemo.Wpf/Converters/BrushToHexConverter.cs b/src/MaterialDesignDemo.Shared/Converters/BrushToHexConverter.cs
similarity index 100%
rename from src/MainDemo.Wpf/Converters/BrushToHexConverter.cs
rename to src/MaterialDesignDemo.Shared/Converters/BrushToHexConverter.cs
diff --git a/src/MainDemo.Wpf/Converters/ColorToBrushConverter.cs b/src/MaterialDesignDemo.Shared/Converters/ColorToBrushConverter.cs
similarity index 100%
rename from src/MainDemo.Wpf/Converters/ColorToBrushConverter.cs
rename to src/MaterialDesignDemo.Shared/Converters/ColorToBrushConverter.cs
diff --git a/src/MainDemo.Wpf/Converters/IsTransparentConverter.cs b/src/MaterialDesignDemo.Shared/Converters/IsTransparentConverter.cs
similarity index 100%
rename from src/MainDemo.Wpf/Converters/IsTransparentConverter.cs
rename to src/MaterialDesignDemo.Shared/Converters/IsTransparentConverter.cs
diff --git a/src/MainDemo.Wpf/Converters/MultiValueEqualityConverter.cs b/src/MaterialDesignDemo.Shared/Converters/MultiValueEqualityConverter.cs
similarity index 100%
rename from src/MainDemo.Wpf/Converters/MultiValueEqualityConverter.cs
rename to src/MaterialDesignDemo.Shared/Converters/MultiValueEqualityConverter.cs
diff --git a/src/MainDemo.Wpf/Converters/StringJoinConverter.cs b/src/MaterialDesignDemo.Shared/Converters/StringJoinConverter.cs
similarity index 100%
rename from src/MainDemo.Wpf/Converters/StringJoinConverter.cs
rename to src/MaterialDesignDemo.Shared/Converters/StringJoinConverter.cs
diff --git a/src/MaterialDesignDemo.Shared/MaterialDesignDemo.Shared.csproj b/src/MaterialDesignDemo.Shared/MaterialDesignDemo.Shared.csproj
new file mode 100644
index 0000000000..f423c0ace2
--- /dev/null
+++ b/src/MaterialDesignDemo.Shared/MaterialDesignDemo.Shared.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net472;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
+    <UseWPF>true</UseWPF>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
+</Project>