diff --git a/ConsoleTools/Program.cs b/ConsoleTools/Program.cs
index 9f87c0c3..cc210e29 100644
--- a/ConsoleTools/Program.cs
+++ b/ConsoleTools/Program.cs
@@ -102,15 +102,45 @@ public static async Task<int> HandleConsoleArgs()
             {
                 code = await UnwrapFile();
             }
+            else if (cmd == "/list")
+            {
+                code = await ListRoot();
+            }
             else
             {
-                await ShowHelp();
+                Console.WriteLine("Unknown Command: " + cmd);
                 code = -1;
             }
 
             return code;
         }
 
+        private static async Task<int> ListRoot()
+        {
+            if (_Args.Length < 2)
+            {
+                return -1;
+            }
+
+            var rootSt = _Args[1];
+            var rootInfo = XivCache.GetFileNameRootInfo(rootSt, true);
+
+            if (!rootInfo.IsValid())
+            {
+                Console.WriteLine("Given Root ID is not valid: " + rootSt);
+                return -1;
+            }
+            var root = new XivDependencyRoot(rootInfo);
+
+            var files = await root.GetAllFiles();
+
+            foreach(var file in files)
+            {
+                Console.WriteLine(file);
+            }
+            return 0;
+        }
+
         public static async Task<int> HandleUpgrade()
         {
             if (_Args.Length < 3)
@@ -322,6 +352,8 @@ public static async Task<int> ShowHelp()
             System.Console.WriteLine("");
             System.Console.WriteLine("\t/unwrap [SourceFilePath] [DestFilePath] [IntendedFfxivFilePath] - Unwraps a given on-disk SqPacked or Flat FFXIV file into the given format. FF Path only needed for MDLs Skeleton/Texture info.");
             System.Console.WriteLine("");
+            System.Console.WriteLine("\t/list [RootId] - List the entire collection of files associated with a given root ID. ( Ex. c0101h0010 )");
+            System.Console.WriteLine("");
             System.Console.WriteLine("== FORMATS ==");
             System.Console.WriteLine("\tModpacks may be read or written in .ttmp2, .pmp, or unzipped PMP folder path formats.");
             System.Console.WriteLine("\tImages may be saved as DDS, TEX, TGA, PNG, BMP.");
diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
index c24a2421..6484baa2 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.5</ApplicationVersion>
-    <AssemblyVersion>3.0.5.5</AssemblyVersion>
-    <FileVersion>3.0.5.5</FileVersion>
+    <ApplicationVersion>3.0.5.6</ApplicationVersion>
+    <AssemblyVersion>3.0.5.6</AssemblyVersion>
+    <FileVersion>3.0.5.6</FileVersion>
     
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>
diff --git a/FFXIV_TexTools/MainWindow.xaml.cs b/FFXIV_TexTools/MainWindow.xaml.cs
index 0ad9f807..ec6c697c 100644
--- a/FFXIV_TexTools/MainWindow.xaml.cs
+++ b/FFXIV_TexTools/MainWindow.xaml.cs
@@ -285,6 +285,9 @@ private void AutoUpdater_ApplicationExitEvent()
         }
         public MainWindow(string[] args)
         {
+
+            var hasPenumbra = PenumbraAPI.IsPenumbraInstalled();
+            
             _Args = args;
             _mainWindow = this;
 
@@ -1518,6 +1521,10 @@ private async void Menu_StartOver_Click(object sender, RoutedEventArgs e)
                 if(MainWindow.UserTransaction.ModifiedFiles.Count > 0)
                 {
                     var r = FlexibleMessageBox.Show(ViewHelpers.GetWin32Window(this), "Your current transaction must be closed in order to proceed.\n\nYou will lose any active changes if you continue.", "Transaction Cancel Warning", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
+                    if (r != System.Windows.Forms.DialogResult.OK)
+                    {
+                        return;
+                    }
                 }
                 await ModTransaction.CancelTransaction(MainWindow.UserTransaction, true);
             }
diff --git a/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs b/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
index c7f78ae7..6055bf28 100644
--- a/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
+++ b/FFXIV_TexTools/Models/PenumbraUpgradeStatus.cs
@@ -10,6 +10,7 @@
 using FFXIV_TexTools.Helpers;
 using System.Diagnostics;
 using xivModdingFramework.Mods;
+using xivModdingFramework.Exd.FileTypes;
 
 namespace FFXIV_TexTools.Models
 {
@@ -49,8 +50,23 @@ public async Task<EUpgradeResult> ProcessMod(string baseDir, string targetDir, s
                 {
                     if (source != target)
                     {
-                        IOUtil.RecursiveDeleteDirectory(target);
-                        IOUtil.CopyFolder(source, target);
+                        try
+                        {
+                            IOUtil.RecursiveDeleteDirectory(target);
+                        }
+                        catch(Exception ex2)
+                        {
+                            throw new Exception("Unable to delete directory for failed conversion, possibly due to security issue: " + target + "\n"+ ex2.Message + "\n\nOriginal Conversion Failure: " + ex.Message);
+                        }
+
+                        try
+                        {
+                            IOUtil.CopyFolder(source, target);
+                        }
+                        catch (Exception ex2)
+                        {
+                            throw new Exception("Unable to copy failed mod directory to destination.\nFrom: " + source + "\nTo: " + target + "\n" + ex2.Message + "\n\nOriginal Conversion Failure: " + ex.Message);
+                        }
                     }
                 }
                 res = EUpgradeResult.Failure;
diff --git a/FFXIV_TexTools/ViewModels/MainViewModel.cs b/FFXIV_TexTools/ViewModels/MainViewModel.cs
index 6d1858f4..e50573af 100644
--- a/FFXIV_TexTools/ViewModels/MainViewModel.cs
+++ b/FFXIV_TexTools/ViewModels/MainViewModel.cs
@@ -237,6 +237,7 @@ public async Task DoPostPatchCleanup()
                         {
                             // Original offset moved.  Just update the mod entry.
                             var m = mod;
+                            Dat.AssertOriginalOffsetIsSafe(mod.DataFile, currentOffset);
                             m.OriginalOffset8x = currentOffset;
                             await tx.UpdateMod(mod, mod.FilePath);
                         } else if(currentOK && !moddedOk && !originalOk)
diff --git a/FFXIV_TexTools/Views/Controls/FileListControl.xaml b/FFXIV_TexTools/Views/Controls/FileListControl.xaml
index 24d52c9f..3669ef19 100644
--- a/FFXIV_TexTools/Views/Controls/FileListControl.xaml
+++ b/FFXIV_TexTools/Views/Controls/FileListControl.xaml
@@ -54,16 +54,12 @@
 
         <Grid x:Name="InfoGrid" Grid.Row="1">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="120"></ColumnDefinition>
-                <ColumnDefinition Width="120"></ColumnDefinition>
                 <ColumnDefinition Width="120"></ColumnDefinition>
                 <ColumnDefinition Width="120"></ColumnDefinition>
                 <ColumnDefinition Width="1*"></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <Button Grid.Column="0" Content="Select All" VerticalAlignment="Center" Margin="10,0,10,0" Click="SelectAll_Click"/>
-            <Button Grid.Column="1" Content="Clear All" VerticalAlignment="Center" Margin="10,0,10,0" Click="ClearAll_Click"/>
-            <Button Grid.Column="2" Content="Select Visible" VerticalAlignment="Center" Margin="10,0,10,0" Click="SelectVisible_Click"/>
-            <Button Grid.Column="3" Content="Clear Visible" VerticalAlignment="Center" Margin="10,0,10,0" Click="ClearVisible_Click"/>
+            <Button Grid.Column="0" Content="{Binding Path=SelectAllText, FallbackValue=Select All}" VerticalAlignment="Center" Margin="10,0,10,0" Click="SelectAll_Click"/>
+            <Button Grid.Column="1" Content="{Binding Path=ClearAllText, FallbackValue=Clear All}" VerticalAlignment="Center" Margin="10,0,10,0" Click="ClearAll_Click"/>
             <Label Grid.Column="4" HorizontalAlignment="Left" VerticalAlignment="Center" Content="{Binding Path=SelectedCountLabel}"></Label>
         </Grid>
     </Grid>
diff --git a/FFXIV_TexTools/Views/Controls/FileListControl.xaml.cs b/FFXIV_TexTools/Views/Controls/FileListControl.xaml.cs
index 59034b5f..6fc09ac2 100644
--- a/FFXIV_TexTools/Views/Controls/FileListControl.xaml.cs
+++ b/FFXIV_TexTools/Views/Controls/FileListControl.xaml.cs
@@ -284,6 +284,32 @@ public ICollectionView VisibleFiles {
                 PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(VisibleFiles)));
             }
         }
