diff --git a/.gitignore b/.gitignore
index 7172832e..4f4a0021 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *NodeEditorWinforms-master
 *GL_EditorFramework-master
 *SuperBMD-master
+*SuperBMD-link
 *Assimp
 *.resources
 Debug/
diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index c04e7255..93f9ff9c 100644
Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ
diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
index 283f98bd..61cbdfa9 100644
Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ
diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
index b2a2fe35..6a78547a 100644
Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/Switch_FileFormatsMain/FileFormats/Texture/BNTX.cs b/Switch_FileFormatsMain/FileFormats/Texture/BNTX.cs
index 9ca8f3a3..e76ed5c6 100644
--- a/Switch_FileFormatsMain/FileFormats/Texture/BNTX.cs
+++ b/Switch_FileFormatsMain/FileFormats/Texture/BNTX.cs
@@ -17,6 +17,7 @@ using Switch_Toolbox.Library;
 using Switch_Toolbox.Library.Forms;
 using Switch_Toolbox.Library.IO;
 using Switch_Toolbox.Library.Animations;
+using FirstPlugin.Forms;
 
 namespace FirstPlugin
 {
@@ -1261,13 +1262,20 @@ namespace FirstPlugin
 
         private bool IsEditorActive()
         {
-            ImageEditorBase editor = (ImageEditorBase)LibraryGUI.GetActiveContent(typeof(ImageEditorBase));
-            if (editor == null)
-                return false;
+            BfresEditor bfresEditor = (BfresEditor)LibraryGUI.GetActiveContent(typeof(BfresEditor));
+            if (bfresEditor != null)
+            {
+                var imageEditor = bfresEditor.GetActiveEditor(typeof(ImageEditorBase));
+                return imageEditor != null;
+            }
             else
-                return true;
+            {
+                ImageEditorBase editor = (ImageEditorBase)LibraryGUI.GetActiveContent(typeof(ImageEditorBase));
+                return editor != null;
+            }
         }
 
+
         public void UpdateEditor()
         {
             if (Parent != null && Parent.Parent != null && Parent.Parent is BFRES)
@@ -1407,6 +1415,7 @@ namespace FirstPlugin
             if (IsEditorActive())
                 UpdateEditor();
         }
+
         private void UpdateTextureMapping()
         {
             var viewport = LibraryGUI.GetActiveViewport();
diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
index 3bf2d6d4..f1cfd99a 100644
Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
index 31443025..47db3ddf 100644
Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