diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index 67cc55fe..55cff56f 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 804328ab..6d8b6a9d 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 bf7fbb59..0e2e4370 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/BFRES/BFRES.cs b/Switch_FileFormatsMain/FileFormats/BFRES/BFRES.cs
index d52e537e..54b88eee 100644
--- a/Switch_FileFormatsMain/FileFormats/BFRES/BFRES.cs
+++ b/Switch_FileFormatsMain/FileFormats/BFRES/BFRES.cs
@@ -774,6 +774,10 @@ namespace FirstPlugin
             var animFolder = new BFRESAnimFolder();
             var externalFilesFolder = new BFRESGroupNode(BRESGroupType.Embedded);
 
+            //Reload context menus to load specific context menus
+            modelFolder.LoadContextMenus();
+            texturesFolder.LoadContextMenus();
+
             texturesFolder.ShowNewContextMenu = false;
 
             Nodes.Add(modelFolder);
@@ -896,6 +900,9 @@ namespace FirstPlugin
             var animFolder = new BFRESAnimFolder();
             var externalFilesFolder = new BFRESGroupNode(BRESGroupType.Embedded);
 
+            //Reload context menus for models to load specific context menus
+            modelFolder.LoadContextMenus();
+
             //Texture folder acts like a bntx for saving back
             //This will only save if the user adds textures to it or the file has a bntx already
             texturesFolder.IFileInfo = new IFileInfo();
diff --git a/Switch_FileFormatsMain/FileFormats/BFRES/BFRESGroupNode.cs b/Switch_FileFormatsMain/FileFormats/BFRES/BFRESGroupNode.cs
index 600eb35c..37fcd395 100644
--- a/Switch_FileFormatsMain/FileFormats/BFRES/BFRESGroupNode.cs
+++ b/Switch_FileFormatsMain/FileFormats/BFRES/BFRESGroupNode.cs
@@ -14,6 +14,7 @@ namespace Bfres.Structs
 {
     public enum BRESGroupType
     {
+        None,
         Models,
         Textures,
         SkeletalAnim,
diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
index 20436a70..5068417b 100644
Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ
diff --git a/Switch_Toolbox.zip b/Switch_Toolbox.zip
new file mode 100644
index 00000000..0d1c1c30
Binary files /dev/null and b/Switch_Toolbox.zip differ
diff --git a/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs b/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs
index 2648ef12..5f8a592a 100644
--- a/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs
+++ b/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs
@@ -182,9 +182,8 @@ namespace Switch_Toolbox.Library.Forms
 
             SetEditorOrientation(Runtime.ImageEditor.DisplayVertical);
 
-            //If it's horizontal we need to update it manually 
             if (!Runtime.ImageEditor.DisplayVertical)
-                SetOrientation();
+                DisplayHorizontal();
 
             propertyGridToolStripMenuItem.Checked = Runtime.ImageEditor.ShowPropertiesPanel;