diff --git a/.github/workflows/get_versions.yml b/.github/workflows/get_versions.yml
index 4a6f9110e5..c916fd7535 100644
--- a/.github/workflows/get_versions.yml
+++ b/.github/workflows/get_versions.yml
@@ -2,7 +2,7 @@ name: Setup Versions
 
 on:
   workflow_call:
-    inputs: 
+    inputs:
       is-full-release:
         required: false
         type: boolean
diff --git a/src/MainDemo.Wpf/Domain/MainWindowViewModel.cs b/src/MainDemo.Wpf/Domain/MainWindowViewModel.cs
index 64ec7192c5..12e4238fc8 100644
--- a/src/MainDemo.Wpf/Domain/MainWindowViewModel.cs
+++ b/src/MainDemo.Wpf/Domain/MainWindowViewModel.cs
@@ -1,132 +1,133 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Configuration;
+using System.Reflection;
 using System.Windows.Data;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using MaterialDesignColors;
 using MaterialDesignDemo.Shared.Domain;
 using MaterialDesignThemes.Wpf;
 using MaterialDesignThemes.Wpf.Transitions;
 
 namespace MaterialDesignDemo.Domain;
 
-public class MainWindowViewModel : ViewModelBase
+public partial class MainWindowViewModel : ObservableObject
 {
     public MainWindowViewModel(ISnackbarMessageQueue snackbarMessageQueue, string? startupPage)
     {
-        DemoItems = new ObservableCollection<DemoItem>(new[]
-        {
+        DemoItems =
+        [
             new DemoItem(
                 "Home",
                 typeof(Home),
-                new[]
-                {
+                [
                     new DocumentationLink(
                         DocumentationLinkType.Wiki,
                         $"{ConfigurationManager.AppSettings["GitHub"]}/wiki",
                         "WIKI"),
                     DocumentationLink.DemoPageLink<Home>()
-                }
+                ]
             )
             {
                 HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Disabled
-            }
-        });
-
-        foreach (var item in GenerateDemoItems(snackbarMessageQueue).OrderBy(i => i.Name))
-        {
-            DemoItems.Add(item);
-        }
+            },
+            .. GenerateDemoItems(snackbarMessageQueue).OrderBy(i => i.Name),
+        ];
         SelectedItem = DemoItems.FirstOrDefault(di => string.Equals(di.Name, startupPage, StringComparison.CurrentCultureIgnoreCase)) ?? DemoItems.First();
         _demoItemsView = CollectionViewSource.GetDefaultView(DemoItems);
         _demoItemsView.Filter = DemoItemsFilter;
 
+        LoadVersions();
+    }
 
-        HomeCommand = new AnotherCommandImplementation(
-            _ =>
-            {
-                SearchKeyword = string.Empty;
-                SelectedIndex = 0;
-            });
-
-        MovePrevCommand = new AnotherCommandImplementation(
-            _ =>
-            {
-                if (!string.IsNullOrWhiteSpace(SearchKeyword))
-                    SearchKeyword = string.Empty;
-
-                SelectedIndex--;
-            },
-            _ => SelectedIndex > 0);
+    private readonly ICollectionView _demoItemsView;
 
-        MoveNextCommand = new AnotherCommandImplementation(
-           _ =>
-           {
-               if (!string.IsNullOrWhiteSpace(SearchKeyword))
-                   SearchKeyword = string.Empty;
+    [ObservableProperty]
+    private string? _searchKeyword;
 
-               SelectedIndex++;
-           },
-           _ => SelectedIndex < DemoItems.Count - 1);
+    partial void OnSearchKeywordChanged(string? oldValue, string? newValue)
+    {
+        _demoItemsView.Refresh();
     }
 
-    private readonly ICollectionView _demoItemsView;
-    private DemoItem? _selectedItem;
-    private int _selectedIndex;
-    private string? _searchKeyword;
-    private bool _controlsEnabled = true;
+    [ObservableProperty]
+    private string? _nugetVersions;
 
