diff --git a/BatchConfigUpdater/VM_BatchConfigUpdater.cs b/BatchConfigUpdater/VM_BatchConfigUpdater.cs
index 5d394b9e..ff0d4247 100644
--- a/BatchConfigUpdater/VM_BatchConfigUpdater.cs
+++ b/BatchConfigUpdater/VM_BatchConfigUpdater.cs
@@ -24,7 +24,7 @@ public VM_BatchConfigUpdater()
 
                     if (errors.Any())
                     {
-                        CustomMessageBox.DisplayNotificationOK("Errors", String.Join(Environment.NewLine, errors));
+                        MessageWindow.DisplayNotificationOK("Errors", String.Join(Environment.NewLine, errors));
                     }
                 }
             }
diff --git a/SynthEBD/App.xaml.cs b/SynthEBD/App.xaml.cs
index e2bb62ea..475f8a15 100644
--- a/SynthEBD/App.xaml.cs
+++ b/SynthEBD/App.xaml.cs
@@ -65,14 +65,6 @@ public int StandaloneOpen()
         var navPanel = container.Resolve<VM_NavPanel>();
         navPanel.GoToMainMenu();
 
-        var customMessages = container.Resolve<CustomMessageBox>();
-        customMessages.AllowMessageDisplay();
-
-        //special case - MaterialMessageBox causes main window to close if it's called before window.Show(), so have to call these functions now
-        //update 2023 08 09 - it looks like MaterialMessageBox is fine as long as it's called after the window is declared, not when window.Show() is called. Not changing the function calls below because they work fine, but
-        // for future reference it's fine to call MaterialMessageBox any time after the window is declared -- currently used by mainVM.Init()
-        //update 2023 08 21 - Moved these functions to ViewModelLoader now that they're ok to call before window.Show()
-
         return 0;
     }
 
@@ -98,9 +90,6 @@ public int OpenForSettings(IOpenForSettingsState state)
         mainVM.Init();
         window.Show();
 
-        var customMessages = container.Resolve<CustomMessageBox>();
-        customMessages.AllowMessageDisplay();
-
         return 0;
     }
 
@@ -253,7 +242,7 @@ private void Application_DispatcherUnhandledException(object sender, System.Wind
         }
 
         var errorMessage = sb.ToString();
-        CustomMessageBox.DisplayNotificationOK("SynthEBD has crashed.", errorMessage);
+        MessageWindow.DisplayNotificationOK("SynthEBD has crashed.", errorMessage);
 
 
         var path = Path.Combine(_settingsSourceProvider.DefaultSettingsRootPath, "Logs", "Crash Logs", DateTime.Now.ToString("yyyy-MM-dd-HH-mm", System.Globalization.CultureInfo.InvariantCulture) + ".txt");
diff --git a/SynthEBD/Classes_Aux/ViewModels/VM_AssetDistributionSimulator.cs b/SynthEBD/Classes_Aux/ViewModels/VM_AssetDistributionSimulator.cs
index 15122a3a..bd498cae 100644
--- a/SynthEBD/Classes_Aux/ViewModels/VM_AssetDistributionSimulator.cs
+++ b/SynthEBD/Classes_Aux/ViewModels/VM_AssetDistributionSimulator.cs
@@ -115,11 +115,11 @@ public bool SimulatePrimaryDistribution()
         {
             Clear();
             if (PrimaryAPs is null || !PrimaryAPs.Any()) {
-                CustomMessageBox.DisplayNotificationOK("Cannot Simulate Distribution", "No Primary Config Files are selected in the Active Config Files list");
+                MessageWindow.DisplayNotificationOK("Cannot Simulate Distribution", "No Primary Config Files are selected in the Active Config Files list");
                 return false; 
             }
             if (NPCformKey.IsNull) {
-                CustomMessageBox.DisplayNotificationOK("Cannot Simulate Distribution", "No NPC is selected");
+                MessageWindow.DisplayNotificationOK("Cannot Simulate Distribution", "No NPC is selected");
                 return false; 
             }
 
@@ -129,7 +129,7 @@ public bool SimulatePrimaryDistribution()
 
             if (!flattenedAssetPacks.Any())
             {
-                CustomMessageBox.DisplayNotificationOK("Cannot Simulate Distribution", "No Primary Config Files with the same gender as " + _logger.GetNPCLogNameString(NPCgetter) + " are selected in the Active Config Files list");
+                MessageWindow.DisplayNotificationOK("Cannot Simulate Distribution", "No Primary Config Files with the same gender as " + _logger.GetNPCLogNameString(NPCgetter) + " are selected in the Active Config Files list");
                 return false;
             }
 
@@ -247,7 +247,7 @@ public void DislpayFullReportPopup(NPCInfo npcInfo)
             output.Add(npcInfo.Report.RootElement);
 
             var outputStr = Logger.FormatLogStringIndents(output.ToString());
-            CustomMessageBox.DisplayNotificationOK("Copy this to a text editor: Notepad++ is recommended", outputStr);
+            MessageWindow.DisplayNotificationOK("Copy this to a text editor: Notepad++ is recommended", outputStr);
         }
 
 
@@ -270,7 +270,7 @@ public VM_ReportCountableStringWrapper(CountableString str)
                 ReferencedStr = str;
                 ExplainCommand = new RelayCommand(canExecute: _ => true, execute: _ =>
                 {
-                    CustomMessageBox.DisplayNotificationOK("Explanation", ExplainStr);
+                    MessageWindow.DisplayNotificationOK("Explanation", ExplainStr);
                 });
             }
 
diff --git a/SynthEBD/Classes_Aux/ViewModels/VM_AttributeGroup.cs b/SynthEBD/Classes_Aux/ViewModels/VM_AttributeGroup.cs
index 219814ce..8d86abfe 100644
--- a/SynthEBD/Classes_Aux/ViewModels/VM_AttributeGroup.cs
+++ b/SynthEBD/Classes_Aux/ViewModels/VM_AttributeGroup.cs
@@ -85,7 +85,7 @@ public void CheckGroupForCircularReferences()
         {
             if (CheckMemberForCircularReference(attribute, circularRefs, ParentMenu.Groups))
             {
-                CustomMessageBox.DisplayNotificationOK("Attribute Group Error", "Circular reference detected: " + string.Join(" -> ", circularRefs));
+                MessageWindow.DisplayNotificationOK("Attribute Group Error", "Circular reference detected: " + string.Join(" -> ", circularRefs));
                 var groupAttribute = attribute.MostRecentlyEditedShell.Attribute as VM_NPCAttributeGroup;
                 if (groupAttribute != null)
                 {
diff --git a/SynthEBD/Classes_Aux/ViewModels/VM_BodySlideExchange.cs b/SynthEBD/Classes_Aux/ViewModels/VM_BodySlideExchange.cs
index d6d23770..25ae106e 100644
--- a/SynthEBD/Classes_Aux/ViewModels/VM_BodySlideExchange.cs
+++ b/SynthEBD/Classes_Aux/ViewModels/VM_BodySlideExchange.cs
@@ -98,7 +98,7 @@ public bool Export()
                 JSONhandler<BodySlideExchange>.SaveJSONFile(exchange, savePath, out bool success, out string exception);
                 if (!success)
                 {
-                    CustomMessageBox.DisplayNotificationOK("Export Failed", exception);
+                    MessageWindow.DisplayNotificationOK("Export Failed", exception);
                     closeWindow = false;
                 }
             }
@@ -215,11 +215,11 @@ public bool Import()
             var exchange = JSONhandler<BodySlideExchange>.LoadJSONFile(loadPath, out bool success, out string exception);
             if (!success)
             {
-                CustomMessageBox.DisplayNotificationOK("Import Failed", exception);
+                MessageWindow.DisplayNotificationOK("Import Failed", exception);
                 return false;
             }
 
-            if (CustomMessageBox.DisplayNotificationYesNo("Settings Backup", "Back up your current BodySlide settings before importing?"))
+            if (MessageWindow.DisplayNotificationYesNo("Settings Backup", "Back up your current BodySlide settings before importing?"))
             {
                 var currentSettings = _oBodyUI.DumpViewModelToModel();
                 if (currentSettings != null && IO_Aux.SelectFileSave("", "Bodyslide Settings files (.json|*.json", ".json", "Save BodySlide Settings", out string savePath, "OBodySettings.json"))
@@ -227,7 +227,7 @@ public bool Import()
                     JSONhandler<Settings_OBody>.SaveJSONFile(currentSettings, savePath, out bool succes, out string saveException);
                     if (!succes)
                     {
-                        CustomMessageBox.DisplayNotificationOK("Failed to save settings", "Settings could not be saved. Error: " + Environment.NewLine + Environment.NewLine + saveException);
+                        MessageWindow.DisplayNotificationOK("Failed to save settings", "Settings could not be saved. Error: " + Environment.NewLine + Environment.NewLine + saveException);
                         return false;
                     }
                 }
@@ -261,7 +261,7 @@ public bool Import()
             _oBodyUI.DescriptorUI.MergeInMissingModels(exchange.TemplateDescriptors, DescriptorMergeMode, mergedDescriptors);
             if (mergedDescriptors.Any())
             {
-                CustomMessageBox.DisplayNotificationOK("Descriptor Merge", "The following already existing Descriptors were merged from the imported file. Please check their associated distribution rules to make sure the merged product is consistent with your preferences." + Environment.NewLine + string.Join(Environment.NewLine, mergedDescriptors));
+                MessageWindow.DisplayNotificationOK("Descriptor Merge", "The following already existing Descriptors were merged from the imported file. Please check their associated distribution rules to make sure the merged product is consistent with your preferences." + Environment.NewLine + string.Join(Environment.NewLine, mergedDescriptors));
             }
 
             List<(string, int, int)> multiplexWarnings = new();
@@ -277,7 +277,7 @@ public bool Import()
                 }
 
                 string dispStr = "Could not import annotations for the following BodySlides because the number of existing entries in your BodySlide Settings does not match the number of annotations in the exchange file. Either adjust the number of your entries to match by copying/deleting the existing one(s), or delete all but one, and then try importing again." + Environment.NewLine + Environment.NewLine + string.Join(Environment.NewLine + Environment.NewLine, warnStrs);
-                CustomMessageBox.DisplayNotificationOK("Import Warnings", dispStr);
+                MessageWindow.DisplayNotificationOK("Import Warnings", dispStr);
             }
 
             return true;
diff --git a/SynthEBD/Classes_Aux/ViewModels/VM_FilePathReplacement.cs b/SynthEBD/Classes_Aux/ViewModels/VM_FilePathReplacement.cs
index 656fd33b..f6500e8e 100644
--- a/SynthEBD/Classes_Aux/ViewModels/VM_FilePathReplacement.cs
+++ b/SynthEBD/Classes_Aux/ViewModels/VM_FilePathReplacement.cs
@@ -71,7 +71,7 @@ public VM_FilePathReplacement(VM_FilePathReplacementMenu parentMenu, IEnvironmen
                     }
                     else
                     {
-                        CustomMessageBox.DisplayNotificationOK("Parsing Error", "Cannot figure out where the Data folder is within the supplied path. You will need to edit the path so that it starts one folder beneath the Data folder.");
+                        MessageWindow.DisplayNotificationOK("Parsing Error", "Cannot figure out where the Data folder is within the supplied path. You will need to edit the path so that it starts one folder beneath the Data folder.");
                         Source = dialog.FileName;
                     }
 
diff --git a/SynthEBD/Classes_Aux/ViewModels/VM_HeadPartImport.cs b/SynthEBD/Classes_Aux/ViewModels/VM_HeadPartImport.cs
index 07eecad1..76ea31d1 100644
--- a/SynthEBD/Classes_Aux/ViewModels/VM_HeadPartImport.cs
+++ b/SynthEBD/Classes_Aux/ViewModels/VM_HeadPartImport.cs
@@ -217,7 +217,7 @@ public void ImportSelections()
 
             if (skippedImports.Any())
             {
-                CustomMessageBox.DisplayNotificationOK("Duplicate Imports", "The following head parts were previously imported and will be skipped: " + Environment.NewLine + String.Join(Environment.NewLine, skippedImports));
+                MessageWindow.DisplayNotificationOK("Duplicate Imports", "The following head parts were previously imported and will be skipped: " + Environment.NewLine + String.Join(Environment.NewLine, skippedImports));
             }
 
             _logger.CallTimedNotifyStatusUpdateAsync("Imported " + importCount + " head parts.", 5);
