From 6c0e9d5987b8391d2bd414cb743b70834e2b0462 Mon Sep 17 00:00:00 2001
From: DarkShadow <ivanivov.p@gmail.com>
Date: Wed, 9 Oct 2024 01:39:12 +0300
Subject: [PATCH] Do some cleanup

---
 .../TelltaleTextureTool/App.axaml             |   1 -
 .../TelltaleTextureTool/App.axaml.cs          |   2 +-
 .../Common/ByteFunctions.cs                   | 118 +--
 .../TelltaleTextureTool/Converter.cs          | 211 +----
 .../TelltaleTextureTool/GUI/IO/Logger.cs      |   4 +-
 .../GUI/IO/WorkingDirectory.cs                |   5 +-
 .../GUI/ImageAdvancedOptions.cs               |  15 +-
 .../TelltaleTextureTool/GUI/ImageData.cs      |  38 +-
 .../GUI/Views/MainView.axaml                  |  26 +-
 .../GUI/Views/MainView.axaml.cs               |   1 -
 .../GUI/Views/MainWindow.axaml.cs             |   3 +-
 .../DDS/{DDS_HELPER.cs => DDSHelper.cs}       |  61 +-
 ...DDS_DirectXTexNet.cs => TextureManager.cs} | 169 ++--
 .../Graphics/KTX2/KTX2_Bindings.cs            |   4 -
 .../Graphics/KTX2/KTX2_HELPER.cs              | 888 +++++++++---------
 .../Graphics/PVR/PVRDecoder.cs                |   2 +-
 .../Main/D3DTXVersionEnums.cs                 |  90 +-
 .../TelltaleTextureTool/Main/D3DTX_Master.cs  |  43 +-
 .../TelltaleTextureTool/Main/DDS_Master.cs    |  14 +-
 .../TelltaleTextureTool/Main/KTX2_Master.cs   | 372 ++++----
 .../FileTypes/D3DTX/Enums/T3SurfaceGamma.cs   |   6 +-
 .../Telltale/FileTypes/D3DTX/ID3DTX.cs        |   2 +-
 .../FileTypes/D3DTX/Versions/D3DTX_V3.cs      |   2 +-
 .../FileTypes/D3DTX/Versions/D3DTX_V4.cs      |   2 +-
 .../FileTypes/D3DTX/Versions/D3DTX_V5.cs      |   2 +-
 .../FileTypes/D3DTX/Versions/D3DTX_V6.cs      |   3 +-
 .../FileTypes/D3DTX/Versions/D3DTX_V7.cs      |   3 +-
 .../FileTypes/D3DTX/Versions/D3DTX_V8.cs      |   2 +-
 .../FileTypes/D3DTX/Versions/D3DTX_V9.cs      |   2 +-
 .../FileTypes/D3DTX/Versions/Legacy_D3DTX.cs  |   2 +-
 .../Telltale/Structs/T3SamplerStateBlock.cs   |   5 -
 .../Telltale/Structs/TelltalePixelData.cs     |  19 +
 32 files changed, 951 insertions(+), 1166 deletions(-)
 rename TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/{DDS_HELPER.cs => DDSHelper.cs} (92%)
 rename TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/{DDS_DirectXTexNet.cs => TextureManager.cs} (88%)

diff --git a/TelltaleTextureTool/TelltaleTextureTool/App.axaml b/TelltaleTextureTool/TelltaleTextureTool/App.axaml
index 3c5e1c4..22c1b7e 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/App.axaml
+++ b/TelltaleTextureTool/TelltaleTextureTool/App.axaml
@@ -16,7 +16,6 @@
         <!-- <Style Selector="ads:MsBox"> -->
         <!-- <Setter Property="Background" Value="#FFDDDDDD" /> -->
         <!-- </Style> -->
-        <avalonia:HyperLinkStyle />
 		
         <Style Selector="mscontrols|MsBoxStandardView">
             <Setter Property="Background"