-    public string? SearchKeyword
+    private void LoadVersions()
     {
-        get => _searchKeyword;
-        set
+        string? mdixVersion = GetVersion<Theme>("MDIXVersion");
+        string? mdixColorsVersion = GetVersion<Swatch>("MDIXColorsVersion");
+
+        NugetVersions = $"""
+            MDIX: {mdixVersion}
+            MDIX Colors: {mdixColorsVersion}
+            """;
+
+        static string? GetVersion<T>(string attributeKey)
         {
-            if (SetProperty(ref _searchKeyword, value))
-            {
-                _demoItemsView.Refresh();
-            }
+            return typeof(T).Assembly
+                .GetCustomAttributes<AssemblyMetadataAttribute>()
+                .SingleOrDefault(x => x.Key == attributeKey)?.Value;
         }
     }
 
     public ObservableCollection<DemoItem> DemoItems { get; }
 
-    public DemoItem? SelectedItem
+
+    [ObservableProperty]
+    private DemoItem? _selectedItem;
+
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(MoveNextCommand))]
+    [NotifyCanExecuteChangedFor(nameof(MovePrevCommand))]
+    private int _selectedIndex;
+
+    [ObservableProperty]
+    private bool _controlsEnabled = true;
+
+    [RelayCommand]
+    private void OnHome()
     {
-        get => _selectedItem;
-        set => SetProperty(ref _selectedItem, value);
+        SearchKeyword = string.Empty;
+        SelectedIndex = 0;
     }
 
-    public int SelectedIndex
+    [RelayCommand(CanExecute = nameof(CanMovePrevious))]
+    private void OnMovePrev()
     {
-        get => _selectedIndex;
-        set => SetProperty(ref _selectedIndex, value);
+        if (!string.IsNullOrWhiteSpace(SearchKeyword))
+            SearchKeyword = string.Empty;
+
+        SelectedIndex--;
     }
 
-    public bool ControlsEnabled
+    private bool CanMovePrevious() => SelectedIndex > 0;
+
+    [RelayCommand(CanExecute = nameof(CanMoveNext))]
+    private void OnMoveNext()
     {
-        get => _controlsEnabled;
-        set => SetProperty(ref _controlsEnabled, value);
+        if (!string.IsNullOrWhiteSpace(SearchKeyword))
+            SearchKeyword = string.Empty;
+
+        SelectedIndex++;
     }
 
-    public AnotherCommandImplementation HomeCommand { get; }
-    public AnotherCommandImplementation MovePrevCommand { get; }
-    public AnotherCommandImplementation MoveNextCommand { get; }
+    private bool CanMoveNext() => SelectedIndex < DemoItems.Count - 1;
 
     private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue snackbarMessageQueue)
     {
-        if (snackbarMessageQueue is null)
-            throw new ArgumentNullException(nameof(snackbarMessageQueue));
-
         yield return new DemoItem(
             "Palette",
             typeof(PaletteSelector),
-            new[]
-            {
+            [
                 DocumentationLink.WikiLink("Brush-Names", "Brushes"),
                 DocumentationLink.WikiLink("Custom-Palette-Hues", "Custom Palettes"),
                 DocumentationLink.WikiLink("Swatches-and-Recommended-Colors", "Swatches"),
                 DocumentationLink.DemoPageLink<PaletteSelector>("Demo View"),
                 DocumentationLink.DemoPageLink<PaletteSelectorViewModel>("Demo View Model","Domain"),
                 DocumentationLink.ApiLink<PaletteHelper>()
-            })
+            ])
         {
             HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Disabled
         };
@@ -134,58 +135,53 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "ColorTool",
             typeof(ColorTool),
-            new[]
-            {
+            [
                 DocumentationLink.WikiLink("Brush-Names", "Brushes"),
                 DocumentationLink.WikiLink("Custom-Palette-Hues", "Custom Palettes"),
                 DocumentationLink.WikiLink("Swatches-and-Recommended-Colors", "Swatches"),
                 DocumentationLink.DemoPageLink<ColorTool>("Demo View"),
                 DocumentationLink.DemoPageLink<ColorToolViewModel>("Demo View Model","Domain"),
                 DocumentationLink.ApiLink<PaletteHelper>()
-            });
+            ]);
 
         yield return new DemoItem(
             "Button",
             typeof(Buttons),
-            new[]
-            {
+            [
                 DocumentationLink.WikiLink("Button-Styles", "Buttons"),
                 DocumentationLink.DemoPageLink<Buttons>("Demo View"),
                 DocumentationLink.DemoPageLink<ButtonsViewModel>("Demo View Model", "Domain"),
                 DocumentationLink.StyleLink("Button"),
                 DocumentationLink.StyleLink("PopupBox"),
                 DocumentationLink.ApiLink<PopupBox>()
-            });
+            ]);
 
         yield return new DemoItem(
             "Toggle",
             typeof(Toggles),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Toggles>(),
                 DocumentationLink.StyleLink("ToggleButton"),
                 DocumentationLink.StyleLink("CheckBox"),
                 DocumentationLink.ApiLink<Toggles>()
-            });
+            ]);
 
         yield return new DemoItem(
             "RatingBar",
             typeof(RatingBar),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<RatingBar>(),
                 DocumentationLink.StyleLink("RatingBar"),
                 DocumentationLink.ApiLink<RatingBar>()
-            });
+            ]);
 
         yield return new DemoItem(
             "Field",
             typeof(Fields),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Fields>(),
                 DocumentationLink.StyleLink("TextBox")
-            })
+            ])
         {
             HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Disabled,
         };
