diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index b608bc14..c3d03c81 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 244e175f..09b37894 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 58e103ac..0cfad09a 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/Font/BFFNT.cs b/Switch_FileFormatsMain/FileFormats/Font/BFFNT.cs
index 03a57a1d..e98734f9 100644
--- a/Switch_FileFormatsMain/FileFormats/Font/BFFNT.cs
+++ b/Switch_FileFormatsMain/FileFormats/Font/BFFNT.cs
@@ -268,11 +268,14 @@ namespace FirstPlugin
 
         private const uint SwizzleBase = 0x000D0000;
 
+        private uint swizzle;
         private uint Swizzle
         {
             get
             {
-                return SwizzleBase | (byte)(SheetIndex * 2);
+                swizzle = SwizzleBase;
+                swizzle |= (uint)(SheetIndex * 2) << 8;
+                return swizzle;
             }
         }
 
@@ -297,7 +300,6 @@ namespace FirstPlugin
             surf.mipData = null;
             surf.tileMode = (uint)GX2.GX2TileMode.MODE_2D_TILED_THIN1;
             surf.swizzle = Swizzle;
-            surf.swizzle *= 2;
             surf.numArray = 1;
 
             var surfaces = GX2.Decode(surf);
diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
index 72762b9e..41d61c49 100644
Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