diff --git a/TelltaleTextureTool/TelltaleTextureTool/App.axaml.cs b/TelltaleTextureTool/TelltaleTextureTool/App.axaml.cs
index e1bae54..bb91d30 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/App.axaml.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/App.axaml.cs
@@ -45,7 +45,7 @@ public override void OnFrameworkInitializationCompleted()
         {
             try
             {
-                Logger.Instance().Log(e);
+                Logger.Log(e);
             }
             catch (IOException ex)
             {
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Common/ByteFunctions.cs b/TelltaleTextureTool/TelltaleTextureTool/Common/ByteFunctions.cs
index e03ec27..7e0773c 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Common/ByteFunctions.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Common/ByteFunctions.cs
@@ -8,7 +8,7 @@ namespace TelltaleTextureTool.Utilities;
 public static class ByteFunctions
 {
     /// <summary>
-    /// 
+    /// Get the number of all items in a list of byte arrays
     /// </summary>
     /// <param name="array"></param>
     /// <returns></returns>
@@ -43,25 +43,6 @@ public static string ReadString(BinaryReader reader)
         return value;
     }
 
-    public static string ReadNullTerminatedString(BinaryReader reader)
-    {
-        StringBuilder sb = new();
-
-        // If files names longer than 256 characters exist, then I woudld be impressed.
-        for (int i = 0; i < 256; i++)
-        {
-            char c = reader.ReadChar();
-            if (c != '\0')
-            {
-                break;
-            }
-
-            sb.Append(c);
-        }
-
-        return sb.ToString();
-    }
-
     public static string ReadFixedString(BinaryReader reader, int length)
     {
         string value = "";
@@ -78,15 +59,12 @@ public static bool ReadTelltaleBoolean(BinaryReader reader)
     {
         char parsedChar = reader.ReadChar();
 
-        switch (parsedChar)
+        return parsedChar switch
         {
-            case '1':
-                return true;
-            case '0':
-                return false;
-            default:
-                throw new Exception("Invalid Telltale Boolean data.");
-        }
+            '1' => true,
+            '0' => false,
+            _ => throw new Exception("Invalid Telltale Boolean data."),
+        };
     }
 
     /// <summary>
@@ -124,23 +102,6 @@ public static void WriteFixedString(BinaryWriter writer, string value)
     /// <param name="value"></param>
     public static void WriteBoolean(BinaryWriter writer, bool value) => writer.Write(value ? '1' : '0');
 
-    public static byte[] GetBytes(string stringValue)
-    {
-        //create byte array of the length of the string
-        byte[] stringBytes = new byte[stringValue.Length];
-
-        //for the length of the string, get each byte value
-        for (int i = 0; i < stringBytes.Length; i++)
-        {
-            stringBytes[i] = Convert.ToByte(stringValue[i]);
-        }
-
-        //return it
-        return stringBytes;
-    }
-
-    public static uint ConvertStringToUInt32(string sValue) => BitConverter.ToUInt32(GetBytes(sValue), 0);
-
     /// <summary>
     /// Combines two byte arrays into one.
     /// </summary>
@@ -162,75 +123,8 @@ public static byte[] Combine(byte[] first, byte[] second)
         return bytes;
     }
 
-    /// <summary>
-    /// Checks if the pointer position is at the DCArray capacity, if's not then it moves the pointer past where it should be after reading the DCArray.
-    /// </summary>
-    /// <param name="pointerPositionBeforeCapacity"></param>
-    /// <param name="arrayCapacity"></param>
-    /// <param name="bytePointerPosition"></param>
-    public static void DCArrayCheckAdjustment(uint pointerPositionBeforeCapacity, uint arrayCapacity, ref uint bytePointerPosition)
-    {
-        uint estimatedOffPoint = pointerPositionBeforeCapacity + arrayCapacity;
-        Console.WriteLine("(DCArray Check) Estimated to be at = {0}", estimatedOffPoint);
-
-        if (bytePointerPosition != estimatedOffPoint)
-        {
-            Console.WriteLine("(DCArray Check) Left off at = {0}", bytePointerPosition);
-            Console.WriteLine("(DCArray Check) Skipping by using the estimated position...", bytePointerPosition);
-            bytePointerPosition = estimatedOffPoint;
-        }
-        else
-        {
-            Console.WriteLine("(DCArray Check) Left off at = {0}", bytePointerPosition);
-        }
-
-    }
-
-    /// <summary>
-    /// Checks if we have reached the end of the file.
-    /// </summary>
-    /// <param name="bytePointerPosition"></param>
-    /// <param name="fileSize"></param>
-    public static void ReachedEndOfFile(uint bytePointerPosition, uint fileSize)
-    {
-        if (bytePointerPosition != fileSize)
-        {
-            Console.WriteLine("(End Of File Check) Didn't reach the end of the file!");
-            Console.WriteLine("(End Of File Check) Left off at = {0}", bytePointerPosition);
-            Console.WriteLine("(End Of File Check) File Size = {0}", fileSize);
-        }
-        else
-        {
-            Console.WriteLine("(End Of File Check) Reached end of file!");
-            Console.WriteLine("(End Of File Check) Left off at = {0}", bytePointerPosition);
-            Console.WriteLine("(End Of File Check) File Size = {0}", fileSize);
-        }
-    }
-
     public static byte[] LoadTexture(string path) => File.ReadAllBytes(path);
 
-    /// <summary>
-    /// Checks if we have reached a specific offset in the file.
-    /// </summary>
-    /// <param name="bytePointerPosition"></param>
-    /// <param name="offsetPoint"></param>
-    public static void ReachedOffset(uint bytePointerPosition, uint offsetPoint)
-    {
-        if (bytePointerPosition != offsetPoint)
-        {
-            Console.WriteLine("(Offset Check) Didn't reach the offset!");
-            Console.WriteLine("(Offset Check) Left off at = {0}", bytePointerPosition);
-            Console.WriteLine("(Offset Check) Offset = {0}", offsetPoint);
-        }
-        else
-        {
-            Console.WriteLine("(Offset Check) Reached the offset!");
-            Console.WriteLine("(Offset Check) Left off at = {0}", bytePointerPosition);
-            Console.WriteLine("(Offset Check) Offset = {0}", offsetPoint);
-        }
-
-    }
-
     public static byte[] GetBytesAfterBytePattern(string searchString, byte[] fileBytes)
     {
         byte[] searchBytes = Encoding.ASCII.GetBytes(searchString);
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Converter.cs b/TelltaleTextureTool/TelltaleTextureTool/Converter.cs
index 3cbe601..eeeb547 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Converter.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Converter.cs
@@ -7,9 +7,7 @@
 using System.Threading;
 using System.Linq;
 using System.ComponentModel;
-using System.Threading.Tasks;
 using Hexa.NET.DirectXTex;
-using TelltaleTextureTool.DirectX.Enums;
 using TelltaleTextureTool.Telltale.FileTypes.D3DTX;
 using TelltaleTextureTool.TelltaleEnums;
 
@@ -134,14 +132,6 @@ public static void ConvertTexture(string sourcePath, string resultPath, ImageAdv
                 case TextureType.D3DTX:
                     ConvertTextureFromOthersToD3Dtx(sourcePath, resultPath, oldTextureType, options);
                     break;
-                case TextureType.PNG:
-                case TextureType.JPEG:
-                case TextureType.BMP:
-                case TextureType.TIFF:
-                case TextureType.TGA:
-                case TextureType.HDR:
-                    ConvertTextureFromDdsToOthers(sourcePath, resultPath, newTextureType);
-                    break;
                 default:
                     throw new Exception("Invalid file type.");
             }
@@ -153,8 +143,6 @@ public static void ConvertTexture(string sourcePath, string resultPath, ImageAdv
         {
             switch (newTextureType)
             {
-                case TextureType.DDS:
-                    ConvertTextureFileFromOthersToDds(sourcePath, resultPath); break;
                 case TextureType.D3DTX:
                     ConvertTextureFromOthersToD3Dtx(sourcePath, resultPath, oldTextureType, options); break;
                 default:
@@ -233,20 +221,47 @@ public static void ConvertTextureFromOthersToD3Dtx(string sourceFilePath, string
             D3DTX_Master d3dtxMaster = new();
 
             // Parse the .json file as a d3dtx
-            d3dtxMaster.ReadD3DTXJSON(textureFilePathJson);
+            try
+            {
+                d3dtxMaster.ReadD3DTXJSON(textureFilePathJson);
+            }
+            catch (Exception)
+            {
+                throw new Exception("Conversion failed.\nFailed to read the .d3dtx file.");
+            }
 
             // If the d3dtx is a legacy D3DTX, force the use of the DX9 legacy flag
             DDSFlags flags = d3dtxMaster.IsLegacyD3DTX() ? DDSFlags.ForceDx9Legacy : DDSFlags.None;
 
             Texture texture = new(sourceFilePath, oldTextureType, flags);
 
+            if (d3dtxMaster.d3dtxMetadata.TextureType == T3TextureType.eTxBumpmap ||
+                            d3dtxMaster.d3dtxMetadata.TextureType == T3TextureType.eTxNormalMap)
+            {
+                options.IsTelltaleNormalMap = true;
+            }
+            else if (d3dtxMaster.d3dtxMetadata.TextureType == T3TextureType.eTxNormalXYMap)
+            {
+                options.IsTelltaleNormalMap = true;
+            }
+
+            if (d3dtxMaster.d3dtxMetadata.SurfaceGamma == T3SurfaceGamma.sRGB)
+            {
+                options.IsSRGB = true;
+            }
+
             texture.ChangePreviewImage(options, true);
 
             // Get the image
             texture.GetDDSInformation(out D3DTXMetadata metadata, out ImageSection[] sections, flags);
 
-            metadata.Platform = options.PlatformType;
+            if (options.EnableSwizzle)
+            {
+                metadata.Platform = options.PlatformType;
+            }
 
+            Console.WriteLine("DXGI: " + texture.Metadata.Format);
+            Console.WriteLine(metadata.Format);
             // Modify the d3dtx file using our dds data
             d3dtxMaster.ModifyD3DTX(metadata, sections);
 
@@ -261,172 +276,4 @@ public static void ConvertTextureFromOthersToD3Dtx(string sourceFilePath, string
             throw new FileNotFoundException("Conversion failed.\nNo .json file was found for the file.");
         }
     }
-
-    /// <summary>
-    /// The main function for reading and converting said .bmp into a .dds file
-    /// </summary>
-    /// <param name="sourceFilePath"></param>
-    /// <param name="destinationDirectory"></param>
-    public static void ConvertTextureFileFromOthersToDds(string sourceFilePath, string destinationDirectory)
-    {
-        if (string.IsNullOrEmpty(sourceFilePath) || string.IsNullOrEmpty(destinationDirectory))
-        {
-            throw new ArgumentException("Arguments cannot be null in OthersToDds function.");
-        }
-
-        // Deconstruct the source file path
-        string textureFileDirectory = Path.GetDirectoryName(sourceFilePath);
-        string textureFileNameOnly = Path.GetFileNameWithoutExtension(sourceFilePath);
-
-        // Create the names of the following files
-        string textureFileNameWithJSON = textureFileNameOnly + Main_Shared.jsonExtension;
-
-        // Create the path of these files. If things go well, these files (depending on the version) should exist in the same directory at the original .dds file.
-        string textureFilePath_JSON = Path.Combine(textureFileDirectory, textureFileNameWithJSON);
-
-        //TODO Update to DirectXTexNet
-
-        // If a json file exists (for newer 5VSM and 6VSM)
-        if (File.Exists(textureFilePath_JSON))
-        {
-            // Create a new d3dtx object
-            D3DTX_Master d3dtxFile = new();
-
-            // Parse the .json file as a d3dtx
-            d3dtxFile.ReadD3DTXJSON(textureFilePath_JSON);
-
-            // MasterOptions options = new()
-            // {
-            //     outputDirectory = new() { directory = destinationDirectory },
-            //     outputOverwrite = new(),
-            //     outputFileType = new() { fileType = TelltaleTextureTool.TexconvEnums.TexconvEnumFileTypes.dds }
-            // };
-
-            // if (d3dtxFile.HasMipMaps() == false)
-            //     options.outputMipMaps = new() { remove = true };
-
-            // switch (d3dtxFile.d3dtxMetadata.TextureType)
-            // {
-            //     case T3TextureType.eTxSingleChannelSDFDetailMap:
-            //         options.outputFormat = new() { format = DXGIFormat.BC3_UNORM };
-
-            //         await TexconvApp.RunTexconvAsync(sourceFilePath, options);
-
-            //         //   DirectXTex.LoadFromWICFile(sourceFilePath).SaveToDDSFile(Path.Combine(destinationDirectory, Path.GetFileNameWithoutExtension(sourceFilePath) + Main_Shared.ddsExtension), DirectXTex.DDSFlags.ForceDX10Ext);
-            //         //   DirectXTex.SaveToWICFile(DirectXTex.LoadFromDDSFile(sourceFilePath), WICCodecs.WIC_CODEC_PNG, Path.Combine(destinationDirectory, Path.GetFileNameWithoutExtension(sourceFilePath) + Main_Shared.pngExtension));
-            //         break;
-            //     case T3TextureType.eTxBumpmap:
-            //     case T3TextureType.eTxNormalMap:
-
-            //         options.outputFormat = new() { format = DXGIFormat.BC3_UNORM };
-            //         options.outputTreatTypelessAsUNORM = new();
-
-            //         if (fixes_generic_to_dds)
-            //             options.outputSwizzle = new() { mask = "abgr" };
-
-            //         await TexconvApp.RunTexconvAsync(sourceFilePath, options);
-            //         break;
-            //     case T3TextureType.eTxNormalXYMap:
-
-            //         options.outputFormat = new() { format = DXGIFormat.BC5_UNORM };
-            //         //options.outputSRGB = new() { srgbMode = TexconvEnums.TexconvEnumSrgb.srgbo };
-            //         options.outputTreatTypelessAsUNORM = new();
-
-            //         if (fixes_generic_to_dds)
-            //             options.outputSwizzle = new() { mask = "rg00" };
-
-            //         await TexconvApp.RunTexconvAsync(sourceFilePath, options);
-            //         break;
-            //     default:
-            //         if (ImageUtilities.IsImageOpaque(sourceFilePath))
-            //             options.outputFormat = new() { format = DXGIFormat.BC1_UNORM };
-            //         else
-            //             options.outputFormat = new() { format = DXGIFormat.BC3_UNORM };
-
-            //         await TexconvApp.RunTexconvAsync(sourceFilePath, options);
-            //         break;
-            // }
-        }
-        // If we didn't find a json file, we're screwed!
-        else
-        {
-            throw new FileNotFoundException("Conversion failed.\nNo .json file was found for the file.");
-        }
-
-        string outputTextureFilePath = Path.Combine(destinationDirectory, Path.GetFileNameWithoutExtension(sourceFilePath) + Main_Shared.ddsExtension);
-
-        // Check if the output file exists, if it doesn't then the conversion failed so notify the user
-        if (File.Exists(outputTextureFilePath) == false)
-        {
-            throw new FileNotFoundException("Conversion failed. Output file was not created.");
-        }
-    }
-
-    /// <summary>
-    /// The main function for reading and converting said .dds into the  more accessible supported file formats.
-    /// </summary>
-    /// <param name="sourceFilePath"></param>
-    /// <param name="destinationDirectory"></param>
-    /// <param name="newFileType"></param>
-    public static void ConvertTextureFromDdsToOthers(string sourceFilePath, string destinationDirectory,
-        TextureType newTextureType)
-    {
-        // Null safety validation of inputs.
-        if (string.IsNullOrEmpty(sourceFilePath) || string.IsNullOrEmpty(destinationDirectory))
-        {
-            throw new ArgumentException("Arguments cannot be null in DdsToOthers function.");
-        }
-
-        // Deconstruct the source file path
-        string? textureFileDirectory = Path.GetDirectoryName(sourceFilePath);
-        string textureFileNameOnly = Path.GetFileNameWithoutExtension(sourceFilePath);
-
-        // Create the names of the following files
-        string textureFileNameWithJson = textureFileNameOnly + Main_Shared.jsonExtension;
-
-        // Create the path of these files. If things go well, these files (depending on the version) should exist in the same directory at the original .dds file.
-        string textureFilePathJson = textureFileDirectory + Path.DirectorySeparatorChar + textureFileNameWithJson;
-        string outputTextureFilePath =
-            destinationDirectory + Path.DirectorySeparatorChar + textureFileNameOnly + GetExtension(newTextureType)[0];
-
-        // If a json file exists (for newer 5VSM and 6VSM)
-        if (File.Exists(textureFilePathJson))
-        {
-            // Create a new d3dtx object
-            D3DTX_Master d3dtxFile = new();
-
-            // Parse the .json file as a d3dtx
-            d3dtxFile.ReadD3DTXJSON(textureFilePathJson);
-
-            // Get the d3dtx texture type
-            T3TextureType d3dtxTextureType = d3dtxFile.d3dtxMetadata.TextureType;
-
-            //ConvertOptions
-            if (d3dtxTextureType == T3TextureType.eTxBumpmap || d3dtxTextureType == T3TextureType.eTxNormalMap)
-            {
-                //  DDS_DirectXTexNet.SaveDDSToWIC(sourceFilePath, destinationDirectory, newTextureType, ImageEffect.SWIZZLE_ABGR);
-            }
-            else if (d3dtxTextureType == T3TextureType.eTxNormalXYMap)
-            {
-                //   DDS_DirectXTexNet.SaveDDSToWIC(sourceFilePath, destinationDirectory, newTextureType, ImageEffect.RESTORE_Z);
-            }
-            else
-            {
-                //     DDS_DirectXTexNet.SaveDDSToWIC(sourceFilePath, destinationDirectory, newTextureType, ImageEffect.DEFAULT);
-            }
-        }
-        // If we didn't find a JSON file, use default conversion.
-        else
-        {
-            // DDS_DirectXTexNet.SaveDDSToWIC(sourceFilePath, destinationDirectory, newTextureType, ImageEffect.DEFAULT);
-            throw new FileNotFoundException(
-                "No .json file was found for the file.\nDefaulting to classic conversion.");
-        }
-
-        // Check if the output file exists, if it doesn't then the conversion failed so notify the user
-        if (!File.Exists(outputTextureFilePath))
-        {
-            throw new FileNotFoundException("Conversion failed. Output file was not created.");
-        }
-    }
 }
diff --git a/TelltaleTextureTool/TelltaleTextureTool/GUI/IO/Logger.cs b/TelltaleTextureTool/TelltaleTextureTool/GUI/IO/Logger.cs
index 93c52bb..c206824 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/GUI/IO/Logger.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/GUI/IO/Logger.cs
@@ -19,13 +19,13 @@ static Logger()
         Directory.CreateDirectory(CrashesDirectory);
     }
 
-    public void Log(Exception e)
+    public static void Log(Exception e)
     {
         // Create a new text file with the current date as the file name
         string logFileName = DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".txt";
         string logFilePath = Path.Combine(CrashesDirectory, logFileName);
 
-        using (StreamWriter writer = new StreamWriter(logFilePath))
+        using (StreamWriter writer = new(logFilePath))
         {
             writer.WriteLine("Timestamp: " + DateTime.Now);
             writer.WriteLine("Error Details: " + e.Message);
diff --git a/TelltaleTextureTool/TelltaleTextureTool/GUI/IO/WorkingDirectory.cs b/TelltaleTextureTool/TelltaleTextureTool/GUI/IO/WorkingDirectory.cs
index 0e5bc09..cfb9858 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/GUI/IO/WorkingDirectory.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/GUI/IO/WorkingDirectory.cs
@@ -1,5 +1,4 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -28,7 +27,7 @@ public class WorkingDirectory
     public List<WorkingDirectoryFile> WorkingDirectoryFiles = [];
 
     //hardcoded filters
-    public List<string> filterFileExtensions = [".d3dtx", ".dds", ".png", ".jpg", ".jpeg", ".tiff", ".tif", ".bmp", ".json", ".tga", ".hdr"];
+    public List<string> filterFileExtensions = [".d3dtx", ".dds", ".png", ".jpg", ".jpeg", ".tiff", ".tif", ".bmp", ".json", ".tga", ".hdr", ""];
 
     /// <summary>
     /// Gets the files from the provided directory path.
diff --git a/TelltaleTextureTool/TelltaleTextureTool/GUI/ImageAdvancedOptions.cs b/TelltaleTextureTool/TelltaleTextureTool/GUI/ImageAdvancedOptions.cs
index 68d83ac..ee0ccf5 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/GUI/ImageAdvancedOptions.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/GUI/ImageAdvancedOptions.cs
@@ -8,7 +8,6 @@ namespace TelltaleTextureTool;
 
 public partial class ImageAdvancedOptions : ObservableObject
 {
-
     // Private telltale games
     [ObservableProperty]
     private TelltaleToolGame _gameID = TelltaleToolGame.DEFAULT;
@@ -35,13 +34,20 @@ public partial class ImageAdvancedOptions : ObservableObject
     private bool _isLegacyConsole;
 
     [ObservableProperty]
-    private bool _enableAutomaticCompression;
+    private bool _enableAutomaticCompression = true;
 
     [ObservableProperty]
     private bool _isAutomaticCompression;
+    [ObservableProperty]
+    private bool _enableTelltaleNormalMap = true;
 
     [ObservableProperty]
-    private bool _isManualCompression;
+    private bool _isTelltaleNormalMap = false;
+
+    [ObservableProperty]
+    private bool _isTelltaleXYNormalMap = false;
+    [ObservableProperty]
+    private bool _isSRGB = false;
 
     [ObservableProperty]
     private T3SurfaceFormat _format;
@@ -104,9 +110,10 @@ public ImageAdvancedOptions(ImageAdvancedOptions imageAdvancedOptions)
         _compression = imageAdvancedOptions._compression;
         _enableAutomaticCompression = imageAdvancedOptions._enableAutomaticCompression;
         _isAutomaticCompression = imageAdvancedOptions._isAutomaticCompression;
-        _isManualCompression = imageAdvancedOptions._isManualCompression;
         _format = imageAdvancedOptions._format;
+        _isTelltaleNormalMap = imageAdvancedOptions._isTelltaleNormalMap;
         _enableNormalMap = imageAdvancedOptions._enableNormalMap;
+        _enableTelltaleNormalMap = imageAdvancedOptions._enableTelltaleNormalMap;
         _isLegacyConsole = imageAdvancedOptions._isLegacyConsole;
         _encodeDDSHeader = imageAdvancedOptions._encodeDDSHeader;
         _filterValues = imageAdvancedOptions._filterValues;
diff --git a/TelltaleTextureTool/TelltaleTextureTool/GUI/ImageData.cs b/TelltaleTextureTool/TelltaleTextureTool/GUI/ImageData.cs
index 302699f..0164775 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/GUI/ImageData.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/GUI/ImageData.cs
@@ -46,6 +46,21 @@ public void Initialize(string filePath, TextureType textureType, TelltaleToolGam
         ImageProperties = imageProperties;
     }
 
+    public void Reset()
+    {
+        if (HasPixelData)
+        {
+            HasPixelData = false;
+            DDSImage.Release();
+        }
+
+        ImageProperties = new ImageProperties();
+        MaxMip = 0;
+        MaxFace = 0;
+        CurrentFilePath = string.Empty;
+        CurrentTextureType = TextureType.Unknown;
+    }
+
     /// <summary>
     /// Applies the effects to the image.
     /// </summary>
@@ -103,11 +118,11 @@ private void GetImageDataFromD3DTX(TelltaleToolGame game, out ImageProperties im
         imageProperties = new ImageProperties()
         {
             Name = metadata.TextureName,
-            SurfaceFormat = d3dtx.GetSurfaceFormat(),
             Width = metadata.Width.ToString(),
             Height = metadata.Height.ToString(),
             HasAlpha = d3dtx.GetHasAlpha(),
-            // ChannelCount = d3dtx.GetChannelCount(),
+            SurfaceFormat = d3dtx.GetSurfaceFormat(),
+            SurfaceGamma = metadata.SurfaceGamma.ToString(),
             MipMapCount = metadata.MipLevels.ToString(),
             TextureLayout = metadata.Dimension.ToString(),
             AlphaMode = metadata.AlphaMode.ToString(),
@@ -120,7 +135,7 @@ private void GetImageDataFromD3DTX(TelltaleToolGame game, out ImageProperties im
             DDS_Master ddsFile = new(d3dtx);
             var array = ddsFile.GetData(d3dtx);
 
-            DDSImage = new DirectX.Texture(array, TextureType.D3DTX);
+            DDSImage = new Texture(array, TextureType.D3DTX);
         }
     }
 
@@ -138,19 +153,14 @@ public ImageAdvancedOptions GetImageAdvancedOptions(ImageAdvancedOptions options
 
         var d3dtx = new D3DTX_Master();
         d3dtx.ReadD3DTXFile(CurrentFilePath, Game, options.IsLegacyConsole);
-        d3dtx.ReadD3DTXJSON(Path.Combine(Path.GetDirectoryName(CurrentFilePath), Path.GetFileNameWithoutExtension(CurrentFilePath) + ".json"));
-
-        // Initialize image properties
-        D3DTXMetadata metadata = d3dtx.GetMetadata();
 
-        if (metadata.TextureType == T3TextureType.eTxNormalMap || metadata.TextureType == T3TextureType.eTxBumpmap)
+        try
         {
-            options.EnableEditing = true;
-            options.ImageEffect = ImageEffect.SWIZZLE_ABGR;
-        } else if (metadata.TextureType == T3TextureType.eTxNormalXYMap)
+            d3dtx.ReadD3DTXJSON(Path.Combine(Path.GetDirectoryName(CurrentFilePath), Path.GetFileNameWithoutExtension(CurrentFilePath) + ".json"));
+        }
+        catch (Exception)
         {
-            options.EnableEditing = true;
-            options.ImageEffect = CurrentTextureType == TextureType.D3DTX ? ImageEffect.RESTORE_Z : ImageEffect.REMOVE_Z;
+            // Silent Error if the JSON file is not found or it's invalid.
         }
 
         if (d3dtx.IsLegacyConsole())
@@ -168,7 +178,7 @@ private void GetImageDataFromCommon(out ImageProperties imageProperties)
             DDSImage = new Texture(CurrentFilePath, CurrentTextureType);
         }
 
-        imageProperties = DDS_DirectXTexNet.GetDDSProperties(CurrentFilePath, DDSImage.Metadata);
+        imageProperties = TextureManager.GetDDSProperties(CurrentFilePath, DDSImage.Metadata);
     }
 
     /// <summary>
diff --git a/TelltaleTextureTool/TelltaleTextureTool/GUI/Views/MainView.axaml b/TelltaleTextureTool/TelltaleTextureTool/GUI/Views/MainView.axaml
index 07456e7..39f9ce2 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/GUI/Views/MainView.axaml
+++ b/TelltaleTextureTool/TelltaleTextureTool/GUI/Views/MainView.axaml
@@ -266,7 +266,6 @@
                                                 Width="200"
                                                 IsVisible="False" />
                         </DataGrid.Columns>
-                        <!-- CustomSortComparer="{Binding CustomDateSort}" -->
                         <DataGrid.ContextFlyout>
                             <MenuFlyout>
                                 <MenuItem Name="ContextMenuOpenFile"
@@ -304,7 +303,6 @@
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
                 <!-- IMAGE PREVIEW -->
-                <!-- Background="{DynamicResource MainPanelColor}" -->
                 <!-- Image Properties -->
                 <Grid Grid.Row="0"
                       Background="{DynamicResource MainPanelColor}"
@@ -316,8 +314,7 @@
                                       VerticalAlignment="Top"
                                       HorizontalAlignment="Stretch"
                                       Background="{DynamicResource MainPanelColor}"
-                                      IsExpanded="True"
-                                      IsVisible="{Binding IsImageInformationVisible}">
+                                      IsExpanded="{Binding IsImageInformationVisible}">
                                 <StackPanel>
                                     <StackPanel Orientation="Horizontal">
                                         <Label Name="ImagepreviewImageNameLabel"
@@ -444,7 +441,7 @@
                                       VerticalAlignment="Top"
                                       HorizontalAlignment="Stretch"
                                       Background="{DynamicResource MainPanelColor}"
-                                      IsExpanded="True">
+                                      IsExpanded="False">
                                 <StackPanel Margin="0,0,10,10"
                                             Spacing="4">
                                     <Grid ColumnDefinitions="auto,*">
@@ -453,21 +450,6 @@
                                                HorizontalAlignment="Left"
                                                VerticalContentAlignment="Center"
                                                Height="30" />
-                                        <!-- SelectedIndex="{Binding SelectedConvertOptionsComboBoxIndex}" -->
-                                        <ComboBox Grid.Column="1"
-                                                  ItemsSource="{Binding VersionConvertOptionsList}"
-                                                  SelectedItem="{Binding SelectedVersionConvertOption}"
-                                                  HorizontalAlignment="Stretch"
-                                                  VerticalAlignment="Bottom"
-                                                  Height="30"
-                                                  IsEnabled="{Binding VersionConvertComboBoxStatus}"
-                                                  ToolTip.Tip="Choose the conversion option. Use the default option unless you want to edit legacy titles.">
-                                            <ComboBox.ItemTemplate>
-                                                <DataTemplate>
-                                                    <TextBlock Text="{Binding Name}" />
-                                                </DataTemplate>
-                                            </ComboBox.ItemTemplate>
-                                        </ComboBox>
                                         <ComboBox Grid.Column="1"
                                                   ItemsSource="{Binding Games}"
                                                   SelectedItem="{Binding ImageAdvancedOptions.GameID, Mode=TwoWay}"
@@ -623,7 +605,7 @@
                                       VerticalAlignment="Top"
                                       HorizontalAlignment="Stretch"
                                       Background="{DynamicResource MainPanelColor}"
-                                      IsVisible="{Binding IsDebugInformationVisible}">
+                                      IsExpanded="False">
                                 <Expander.Header />
                                 <TextBox Background="{DynamicResource PanelSplitterColor}"
                                          HorizontalAlignment="Stretch"
@@ -700,8 +682,6 @@
                     </ScrollViewer>
                 </Grid>
                 <!-- Convert Panel -->
-                <!-- <Grid Grid.Row="2"
-                      Background="{DynamicResource MainPanelColor}" /> -->
             </Grid>
             <Grid Grid.Column="2"
                   Background="{DynamicResource MainPanelColor}">
diff --git a/TelltaleTextureTool/TelltaleTextureTool/GUI/Views/MainView.axaml.cs b/TelltaleTextureTool/TelltaleTextureTool/GUI/Views/MainView.axaml.cs
index 9486384..d9ce38d 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/GUI/Views/MainView.axaml.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/GUI/Views/MainView.axaml.cs
@@ -4,7 +4,6 @@
 using CommunityToolkit.Mvvm.Input;
 using TelltaleTextureTool.ViewModels;
 using System;
-using Avalonia.Controls.Primitives;
 
 namespace TelltaleTextureTool.Views;
 
diff --git a/TelltaleTextureTool/TelltaleTextureTool/GUI/Views/MainWindow.axaml.cs b/TelltaleTextureTool/TelltaleTextureTool/GUI/Views/MainWindow.axaml.cs
index 2174d22..08d52c7 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/GUI/Views/MainWindow.axaml.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/GUI/Views/MainWindow.axaml.cs
@@ -1,5 +1,4 @@
-using Avalonia;
-using Avalonia.Controls;
+using Avalonia.Controls;
 
 namespace TelltaleTextureTool.Views;
 
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/DDS_HELPER.cs b/TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/DDSHelper.cs
similarity index 92%
rename from TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/DDS_HELPER.cs
rename to TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/DDSHelper.cs
index e3f15a9..88bfb92 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/DDS_HELPER.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/DDSHelper.cs
@@ -2,7 +2,6 @@
 using TelltaleTextureTool.TelltaleEnums;
 using Hexa.NET.DirectXTex;
 using SkiaSharp;
-using static Ktx.Ktx2;
 
 namespace TelltaleTextureTool.DirectX;
 
@@ -18,7 +17,7 @@ namespace TelltaleTextureTool.DirectX;
 /// <summary>
 /// The class is used for decoding and encoding .dds headers. 
 /// </summary>
-public static partial class DDS_HELPER
+public static partial class DDSHelper
 {
     /// <summary>
     /// Get the Telltale surface format from a DXGI format.
@@ -135,13 +134,13 @@ public static T3SurfaceFormat GetTelltaleSurfaceFormat(DXGIFormat dxgiFormat, T3
     /// <param name="gamma"></param>
     /// <param name="platformType"></param>
     /// <returns>The corresponding DXGI_Format.</returns>
-    public static DXGIFormat GetDXGIFormat(T3SurfaceFormat format, T3SurfaceGamma gamma = T3SurfaceGamma.eSurfaceGamma_Linear, T3PlatformType platformType = T3PlatformType.ePlatform_PC)
+    public static DXGIFormat GetDXGIFormat(T3SurfaceFormat format, T3SurfaceGamma gamma = T3SurfaceGamma.Linear, T3PlatformType platformType = T3PlatformType.ePlatform_PC)
     {
         DXGIFormat dxgiFormat = format switch
         {
             // In order of T3SurfaceFormat enum
             //--------------------ARGB8--------------------
-            T3SurfaceFormat.ARGB8 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.B8G8R8A8_UNORM_SRGB : DXGIFormat.B8G8R8A8_UNORM,
+            T3SurfaceFormat.ARGB8 => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.B8G8R8A8_UNORM_SRGB : DXGIFormat.B8G8R8A8_UNORM,
             //--------------------ARGB16--------------------
             T3SurfaceFormat.ARGB16 => DXGIFormat.R16G16B16A16_UNORM,
             //--------------------RGB565--------------------
@@ -161,7 +160,7 @@ public static DXGIFormat GetDXGIFormat(T3SurfaceFormat format, T3SurfaceGamma ga
             //--------------------RG8--------------------
             T3SurfaceFormat.RG8 => DXGIFormat.R8G8_UNORM,
             //--------------------RGBA8--------------------
-            T3SurfaceFormat.RGBA8 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
+            T3SurfaceFormat.RGBA8 => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
             //--------------------R32--------------------
             T3SurfaceFormat.R32 => DXGIFormat.R32_FLOAT,
             //--------------------RG32--------------------
@@ -219,11 +218,11 @@ public static DXGIFormat GetDXGIFormat(T3SurfaceFormat format, T3SurfaceGamma ga
             //--------------------Depth24F_Stencil8--------------------
             T3SurfaceFormat.Depth24F_Stencil8 => DXGIFormat.D24_UNORM_S8_UINT,
             //--------------------DXT1 / BC1--------------------
-            T3SurfaceFormat.BC1 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
+            T3SurfaceFormat.BC1 => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
             //--------------------DXT2 and DXT3 / BC2--------------------
-            T3SurfaceFormat.BC2 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC2_UNORM_SRGB : DXGIFormat.BC2_UNORM,
+            T3SurfaceFormat.BC2 => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC2_UNORM_SRGB : DXGIFormat.BC2_UNORM,
             //--------------------DXT4 and DXT5 / BC3--------------------
-            T3SurfaceFormat.BC3 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC3_UNORM_SRGB : DXGIFormat.BC3_UNORM,
+            T3SurfaceFormat.BC3 => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC3_UNORM_SRGB : DXGIFormat.BC3_UNORM,
             //--------------------ATI1 / BC4--------------------
             T3SurfaceFormat.BC4 => DXGIFormat.BC4_UNORM,
             //--------------------ATI2 / BC5--------------------
@@ -231,21 +230,21 @@ public static DXGIFormat GetDXGIFormat(T3SurfaceFormat format, T3SurfaceGamma ga
             //--------------------BC6H--------------------
             T3SurfaceFormat.BC6 => DXGIFormat.BC6H_UF16,
             //--------------------BC7--------------------
-            T3SurfaceFormat.BC7 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC7_UNORM_SRGB : DXGIFormat.BC7_UNORM,
+            T3SurfaceFormat.BC7 => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC7_UNORM_SRGB : DXGIFormat.BC7_UNORM,
             //--------------------ATC--------------------
-            T3SurfaceFormat.ATC_RGB => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
+            T3SurfaceFormat.ATC_RGB => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
             //--------------------ATCA--------------------
-            T3SurfaceFormat.ATC_RGB1A => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
+            T3SurfaceFormat.ATC_RGB1A => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
             //--------------------ATCI--------------------
-            T3SurfaceFormat.ATC_RGBA => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
+            T3SurfaceFormat.ATC_RGBA => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
             //-------------------PVRTC2--------------------
-            T3SurfaceFormat.PVRTC2 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
+            T3SurfaceFormat.PVRTC2 => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
             //-------------------PVRTC2a--------------------
-            T3SurfaceFormat.PVRTC2a => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
+            T3SurfaceFormat.PVRTC2a => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
             //-------------------PVRTC4--------------------
-            T3SurfaceFormat.PVRTC4 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
+            T3SurfaceFormat.PVRTC4 => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
             //-------------------PVRTC4a--------------------
-            T3SurfaceFormat.PVRTC4a => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
+            T3SurfaceFormat.PVRTC4a => gamma == T3SurfaceGamma.sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM,
             //-------------------CTX1--------------------
             T3SurfaceFormat.CTX1 => DXGIFormat.BC1_UNORM,
             //--------------------UNKNOWN--------------------
@@ -275,23 +274,23 @@ public static DXGIFormat GetDXGIFormat(T3SurfaceFormat format, T3SurfaceGamma ga
 
     public static DXGIFormat GetEquivalentDXGIFormat(T3SurfaceFormat format, T3SurfaceGamma surfaceGamma) => format switch
     {
-        T3SurfaceFormat.ATC_RGB => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
-        T3SurfaceFormat.ATC_RGBA => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC3_UNORM_SRGB : DXGIFormat.BC3_UNORM,
-        T3SurfaceFormat.ATC_RGB1A => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC3_UNORM_SRGB : DXGIFormat.BC3_UNORM,
-        T3SurfaceFormat.ETC1_RGB => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
-        T3SurfaceFormat.ETC2_RGB => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
-        T3SurfaceFormat.ETC2_RGBA => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC3_UNORM_SRGB : DXGIFormat.BC3_UNORM,
-        T3SurfaceFormat.ETC2_RGB1A => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
-        T3SurfaceFormat.ETC2_R => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
-        T3SurfaceFormat.ETC2_RG => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC3_UNORM_SRGB : DXGIFormat.BC3_UNORM,
-        T3SurfaceFormat.ATSC_RGBA_4x4 => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC3_UNORM_SRGB : DXGIFormat.BC3_UNORM,
-        T3SurfaceFormat.PVRTC2 => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
-        T3SurfaceFormat.PVRTC2a => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
-        T3SurfaceFormat.PVRTC4 => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
-        T3SurfaceFormat.PVRTC4a => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
+        T3SurfaceFormat.ATC_RGB => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
+        T3SurfaceFormat.ATC_RGBA => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC3_UNORM_SRGB : DXGIFormat.BC3_UNORM,
+        T3SurfaceFormat.ATC_RGB1A => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC3_UNORM_SRGB : DXGIFormat.BC3_UNORM,
+        T3SurfaceFormat.ETC1_RGB => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
+        T3SurfaceFormat.ETC2_RGB => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
+        T3SurfaceFormat.ETC2_RGBA => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC3_UNORM_SRGB : DXGIFormat.BC3_UNORM,
+        T3SurfaceFormat.ETC2_RGB1A => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
+        T3SurfaceFormat.ETC2_R => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
+        T3SurfaceFormat.ETC2_RG => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC3_UNORM_SRGB : DXGIFormat.BC3_UNORM,
+        T3SurfaceFormat.ATSC_RGBA_4x4 => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC3_UNORM_SRGB : DXGIFormat.BC3_UNORM,
+        T3SurfaceFormat.PVRTC2 => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
+        T3SurfaceFormat.PVRTC2a => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
+        T3SurfaceFormat.PVRTC4 => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
+        T3SurfaceFormat.PVRTC4a => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.BC1_UNORM_SRGB : DXGIFormat.BC1_UNORM,
         T3SurfaceFormat.CTX1 => DXGIFormat.BC4_UNORM,
 
-        _ => surfaceGamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM
+        _ => surfaceGamma == T3SurfaceGamma.sRGB ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM
     };
 
     /// <summary>
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/DDS_DirectXTexNet.cs b/TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/TextureManager.cs
similarity index 88%
rename from TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/DDS_DirectXTexNet.cs
rename to TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/TextureManager.cs
index 0bad744..272b6e7 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/DDS_DirectXTexNet.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Graphics/DDS/TextureManager.cs
@@ -8,7 +8,7 @@
 using TelltaleTextureTool.Telltale.FileTypes.D3DTX;
 using System.Numerics;
 using System.Text;
-using static TelltaleTextureTool.DirectX.DDS_DirectXTexNet;
+using static TelltaleTextureTool.DirectX.TextureManager;
 using TelltaleTextureTool.TelltaleEnums;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
@@ -48,7 +48,7 @@ public enum ImageEffect
 /// <summary>
 /// A class that provides methods to interact with DirectXTexNet. Mainly used for loading and saving DDS files.
 /// </summary>
-public unsafe static partial class DDS_DirectXTexNet
+public unsafe static partial class TextureManager
 {
 
     /// <summary>
@@ -74,14 +74,10 @@ public static string GetDDSDebugInfo(string ddsFilePath)
         return debugInfo;
     }
 
-    public static ImageProperties GetDDSProperties(string ddsFilePath, TexMetadata ddsMetadata, DDSFlags flags = DDSFlags.None)
+    public static ImageProperties GetDDSProperties(string ddsFilePath, TexMetadata ddsMetadata)
     {
         DXGIFormat dxgiFormat = (DXGIFormat)ddsMetadata.Format;
 
-        var bpp = DirectXTex.BitsPerPixel((int)dxgiFormat);
-
-        string hasAlpha = DirectXTex.HasAlpha((int)dxgiFormat) ? "True" : "False";
-
         ImageProperties properties = new()
         {
             Name = Path.GetFileNameWithoutExtension(ddsFilePath),
@@ -89,8 +85,8 @@ public static ImageProperties GetDDSProperties(string ddsFilePath, TexMetadata d
             Height = ddsMetadata.Height.ToString(),
             Width = ddsMetadata.Width.ToString(),
             SurfaceFormat = dxgiFormat.ToString(),
-            HasAlpha = hasAlpha,
-            BitsPerPixel = bpp.ToString(),
+            HasAlpha = DirectXTex.HasAlpha((int)dxgiFormat) ? "True" : "False",
+            SurfaceGamma = DirectXTex.IsSRGB((int)dxgiFormat) ? "sRGB" : "Linear",
             MipMapCount = ddsMetadata.MipLevels.ToString(),
             ArraySize = ddsMetadata.ArraySize.ToString(),
             TextureLayout = ddsMetadata.Dimension.ToString(),
@@ -185,7 +181,6 @@ public static void GetDDSInformation(string ddsFilePath, out D3DTXMetadata metad
         image.Release();
     }
 
-
     public static D3DTXMetadata GetDDSInformation(TexMetadata metadata)
     {
         return new D3DTXMetadata
@@ -195,10 +190,10 @@ public static D3DTXMetadata GetDDSInformation(TexMetadata metadata)
             Depth = (uint)metadata.Depth,
             ArraySize = (uint)metadata.ArraySize,
             MipLevels = (uint)metadata.MipLevels,
-            Format = DDS_HELPER.GetTelltaleSurfaceFormat((DXGIFormat)metadata.Format),
-            SurfaceGamma = DirectXTex.IsSRGB(metadata.Format) ? TelltaleEnums.T3SurfaceGamma.eSurfaceGamma_sRGB : TelltaleEnums.T3SurfaceGamma.eSurfaceGamma_Linear,
-            D3DFormat = DDS_HELPER.GetD3DFORMAT((DXGIFormat)metadata.Format, metadata),
-            Dimension = DDS_HELPER.GetDimensionFromDDS(metadata),
+            Format = DDSHelper.GetTelltaleSurfaceFormat((DXGIFormat)metadata.Format),
+            SurfaceGamma = DirectXTex.IsSRGB(metadata.Format) ? T3SurfaceGamma.sRGB : T3SurfaceGamma.Linear,
+            D3DFormat = DDSHelper.GetD3DFORMAT((DXGIFormat)metadata.Format, metadata),
+            Dimension = DDSHelper.GetDimensionFromDDS(metadata),
         };
     }
 
@@ -513,28 +508,21 @@ private void Initialize(string filePath, DDSFlags flags = DDSFlags.None)
         blob.Release();
     }
 
-    public void LoadDDS(string filePath, DDSFlags flags = DDSFlags.None)
-    {
-        DDS_DirectXTexNet.GetDDSImage(filePath, out ScratchImage Image, out TexMetadata Metadata, flags);
-    }
-
     public string GetDDSDebugInfo()
     {
-        return DDS_DirectXTexNet.GetDDSDebugInfo(Metadata);
+        return TextureManager.GetDDSDebugInfo(Metadata);
     }
 
     public void ConvertToRGBA()
     {
-        int format = (int)(DirectXTex.IsSRGB(Image.GetMetadata().Format) ? DXGIFormat.R8G8B8A8_UNORM_SRGB : DXGIFormat.R8G8B8A8_UNORM);
-
         ScratchImage destImage = DirectXTex.CreateScratchImage();
 
         TexMetadata ogMeta = Image.GetMetadata();
-        Decompress((DXGIFormat)format);
+        Decompress(DXGIFormat.R8G8B8A8_UNORM);
 
-        if (Image.GetMetadata().Format != (uint)DXGIFormat.R8G8B8A8_UNORM_SRGB && Image.GetMetadata().Format != (uint)DXGIFormat.R8G8B8A8_UNORM)
+        if (Image.GetMetadata().Format != (uint)DXGIFormat.R8G8B8A8_UNORM)
         {
-            DirectXTex.Convert2(Image.GetImages(), Image.GetImageCount(), ref ogMeta, format, TexFilterFlags.Default, 0.5f, ref destImage).ThrowIf();
+            DirectXTex.Convert2(Image.GetImages(), Image.GetImageCount(), ref ogMeta, (int)DXGIFormat.R8G8B8A8_UNORM, TexFilterFlags.Default, 0.5f, ref destImage).ThrowIf();
 
             Image.Release();
             Image = destImage;
@@ -549,8 +537,7 @@ public void ConvertToRGBA()
 
     public byte[] GetSectionPixelData(uint mip, uint face)
     {
-        if ((uint)Image.GetMetadata().Format != (uint)DXGIFormat.R8G8B8A8_UNORM_SRGB
-            && (uint)Image.GetMetadata().Format != (uint)DXGIFormat.R8G8B8A8_UNORM)
+        if ((uint)Image.GetMetadata().Format != (uint)DXGIFormat.R8G8B8A8_UNORM)
         {
             ConvertToRGBA();
         }
@@ -583,7 +570,7 @@ public void GetData(uint mip, uint face, out ulong width, out ulong height, out
         pixels = GetSectionPixelData(mip, face);
         width = PreviewWidth;
         height = PreviewHeight;
-        pitch = DDS_DirectXTexNet.ComputePitch(PreviewFormat, PreviewWidth, PreviewHeight);
+        pitch = ComputePitch(PreviewFormat, PreviewWidth, PreviewHeight);
         length = width * height * (DirectXTex.BitsPerPixel((int)PreviewFormat) / 8);
     }
 
@@ -638,7 +625,7 @@ public void Decompress(DXGIFormat format = DXGIFormat.UNKNOWN)
     {
         if (DirectXTex.IsCompressed((int)format))
         {
-            throw new Exception("Invalid format");
+            throw new Exception("Invalid format!");
         }
 
         ScratchImage transformedImage = DirectXTex.CreateScratchImage();
@@ -706,7 +693,16 @@ private void Initialize(string filePath, TextureType textureType, bool isCopy =
             switch (textureType)
             {
                 case TextureType.DDS: DirectXTex.LoadFromDDSFile(filePath, flags, ref texMetadata, ref scratchImage).ThrowIf(); break;
-                case TextureType.PNG: DirectXTex.LoadFromPNGFile(filePath, ref texMetadata, ref scratchImage).ThrowIf(); break;
+                case TextureType.PNG:
+                    if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+                    {
+                        DirectXTex.LoadFromWICFile(filePath, WICFlags.AllFrames, ref texMetadata, ref scratchImage, default).ThrowIf(); break;
+                    }
+                    else if (Environment.OSVersion.Platform == PlatformID.Unix)
+                    {
+                        DirectXTex.LoadFromPNGFile(filePath, ref texMetadata, ref scratchImage).ThrowIf();
+                    }
+                    break;
                 case TextureType.HDR: DirectXTex.LoadFromHDRFile(filePath, ref texMetadata, ref scratchImage).ThrowIf(); break;
                 case TextureType.JPEG: DirectXTex.LoadFromJPEGFile(filePath, ref texMetadata, ref scratchImage).ThrowIf(); break;
                 case TextureType.TGA: DirectXTex.LoadFromTGAFile2(filePath, ref texMetadata, ref scratchImage).ThrowIf(); break;
@@ -733,11 +729,13 @@ private void Initialize(string filePath, TextureType textureType, bool isCopy =
                 OriginalImage = scratchImage;
                 OriginalMetadata = texMetadata;
             }
+
         }
         catch (Exception e)
         {
             Console.WriteLine(e.Message);
             scratchImage.Release();
+            throw new Exception("Failed to load image!");
         }
     }
 
@@ -780,6 +778,11 @@ public void ChangePreviewImage(ImageAdvancedOptions options, bool keepOriginal =
             }
         }
 
+        if (options.EnableTelltaleNormalMap && options.IsTelltaleNormalMap)
+        {
+            TransformImage(ImageEffect.SWIZZLE_ABGR);
+        }
+
         if (CurrentOptions.EnableNormalMap != options.EnableNormalMap)
         {
             if (!CurrentOptions.EnableNormalMap)
@@ -794,11 +797,40 @@ public void ChangePreviewImage(ImageAdvancedOptions options, bool keepOriginal =
             }
             else if (options.ManualGenerateMips && options.SetMips > 1)
             {
-                GenerateMipMaps(options.SetMips);
+                GenerateMipMaps(Math.Min(options.SetMips, GetMaxMipLevels()));
             }
         }
 
-        if (keepOriginal)
+        if (options.EnableAutomaticCompression)
+        {
+            if (options.EnableNormalMap && options.IsTelltaleXYNormalMap)
+            {
+                Compress(DXGIFormat.BC5_UNORM);
+            }
+            else if (OriginalImage.IsAlphaAllOpaque())
+            {
+                if (options.IsSRGB)
+                {
+                    Compress(DXGIFormat.BC1_UNORM_SRGB);
+                }
+                else
+                {
+                    Compress(DXGIFormat.BC1_UNORM);
+                }
+            }
+            else
+            {
+                if (options.IsSRGB)
+                {
+                    Compress(DXGIFormat.BC3_UNORM_SRGB);
+                }
+                else
+                {
+                    Compress(DXGIFormat.BC3_UNORM);
+                }
+            }
+        }
+        else if (keepOriginal)
         {
             Compress((DXGIFormat)OriginalImage.GetMetadata().Format);
         }
@@ -853,7 +885,6 @@ public void Swizzle(T3PlatformType platform = T3PlatformType.ePlatform_None)
 
         foreach (var image in images)
         {
-
             image.Pixels = platform switch
             {
                 T3PlatformType.ePlatform_NX => DrSwizzler.Swizzler.SwitchSwizzle(image.Pixels, (int)image.Width, (int)image.Height, (DrSwizzler.DDS.DXEnums.DXGIFormat)image.Format),
@@ -865,7 +896,7 @@ public void Swizzle(T3PlatformType platform = T3PlatformType.ePlatform_None)
             };
         }
 
-        byte[] header = DDS_DirectXTexNet.GetDDSHeaderBytes(Image);
+        byte[] header = GetDDSHeaderBytes(Image);
         byte[] pixels = images.SelectMany(x => x.Pixels).ToArray();
 
         byte[] newDDS = ByteFunctions.Combine(header, pixels);
@@ -894,7 +925,7 @@ public void Deswizzle(T3PlatformType platform = T3PlatformType.ePlatform_None)
             };
         }
 
-        byte[] header = DDS_DirectXTexNet.GetDDSHeaderBytes(Image);
+        byte[] header = GetDDSHeaderBytes(Image);
         byte[] pixels = images.SelectMany(x => x.Pixels).ToArray();
 
         byte[] newDDS = ByteFunctions.Combine(header, pixels);
@@ -929,10 +960,10 @@ public void SaveAsPNG(string filePath)
     {
         Decompress();
 
-        if (Metadata.Format != (int)DXGIFormat.R8_UNORM &&
-            Metadata.Format != (int)DXGIFormat.B8G8R8A8_UNORM &&
-            Metadata.Format != (int)DXGIFormat.B8G8R8X8_UNORM &&
-            Metadata.Format != (int)DXGIFormat.R8G8B8A8_UNORM)
+        if (Image.GetMetadata().Format != (int)DXGIFormat.R8_UNORM &&
+            Image.GetMetadata().Format != (int)DXGIFormat.B8G8R8A8_UNORM &&
+            Image.GetMetadata().Format != (int)DXGIFormat.B8G8R8X8_UNORM &&
+            Image.GetMetadata().Format != (int)DXGIFormat.R8G8B8A8_UNORM)
         {
             Convert(DXGIFormat.R8G8B8A8_UNORM);
         }
@@ -941,7 +972,7 @@ public void SaveAsPNG(string filePath)
         {
             if (Metadata.Depth == 1)
             {
-                DirectXTex.SaveToPNGFile(Image.GetImage(0, 0, 0), filePath);
+                DirectXTex.SaveToPNGFile(Image.GetImage(0, 0, 0), filePath).ThrowIf();
             }
             else
             {
@@ -968,8 +999,8 @@ public void SaveAsJPEG(string filePath)
     {
         Decompress();
 
-        if (Metadata.Format != (int)DXGIFormat.R8_UNORM &&
-            Metadata.Format != (int)DXGIFormat.R8G8B8A8_UNORM)
+        if (Image.GetMetadata().Format != (int)DXGIFormat.R8_UNORM &&
+            Image.GetMetadata().Format != (int)DXGIFormat.R8G8B8A8_UNORM)
         {
             Convert(DXGIFormat.R8G8B8A8_UNORM);
         }
@@ -1005,16 +1036,16 @@ public void SaveAsTGA(string filePath)
     {
         Decompress();
 
-        if (Metadata.Format != (int)DXGIFormat.R8_UNORM &&
-            Metadata.Format != (int)DXGIFormat.A8_UNORM &&
-            Metadata.Format != (int)DXGIFormat.R8G8B8A8_UNORM &&
-            Metadata.Format != (int)DXGIFormat.R8G8B8A8_UNORM_SRGB &&
-            Metadata.Format != (int)DXGIFormat.B8G8R8A8_UNORM &&
-            Metadata.Format != (int)DXGIFormat.B8G8R8A8_UNORM_SRGB &&
-            Metadata.Format != (int)DXGIFormat.B8G8R8X8_UNORM &&
-            Metadata.Format != (int)DXGIFormat.B8G8R8X8_UNORM_SRGB &&
-            Metadata.Format != (int)DXGIFormat.B8G8R8X8_UNORM &&
-            Metadata.Format != (int)DXGIFormat.B5G5R5A1_UNORM)
+        if (Image.GetMetadata().Format != (int)DXGIFormat.R8_UNORM &&
+            Image.GetMetadata().Format != (int)DXGIFormat.A8_UNORM &&
+            Image.GetMetadata().Format != (int)DXGIFormat.R8G8B8A8_UNORM &&
+            Image.GetMetadata().Format != (int)DXGIFormat.R8G8B8A8_UNORM_SRGB &&
+            Image.GetMetadata().Format != (int)DXGIFormat.B8G8R8A8_UNORM &&
+            Image.GetMetadata().Format != (int)DXGIFormat.B8G8R8A8_UNORM_SRGB &&
+            Image.GetMetadata().Format != (int)DXGIFormat.B8G8R8X8_UNORM &&
+            Image.GetMetadata().Format != (int)DXGIFormat.B8G8R8X8_UNORM_SRGB &&
+            Image.GetMetadata().Format != (int)DXGIFormat.B8G8R8X8_UNORM &&
+            Image.GetMetadata().Format != (int)DXGIFormat.B5G5R5A1_UNORM)
         {
             Convert(DXGIFormat.R8G8B8A8_UNORM);
         }
@@ -1052,7 +1083,7 @@ public void SaveAsHDR(string filePath)
     {
         Decompress();
 
-        if (Metadata.Format != (int)DXGIFormat.R32G32B32A32_FLOAT)
+        if (Image.GetMetadata().Format != (int)DXGIFormat.R32G32B32A32_FLOAT)
         {
             Convert(DXGIFormat.R32G32B32A32_FLOAT);
         }
@@ -1088,7 +1119,7 @@ public void SaveAsWIC(string filePath)
     {
         Decompress();
 
-        if (Metadata.Format == (int)DXGIFormat.R8G8_UNORM || Metadata.Format == (int)DXGIFormat.R8G8_SNORM)
+        if (Image.GetMetadata().Format == (int)DXGIFormat.R8G8_UNORM || Image.GetMetadata().Format == (int)DXGIFormat.R8G8_SNORM)
         {
             Convert(DXGIFormat.R8G8B8A8_UNORM);
         }
@@ -1103,7 +1134,7 @@ public void SaveAsWIC(string filePath)
             {
                 for (uint i = 0; i < Metadata.Depth; i++)
                 {
-                    StringBuilder sb = new StringBuilder();
+                    StringBuilder sb = new();
                     sb.Append(filePath).Append('_').Append(i);
                     DirectXTex.SaveToWICFile(Image.GetImage(0, 0, i), WICFlags.None, DirectXTex.GetWICCodec(WICCodecs.CodecBmp), filePath, null, default).ThrowIf();
                 }
@@ -1113,7 +1144,7 @@ public void SaveAsWIC(string filePath)
         {
             for (uint i = 0; i < Metadata.ArraySize; i++)
             {
-                StringBuilder sb = new StringBuilder();
+                StringBuilder sb = new();
                 sb.Append(filePath).Append('_').Append(i);
                 DirectXTex.SaveToWICFile(Image.GetImage(0, i, 0), WICFlags.None, DirectXTex.GetWICCodec(WICCodecs.CodecBmp), filePath, null, default).ThrowIf();
             }
@@ -1138,7 +1169,15 @@ public void SaveTexture(string filePath, TextureType textureType = TextureType.U
                 SaveAsWIC(filePath); break;
             case TextureType.PNG:
                 filePath += ".png";
-                SaveAsPNG(filePath); break;
+                if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+                {
+                    SaveAsWIC(filePath);
+                }
+                else if (Environment.OSVersion.Platform == PlatformID.Unix)
+                {
+                    SaveAsPNG(filePath);
+                }
+                break;
             case TextureType.JPEG:
                 filePath += ".jpeg";
                 SaveAsJPEG(filePath); break;
@@ -1172,9 +1211,23 @@ public void Convert(DXGIFormat format)
         }
     }
 
+    public void ApplyTexFilter(TexFilterFlags filter = TexFilterFlags.Default)
+    {
+        Decompress();
+
+        TexMetadata texMetadata = Image.GetMetadata();
+
+        ScratchImage transformedImage = DirectXTex.CreateScratchImage();
+
+        DirectXTex.Convert2(Image.GetImages(), Image.GetImageCount(), ref texMetadata, (int)DXGIFormat.R8G8B8A8_UNORM, filter, 0.5f, ref transformedImage).ThrowIf();
+
+        Image.Release();
+        Image = transformedImage;
+    }
+
     public void GetDDSInformation(out D3DTXMetadata metadata, out ImageSection[] sections, DDSFlags flags = DDSFlags.None)
     {
-        metadata = DDS_DirectXTexNet.GetDDSInformation(Image.GetMetadata());
+        metadata = TextureManager.GetDDSInformation(Image.GetMetadata());
         sections = GetDDSImageSections(Image, flags);
     }
 
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Graphics/KTX2/KTX2_Bindings.cs b/TelltaleTextureTool/TelltaleTextureTool/Graphics/KTX2/KTX2_Bindings.cs
index f4d2d71..b7c49d1 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Graphics/KTX2/KTX2_Bindings.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Graphics/KTX2/KTX2_Bindings.cs
@@ -1,11 +1,7 @@
 using TelltaleTextureTool.DirectX.Enums;
 using Hexa.NET.DirectXTex;
-using Ktx;
 using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Runtime.InteropServices;
-using static Ktx.Ktx2;
 
 namespace TelltaleTextureTool.DirectX;
 
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Graphics/KTX2/KTX2_HELPER.cs b/TelltaleTextureTool/TelltaleTextureTool/Graphics/KTX2/KTX2_HELPER.cs
index fee041f..af35a38 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Graphics/KTX2/KTX2_HELPER.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Graphics/KTX2/KTX2_HELPER.cs
@@ -1,467 +1,467 @@
-using TelltaleTextureTool.TelltaleEnums;
-using static Ktx.Ktx2;
+//using TelltaleTextureTool.TelltaleEnums;
+//using static Ktx.Ktx2;
 
-namespace TelltaleTextureTool.DirectX;
+//namespace TelltaleTextureTool.DirectX;
 
-// DDS Docs - https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-header
-// DDS PIXEL FORMAT - https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-pixelformat
-// DDS DDS_HEADER_DXT10 - https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-header-dxt10
-// DDS File Layout https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-file-layout-for-textures
-// Texture Block Compression in D3D11 - https://docs.microsoft.com/en-us/windows/win32/direct3d11/texture-block-compression-in-direct3d-11
-// DDS Programming Guide - https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dx-graphics-dds-pguide
-// D3DFORMAT - https://learn.microsoft.com/en-us/windows/win32/direct3d9/d3dformat
-// Map Direct3D 9 Formats to Direct3D 10 - https://learn.microsoft.com/en-gb/windows/win32/direct3d10/d3d10-graphics-programming-guide-resources-legacy-formats?redirectedfrom=MSDN
+//// DDS Docs - https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-header
+//// DDS PIXEL FORMAT - https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-pixelformat
+//// DDS DDS_HEADER_DXT10 - https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-header-dxt10
+//// DDS File Layout https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dds-file-layout-for-textures
+//// Texture Block Compression in D3D11 - https://docs.microsoft.com/en-us/windows/win32/direct3d11/texture-block-compression-in-direct3d-11
+//// DDS Programming Guide - https://docs.microsoft.com/en-us/windows/win32/direct3ddds/dx-graphics-dds-pguide
+//// D3DFORMAT - https://learn.microsoft.com/en-us/windows/win32/direct3d9/d3dformat
+//// Map Direct3D 9 Formats to Direct3D 10 - https://learn.microsoft.com/en-gb/windows/win32/direct3d10/d3d10-graphics-programming-guide-resources-legacy-formats?redirectedfrom=MSDN
 
-/// <summary>
-/// The class is used for decoding and encoding .dds headers. 
-/// </summary>
-public static partial class KTX2_HELPER
-{
-    /// <summary>
-    /// Get the Telltale surface format from a DXGI format.
-    /// This is used for the conversion process from .dds to .d3dtx.
-    /// </summary>
-    /// <param name="dxgiFormat">The Direct3D10/DXGI format.</param>
-    /// <returns>The corresponding T3SurfaceFormat enum from the DXGI format.</returns>
-    private static T3SurfaceFormat GetTelltaleSurfaceFormatFromDXGI(VkFormat vkFormat)
-    {
-        return vkFormat switch
-        {
-            VkFormat.B8G8R8A8Snorm => T3SurfaceFormat.ARGB8,
-            VkFormat.B8G8R8A8Srgb => T3SurfaceFormat.ARGB8,
-            VkFormat.R16G16B16A16Unorm => T3SurfaceFormat.ARGB16,
-            VkFormat.B5G6R5UnormPack16 => T3SurfaceFormat.RGB565,
-            VkFormat.B5G5R5A1UnormPack16 => T3SurfaceFormat.ARGB1555,
-            VkFormat.B4G4R4A4UnormPack16 => T3SurfaceFormat.ARGB4,
-            VkFormat.A2R10G10B10UnormPack32 => T3SurfaceFormat.ARGB2101010,
-            VkFormat.R16G16Unorm => T3SurfaceFormat.RG16,
-            VkFormat.R8G8B8A8Unorm => T3SurfaceFormat.RGBA8,
-            VkFormat.R8G8B8A8Srgb => T3SurfaceFormat.RGBA8,
-            VkFormat.R32Uint => T3SurfaceFormat.R32,
-            VkFormat.R32G32Uint => T3SurfaceFormat.RG32,
-            VkFormat.R32G32B32A32Sfloat => T3SurfaceFormat.RGBA32F,
-            VkFormat.R8Unorm => T3SurfaceFormat.L8,
-            VkFormat.R8Srgb => T3SurfaceFormat.L8,
-            VkFormat.R8G8Unorm => T3SurfaceFormat.AL8,
-            VkFormat.R8G8Srgb => T3SurfaceFormat.AL8,
-            VkFormat.R16Unorm => T3SurfaceFormat.L16,
-            VkFormat.R16G16Snorm => T3SurfaceFormat.RG16S,
-            VkFormat.R8G8B8A8Snorm => T3SurfaceFormat.RGBA8S,
-            VkFormat.R16G16B16A16Snorm => T3SurfaceFormat.RGBA16S,
-            VkFormat.R16G16B16A16Uint => T3SurfaceFormat.R16UI,
-            VkFormat.R16Sfloat => T3SurfaceFormat.R16F,
-            VkFormat.R16G16B16A16Sfloat => T3SurfaceFormat.RGBA16F,
-            VkFormat.R32Sfloat => T3SurfaceFormat.R32F,
-            VkFormat.R32G32Sfloat => T3SurfaceFormat.RG32F,
-            VkFormat.R32G32B32A32Uint => T3SurfaceFormat.RGBA32,
-            // VkFormat.BC1RgbaUnormBlock => T3SurfaceFormat.eSurface_BC1,
-            // VkFormat.BC2UnormBlock => T3SurfaceFormat.eSurface_BC2,
-            // VkFormat.BC3UnormBlock => T3SurfaceFormat.eSurface_BC3,
-            // VkFormat.BC4UnormBlock => T3SurfaceFormat.eSurface_BC4,
-            // VkFormat.BC5UnormBlock => T3SurfaceFormat.eSurface_BC5,
-            // VkFormat.BC6HUfloatBlock => T3SurfaceFormat.eSurface_BC6,
-            // VkFormat.BC7UnormBlock => T3SurfaceFormat.eSurface_BC7,
-            // VkFormat.BC1RgbSrgbBlock => T3SurfaceFormat.eSurface_BC1,
-            // VkFormat.BC1RgbaSrgbBlock => T3SurfaceFormat.eSurface_BC1,
-            // VkFormat.BC2SrgbBlock => T3SurfaceFormat.eSurface_BC2,
-            // VkFormat.BC3SrgbBlock => T3SurfaceFormat.eSurface_BC3,
-            // VkFormat.BC7SrgbBlock => T3SurfaceFormat.eSurface_BC7,
+///// <summary>
+///// The class is used for decoding and encoding .dds headers. 
+///// </summary>
+//public static partial class KTX2_HELPER
+//{
+//    /// <summary>
+//    /// Get the Telltale surface format from a DXGI format.
+//    /// This is used for the conversion process from .dds to .d3dtx.
+//    /// </summary>
+//    /// <param name="dxgiFormat">The Direct3D10/DXGI format.</param>
+//    /// <returns>The corresponding T3SurfaceFormat enum from the DXGI format.</returns>
+//    private static T3SurfaceFormat GetTelltaleSurfaceFormatFromDXGI(VkFormat vkFormat)
+//    {
+//        return vkFormat switch
+//        {
+//            VkFormat.B8G8R8A8Snorm => T3SurfaceFormat.ARGB8,
+//            VkFormat.B8G8R8A8Srgb => T3SurfaceFormat.ARGB8,
+//            VkFormat.R16G16B16A16Unorm => T3SurfaceFormat.ARGB16,
+//            VkFormat.B5G6R5UnormPack16 => T3SurfaceFormat.RGB565,
+//            VkFormat.B5G5R5A1UnormPack16 => T3SurfaceFormat.ARGB1555,
+//            VkFormat.B4G4R4A4UnormPack16 => T3SurfaceFormat.ARGB4,
+//            VkFormat.A2R10G10B10UnormPack32 => T3SurfaceFormat.ARGB2101010,
+//            VkFormat.R16G16Unorm => T3SurfaceFormat.RG16,
+//            VkFormat.R8G8B8A8Unorm => T3SurfaceFormat.RGBA8,
+//            VkFormat.R8G8B8A8Srgb => T3SurfaceFormat.RGBA8,
+//            VkFormat.R32Uint => T3SurfaceFormat.R32,
+//            VkFormat.R32G32Uint => T3SurfaceFormat.RG32,
+//            VkFormat.R32G32B32A32Sfloat => T3SurfaceFormat.RGBA32F,
+//            VkFormat.R8Unorm => T3SurfaceFormat.L8,
+//            VkFormat.R8Srgb => T3SurfaceFormat.L8,
+//            VkFormat.R8G8Unorm => T3SurfaceFormat.AL8,
+//            VkFormat.R8G8Srgb => T3SurfaceFormat.AL8,
+//            VkFormat.R16Unorm => T3SurfaceFormat.L16,
+//            VkFormat.R16G16Snorm => T3SurfaceFormat.RG16S,
+//            VkFormat.R8G8B8A8Snorm => T3SurfaceFormat.RGBA8S,
+//            VkFormat.R16G16B16A16Snorm => T3SurfaceFormat.RGBA16S,
+//            VkFormat.R16G16B16A16Uint => T3SurfaceFormat.R16UI,
+//            VkFormat.R16Sfloat => T3SurfaceFormat.R16F,
+//            VkFormat.R16G16B16A16Sfloat => T3SurfaceFormat.RGBA16F,
+//            VkFormat.R32Sfloat => T3SurfaceFormat.R32F,
+//            VkFormat.R32G32Sfloat => T3SurfaceFormat.RG32F,
+//            VkFormat.R32G32B32A32Uint => T3SurfaceFormat.RGBA32,
+//            // VkFormat.BC1RgbaUnormBlock => T3SurfaceFormat.eSurface_BC1,
+//            // VkFormat.BC2UnormBlock => T3SurfaceFormat.eSurface_BC2,
+//            // VkFormat.BC3UnormBlock => T3SurfaceFormat.eSurface_BC3,
+//            // VkFormat.BC4UnormBlock => T3SurfaceFormat.eSurface_BC4,
+//            // VkFormat.BC5UnormBlock => T3SurfaceFormat.eSurface_BC5,
+//            // VkFormat.BC6HUfloatBlock => T3SurfaceFormat.eSurface_BC6,
+//            // VkFormat.BC7UnormBlock => T3SurfaceFormat.eSurface_BC7,
+//            // VkFormat.BC1RgbSrgbBlock => T3SurfaceFormat.eSurface_BC1,
+//            // VkFormat.BC1RgbaSrgbBlock => T3SurfaceFormat.eSurface_BC1,
+//            // VkFormat.BC2SrgbBlock => T3SurfaceFormat.eSurface_BC2,
+//            // VkFormat.BC3SrgbBlock => T3SurfaceFormat.eSurface_BC3,
+//            // VkFormat.BC7SrgbBlock => T3SurfaceFormat.eSurface_BC7,
 
-            VkFormat.Astc4X4UnormBlock => T3SurfaceFormat.ATSC_RGBA_4x4,
-            VkFormat.Astc4X4SrgbBlock => T3SurfaceFormat.ATSC_RGBA_4x4,
+//            VkFormat.Astc4X4UnormBlock => T3SurfaceFormat.ATSC_RGBA_4x4,
+//            VkFormat.Astc4X4SrgbBlock => T3SurfaceFormat.ATSC_RGBA_4x4,
 
-            VkFormat.Etc2R8G8B8A1SrgbBlock => T3SurfaceFormat.ETC2_RGB1A,
-            VkFormat.Etc2R8G8B8A1UnormBlock => T3SurfaceFormat.ETC2_RGB1A,
+//            VkFormat.Etc2R8G8B8A1SrgbBlock => T3SurfaceFormat.ETC2_RGB1A,
+//            VkFormat.Etc2R8G8B8A1UnormBlock => T3SurfaceFormat.ETC2_RGB1A,
 
-            VkFormat.Etc2R8G8B8A8SrgbBlock => T3SurfaceFormat.ETC2_RGBA,
-            VkFormat.Etc2R8G8B8A8UnormBlock => T3SurfaceFormat.ETC2_RGBA,
+//            VkFormat.Etc2R8G8B8A8SrgbBlock => T3SurfaceFormat.ETC2_RGBA,
+//            VkFormat.Etc2R8G8B8A8UnormBlock => T3SurfaceFormat.ETC2_RGBA,
 
-            VkFormat.Etc2R8G8B8SrgbBlock => T3SurfaceFormat.ETC2_RGB,
-            VkFormat.Etc2R8G8B8UnormBlock => T3SurfaceFormat.ETC2_RGB,
+//            VkFormat.Etc2R8G8B8SrgbBlock => T3SurfaceFormat.ETC2_RGB,
+//            VkFormat.Etc2R8G8B8UnormBlock => T3SurfaceFormat.ETC2_RGB,
 
-            VkFormat.EacR11UnormBlock => T3SurfaceFormat.ETC2_R,
-            VkFormat.EacR11SnormBlock => T3SurfaceFormat.ETC2_R,
+//            VkFormat.EacR11UnormBlock => T3SurfaceFormat.ETC2_R,
+//            VkFormat.EacR11SnormBlock => T3SurfaceFormat.ETC2_R,
 
-            VkFormat.EacR11G11UnormBlock => T3SurfaceFormat.ETC2_RG,
-            VkFormat.EacR11G11SnormBlock => T3SurfaceFormat.ETC2_RG,
+//            VkFormat.EacR11G11UnormBlock => T3SurfaceFormat.ETC2_RG,
+//            VkFormat.EacR11G11SnormBlock => T3SurfaceFormat.ETC2_RG,
 
-            VkFormat.Pvrtc12BppSrgbBlockImg => T3SurfaceFormat.PVRTC2,
-            VkFormat.Pvrtc12BppUnormBlockImg => T3SurfaceFormat.PVRTC2,
-            VkFormat.Pvrtc14BppSrgbBlockImg => T3SurfaceFormat.PVRTC2,
-            VkFormat.Pvrtc14BppUnormBlockImg => T3SurfaceFormat.PVRTC2a,
+//            VkFormat.Pvrtc12BppSrgbBlockImg => T3SurfaceFormat.PVRTC2,
+//            VkFormat.Pvrtc12BppUnormBlockImg => T3SurfaceFormat.PVRTC2,
+//            VkFormat.Pvrtc14BppSrgbBlockImg => T3SurfaceFormat.PVRTC2,
+//            VkFormat.Pvrtc14BppUnormBlockImg => T3SurfaceFormat.PVRTC2a,
 
-            VkFormat.Pvrtc22BppSrgbBlockImg => T3SurfaceFormat.PVRTC4,
-            VkFormat.Pvrtc22BppUnormBlockImg => T3SurfaceFormat.PVRTC4,
-            VkFormat.Pvrtc24BppSrgbBlockImg => T3SurfaceFormat.PVRTC4,
-            VkFormat.Pvrtc24BppUnormBlockImg => T3SurfaceFormat.PVRTC4,
+//            VkFormat.Pvrtc22BppSrgbBlockImg => T3SurfaceFormat.PVRTC4,
+//            VkFormat.Pvrtc22BppUnormBlockImg => T3SurfaceFormat.PVRTC4,
+//            VkFormat.Pvrtc24BppSrgbBlockImg => T3SurfaceFormat.PVRTC4,
+//            VkFormat.Pvrtc24BppUnormBlockImg => T3SurfaceFormat.PVRTC4,
 
-            _ => T3SurfaceFormat.Unknown,
-        };
-    }
+//            _ => T3SurfaceFormat.Unknown,
+//        };
+//    }
 
-    public static bool HasAlpha(VkFormat format)
-    {
-        switch (format)
-        {
-            case VkFormat.R4G4B4A4UnormPack16:
-            case VkFormat.B4G4R4A4UnormPack16:
-            case VkFormat.R5G5B5A1UnormPack16:
-            case VkFormat.B5G5R5A1UnormPack16:
-            case VkFormat.A1R5G5B5UnormPack16:
-            case VkFormat.R8G8B8A8Unorm:
-            case VkFormat.R8G8B8A8Snorm:
-            case VkFormat.R8G8B8A8Uscaled:
-            case VkFormat.R8G8B8A8Sscaled:
-            case VkFormat.R8G8B8A8Uint:
-            case VkFormat.R8G8B8A8Sint:
-            case VkFormat.R8G8B8A8Srgb:
-            case VkFormat.B8G8R8A8Unorm:
-            case VkFormat.B8G8R8A8Snorm:
-            case VkFormat.B8G8R8A8Uscaled:
-            case VkFormat.B8G8R8A8Sscaled:
-            case VkFormat.B8G8R8A8Uint:
-            case VkFormat.B8G8R8A8Sint:
-            case VkFormat.B8G8R8A8Srgb:
-            case VkFormat.A8B8G8R8UnormPack32:
-            case VkFormat.A8B8G8R8SnormPack32:
-            case VkFormat.A8B8G8R8UscaledPack32:
-            case VkFormat.A8B8G8R8SscaledPack32:
-            case VkFormat.A8B8G8R8UintPack32:
-            case VkFormat.A8B8G8R8SintPack32:
-            case VkFormat.A8B8G8R8SrgbPack32:
-            case VkFormat.A2R10G10B10UnormPack32:
-            case VkFormat.A2R10G10B10SnormPack32:
-            case VkFormat.A2R10G10B10UscaledPack32:
-            case VkFormat.A2R10G10B10SscaledPack32:
-            case VkFormat.A2R10G10B10UintPack32:
-            case VkFormat.A2R10G10B10SintPack32:
-            case VkFormat.A2B10G10R10UnormPack32:
-            case VkFormat.A2B10G10R10SnormPack32:
-            case VkFormat.A2B10G10R10UscaledPack32:
-            case VkFormat.A2B10G10R10SscaledPack32:
-            case VkFormat.A2B10G10R10UintPack32:
-            case VkFormat.A2B10G10R10SintPack32:
-            case VkFormat.R16G16B16A16Unorm:
-            case VkFormat.R16G16B16A16Snorm:
-            case VkFormat.R16G16B16A16Uscaled:
-            case VkFormat.R16G16B16A16Sscaled:
-            case VkFormat.R16G16B16A16Uint:
-            case VkFormat.R16G16B16A16Sint:
-            case VkFormat.R16G16B16A16Sfloat:
-            case VkFormat.R32G32B32A32Uint:
-            case VkFormat.R32G32B32A32Sint:
-            case VkFormat.R32G32B32A32Sfloat:
-            case VkFormat.R64G64B64A64Uint:
-            case VkFormat.R64G64B64A64Sint:
-            case VkFormat.R64G64B64A64Sfloat:
-            // case VkFormat.BC1RgbaUnormBlock:
-            // case VkFormat.BC1RgbaSrgbBlock:
-            // case VkFormat.BC2UnormBlock:
-            // case VkFormat.BC2SrgbBlock:
-            // case VkFormat.BC3UnormBlock:
-            // case VkFormat.BC3SrgbBlock:
-            // case VkFormat.BC7UnormBlock:
-            // case VkFormat.BC7SrgbBlock:
-            case VkFormat.Etc2R8G8B8A1UnormBlock:
-            case VkFormat.Etc2R8G8B8A1SrgbBlock:
-            case VkFormat.Etc2R8G8B8A8UnormBlock:
-            case VkFormat.Etc2R8G8B8A8SrgbBlock:
-            case VkFormat.Astc4X4UnormBlock:
-            case VkFormat.Astc4X4SrgbBlock:
-            case VkFormat.Astc5X4UnormBlock:
-            case VkFormat.Astc5X4SrgbBlock:
-            case VkFormat.Astc5X5UnormBlock:
-            case VkFormat.Astc5X5SrgbBlock:
-            case VkFormat.Astc6X5UnormBlock:
-            case VkFormat.Astc6X5SrgbBlock:
-            case VkFormat.Astc6X6UnormBlock:
-            case VkFormat.Astc6X6SrgbBlock:
-            case VkFormat.Astc8X5UnormBlock:
-            case VkFormat.Astc8X5SrgbBlock:
-            case VkFormat.Astc8X6UnormBlock:
-            case VkFormat.Astc8X6SrgbBlock:
-            case VkFormat.Astc8X8UnormBlock:
-            case VkFormat.Astc8X8SrgbBlock:
-            case VkFormat.Astc10X5UnormBlock:
-            case VkFormat.Astc10X5SrgbBlock:
-            case VkFormat.Astc10X6UnormBlock:
-            case VkFormat.Astc10X6SrgbBlock:
-            case VkFormat.Astc10X8UnormBlock:
-            case VkFormat.Astc10X8SrgbBlock:
-            case VkFormat.Astc10X10UnormBlock:
-            case VkFormat.Astc10X10SrgbBlock:
-            case VkFormat.Astc12X10UnormBlock:
-            case VkFormat.Astc12X10SrgbBlock:
-            case VkFormat.Astc12X12UnormBlock:
-            case VkFormat.Astc12X12SrgbBlock:
-            case VkFormat.G8B8G8R8422Unorm:
-            case VkFormat.B8G8R8G8422Unorm:
-            case VkFormat.G8B8R83Plane420Unorm:
-            case VkFormat.G8B8R82Plane420Unorm:
-            case VkFormat.G8B8R83Plane422Unorm:
-            case VkFormat.G8B8R82Plane422Unorm:
-            case VkFormat.G8B8R83Plane444Unorm:
-            case VkFormat.R10X6G10X6B10X6A10X6Unorm4Pack16:
-            case VkFormat.G10X6B10X6G10X6R10X6422Unorm4Pack16:
-            case VkFormat.B10X6G10X6R10X6G10X6422Unorm4Pack16:
-            case VkFormat.G10X6B10X6R10X63Plane420Unorm3Pack16:
-            case VkFormat.G10X6B10X6R10X62Plane420Unorm3Pack16:
-            case VkFormat.G10X6B10X6R10X63Plane422Unorm3Pack16:
-            case VkFormat.G10X6B10X6R10X62Plane422Unorm3Pack16:
-            case VkFormat.G10X6B10X6R10X63Plane444Unorm3Pack16:
-            case VkFormat.R12X4G12X4B12X4A12X4Unorm4Pack16:
-            case VkFormat.G12X4B12X4G12X4R12X4422Unorm4Pack16:
-            case VkFormat.B12X4G12X4R12X4G12X4422Unorm4Pack16:
-            case VkFormat.G12X4B12X4R12X43Plane420Unorm3Pack16:
-            case VkFormat.G12X4B12X4R12X42Plane420Unorm3Pack16:
-            case VkFormat.G12X4B12X4R12X43Plane422Unorm3Pack16:
-            case VkFormat.G12X4B12X4R12X42Plane422Unorm3Pack16:
-            case VkFormat.G12X4B12X4R12X43Plane444Unorm3Pack16:
-            case VkFormat.G16B16R163Plane420Unorm:
-            case VkFormat.G16B16R162Plane420Unorm:
-            case VkFormat.G16B16R163Plane422Unorm:
-            case VkFormat.G16B16R162Plane422Unorm:
-            case VkFormat.G16B16R163Plane444Unorm:
-            case VkFormat.Pvrtc12BppUnormBlockImg:
-            case VkFormat.Pvrtc12BppSrgbBlockImg:
-            case VkFormat.Pvrtc14BppUnormBlockImg:
-            case VkFormat.Pvrtc14BppSrgbBlockImg:
-            case VkFormat.Pvrtc22BppUnormBlockImg:
-            case VkFormat.Pvrtc22BppSrgbBlockImg:
-            case VkFormat.Pvrtc24BppUnormBlockImg:
-            case VkFormat.Pvrtc24BppSrgbBlockImg:
-                return true;
-            default:
-                return false;
-        }
-    }
+//    public static bool HasAlpha(VkFormat format)
+//    {
+//        switch (format)
+//        {
+//            case VkFormat.R4G4B4A4UnormPack16:
+//            case VkFormat.B4G4R4A4UnormPack16:
+//            case VkFormat.R5G5B5A1UnormPack16:
+//            case VkFormat.B5G5R5A1UnormPack16:
+//            case VkFormat.A1R5G5B5UnormPack16:
+//            case VkFormat.R8G8B8A8Unorm:
+//            case VkFormat.R8G8B8A8Snorm:
+//            case VkFormat.R8G8B8A8Uscaled:
+//            case VkFormat.R8G8B8A8Sscaled:
+//            case VkFormat.R8G8B8A8Uint:
+//            case VkFormat.R8G8B8A8Sint:
+//            case VkFormat.R8G8B8A8Srgb:
+//            case VkFormat.B8G8R8A8Unorm:
+//            case VkFormat.B8G8R8A8Snorm:
+//            case VkFormat.B8G8R8A8Uscaled:
+//            case VkFormat.B8G8R8A8Sscaled:
+//            case VkFormat.B8G8R8A8Uint:
+//            case VkFormat.B8G8R8A8Sint:
+//            case VkFormat.B8G8R8A8Srgb:
+//            case VkFormat.A8B8G8R8UnormPack32:
+//            case VkFormat.A8B8G8R8SnormPack32:
+//            case VkFormat.A8B8G8R8UscaledPack32:
+//            case VkFormat.A8B8G8R8SscaledPack32:
+//            case VkFormat.A8B8G8R8UintPack32:
+//            case VkFormat.A8B8G8R8SintPack32:
+//            case VkFormat.A8B8G8R8SrgbPack32:
+//            case VkFormat.A2R10G10B10UnormPack32:
+//            case VkFormat.A2R10G10B10SnormPack32:
+//            case VkFormat.A2R10G10B10UscaledPack32:
+//            case VkFormat.A2R10G10B10SscaledPack32:
+//            case VkFormat.A2R10G10B10UintPack32:
+//            case VkFormat.A2R10G10B10SintPack32:
+//            case VkFormat.A2B10G10R10UnormPack32:
+//            case VkFormat.A2B10G10R10SnormPack32:
+//            case VkFormat.A2B10G10R10UscaledPack32:
+//            case VkFormat.A2B10G10R10SscaledPack32:
+//            case VkFormat.A2B10G10R10UintPack32:
+//            case VkFormat.A2B10G10R10SintPack32:
+//            case VkFormat.R16G16B16A16Unorm:
+//            case VkFormat.R16G16B16A16Snorm:
+//            case VkFormat.R16G16B16A16Uscaled:
+//            case VkFormat.R16G16B16A16Sscaled:
+//            case VkFormat.R16G16B16A16Uint:
+//            case VkFormat.R16G16B16A16Sint:
+//            case VkFormat.R16G16B16A16Sfloat:
+//            case VkFormat.R32G32B32A32Uint:
+//            case VkFormat.R32G32B32A32Sint:
+//            case VkFormat.R32G32B32A32Sfloat:
+//            case VkFormat.R64G64B64A64Uint:
+//            case VkFormat.R64G64B64A64Sint:
+//            case VkFormat.R64G64B64A64Sfloat:
+//            // case VkFormat.BC1RgbaUnormBlock:
+//            // case VkFormat.BC1RgbaSrgbBlock:
+//            // case VkFormat.BC2UnormBlock:
+//            // case VkFormat.BC2SrgbBlock:
+//            // case VkFormat.BC3UnormBlock:
+//            // case VkFormat.BC3SrgbBlock:
+//            // case VkFormat.BC7UnormBlock:
+//            // case VkFormat.BC7SrgbBlock:
+//            case VkFormat.Etc2R8G8B8A1UnormBlock:
+//            case VkFormat.Etc2R8G8B8A1SrgbBlock:
+//            case VkFormat.Etc2R8G8B8A8UnormBlock:
+//            case VkFormat.Etc2R8G8B8A8SrgbBlock:
+//            case VkFormat.Astc4X4UnormBlock:
+//            case VkFormat.Astc4X4SrgbBlock:
+//            case VkFormat.Astc5X4UnormBlock:
+//            case VkFormat.Astc5X4SrgbBlock:
+//            case VkFormat.Astc5X5UnormBlock:
+//            case VkFormat.Astc5X5SrgbBlock:
+//            case VkFormat.Astc6X5UnormBlock:
+//            case VkFormat.Astc6X5SrgbBlock:
+//            case VkFormat.Astc6X6UnormBlock:
+//            case VkFormat.Astc6X6SrgbBlock:
+//            case VkFormat.Astc8X5UnormBlock:
+//            case VkFormat.Astc8X5SrgbBlock:
+//            case VkFormat.Astc8X6UnormBlock:
+//            case VkFormat.Astc8X6SrgbBlock:
+//            case VkFormat.Astc8X8UnormBlock:
+//            case VkFormat.Astc8X8SrgbBlock:
+//            case VkFormat.Astc10X5UnormBlock:
+//            case VkFormat.Astc10X5SrgbBlock:
+//            case VkFormat.Astc10X6UnormBlock:
+//            case VkFormat.Astc10X6SrgbBlock:
+//            case VkFormat.Astc10X8UnormBlock:
+//            case VkFormat.Astc10X8SrgbBlock:
+//            case VkFormat.Astc10X10UnormBlock:
+//            case VkFormat.Astc10X10SrgbBlock:
+//            case VkFormat.Astc12X10UnormBlock:
+//            case VkFormat.Astc12X10SrgbBlock:
+//            case VkFormat.Astc12X12UnormBlock:
+//            case VkFormat.Astc12X12SrgbBlock:
+//            case VkFormat.G8B8G8R8422Unorm:
+//            case VkFormat.B8G8R8G8422Unorm:
+//            case VkFormat.G8B8R83Plane420Unorm:
+//            case VkFormat.G8B8R82Plane420Unorm:
+//            case VkFormat.G8B8R83Plane422Unorm:
+//            case VkFormat.G8B8R82Plane422Unorm:
+//            case VkFormat.G8B8R83Plane444Unorm:
+//            case VkFormat.R10X6G10X6B10X6A10X6Unorm4Pack16:
+//            case VkFormat.G10X6B10X6G10X6R10X6422Unorm4Pack16:
+//            case VkFormat.B10X6G10X6R10X6G10X6422Unorm4Pack16:
+//            case VkFormat.G10X6B10X6R10X63Plane420Unorm3Pack16:
+//            case VkFormat.G10X6B10X6R10X62Plane420Unorm3Pack16:
+//            case VkFormat.G10X6B10X6R10X63Plane422Unorm3Pack16:
+//            case VkFormat.G10X6B10X6R10X62Plane422Unorm3Pack16:
+//            case VkFormat.G10X6B10X6R10X63Plane444Unorm3Pack16:
+//            case VkFormat.R12X4G12X4B12X4A12X4Unorm4Pack16:
+//            case VkFormat.G12X4B12X4G12X4R12X4422Unorm4Pack16:
+//            case VkFormat.B12X4G12X4R12X4G12X4422Unorm4Pack16:
+//            case VkFormat.G12X4B12X4R12X43Plane420Unorm3Pack16:
+//            case VkFormat.G12X4B12X4R12X42Plane420Unorm3Pack16:
+//            case VkFormat.G12X4B12X4R12X43Plane422Unorm3Pack16:
+//            case VkFormat.G12X4B12X4R12X42Plane422Unorm3Pack16:
+//            case VkFormat.G12X4B12X4R12X43Plane444Unorm3Pack16:
+//            case VkFormat.G16B16R163Plane420Unorm:
+//            case VkFormat.G16B16R162Plane420Unorm:
+//            case VkFormat.G16B16R163Plane422Unorm:
+//            case VkFormat.G16B16R162Plane422Unorm:
+//            case VkFormat.G16B16R163Plane444Unorm:
+//            case VkFormat.Pvrtc12BppUnormBlockImg:
+//            case VkFormat.Pvrtc12BppSrgbBlockImg:
+//            case VkFormat.Pvrtc14BppUnormBlockImg:
+//            case VkFormat.Pvrtc14BppSrgbBlockImg:
+//            case VkFormat.Pvrtc22BppUnormBlockImg:
+//            case VkFormat.Pvrtc22BppSrgbBlockImg:
+//            case VkFormat.Pvrtc24BppUnormBlockImg:
+//            case VkFormat.Pvrtc24BppSrgbBlockImg:
+//                return true;
+//            default:
+//                return false;
+//        }
+//    }
 
-    /// <summary>
-    /// Get the Telltale surface format from a DXGI format and an already existing surface format.
-    /// This is used for the conversion process from .dds to .d3dtx.
-    /// This is used when equivalent formats are found. 
-    /// Some Telltale games have different values for the same formats, but they do not ship with all of them.
-    /// This can create issues if the Telltale surface format is not found in the game. 
-    /// In any case, use Lucas's Telltale Inspector to change the value if any issues arise.
-    /// </summary>
-    /// <param name="dxgiFormat">The Direct3D10/DXGI format.</param>
-    /// <param name="surfaceFormat">(Optional) The existing Telltale surface format. Default value is UNKNOWN.</param>
-    /// <returns>The corresponding T3SurfaceFormat enum from the DXGI format and Telltale surface format.</returns>
-    public static T3SurfaceFormat GetTelltaleSurfaceFormatFromVulkan(VkFormat vkFormat, T3SurfaceFormat surfaceFormat = T3SurfaceFormat.Unknown)
-    {
-        T3SurfaceFormat surfaceFormatFromDXGI = GetTelltaleSurfaceFormatFromVulkan(vkFormat);
+//    /// <summary>
+//    /// Get the Telltale surface format from a DXGI format and an already existing surface format.
+//    /// This is used for the conversion process from .dds to .d3dtx.
+//    /// This is used when equivalent formats are found. 
+//    /// Some Telltale games have different values for the same formats, but they do not ship with all of them.
+//    /// This can create issues if the Telltale surface format is not found in the game. 
+//    /// In any case, use Lucas's Telltale Inspector to change the value if any issues arise.
+//    /// </summary>
+//    /// <param name="dxgiFormat">The Direct3D10/DXGI format.</param>
+//    /// <param name="surfaceFormat">(Optional) The existing Telltale surface format. Default value is UNKNOWN.</param>
+//    /// <returns>The corresponding T3SurfaceFormat enum from the DXGI format and Telltale surface format.</returns>
+//    public static T3SurfaceFormat GetTelltaleSurfaceFormatFromVulkan(VkFormat vkFormat, T3SurfaceFormat surfaceFormat = T3SurfaceFormat.Unknown)
+//    {
+//        T3SurfaceFormat surfaceFormatFromDXGI = GetTelltaleSurfaceFormatFromVulkan(vkFormat);
 
-        if (surfaceFormatFromDXGI == T3SurfaceFormat.Unknown)
-        {
-            return surfaceFormat;
-        }
+//        if (surfaceFormatFromDXGI == T3SurfaceFormat.Unknown)
+//        {
+//            return surfaceFormat;
+//        }
 
-        if (surfaceFormatFromDXGI == T3SurfaceFormat.L16 && surfaceFormat == T3SurfaceFormat.R16)
-        {
-            return T3SurfaceFormat.L16;
-        }
-        else if (surfaceFormatFromDXGI == T3SurfaceFormat.AL8 && surfaceFormat == T3SurfaceFormat.RG8)
-        {
-            return T3SurfaceFormat.RG8;
-        }
-        else if (surfaceFormatFromDXGI == T3SurfaceFormat.L8 && surfaceFormat == T3SurfaceFormat.R8)
-        {
-            return T3SurfaceFormat.R8;
-        }
-        else if (surfaceFormatFromDXGI == T3SurfaceFormat.ARGB16 && surfaceFormat == T3SurfaceFormat.RGBA16)
-        {
-            return T3SurfaceFormat.RGBA16;
-        }
-        else if (surfaceFormatFromDXGI == T3SurfaceFormat.ARGB2101010 && surfaceFormat == T3SurfaceFormat.RGBA1010102F)
-        {
-            return T3SurfaceFormat.RGBA1010102F;
-        }
-        else if (surfaceFormatFromDXGI == T3SurfaceFormat.R32F && surfaceFormat == T3SurfaceFormat.R32)
-        {
-            return T3SurfaceFormat.R32;
-        }
-        else if (surfaceFormatFromDXGI == T3SurfaceFormat.RG32F && surfaceFormat == T3SurfaceFormat.RG32)
-        {
-            return T3SurfaceFormat.R32;
-        }
+//        if (surfaceFormatFromDXGI == T3SurfaceFormat.L16 && surfaceFormat == T3SurfaceFormat.R16)
+//        {
+//            return T3SurfaceFormat.L16;
+//        }
+//        else if (surfaceFormatFromDXGI == T3SurfaceFormat.AL8 && surfaceFormat == T3SurfaceFormat.RG8)
+//        {
+//            return T3SurfaceFormat.RG8;
+//        }
+//        else if (surfaceFormatFromDXGI == T3SurfaceFormat.L8 && surfaceFormat == T3SurfaceFormat.R8)
+//        {
+//            return T3SurfaceFormat.R8;
+//        }
+//        else if (surfaceFormatFromDXGI == T3SurfaceFormat.ARGB16 && surfaceFormat == T3SurfaceFormat.RGBA16)
+//        {
+//            return T3SurfaceFormat.RGBA16;
+//        }
+//        else if (surfaceFormatFromDXGI == T3SurfaceFormat.ARGB2101010 && surfaceFormat == T3SurfaceFormat.RGBA1010102F)
+//        {
+//            return T3SurfaceFormat.RGBA1010102F;
+//        }
+//        else if (surfaceFormatFromDXGI == T3SurfaceFormat.R32F && surfaceFormat == T3SurfaceFormat.R32)
+//        {
+//            return T3SurfaceFormat.R32;
+//        }
+//        else if (surfaceFormatFromDXGI == T3SurfaceFormat.RG32F && surfaceFormat == T3SurfaceFormat.RG32)
+//        {
+//            return T3SurfaceFormat.R32;
+//        }
 
-        return surfaceFormatFromDXGI;
-    }
+//        return surfaceFormatFromDXGI;
+//    }
 
-    /// <summary>
-    /// Returns the corresponding VkFormat from a Telltale surface format. 
-    /// This is used for the conversion process from .d3dtx to .dds.
-    /// </summary>
-    /// <param name="format"></param>
-    /// <param name="gamma"></param>
-    /// <returns>The corresponding VkFormat.</returns>
-    public static VkFormat GetVkFormatFromTelltaleSurfaceFormat(T3SurfaceFormat format, T3SurfaceGamma gamma = T3SurfaceGamma.eSurfaceGamma_Linear, T3PlatformType platformType = T3PlatformType.ePlatform_PC, T3TextureAlphaMode alphaMode = T3TextureAlphaMode.Unknown)
-    {
-        VkFormat vkFormat = format switch
-        {
-            // In order of T3SurfaceFormat enum
-            //--------------------ARGB8--------------------
-            T3SurfaceFormat.ARGB8 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.B8G8R8A8Srgb : VkFormat.B8G8R8A8Unorm,
-            //--------------------ARGB16--------------------
-            T3SurfaceFormat.ARGB16 => VkFormat.R16G16B16A16Unorm,
-            //--------------------RGB565--------------------
-            T3SurfaceFormat.RGB565 => VkFormat.B5G6R5UnormPack16,
-            //--------------------ARGB1555--------------------
-            T3SurfaceFormat.ARGB1555 => VkFormat.B5G5R5A1UnormPack16,
-            //--------------------ARGB4--------------------
-            T3SurfaceFormat.ARGB4 => VkFormat.B4G4R4A4UnormPack16,
-            //--------------------ARGB2101010--------------------
-            T3SurfaceFormat.ARGB2101010 => VkFormat.A2B10G10R10UnormPack32,
-            //--------------------R16--------------------
-            T3SurfaceFormat.R16 => VkFormat.R16Unorm,
-            //--------------------RG16--------------------
-            T3SurfaceFormat.RG16 => VkFormat.R16G16Unorm,
-            //--------------------RGBA16--------------------
-            T3SurfaceFormat.RGBA16 => VkFormat.R16G16B16A16Unorm,
-            //--------------------RG8--------------------
-            T3SurfaceFormat.RG8 => VkFormat.R8G8Unorm,
-            //--------------------RGBA8--------------------
-            T3SurfaceFormat.RGBA8 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.R8G8B8A8Srgb : VkFormat.R8G8B8A8Unorm,
-            //--------------------R32--------------------
-            T3SurfaceFormat.R32 => VkFormat.R32Sfloat,
-            //--------------------RG32--------------------
-            T3SurfaceFormat.RG32 => VkFormat.R32G32Sfloat,
-            //--------------------RGBA32--------------------
-            T3SurfaceFormat.RGBA32 => VkFormat.R32G32B32A32Sfloat, // It could be UINT
-            //--------------------R8--------------------
-            T3SurfaceFormat.R8 => VkFormat.R8Unorm,
-            //--------------------RGBA8S--------------------
-            T3SurfaceFormat.RGBA8S => VkFormat.R8G8B8A8Snorm,
-            //--------------------L8--------------------
-            T3SurfaceFormat.L8 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.R8Srgb : VkFormat.R8Unorm,
-            //--------------------AL8--------------------
-            T3SurfaceFormat.AL8 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.R8G8Srgb : VkFormat.R8G8Unorm,
-            //--------------------R16--------------------
-            T3SurfaceFormat.L16 => VkFormat.R16Unorm,
-            //--------------------RG16S--------------------
-            T3SurfaceFormat.RG16S => VkFormat.R16G16Snorm,
-            //--------------------RGBA16S--------------------
-            T3SurfaceFormat.RGBA16S => VkFormat.R16G16B16A16Snorm,
-            //--------------------RGBA16UI--------------------
-            T3SurfaceFormat.R16UI => VkFormat.R16G16B16A16Uint,
-            //--------------------RG16F--------------------
-            T3SurfaceFormat.R16F => VkFormat.R16Sfloat,
-            //--------------------RGBA16F--------------------
-            T3SurfaceFormat.RGBA16F => VkFormat.R16G16B16A16Sfloat,
-            //--------------------R32F--------------------
-            T3SurfaceFormat.R32F => VkFormat.R32Sfloat,
-            //--------------------RG32F--------------------
-            T3SurfaceFormat.RG32F => VkFormat.R32G32Sfloat,
-            //--------------------RGBA32F--------------------
-            T3SurfaceFormat.RGBA32F => VkFormat.R32G32B32A32Sfloat,
-            //--------------------RGBA1010102F--------------------
-            T3SurfaceFormat.RGBA1010102F => VkFormat.A2B10G10R10UnormPack32,
-            //--------------------RGB111110F--------------------
-            T3SurfaceFormat.RGB111110F => VkFormat.B10G11R11UfloatPack32,
-            //--------------------RGB9E5F--------------------
-            T3SurfaceFormat.RGB9E5F => VkFormat.E5B9G9R9UfloatPack32,
-            //--------------------DepthPCF16--------------------
-            T3SurfaceFormat.DepthPCF16 => VkFormat.D16Unorm,
-            //--------------------DepthPCF24--------------------
-            T3SurfaceFormat.DepthPCF24 => VkFormat.D24UnormS8Uint,
-            //--------------------Depth16--------------------
-            T3SurfaceFormat.Depth16 => VkFormat.D16Unorm,
-            //--------------------Depth24--------------------
-            T3SurfaceFormat.Depth24 => VkFormat.D24UnormS8Uint,
-            //--------------------DepthStencil32--------------------
-            T3SurfaceFormat.DepthStencil32 => VkFormat.D32SfloatS8Uint,
-            //--------------------Depth32F--------------------
-            T3SurfaceFormat.Depth32F => VkFormat.D32Sfloat,
-            //--------------------Depth32F_Stencil8--------------------
-            T3SurfaceFormat.Depth32F_Stencil8 => VkFormat.D32SfloatS8Uint,
-            //--------------------Depth24F_Stencil8--------------------
-            T3SurfaceFormat.Depth24F_Stencil8 => VkFormat.D24UnormS8Uint,
-            // //--------------------DXT1 / BC1--------------------
-            // T3SurfaceFormat.eSurface_BC1 => alphaMode > 0 ? (gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.BC1RgbaSrgbBlock : VkFormat.BC1RgbaUnormBlock) : (gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.BC1RgbSrgbBlock : VkFormat.BC1RgbUnormBlock),
-            // //--------------------DXT2 and DXT3 / BC2--------------------
-            // T3SurfaceFormat.eSurface_BC2 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.BC2SrgbBlock : VkFormat.BC2UnormBlock,
-            // //--------------------DXT4 and DXT5 / BC3--------------------
-            // T3SurfaceFormat.eSurface_BC3 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.BC3SrgbBlock : VkFormat.BC3UnormBlock,
-            // //--------------------ATI1 / BC4--------------------
-            // T3SurfaceFormat.eSurface_BC4 => VkFormat.BC4UnormBlock,
-            // //--------------------ATI2 / BC5--------------------
-            // T3SurfaceFormat.eSurface_BC5 => VkFormat.BC5UnormBlock,
-            // //--------------------BC6H--------------------
-            // T3SurfaceFormat.eSurface_BC6 => VkFormat.BC6HUfloatBlock,
-            // //--------------------BC7--------------------
-            // T3SurfaceFormat.eSurface_BC7 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.BC7SrgbBlock : VkFormat.BC7UnormBlock,
-            // //--------------------ATSC_RGBA_4x4--------------------
-            // T3SurfaceFormat.eSurface_ATSC_RGBA_4x4 => VkFormat.Astc4X4UnormBlock,
-            //--------------------ETC2_RGB1A--------------------
-            T3SurfaceFormat.ETC2_RGB1A => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.Etc2R8G8B8A1SrgbBlock : VkFormat.Etc2R8G8B8A1UnormBlock,
-            //--------------------ETC2_RGBA--------------------
-            T3SurfaceFormat.ETC2_RGBA => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.Etc2R8G8B8A8SrgbBlock : VkFormat.Etc2R8G8B8A8UnormBlock,
-            //--------------------ETC2_RGB--------------------
-            T3SurfaceFormat.ETC2_RGB => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.Etc2R8G8B8SrgbBlock : VkFormat.Etc2R8G8B8UnormBlock,
-            //--------------------ETC2_R--------------------
-            T3SurfaceFormat.ETC2_R => VkFormat.EacR11UnormBlock,
-            //--------------------ETC2_RG--------------------
-            T3SurfaceFormat.ETC2_RG => VkFormat.EacR11G11UnormBlock,
-            //--------------------PVRTC2--------------------
-            T3SurfaceFormat.PVRTC2 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.Pvrtc12BppSrgbBlockImg : VkFormat.Pvrtc12BppUnormBlockImg,
-            //--------------------PVRTC2a--------------------
-            T3SurfaceFormat.PVRTC2a => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.Pvrtc22BppSrgbBlockImg : VkFormat.Pvrtc22BppUnormBlockImg,
-            //--------------------PVRTC4--------------------
-            T3SurfaceFormat.PVRTC4 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.Pvrtc14BppSrgbBlockImg : VkFormat.Pvrtc14BppUnormBlockImg,
-            //--------------------PVRTC4a--------------------
-            T3SurfaceFormat.PVRTC4a => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.Pvrtc24BppSrgbBlockImg : VkFormat.Pvrtc24BppUnormBlockImg,
-            //--------------------UNKNOWN--------------------
-            T3SurfaceFormat.Unknown => VkFormat.Undefined,
+//    /// <summary>
+//    /// Returns the corresponding VkFormat from a Telltale surface format. 
+//    /// This is used for the conversion process from .d3dtx to .dds.
+//    /// </summary>
+//    /// <param name="format"></param>
+//    /// <param name="gamma"></param>
+//    /// <returns>The corresponding VkFormat.</returns>
+//    public static VkFormat GetVkFormatFromTelltaleSurfaceFormat(T3SurfaceFormat format, T3SurfaceGamma gamma = T3SurfaceGamma.Linear, T3PlatformType platformType = T3PlatformType.ePlatform_PC, T3TextureAlphaMode alphaMode = T3TextureAlphaMode.Unknown)
+//    {
+//        VkFormat vkFormat = format switch
+//        {
+//            // In order of T3SurfaceFormat enum
+//            //--------------------ARGB8--------------------
+//            T3SurfaceFormat.ARGB8 => gamma == T3SurfaceGamma.sRGB ? VkFormat.B8G8R8A8Srgb : VkFormat.B8G8R8A8Unorm,
+//            //--------------------ARGB16--------------------
+//            T3SurfaceFormat.ARGB16 => VkFormat.R16G16B16A16Unorm,
+//            //--------------------RGB565--------------------
+//            T3SurfaceFormat.RGB565 => VkFormat.B5G6R5UnormPack16,
+//            //--------------------ARGB1555--------------------
+//            T3SurfaceFormat.ARGB1555 => VkFormat.B5G5R5A1UnormPack16,
+//            //--------------------ARGB4--------------------
+//            T3SurfaceFormat.ARGB4 => VkFormat.B4G4R4A4UnormPack16,
+//            //--------------------ARGB2101010--------------------
+//            T3SurfaceFormat.ARGB2101010 => VkFormat.A2B10G10R10UnormPack32,
+//            //--------------------R16--------------------
+//            T3SurfaceFormat.R16 => VkFormat.R16Unorm,
+//            //--------------------RG16--------------------
+//            T3SurfaceFormat.RG16 => VkFormat.R16G16Unorm,
+//            //--------------------RGBA16--------------------
+//            T3SurfaceFormat.RGBA16 => VkFormat.R16G16B16A16Unorm,
+//            //--------------------RG8--------------------
+//            T3SurfaceFormat.RG8 => VkFormat.R8G8Unorm,
+//            //--------------------RGBA8--------------------
+//            T3SurfaceFormat.RGBA8 => gamma == T3SurfaceGamma.sRGB ? VkFormat.R8G8B8A8Srgb : VkFormat.R8G8B8A8Unorm,
+//            //--------------------R32--------------------
+//            T3SurfaceFormat.R32 => VkFormat.R32Sfloat,
+//            //--------------------RG32--------------------
+//            T3SurfaceFormat.RG32 => VkFormat.R32G32Sfloat,
+//            //--------------------RGBA32--------------------
+//            T3SurfaceFormat.RGBA32 => VkFormat.R32G32B32A32Sfloat, // It could be UINT
+//            //--------------------R8--------------------
+//            T3SurfaceFormat.R8 => VkFormat.R8Unorm,
+//            //--------------------RGBA8S--------------------
+//            T3SurfaceFormat.RGBA8S => VkFormat.R8G8B8A8Snorm,
+//            //--------------------L8--------------------
+//            T3SurfaceFormat.L8 => gamma == T3SurfaceGamma.sRGB ? VkFormat.R8Srgb : VkFormat.R8Unorm,
+//            //--------------------AL8--------------------
+//            T3SurfaceFormat.AL8 => gamma == T3SurfaceGamma.sRGB ? VkFormat.R8G8Srgb : VkFormat.R8G8Unorm,
+//            //--------------------R16--------------------
+//            T3SurfaceFormat.L16 => VkFormat.R16Unorm,
+//            //--------------------RG16S--------------------
+//            T3SurfaceFormat.RG16S => VkFormat.R16G16Snorm,
+//            //--------------------RGBA16S--------------------
+//            T3SurfaceFormat.RGBA16S => VkFormat.R16G16B16A16Snorm,
+//            //--------------------RGBA16UI--------------------
+//            T3SurfaceFormat.R16UI => VkFormat.R16G16B16A16Uint,
+//            //--------------------RG16F--------------------
+//            T3SurfaceFormat.R16F => VkFormat.R16Sfloat,
+//            //--------------------RGBA16F--------------------
+//            T3SurfaceFormat.RGBA16F => VkFormat.R16G16B16A16Sfloat,
+//            //--------------------R32F--------------------
+//            T3SurfaceFormat.R32F => VkFormat.R32Sfloat,
+//            //--------------------RG32F--------------------
+//            T3SurfaceFormat.RG32F => VkFormat.R32G32Sfloat,
+//            //--------------------RGBA32F--------------------
+//            T3SurfaceFormat.RGBA32F => VkFormat.R32G32B32A32Sfloat,
+//            //--------------------RGBA1010102F--------------------
+//            T3SurfaceFormat.RGBA1010102F => VkFormat.A2B10G10R10UnormPack32,
+//            //--------------------RGB111110F--------------------
+//            T3SurfaceFormat.RGB111110F => VkFormat.B10G11R11UfloatPack32,
+//            //--------------------RGB9E5F--------------------
+//            T3SurfaceFormat.RGB9E5F => VkFormat.E5B9G9R9UfloatPack32,
+//            //--------------------DepthPCF16--------------------
+//            T3SurfaceFormat.DepthPCF16 => VkFormat.D16Unorm,
+//            //--------------------DepthPCF24--------------------
+//            T3SurfaceFormat.DepthPCF24 => VkFormat.D24UnormS8Uint,
+//            //--------------------Depth16--------------------
+//            T3SurfaceFormat.Depth16 => VkFormat.D16Unorm,
+//            //--------------------Depth24--------------------
+//            T3SurfaceFormat.Depth24 => VkFormat.D24UnormS8Uint,
+//            //--------------------DepthStencil32--------------------
+//            T3SurfaceFormat.DepthStencil32 => VkFormat.D32SfloatS8Uint,
+//            //--------------------Depth32F--------------------
+//            T3SurfaceFormat.Depth32F => VkFormat.D32Sfloat,
+//            //--------------------Depth32F_Stencil8--------------------
+//            T3SurfaceFormat.Depth32F_Stencil8 => VkFormat.D32SfloatS8Uint,
+//            //--------------------Depth24F_Stencil8--------------------
+//            T3SurfaceFormat.Depth24F_Stencil8 => VkFormat.D24UnormS8Uint,
+//            // //--------------------DXT1 / BC1--------------------
+//            // T3SurfaceFormat.eSurface_BC1 => alphaMode > 0 ? (gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.BC1RgbaSrgbBlock : VkFormat.BC1RgbaUnormBlock) : (gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.BC1RgbSrgbBlock : VkFormat.BC1RgbUnormBlock),
+//            // //--------------------DXT2 and DXT3 / BC2--------------------
+//            // T3SurfaceFormat.eSurface_BC2 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.BC2SrgbBlock : VkFormat.BC2UnormBlock,
+//            // //--------------------DXT4 and DXT5 / BC3--------------------
+//            // T3SurfaceFormat.eSurface_BC3 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.BC3SrgbBlock : VkFormat.BC3UnormBlock,
+//            // //--------------------ATI1 / BC4--------------------
+//            // T3SurfaceFormat.eSurface_BC4 => VkFormat.BC4UnormBlock,
+//            // //--------------------ATI2 / BC5--------------------
+//            // T3SurfaceFormat.eSurface_BC5 => VkFormat.BC5UnormBlock,
+//            // //--------------------BC6H--------------------
+//            // T3SurfaceFormat.eSurface_BC6 => VkFormat.BC6HUfloatBlock,
+//            // //--------------------BC7--------------------
+//            // T3SurfaceFormat.eSurface_BC7 => gamma == T3SurfaceGamma.eSurfaceGamma_sRGB ? VkFormat.BC7SrgbBlock : VkFormat.BC7UnormBlock,
+//            // //--------------------ATSC_RGBA_4x4--------------------
+//            // T3SurfaceFormat.eSurface_ATSC_RGBA_4x4 => VkFormat.Astc4X4UnormBlock,
+//            //--------------------ETC2_RGB1A--------------------
+//            T3SurfaceFormat.ETC2_RGB1A => gamma == T3SurfaceGamma.sRGB ? VkFormat.Etc2R8G8B8A1SrgbBlock : VkFormat.Etc2R8G8B8A1UnormBlock,
+//            //--------------------ETC2_RGBA--------------------
+//            T3SurfaceFormat.ETC2_RGBA => gamma == T3SurfaceGamma.sRGB ? VkFormat.Etc2R8G8B8A8SrgbBlock : VkFormat.Etc2R8G8B8A8UnormBlock,
+//            //--------------------ETC2_RGB--------------------
+//            T3SurfaceFormat.ETC2_RGB => gamma == T3SurfaceGamma.sRGB ? VkFormat.Etc2R8G8B8SrgbBlock : VkFormat.Etc2R8G8B8UnormBlock,
+//            //--------------------ETC2_R--------------------
+//            T3SurfaceFormat.ETC2_R => VkFormat.EacR11UnormBlock,
+//            //--------------------ETC2_RG--------------------
+//            T3SurfaceFormat.ETC2_RG => VkFormat.EacR11G11UnormBlock,
+//            //--------------------PVRTC2--------------------
+//            T3SurfaceFormat.PVRTC2 => gamma == T3SurfaceGamma.sRGB ? VkFormat.Pvrtc12BppSrgbBlockImg : VkFormat.Pvrtc12BppUnormBlockImg,
+//            //--------------------PVRTC2a--------------------
+//            T3SurfaceFormat.PVRTC2a => gamma == T3SurfaceGamma.sRGB ? VkFormat.Pvrtc22BppSrgbBlockImg : VkFormat.Pvrtc22BppUnormBlockImg,
+//            //--------------------PVRTC4--------------------
+//            T3SurfaceFormat.PVRTC4 => gamma == T3SurfaceGamma.sRGB ? VkFormat.Pvrtc14BppSrgbBlockImg : VkFormat.Pvrtc14BppUnormBlockImg,
+//            //--------------------PVRTC4a--------------------
+//            T3SurfaceFormat.PVRTC4a => gamma == T3SurfaceGamma.sRGB ? VkFormat.Pvrtc24BppSrgbBlockImg : VkFormat.Pvrtc24BppUnormBlockImg,
+//            //--------------------UNKNOWN--------------------
+//            T3SurfaceFormat.Unknown => VkFormat.Undefined,
 
-            _ => VkFormat.R8G8B8A8Unorm, // Choose R8G8B8A8 if the format is not specified. (Raw data)
-        };
+//            _ => VkFormat.R8G8B8A8Unorm, // Choose R8G8B8A8 if the format is not specified. (Raw data)
+//        };
 
-        if (platformType == T3PlatformType.ePlatform_Android)
-        {
-            vkFormat = SwitchChannels(vkFormat);
-        }
+//        if (platformType == T3PlatformType.ePlatform_Android)
+//        {
+//            vkFormat = SwitchChannels(vkFormat);
+//        }
 
-        return vkFormat;
-    }
+//        return vkFormat;
+//    }
 
-    private static bool IsSRGB(VkFormat format) => format switch
-    {
-        VkFormat.R8Srgb => true,
-        VkFormat.R8G8Srgb => true,
-        VkFormat.R8G8B8Srgb => true,
-        VkFormat.R8G8B8A8Srgb => true,
-        VkFormat.B8G8R8A8Srgb => true,
-        // VkFormat.BC1RgbaSrgbBlock => true,
-        // VkFormat.BC2SrgbBlock => true,
-        // VkFormat.BC3SrgbBlock => true,
-        // VkFormat.BC7SrgbBlock => true,
-        VkFormat.Etc2R8G8B8SrgbBlock => true,
-        VkFormat.Etc2R8G8B8A1SrgbBlock => true,
-        VkFormat.Etc2R8G8B8A8SrgbBlock => true,
-        VkFormat.Astc4X4SrgbBlock => true,
-        VkFormat.Astc5X5SrgbBlock => true,
-        VkFormat.Pvrtc12BppSrgbBlockImg => true,
-        VkFormat.Pvrtc14BppSrgbBlockImg => true,
-        VkFormat.Pvrtc22BppSrgbBlockImg => true,
-        VkFormat.Pvrtc24BppSrgbBlockImg => true,
-        _ => false
-    };
+//    private static bool IsSRGB(VkFormat format) => format switch
+//    {
+//        VkFormat.R8Srgb => true,
+//        VkFormat.R8G8Srgb => true,
+//        VkFormat.R8G8B8Srgb => true,
+//        VkFormat.R8G8B8A8Srgb => true,
+//        VkFormat.B8G8R8A8Srgb => true,
+//        // VkFormat.BC1RgbaSrgbBlock => true,
+//        // VkFormat.BC2SrgbBlock => true,
+//        // VkFormat.BC3SrgbBlock => true,
+//        // VkFormat.BC7SrgbBlock => true,
+//        VkFormat.Etc2R8G8B8SrgbBlock => true,
+//        VkFormat.Etc2R8G8B8A1SrgbBlock => true,
+//        VkFormat.Etc2R8G8B8A8SrgbBlock => true,
+//        VkFormat.Astc4X4SrgbBlock => true,
+//        VkFormat.Astc5X5SrgbBlock => true,
+//        VkFormat.Pvrtc12BppSrgbBlockImg => true,
+//        VkFormat.Pvrtc14BppSrgbBlockImg => true,
+//        VkFormat.Pvrtc22BppSrgbBlockImg => true,
+//        VkFormat.Pvrtc24BppSrgbBlockImg => true,
+//        _ => false
+//    };
 
-    private static VkFormat SwitchChannels(VkFormat format)
-    {
-        return format switch
-        {
-            VkFormat.R8G8B8A8Unorm => VkFormat.B8G8R8A8Unorm,
-            VkFormat.B8G8R8A8Unorm => VkFormat.R8G8B8A8Unorm,
-            VkFormat.R8G8B8A8Srgb => VkFormat.B8G8R8A8Srgb,
-            VkFormat.B8G8R8A8Srgb => VkFormat.R8G8B8A8Srgb,
-            VkFormat.R8G8B8Unorm => VkFormat.B8G8R8Unorm,
-            VkFormat.B8G8R8Unorm => VkFormat.R8G8B8Unorm,
-            VkFormat.R8G8B8Srgb => VkFormat.B8G8R8Srgb,
-            VkFormat.B8G8R8Srgb => VkFormat.R8G8B8Srgb,
-            VkFormat.B4G4R4A4UnormPack16 => VkFormat.R4G4B4A4UnormPack16,
-            VkFormat.R4G4B4A4UnormPack16 => VkFormat.B4G4R4A4UnormPack16,
-            _ => format
-        };
-    }
-}
+//    private static VkFormat SwitchChannels(VkFormat format)
+//    {
+//        return format switch
+//        {
+//            VkFormat.R8G8B8A8Unorm => VkFormat.B8G8R8A8Unorm,
+//            VkFormat.B8G8R8A8Unorm => VkFormat.R8G8B8A8Unorm,
+//            VkFormat.R8G8B8A8Srgb => VkFormat.B8G8R8A8Srgb,
+//            VkFormat.B8G8R8A8Srgb => VkFormat.R8G8B8A8Srgb,
+//            VkFormat.R8G8B8Unorm => VkFormat.B8G8R8Unorm,
+//            VkFormat.B8G8R8Unorm => VkFormat.R8G8B8Unorm,
+//            VkFormat.R8G8B8Srgb => VkFormat.B8G8R8Srgb,
+//            VkFormat.B8G8R8Srgb => VkFormat.R8G8B8Srgb,
+//            VkFormat.B4G4R4A4UnormPack16 => VkFormat.R4G4B4A4UnormPack16,
+//            VkFormat.R4G4B4A4UnormPack16 => VkFormat.B4G4R4A4UnormPack16,
+//            _ => format
+//        };
+//    }
+//}
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Graphics/PVR/PVRDecoder.cs b/TelltaleTextureTool/TelltaleTextureTool/Graphics/PVR/PVRDecoder.cs
index 0e15701..f1359e8 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Graphics/PVR/PVRDecoder.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Graphics/PVR/PVRDecoder.cs
@@ -32,7 +32,7 @@ public static byte[] DecodeTexture(D3DTXMetadata d3dtxMetadata, byte[] data)
             {
                 using PVRTexture texture = new PVRTexture(textureHeader, ptr);
 
-                var colorSpace = d3dtxMetadata.SurfaceGamma == TelltaleEnums.T3SurfaceGamma.eSurfaceGamma_sRGB ? PVRTexLibColourSpace.sRGB : PVRTexLibColourSpace.Linear;
+                var colorSpace = d3dtxMetadata.SurfaceGamma == TelltaleEnums.T3SurfaceGamma.sRGB ? PVRTexLibColourSpace.sRGB : PVRTexLibColourSpace.Linear;
                 texture.Transcode(RGBA8888, PVRTexLibVariableType.UnsignedByteNorm, colorSpace);
 
                 void* ddsPtr = null;
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Main/D3DTXVersionEnums.cs b/TelltaleTextureTool/TelltaleTextureTool/Main/D3DTXVersionEnums.cs
index b84e8b6..5010736 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Main/D3DTXVersionEnums.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Main/D3DTXVersionEnums.cs
@@ -1,48 +1,48 @@
-namespace TelltaleTextureTool.Main;
+// namespace TelltaleTextureTool.Main;
 
-// L stands for Legacy, V stands for Version, C stands for Console 
-public enum D3DTXVersion
-{
-    V9 = 9,
-    V8 = 8,
-    V7 = 7,
-    V6 = 6,
-    V5 = 5,
-    V4 = 4,
-    V3 = 3,
-    V2 = 2,
-    V1 = 1,
-    DEFAULT = 0,
-    LV1 = -1,
-    LV2 = -2,
-    LV3 = -3,
-    LV4 = -4,
-    LV5 = -5,
-    LV6 = -6,
-    LV7 = -7,
-    LV8 = -8,
-    LV9 = -9,
-    LV10 = -10,
-    LV11 = -11,
-    LV12 = -12,
-    LV13 = -13,
-    LV14 = -14,
+// // L stands for Legacy, V stands for Version, C stands for Console 
+// public enum D3DTXVersion
+// {
+//     V9 = 9,
+//     V8 = 8,
+//     V7 = 7,
+//     V6 = 6,
+//     V5 = 5,
+//     V4 = 4,
+//     V3 = 3,
+//     V2 = 2,
+//     V1 = 1,
+//     DEFAULT = 0,
+//     LV1 = -1,
+//     LV2 = -2,
+//     LV3 = -3,
+//     LV4 = -4,
+//     LV5 = -5,
+//     LV6 = -6,
+//     LV7 = -7,
+//     LV8 = -8,
+//     LV9 = -9,
+//     LV10 = -10,
+//     LV11 = -11,
+//     LV12 = -12,
+//     LV13 = -13,
+//     LV14 = -14,
 
-    CLV1 = -20,
-    CLV2 = -21,
-    CLV3 = -22,
-    CLV4 = -23,
-    CLV5 = -24,
-    CLV6 = -25,
-    CLV7 = -26,
-    CLV8 = -27,
-    CLV9 = -28,
-    CLV10 = -29,
-    CLV11 = -30,
-    CLV12 = -31,
-    CLV13 = -32,
-    CLV14 = -33,
+//     CLV1 = -20,
+//     CLV2 = -21,
+//     CLV3 = -22,
+//     CLV4 = -23,
+//     CLV5 = -24,
+//     CLV6 = -25,
+//     CLV7 = -26,
+//     CLV8 = -27,
+//     CLV9 = -28,
+//     CLV10 = -29,
+//     CLV11 = -30,
+//     CLV12 = -31,
+//     CLV13 = -32,
+//     CLV14 = -33,
 
-    // Such a bad practice to use negative numbers for versioning, but I had to use it as a level.
-    Unknown = -100
-}
+//     // Such a bad practice to use negative numbers for versioning, but I had to use it as a level.
+//     Unknown = -100
+// }
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Main/D3DTX_Master.cs b/TelltaleTextureTool/TelltaleTextureTool/Main/D3DTX_Master.cs
index 3d91af0..8dd204e 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Main/D3DTX_Master.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Main/D3DTX_Master.cs
@@ -36,9 +36,8 @@ public class D3DTX_Master
 
         public struct D3DTX_JSON
         {
-            public TelltaleToolGame GameID;
+            public string GameID;
             public T3PlatformType PlatformType;
-
             public int ConversionType;
         }
 
@@ -242,8 +241,8 @@ public void WriteFinalD3DTX(string destinationPath)
         {
             using BinaryWriter writer = new(File.Create(destinationPath));
 
-            metaHeaderObject.WriteToBinary(writer);
-            d3dtxObject.WriteToBinary(writer);
+            metaHeaderObject.WriteToBinary(writer,Game, Platform, true);
+            d3dtxObject.WriteToBinary(writer, Game, Platform, true);
         }
 
         public string GetD3DTXDebugInfo()
@@ -284,7 +283,7 @@ public void ReadD3DTXJSON(string filePath)
             int metaObjectIndex = 1;
             int d3dtxObjectIndex = 2;
 
-            Game = firstObject.ToObject<D3DTX_JSON>().GameID;
+            Game = TelltaleToolGameExtensions.GetTelltaleToolGameFromString(firstObject.ToObject<D3DTX_JSON>().GameID);
 
             // I am creating the metaObject again instead of using the firstObject variable and i am aware of the performance hit.
             JObject? metaObject = jarray[metaObjectIndex] as JObject;
@@ -297,6 +296,11 @@ public void ReadD3DTXJSON(string filePath)
             CreateD3DTX(Game, jsond3dtxObject);
 
             d3dtxMetadata = d3dtxObject.GetD3DTXMetadata();
+
+            Console.WriteLine("METADATA JSON");
+            Console.WriteLine(d3dtxMetadata.MipLevels);
+            Console.WriteLine(d3dtxMetadata.RegionHeaders.Length);
+            Console.WriteLine(d3dtxMetadata.Format);
         }
 
         public void ConvertJSONObjectToD3dtx(JObject jObject)
@@ -360,7 +364,7 @@ public void ConvertJSONObjectToMeta(JObject metaObject)
             {
                 "6VSM" or "MSV6" => MetaVersion.MSV6,
                 "5VSM" or "4VSM" or "MSV5" or "MSV4" => MetaVersion.MSV5,
-                "ERTM" or "MTRE"=> MetaVersion.MTRE,
+                "ERTM" or "MTRE" => MetaVersion.MTRE,
                 "NIBM" or "MBIN" => MetaVersion.MBIN,
                 _ => throw new Exception("This meta version is not supported!"),
             };
@@ -384,7 +388,7 @@ public void WriteD3DTXJSON(string fileName, string destinationDirectory)
 
             D3DTX_JSON conversionTypeObject = new()
             {
-                GameID = Game,
+                GameID = TelltaleToolGameExtensions.GetGameName(Game),
                 PlatformType = Platform
             };
 
@@ -405,7 +409,7 @@ public void ModifyD3DTX(D3DTXMetadata metadata, ImageSection[] sections)
                 //sections = sections.Skip(1).ToArray();
                 //}
 
-                d3dtxObject.ModifyD3DTX(metadata, sections.ToArray()); //ISSUE HERE WITH DXT5 AND MIP MAPS WITH UPSCALED TEXTURES
+                d3dtxObject.ModifyD3DTX(metadata, sections.ToArray());
             }
             else
             {
@@ -414,7 +418,7 @@ public void ModifyD3DTX(D3DTXMetadata metadata, ImageSection[] sections)
                 IEnumerable<ImageSection> newSections = sections;
                 newSections = sections.OrderBy(section => section.Pixels.Length);
 
-                d3dtxObject.ModifyD3DTX(metadata, newSections.ToArray()); //ISSUE HERE WITH DXT5 AND MIP MAPS WITH UPSCALED TEXTURES
+                d3dtxObject.ModifyD3DTX(metadata, newSections.ToArray());
                 metaHeaderObject.SetMetaSectionChunkSizes(d3dtxObject.GetHeaderByteSize(), 0, ByteFunctions.GetByteArrayListElementsCount(d3dtxObject.GetPixelData()));
             }
         }
@@ -441,7 +445,7 @@ public static string ReadD3DTXFileMetaVersionOnly(string sourceFile)
         /// </summary>
         /// <param name="sourceFile"></param>
         /// <returns></returns>
-        public int ReadD3DTXFileD3DTXVersionOnly(string sourceFile)
+        public static int ReadD3DTXFileD3DTXVersionOnly(string sourceFile)
         {
             string metaFourCC = ReadD3DTXFileMetaVersionOnly(sourceFile);
 
@@ -604,9 +608,9 @@ public byte[] GetPixelDataByMipmapIndex(int mipmapIndex, T3SurfaceFormat surface
             return newPixelData.SelectMany(b => b).ToArray();
         }
 
-        public byte[] DecodePixelDataByPlatform(byte[] pixelData, T3SurfaceFormat surfaceFormat, int width, int height, T3PlatformType platformType)
+        public static byte[] DecodePixelDataByPlatform(byte[] pixelData, T3SurfaceFormat surfaceFormat, int width, int height, T3PlatformType platformType)
         {
-            DrSwizzler.DDS.DXEnums.DXGIFormat format = (DrSwizzler.DDS.DXEnums.DXGIFormat)DDS_HELPER.GetDXGIFormat(surfaceFormat);
+            DrSwizzler.DDS.DXEnums.DXGIFormat format = (DrSwizzler.DDS.DXEnums.DXGIFormat)DDSHelper.GetDXGIFormat(surfaceFormat);
 
             return platformType switch
             {
@@ -704,21 +708,8 @@ public static bool IsPlatformIncompatibleWithDDS(T3PlatformType type)
             };
         }
 
-        public string GetDDSHeaderInfo()
+        public bool IsLegacyConsole()
         {
-            string info = "";
-            foreach (var region in GetPixelData())
-            {
-                // if (ByteFunctions.Ge)
-                // {
-                //     info += DDS_DirectXTexNet.GetDDSDebugInfo(DirectXTex.GetMetadata(region));
-                // }
-            }
-
-            return info;
-        }
-
-        public bool IsLegacyConsole(){
             return Platform != T3PlatformType.ePlatform_None;
         }
     }
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Main/DDS_Master.cs b/TelltaleTextureTool/TelltaleTextureTool/Main/DDS_Master.cs
index a620aee..6b13d1a 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Main/DDS_Master.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Main/DDS_Master.cs
@@ -74,7 +74,7 @@ private void InitializeDDSHeader(D3DTX_Master d3dtx)
                 ArraySize = d3dtxMetadata.IsCubemap() ? d3dtxMetadata.ArraySize * 6 : d3dtxMetadata.ArraySize,
                 Depth = d3dtxMetadata.Depth,
                 MipLevels = d3dtxMetadata.MipLevels,
-                Format = d3dtx.IsLegacyD3DTX() ? (int)DDS_HELPER.GetDXGIFormat(d3dtxMetadata.D3DFormat) : (int)DDS_HELPER.GetDXGIFormat(surfaceFormat, surfaceGamma, platformType),
+                Format = d3dtx.IsLegacyD3DTX() ? (int)DDSHelper.GetDXGIFormat(d3dtxMetadata.D3DFormat) : (int)DDSHelper.GetDXGIFormat(surfaceFormat, surfaceGamma, platformType),
                 Dimension = d3dtxMetadata.IsVolumemap() ? TexDimension.Texture3D : TexDimension.Texture2D,
             };
 
@@ -86,7 +86,7 @@ private void InitializeDDSHeader(D3DTX_Master d3dtx)
             image.Initialize(ref metadata, CPFlags.None);
 
             //DDSFlags flags = D3DTX_Master.IsFormatIncompatibleWithDDS(surfaceFormat) ? DDSFlags.ForceDx9Legacy : DDSFlags.ForceDx9Legacy;
-            header = DDS_DirectXTexNet.GetDDSHeaderBytes(image);
+            header = TextureManager.GetDDSHeaderBytes(image);
 
             Console.WriteLine("Header length: " + header.Length);
 
@@ -107,27 +107,27 @@ private void InitializeUnsupportedDDSHeader(D3DTX_Master d3dtx)
                 ArraySize = d3dtxMetadata.ArraySize,
                 Depth = d3dtxMetadata.Depth,
                 MipLevels = d3dtxMetadata.MipLevels,
-                Format = (int)DDS_HELPER.GetEquivalentDXGIFormat(surfaceFormat, surfaceGamma),
+                Format = (int)DDSHelper.GetEquivalentDXGIFormat(surfaceFormat, surfaceGamma),
                 Dimension = d3dtxMetadata.IsVolumemap() ? TexDimension.Texture3D : TexDimension.Texture2D,
             };
 
             image.Initialize(ref metadata, CPFlags.None);
 
-            header = DDS_DirectXTexNet.GetDDSHeaderBytes(image, DDSFlags.ForceDx9Legacy);
+            header = TextureManager.GetDDSHeaderBytes(image, DDSFlags.ForceDx9Legacy);
 
             Console.WriteLine("Header length: " + header.Length);
 
             if (d3dtx.d3dtxMetadata.Format == T3SurfaceFormat.ATC_RGB)
             {
-                DDS_DirectXTexNet.SetDDSHeaderFourCC(ref header, 'A', 'T', 'C', ' ');
+                TextureManager.SetDDSHeaderFourCC(ref header, 'A', 'T', 'C', ' ');
             }
             else if (d3dtx.d3dtxMetadata.Format == T3SurfaceFormat.ATC_RGBA)
             {
-                DDS_DirectXTexNet.SetDDSHeaderFourCC(ref header, 'A', 'T', 'C', 'A');
+                TextureManager.SetDDSHeaderFourCC(ref header, 'A', 'T', 'C', 'A');
             }
             else if (d3dtx.d3dtxMetadata.Format == T3SurfaceFormat.ATC_RGB1A)
             {
-                DDS_DirectXTexNet.SetDDSHeaderFourCC(ref header, 'A', 'T', 'C', 'I');
+                TextureManager.SetDDSHeaderFourCC(ref header, 'A', 'T', 'C', 'I');
             }
 
             image.Release();
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Main/KTX2_Master.cs b/TelltaleTextureTool/TelltaleTextureTool/Main/KTX2_Master.cs
index e048fda..23fbe00 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Main/KTX2_Master.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Main/KTX2_Master.cs
@@ -1,187 +1,187 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using TelltaleTextureTool.DirectX;
-using System.Linq;
-using static Ktx.Ktx2;
-using TelltaleTextureTool.TelltaleEnums;
-using Ktx;
-using TelltaleTextureTool.Telltale.FileTypes.D3DTX;
-using TelltaleTextureTool.Utilities;
-using Texture = Ktx.Ktx2.Texture;
-
-namespace TelltaleTextureTool.Main
-{
-    /// <summary>
-    /// Main class for managing D3DTX files and converting them to KTX2.
-    /// </summary>
-    public unsafe class KTX2_Master
-    {
-        //TextureCreateInfo ktx2TextureInfo;
-        Texture* texture;
-
-        public byte[] header = [];
-        public byte[] pixelData = [];
-
-        /// <summary>
-        /// Create a DDS file from a D3DTX.
-        /// </summary>
-        /// <param name="d3dtx">The D3DTX data that will be used.</param>
-        public KTX2_Master(D3DTX_Master d3dtx)
-        {
-            if (d3dtx.HasDDSHeader())
-            {
-                return;
-            }
-
-            InitializeKTX2Header(d3dtx);
-            InitializeKTX2PixelData(d3dtx);
-        }
-
-        private void InitializeKTX2Header(D3DTX_Master d3dtx)
-        {
-            D3DTXMetadata d3dtxMetadata = d3dtx.GetMetadata();
-
-            Console.WriteLine("D3dtx width: " + d3dtxMetadata.Width);
-            Console.WriteLine("D3dtx height: " + d3dtxMetadata.Height);
-            Console.WriteLine("D3dtx mip map count: " + d3dtxMetadata.MipLevels);
-            Console.WriteLine("D3dtx d3d format: " + d3dtxMetadata.D3DFormat);
-
-            T3SurfaceFormat surfaceFormat = d3dtxMetadata.Format;
-            T3SurfaceGamma surfaceGamma = d3dtxMetadata.SurfaceGamma;
-            T3PlatformType platformType = d3dtxMetadata.Platform;
-            T3TextureAlphaMode alphaMode = d3dtxMetadata.AlphaMode;
-
-            // ktx2TextureInfo = new()
-            // {
-            //     BaseWidth = d3dtxMetadata.Width,
-            //     BaseHeight = d3dtxMetadata.Height,
-            //     BaseDepth = d3dtxMetadata.Depth,
-            //     NumLevels = d3dtxMetadata.MipLevels,
-            //     NumLayers = d3dtxMetadata.ArraySize,
-            //     NumFaces = (uint)(d3dtxMetadata.IsCubemap() ? 6 : 1),
-            //     NumDimensions = (uint)(d3dtxMetadata.IsVolumemap() ? 3 : 2),
-            //     IsArray = (byte)(d3dtxMetadata.IsArrayTexture() ? 1 : 0),
-            //     GenerateMipmaps = (byte)(d3dtxMetadata.MipLevels > 1 ? 1 : 0),
-            //     VkFormat = KTX2_HELPER.GetVkFormatFromTelltaleSurfaceFormat(surfaceFormat, surfaceGamma, platformType, alphaMode)
-            // };
-
-            // if (D3DTX_Master.IsFormatIncompatibleWithDDS(surfaceFormat))
-            // {
-            //     ktx2TextureInfo.NumLevels = 1;
-            //     ktx2TextureInfo.GenerateMipmaps = 0;
-            // }
-            // ktx2TextureInfo.GenerateMipmaps = 0;
-            // Ktx2.ErrorCode err = Ktx2.Create(ktx2TextureInfo, Ktx2.TextureCreateStorage.NoStorage, out texture);
-
-            // List<byte[]> textureData = d3dtx.GetPixelData();
-
-            // byte[] pixelData = textureData.SelectMany(x => x).ToArray();
-
-            // fixed (byte* pData = pixelData)
-            // {
-            //     texture->PData = pData;
-            // }
-
-            // if (err != Ktx2.ErrorCode.Success)
-            // {
-            //     throw new Exception("Failed to create KTX2 texture.");
-            // }
-        }
-
-        private void InitializeKTX2PixelData(D3DTX_Master d3dtx)
-        {
-            // NOTES: Telltale mip levels are reversed in Poker Night 2 and above. The first level are the smallest mip levels and the last level is the largest mip level.
-            // The faces are NOT reverse.
-            // This is likely corelating with the way that KTX and KTX2 files are written.
-            // Some normal maps specifically with type 4 (eTxNormalMap) channels are all reversed (ABGR instead of RGBA) (Only applies for newer games)
-            // Some surface formats are dependant on platforms. For example, iOS textures have their R and B channels swapped.
-            // Some surface formats are not supported by DDS. In this case, the texture will be written as a raw texture.
-
-            if (d3dtx.IsLegacyD3DTX())
-            {
-                throw new Exception("KTX2 does not support legacy D3DTX files.");
-
-            }
-
-            D3DTXMetadata metadata = d3dtx.GetMetadata();
-
-            T3SurfaceFormat surfaceFormat = metadata.Format;
-
-            //             List<byte[]> textureData = d3dtx.GetPixelData();
-
-            //             byte[] pixelData = textureData.SelectMany(x => x).ToArray();
-
-            // texture.p
-
-            // textureData.Reverse();
-
-            // for (int i = 0; i < ktx2TextureInfo.NumLevels; i++)
-            // {
-            //     for (int j = 0; j < ktx2TextureInfo.NumLayers; j++)
-            //     {
-            //         for (int k = 0; k < ktx2TextureInfo.NumFaces; k++)
-            //         {
-            //             Ktx2.ErrorCode err = Ktx2.SetImageFromMemory(texture, (uint)i, (uint)j, (uint)k, textureData[i + j + k][0], (nuint)textureData[i + j + k].Length);
-
-            //             if (err != Ktx2.ErrorCode.Success)
-            //             {
-            //                 throw new Exception("Failed to set image from memory.");
-            //             }
-            //         }
-            //     }
-            // }
-        }
-
-        /// <summary>
-        /// Writes a D3DTX into a KTX2 file on the disk.
-        /// </summary>
-        /// <param name="d3dtx"></param>
-        /// <param name="destinationDirectory"></param>
-        public void WriteD3DTXAsKTX2(D3DTX_Master d3dtx, string destinationDirectory)
-        {
-            var watch = System.Diagnostics.Stopwatch.StartNew();
-            string d3dtxFilePath = d3dtx.FilePath;
-            string fileName = Path.GetFileNameWithoutExtension(d3dtxFilePath);
-
-            string newKTX2Path = destinationDirectory + Path.DirectorySeparatorChar + fileName +
-                                                       Main_Shared.ktx2Extension;
-
-            Ktx2.WriteToNamedFile(texture, newKTX2Path);
-            watch.Stop();
-            var elapsedMs = watch.ElapsedMilliseconds;
-            Console.WriteLine("Time to get data: {0}", elapsedMs);
-        }
-
-        /// <summary>
-        /// Get the correct DDS data from a Telltale texture.
-        /// </summary>
-        /// <param name="d3dtx"></param>
-        /// <returns></returns>
-        public byte[] GetData(D3DTX_Master d3dtx)
-        {
-            Console.WriteLine("Getting data for: " + d3dtx.FilePath);
-
-            // If the D3DTX exists, return the pixel data.
-            if (d3dtx.d3dtxObject == null)
-            {
-                throw new InvalidDataException("There is no pixel data to be written.");
-            }
-
-            // If the D3DTX has a DDS header, return the whole pixel data.
-            if (d3dtx.HasDDSHeader())
-            {
-                return d3dtx.GetPixelData()[d3dtx.GetPixelData().Count - 1];
-            }
-
-            // Return the created DDS file.
-            return ByteFunctions.Combine(header, pixelData);
-        }
-
-        ~KTX2_Master()
-        {
-            Destroy(texture);
-        }
-    }
-}
+//using System;
+//using System.Collections.Generic;
+//using System.IO;
+//using TelltaleTextureTool.DirectX;
+//using System.Linq;
+//using static Ktx.Ktx2;
+//using TelltaleTextureTool.TelltaleEnums;
+//using Ktx;
+//using TelltaleTextureTool.Telltale.FileTypes.D3DTX;
+//using TelltaleTextureTool.Utilities;
+//using Texture = Ktx.Ktx2.Texture;
+
+//namespace TelltaleTextureTool.Main
+//{
+//    /// <summary>
+//    /// Main class for managing D3DTX files and converting them to KTX2.
+//    /// </summary>
+//    public unsafe class KTX2_Master
+//    {
+//        //TextureCreateInfo ktx2TextureInfo;
+//        Texture* texture;
+
+//        public byte[] header = [];
+//        public byte[] pixelData = [];
+
+//        /// <summary>
+//        /// Create a DDS file from a D3DTX.
+//        /// </summary>
+//        /// <param name="d3dtx">The D3DTX data that will be used.</param>
+//        public KTX2_Master(D3DTX_Master d3dtx)
+//        {
+//            if (d3dtx.HasDDSHeader())
+//            {
+//                return;
+//            }
+
+//            InitializeKTX2Header(d3dtx);
+//            InitializeKTX2PixelData(d3dtx);
+//        }
+
+//        private void InitializeKTX2Header(D3DTX_Master d3dtx)
+//        {
+//            D3DTXMetadata d3dtxMetadata = d3dtx.GetMetadata();
+
+//            Console.WriteLine("D3dtx width: " + d3dtxMetadata.Width);
+//            Console.WriteLine("D3dtx height: " + d3dtxMetadata.Height);
+//            Console.WriteLine("D3dtx mip map count: " + d3dtxMetadata.MipLevels);
+//            Console.WriteLine("D3dtx d3d format: " + d3dtxMetadata.D3DFormat);
+
+//            T3SurfaceFormat surfaceFormat = d3dtxMetadata.Format;
+//            T3SurfaceGamma surfaceGamma = d3dtxMetadata.SurfaceGamma;
+//            T3PlatformType platformType = d3dtxMetadata.Platform;
+//            T3TextureAlphaMode alphaMode = d3dtxMetadata.AlphaMode;
+
+//            // ktx2TextureInfo = new()
+//            // {
+//            //     BaseWidth = d3dtxMetadata.Width,
+//            //     BaseHeight = d3dtxMetadata.Height,
+//            //     BaseDepth = d3dtxMetadata.Depth,
+//            //     NumLevels = d3dtxMetadata.MipLevels,
+//            //     NumLayers = d3dtxMetadata.ArraySize,
+//            //     NumFaces = (uint)(d3dtxMetadata.IsCubemap() ? 6 : 1),
+//            //     NumDimensions = (uint)(d3dtxMetadata.IsVolumemap() ? 3 : 2),
+//            //     IsArray = (byte)(d3dtxMetadata.IsArrayTexture() ? 1 : 0),
+//            //     GenerateMipmaps = (byte)(d3dtxMetadata.MipLevels > 1 ? 1 : 0),
+//            //     VkFormat = KTX2_HELPER.GetVkFormatFromTelltaleSurfaceFormat(surfaceFormat, surfaceGamma, platformType, alphaMode)
+//            // };
+
+//            // if (D3DTX_Master.IsFormatIncompatibleWithDDS(surfaceFormat))
+//            // {
+//            //     ktx2TextureInfo.NumLevels = 1;
+//            //     ktx2TextureInfo.GenerateMipmaps = 0;
+//            // }
+//            // ktx2TextureInfo.GenerateMipmaps = 0;
+//            // Ktx2.ErrorCode err = Ktx2.Create(ktx2TextureInfo, Ktx2.TextureCreateStorage.NoStorage, out texture);
+
+//            // List<byte[]> textureData = d3dtx.GetPixelData();
+
+//            // byte[] pixelData = textureData.SelectMany(x => x).ToArray();
+
+//            // fixed (byte* pData = pixelData)
+//            // {
+//            //     texture->PData = pData;
+//            // }
+
+//            // if (err != Ktx2.ErrorCode.Success)
+//            // {
+//            //     throw new Exception("Failed to create KTX2 texture.");
+//            // }
+//        }
+
+//        private void InitializeKTX2PixelData(D3DTX_Master d3dtx)
+//        {
+//            // NOTES: Telltale mip levels are reversed in Poker Night 2 and above. The first level are the smallest mip levels and the last level is the largest mip level.
+//            // The faces are NOT reverse.
+//            // This is likely corelating with the way that KTX and KTX2 files are written.
+//            // Some normal maps specifically with type 4 (eTxNormalMap) channels are all reversed (ABGR instead of RGBA) (Only applies for newer games)
+//            // Some surface formats are dependant on platforms. For example, iOS textures have their R and B channels swapped.
+//            // Some surface formats are not supported by DDS. In this case, the texture will be written as a raw texture.
+
+//            if (d3dtx.IsLegacyD3DTX())
+//            {
+//                throw new Exception("KTX2 does not support legacy D3DTX files.");
+
+//            }
+
+//            D3DTXMetadata metadata = d3dtx.GetMetadata();
+
+//            T3SurfaceFormat surfaceFormat = metadata.Format;
+
+//            //             List<byte[]> textureData = d3dtx.GetPixelData();
+
+//            //             byte[] pixelData = textureData.SelectMany(x => x).ToArray();
+
+//            // texture.p
+
+//            // textureData.Reverse();
+
+//            // for (int i = 0; i < ktx2TextureInfo.NumLevels; i++)
+//            // {
+//            //     for (int j = 0; j < ktx2TextureInfo.NumLayers; j++)
+//            //     {
+//            //         for (int k = 0; k < ktx2TextureInfo.NumFaces; k++)
+//            //         {
+//            //             Ktx2.ErrorCode err = Ktx2.SetImageFromMemory(texture, (uint)i, (uint)j, (uint)k, textureData[i + j + k][0], (nuint)textureData[i + j + k].Length);
+
+//            //             if (err != Ktx2.ErrorCode.Success)
+//            //             {
+//            //                 throw new Exception("Failed to set image from memory.");
+//            //             }
+//            //         }
+//            //     }
+//            // }
+//        }
+
+//        /// <summary>
+//        /// Writes a D3DTX into a KTX2 file on the disk.
+//        /// </summary>
+//        /// <param name="d3dtx"></param>
+//        /// <param name="destinationDirectory"></param>
+//        public void WriteD3DTXAsKTX2(D3DTX_Master d3dtx, string destinationDirectory)
+//        {
+//            var watch = System.Diagnostics.Stopwatch.StartNew();
+//            string d3dtxFilePath = d3dtx.FilePath;
+//            string fileName = Path.GetFileNameWithoutExtension(d3dtxFilePath);
+
+//            string newKTX2Path = destinationDirectory + Path.DirectorySeparatorChar + fileName +
+//                                                       Main_Shared.ktx2Extension;
+
+//            Ktx2.WriteToNamedFile(texture, newKTX2Path);
+//            watch.Stop();
+//            var elapsedMs = watch.ElapsedMilliseconds;
+//            Console.WriteLine("Time to get data: {0}", elapsedMs);
+//        }
+
+//        /// <summary>
+//        /// Get the correct DDS data from a Telltale texture.
+//        /// </summary>
+//        /// <param name="d3dtx"></param>
+//        /// <returns></returns>
+//        public byte[] GetData(D3DTX_Master d3dtx)
+//        {
+//            Console.WriteLine("Getting data for: " + d3dtx.FilePath);
+
+//            // If the D3DTX exists, return the pixel data.
+//            if (d3dtx.d3dtxObject == null)
+//            {
+//                throw new InvalidDataException("There is no pixel data to be written.");
+//            }
+
+//            // If the D3DTX has a DDS header, return the whole pixel data.
+//            if (d3dtx.HasDDSHeader())
+//            {
+//                return d3dtx.GetPixelData()[d3dtx.GetPixelData().Count - 1];
+//            }
+
+//            // Return the created DDS file.
+//            return ByteFunctions.Combine(header, pixelData);
+//        }
+
+//        ~KTX2_Master()
+//        {
+//            Destroy(texture);
+//        }
+//    }
+//}
 
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Enums/T3SurfaceGamma.cs b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Enums/T3SurfaceGamma.cs
index 011b273..c89e710 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Enums/T3SurfaceGamma.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Enums/T3SurfaceGamma.cs
@@ -5,7 +5,7 @@
 /// </summary>
 public enum T3SurfaceGamma
 {
-    eSurfaceGamma_Unknown = -1,
-    eSurfaceGamma_Linear = 0,
-    eSurfaceGamma_sRGB = 1,
+    Unknown = -1,
+    Linear = 0,
+    sRGB = 1,
 }
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/ID3DTX.cs b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/ID3DTX.cs
index 0142af4..18f5659 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/ID3DTX.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/ID3DTX.cs
@@ -59,7 +59,7 @@ public partial class D3DTXMetadata
 
     public T3SurfaceFormat Format { get; set; } = T3SurfaceFormat.Unknown;
 
-    public T3SurfaceGamma SurfaceGamma { get; set; } = T3SurfaceGamma.eSurfaceGamma_Unknown;
+    public T3SurfaceGamma SurfaceGamma { get; set; } = T3SurfaceGamma.Unknown;
 
     public T3TextureLayout Dimension { get; set; } = T3TextureLayout.Unknown;
 
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V3.cs b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V3.cs
index d123617..2de0e13 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V3.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V3.cs
@@ -349,7 +349,7 @@ public void ModifyD3DTX(D3DTXMetadata metadata, ImageSection[] imageSections, bo
     mNumMipLevels = metadata.MipLevels;
 
     mPixelData.Clear();
-    mPixelData = DDS_DirectXTexNet.GetPixelDataListFromSections(imageSections);
+    mPixelData = TextureManager.GetPixelDataListFromSections(imageSections);
 
     mStreamHeader = new()
     {
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V4.cs b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V4.cs
index 6f7315b..48e6a8c 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V4.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V4.cs
@@ -346,7 +346,7 @@ public void ModifyD3DTX(D3DTXMetadata metadata, ImageSection[] imageSections, bo
         mNumMipLevels = metadata.MipLevels;
 
         mPixelData.Clear();
-        mPixelData = DDS_DirectXTexNet.GetPixelDataListFromSections(imageSections);
+        mPixelData = TextureManager.GetPixelDataListFromSections(imageSections);
 
         mStreamHeader = new()
         {
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V5.cs b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V5.cs
index 2becdca..84207ce 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V5.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V5.cs
@@ -379,7 +379,7 @@ public void ModifyD3DTX(D3DTXMetadata metadata, ImageSection[] imageSections, bo
         mSurfaceGamma = metadata.SurfaceGamma;
 
         mPixelData.Clear();
-        mPixelData = DDS_DirectXTexNet.GetPixelDataListFromSections(imageSections);
+        mPixelData = TextureManager.GetPixelDataListFromSections(imageSections);
 
         mStreamHeader = new()
         {
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V6.cs b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V6.cs
index 2d3e0bd..9437346 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V6.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V6.cs
@@ -6,7 +6,6 @@
 using TelltaleTextureTool.Utilities;
 using TelltaleTextureTool.DirectX;
 using System.Runtime.InteropServices;
-using Hexa.NET.DirectXTex;
 using TelltaleTextureTool.DirectX.Enums;
 using TelltaleTextureTool.Telltale.FileTypes.D3DTX;
 
@@ -382,7 +381,7 @@ public void ModifyD3DTX(D3DTXMetadata metadata, ImageSection[] imageSections, bo
         mSurfaceGamma = metadata.SurfaceGamma;
 
         mPixelData.Clear();
-        mPixelData = DDS_DirectXTexNet.GetPixelDataListFromSections(imageSections);
+        mPixelData = TextureManager.GetPixelDataListFromSections(imageSections);
 
         mStreamHeader = new()
         {
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V7.cs b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V7.cs
index 2ce40cb..074bde8 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V7.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V7.cs
@@ -6,7 +6,6 @@
 using TelltaleTextureTool.Utilities;
 using TelltaleTextureTool.DirectX;
 using System.Runtime.InteropServices;
-using Hexa.NET.DirectXTex;
 using TelltaleTextureTool.DirectX.Enums;
 using TelltaleTextureTool.Telltale.FileTypes.D3DTX;
 
@@ -383,7 +382,7 @@ public void ModifyD3DTX(D3DTXMetadata metadata, ImageSection[] imageSections, bo
         mSurfaceGamma = metadata.SurfaceGamma;
 
         mPixelData.Clear();
-        mPixelData = DDS_DirectXTexNet.GetPixelDataListFromSections(imageSections);
+        mPixelData = TextureManager.GetPixelDataListFromSections(imageSections);
 
         mStreamHeader = new()
         {
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V8.cs b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V8.cs
index ecb21e1..3b7c0cf 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V8.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V8.cs
@@ -408,7 +408,7 @@ public void ModifyD3DTX(D3DTXMetadata metadata, ImageSection[] imageSections, bo
         mSurfaceGamma = metadata.SurfaceGamma;
 
         mPixelData.Clear();
-        mPixelData = DDS_DirectXTexNet.GetPixelDataListFromSections(imageSections);
+        mPixelData = TextureManager.GetPixelDataListFromSections(imageSections);
 
         mStreamHeader = new()
         {
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V9.cs b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V9.cs
index 2bc2ad2..e8c4d1a 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V9.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/D3DTX_V9.cs
@@ -413,7 +413,7 @@ public void ModifyD3DTX(D3DTXMetadata metadata, ImageSection[] imageSections, bo
         mSurfaceGamma = metadata.SurfaceGamma;
 
         mPixelData.Clear();
-        mPixelData = DDS_DirectXTexNet.GetPixelDataListFromSections(imageSections);
+        mPixelData = TextureManager.GetPixelDataListFromSections(imageSections);
 
         mStreamHeader = new()
         {
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/Legacy_D3DTX.cs b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/Legacy_D3DTX.cs
index a998ae7..f1d6440 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/Legacy_D3DTX.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Telltale/FileTypes/D3DTX/Versions/Legacy_D3DTX.cs
@@ -1272,7 +1272,7 @@ public void ModifyD3DTX(D3DTXMetadata metadata, ImageSection[] imageSections, bo
             mbIsMipMapped = new TelltaleBoolean(metadata.MipLevels > 1);
             mbEmbedMipMaps = new TelltaleBoolean(metadata.MipLevels > 1);
 
-            var textureData = DDS_DirectXTexNet.GetPixelDataArrayFromSections(imageSections);
+            var textureData = TextureManager.GetPixelDataArrayFromSections(imageSections);
 
             if (mTextureDataFormats > 0x200)
             {
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Telltale/Structs/T3SamplerStateBlock.cs b/TelltaleTextureTool/TelltaleTextureTool/Telltale/Structs/T3SamplerStateBlock.cs
index 73facc0..a610acf 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Telltale/Structs/T3SamplerStateBlock.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Telltale/Structs/T3SamplerStateBlock.cs
@@ -14,11 +14,6 @@ public T3SamplerStateBlock(BinaryReader reader)
     mData = reader.ReadUInt32(); //mSamplerState [4 bytes]
   }
 
-  public readonly void WriteBinaryData(BinaryWriter writer)
-  {
-    writer.Write(mData); //mData [4 bytes] 
-  }
-
   public readonly uint GetByteSize()
   {
     uint totalByteSize = 0;
diff --git a/TelltaleTextureTool/TelltaleTextureTool/Telltale/Structs/TelltalePixelData.cs b/TelltaleTextureTool/TelltaleTextureTool/Telltale/Structs/TelltalePixelData.cs
index f7d3731..b1e91c0 100644
--- a/TelltaleTextureTool/TelltaleTextureTool/Telltale/Structs/TelltalePixelData.cs
+++ b/TelltaleTextureTool/TelltaleTextureTool/Telltale/Structs/TelltalePixelData.cs
@@ -1,4 +1,6 @@
+using System;
 using System.IO;
+using TelltaleTextureTool.Utilities;
 
 namespace TelltaleTextureTool.TelltaleTypes;
 
@@ -36,6 +38,23 @@ public void WriteBinaryData(BinaryWriter writer)
         writer.Write(pixelData);
     }
 
+    public TelltalePixelData(byte[] ddsData, int skippedOriginalBytes = 0, int skippedDDSBytes = 0)
+    {
+        if (skippedOriginalBytes > ddsData.Length || skippedDDSBytes > ddsData.Length)
+            throw new Exception("One of the parameters is larger than the data size.");
+
+        byte[] copyBuffer = new byte[skippedOriginalBytes];
+
+        Array.Copy(pixelData, 0, copyBuffer, 0, skippedOriginalBytes);
+
+        byte[] copyDDSBuffer = new byte[ddsData.Length - skippedDDSBytes];
+
+        Array.Copy(ddsData, skippedDDSBytes, copyDDSBuffer, 0, ddsData.Length - skippedDDSBytes);
+
+        pixelData = ByteFunctions.Combine(copyBuffer, copyDDSBuffer);
+        length = (uint)pixelData.Length;
+    }
+
     public uint GetByteSize()
     {
         uint totalByteSize = 0;