@@ -193,30 +189,27 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "Fields line up",
             typeof(FieldsLineUp),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<FieldsLineUp>()
-            });
+            ]);
 
         yield return new DemoItem(
             "ComboBox",
             typeof(ComboBoxes),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<ComboBoxes>(),
                 DocumentationLink.StyleLink("ComboBox")
-            });
+            ]);
 
         yield return new DemoItem(
             "Picker",
             typeof(Pickers),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Pickers>(),
                 DocumentationLink.StyleLink("Clock"),
                 DocumentationLink.StyleLink("DatePicker"),
                 DocumentationLink.ApiLink<TimePicker>()
-            })
+            ])
         {
             HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Disabled,
         };
@@ -224,30 +217,27 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "Slider",
             typeof(Sliders),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Sliders>(),
                 DocumentationLink.StyleLink("Slider")
-            });
+            ]);
 
         yield return new DemoItem(
             "Chip",
             typeof(Chips),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Chips>(),
                 DocumentationLink.StyleLink("Chip"),
                 DocumentationLink.ApiLink<Chip>()
-            });
+            ]);
 
         yield return new DemoItem(
             "Typography",
             typeof(Typography),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Typography>(),
                 DocumentationLink.StyleLink("TextBlock")
-            })
+            ])
         {
             HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Auto
         };
@@ -255,12 +245,11 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "Card",
             typeof(Cards),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Cards>(),
                 DocumentationLink.StyleLink("Card"),
                 DocumentationLink.ApiLink<Card>()
-            })
+            ])
         {
             HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Disabled
         };
@@ -268,12 +257,11 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "Icons",
             typeof(IconPack),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<IconPack>("Demo View"),
                 DocumentationLink.DemoPageLink<IconPackViewModel>("Demo View Model", "Domain"),
                 DocumentationLink.ApiLink<PackIcon>()
-            },
+            ],
             new IconPackViewModel(snackbarMessageQueue))
         {
             //The icons view handles its own scrolling
@@ -284,22 +272,20 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "ColorZone",
             typeof(ColorZones),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<ColorZones>(),
                 DocumentationLink.ApiLink<ColorZone>()
-            });
+            ]);
 
         yield return new DemoItem(
             "List",
             typeof(Lists),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Lists>("Demo View"),
                 DocumentationLink.DemoPageLink<ListsAndGridsViewModel>("Demo View Model", "Domain"),
                 DocumentationLink.StyleLink("ListBox"),
                 DocumentationLink.StyleLink("ListView")
-            })
+            ])
         {
             HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Disabled,
         };
@@ -307,49 +293,44 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "Tab",
             typeof(Tabs),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Tabs>(),
                 DocumentationLink.StyleLink("TabControl")
-            });
+            ]);
 
         yield return new DemoItem(
             "Tree",
             typeof(Trees),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Trees>("Demo View"),
                 DocumentationLink.DemoPageLink<TreesViewModel>("Demo View Model", "Domain"),
                 DocumentationLink.StyleLink("TreeView")
-            });
+            ]);
 
         yield return new DemoItem(
             "DataGrid",
             typeof(DataGrids),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<DataGrids>("Demo View"),
                 DocumentationLink.DemoPageLink<ListsAndGridsViewModel>("Demo View Model", "Domain"),
                 DocumentationLink.StyleLink("DataGrid")
-            });
+            ]);
 
         yield return new DemoItem(
             "Expander",
             typeof(Expander),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Expander>(),
                 DocumentationLink.StyleLink("Expander")
-            });
+            ]);
 
         yield return new DemoItem(
             "GroupBox",
             typeof(GroupBoxes),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<GroupBoxes>(),
                 DocumentationLink.StyleLink("GroupBox")
-            })
+            ])
         {
             HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Disabled,
         };
