diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
index 81d64b15..c24a2421 100644
--- a/FFXIV_TexTools/FFXIV_TexTools.csproj
+++ b/FFXIV_TexTools/FFXIV_TexTools.csproj
@@ -23,9 +23,9 @@
     <Product>FFXIV_TexTools</Product>
     <Copyright>Copyright ©  2024</Copyright>
     
-    <ApplicationVersion>3.0.5.4</ApplicationVersion>
-    <AssemblyVersion>3.0.5.4</AssemblyVersion>
-    <FileVersion>3.0.5.4</FileVersion>
+    <ApplicationVersion>3.0.5.5</ApplicationVersion>
+    <AssemblyVersion>3.0.5.5</AssemblyVersion>
+    <FileVersion>3.0.5.5</FileVersion>
     
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>
diff --git a/FFXIV_TexTools/MainWindow.xaml.cs b/FFXIV_TexTools/MainWindow.xaml.cs
index 0fcb8b27..0ad9f807 100644
--- a/FFXIV_TexTools/MainWindow.xaml.cs
+++ b/FFXIV_TexTools/MainWindow.xaml.cs
@@ -548,9 +548,13 @@ await Task.Run(async () =>
                         }
 
                     }
-                    FlexibleMessageBox.Show(("An error occurred while attempting to rebuild the cache. This may be caused by this version of Final Fantasy XIV " +
-                        "not being supported by this version of TexTools.\n\n").L() + ex.Message, "Cache Rebuild Error.".L(), MessageBoxButtons.OK,  MessageBoxIcon.Error, 
-                        MessageBoxDefaultButton.Button1);
+
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        FlexibleMessageBox.Show(("An error occurred while attempting to rebuild the cache. This may be caused by this version of Final Fantasy XIV " +
+                            "not being supported by this version of TexTools.\n\n").L() + ex.Message, "Cache Rebuild Error.".L(), MessageBoxButtons.OK,  MessageBoxIcon.Error, 
+                            MessageBoxDefaultButton.Button1);
+                    });
                 }
 
                 try
@@ -559,12 +563,18 @@ await Task.Run(async () =>
 
                     if (!await tx.FileExists(Eqp.DawntrailTestFile, true))
                     {
-                        this.ShowWarning("Non-Dawntrail Install", "TexTools is currently assigned to a Endwalker or previous install.\n\nMany parts of the application will not operate correctly on old FFXIV installs.");
+                        Application.Current.Dispatcher.Invoke(() =>
+                        {
+                            this.ShowWarning("Non-Dawntrail Install", "TexTools is currently assigned to a Endwalker or previous install.\n\nMany parts of the application will not operate correctly on old FFXIV installs.");
+                        });
                     }
                 }
                 catch(Exception ex)
                 {
-                    this.ShowWarning("Unable to read base game files.  FFXIV Install location may be corrupt or invalid:\n" + Settings.Default.FFXIV_Directory, "Unable to Read Files");
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        this.ShowWarning("Unable to read base game files.  FFXIV Install location may be corrupt or invalid:\n" + Settings.Default.FFXIV_Directory, "Unable to Read Files");
+                    });
                 }
 
                 await Dispatcher.Invoke(async () =>
diff --git a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
index e127e977..f5056b4b 100644
--- a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
+++ b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
@@ -397,7 +397,10 @@ await Task.Run(async () =>
                     }
                     catch
                     {
-                        ViewHelpers.ShowWarning(this, "Temp File Clear Error", "Unable to clear TexTools temp folder.\nThe mod as converted successfully, cannot clear its temp folder due to unusual permissions issues with some mod file that was used.\n\nPlease manually delete the folder: %TEMP%/xivmf/\n\n(The upgrade process has been paused.)");
+                        Application.Current.Dispatcher.Invoke(() =>
+                        {
+                            ViewHelpers.ShowWarning(this, "Temp File Clear Error", "Unable to clear TexTools temp folder.\nThe mod as converted successfully, cannot clear its temp folder due to unusual permissions issues with some mod file that was used.\n\nPlease manually delete the folder: %TEMP%/xivmf/\n\n(The upgrade process has been paused.)");
+                        });
                         _RequestStop = true;
                     }
 
diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 8ecf7aa0..0ea2ed07 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 8ecf7aa0600a4460cce02d8e6f34e142575ea34f
+Subproject commit 0ea2ed072c6dd429dcb16bed2f951f0b3414cab1