diff --git a/SynthEBD/Classes_Aux/ViewModels/VM_HeadPartList.cs b/SynthEBD/Classes_Aux/ViewModels/VM_HeadPartList.cs
index 512ffcbf..88a68c87 100644
--- a/SynthEBD/Classes_Aux/ViewModels/VM_HeadPartList.cs
+++ b/SynthEBD/Classes_Aux/ViewModels/VM_HeadPartList.cs
@@ -74,7 +74,7 @@ public VM_HeadPartList(ObservableCollection<VM_RaceGrouping> raceGroupingVMs,
             DeleteAll = new RelayCommand(
                 canExecute: _ => true,
                 execute: _ => { 
-                    if (CustomMessageBox.DisplayNotificationYesNo("Batch Deletion", "Are you sure you want to delete all headparts in this list?"))
+                    if (MessageWindow.DisplayNotificationYesNo("Batch Deletion", "Are you sure you want to delete all headparts in this list?"))
                     {
                         foreach (var hp in DisplayedList.ToArray())
                         {
diff --git a/SynthEBD/Classes_Aux/ViewModels/VM_MessageWindow.cs b/SynthEBD/Classes_Aux/ViewModels/VM_MessageWindow.cs
new file mode 100644
index 00000000..26772611
--- /dev/null
+++ b/SynthEBD/Classes_Aux/ViewModels/VM_MessageWindow.cs
@@ -0,0 +1,119 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace SynthEBD
+{
+    public class MessageWindow
+    {
+        public static void DisplayNotificationOK(string header, string text)
+        {
+            var box = new VM_MessageWindowOK(header, text);
+            box.Show();
+        }
+        public static void DisplayNotificationOK(string header, ICollection<string> text, string separator)
+        {
+            var box = new VM_MessageWindowOK(header, string.Join(separator, text));
+            box.Show();
+        }
+        public static bool DisplayNotificationYesNo(string header, string text)
+        {
+            var box = new VM_MessageWindowYesNo(header, text);
+            box.Show();
+
+            return box.Result;
+        }
+        public static bool DisplayNotificationYesNo(string header, ICollection<string> text, string separator)
+        {
+            var box = new VM_MessageWindowYesNo(header, string.Join(separator, text));
+            box.Show();
+
+            return box.Result;
+        }
+    }
+
+    public class VM_MessageWindowOK : VM
+    {
+        public VM_MessageWindowOK(string header, string text)
+        {
+            Header = header;
+            Text = text;
+            _window = new();
+
+            OkCommand = new RelayCommand(
+                canExecute: _ => true,
+                execute: _ =>
+                {
+                    _window.Close();
+                });
+
+            CopyTextCommand = new RelayCommand(
+                canExecute: _ => true,
+                execute: _ =>
+                {
+                    Clipboard.SetText(Text);
+                });
+        }
+
+        public string Header { get; set; }
+        public string Text { get; set; }
+        private Window_MessageWindowOK _window { get; }
+        public RelayCommand OkCommand { get; }
+        public RelayCommand CopyTextCommand { get; }
+
+        public void Show()
+        {
+            _window.DataContext = this;
+            _window.ShowDialog();
+        }
+    }
+
+    public class VM_MessageWindowYesNo : VM
+    {
+        public VM_MessageWindowYesNo(string header, string text)
+        {
+            Header = header;
+            Text = text;
+            _window = new();
+
+            YesCommand = new RelayCommand(
+                canExecute: _ => true,
+                execute: _ =>
+                {
+                    Result = true;
+                    _window.Close();
+                });
+
+            NoCommand = new RelayCommand(
+                canExecute: _ => true,
+                execute: _ =>
+                {
+                    Result = false;
+                    _window.Close();
+                });
+
+            CopyTextCommand = new RelayCommand(
+                canExecute: _ => true,
+                execute: _ =>
+                {
+                    Clipboard.SetText(Text);
+                });
+        }
+
+        public string Header { get; set; }
+        public string Text { get; set; }
+        public bool Result { get; set; }
+        private Window_MessageWindowYesNo _window { get; }
+        public RelayCommand YesCommand { get; }
+        public RelayCommand NoCommand { get; }
+        public RelayCommand CopyTextCommand { get; }
+        public void Show()
+        {
+            _window.DataContext = this;
+            _window.ShowDialog();
+        }
+    }
+}
diff --git a/SynthEBD/Classes_Aux/ViewModels/VM_PositionalSubgroupContainerCollection.cs b/SynthEBD/Classes_Aux/ViewModels/VM_PositionalSubgroupContainerCollection.cs
index db7d5111..90228ec6 100644
--- a/SynthEBD/Classes_Aux/ViewModels/VM_PositionalSubgroupContainerCollection.cs
+++ b/SynthEBD/Classes_Aux/ViewModels/VM_PositionalSubgroupContainerCollection.cs
@@ -127,7 +127,7 @@ public void Drop(IDropInfo dropInfo)
                         {
                             if (collectionViewModel.ContainsSubgroup(draggedSubgroup))
                             {
-                                CustomMessageBox.DisplayNotificationOK("Invalid Operation", "This list already contains subgroup " + draggedSubgroup.ID + ": " + draggedSubgroup.Name);
+                                MessageWindow.DisplayNotificationOK("Invalid Operation", "This list already contains subgroup " + draggedSubgroup.ID + ": " + draggedSubgroup.Name);
                             }
                             else
                             {
diff --git a/SynthEBD/Classes_Aux/Views/Window_MessageWindowOK.xaml b/SynthEBD/Classes_Aux/Views/Window_MessageWindowOK.xaml
new file mode 100644
index 00000000..50e9ca84
--- /dev/null
+++ b/SynthEBD/Classes_Aux/Views/Window_MessageWindowOK.xaml
@@ -0,0 +1,26 @@
+<Window x:Class="SynthEBD.Window_MessageWindowOK"
+        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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        d:DataContext="{d:DesignInstance Type=local:VM_MessageWindowOK}"
+        xmlns:local="clr-namespace:SynthEBD"
+        mc:Ignorable="d"
+        Title="{Binding Header}" Height="450" Width="800">
+    <Grid>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+
+            <ScrollViewer Grid.Row="0">
+                <TextBox Text="{Binding Path=Text, Mode=OneWay}" Foreground="White" Background="Transparent" BorderThickness="0" IsReadOnly="True" TextWrapping="Wrap" FontSize="12"/>
+            </ScrollViewer>
+            <StackPanel Grid.Row="1" Orientation="Horizontal">
+                <Button Foreground="Green" Content="OK" Command="{Binding OkCommand}" FontSize="18"/>
+                <Button Foreground="White" FontSize="18" Content="Copy Message" Command="{Binding CopyTextCommand}" Margin="15 0 0 0"/>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/SynthEBD/Classes_Aux/Views/Window_MessageWindowOK.xaml.cs b/SynthEBD/Classes_Aux/Views/Window_MessageWindowOK.xaml.cs
new file mode 100644
index 00000000..68166a9a
--- /dev/null
+++ b/SynthEBD/Classes_Aux/Views/Window_MessageWindowOK.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace SynthEBD
+{
+    /// <summary>
+    /// Interaction logic for Window_MessageWindowOK.xaml
+    /// </summary>
+    public partial class Window_MessageWindowOK : Window
+    {
+        public Window_MessageWindowOK()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/SynthEBD/Classes_Aux/Views/Window_MessageWindowYesNo.xaml b/SynthEBD/Classes_Aux/Views/Window_MessageWindowYesNo.xaml
new file mode 100644
index 00000000..a181a00a
--- /dev/null
+++ b/SynthEBD/Classes_Aux/Views/Window_MessageWindowYesNo.xaml
@@ -0,0 +1,27 @@
+<Window x:Class="SynthEBD.Window_MessageWindowYesNo"
+        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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        d:DataContext="{d:DesignInstance Type=local:VM_MessageWindowYesNo}"
+        xmlns:local="clr-namespace:SynthEBD"
+        mc:Ignorable="d"
+        Title="{Binding Header}" Height="450" Width="800">
+    <Grid>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*"/>
+                <RowDefinition Height="auto"/>
+            </Grid.RowDefinitions>
+
+            <ScrollViewer Grid.Row="0">
+                <TextBox Text="{Binding Path=Text, Mode=OneWay}" Foreground="White" Background="Transparent" BorderThickness="0" IsReadOnly="True" TextWrapping="Wrap" FontSize="12"/>
+            </ScrollViewer>
+            <StackPanel Grid.Row="1" Orientation="Horizontal">
+                <Button Foreground="Green" FontSize="18" Content="Yes" Command="{Binding YesCommand}"/>
+                <Button Foreground="Firebrick" FontSize="18" Content="No" Command="{Binding NoCommand}" Margin="15 0 0 0"/>
+                <Button Foreground="White" FontSize="18" Content="Copy Message" Command="{Binding CopyTextCommand}" Margin="15 0 0 0"/>
+            </StackPanel>
+        </Grid>
+    </Grid>
+</Window>
\ No newline at end of file
diff --git a/SynthEBD/Classes_Aux/Views/Window_MessageWindowYesNo.xaml.cs b/SynthEBD/Classes_Aux/Views/Window_MessageWindowYesNo.xaml.cs
new file mode 100644
index 00000000..eb3f3125
--- /dev/null
+++ b/SynthEBD/Classes_Aux/Views/Window_MessageWindowYesNo.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace SynthEBD
+{
+    /// <summary>
+    /// Interaction logic for Window_MessageWindowYesNo.xaml
+    /// </summary>
+    public partial class Window_MessageWindowYesNo : Window
+    {
+        public Window_MessageWindowYesNo()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/SynthEBD/Classes_Core/Models/AssetPack.cs b/SynthEBD/Classes_Core/Models/AssetPack.cs
index 1e3882a3..0fcc1c09 100644
--- a/SynthEBD/Classes_Core/Models/AssetPack.cs
+++ b/SynthEBD/Classes_Core/Models/AssetPack.cs
@@ -492,7 +492,7 @@ public AssetPack ToSynthEBDAssetPack(List<RaceGrouping> raceGroupings, List<Skyr
             string logPath = System.IO.Path.Combine(paths.LogFolderPath, logFile);
             Task.Run(() => PatcherIO.WriteTextFile(logPath, conversionErrors, logger));
             logger.LogMessage(conversionErrors);
-            CustomMessageBox.DisplayNotificationOK("Import Error", "Errors were encountered during upgrade of a zEBD Config File. Please see log at " + logPath + ".");
+            MessageWindow.DisplayNotificationOK("Import Error", "Errors were encountered during upgrade of a zEBD Config File. Please see log at " + logPath + ".");
         }
 
         return s;
diff --git a/SynthEBD/Classes_Core/ViewModels/BodyGenConfig SubModels/VM_BodyGenTemplateMenu.cs b/SynthEBD/Classes_Core/ViewModels/BodyGenConfig SubModels/VM_BodyGenTemplateMenu.cs
index 0f15e385..585cd1ee 100644
--- a/SynthEBD/Classes_Core/ViewModels/BodyGenConfig SubModels/VM_BodyGenTemplateMenu.cs	
+++ b/SynthEBD/Classes_Core/ViewModels/BodyGenConfig SubModels/VM_BodyGenTemplateMenu.cs	
@@ -47,7 +47,7 @@ public VM_BodyGenTemplateMenu(VM_BodyGenConfig parentConfig, ObservableCollectio
             {
                 if (IO_Aux.SelectFile("", "INI files (*.ini)|*.ini", "Select the Templates.ini file", out string templatePath))
                 {
-                    if (System.IO.Path.GetFileName(templatePath).Equals("morphs.ini", StringComparison.OrdinalIgnoreCase) && !CustomMessageBox.DisplayNotificationYesNo("Confirm File Name", "Expecting templates.ini but this file is morphs.ini, which should be imported in the Specific NPC Assignments Menu. Are you sure you want to continue?"))
+                    if (System.IO.Path.GetFileName(templatePath).Equals("morphs.ini", StringComparison.OrdinalIgnoreCase) && !MessageWindow.DisplayNotificationYesNo("Confirm File Name", "Expecting templates.ini but this file is morphs.ini, which should be imported in the Specific NPC Assignments Menu. Are you sure you want to continue?"))
                     {
                         return;
                     }
diff --git a/SynthEBD/Classes_Core/ViewModels/OBody SubModels/VM_BodySlideSetting.cs b/SynthEBD/Classes_Core/ViewModels/OBody SubModels/VM_BodySlideSetting.cs
index 4368ec3a..0ee5e84d 100644
--- a/SynthEBD/Classes_Core/ViewModels/OBody SubModels/VM_BodySlideSetting.cs	
+++ b/SynthEBD/Classes_Core/ViewModels/OBody SubModels/VM_BodySlideSetting.cs	
@@ -56,7 +56,7 @@ public VM_BodySlideSetting(VM_BodySlidePlaceHolder associatedPlaceHolder, Observ
             execute: _ => {
                 if (!ReferenceUnlocked)
                 {
-                    if (CustomMessageBox.DisplayNotificationYesNo("Confirm Unlock", "Bodyslide is exactly the name that will be fed to O/AutoBody and is expected to be read from the data in your CalienteTools\\BodySlide\\SliderPresets directory. Are you sure you want to unlock it for editing?"))
+                    if (MessageWindow.DisplayNotificationYesNo("Confirm Unlock", "Bodyslide is exactly the name that will be fed to O/AutoBody and is expected to be read from the data in your CalienteTools\\BodySlide\\SliderPresets directory. Are you sure you want to unlock it for editing?"))
                     {
                         UnlockReference();
                     }
diff --git a/SynthEBD/Classes_Core/ViewModels/OBody SubModels/VM_BodySlidesMenu.cs b/SynthEBD/Classes_Core/ViewModels/OBody SubModels/VM_BodySlidesMenu.cs
index 2e244637..5b147083 100644
--- a/SynthEBD/Classes_Core/ViewModels/OBody SubModels/VM_BodySlidesMenu.cs	
+++ b/SynthEBD/Classes_Core/ViewModels/OBody SubModels/VM_BodySlidesMenu.cs	
@@ -32,7 +32,7 @@ public VM_BodySlidesMenu(ObservableCollection<VM_RaceGrouping> raceGroupingVMs,
             canExecute: _ => true,
             execute: x =>
             {
-                if (CustomMessageBox.DisplayNotificationYesNo("", "Are you sure you want to remove all displayed BodySlides that are not in your current game environment?"))
+                if (MessageWindow.DisplayNotificationYesNo("", "Are you sure you want to remove all displayed BodySlides that are not in your current game environment?"))
                 {
                     for (int i = 0; i < CurrentlyDisplayedBodySlides.Count; i++)
                     {
@@ -49,7 +49,7 @@ public VM_BodySlidesMenu(ObservableCollection<VM_RaceGrouping> raceGroupingVMs,
             canExecute: _ => true,
             execute: x =>
             {
-                if (CustomMessageBox.DisplayNotificationYesNo("", "Are you sure you want to remove all displayed BodySlides that are not currently annotated with Body Shape Descriptors?"))
+                if (MessageWindow.DisplayNotificationYesNo("", "Are you sure you want to remove all displayed BodySlides that are not currently annotated with Body Shape Descriptors?"))
                 {
                     for (int i = 0; i < CurrentlyDisplayedBodySlides.Count; i++)
                     {
@@ -66,7 +66,7 @@ public VM_BodySlidesMenu(ObservableCollection<VM_RaceGrouping> raceGroupingVMs,
             canExecute: _ => true,
             execute: x =>
             {
-                if (CustomMessageBox.DisplayNotificationYesNo("", "Are you sure you want to remove all displayed BodySlides?"))
+                if (MessageWindow.DisplayNotificationYesNo("", "Are you sure you want to remove all displayed BodySlides?"))
                 {
                     for (int i = 0; i < CurrentlyDisplayedBodySlides.Count; i++)
                     {
diff --git a/SynthEBD/Classes_Core/ViewModels/VM_AssetPack.cs b/SynthEBD/Classes_Core/ViewModels/VM_AssetPack.cs
index 47c6aeec..e205a4dc 100644
--- a/SynthEBD/Classes_Core/ViewModels/VM_AssetPack.cs
+++ b/SynthEBD/Classes_Core/ViewModels/VM_AssetPack.cs
@@ -238,7 +238,7 @@ public VM_AssetPack(
 
                 if (Validate(bgConfigs, oBodySettings, out List<string> errors))
                 {
-                    CustomMessageBox.DisplayNotificationOK("Validation", "No errors found.");
+                    MessageWindow.DisplayNotificationOK("Validation", "No errors found.");
                 }
                 else
                 {
@@ -256,7 +256,7 @@ public VM_AssetPack(
             canExecute: _ => true,
             execute: _ => {
                 var disabledSubgroups = GetDisabledSubgroups();
-                CustomMessageBox.DisplayNotificationOK("Disabled Subgroups", string.Join(Environment.NewLine, disabledSubgroups));
+                MessageWindow.DisplayNotificationOK("Disabled Subgroups", string.Join(Environment.NewLine, disabledSubgroups));
             }
         );
 
@@ -264,7 +264,7 @@ public VM_AssetPack(
             canExecute: _ => true,
             execute: _ => {
                 var rules = GetCustomRules();
-                CustomMessageBox.DisplayNotificationOK("Custom Rules", string.Join(Environment.NewLine, rules));
+                MessageWindow.DisplayNotificationOK("Custom Rules", string.Join(Environment.NewLine, rules));
             }
         );
 
@@ -653,7 +653,7 @@ public void AutoGenerateSubgroupIDs()
 
     public void RemoveAssetPackDialog()
     {
-        bool result = CustomMessageBox.DisplayNotificationYesNo("Confirm Deletion", "Are you sure you want to permanently delete this config file?");
+        bool result = MessageWindow.DisplayNotificationYesNo("Confirm Deletion", "Are you sure you want to permanently delete this config file?");
             
         switch (result)
         {
@@ -714,12 +714,12 @@ public void MergeInAssetPack(string assetPackDirPath)
 
                 if (newSubgroupNames.Any())
                 {
-                    CustomMessageBox.DisplayNotificationOK("Config Merger", "The following subgroups were imported:" + Environment.NewLine + string.Join(Environment.NewLine, newSubgroupNames));
+                    MessageWindow.DisplayNotificationOK("Config Merger", "The following subgroups were imported:" + Environment.NewLine + string.Join(Environment.NewLine, newSubgroupNames));
                 }
             }
             else
             {
-                CustomMessageBox.DisplayNotificationOK("Config Merger", "That file could not be parsed as a valid Asset Config Plugin File.");
+                MessageWindow.DisplayNotificationOK("Config Merger", "That file could not be parsed as a valid Asset Config Plugin File.");
             }
         }
     }
@@ -819,13 +819,13 @@ public void RemovePreviousGenderRecordTemplates(Gender previousGender)
 
     public void SetDefaultTargetPaths()
     {
-        bool saveConfig = CustomMessageBox.DisplayNotificationYesNo("Save Config File?", "Save the config file before modifying destinations? (Recommended yes so you can use the Discard button to throw out incorrect changes).");
+        bool saveConfig = MessageWindow.DisplayNotificationYesNo("Save Config File?", "Save the config file before modifying destinations? (Recommended yes so you can use the Discard button to throw out incorrect changes).");
         if (saveConfig)
         {
             bool saved = SaveToModel(false);
             if (!saved)
             {
-                CustomMessageBox.DisplayNotificationOK("Save Failure", "Config file could not be saved. Destination paths will not be modified.");
+                MessageWindow.DisplayNotificationOK("Save Failure", "Config file could not be saved. Destination paths will not be modified.");
                 return;
             }
         }
@@ -884,11 +884,11 @@ public void SetDefaultTargetPaths()
 
         if (modifications.Any())
         {
-            CustomMessageBox.DisplayNotificationOK("Summary", "The following modifications were made: " + Environment.NewLine + Environment.NewLine + string.Join(Environment.NewLine + Environment.NewLine, modifications));
+            MessageWindow.DisplayNotificationOK("Summary", "The following modifications were made: " + Environment.NewLine + Environment.NewLine + string.Join(Environment.NewLine + Environment.NewLine, modifications));
         }
         else
         {
-            CustomMessageBox.DisplayNotificationOK("Summary", "No automatic modifications could be made based on the current Source and Destination paths.");
+            MessageWindow.DisplayNotificationOK("Summary", "No automatic modifications could be made based on the current Source and Destination paths.");
         }
     }
 
@@ -1305,7 +1305,7 @@ private void DeleteAssetFiles()
                         dispMessage += "Asset folders found at: " + Environment.NewLine + String.Join(Environment.NewLine, deletePrefixPaths) + Environment.NewLine + "Delete these folders?";
                     }
 
-                    if (CustomMessageBox.DisplayNotificationYesNo("", dispMessage))
+                    if (MessageWindow.DisplayNotificationYesNo("", dispMessage))
                     {
                         foreach (var directory in deletePrefixPaths)
                         {
@@ -1331,7 +1331,7 @@ private void DeleteAssetFiles()
                                 currentModDir = modDirectory;
                                 if (installationTokens.Count == 1)
                                 {
-                                    if (CustomMessageBox.DisplayNotificationYesNo("", "Delete asset folder at " + currentModDir + "?"))
+                                    if (MessageWindow.DisplayNotificationYesNo("", "Delete asset folder at " + currentModDir + "?"))
                                     {
                                         _auxIO.TryDeleteDirectory(currentModDir, true);
                                     }
@@ -1378,7 +1378,7 @@ private void DeleteAssetFiles()
             {
                 currentModDir = candidateAssetDirs.First();
                 dispMessage = "This config file was installed on a version of SynthEBD < 1.0.1.9 (or was generated using the Config Drafter), so there is no record of where assets were installed. Based on the paths in this config file, SynthEBD predicts they are in " + currentModDir + ". Do you want to delete this folder?";
-                if (CustomMessageBox.DisplayNotificationYesNo("PLEASE READ CAREFULLY", dispMessage))
+                if (MessageWindow.DisplayNotificationYesNo("PLEASE READ CAREFULLY", dispMessage))
                 {
                     _auxIO.TryDeleteDirectory(currentModDir, true);
                 }
@@ -1386,11 +1386,11 @@ private void DeleteAssetFiles()
             else if (candidateAssetDirs.Count > 1)
             {
                 dispMessage = "SynthEBD could not determine which of the following mod folders corresponds to this config file. If you want to delete the corresponding assets, you will need to do it manually from your mod manager." + Environment.NewLine + Environment.NewLine + String.Join(Environment.NewLine, candidateAssetDirs);
-                CustomMessageBox.DisplayNotificationOK("", dispMessage);
+                MessageWindow.DisplayNotificationOK("", dispMessage);
             }
             else
             {
-                CustomMessageBox.DisplayNotificationOK("", "Could not find the Assets Folder for this config file in your mod manager. If you want to delete the corresponding assets, you will need to do it manually from your mod manager.");
+                MessageWindow.DisplayNotificationOK("", "Could not find the Assets Folder for this config file in your mod manager. If you want to delete the corresponding assets, you will need to do it manually from your mod manager.");
             }
         }
 
@@ -1406,7 +1406,7 @@ private void DeleteAssetFiles()
             dispMessage = "The following assets are detected to be associated with this config file. Please read the following list carefully. If all files are from SynthEBD, press Yes to delete. If any of them are native game files, please press No and delete the SynthEBD files manually" + Environment.NewLine + Environment.NewLine;
             dispMessage += string.Join(Environment.NewLine, containedPaths);
 
-            if (containedPaths.Any() && CustomMessageBox.DisplayNotificationYesNo("PLEASE READ CAREFULLY", dispMessage))
+            if (containedPaths.Any() && MessageWindow.DisplayNotificationYesNo("PLEASE READ CAREFULLY", dispMessage))
             {
                 foreach (var path in containedPaths)
                 {
diff --git a/SynthEBD/Classes_Core/ViewModels/VM_BodyGenConfig.cs b/SynthEBD/Classes_Core/ViewModels/VM_BodyGenConfig.cs
index 5536a4d3..84853296 100644
--- a/SynthEBD/Classes_Core/ViewModels/VM_BodyGenConfig.cs
+++ b/SynthEBD/Classes_Core/ViewModels/VM_BodyGenConfig.cs
@@ -96,7 +96,7 @@ public VM_BodyGenConfig(
             canExecute: _ => true,
             execute: _ =>
             {
-                if (CustomMessageBox.DisplayNotificationYesNo("Confirmation", "Are you sure you want to permanently delete this BodyGen Config?"))
+                if (MessageWindow.DisplayNotificationYesNo("Confirmation", "Are you sure you want to permanently delete this BodyGen Config?"))
                 {
                     try
                     {
diff --git a/SynthEBD/Classes_Core/ViewModels/VM_Subgroup.cs b/SynthEBD/Classes_Core/ViewModels/VM_Subgroup.cs
index 46787179..60cea96d 100644
--- a/SynthEBD/Classes_Core/ViewModels/VM_Subgroup.cs
+++ b/SynthEBD/Classes_Core/ViewModels/VM_Subgroup.cs
@@ -172,11 +172,11 @@ public VM_Subgroup(
             execute: x => {
                 if (RenameTo.IsNullOrWhitespace())
                 {
-                    CustomMessageBox.DisplayNotificationOK("Renaming Error", "Subgroup Names cannot be blank or empty");
+                    MessageWindow.DisplayNotificationOK("Renaming Error", "Subgroup Names cannot be blank or empty");
                 }
                 else if (RenameFrom.Length == 0)
                 {
-                    CustomMessageBox.DisplayNotificationOK("Renaming Error", "Text to replace cannot be blank");
+                    MessageWindow.DisplayNotificationOK("Renaming Error", "Text to replace cannot be blank");
                 }
                 else
                 {
diff --git a/SynthEBD/FirstLaunch/FirstLaunch.cs b/SynthEBD/FirstLaunch/FirstLaunch.cs
index 6c820dbf..6f50242d 100644
--- a/SynthEBD/FirstLaunch/FirstLaunch.cs
+++ b/SynthEBD/FirstLaunch/FirstLaunch.cs
@@ -21,8 +21,7 @@ public class FirstLaunch
         private readonly VM_SettingsModManager _modManager;
         private readonly SettingsIO_AssetPack _assetIO;
         private readonly PatcherState _patcherState;
-        private readonly CustomMessageBox _customMessageBox;
-        public FirstLaunch(IEnvironmentStateProvider environmentProvider, SynthEBDPaths paths, Logger logger, VM_SettingsHeight heightSettingsVM, VM_SettingsModManager modManager, SettingsIO_AssetPack assetIO, PatcherState patcherState, VM_HeightConfig.Factory heightConfigFactory, VM_HeightAssignment.Factory heightAssignmentFactory, CustomMessageBox customMessageBox)
+        public FirstLaunch(IEnvironmentStateProvider environmentProvider, SynthEBDPaths paths, Logger logger, VM_SettingsHeight heightSettingsVM, VM_SettingsModManager modManager, SettingsIO_AssetPack assetIO, PatcherState patcherState, VM_HeightConfig.Factory heightConfigFactory, VM_HeightAssignment.Factory heightAssignmentFactory)
         {
             _environmentProvider = environmentProvider;
             _paths = paths;
@@ -33,7 +32,6 @@ public FirstLaunch(IEnvironmentStateProvider environmentProvider, SynthEBDPaths
             _patcherState = patcherState;
             _heightConfigFactory = heightConfigFactory;
             _heightAssignmentFactory = heightAssignmentFactory;
-            _customMessageBox = customMessageBox;
         }
 
         public void OnFirstLaunch()
@@ -95,7 +93,7 @@ private void ShowFirstRunMessage()
 If you are using a mod manager, start by going to the Mod Manager Integration menu and setting up your paths.
 If you don't want your patcher output going straight to your Data or Overwrite folder, set your desired Output Data Folder in the General Settings menu.";
 
-            _customMessageBox.DisplayNotificationOK_WindowSafe("", message);
+            MessageWindow.DisplayNotificationOK("Welcome!", message);
         }
     }
 }
diff --git a/SynthEBD/GUI_Aux/FileDialogs.cs b/SynthEBD/GUI_Aux/FileDialogs.cs
index 804df57d..4397fe7f 100644
--- a/SynthEBD/GUI_Aux/FileDialogs.cs
+++ b/SynthEBD/GUI_Aux/FileDialogs.cs
@@ -9,7 +9,7 @@ public FileDialogs(Logger logger)
     }
     public bool ConfirmFileDeletion(string path, string filetype)
     {
-        if (CustomMessageBox.DisplayNotificationYesNo("Confirm Deletion", "Are you sure you want to permanently delete this " + filetype + "?"))
+        if (MessageWindow.DisplayNotificationYesNo("Confirm Deletion", "Are you sure you want to permanently delete this " + filetype + "?"))
         {
             try
             {
diff --git a/SynthEBD/GUI_Aux/ViewModels/VM_ConfigDrafter.cs b/SynthEBD/GUI_Aux/ViewModels/VM_ConfigDrafter.cs
index bfa648f1..d15ecb02 100644
--- a/SynthEBD/GUI_Aux/ViewModels/VM_ConfigDrafter.cs
+++ b/SynthEBD/GUI_Aux/ViewModels/VM_ConfigDrafter.cs
@@ -129,7 +129,7 @@ public VM_ConfigDrafter(ConfigDrafter configDrafter, IEnvironmentStateProvider e
                    case MultipletHandlingMode.Replace:
                        if (!PreVerifyMultiplets(MultipletTextureGroups, out string failedChecks))
                        {
-                           CustomMessageBox.DisplayNotificationOK("Please Fix Duplicate File Selections", failedChecks);
+                           MessageWindow.DisplayNotificationOK("Please Fix Duplicate File Selections", failedChecks);
                        }
                        else
                        {
@@ -164,7 +164,7 @@ public VM_ConfigDrafter(ConfigDrafter configDrafter, IEnvironmentStateProvider e
                    toShow.Add("");
                }
 
-               CustomMessageBox.DisplayNotificationOK("Press the white button to copy list", string.Join(Environment.NewLine, toShow));
+               MessageWindow.DisplayNotificationOK("Press the white button to copy list", string.Join(Environment.NewLine, toShow));
            });
 
         DraftConfigButton = ReactiveCommand.CreateFromTask(
@@ -178,7 +178,7 @@ public VM_ConfigDrafter(ConfigDrafter configDrafter, IEnvironmentStateProvider e
 
                     if (HasMultiplets && MultipletHandlingMode == MultipletHandlingMode.Replace && !PreVerifyMultiplets(MultipletTextureGroups, out string failedChecks))
                     {
-                        CustomMessageBox.DisplayNotificationOK("Please Fix Duplicate File Selections", failedChecks);
+                        MessageWindow.DisplayNotificationOK("Please Fix Duplicate File Selections", failedChecks);
                         return;
                     }
 
@@ -227,12 +227,12 @@ public VM_ConfigDrafter(ConfigDrafter configDrafter, IEnvironmentStateProvider e
                                 message = "No new subgroups were added";
                             }
 
-                            CustomMessageBox.DisplayNotificationOK("Config File Update", message);
+                            MessageWindow.DisplayNotificationOK("Config File Update", message);
                         }
                     }
                     else
                     {
-                        CustomMessageBox.DisplayNotificationOK("Error drafting config file", status);
+                        MessageWindow.DisplayNotificationOK("Error drafting config file", status);
                     }
                 }
             }, canExecuteDrafting);
@@ -417,7 +417,7 @@ public bool ValidateExistingDirectory(string directory)
     {
         if (!Directory.Exists(directory))
         {
-            CustomMessageBox.DisplayNotificationOK("Drafter Error", "The selected mod directory does not exist: " + directory);
+            MessageWindow.DisplayNotificationOK("Drafter Error", "The selected mod directory does not exist: " + directory);
             return false;
         }
 
@@ -426,12 +426,12 @@ public bool ValidateExistingDirectory(string directory)
             var texturesDir = Path.Combine(directory, "Textures");
             if (!Directory.Exists(texturesDir))
             {
-                CustomMessageBox.DisplayNotificationOK("Drafter Error", "The selected mod directory must contain a Textures folder: " + directory);
+                MessageWindow.DisplayNotificationOK("Drafter Error", "The selected mod directory must contain a Textures folder: " + directory);
                 return false;
             }
             if (Directory.GetDirectories(texturesDir).Length < 1)
             {
-                CustomMessageBox.DisplayNotificationOK("Drafter Error", "The selected mod directory must contain a Textures\\* folder: " + directory);
+                MessageWindow.DisplayNotificationOK("Drafter Error", "The selected mod directory must contain a Textures\\* folder: " + directory);
                 return false;
             }
         }
@@ -442,13 +442,13 @@ public async Task<bool> ValidateContainers()
     {
         if (!SelectedFileArchives.Any())
         {
-            CustomMessageBox.DisplayNotificationOK("Drafter Error", "No file archives were selected");
+            MessageWindow.DisplayNotificationOK("Drafter Error", "No file archives were selected");
             return false;
         }
 
         if (GeneratedModName.IsNullOrWhitespace())
         {
-            CustomMessageBox.DisplayNotificationOK("Drafter Error", "You must enter a name for the mod to which the files will be extracted. Recommend something like \"SynthEBD - This Texture Mod\"");
+            MessageWindow.DisplayNotificationOK("Drafter Error", "You must enter a name for the mod to which the files will be extracted. Recommend something like \"SynthEBD - This Texture Mod\"");
             return false;
         }
 
@@ -461,26 +461,26 @@ public async Task<bool> ValidateContainers()
 
             if (fileNames.Contains(container.FilePath))
             {
-                CustomMessageBox.DisplayNotificationOK("Drafter Error", "Cannot select the same file multiple times: " + Environment.NewLine + container.FilePath);
+                MessageWindow.DisplayNotificationOK("Drafter Error", "Cannot select the same file multiple times: " + Environment.NewLine + container.FilePath);
                 return false;
             }
             fileNames.Add(container.FilePath);
 
             if (!File.Exists(container.FilePath))
             {
-                CustomMessageBox.DisplayNotificationOK("Drafter Error", "The following file from Archive #" + (i + 1).ToString() + " does not exist: " + Environment.NewLine + container.FilePath);
+                MessageWindow.DisplayNotificationOK("Drafter Error", "The following file from Archive #" + (i + 1).ToString() + " does not exist: " + Environment.NewLine + container.FilePath);
                 return false;
             }
             if (container.Prefix.IsNullOrWhitespace())
             {
-                CustomMessageBox.DisplayNotificationOK("Drafter Error", "You need to assign a prefix to Archive #" + (i + 1).ToString());
+                MessageWindow.DisplayNotificationOK("Drafter Error", "You need to assign a prefix to Archive #" + (i + 1).ToString());
                 return false;
             }
 
             var currentArchiveContents = await _7ZipInterfaceVM().GetArchiveContents(container.FilePath, true, _patcherState.GeneralSettings.Close7ZipWhenFinished, 1000);
             if (!currentArchiveContents.Any())
             {
-                CustomMessageBox.DisplayNotificationOK("Drafter Error", "The following file has no contents upon extraction: " + Environment.NewLine + container.FilePath);
+                MessageWindow.DisplayNotificationOK("Drafter Error", "The following file has no contents upon extraction: " + Environment.NewLine + container.FilePath);
                 return false;
             }
             foreach (var path in currentArchiveContents)
@@ -489,7 +489,7 @@ public async Task<bool> ValidateContainers()
                 {
                     if (archiveContents[j].Contains(path) && container.Prefix == SelectedFileArchives[j].Prefix)
                     {
-                        CustomMessageBox.DisplayNotificationOK("Drafter Error", "The following file in Archive #" + (i + 1).ToString() + " was also found in Archive # " + (j + 1).ToString() + ":" + Environment.NewLine + path + Environment.NewLine + "You must assign a different Prefix to one of these archives");
+                        MessageWindow.DisplayNotificationOK("Drafter Error", "The following file in Archive #" + (i + 1).ToString() + " was also found in Archive # " + (j + 1).ToString() + ":" + Environment.NewLine + path + Environment.NewLine + "You must assign a different Prefix to one of these archives");
                         return false;
                     }
                 }
diff --git a/SynthEBD/GUI_Aux/WinExplorerOpener.cs b/SynthEBD/GUI_Aux/WinExplorerOpener.cs
index 4c0c3a77..ae0e6a05 100644
--- a/SynthEBD/GUI_Aux/WinExplorerOpener.cs
+++ b/SynthEBD/GUI_Aux/WinExplorerOpener.cs
@@ -27,12 +27,12 @@ public static void OpenFolder(string folderPath)
                 }
                 catch
                 {
-                    CustomMessageBox.DisplayNotificationOK("Explorer Launcher", "Could not launch Windows Explorer to directory: " + folderPath);
+                    MessageWindow.DisplayNotificationOK("Explorer Launcher", "Could not launch Windows Explorer to directory: " + folderPath);
                 }
             }
             else
             {
-                CustomMessageBox.DisplayNotificationOK("Explorer Launcher", string.Format("{0} Directory does not exist!", folderPath));
+                MessageWindow.DisplayNotificationOK("Explorer Launcher", string.Format("{0} Directory does not exist!", folderPath));
             }
         }
     }
diff --git a/SynthEBD/General_Aux/7ZipInterface.cs b/SynthEBD/General_Aux/7ZipInterface.cs
index aced1932..e8a147bd 100644
--- a/SynthEBD/General_Aux/7ZipInterface.cs
+++ b/SynthEBD/General_Aux/7ZipInterface.cs
@@ -66,7 +66,7 @@ public async Task<bool> ExtractArchive(string archivePath, string destinationPat
                     var redirectedOutput = standardOutputCapture.ToString();
                     if (redirectedOutput.Contains("Can't open as archive"))
                     {
-                        CustomMessageBox.DisplayNotificationOK("File Extraction Error", "Extraction of " + archivePath + " appears to have failed with message: " + Environment.NewLine + redirectedOutput.Replace("\r\n", Environment.NewLine));
+                        MessageWindow.DisplayNotificationOK("File Extraction Error", "Extraction of " + archivePath + " appears to have failed with message: " + Environment.NewLine + redirectedOutput.Replace("\r\n", Environment.NewLine));
                         return false;
                     }
                 }
@@ -74,7 +74,7 @@ public async Task<bool> ExtractArchive(string archivePath, string destinationPat
 
             catch (Exception e)
             {
-                CustomMessageBox.DisplayNotificationOK("File Extraction Error", "Extraction of " + archivePath + " failed with message: " + Environment.NewLine + ExceptionLogger.GetExceptionStack(e));
+                MessageWindow.DisplayNotificationOK("File Extraction Error", "Extraction of " + archivePath + " failed with message: " + Environment.NewLine + ExceptionLogger.GetExceptionStack(e));
                 return false;
             }
             return true;
@@ -131,7 +131,7 @@ public async Task<List<string>> GetArchiveContents(string archivePath, bool hide
                     var  outputStr = standardOutputCapture.ToString();
                     if (outputStr.Contains("Can't open as archive"))
                     {
-                        CustomMessageBox.DisplayNotificationOK("File Extraction Error", "Extraction of " + archivePath + " appears to have failed with message: " + Environment.NewLine + outputStr.Replace("\r\n", Environment.NewLine));
+                        MessageWindow.DisplayNotificationOK("File Extraction Error", "Extraction of " + archivePath + " appears to have failed with message: " + Environment.NewLine + outputStr.Replace("\r\n", Environment.NewLine));
                         return new();
                     }
                 }
@@ -139,7 +139,7 @@ public async Task<List<string>> GetArchiveContents(string archivePath, bool hide
 
             catch (Exception e)
             {
-                CustomMessageBox.DisplayNotificationOK("File Extraction Error", "Extraction of " + archivePath + " failed with message: " + Environment.NewLine + ExceptionLogger.GetExceptionStack(e));
+                MessageWindow.DisplayNotificationOK("File Extraction Error", "Extraction of " + archivePath + " failed with message: " + Environment.NewLine + ExceptionLogger.GetExceptionStack(e));
                 return new();
             }
  
diff --git a/SynthEBD/General_Aux/CustomMessageBox.cs b/SynthEBD/General_Aux/CustomMessageBox.cs
deleted file mode 100644
index fa405211..00000000
--- a/SynthEBD/General_Aux/CustomMessageBox.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using BespokeFusion;
-using ReactiveUI;
-using System.Windows;
-using System.Windows.Media;
-
-namespace SynthEBD;
-
-public class CustomMessageBox
-{
-    private List<CustomMaterialMessageBox> MessageQueue { get; set; } = new();
-    private bool IsWindowInitialized { get; set; } = false; // CustomMaterialMessageBox seems to have a bug where closing a message box before the application window initializes closes the application window as well as the message box. Therefore, messages must be delayed until the window loads.
-    public CustomMessageBox()
-    {
-        this.WhenAnyValue(x => x.IsWindowInitialized).Subscribe(x => ShowMessageQueue());
-    }
-
-    public void ShowMessageQueue()
-    {
-        foreach (var message in MessageQueue)
-        {
-            message.Show();
-        }
-        MessageQueue.Clear();
-    }
-
-    public void AllowMessageDisplay()
-    {
-        IsWindowInitialized = true;
-    }
-
-    public static void DisplayNotificationOK(string title, string text) // be sure caller is calling after main window is shown
-    {
-        var box = new CustomMaterialMessageBox()
-        {
-            TxtTitle = { Text = title, Foreground = Brushes.White },
-            TxtMessage = { Text = text, Foreground = Brushes.White },
-            BtnOk = { Content = "OK" },
-            BtnCancel = { IsEnabled = false, Visibility = Visibility.Hidden },
-            MainContentControl = { Background = Brushes.Black },
-            TitleBackgroundPanel = { Background = Brushes.Black },
-            BorderBrush = Brushes.Silver
-        };
-
-        box.Show();
-    }
-
-    public void DisplayNotificationOK_WindowSafe(string title, string text)
-    {
-        var box = new CustomMaterialMessageBox()
-        {
-            TxtTitle = { Text = title, Foreground = Brushes.White },
-            TxtMessage = { Text = text, Foreground = Brushes.White },
-            BtnOk = { Content = "OK" },
-            BtnCancel = { IsEnabled = false, Visibility = Visibility.Hidden },
-            MainContentControl = { Background = Brushes.Black },
-            TitleBackgroundPanel = { Background = Brushes.Black },
-            BorderBrush = Brushes.Silver
-        };
-        if (IsWindowInitialized)
-        {
-            box.Show();
-        }
-        else
-        {
-            MessageQueue.Add(box);
-        }
-    }
-
-    public static bool DisplayNotificationYesNo(string title, string text)
-    {
-        var box = new CustomMaterialMessageBox()
-        {
-            TxtMessage = { Text = text, Foreground = Brushes.White },
-            TxtTitle = { Text = title, Foreground = Brushes.White },
-            BtnOk = { Content = "Yes" },
-            BtnCancel = { Content = "No" },
-            MainContentControl = { Background = Brushes.Black },
-            TitleBackgroundPanel = { Background = Brushes.Black },
-            BorderBrush = Brushes.Silver
-        };
-        box.Show();
-
-        return box.Result == MessageBoxResult.OK;
-    }
-
-    public void DisplayEvalErrorMessage()
-    {
-        Application.Current.Dispatcher.Invoke((Action)delegate { // apparently thread-safe to do it this way - https://stackoverflow.com/questions/2329978/the-calling-thread-must-be-sta-because-many-ui-components-require-this
-            DisplayNotificationOK_WindowSafe("Eval-Expression License Expired", "SynthEBD's asset distribution functionality depends on a month-to-month license of Eval-Expression.NET, and it appears this license has expired for the current build of SynthEBD. Please check the GitHub or Nexus page to see if an updated version has been released, and install the update if so. Otherwise, please contact Piranha91 or another member of the Synthesis Collective to refresh this license by updating the Eval-Expression NuGet package.");
-            MainWindow_ViewModel.EvalMessageTriggered = true;
-        });
-    }
-}
\ No newline at end of file
diff --git a/SynthEBD/General_Aux/MiscValidation.cs b/SynthEBD/General_Aux/MiscValidation.cs
index e1f1dcad..28b60d3f 100644
--- a/SynthEBD/General_Aux/MiscValidation.cs
+++ b/SynthEBD/General_Aux/MiscValidation.cs
@@ -270,7 +270,7 @@ public bool VerifyBodyGenAnnotations(List<AssetPack> assetPacks, BodyGenConfigs
         else if (message.Any())
         {
             message.Add("Morphs that lack descriptors can be misassigned by the texture/body shape assigner. Do you want to continue patching?");
-            return CustomMessageBox.DisplayNotificationYesNo("Missing Descriptors", String.Join(Environment.NewLine, message));
+            return MessageWindow.DisplayNotificationYesNo("Missing Descriptors", String.Join(Environment.NewLine, message));
         }
         else
         {
@@ -418,7 +418,7 @@ public bool VerifyBodySlideAnnotations(Settings_OBody obodySettings)
         {
             bsMissingDescriptors.Insert(0, "The following active BodySlides have not been annotated with any body shape descriptors:");
             bsMissingDescriptors.Add("Bodyslides that lack descriptors can be misassigned by the texture/body shape assigner. Do you want to continue patching?");
-            return CustomMessageBox.DisplayNotificationYesNo("Missing Descriptors", String.Join(Environment.NewLine, bsMissingDescriptors));
+            return MessageWindow.DisplayNotificationYesNo("Missing Descriptors", String.Join(Environment.NewLine, bsMissingDescriptors));
         }
         else
         {
@@ -664,7 +664,7 @@ public static IEnumerable<RaceGrouping> CheckRaceGroupingDuplicates(IEnumerable<
                 message += g + " (" + (duplicates.Where(x => x == g).Count() + 1) + ")" + Environment.NewLine;
             }
 
-            if (CustomMessageBox.DisplayNotificationYesNo("Duplicate Race Groupings", message))
+            if (MessageWindow.DisplayNotificationYesNo("Duplicate Race Groupings", message))
             {
                 foreach (var name in duplicates)
                 {
diff --git a/SynthEBD/General_Aux/RecordPathParser.cs b/SynthEBD/General_Aux/RecordPathParser.cs
index 96bd97cf..21c85d60 100644
--- a/SynthEBD/General_Aux/RecordPathParser.cs
+++ b/SynthEBD/General_Aux/RecordPathParser.cs
@@ -25,13 +25,11 @@ public class RecordPathParser
     private readonly IEnvironmentStateProvider _environmentProvider; 
     private readonly Logger _logger;
     private readonly PatchableRaceResolver _raceResolver;
-    private readonly CustomMessageBox _customMessageBox;
-    public RecordPathParser(IEnvironmentStateProvider environmentProvider, Logger logger, PatchableRaceResolver raceResolver, CustomMessageBox customMessageBox)
+    public RecordPathParser(IEnvironmentStateProvider environmentProvider, Logger logger, PatchableRaceResolver raceResolver)
     {
         _environmentProvider = environmentProvider;
         _logger = logger;
         _raceResolver = raceResolver;
-        _customMessageBox = customMessageBox;
     }
 
     //note: To allow the most flexibility in alternative usages, rootRecord can be any IMajorRecordGetter, but in SynthEBD it should always be the root INpcGetter.
@@ -809,7 +807,7 @@ private bool ChooseWhichArrayObject(IReadOnlyList<dynamic> variants, string matc
             {
                 if (ex.Message.StartsWith("ERROR_005") && !MainWindow_ViewModel.EvalMessageTriggered)
                 {
-                    _customMessageBox.DisplayEvalErrorMessage();
+                    MessageWindow.DisplayNotificationOK("Eval-Expression License Expired", MainWindow_ViewModel.EvalExpiredMessage);
                 }
                 return false; // should only happen when user is screwing around with UI
             }
diff --git a/SynthEBD/General_Aux/ViewModels/VM_CustomEnvironment.cs b/SynthEBD/General_Aux/ViewModels/VM_CustomEnvironment.cs
index 171830c5..b610c5ff 100644
--- a/SynthEBD/General_Aux/ViewModels/VM_CustomEnvironment.cs
+++ b/SynthEBD/General_Aux/ViewModels/VM_CustomEnvironment.cs
@@ -72,7 +72,7 @@ public VM_CustomEnvironment(Window_CustomEnvironment window, string message, Sky
                 canExecute: _ => true,
                 execute: _ =>
                 {
-                    CustomMessageBox.DisplayNotificationOK("Environment Creation Error", CurrentError);
+                    MessageWindow.DisplayNotificationOK("Environment Creation Error", CurrentError);
                 }
                 );
 
diff --git a/SynthEBD/Installer/ConfigInstaller.cs b/SynthEBD/Installer/ConfigInstaller.cs
index 7b1b0c94..15bc0c92 100644
--- a/SynthEBD/Installer/ConfigInstaller.cs
+++ b/SynthEBD/Installer/ConfigInstaller.cs
@@ -40,7 +40,7 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
         bool triggerGeneralVMRefresh = false;
         if (_patcherState.ModManagerSettings.ModManagerType != ModManager.None && string.IsNullOrWhiteSpace(_patcherState.ModManagerSettings.CurrentInstallationFolder))
         {
-            CustomMessageBox.DisplayNotificationOK("Installation failed", "You must set the location of your mod manager's Mods folder before installing a config file archive.");
+            MessageWindow.DisplayNotificationOK("Installation failed", "You must set the location of your mod manager's Mods folder before installing a config file archive.");
             return (installedConfigs, triggerGeneralVMRefresh);
         }
 
@@ -70,20 +70,20 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
         }
         catch (Exception ex)
         {
-            CustomMessageBox.DisplayNotificationOK("Installation failed", "Archive extraction failed. This may be because the resulting file paths were too long. Try moving your Temp Folder in Mod Manager Integration to a short path such as your desktop. Installation aborted. Exception Message: " + Environment.NewLine + ExceptionLogger.GetExceptionStack(ex));
+            MessageWindow.DisplayNotificationOK("Installation failed", "Archive extraction failed. This may be because the resulting file paths were too long. Try moving your Temp Folder in Mod Manager Integration to a short path such as your desktop. Installation aborted. Exception Message: " + Environment.NewLine + ExceptionLogger.GetExceptionStack(ex));
         }
 
         string manifestPath = Path.Combine(tempFolderPath, "Manifest.json");
         if (!File.Exists(manifestPath))
         {
-            CustomMessageBox.DisplayNotificationOK("Installation failed", "Could not find Manifest.json in " + tempFolderPath + ". Installation aborted.");
+            MessageWindow.DisplayNotificationOK("Installation failed", "Could not find Manifest.json in " + tempFolderPath + ". Installation aborted.");
             return (installedConfigs, triggerGeneralVMRefresh);
         }
 
         Manifest manifest = JSONhandler<Manifest>.LoadJSONFile(manifestPath, out bool parsed, out string exceptionStr);
         if (!parsed)
         {
-            CustomMessageBox.DisplayNotificationOK("Installation failed", "Could not parse Manifest.json in " + tempFolderPath + ". Installation aborted.");
+            MessageWindow.DisplayNotificationOK("Installation failed", "Could not parse Manifest.json in " + tempFolderPath + ". Installation aborted.");
             _logger.LogError(exceptionStr);
             return (installedConfigs, triggerGeneralVMRefresh);
         }
@@ -104,7 +104,7 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
 
         if (_patcherState.ModManagerSettings.ModManagerType != ModManager.None && (manifest.DestinationModFolder == null || string.IsNullOrWhiteSpace(manifest.DestinationModFolder)))
         {
-            CustomMessageBox.DisplayNotificationOK("Installation warning", "Manifest did not include a destination folder. A new folder called \"New SynthEBD Config\" will appear in your mod list. Pleast rename this folder to something sensible after completing installation.");
+            MessageWindow.DisplayNotificationOK("Installation warning", "Manifest did not include a destination folder. A new folder called \"New SynthEBD Config\" will appear in your mod list. Pleast rename this folder to something sensible after completing installation.");
             manifest.DestinationModFolder = "New SynthEBD Config";
         }
 
@@ -118,7 +118,7 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
         List<SkyrimMod> validationRecordTemplates = _assetPackIO.LoadRecordTemplates(recordTemplatePaths, out bool loadSuccess);
         if (!loadSuccess)
         {
-            CustomMessageBox.DisplayNotificationOK("Installation failed", "Could not parse all Record Template Plugins at " + string.Join(", ", recordTemplatePaths) + ". Installation aborted.");
+            MessageWindow.DisplayNotificationOK("Installation failed", "Could not parse all Record Template Plugins at " + string.Join(", ", recordTemplatePaths) + ". Installation aborted.");
             return (new List<string>(), triggerGeneralVMRefresh);
         }
 
@@ -131,7 +131,7 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
         BodyGenConfigs validationBG = _bodyGenIO.LoadBodyGenConfigs(bodyGenConfigPaths.ToArray(), _patcherState.GeneralSettings.RaceGroupings, out loadSuccess);
         if (!loadSuccess)
         {
-            CustomMessageBox.DisplayNotificationOK("Installation failed", "Could not parse all BodyGen configs at " + string.Join(", ", bodyGenConfigPaths) + ". Installation aborted.");
+            MessageWindow.DisplayNotificationOK("Installation failed", "Could not parse all BodyGen configs at " + string.Join(", ", bodyGenConfigPaths) + ". Installation aborted.");
             return (new List<string>(), triggerGeneralVMRefresh);
         }
 
@@ -150,7 +150,7 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
             var validationAP = _assetPackIO.LoadAssetPack(extractedPath, _patcherState.GeneralSettings.RaceGroupings, validationRecordTemplates, validationBG, out loadSuccess);
             if (!loadSuccess)
             {
-                CustomMessageBox.DisplayNotificationOK("Installation failed", "Could not parse Asset Pack " + configPath + ". Installation aborted.");
+                MessageWindow.DisplayNotificationOK("Installation failed", "Could not parse Asset Pack " + configPath + ". Installation aborted.");
                 continue;
             }
             loadedPacks.Add(validationAP);
@@ -169,7 +169,7 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
                 _assetPackIO.SaveAssetPack(validationAP, out bool saveSuccess); // save as Json instead of moving in case the referenced paths were modified by HandleLongFilePaths()
                 if (!saveSuccess)
                 {
-                    CustomMessageBox.DisplayNotificationOK("Installation failed", "Could not save Asset Pack to " + destinationPath + ". Installation aborted.");
+                    MessageWindow.DisplayNotificationOK("Installation failed", "Could not save Asset Pack to " + destinationPath + ". Installation aborted.");
                     continue;
                 }
             }
@@ -198,7 +198,7 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
                 }
                 catch (Exception ex)
                 {
-                    CustomMessageBox.DisplayNotificationOK("Installation warning", "Could not move " + sourcePath + " to " + destPath + ": " + ex.Message);
+                    MessageWindow.DisplayNotificationOK("Installation warning", "Could not move " + sourcePath + " to " + destPath + ": " + ex.Message);
                 }
             }
             else
@@ -221,7 +221,7 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
                 }
                 catch (Exception ex)
                 {
-                    CustomMessageBox.DisplayNotificationOK("Installation warning", "Could not move " + sourcePath + " to " + destPath + ": " + ex.Message);
+                    MessageWindow.DisplayNotificationOK("Installation warning", "Could not move " + sourcePath + " to " + destPath + ": " + ex.Message);
                 }
             }
             else
@@ -233,7 +233,7 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
 
         if (skippedConfigs.Any())
         {
-            CustomMessageBox.DisplayNotificationOK("Installation warning", "The following resources were not installed because they already exist in your settings:" + Environment.NewLine + String.Join(Environment.NewLine, skippedConfigs));
+            MessageWindow.DisplayNotificationOK("Installation warning", "The following resources were not installed because they already exist in your settings:" + Environment.NewLine + String.Join(Environment.NewLine, skippedConfigs));
         }
 
         #region move dependency files
@@ -370,11 +370,11 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
                 missingFilesWarnStr += Environment.NewLine + "You may need to move your Temp Folder in your Mod Manager Settings to a shorter path.";
             }
             missingFilesWarnStr += Environment.NewLine + "You will likely need to reinstall this config file to correctly extract the missing files.";
-            CustomMessageBox.DisplayNotificationOK("Installation warning", missingFilesWarnStr);
+            MessageWindow.DisplayNotificationOK("Installation warning", missingFilesWarnStr);
         }
         if (assetPathCopyErrors)
         {
-            CustomMessageBox.DisplayNotificationOK("Installation warning", "Some installation errors occurred. Please see the Status Log.");
+            MessageWindow.DisplayNotificationOK("Installation warning", "Some installation errors occurred. Please see the Status Log.");
         }
 
         if (referencedFilePaths.Any())
@@ -410,13 +410,13 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
             }
         }
 
-        if (missingRaces.Any() && CustomMessageBox.DisplayNotificationYesNo("Missing Additional Races", "The installer attempted to add the following patchable races, but they were not found in your load order. Add them to Patchable Races list anyway?" + Environment.NewLine + String.Join(Environment.NewLine, missingRaces)))
+        if (missingRaces.Any() && MessageWindow.DisplayNotificationYesNo("Missing Additional Races", "The installer attempted to add the following patchable races, but they were not found in your load order. Add them to Patchable Races list anyway?" + Environment.NewLine + String.Join(Environment.NewLine, missingRaces)))
         {
             _patcherState.GeneralSettings.PatchableRaces.AddRange(missingRaces);
             triggerGeneralVMRefresh = true;
         }
 
-        if (addedRaces.Any() && CustomMessageBox.DisplayNotificationYesNo("Found Additional Races", "This config file references the following races. Add them to your Patchable Races list?" + Environment.NewLine + String.Join(Environment.NewLine, addedRaces.Select(x => x.EditorID ?? x.FormKey.ToString()))))
+        if (addedRaces.Any() && MessageWindow.DisplayNotificationYesNo("Found Additional Races", "This config file references the following races. Add them to your Patchable Races list?" + Environment.NewLine + String.Join(Environment.NewLine, addedRaces.Select(x => x.EditorID ?? x.FormKey.ToString()))))
         {
             _patcherState.GeneralSettings.PatchableRaces.AddRange(addedRaces.Select(x => x.FormKey));
             triggerGeneralVMRefresh = true;
@@ -461,12 +461,12 @@ public ConfigInstaller(Logger logger, SynthEBDPaths synthEBDPaths, SettingsIO_As
         }
         catch
         {
-            CustomMessageBox.DisplayNotificationOK("Installation warning", "Could not delete the temp folder located at " + tempFolderPath + ". This may be because the folder path or some of the contained file paths exceeded 260 characters. You may delete this folder manually.");
+            MessageWindow.DisplayNotificationOK("Installation warning", "Could not delete the temp folder located at " + tempFolderPath + ". This may be because the folder path or some of the contained file paths exceeded 260 characters. You may delete this folder manually.");
         }
 
         if (_patcherState.ModManagerSettings.ModManagerType != ModManager.None && referencedFilePaths.Any())
         {
-            CustomMessageBox.DisplayNotificationOK("Installation success", "Installation complete. You will need to restart your mod manager to rebuild the VFS in order for SynthEBD to see the newly installed asset files.");
+            MessageWindow.DisplayNotificationOK("Installation success", "Installation complete. You will need to restart your mod manager to rebuild the VFS in order for SynthEBD to see the newly installed asset files.");
         }
 
         return (installedConfigs, triggerGeneralVMRefresh);
@@ -476,7 +476,7 @@ public bool ValidateManifest(Manifest manifest)
     {
         if (manifest.ConfigPrefix == null || string.IsNullOrWhiteSpace(manifest.ConfigPrefix))
         {
-            CustomMessageBox.DisplayNotificationOK("Installation error", "Manifest did not include a destination prefix. This must match the second directory of each file path in the config file (e.g. textures\\PREFIX\\some\\texture.dds). Please fix the manifest file.");
+            MessageWindow.DisplayNotificationOK("Installation error", "Manifest did not include a destination prefix. This must match the second directory of each file path in the config file (e.g. textures\\PREFIX\\some\\texture.dds). Please fix the manifest file.");
             return false;
         }
         return true;
@@ -600,7 +600,7 @@ private bool ExtractArchive(string archivePath, string destinationPath)
         else
         {
             Cursor.Current = Cursors.Default;
-            CustomMessageBox.DisplayNotificationOK("Installation error", "Could not extract the config archive. Valid formats are .7z, .zip, and .rar.");
+            MessageWindow.DisplayNotificationOK("Installation error", "Could not extract the config archive. Valid formats are .7z, .zip, and .rar.");
             return false;
         }
     }
@@ -659,7 +659,7 @@ public bool HandleLongFilePaths(AssetPack assetPack, Manifest manifest, out Dict
                     "After automatic renaming the longest path was still " + newLongestPathLength + " charactersl long.",
                     "Please consider moving the destination directory to a shorter path"
                 };
-                CustomMessageBox.DisplayNotificationOK("Installation error", string.Join(Environment.NewLine, longMessage));
+                MessageWindow.DisplayNotificationOK("Installation error", string.Join(Environment.NewLine, longMessage));
                 return false;
             }
             else
@@ -673,7 +673,7 @@ public bool HandleLongFilePaths(AssetPack assetPack, Manifest manifest, out Dict
                     "All long paths within the config file and the destination data folder were automatically modified.",
                     "No additional action is required."
                 };
-                CustomMessageBox.DisplayNotificationOK("Installation notice", string.Join(Environment.NewLine, longMessage));
+                MessageWindow.DisplayNotificationOK("Installation notice", string.Join(Environment.NewLine, longMessage));
             }
         }
 
diff --git a/SynthEBD/Installer/Packager/VM_Manifest.cs b/SynthEBD/Installer/Packager/VM_Manifest.cs
index 308208fe..af05f19a 100644
--- a/SynthEBD/Installer/Packager/VM_Manifest.cs
+++ b/SynthEBD/Installer/Packager/VM_Manifest.cs
@@ -42,7 +42,7 @@ public VM_Manifest(Logger logger, IEnvironmentStateProvider environmentStateProv
                         }
                         else
                         {
-                            CustomMessageBox.DisplayNotificationOK("Import Failed", "Manifest.json import failed with the following error: " + Environment.NewLine + exceptionStr);
+                            MessageWindow.DisplayNotificationOK("Import Failed", "Manifest.json import failed with the following error: " + Environment.NewLine + exceptionStr);
                         }
                     }
                 });
@@ -62,7 +62,7 @@ public VM_Manifest(Logger logger, IEnvironmentStateProvider environmentStateProv
                         }
                         else
                         {
-                            CustomMessageBox.DisplayNotificationOK("Export Failed", "Manifest.json export failed with the following error: " + Environment.NewLine + exceptionStr);
+                            MessageWindow.DisplayNotificationOK("Export Failed", "Manifest.json export failed with the following error: " + Environment.NewLine + exceptionStr);
                         }
 
                         //ClearInstallationTokens(); This function works but it doesn't seem necessary, and can introduce an unnecessary complication if a user packages config files in the SynthEBD Asset Packs folder (by stripping the installation token the config files will lose association with their assets).
@@ -205,7 +205,7 @@ private void ClearInstallationToken(string path)
             var config = JSONhandler<AssetPack>.LoadJSONFile(path, out var success, out var exceptionStr);
             if (!success)
             {
-                CustomMessageBox.DisplayNotificationOK("Warning", "Could not clear the installation token from config file at " + path + Environment.NewLine + Environment.NewLine + "This is non-criticial, but you may want to manually remove the token in a text editor." + Environment.NewLine + Environment.NewLine + "Exception: " + Environment.NewLine + exceptionStr);
+                MessageWindow.DisplayNotificationOK("Warning", "Could not clear the installation token from config file at " + path + Environment.NewLine + Environment.NewLine + "This is non-criticial, but you may want to manually remove the token in a text editor." + Environment.NewLine + Environment.NewLine + "Exception: " + Environment.NewLine + exceptionStr);
                 return;
             }
 
@@ -214,7 +214,7 @@ private void ClearInstallationToken(string path)
             JSONhandler<AssetPack>.SaveJSONFile(config, path, out success, out exceptionStr);
             if (!success)
             {
-                CustomMessageBox.DisplayNotificationOK("Warning", "Could not clear the installation token from config file at " + path + Environment.NewLine + Environment.NewLine + "This is non-criticial, but you may want to manually remove the token in a text editor." + Environment.NewLine + Environment.NewLine + "Exception: " + Environment.NewLine + exceptionStr);
+                MessageWindow.DisplayNotificationOK("Warning", "Could not clear the installation token from config file at " + path + Environment.NewLine + Environment.NewLine + "This is non-criticial, but you may want to manually remove the token in a text editor." + Environment.NewLine + Environment.NewLine + "Exception: " + Environment.NewLine + exceptionStr);
             }
         }
         */
diff --git a/SynthEBD/Installer/VM_DownloadCoordinator.cs b/SynthEBD/Installer/VM_DownloadCoordinator.cs
index 7599e828..53a86ca7 100644
--- a/SynthEBD/Installer/VM_DownloadCoordinator.cs
+++ b/SynthEBD/Installer/VM_DownloadCoordinator.cs
@@ -32,13 +32,13 @@ public VM_DownloadCoordinator(HashSet<Manifest.DownloadInfoContainer> downloadIn
                 {
                     if (string.IsNullOrWhiteSpace(DI.Path))
                     {
-                        CustomMessageBox.DisplayNotificationOK("Path required", "Please enter a path to the required archive for " + DI.ModDownloadName);
+                        MessageWindow.DisplayNotificationOK("Path required", "Please enter a path to the required archive for " + DI.ModDownloadName);
                         allFound = false;
                         break;
                     }
                     else if (!File.Exists(DI.Path))
                     {
-                        CustomMessageBox.DisplayNotificationOK("File not found", "Could not find the archive at " + DI.Path + " for mod " + DI.ModDownloadName);
+                        MessageWindow.DisplayNotificationOK("File not found", "Could not find the archive at " + DI.Path + " for mod " + DI.ModDownloadName);
                         allFound= false;
                         break;
                     }
diff --git a/SynthEBD/MainModule.cs b/SynthEBD/MainModule.cs
index 0652036e..2daf818d 100644
--- a/SynthEBD/MainModule.cs
+++ b/SynthEBD/MainModule.cs
@@ -12,7 +12,6 @@ protected override void Load(ContainerBuilder builder)
 
         //logging
         builder.RegisterType<Logger>().AsSelf().SingleInstance();
-        builder.RegisterType<CustomMessageBox>().AsSelf().SingleInstance();
 
         //IO
         builder.RegisterType<PatcherIO>().AsSelf().SingleInstance();
diff --git a/SynthEBD/MainWindow_ViewModel.cs b/SynthEBD/MainWindow_ViewModel.cs
index 9d0ec54b..1d61c5c3 100644
--- a/SynthEBD/MainWindow_ViewModel.cs
+++ b/SynthEBD/MainWindow_ViewModel.cs
@@ -13,7 +13,6 @@ public class MainWindow_ViewModel : VM
     private readonly VM_Settings_General _settingsGeneral;
     private readonly VM_NavPanel _navPanel;
     public readonly SynthEBDPaths _paths; // must be accessible to App.xaml.cs for crash logging
-    private readonly CustomMessageBox _customMessageBox;
     private readonly Logger _logger;
 
     public DisplayedItemVm Display { get; }
@@ -31,7 +30,6 @@ public MainWindow_ViewModel(
         VM_NavPanel navPanel,
         Func<VM_RunButton> getRunButton,
         SynthEBDPaths paths,
-        CustomMessageBox customMessageBox,
         Logger logger)
     {
         _environmentProvider = environmentProvider;
@@ -39,7 +37,6 @@ public MainWindow_ViewModel(
         _viewModelLoader = viewModelLoader;
         _settingsGeneral = settingsGeneral;
         _navPanel = navPanel;
-        _customMessageBox = customMessageBox;
         _logger = logger;
 
         Display = display;
@@ -87,9 +84,9 @@ void MainWindow_Closing(object sender, ExitEventArgs e)
 
         if (!trueVar)
         {
-            _customMessageBox.DisplayEvalErrorMessage();
+            MessageWindow.DisplayNotificationOK("Eval-Expression License Expired", EvalExpiredMessage);
         }
     }
 
-    
+    public const string EvalExpiredMessage = "SynthEBD's asset distribution functionality depends on a month-to-month license of Eval-Expression.NET, and it appears this license has expired for the current build of SynthEBD. Please check the GitHub or Nexus page to see if an updated version has been released, and install the update if so. Otherwise, please contact Piranha91 or another member of the Synthesis Collective to refresh this license by updating the Eval-Expression NuGet package.";
 }
\ No newline at end of file
diff --git a/SynthEBD/Patcher/PatcherAux/UpdateHandler.cs b/SynthEBD/Patcher/PatcherAux/UpdateHandler.cs
index cfb468a7..532364c5 100644
--- a/SynthEBD/Patcher/PatcherAux/UpdateHandler.cs
+++ b/SynthEBD/Patcher/PatcherAux/UpdateHandler.cs
@@ -65,7 +65,7 @@ private void UpdateV1012(VM_Settings_General generalVM)
         {
             var missingNames = v1012UniqueNameExclusions.Where(x => !generalVM.LinkedNameExclusions.Select(y => y.Content).Contains(x)).ToHashSet();
             var dispText = "v1.0.1.2 Update: It is suggested to add the following names to your Linked Unique NPC Name Exclusions. Would you like to do this automatically?" + Environment.NewLine + String.Join(Environment.NewLine, missingNames);
-            if (missingNames.Any() && CustomMessageBox.DisplayNotificationYesNo("Update Unique Name Exclusions?", dispText))
+            if (missingNames.Any() && MessageWindow.DisplayNotificationYesNo("Update Unique Name Exclusions?", dispText))
             {
                 foreach (var name in missingNames)
                 {
@@ -187,7 +187,7 @@ private void UpdateV1025RaceGroupings()
     {
         if (!_patcherState.UpdateLog.Performed1_0_2_5RGUpdate)
         {
-            if (CustomMessageBox.DisplayNotificationYesNo("Version 1.0.2.5 Update", "In previous SynthEBD versions, the Humanoid Playable race grouping erroneously included Elder Race. Would you like to fix this? (Recommend: Yes)"))
+            if (MessageWindow.DisplayNotificationYesNo("Version 1.0.2.5 Update", new List<string>() { "In previous SynthEBD versions, the Humanoid Playable race grouping erroneously included Elder Race.", "Would you like to fix this? (Recommend: Yes)"}, Environment.NewLine))
             {
                 var humanoidPlayableVM = _generalVM.RaceGroupingEditor.RaceGroupings.Where(x => x.Label.Equals("Humanoid Playable", StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
                 if (humanoidPlayableVM != null && (humanoidPlayableVM.Races.Contains(Mutagen.Bethesda.FormKeys.SkyrimSE.Skyrim.Race.ElderRace.FormKey) || humanoidPlayableVM.Races.Contains(Mutagen.Bethesda.FormKeys.SkyrimSE.Skyrim.Race.ElderRaceVampire.FormKey)))
diff --git a/SynthEBD/Patcher/PatcherIO/PatcherIO.cs b/SynthEBD/Patcher/PatcherIO/PatcherIO.cs
index 8c319735..4b1e2031 100644
--- a/SynthEBD/Patcher/PatcherIO/PatcherIO.cs
+++ b/SynthEBD/Patcher/PatcherIO/PatcherIO.cs
@@ -56,7 +56,7 @@ public static async Task WriteTextFileStatic(string path, string contents)
         catch(Exception e)
         {
             var error = ExceptionLogger.GetExceptionStack(e);
-            CustomMessageBox.DisplayNotificationOK("Could not save text file", "Error: could not save text file to " + path + ". Exception: " + Environment.NewLine + error);
+            MessageWindow.DisplayNotificationOK("Could not save text file", "Error: could not save text file to " + path + ". Exception: " + Environment.NewLine + error);
         }
     }
 
diff --git a/SynthEBD/SaveLoader.cs b/SynthEBD/SaveLoader.cs
index 91621452..dd8032c9 100644
--- a/SynthEBD/SaveLoader.cs
+++ b/SynthEBD/SaveLoader.cs
@@ -244,7 +244,7 @@ public void SaveStateToDrive()
         if (showFinalExceptions)
         {
             string notificationStr = allExceptions;
-            CustomMessageBox.DisplayNotificationOK("Errors were encountered upon closing", notificationStr);
+            MessageWindow.DisplayNotificationOK("Errors were encountered upon closing", notificationStr);
         }
     }
 
diff --git a/SynthEBD/Settings/SettingsIO/IO_Aux.cs b/SynthEBD/Settings/SettingsIO/IO_Aux.cs
index d79d612e..d54507f1 100644
--- a/SynthEBD/Settings/SettingsIO/IO_Aux.cs
+++ b/SynthEBD/Settings/SettingsIO/IO_Aux.cs
@@ -191,7 +191,7 @@ public void DeleteDirectory(string target_dir, bool isInner)
 
         if (exceedsPathLimit && !isInner)
         {
-            CustomMessageBox.DisplayNotificationOK("Deletion Warning", "Some file/folder paths in " + target_dir + " exceed 260 characters and cannot be deleted automatically. You may delete them manually after SynthEBD closes.");
+            MessageWindow.DisplayNotificationOK("Deletion Warning", "Some file/folder paths in " + target_dir + " exceed 260 characters and cannot be deleted automatically. You may delete them manually after SynthEBD closes.");
         }
     }
 
diff --git a/SynthEBD/Settings/SettingsIO/OnLoadValidator.cs b/SynthEBD/Settings/SettingsIO/OnLoadValidator.cs
index e6d20318..4f337573 100644
--- a/SynthEBD/Settings/SettingsIO/OnLoadValidator.cs
+++ b/SynthEBD/Settings/SettingsIO/OnLoadValidator.cs
@@ -69,7 +69,7 @@ public static IEnumerable<IHasLabel> CheckGroupDuplicates(IEnumerable<IHasLabel>
                     message += g + " (" + (duplicates.Where(x => x == g).Count() + 1) + ")" + Environment.NewLine;
                 }
 
-                if (CustomMessageBox.DisplayNotificationYesNo("Duplicate " + type, message))
+                if (MessageWindow.DisplayNotificationYesNo("Duplicate " + type, message))
                 {
                     foreach (var name in duplicates)
                     {
diff --git a/SynthEBD/Settings/Settings_Consistency/VM_ConsistencyUI.cs b/SynthEBD/Settings/Settings_Consistency/VM_ConsistencyUI.cs
index ca1b719f..6b0e5145 100644
--- a/SynthEBD/Settings/Settings_Consistency/VM_ConsistencyUI.cs
+++ b/SynthEBD/Settings/Settings_Consistency/VM_ConsistencyUI.cs
@@ -115,7 +115,7 @@ public VM_ConsistencyUI(IEnvironmentStateProvider environmentProvider, PatcherSt
             canExecute: _ => true,
             execute: x =>
             {
-                if (CustomMessageBox.DisplayNotificationYesNo("Confirmation", "Are you sure you want to completely clear the consistency file?"))
+                if (MessageWindow.DisplayNotificationYesNo("Confirmation", "Are you sure you want to completely clear the consistency file?"))
                 {
                     CurrentlyDisplayedAssignment = null;
                     _patcherState.Consistency.Clear();
diff --git a/SynthEBD/Settings/Settings_General/VM_Settings_General.cs b/SynthEBD/Settings/Settings_General/VM_Settings_General.cs
index 81aa65b2..92accf86 100644
--- a/SynthEBD/Settings/Settings_General/VM_Settings_General.cs
+++ b/SynthEBD/Settings/Settings_General/VM_Settings_General.cs
@@ -82,7 +82,7 @@ Func<VM_SettingsOBody> getOBody
         {
             if (!IsCurrentlyLoading && y && !_bHeadPartWarningDisplayed)
             {
-                if(!CustomMessageBox.DisplayNotificationYesNo("Warning", "Head Part functionality is experimental and some Head Parts can change the faces of custom face sculpted NPCs. Are you sure you want to enable headpart distribution?"))
+                if(!MessageWindow.DisplayNotificationYesNo("Warning", "Head Part functionality is experimental and some Head Parts can change the faces of custom face sculpted NPCs. Are you sure you want to enable headpart distribution?"))
                 {
                     bChangeHeadParts = false;
                 }
@@ -156,7 +156,7 @@ Func<VM_SettingsOBody> getOBody
                 {
                     if (!string.Equals(new DirectoryInfo(selectedPath).Name, "SynthEBD", StringComparison.OrdinalIgnoreCase))
                     {
-                        CustomMessageBox.DisplayNotificationOK("Invalid Directory", "The folder name must be \"SynthEBD\"");
+                        MessageWindow.DisplayNotificationOK("Invalid Directory", "The folder name must be \"SynthEBD\"");
                     }
                     else
                     {
@@ -172,7 +172,7 @@ Func<VM_SettingsOBody> getOBody
             {
                 if (string.IsNullOrWhiteSpace(SettingsSourceProvider.PortableSettingsFolder))
                 {
-                    CustomMessageBox.DisplayNotificationOK("", "There is no settings folder path to clear.");
+                    MessageWindow.DisplayNotificationOK("", "There is no settings folder path to clear.");
                     return;
                 }
                 SettingsSourceProvider.PortableSettingsFolder = String.Empty;
@@ -188,7 +188,7 @@ Func<VM_SettingsOBody> getOBody
                     bShowTroubleshootingSettings = false;
                     TroubleShootingSettingsToggleLabel = _troubleShootingSettingsShowText;
                 }
-                else if (_bTroubleshootingWarningDisplayed || CustomMessageBox.DisplayNotificationYesNo("Are you sure?", "These settings are only meant for troubleshooting. Do not change them unless you know what you're doing or have been instructed to do so."))
+                else if (_bTroubleshootingWarningDisplayed || MessageWindow.DisplayNotificationYesNo("Are you sure?", "These settings are only meant for troubleshooting. Do not change them unless you know what you're doing or have been instructed to do so."))
                 {
                     bShowTroubleshootingSettings = true;
                     _bTroubleshootingWarningDisplayed = true;
@@ -207,9 +207,9 @@ Func<VM_SettingsOBody> getOBody
 
                 if (!changes.Any())
                 {
-                    CustomMessageBox.DisplayNotificationOK("Reverting Settings", "All troubleshooting settings are already at their default values.");
+                    MessageWindow.DisplayNotificationOK("Reverting Settings", "All troubleshooting settings are already at their default values.");
                 }
-                else if (CustomMessageBox.DisplayNotificationYesNo("Are you sure?", string.Join(Environment.NewLine, changes)))
+                else if (MessageWindow.DisplayNotificationYesNo("Are you sure?", string.Join(Environment.NewLine, changes)))
                 {
                     ResetTroubleShootingToDefault(false);
                     getTexMesh().ResetTroubleShootingToDefault(false);
@@ -242,7 +242,7 @@ Func<VM_SettingsOBody> getOBody
         {
             if (!IsCurrentlyLoading && y)
             {
-                if (!CustomMessageBox.DisplayNotificationYesNo("Are you sure?", "SynthEBD can ignore validation, but Skyrim itself cannot. If you disable validation, you may run into issues such as NPCs missing textures and turning blue, or even Papyrus script issues. This option is mainly intended for config file devs to share and troubleshoot configs without having to download the corresponding large texture mods. Are you sure you meant to disable validation?"))
+                if (!MessageWindow.DisplayNotificationYesNo("Are you sure?", "SynthEBD can ignore validation, but Skyrim itself cannot. If you disable validation, you may run into issues such as NPCs missing textures and turning blue, or even Papyrus script issues. This option is mainly intended for config file devs to share and troubleshoot configs without having to download the corresponding large texture mods. Are you sure you meant to disable validation?"))
                 {
                     DisableValidation = false;
                 }
diff --git a/SynthEBD/Settings/Settings_ModManager/VM_SettingsModManager.cs b/SynthEBD/Settings/Settings_ModManager/VM_SettingsModManager.cs
index e3b11f81..adba4886 100644
--- a/SynthEBD/Settings/Settings_ModManager/VM_SettingsModManager.cs
+++ b/SynthEBD/Settings/Settings_ModManager/VM_SettingsModManager.cs
@@ -10,13 +10,11 @@ public class VM_SettingsModManager : VM
 {
     private readonly PatcherState _patcherState;
     private readonly Logger _logger;
-    private readonly CustomMessageBox _customMessageBox;
     public delegate VM_SettingsModManager Factory();
-    public VM_SettingsModManager(PatcherState patcherState, Logger logger, CustomMessageBox customMessageBox)
+    public VM_SettingsModManager(PatcherState patcherState, Logger logger)
     {
         _patcherState = patcherState;
         _logger = logger;
-        _customMessageBox = customMessageBox;
 
         SelectTempFolder = new SynthEBD.RelayCommand(
             canExecute: _ => true,
@@ -39,7 +37,7 @@ public VM_SettingsModManager(PatcherState patcherState, Logger logger, CustomMes
         {
             if (folder.Length > 100)
             {
-                _customMessageBox.DisplayNotificationOK_WindowSafe("Warning", "Your SynthEBD Temp Folder is currently buried very deep: the folder path is " + folder.Length + " characters long. This can cause issues during config file installation. It is recommended that you change the Temp Folder in the Mod Manager Integration menu to a less deep folder.");
+                MessageWindow.DisplayNotificationOK("Warning", "Your SynthEBD Temp Folder is currently buried very deep: the folder path is " + folder.Length + " characters long. This can cause issues during config file installation. It is recommended that you change the Temp Folder in the Mod Manager Integration menu to a less deep folder.");
             }
         }).DisposeWith(this);
     }
diff --git a/SynthEBD/Settings/Settings_SpecificNPCAssignments/VM_SpecificNPCAssignmentsUI.cs b/SynthEBD/Settings/Settings_SpecificNPCAssignments/VM_SpecificNPCAssignmentsUI.cs
index e16d13dd..e72a4f45 100644
--- a/SynthEBD/Settings/Settings_SpecificNPCAssignments/VM_SpecificNPCAssignmentsUI.cs
+++ b/SynthEBD/Settings/Settings_SpecificNPCAssignments/VM_SpecificNPCAssignmentsUI.cs
@@ -76,7 +76,7 @@ public VM_SpecificNPCAssignmentsUI(
             {
                 if (IO_Aux.SelectFile("", "INI files (*.ini)|*.ini", "Select the Morphs.ini file", out string morphsPath))
                 {
-                    if (System.IO.Path.GetFileName(morphsPath).Equals("templates.ini", StringComparison.OrdinalIgnoreCase) && !CustomMessageBox.DisplayNotificationYesNo("Confirm File Name", "Expecting morphs.ini but this file is templates.ini, which should be imported in the BodyGen Menu. Are you sure you want to continue?"))
+                    if (System.IO.Path.GetFileName(morphsPath).Equals("templates.ini", StringComparison.OrdinalIgnoreCase) && !MessageWindow.DisplayNotificationYesNo("Confirm File Name", "Expecting morphs.ini but this file is templates.ini, which should be imported in the BodyGen Menu. Are you sure you want to continue?"))
                     {
                         return;
                     }
diff --git a/SynthEBD/Settings/Settings_TexMesh/VM_SettingsTexMesh.cs b/SynthEBD/Settings/Settings_TexMesh/VM_SettingsTexMesh.cs
index 609f1392..1264eb7f 100644
--- a/SynthEBD/Settings/Settings_TexMesh/VM_SettingsTexMesh.cs
+++ b/SynthEBD/Settings/Settings_TexMesh/VM_SettingsTexMesh.cs
@@ -150,11 +150,11 @@ public VM_SettingsTexMesh(
 
                 if (!AssetPacks.Any())
                 {
-                    CustomMessageBox.DisplayNotificationOK("", "There are no Asset Pack Config Files installed.");
+                    MessageWindow.DisplayNotificationOK("", "There are no Asset Pack Config Files installed.");
                 }
                 else if (ValidateAllConfigs(bgConfigs, oBodySettings, out List<string> errors))
                 {
-                    CustomMessageBox.DisplayNotificationOK("", "No errors found.");
+                    MessageWindow.DisplayNotificationOK("", "No errors found.");
                 }
                 else
                 {
@@ -507,7 +507,7 @@ public void ConfigVersionUpdate(Version version, List<string> assetPacks)
                 Environment.NewLine + string.Join(Environment.NewLine, toUpdate.Select(x => x.GroupName)) +
                 Environment.NewLine + Environment.NewLine + "Press Yes unless you know what you're doing or SynthEBD may not be able to use these config files.";
 
-            if (CustomMessageBox.DisplayNotificationYesNo("Config File Update", messageStr))
+            if (MessageWindow.DisplayNotificationYesNo("Config File Update", messageStr))
             {
                 foreach (var ap in toUpdate)
                 {
diff --git a/SynthEBD/SynthEBD.csproj b/SynthEBD/SynthEBD.csproj
index 6971e509..50e2eda3 100644
--- a/SynthEBD/SynthEBD.csproj
+++ b/SynthEBD/SynthEBD.csproj
@@ -215,7 +215,6 @@
     <PackageReference Include="AlphaFS" Version="2.2.6" />
     <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
     <PackageReference Include="gong-wpf-dragdrop" Version="3.2.1" />
-    <PackageReference Include="MaterialMessageBox" Version="4.0.2" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
     <PackageReference Include="Mutagen.Bethesda.FormKeys.SkyrimSE" Version="3.2.0" />
     <PackageReference Include="Mutagen.Bethesda.Json" Version="0.43.0.1-nightly-20231127-015852" />