@@ -357,30 +338,27 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "Menu & ToolBar",
             typeof(MenusAndToolBars),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<MenusAndToolBars>(),
                 DocumentationLink.StyleLink("Menu"),
                 DocumentationLink.StyleLink("ToolBar")
-            });
+            ]);
 
         yield return new DemoItem(
             "Progress Indicator",
             typeof(Progress),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Progress>(),
                 DocumentationLink.StyleLink("ProgressBar")
-            });
+            ]);
 
         yield return new DemoItem(
             "NavigationRail",
             typeof(NavigationRail),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<NavigationRail>("Demo View"),
                 DocumentationLink.StyleLink("TabControl"),
-            })
+            ])
         {
             HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Disabled,
         };
@@ -388,13 +366,12 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "Dialog",
             typeof(Dialogs),
-            new[]
-            {
+            [
                 DocumentationLink.WikiLink("Dialogs", "Dialogs"),
                 DocumentationLink.DemoPageLink<Dialogs>("Demo View"),
                 DocumentationLink.DemoPageLink<DialogsViewModel>("Demo View Model", "Domain"),
                 DocumentationLink.ApiLink<DialogHost>()
-            })
+            ])
         {
             HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Auto
         };
@@ -402,23 +379,21 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "Drawer",
             typeof(Drawers),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Drawers>("Demo View"),
                 DocumentationLink.ApiLink<DrawerHost>()
-            });
+            ]);
 
         yield return new DemoItem(
             "Snackbar",
             typeof(Snackbars),
-            new[]
-            {
+            [
                 DocumentationLink.WikiLink("Snackbar", "Snackbar"),
                 DocumentationLink.DemoPageLink<Snackbars>(),
                 DocumentationLink.StyleLink("Snackbar"),
                 DocumentationLink.ApiLink<Snackbar>(),
                 DocumentationLink.ApiLink<ISnackbarMessageQueue>()
-            })
+            ])
         {
             HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Auto
         };
@@ -426,24 +401,22 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "Transition",
             typeof(Transitions),
-            new[]
-            {
+            [
                 DocumentationLink.WikiLink("Transitions", "Transitions"),
                 DocumentationLink.DemoPageLink<Transitions>(),
                 DocumentationLink.ApiLink<Transitioner>("Transitions"),
                 DocumentationLink.ApiLink<TransitionerSlide>("Transitions"),
                 DocumentationLink.ApiLink<TransitioningContent>("Transitions"),
-            });
+            ]);
 
         yield return new DemoItem(
             "Elevation",
             typeof(Elevation),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<Elevation>(),
                 DocumentationLink.StyleLink("Shadows"),
                 DocumentationLink.SpecsLink("https://material.io/design/environment/elevation.html", "Elevation")
-            })
+            ])
         {
             HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Disabled,
         };
@@ -451,11 +424,10 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "Smart Hint",
             typeof(SmartHint),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<SmartHint>(),
                 DocumentationLink.StyleLink("SmartHint"),
-            })
+            ])
         {
             //The smart hint view handles its own scrolling
             HorizontalScrollBarVisibilityRequirement = ScrollBarVisibility.Disabled,
@@ -465,30 +437,35 @@ private static IEnumerable<DemoItem> GenerateDemoItems(ISnackbarMessageQueue sna
         yield return new DemoItem(
             "PopupBox",
             typeof(PopupBox),
-            new[]
-            {
+            [
                 DocumentationLink.DemoPageLink<PopupBox>(),
                 DocumentationLink.StyleLink("PopupBox"),
-            });
+            ]);
 
-        yield return new DemoItem(nameof(NumericUpDown), typeof(NumericUpDown), new[]
-        {
+        yield return new DemoItem(nameof(NumericUpDown), typeof(NumericUpDown),
+        [
             DocumentationLink.DemoPageLink<NumericUpDown>(),
             DocumentationLink.StyleLink(nameof(NumericUpDown)),
             DocumentationLink.ApiLink<NumericUpDown>(),
             DocumentationLink.ApiLink<DecimalUpDown>(),
             DocumentationLink.ApiLink<UpDownBase>()
-        });
+        ]);
     }
 
     private bool DemoItemsFilter(object obj)
     {
-        if (string.IsNullOrWhiteSpace(_searchKeyword))
+        string? searchKeyword = SearchKeyword;
+
+        if (string.IsNullOrWhiteSpace(searchKeyword))
         {
             return true;
         }
 
         return obj is DemoItem item
-               && item.Name.ToLower().Contains(_searchKeyword!.ToLower());
+#if NET6_0_OR_GREATER
+               && item.Name.Contains(searchKeyword, StringComparison.OrdinalIgnoreCase);
+#else
+               && item.Name.IndexOf(searchKeyword, StringComparison.OrdinalIgnoreCase) >= 0;
+#endif
     }
 }