+        private string _SelectAllText = "Select All";
+        public string SelectAllText
+        {
+            get
+            {
+                return _SelectAllText;
+            }
+            set
+            {
+                _SelectAllText = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SelectAllText)));
+            }
+        }
+        private string _ClearAllText = "Clear All";
+        public string ClearAllText
+        {
+            get
+            {
+                return _ClearAllText;
+            }
+            set
+            {
+                _ClearAllText = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(ClearAllText)));
+            }
+        }
 
         public FileListControl()
         {
@@ -296,14 +322,14 @@ public FileListControl()
             InitializeComponent();
 
         }
-        public void SetFiles(IEnumerable<string> files)
+        public void SetFiles(IEnumerable<string> files, bool selected = true)
         {
             _Files = new ObservableCollection<UiWrappedFile>();
             var dist = files.Distinct();
             var tx = MainWindow.DefaultTransaction;
             foreach (var file in dist)
             {
-                var uif = new UiWrappedFile(file, null, true, tx);
+                var uif = new UiWrappedFile(file, null, selected, tx);
                 uif.PropertyChanged += Uif_PropertyChanged;
                 _Files.Add(uif);
             }
@@ -364,6 +390,16 @@ private void UpdateVisible()
         {
             this.Invoke(() =>
             {
+                if (string.IsNullOrWhiteSpace(_SearchText))
+                {
+                    SelectAllText = "Select All";
+                    ClearAllText = "Clear All";
+                } else
+                {
+                    SelectAllText = "Select Visible";
+                    ClearAllText = "Clear Visible";
+                }
+
                 _VisibleFiles.Refresh();
             });
         }
@@ -475,15 +511,14 @@ private void Header_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void SelectAll_Click(object sender, RoutedEventArgs e)
+        public void SelectAll()
         {
             foreach (UiWrappedFile file in _Files)
             {
                 file.Selected = true;
             }
         }
-
-        private void ClearAll_Click(object sender, RoutedEventArgs e)
+        public void ClearAll()
         {
             foreach (UiWrappedFile file in _Files)
             {
@@ -491,19 +526,38 @@ private void ClearAll_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private void SelectVisible_Click(object sender, RoutedEventArgs e)
+        private void SelectAll_Click(object sender, RoutedEventArgs e)
         {
-            foreach (UiWrappedFile file in VisibleFiles)
+
+            if (string.IsNullOrWhiteSpace(_SearchText))
             {
-                file.Selected = true;
+                foreach (UiWrappedFile file in _Files)
+                {
+                    file.Selected = true;
+                }
+            } else
+            {
+                foreach (UiWrappedFile file in VisibleFiles)
+                {
+                    file.Selected = true;
+                }
             }
         }
 
-        private void ClearVisible_Click(object sender, RoutedEventArgs e)
+        private void ClearAll_Click(object sender, RoutedEventArgs e)
         {
-            foreach (UiWrappedFile file in VisibleFiles)
+            if (string.IsNullOrWhiteSpace(_SearchText))
             {
-                file.Selected = false;
+                foreach (UiWrappedFile file in _Files)
+                {
+                    file.Selected = false;
+                }
+            } else
+            {
+                foreach (UiWrappedFile file in VisibleFiles)
+                {
+                    file.Selected = false;
+                }
             }
         }
 
diff --git a/FFXIV_TexTools/Views/FileControls/FileViewControl.cs b/FFXIV_TexTools/Views/FileControls/FileViewControl.cs
index 6256d6ff..3ac04878 100644
--- a/FFXIV_TexTools/Views/FileControls/FileViewControl.cs
+++ b/FFXIV_TexTools/Views/FileControls/FileViewControl.cs
@@ -37,6 +37,9 @@ public enum EFileViewType
 
     public abstract class FileViewControl : System.Windows.Controls.UserControl, INotifyPropertyChanged, IDisposable
     {
+
+        public const int _DEBOUNCE_TIME = 1000;
+
         public delegate void FileDeletedEventHandler(string internalPath);
         public event FileDeletedEventHandler FileDeleted;
 
@@ -146,14 +149,14 @@ public FileViewControl()
             TxWatcher.UserTxStarted += OnUserTransactionStarted;
 
 
-            DebouncedUpdate = ViewHelpers.Debounce<string>(_UpdateOnMainThread, 200);
+            DebouncedUpdate = ViewHelpers.CancellableDebounce<string>(_UpdateOnMainThread, _DEBOUNCE_TIME);
 
 
             IsEnabled = false;
         }
 
 
-        private Action<string> DebouncedUpdate;
+        private Action<string, bool> DebouncedUpdate;
 
         private void OnUserTransactionStarted(ModTransaction tx)
         {
@@ -204,7 +207,7 @@ protected virtual async Task INTERNAL_HandlTxNotification(string changedFile, lo
             {
                 _UpdateQueued = true;
                 // File was deleted.
-                DebouncedUpdate(InternalFilePath);
+                DebouncedUpdate(InternalFilePath, false);
                 FileDeleted?.Invoke(InternalFilePath);
                 return;
             }
@@ -215,7 +218,7 @@ await Task.Run(async () =>
                 if (await ShouldUpdateOnFileChange(changedFile))
                 {
                     _UpdateQueued = true;
-                    DebouncedUpdate(InternalFilePath);
+                    DebouncedUpdate(InternalFilePath, false);
                 }
             });
         }
@@ -237,7 +240,6 @@ protected virtual async Task<bool> ShouldUpdateOnFileChange(string changedFile)
 
         private async void  _UpdateOnMainThread(string file)
         {
-            Trace.WriteLine("Main Thread Update Called: " + file);
             try
             {
                 await await Dispatcher.InvokeAsync(async () =>
@@ -392,6 +394,10 @@ public void ClearFile()
 
         public abstract void INTERNAL_ClearFile();
 
+        public virtual void CancelPendingReload()
+        {
+            DebouncedUpdate(null, true);
+        }
 
         protected bool _LOADING = false;
         /// <summary>
@@ -405,7 +411,6 @@ public void ClearFile()
         /// <returns></returns>
         public virtual async Task<bool> LoadInternalFile(string internalFile, bool forceOriginal = false, IItem referenceItem = null, byte[] decompData = null)
         {
-
             if (_LOADING)
             {
                 // Safety reject.
diff --git a/FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs b/FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs
index 0e41f219..8ded6aa8 100644
--- a/FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs
+++ b/FFXIV_TexTools/Views/FileControls/MaterialFileControl.xaml.cs
@@ -98,6 +98,8 @@ public partial class MaterialFileControl : FileViewControl, INotifyPropertyChang
         private bool _MTRL_LOADING = false;
 
         private XivMtrl _Material;
+
+        private XivMtrl _OriginalMaterial;
         public XivMtrl Material
         {
             get
@@ -230,6 +232,7 @@ protected override async Task<bool> INTERNAL_LoadFile(byte[] data, string path,
 
 
             Material = mtrl;
+            _OriginalMaterial = (XivMtrl) mtrl.Clone();
             return true;
         }
 
@@ -333,10 +336,10 @@ protected override async Task<bool> ShouldUpdateOnFileChange(string changedFile)
                 }
 
                 var newMtrl = await Mtrl.GetXivMtrl(changedFile, false, tx);
-
                 var result = Mtrl.CompareMaterials(Material, newMtrl);
+                var originalResult = Mtrl.CompareMaterials(_OriginalMaterial, newMtrl);
 
-                if (result.OtherDifferences)
+                if (result.OtherDifferences && originalResult.OtherDifferences)
                 {
                     // If parts other than the colorset were changed, we need to prompt a reload.
                     return true;
@@ -345,7 +348,7 @@ protected override async Task<bool> ShouldUpdateOnFileChange(string changedFile)
                 if (!result.ColorsetDifferences)
                 {
                     // Nothing actually changed, don't bother reloading.
-                    return true;
+                    return false;
                 }
 
 
diff --git a/FFXIV_TexTools/Views/FileControls/ModelFileControl.xaml.cs b/FFXIV_TexTools/Views/FileControls/ModelFileControl.xaml.cs
index a8623d7a..55932850 100644
--- a/FFXIV_TexTools/Views/FileControls/ModelFileControl.xaml.cs
+++ b/FFXIV_TexTools/Views/FileControls/ModelFileControl.xaml.cs
@@ -89,6 +89,8 @@ public ModelFileControl()
             InitializeComponent();
             ViewportVM = new Viewport3DViewModel();
 
+            DebouncedUpdateVisual = ViewHelpers.CancellableDebounce(InvokeUpdateVisual, _DEBOUNCE_TIME);
+
             if (Configuration.EnvironmentConfiguration.TT_Unshared_Rendering)
                 _CanvasRenderer = new Helpers.ViewportCanvasRenderer(Viewport, AlternateViewportCanvas);
             ViewType = EFileViewType.Editor;
@@ -136,6 +138,12 @@ protected override async Task<byte[]> INTERNAL_GetUncompressedData()
             return data;
         }
 
+        public override void CancelPendingReload()
+        {
+            base.CancelPendingReload();
+            DebouncedUpdateVisual(true);
+        }
+
         protected override async Task<bool> INTERNAL_LoadFile(byte[] data, string path, IItem referenceItem, ModTransaction tx)
         {
             ShowModelStatus(UIStrings.ModelStatus_Loading);
@@ -260,29 +268,51 @@ protected override async Task<bool> INTERNAL_WriteModFile(ModTransaction tx)
             await Mdl.FillMissingMaterials(Model, ReferenceItem, XivStrings.TexTools, tx);
             return await base.INTERNAL_WriteModFile(tx);   
         }
+
+        private static bool _FullUpdateRequested = false;
         protected override async Task<bool> ShouldUpdateOnFileChange(string changedFile)
         {
+            // We do not use the baseline functionality here since
+            // models can have 'partial reloads.  Thus we always return false.
             if(changedFile == InternalFilePath)
             {
-                return true;
+                _FullUpdateRequested = true;
+                DebouncedUpdateVisual(false);
             }
 
             if(Model == null || _MaterialPaths == null)
             {
-                return true;
+                _FullUpdateRequested = true;
+                DebouncedUpdateVisual(false);
             }
 
             if(_ChildFiles.Contains(changedFile))
             {
                 // Queue visual update if one of our constituent files chnaged, doesn't really matter if it fails.
-                _ = await Dispatcher.InvokeAsync(async () =>
-                {
-                    await UpdateVisual();
-                });
+                DebouncedUpdateVisual(false);
             }
             return false;
         }
 
+        private Action<bool> DebouncedUpdateVisual;
+
+        private async void InvokeUpdateVisual()
+        {
+            _ = await Dispatcher.InvokeAsync(async () =>
+            {
+                if (_FullUpdateRequested)
+                {
+                    await ReloadFile();
+                }
+                else
+                {
+                    await UpdateVisual();
+                }
+
+                _FullUpdateRequested = false;
+            });
+        }
+
         public override string GetNiceName()
         {
             return "Model";
diff --git a/FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs b/FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs
index 0c2dceed..3e23484c 100644
--- a/FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs
+++ b/FFXIV_TexTools/Views/Item/ItemViewControl.xaml.cs
@@ -361,7 +361,14 @@ private void Tx_FileChanged(string changedFile, long newOffset)
 
                         // But is not already listed in our file structure.
                         // This means we need to reload the item.
+
+                        foreach( var c in FileControls)
+                        {
+                            var fc = c.FileControl;
+                            fc?.CancelPendingReload();
+                        }
                         _DebouncedRebuildComboBoxes(Item);
+
                     } else if (changedFile.EndsWith(".mdl"))
                     {
                         _ModelsNeedingValidation.Add(changedFile);
@@ -2005,6 +2012,12 @@ private async void DispatchRebuildComboBoxes(IItem item)
         {
             try
             {
+                foreach (var c in FileControls)
+                {
+                    var fc = c.FileControl;
+                    fc?.CancelPendingReload();
+                }
+
                 await await Dispatcher.InvokeAsync(async () =>
                 {
                     var tx = MainWindow.DefaultTransaction;
diff --git a/FFXIV_TexTools/Views/ModPack/Simple/FileListExporter.xaml.cs b/FFXIV_TexTools/Views/ModPack/Simple/FileListExporter.xaml.cs
index 1caae0f5..126b0652 100644
--- a/FFXIV_TexTools/Views/ModPack/Simple/FileListExporter.xaml.cs
+++ b/FFXIV_TexTools/Views/ModPack/Simple/FileListExporter.xaml.cs
@@ -126,7 +126,7 @@ public FileListExporter(IEnumerable<string> files)
 
             DataContext = this;
             InitializeComponent();
-            FileList.SetFiles(files);
+            FileList.SetFiles(files, false);
 
             ModpackAuthor = Properties.Settings.Default.Default_Author;
             ModpackUrl = Properties.Settings.Default.Default_Modpack_Url;
diff --git a/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml.cs b/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml.cs
index f9de139a..bd4d06ac 100644
--- a/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml.cs
+++ b/FFXIV_TexTools/Views/Transactions/TransactionStatusWindow.xaml.cs
@@ -687,7 +687,7 @@ private async Task BeginPenumbraAttach()
 
             PenumbraAttachDialog.Title = "Select Penumbra Mod Folder...";
 
-            PenumbraAttachDialog.RootFolder = IOUtil.GetPenumbraDirectory();
+            PenumbraAttachDialog.RootFolder = PenumbraAPI.GetPenumbraDirectory();
 
             var res = PenumbraAttachDialog.ShowDialog();
             if (res != System.Windows.Forms.DialogResult.OK)
diff --git a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
index f5056b4b..c51b7d9b 100644
--- a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
+++ b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
@@ -184,7 +184,7 @@ public PenumbraLibraryUpgradeWindow()
             Closing += PenumbraLibraryUpgradeWindow_Closing;
             CheckPaths();
 
-            var p = IOUtil.GetPenumbraDirectory();
+            var p = PenumbraAPI.GetPenumbraDirectory();
             if (!string.IsNullOrWhiteSpace(p)) {
                 PenumbraPath = p;
             }
diff --git a/FFXIV_TexTools/Views/ViewHelpers.cs b/FFXIV_TexTools/Views/ViewHelpers.cs
index 96413f42..ac66676c 100644
--- a/FFXIV_TexTools/Views/ViewHelpers.cs
+++ b/FFXIV_TexTools/Views/ViewHelpers.cs
@@ -283,6 +283,26 @@ public static Action Debounce(Action func, int milliseconds = 300)
                     }, TaskScheduler.Default);
             };
         }
+        public static Action<bool> CancellableDebounce(Action func, int milliseconds = 300)
+        {
+            CancellationTokenSource cancelTokenSource = null;
+
+            return (cancel) =>
+            {
+                cancelTokenSource?.Cancel();
+                if (cancel) return;
+                cancelTokenSource = new CancellationTokenSource();
+
+                Task.Delay(milliseconds, cancelTokenSource.Token)
+                    .ContinueWith(t =>
+                    {
+                        if (t.IsCompleted && !t.IsCanceled)
+                        {
+                            func();
+                        }
+                    }, TaskScheduler.Default);
+            };
+        }
         public static Action<T> Debounce<T>(Action<T> func, int milliseconds = 300)
         {
             CancellationTokenSource cancelTokenSource = null;
@@ -302,6 +322,28 @@ public static Action<T> Debounce<T>(Action<T> func, int milliseconds = 300)
                     }, TaskScheduler.Default);
             };
         }
+        public static Action<T, bool> CancellableDebounce<T>(Action<T> func, int milliseconds = 300)
+        {
+            CancellationTokenSource cancelTokenSource = null;
+
+            return (arg, cancel) =>
+            {
+                cancelTokenSource?.Cancel();
+
+                if (cancel) return;
+
+                cancelTokenSource = new CancellationTokenSource();
+
+                Task.Delay(milliseconds, cancelTokenSource.Token)
+                    .ContinueWith(t =>
+                    {
+                        if (t.IsCompleted && !t.IsCanceled)
+                        {
+                            func(arg);
+                        }
+                    }, TaskScheduler.Default);
+            };
+        }
 
 
         /// <summary>
diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
index 0ea2ed07..caf5f0e0 160000
--- a/lib/xivModdingFramework
+++ b/lib/xivModdingFramework
@@ -1 +1 @@
-Subproject commit 0ea2ed072c6dd429dcb16bed2f951f0b3414cab1
+Subproject commit caf5f0e0135e3bc1c5e47403de6da141ae2d4941