diff --git a/BrawlboxHelper/Syroot.NintenTools.NSW.Bfres.dll b/BrawlboxHelper/Syroot.NintenTools.NSW.Bfres.dll
index 6c2a5331..0c4f2e81 100644
Binary files a/BrawlboxHelper/Syroot.NintenTools.NSW.Bfres.dll and b/BrawlboxHelper/Syroot.NintenTools.NSW.Bfres.dll differ
diff --git a/File_Format_Library/FileFormats/Texture/BNTX.cs b/File_Format_Library/FileFormats/Texture/BNTX.cs
index c9697a8c..db6ebc77 100644
--- a/File_Format_Library/FileFormats/Texture/BNTX.cs
+++ b/File_Format_Library/FileFormats/Texture/BNTX.cs
@@ -1388,7 +1388,6 @@ namespace FirstPlugin
                 case SurfaceFormat.B8_G8_R8_A8_UNORM: return TEX_FORMAT.B8G8R8A8_UNORM;
                 case SurfaceFormat.R10_G10_B10_A2_UNORM: return TEX_FORMAT.R10G10B10A2_UNORM;
                 case SurfaceFormat.R11_G11_B10_UINT: return TEX_FORMAT.R11G11B10_FLOAT;
-                case SurfaceFormat.R16_UNORM: return TEX_FORMAT.R16_UNORM;
                 case SurfaceFormat.R4_G4_B4_A4_UNORM: return TEX_FORMAT.B4G4R4A4_UNORM;
                 case SurfaceFormat.R4_G4_UNORM: return TEX_FORMAT.B4G4R4A4_UNORM;
                 case SurfaceFormat.R5_G5_B5_A1_UNORM: return TEX_FORMAT.R5G5B5A1_UNORM;
@@ -1397,7 +1396,11 @@ namespace FirstPlugin
                 case SurfaceFormat.R8_G8_B8_A8_UNORM: return TEX_FORMAT.R8G8B8A8_UNORM;
                 case SurfaceFormat.R8_G8_B8_A8_SNORM: return TEX_FORMAT.R8G8B8A8_SNORM;
                 case SurfaceFormat.R8_UNORM: return TEX_FORMAT.R8_UNORM;
+                case SurfaceFormat.R16_UNORM: return TEX_FORMAT.R16_UNORM;
+                case SurfaceFormat.R16_SNORM: return TEX_FORMAT.R16_SNORM;
                 case SurfaceFormat.R16_UINT: return TEX_FORMAT.R16_UINT;
+                case SurfaceFormat.R16_SINT: return TEX_FORMAT.R16_SINT;
+                case SurfaceFormat.R16_FLOAT: return TEX_FORMAT.R16_FLOAT;
                 case SurfaceFormat.R8_G8_UNORM: return TEX_FORMAT.R8G8_UNORM;
                 case SurfaceFormat.R8_G8_SNORM: return TEX_FORMAT.R8G8_SNORM;
                 case SurfaceFormat.ETC1_UNORM: return TEX_FORMAT.ETC1_UNORM;
@@ -1434,7 +1437,10 @@ namespace FirstPlugin
 
                 case SurfaceFormat.Invalid: throw new Exception("Invalid Format");
                 default:
-                    throw new Exception($"Cannot convert format {surfaceFormat}");
+                //Unsupported, skip for now
+                     return TEX_FORMAT.R8G8B8A8_UNORM;
+
+                    //    throw new Exception($"Cannot convert format {surfaceFormat}");
             }
         }
         public override void OnClick(TreeView treeView)
diff --git a/Toolbox/Lib/Syroot.NintenTools.NSW.Bntx.dll b/Toolbox/Lib/Syroot.NintenTools.NSW.Bntx.dll
index fff43554..e97ccf21 100644
Binary files a/Toolbox/Lib/Syroot.NintenTools.NSW.Bntx.dll and b/Toolbox/Lib/Syroot.NintenTools.NSW.Bntx.dll differ