diff --git a/src/MainDemo.Wpf/MainWindow.xaml b/src/MainDemo.Wpf/MainWindow.xaml
index 598b362250..d88dbb49c5 100644
--- a/src/MainDemo.Wpf/MainWindow.xaml
+++ b/src/MainDemo.Wpf/MainWindow.xaml
@@ -186,6 +186,11 @@
                 <Separator />
 
                 <Button Click="MenuPopupButton_OnClick" Content="Goodbye" />
+
+                <Separator />
+
+                <TextBlock Text="{Binding NugetVersions}" TextWrapping="Wrap" Margin="10" />
+
               </StackPanel>
             </materialDesign:PopupBox>
 
diff --git a/src/MainDemo.Wpf/MainWindow.xaml.cs b/src/MainDemo.Wpf/MainWindow.xaml.cs
index 411e89c838..41e24837b7 100644
--- a/src/MainDemo.Wpf/MainWindow.xaml.cs
+++ b/src/MainDemo.Wpf/MainWindow.xaml.cs
@@ -13,9 +13,10 @@ public MainWindow()
     {
         InitializeComponent();
 
+
         Task.Factory.StartNew(() => Thread.Sleep(2500)).ContinueWith(t =>
         {
-            //note you can use the message queue from any thread, but just for the demo here we 
+            //note you can use the message queue from any thread, but just for the demo here we
             //need to get the message queue from the snackbar, so need to be on the dispatcher
             MainSnackbar.MessageQueue?.Enqueue("Welcome to Material Design In XAML Toolkit");
         }, TaskScheduler.FromCurrentSynchronizationContext());
@@ -114,4 +115,5 @@ private static void ModifyTheme(bool isDarkTheme)
 
     private void OnSelectedItemChanged(object sender, DependencyPropertyChangedEventArgs e)
         => MainScrollViewer.ScrollToHome();
+    
 }
diff --git a/src/MainDemo.Wpf/MaterialDesignDemo.csproj b/src/MainDemo.Wpf/MaterialDesignDemo.csproj
index bcd9ee7643..c461bb71dc 100644
--- a/src/MainDemo.Wpf/MaterialDesignDemo.csproj
+++ b/src/MainDemo.Wpf/MaterialDesignDemo.csproj
@@ -49,4 +49,4 @@
     <PackageReference Include="ShowMeTheXAML.AvalonEdit" />
     <PackageReference Include="ShowMeTheXAML.MSBuild" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj b/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj
index 072d284566..f92936d0a5 100644
--- a/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj
+++ b/src/MaterialDesignColors.Wpf/MaterialDesignColors.Wpf.csproj
@@ -12,4 +12,11 @@
     <Version>$(MDIXColorsVersion)</Version>
     <AssemblyVersion>$(MDIXColorsVersion)</AssemblyVersion>
   </PropertyGroup>
+
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>MDIXColorsVersion</_Parameter1>
+      <_Parameter2>$(MDIXColorsVersion)</_Parameter2>
+    </AssemblyAttribute>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj b/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
index 2dc5d622cd..262be69548 100644
--- a/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
+++ b/src/MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj
@@ -34,4 +34,12 @@
   <ItemGroup>
     <ProjectReference Include="..\MaterialDesignColors.Wpf\MaterialDesignColors.Wpf.csproj" />
   </ItemGroup>
+
+  <!-- This passes the environment variable values into assembly attributes that can be read in code -->
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>MDIXVersion</_Parameter1>
+      <_Parameter2>$(MDIXVersion)</_Parameter2>
+    </AssemblyAttribute>
+  </ItemGroup>
 </Project>
\ No newline at end of file