diff --git a/File_Format_Library/FileFormats/BMD/BMD.cs b/File_Format_Library/FileFormats/BMD/BMD.cs
index 60adf299..fe65f6db 100644
--- a/File_Format_Library/FileFormats/BMD/BMD.cs
+++ b/File_Format_Library/FileFormats/BMD/BMD.cs
@@ -266,7 +266,7 @@ namespace FirstPlugin
                     if (node.Index < Meshes.Count)
                     {
                         int matIndex = node.Parent.Index;
-                        ((BMDShapeWrapper)Meshes[node.Index]).SetMaterial((STGenericMaterial)MaterialFolder.Nodes[materials.m_RemapIndices[matIndex]]);
+                        ((BMDShapeWrapper)Meshes[node.Index]).SetMaterial((STGenericMaterial)MaterialFolder.Nodes[matIndex]);
                     }
                 }
             }
diff --git a/File_Format_Library/FileFormats/BMD/BMDShapeWrapper.cs b/File_Format_Library/FileFormats/BMD/BMDShapeWrapper.cs
index 81970ce3..90ea77ad 100644
--- a/File_Format_Library/FileFormats/BMD/BMDShapeWrapper.cs
+++ b/File_Format_Library/FileFormats/BMD/BMDShapeWrapper.cs
@@ -37,7 +37,7 @@ namespace FirstPlugin
 
         public override void OnClick(TreeView treeView)
         {
-            STPropertyGrid editor = (STPropertyGrid)LibraryGUI.GetActiveContent(typeof(STPropertyGrid));
+         /*   STPropertyGrid editor = (STPropertyGrid)LibraryGUI.GetActiveContent(typeof(STPropertyGrid));
             if (editor == null)
             {
                 editor = new STPropertyGrid();
@@ -45,7 +45,7 @@ namespace FirstPlugin
             }
             editor.Text = Text;
             editor.Dock = DockStyle.Fill;
-            editor.LoadProperty(BMDShape, null);
+            editor.LoadProperty(BMDShape, null);(*/
         }
     }
 }
diff --git a/File_Format_Library/GUI/BFFNT/BffntEditor.cs b/File_Format_Library/GUI/BFFNT/BffntEditor.cs
index f6cd49c8..09a4c094 100644
--- a/File_Format_Library/GUI/BFFNT/BffntEditor.cs
+++ b/File_Format_Library/GUI/BFFNT/BffntEditor.cs
@@ -143,7 +143,11 @@ namespace FirstPlugin.Forms
                 form.editorBase.Dock = DockStyle.Fill;
                 form.editorBase.LoadProperties(image.GenericProperties);
                 form.editorBase.LoadImage(image);
-                form.ShowDialog();
+
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    UpdateImagePanel(ImageIndex);
+                }
             }
         }
         
diff --git a/Toolbox/Lib/SuperBMDLib.dll b/Toolbox/Lib/SuperBMDLib.dll
index 03aca394..eb52a30e 100644
Binary files a/Toolbox/Lib/SuperBMDLib.dll and b/Toolbox/Lib/SuperBMDLib.dll differ
diff --git a/Toolbox/Lib/SuperBMDLib.pdb b/Toolbox/Lib/SuperBMDLib.pdb
index 88e344dc..ee306ded 100644
Binary files a/Toolbox/Lib/SuperBMDLib.pdb and b/Toolbox/Lib/SuperBMDLib.pdb differ