diff --git a/CustomizeMii/BNS.cs b/CustomizeMii/BNS.cs
deleted file mode 100644
index f723c27..0000000
--- a/CustomizeMii/BNS.cs
+++ /dev/null
@@ -1,714 +0,0 @@
-/* This file is part of CustomizeMii
- * Copyright (C) 2009 Leathl
- * 
- * CustomizeMii is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * CustomizeMii is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-//These classes are based on bns.py (by megazig) of the Wii.py Framework with improvements by me (Leathl)
-//Thanks to Xuzz, SquidMan, megazig, Matt_P, Omega and The Lemon Man, the authors of Wii.py!
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using WaveFile;
-
-namespace BNS
-{
-    internal class BNS_Data
-    {
-        //Private Varialbes
-        private byte[] magic = new byte[] { (byte)'D', (byte)'A', (byte)'T', (byte)'A' };
-        private UInt32 size = 0x0004d000;
-        private byte[] data;
-
-        //Public Variables
-        public UInt32 Size { get { return size; } set { size = value; } }
-        public byte[] Data { get { return data; } set { data = value; } }
-
-        public BNS_Data() { }
-
-        public void Write(Stream outStream)
-        {
-            byte[] temp = BitConverter.GetBytes(size); Array.Reverse(temp);
-
-            outStream.Write(magic, 0, magic.Length);
-            outStream.Write(temp, 0, temp.Length);
-            outStream.Write(data, 0, data.Length);
-        }
-    }
-
-    internal class BNS_Info
-    {
-        //Private Variables
-        private byte[] magic = new byte[] { (byte)'I', (byte)'N', (byte)'F', (byte)'O' };
-        private UInt32 size = 0x000000a0;
-        private byte codec = 0x00;
-        private byte hasLoop = 0x00;
-        private byte channelCount = 0x02;
-        private byte zero = 0x00;
-        private UInt16 sampleRate = 0xac44;
-        private UInt16 pad0 = 0x0000;
-        private UInt32 loopStart = 0x00000000;
-        private UInt32 loopEnd = 0x00000000; //Or total sample count
-        private UInt32 offsetToChannelStart = 0x00000018;
-        private UInt32 pad1 = 0x00000000;
-        private UInt32 channel1StartOffset = 0x00000020;
-        private UInt32 channel2StartOffset = 0x0000002C;
-        private UInt32 channel1Start = 0x00000000;
-        private UInt32 coefficients1Offset = 0x0000038;
-        private UInt32 pad2 = 0x00000000;
-        private UInt32 channel2Start = 0x00000000;
-        private UInt32 coefficients2Offset = 0x00000068;
-        private UInt32 pad3 = 0x00000000;
-        private int[] coefficients1 = new int[16];
-        private UInt16 channel1Gain = 0x0000;
-        private UInt16 channel1PredictiveScale = 0x0000;
-        private UInt16 channel1PreviousValue = 0x0000;
-        private UInt16 channel1NextPreviousValue = 0x0000;
-        private UInt16 channel1LoopPredictiveScale = 0x0000;
-        private UInt16 channel1LoopPreviousValue = 0x0000;
-        private UInt16 channel1LoopNextPreviousValue = 0x0000;
-        private UInt16 channel1LoopPadding = 0x0000;
-        private int[] coefficients2 = new int[16];
-        private UInt16 channel2Gain = 0x0000;
-        private UInt16 channel2PredictiveScale = 0x0000;
-        private UInt16 channel2PreviousValue = 0x0000;
-        private UInt16 channel2NextPreviousValue = 0x0000;
-        private UInt16 channel2LoopPredictiveScale = 0x0000;
-        private UInt16 channel2LoopPreviousValue = 0x0000;
-        private UInt16 channel2LoopNextPreviousValue = 0x0000;
-        private UInt16 channel2LoopPadding = 0x0000;
-
-        //Public Variables
-        public byte HasLoop { get { return hasLoop; } set { hasLoop = value; } }
-        public UInt32 Coefficients1Offset { get { return coefficients1Offset; } set { coefficients1Offset = value; } }
-        public UInt32 Channel1StartOffset { get { return channel1StartOffset; } set { channel1StartOffset = value; } }
-        public UInt32 Channel2StartOffset { get { return channel2StartOffset; } set { channel2StartOffset = value; } }
-        public UInt32 Size { get { return size; } set { size = value; } }
-        public UInt16 SampleRate { get { return sampleRate; } set { sampleRate = value; } }
-        public byte ChannelCount { get { return channelCount; } set { channelCount = value; } }
-        public UInt32 Channel1Start { get { return channel1Start; } set { channel1Start = value; } }
-        public UInt32 Channel2Start { get { return channel2Start; } set { channel2Start = value; } }
-        public UInt32 LoopStart { get { return loopStart; } set { loopStart = value; } }
-        public UInt32 LoopEnd { get { return loopEnd; } set { loopEnd = value; } }
-        public int[] Coefficients1 { get { return coefficients1; } set { coefficients1 = value; } }
-        public int[] Coefficients2 { get { return coefficients2; } set { coefficients2 = value; } }
-
-        public BNS_Info() { }
-
-        public void Write(Stream outStream)
-        {
-            outStream.Write(magic, 0, magic.Length);
-
-            byte[] temp = BitConverter.GetBytes(size); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            outStream.WriteByte(codec);
-            outStream.WriteByte(hasLoop);
-            outStream.WriteByte(channelCount);
-            outStream.WriteByte(zero);
-
-            temp = BitConverter.GetBytes(sampleRate); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(pad0); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(loopStart); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(loopEnd); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(offsetToChannelStart); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(pad1); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(channel1StartOffset); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(channel2StartOffset); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(channel1Start); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(coefficients1Offset); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            if (this.channelCount == 2)
-            {
-                temp = BitConverter.GetBytes(pad2); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel2Start); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(coefficients2Offset); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(pad3); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                foreach (int thisInt in coefficients1)
-                {
-                    temp = BitConverter.GetBytes(thisInt); Array.Reverse(temp);
-                    outStream.Write(temp, 2, temp.Length - 2);
-                }
-
-                temp = BitConverter.GetBytes(channel1Gain); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1PredictiveScale); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1PreviousValue); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1NextPreviousValue); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1LoopPredictiveScale); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1LoopPreviousValue); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1LoopNextPreviousValue); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1LoopPadding); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                foreach (int thisInt in coefficients2)
-                {
-                    temp = BitConverter.GetBytes(thisInt); Array.Reverse(temp);
-                    outStream.Write(temp, 2, temp.Length - 2);
-                }
-
-                temp = BitConverter.GetBytes(channel2Gain); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel2PredictiveScale); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel2PreviousValue); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel2NextPreviousValue); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel2LoopPredictiveScale); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel2LoopPreviousValue); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel2LoopNextPreviousValue); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel2LoopPadding); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-            }
-            else if (this.channelCount == 1)
-            {
-                foreach (int thisInt in coefficients1)
-                {
-                    temp = BitConverter.GetBytes(thisInt); Array.Reverse(temp);
-                    outStream.Write(temp, 2, temp.Length - 2);
-                }
-
-                temp = BitConverter.GetBytes(channel1Gain); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1PredictiveScale); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1PreviousValue); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1NextPreviousValue); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1LoopPredictiveScale); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1LoopPreviousValue); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1LoopNextPreviousValue); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-
-                temp = BitConverter.GetBytes(channel1LoopPadding); Array.Reverse(temp);
-                outStream.Write(temp, 0, temp.Length);
-            }
-        }
-    }
-
-    internal class BNS_Header
-    {
-        //Private Variables
-        private byte[] magic = new byte[] { (byte)'B', (byte)'N', (byte)'S', (byte)' ' };
-        private UInt32 flags = 0xfeff0100;
-        private UInt32 fileSize = 0x0004d0c0;
-        private UInt16 size = 0x0020;
-        private UInt16 chunkCount = 0x0002;
-        private UInt32 infoOffset = 0x00000020;
-        private UInt32 infoLength = 0x000000a0;
-        private UInt32 dataOffset = 0x000000c0;
-        private UInt32 dataLength = 0x0004d000;
-
-        //Public Varialbes
-        public UInt32 DataOffset { get { return dataOffset; } set { dataOffset = value; } }
-        public UInt32 InfoLength { get { return infoLength; } set { infoLength = value; } }
-        public UInt16 Size { get { return size; } set { size = value; } }
-        public UInt32 DataLength { get { return dataLength; } set { dataLength = value; } }
-        public UInt32 FileSize { get { return fileSize; } set { fileSize = value; } }
-
-        public BNS_Header() { }
-
-        public void Write(Stream outStream)
-        {
-            outStream.Write(magic, 0, magic.Length);
-
-            byte[] temp = BitConverter.GetBytes(flags); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(fileSize); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(size); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(chunkCount); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(infoOffset); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(infoLength); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(dataOffset); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-
-            temp = BitConverter.GetBytes(dataLength); Array.Reverse(temp);
-            outStream.Write(temp, 0, temp.Length);
-        }
-    }
-
-    public class BNS_File
-    {
-        //Private Variables
-        private BNS_Header bnsHeader = new BNS_Header();
-        private BNS_Info bnsInfo = new BNS_Info();
-        private BNS_Data bnsData = new BNS_Data();
-        private int[,] lSamples = new int[2, 2];
-        private int[,] rlSamples = new int[2, 2];
-        private int[] tlSamples = new int[2];
-        private int[] hbcDefTbl = new int[] { 674, 1040, 3598, -1738, 2270, -583, 3967, -1969, 1516, 381, 3453, -1468, 2606, -617, 3795, -1759 };
-        private int[] defTbl = new int[] { 1820, -856, 3238, -1514, 2333, -550, 3336, -1376, 2444, -949, 3666, -1764, 2654, -701, 3420, -1398 };
-        private int[] pHist1 = new int[2];
-        private int[] pHist2 = new int[2];
-        private int tempSampleCount;
-        private string waveFile;
-        private bool loopFromWave = false;
-        private bool converted = false;
-        private bool toMono = false;
-
-
-
-        //Public Variables
-        /// <summary>
-        /// 0x00 (0) = No Loop, 0x01 (1) = Loop
-        /// </summary>
-        public byte HasLoop { get { return this.bnsInfo.HasLoop; } set { this.bnsInfo.HasLoop = value; } }
-        /// <summary>
-        /// The start sample of the Loop
-        /// </summary>
-        public UInt32 LoopStart { get { return this.bnsInfo.LoopStart; } set { this.bnsInfo.LoopStart = value; } }
-        /// <summary>
-        /// The total number of samples in this file
-        /// </summary>
-        public UInt32 TotalSampleCount { get { return this.bnsInfo.LoopEnd; } set { this.bnsInfo.LoopEnd = value; } }
-        /// <summary>
-        /// If true and the input Wave file is stereo, the BNS will be converted to Mono.
-        /// Be sure to set this before you call Convert()!
-        /// </summary>
-        public bool StereoToMono { get { return toMono; } set { toMono = value; } }
-
-
-
-        //Public Functions
-
-        public BNS_File(string waveFile)
-        {
-            this.waveFile = waveFile;
-        }
-
-        public BNS_File(string waveFile, bool loopFromWave)
-        {
-            this.waveFile = waveFile;
-            this.loopFromWave = loopFromWave;
-        }
-
-        /// <summary>
-        /// Returns the progress of the conversion
-        /// </summary>
-        public event EventHandler<System.ComponentModel.ProgressChangedEventArgs> ProgressChanged;
-
-        /// <summary>
-        /// Converts the Wave file to BNS
-        /// </summary>
-        public void Convert()
-        {
-            Convert(waveFile, loopFromWave);
-        }
-
-        /// <summary>
-        /// Returns the BNS file as a Byte Array. If not already converted, it will be done first.
-        /// </summary>
-        /// <returns></returns>
-        public byte[] ToByteArray()
-        {
-            return ToMemoryStream().ToArray();
-        }
-
-        /// <summary>
-        /// Returns the BNS file as a Memory Stream. If not already converted, it will be done first.
-        /// </summary>
-        /// <returns></returns>
-        public MemoryStream ToMemoryStream()
-        {
-            if (!converted)
-                Convert(waveFile, loopFromWave);
-
-            MemoryStream ms = new MemoryStream();
-
-            this.bnsHeader.Write(ms);
-            this.bnsInfo.Write(ms);
-            this.bnsData.Write(ms);
-
-            return ms;
-        }
-
-        /// <summary>
-        /// Saves the BNS file to the given path. If not already converted, it will be done first.
-        /// </summary>
-        /// <param name="destionationFile"></param>
-        public void Save(string destionationFile)
-        {
-            if (File.Exists(destionationFile)) File.Delete(destionationFile);
-
-            using (FileStream fs = new FileStream(destionationFile, FileMode.Create))
-            {
-                byte[] bnsFile = ToMemoryStream().ToArray();
-                fs.Write(bnsFile, 0, bnsFile.Length);
-            }
-        }
-
-        /// <summary>
-        /// Sets the Loop to the given Start Sample. Be sure that you call Convert() first!
-        /// </summary>
-        /// <param name="loopStartSample"></param>
-        public void SetLoop(int loopStartSample)
-        {
-            this.bnsInfo.HasLoop = 0x01;
-            this.bnsInfo.LoopStart = (uint)loopStartSample;
-        }
-
-
-
-        //Private Functions
-
-        private void Convert(string waveFile, bool loopFromWave)
-        {
-            Wave wave = new Wave(waveFile);
-            int waveLoopCount = wave.LoopCount;
-            int waveLoopStart = wave.LoopStart;
-
-            this.bnsInfo.ChannelCount = (byte)wave.ChannelCount;
-            this.bnsInfo.SampleRate = (ushort)wave.SampleRate;
-
-            if (this.bnsInfo.ChannelCount > 2 || this.bnsInfo.ChannelCount < 1)
-                throw new Exception("Unsupported Count of Channels!");
-            if (wave.BitDepth != 16)
-                throw new Exception("Only 16bit Wave files are supported!");
-            if (wave.DataFormat != 1)
-                throw new Exception("The format of this Wave file is not supported!");
-
-            this.bnsData.Data = Encode(wave.GetAllFrames());
-            wave.Close();
-
-            if (this.bnsInfo.ChannelCount == 1)
-            {
-                this.bnsHeader.InfoLength = 0x60;
-                this.bnsHeader.DataOffset = 0x80;
-
-                this.bnsInfo.Size = 0x60;
-                this.bnsInfo.Channel1StartOffset = 0x0000001C;
-                this.bnsInfo.Channel2StartOffset = 0x00000000;
-                this.bnsInfo.Channel1Start = 0x00000028;
-                this.bnsInfo.Coefficients1Offset = 0x00000000;
-            }
-
-            this.bnsData.Size = (uint)bnsData.Data.Length + 8;
-
-            this.bnsHeader.DataLength = this.bnsData.Size;
-            this.bnsHeader.FileSize = this.bnsHeader.Size + this.bnsInfo.Size + this.bnsData.Size;
-
-            if (loopFromWave)
-                if (waveLoopCount == 1)
-                    if (waveLoopStart != -1)
-                    { this.bnsInfo.LoopStart = (uint)waveLoopStart; this.bnsInfo.HasLoop = 0x01; }
-
-            this.bnsInfo.LoopEnd = (uint)tempSampleCount;                   
-
-            for (int i = 0; i < 16; i++)
-            {
-                this.bnsInfo.Coefficients1[i] = this.defTbl[i];
-
-                if (this.bnsInfo.ChannelCount == 2)
-                    this.bnsInfo.Coefficients2[i] = this.defTbl[i];
-            }
-
-            this.converted = true;
-        }
-
-        private byte[] Encode(byte[] inputFrames)
-        {
-            int offset = 0;
-            int[] sampleBuffer = new int[14];
-
-            this.tempSampleCount = inputFrames.Length / (bnsInfo.ChannelCount == 2 ? 4 : 2);
-            int modLength = (inputFrames.Length / (bnsInfo.ChannelCount == 2 ? 4 : 2)) % 14;
-
-            Array.Resize(ref inputFrames, inputFrames.Length + ((14 - modLength) * (bnsInfo.ChannelCount == 2 ? 4 : 2)));
-
-            int sampleCount = inputFrames.Length / (bnsInfo.ChannelCount == 2 ? 4 : 2);
-
-            int blocks = (sampleCount + 13) / 14;
-
-            List<int> soundDataLeft = new List<int>();
-            List<int> soundDataRight = new List<int>();
-
-            int co = offset;
-
-            if (this.toMono && this.bnsInfo.ChannelCount == 2) this.bnsInfo.ChannelCount = 1;
-            else if (this.toMono) this.toMono = false;
-
-            for (int j = 0; j < sampleCount; j++)
-            {
-                soundDataLeft.Add(BitConverter.ToInt16(inputFrames, co));
-                co += 2;
-
-                if (this.bnsInfo.ChannelCount == 2 || toMono)
-                {
-                    soundDataRight.Add(BitConverter.ToInt16(inputFrames, co));
-                    co += 2;
-                }
-            }
-
-            byte[] data = new byte[(this.bnsInfo.ChannelCount == 2 ? (blocks * 16) : (blocks * 8))];
-
-            int data1Offset = 0;
-            int data2Offset = blocks * 8;
-
-            this.bnsInfo.Channel2Start = (this.bnsInfo.ChannelCount == 2 ? (uint)data2Offset : 0);
-
-            int[] leftSoundData = soundDataLeft.ToArray();
-            int[] rightSoundData = soundDataRight.ToArray();
-
-            for (int y = 0; y < blocks; y++)
-            {
-                try
-                {
-                    if (y % (int)(blocks / 100) == 0 || (y + 1) == blocks)
-                        ChangeProgress((y + 1) * 100 / blocks);
-                }
-                catch { }
-
-                for (int a = 0; a < 14; a++)
-                    sampleBuffer[a] = leftSoundData[y * 14 + a];
-
-                byte[] outBuffer = RepackAdpcm(0, this.defTbl, sampleBuffer);
-
-                for (int a = 0; a < 8; a++)
-                    data[data1Offset + a] = outBuffer[a];
-
-                data1Offset += 8;
-
-                if (this.bnsInfo.ChannelCount == 2)
-                {
-                    for (int a = 0; a < 14; a++)
-                        sampleBuffer[a] = rightSoundData[y * 14 + a];
-
-                    outBuffer = RepackAdpcm(1, this.defTbl, sampleBuffer);
-
-                    for (int a = 0; a < 8; a++)
-                        data[data2Offset + a] = outBuffer[a];
-                    
-                    data2Offset += 8;
-                }
-            }
-
-            this.bnsInfo.LoopEnd = (uint)(blocks * 7);
-
-            return data;
-        }
-
-        private byte[] RepackAdpcm(int index, int[] table, int[] inputBuffer)
-        {
-            byte[] data = new byte[8];
-            int[] blSamples = new int[2];
-            int bestIndex = -1;
-            double bestError = 999999999.0;
-            double error;
-
-            for (int tableIndex = 0; tableIndex < 8; tableIndex++)
-            {
-                byte[] testData = CompressAdpcm(index, table, tableIndex, inputBuffer, out error);
-
-                if (error < bestError)
-                {
-                    bestError = error;
-
-                    for (int i = 0; i < 8; i++)
-                        data[i] = testData[i];
-                    for (int i = 0; i < 2; i++)
-                        blSamples[i] = this.tlSamples[i];
-
-                    bestIndex = tableIndex;
-                }
-            }
-
-            for (int i = 0; i < 2; i++)
-                this.rlSamples[index, i] = blSamples[i];
-
-            return data;
-        }
-
-        private byte[] CompressAdpcm(int index, int[] table, int tableIndex, int[] inputBuffer, out double outError)
-        {
-            byte[] data = new byte[8];
-            int error = 0;
-            int factor1 = table[2 * tableIndex + 0];
-            int factor2 = table[2 * tableIndex + 1];
-
-            int exponent = DetermineStdExponent(index, table, tableIndex, inputBuffer);
-
-            while (exponent <= 15)
-            {
-                bool breakIt = false;
-                error = 0;
-                data[0] = (byte)(exponent | (tableIndex << 4));
-
-                for (int i = 0; i < 2; i++)
-                    this.tlSamples[i] = this.rlSamples[index, i];
-
-                int j = 0;
-
-                for (int i = 0; i < 14; i++)
-                {
-                    int predictor = (int)((this.tlSamples[1] * factor1 + this.tlSamples[0] * factor2) >> 11);
-                    int residual = (inputBuffer[i] - predictor) >> exponent;
-
-                    if (residual > 7 || residual < -8)
-                    {
-                        exponent++;
-                        breakIt = true;
-                        break;
-                    }
-
-                    int nibble = Clamp(residual, -8, 7);
-
-                    if ((i & 1) != 0)
-                        data[i / 2 + 1] = (byte)(data[i / 2 + 1] | (nibble & 0xf));
-                    else
-                        data[i / 2 + 1] = (byte)(nibble << 4);
-
-                    predictor += nibble << exponent;
-
-                    this.tlSamples[0] = this.tlSamples[1];
-                    this.tlSamples[1] = Clamp(predictor, -32768, 32767);
-
-                    error += (int)(Math.Pow((double)(this.tlSamples[1] - inputBuffer[i]), 2));
-                }
-
-                if (!breakIt) j = 14;
-
-                if (j == 14) break;
-            }
-
-            outError = error;
-            return data;
-        }
-
-        private int DetermineStdExponent(int index, int[] table, int tableIndex, int[] inputBuffer)
-        {
-            int[] elSamples = new int[2];
-            int maxResidual = 0;
-            int factor1 = table[2 * tableIndex + 0];
-            int factor2 = table[2 * tableIndex + 1];
-
-            for (int i = 0; i < 2; i++)
-                elSamples[i] = this.rlSamples[index, i];
-
-            for (int i = 0; i < 14; i++)
-            {
-                int predictor = (elSamples[1] * factor1 + elSamples[0] * factor2) >> 11;
-                int residual = inputBuffer[i] - predictor;
-
-                if (residual > maxResidual)
-                    maxResidual = residual;
-
-                elSamples[0] = elSamples[1];
-                elSamples[1] = inputBuffer[i];
-            }
-
-            return FindExponent(maxResidual);
-        }
-
-        private int FindExponent(double residual)
-        {
-            int exponent = 0;
-
-            while (residual > 7.5 || residual < -8.5)
-            {
-                exponent++;
-                residual /= 2.0;
-            }
-
-            return exponent;
-        }
-
-        private int Clamp(int input, int min, int max)
-        {
-            if (input < min) return min;
-            if (input > max) return max;
-            return input;
-        }
-
-        private void ChangeProgress(int progressPercentage)
-        {
-            EventHandler<System.ComponentModel.ProgressChangedEventArgs> progressChanged = ProgressChanged;
-            if (progressChanged != null)
-            {
-                progressChanged(new object(), new System.ComponentModel.ProgressChangedEventArgs(progressPercentage, new object()));
-            }
-        }
-    }
-}
diff --git a/CustomizeMii/CustomizeMii.csproj b/CustomizeMii/CustomizeMii.csproj
index 1fd7779..aec19f2 100644
--- a/CustomizeMii/CustomizeMii.csproj
+++ b/CustomizeMii/CustomizeMii.csproj
@@ -55,6 +55,7 @@
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
+    <UseVSHostingProcess>true</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -65,13 +66,9 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CustomizeMiiInstaller, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="libWiiSharp, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\CustomizeMiiInstaller\bin\Release\CustomizeMiiInstaller.dll</HintPath>
-    </Reference>
-    <Reference Include="ForwardMii, Version=1.2.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\ForwardMii\bin\x86\Release\ForwardMii.dll</HintPath>
+      <HintPath>.\libWiiSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -79,7 +76,6 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BNS.cs" />
     <Compile Include="CustomizeMii_BackgroundWorkers.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -153,8 +149,8 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <EmbeddedResource Include="Resources\comex.app" />
-    <EmbeddedResource Include="Resources\Waninkoko.app" />
+    <None Include="Resources\comex.app" />
+    <None Include="Resources\Waninkoko.app" />
     <EmbeddedResource Include="CustomizeMii_Preview.resx">
       <DependentUpon>CustomizeMii_Preview.cs</DependentUpon>
     </EmbeddedResource>
@@ -170,8 +166,6 @@
     <Compile Include="CustomizeMii_Preview.designer.cs">
       <DependentUpon>CustomizeMii_Preview.cs</DependentUpon>
     </Compile>
-    <Compile Include="Wave.cs" />
-    <Compile Include="Wii.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="License.txt" />
@@ -182,6 +176,7 @@
     <None Include="Resources\btnCreate.png" />
     <None Include="Resources\CustomizeMii.ico" />
     <None Include="Resources\Instructions.rtf" />
+    <None Include="Resources\WaninkokoLeathl.app" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -210,6 +205,16 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\CustomizeMiiInstaller\CustomizeMiiInstaller.csproj">
+      <Project>{475F3ADF-B529-449F-89DA-BA5E8BE15DD5}</Project>
+      <Name>CustomizeMiiInstaller</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ForwardMii\ForwardMii.csproj">
+      <Project>{20CB2CA7-6767-4758-97FA-97395F47CD6B}</Project>
+      <Name>ForwardMii</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/CustomizeMii/CustomizeMii.csproj.user b/CustomizeMii/CustomizeMii.csproj.user
index 3258829..21068da 100644
--- a/CustomizeMii/CustomizeMii.csproj.user
+++ b/CustomizeMii/CustomizeMii.csproj.user
@@ -14,4 +14,8 @@
     <FallbackCulture>de-DE</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <StartArguments>
+    </StartArguments>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/CustomizeMii/CustomizeMii_BackgroundWorkers.cs b/CustomizeMii/CustomizeMii_BackgroundWorkers.cs
index e7da385..8f1773c 100644
--- a/CustomizeMii/CustomizeMii_BackgroundWorkers.cs
+++ b/CustomizeMii/CustomizeMii_BackgroundWorkers.cs
@@ -14,25 +14,33 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
+
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
-using BNS;
-using System.Net.Sockets;
+using System.Net;
+using System.Windows.Forms;
+using libWiiSharp;
 
 namespace CustomizeMii
 {
     partial class CustomizeMii_Main
     {
-        private Stopwatch CreationTimer = new Stopwatch();
-        private Stopwatch TransmitTimer = new Stopwatch();
         private TransmitInfo transmitInfo;
-        public int sendWadReady = 0;
-        private bool sendToWii = false;
-        private bool internalSound;
         private WadCreationInfo wadCreationInfo;
+        private bool internalSound;
+
+        private WAD sourceWad = new WAD();
+        private U8 bannerBin = new U8();
+        private U8 newBannerBin = new U8();
+        private U8 iconBin = new U8();
+        private U8 newIconBin = new U8();
+        private byte[] newSoundBin = new byte[0];
+        private byte[] newDol = new byte[0];
+        private string replacedBanner = string.Empty;
+        private string replacedIcon = string.Empty;
+        private string replacedSound = string.Empty;
 
         void bwBannerReplace_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
@@ -40,7 +48,7 @@ namespace CustomizeMii
             currentProgress.progressState = " ";
 
             this.Invoke(ProgressUpdate);
-            SetText(tbReplace, BannerReplace);
+            setControlText(tbReplace, replacedBanner);
         }
 
         void bwBannerReplace_ProgressChanged(object sender, ProgressChangedEventArgs e)
@@ -56,51 +64,47 @@ namespace CustomizeMii
             try
             {
                 BackgroundWorker bwBannerReplace = sender as BackgroundWorker;
-                string thisFile = (string)e.Argument;
-                if (Directory.Exists(TempTempPath)) Directory.Delete(TempTempPath, true);
-                if (Directory.Exists(TempBannerPath)) Directory.Delete(TempBannerPath, true);
+                replacedBanner = (string)e.Argument;
 
-                if (thisFile.EndsWith(".bin"))
+                if (replacedBanner.ToLower().EndsWith(".bin"))
                 {
                     bwBannerReplace.ReportProgress(0, "Loading banner.bin...");
-                    Wii.U8.UnpackU8(thisFile, TempBannerPath);
+                    newBannerBin.LoadFile(replacedBanner);
                 }
-                else if (thisFile.EndsWith(".app"))
+                else if (replacedBanner.ToLower().EndsWith(".app"))
                 {
                     bwBannerReplace.ReportProgress(0, "Loading 00000000.app...");
-                    Wii.U8.UnpackU8(thisFile, TempTempPath);
+                    U8 tmpU8 = U8.Load(replacedBanner);
+
                     bwBannerReplace.ReportProgress(50, "Loading banner.bin...");
-                    Wii.U8.UnpackU8(TempTempPath + "meta\\banner.bin", TempBannerPath);
-                    Directory.Delete(TempTempPath, true);
+                    for (int i = 0; i < tmpU8.NumOfNodes; i++)
+                        if (tmpU8.StringTable[i].ToLower() == "banner.bin")
+                        { newBannerBin.LoadFile(tmpU8.Data[i]); break; }
                 }
-                else
+                else //wad
                 {
                     bwBannerReplace.ReportProgress(0, "Loading WAD...");
-                    Wii.WadUnpack.UnpackWad(thisFile, TempTempPath);
-                    if (Wii.U8.CheckU8(TempTempPath + "00000000.app") == false)
+                    WAD tmpWad = WAD.Load(replacedBanner);
+
+                    if (!tmpWad.HasBanner)
                         throw new Exception("CustomizeMii only handles Channel WADs!");
-                    bwBannerReplace.ReportProgress(30, "Loading 00000000.app...");
-                    Wii.U8.UnpackU8(TempTempPath + "00000000.app", TempTempPath + "00000000.app_OUT");
+
                     bwBannerReplace.ReportProgress(60, "Loading banner.bin...");
-                    Wii.U8.UnpackU8(TempTempPath + "00000000.app_OUT\\meta\\banner.bin", TempBannerPath);
-                    Directory.Delete(TempTempPath, true);
+                    for (int i = 0; i < tmpWad.BannerApp.NumOfNodes; i++)
+                        if (tmpWad.BannerApp.StringTable[i].ToLower() == "banner.bin")
+                        { newBannerBin.LoadFile(tmpWad.BannerApp.Data[i]); break; }
                 }
 
-                EventHandler AddBannerTpls = new EventHandler(this.AddBannerTpls);
-                EventHandler AddIconTpls = new EventHandler(this.AddIconTpls);
-                EventHandler AddBrlyts = new EventHandler(this.AddBrlyts);
-                EventHandler AddBrlans = new EventHandler(this.AddBrlans);
-                this.Invoke(AddBannerTpls);
-                this.Invoke(AddIconTpls);
-                this.Invoke(AddBrlyts);
-                this.Invoke(AddBrlans);
+                bannerTransparents.Clear();
+
+                addTpls();
+                addBrlyts();
+                addBrlans();
             }
             catch (Exception ex)
             {
-                if (Directory.Exists(TempTempPath)) Directory.Delete(TempTempPath, true);
-                if (Directory.Exists(TempBannerPath)) Directory.Delete(TempBannerPath, true);
-                BannerReplace = string.Empty;
-                ErrorBox(ex.Message);
+                replacedBanner = string.Empty;
+                errorBox(ex.Message);
             }
         }
 
@@ -110,7 +114,7 @@ namespace CustomizeMii
             currentProgress.progressState = " ";
 
             this.Invoke(ProgressUpdate);
-            SetText(tbReplace, IconReplace);
+            setControlText(tbReplace, replacedIcon);
         }
 
         void bwIconReplace_ProgressChanged(object sender, ProgressChangedEventArgs e)
@@ -126,51 +130,49 @@ namespace CustomizeMii
             try
             {
                 BackgroundWorker bwIconReplace = sender as BackgroundWorker;
-                string thisFile = (string)e.Argument;
-                if (Directory.Exists(TempTempPath)) Directory.Delete(TempTempPath, true);
-                if (Directory.Exists(TempIconPath)) Directory.Delete(TempIconPath, true);
+                replacedIcon = (string)e.Argument;
 
-                if (thisFile.EndsWith(".bin"))
+                bwIconReplace.ReportProgress(0);
+
+                if (replacedIcon.ToLower().EndsWith(".bin"))
                 {
                     bwIconReplace.ReportProgress(0, "Loading icon.bin...");
-                    Wii.U8.UnpackU8(thisFile, TempIconPath);
+                    newIconBin.LoadFile(replacedIcon);
                 }
-                else if (thisFile.EndsWith(".app"))
+                else if (replacedIcon.ToLower().EndsWith(".app"))
                 {
                     bwIconReplace.ReportProgress(0, "Loading 00000000.app...");
-                    Wii.U8.UnpackU8(thisFile, TempTempPath);
+                    U8 tmpU8 = U8.Load(replacedIcon);
+
                     bwIconReplace.ReportProgress(50, "Loading icon.bin...");
-                    Wii.U8.UnpackU8(TempTempPath + "meta\\icon.bin", TempIconPath);
-                    Directory.Delete(TempTempPath, true);
+                    for (int i = 0; i < tmpU8.NumOfNodes; i++)
+                        if (tmpU8.StringTable[i].ToLower() == "icon.bin")
+                        { newIconBin.LoadFile(tmpU8.Data[i]); break; }
                 }
-                else
+                else //wad
                 {
                     bwIconReplace.ReportProgress(0, "Loading WAD...");
-                    Wii.WadUnpack.UnpackWad(thisFile, TempTempPath);
-                    if (Wii.U8.CheckU8(TempTempPath + "00000000.app") == false)
+                    WAD tmpWad = WAD.Load(replacedIcon);
+
+                    if (!tmpWad.HasBanner)
                         throw new Exception("CustomizeMii only handles Channel WADs!");
-                    bwIconReplace.ReportProgress(30, "Loading 00000000.app...");
-                    Wii.U8.UnpackU8(TempTempPath + "00000000.app", TempTempPath + "00000000.app_OUT");
+
                     bwIconReplace.ReportProgress(60, "Loading icon.bin...");
-                    Wii.U8.UnpackU8(TempTempPath + "00000000.app_OUT\\meta\\icon.bin", TempIconPath);
-                    Directory.Delete(TempTempPath, true);
+                    for (int i = 0; i < tmpWad.BannerApp.NumOfNodes; i++)
+                        if (tmpWad.BannerApp.StringTable[i].ToLower() == "icon.bin")
+                        { newIconBin.LoadFile(tmpWad.BannerApp.Data[i]); break; }
                 }
 
-                EventHandler AddBannerTpls = new EventHandler(this.AddBannerTpls);
-                EventHandler AddIconTpls = new EventHandler(this.AddIconTpls);
-                EventHandler AddBrlyts = new EventHandler(this.AddBrlyts);
-                EventHandler AddBrlans = new EventHandler(this.AddBrlans);
-                this.Invoke(AddBannerTpls);
-                this.Invoke(AddIconTpls);
-                this.Invoke(AddBrlyts);
-                this.Invoke(AddBrlans);
+                iconTransparents.Clear();
+
+                addTpls();
+                addBrlyts();
+                addBrlans();
             }
             catch (Exception ex)
             {
-                if (Directory.Exists(TempTempPath)) Directory.Delete(TempTempPath, true);
-                if (Directory.Exists(TempIconPath)) Directory.Delete(TempIconPath, true);
-                IconReplace = string.Empty;
-                ErrorBox(ex.Message);
+                replacedIcon = string.Empty;
+                errorBox(ex.Message);
             }
         }
 
@@ -180,7 +182,7 @@ namespace CustomizeMii
             currentProgress.progressState = " ";
 
             this.Invoke(ProgressUpdate);
-            SetText(tbReplace, SoundReplace);
+            setControlText(tbReplace, replacedSound);
         }
 
         void bwSoundReplace_ProgressChanged(object sender, ProgressChangedEventArgs e)
@@ -196,69 +198,60 @@ namespace CustomizeMii
             try
             {
                 BackgroundWorker bwSoundReplace = sender as BackgroundWorker;
-                string thisFile = (string)e.Argument;
-                if (File.Exists(TempSoundPath)) File.Delete(TempSoundPath);
-                if (Directory.Exists(TempTempPath)) Directory.Delete(TempTempPath, true);
+                replacedSound = (string)e.Argument;
 
-                if (thisFile.EndsWith(".bin"))
+                bwSoundReplace.ReportProgress(0);
+
+                if (replacedSound.ToLower().EndsWith(".bin"))
                 {
-                    bwSoundReplace.ReportProgress(0, "Copying sound.bin...");
-                    File.Copy(thisFile, TempSoundPath);
+                    bwSoundReplace.ReportProgress(0, "Loading sound.bin...");
+                    newSoundBin = File.ReadAllBytes(replacedSound);
                 }
-                else if (thisFile.EndsWith(".app"))
+                else if (replacedSound.ToLower().EndsWith(".app"))
                 {
                     bwSoundReplace.ReportProgress(0, "Loading 00000000.app...");
-                    Wii.U8.UnpackU8(thisFile, TempTempPath);
-                    bwSoundReplace.ReportProgress(80, "Copying sound.bin...");
-                    File.Copy(TempTempPath + "meta\\sound.bin", TempSoundPath);
-                    Directory.Delete(TempTempPath, true);
+                    U8 tmpU8 = U8.Load(replacedSound);
+
+                    bwSoundReplace.ReportProgress(80, "Loading sound.bin...");
+                    for (int i = 0; i < tmpU8.NumOfNodes; i++)
+                        if (tmpU8.StringTable[i].ToLower() == "sound.bin")
+                        { newSoundBin = tmpU8.Data[i]; break; }
                 }
                 else
                 {
                     bwSoundReplace.ReportProgress(0, "Loading WAD...");
-                    Wii.WadUnpack.UnpackWad(thisFile, TempTempPath);
-                    if (Wii.U8.CheckU8(TempTempPath + "00000000.app") == false)
-                        throw new Exception("CustomizeMii only handles Channel WADs!");
-                    bwSoundReplace.ReportProgress(50, "Loading 00000000.app...");
-                    Wii.U8.UnpackU8(TempTempPath + "00000000.app", TempTempPath + "00000000.app_OUT");
-                    bwSoundReplace.ReportProgress(90, "Copying sound.bin...");
-                    File.Copy(TempTempPath + "00000000.app_OUT\\meta\\sound.bin", TempSoundPath);
-                    Directory.Delete(TempTempPath, true);
-                }
+                    WAD tmpWad = WAD.Load(replacedSound);
 
-                SetText(tbSound, SoundReplace);
+                    if (!tmpWad.HasBanner)
+                        throw new Exception("CustomizeMii only handles Channel WADs!");
+
+                    bwSoundReplace.ReportProgress(90, "Loading sound.bin...");
+                    for (int i = 0; i < tmpWad.BannerApp.NumOfNodes; i++)
+                        if (tmpWad.BannerApp.StringTable[i].ToLower() == "sound.bin")
+                        { newSoundBin = tmpWad.BannerApp.Data[i]; break; }
+                }
             }
             catch (Exception ex)
             {
-                if (Directory.Exists(TempTempPath)) Directory.Delete(TempTempPath, true);
-                if (File.Exists(TempSoundPath)) File.Delete(TempSoundPath);
-                SoundReplace = string.Empty;
-                ErrorBox(ex.Message);
+                replacedSound = string.Empty;
+                errorBox(ex.Message);
             }
         }
 
         void bwConvertToBns_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            if (File.Exists(TempBnsPath))
+            if (!string.IsNullOrEmpty(replacedSound))
             {
                 if (internalSound == true)
-                    SetText(tbSound, "BNS: Internal Sound");
+                    setControlText(tbSound, "BNS: Internal Sound");
                 else
-                    SetText(tbSound, "BNS: " + Mp3Path);
+                    setControlText(tbSound, "BNS: " + replacedSound);
 
                 btnBrowseSound.Text = "Clear";
 
-                if (!string.IsNullOrEmpty(SoundReplace))
-                {
-                    SoundReplace = string.Empty;
-                    if (cmbReplace.SelectedIndex == 2) SetText(tbReplace, SoundReplace);
-                    if (File.Exists(TempSoundPath)) File.Delete(TempSoundPath);
-                }
+                if (cmbReplace.SelectedIndex == 2) setControlText(tbReplace, string.Empty);
             }
 
-            if (File.Exists(TempWavePath)) File.Delete(TempWavePath);
-
-            Mp3Path = string.Empty;
             currentProgress.progressValue = 100;
             currentProgress.progressState = " ";
 
@@ -286,23 +279,30 @@ namespace CustomizeMii
             {
                 BackgroundWorker bwConvertToBns = sender as BackgroundWorker;
                 BnsConversionInfo bnsInfo = (BnsConversionInfo)e.Argument;
-                string audioFile;
+                byte[] audioData = new byte[0];
 
-                if (bnsInfo.AudioFile == "Internal Sound")
-                { audioFile = TempWavePath; internalSound = true; }
+                if (bnsInfo.audioFile.ToLower() == "internal sound")
+                {
+                    for (int i = 0; i < sourceWad.BannerApp.NumOfNodes; i++)
+                    {
+                        if (sourceWad.BannerApp.StringTable[i].ToLower() == "sound.bin")
+                            audioData = Headers.IMD5.RemoveHeader(sourceWad.BannerApp.Data[i]);
+                    }
+
+                    internalSound = true;
+                }
                 else
-                    audioFile = bnsInfo.AudioFile;
-                Mp3Path = audioFile; //Rather audioPath...
+                    audioData = File.ReadAllBytes(bnsInfo.audioFile);
 
-                bool mp3 = audioFile.EndsWith(".mp3");
-                if (mp3 && bnsInfo.Loop == BnsConversionInfo.LoopType.FromWave) bnsInfo.Loop = BnsConversionInfo.LoopType.None;
+                bool mp3 = bnsInfo.audioFile.EndsWith(".mp3");
+                if (mp3 && bnsInfo.loopType == BnsConversionInfo.LoopType.FromWave) bnsInfo.loopType = BnsConversionInfo.LoopType.None;
 
                 if (mp3)
                 {
                     bwConvertToBns.ReportProgress(0, "Converting MP3...");
 
-                    ProcessStartInfo lameI = new ProcessStartInfo(System.Windows.Forms.Application.StartupPath + "\\lame.exe",
-                        string.Format("--decode \"{0}\" \"{1}\"", audioFile, "C:\\cmtempmp3wav.wav")); //Gotta go this step, cause the TempWavePath is too long for lame.exe
+                    ProcessStartInfo lameI = new ProcessStartInfo(Application.StartupPath + Path.DirectorySeparatorChar + "lame.exe",
+                        string.Format("--decode \"{0}\" \"{1}\"", bnsInfo.audioFile, Application.StartupPath + Path.DirectorySeparatorChar + "customizemii_temp.wav"));
                     lameI.CreateNoWindow = true;
                     lameI.UseShellExecute = false;
                     lameI.RedirectStandardError = true;
@@ -331,55 +331,46 @@ namespace CustomizeMii
                     lame.WaitForExit();
                     lame.Close();
 
-                    if (File.Exists("C:\\cmtempmp3wav.wav"))
+                    if (File.Exists(Application.StartupPath + Path.DirectorySeparatorChar + "customizemii_temp.wav"))
                     {
-                        FileInfo fi = new FileInfo("C:\\cmtempmp3wav.wav");
-                        fi.MoveTo(TempWavePath);
+                        audioData = File.ReadAllBytes(Application.StartupPath + Path.DirectorySeparatorChar + "customizemii_temp.wav");
+                        File.Delete(Application.StartupPath + Path.DirectorySeparatorChar + "customizemii_temp.wav");
                     }
-
-                    if (!File.Exists(TempWavePath)) throw new Exception("Error converting MP3...");
-                    else audioFile = TempWavePath;
+                    else throw new Exception("Error converting MP3...");
                 }
 
-                bwConvertToBns.ReportProgress(0, "Converting To BNS...");
-                
-                BNS_File bns = new BNS_File(audioFile, bnsInfo.Loop == BnsConversionInfo.LoopType.FromWave);
-                bns.ProgressChanged += new EventHandler<ProgressChangedEventArgs>(bns_ProgressChanged);
+                bwConvertToBns.ReportProgress(0, "Converting to BNS...");
 
-                bns.StereoToMono = bnsInfo.StereoToMono;
+                BNS bns = new BNS(audioData, bnsInfo.loopType == BnsConversionInfo.LoopType.FromWave);
+                bns.Progress += new EventHandler<ProgressChangedEventArgs>(bns_ProgressChanged);
+
+                bns.StereoToMono = bnsInfo.stereoToMono;
                 bns.Convert();
 
-                if (bnsInfo.Loop == BnsConversionInfo.LoopType.Manual && bnsInfo.LoopStartSample > -1 && bnsInfo.LoopStartSample < bns.TotalSampleCount)
-                    bns.SetLoop(bnsInfo.LoopStartSample);
+                if (bnsInfo.loopType == BnsConversionInfo.LoopType.Manual && bnsInfo.loopStartSample > -1 && bnsInfo.loopStartSample < bns.TotalSampleCount)
+                    bns.SetLoop(bnsInfo.loopStartSample);
 
-                bns.Save(TempBnsPath);
-
-                if (File.Exists(TempWavePath))
-                    File.Delete(TempWavePath);
+                newSoundBin = Headers.IMD5.AddHeader(bns.ToByteArray());
+                replacedSound = bnsInfo.audioFile;
             }
             catch (Exception ex)
             {
-                ErrorBox("Error during conversion:\n" + ex.Message);
+                replacedSound = string.Empty;
+                if (File.Exists(Application.StartupPath + Path.DirectorySeparatorChar + "customizemii_temp.wav")) File.Delete(Application.StartupPath + Path.DirectorySeparatorChar + "customizemii_temp.wav");
+                errorBox("Error during conversion:\n" + ex.Message);
             }
         }
 
         void bwConvertMp3_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            if (File.Exists(TempWavePath))
+            if (!string.IsNullOrEmpty(replacedSound))
             {
-                SetText(tbSound, Mp3Path);
-
+                setControlText(tbSound, replacedSound);
                 btnBrowseSound.Text = "Clear";
 
-                if (!string.IsNullOrEmpty(SoundReplace))
-                {
-                    SoundReplace = string.Empty;
-                    if (cmbReplace.SelectedIndex == 2) SetText(tbReplace, SoundReplace);
-                    if (File.Exists(TempSoundPath)) File.Delete(TempSoundPath);
-                }
+                if (cmbReplace.SelectedIndex == 2) setControlText(tbReplace, string.Empty);
             }
 
-            Mp3Path = string.Empty;
             currentProgress.progressValue = 100;
             currentProgress.progressState = " ";
 
@@ -389,6 +380,7 @@ namespace CustomizeMii
         void bwConvertMp3_ProgressChanged(object sender, ProgressChangedEventArgs e)
         {
             currentProgress.progressValue = e.ProgressPercentage;
+            currentProgress.progressState = (string)e.UserState;
 
             this.Invoke(ProgressUpdate);
         }
@@ -398,9 +390,9 @@ namespace CustomizeMii
             try
             {
                 BackgroundWorker bwConvertMp3 = sender as BackgroundWorker;
-                Mp3Path = (string)e.Argument;
-                ProcessStartInfo lameI = new ProcessStartInfo(System.Windows.Forms.Application.StartupPath + "\\lame.exe",
-                    string.Format("--decode \"{0}\" \"{1}\"", e.Argument, "C:\\cmtempmp3wav.wav")); //Gotta go this step, cause the TempWavePath is too long for lame.exe
+
+                ProcessStartInfo lameI = new ProcessStartInfo(Application.StartupPath + Path.DirectorySeparatorChar + "lame.exe",
+                    string.Format("--decode \"{0}\" \"{1}\"", e.Argument, Application.StartupPath + Path.DirectorySeparatorChar + "customizemii_temp.wav"));
                 lameI.CreateNoWindow = true;
                 lameI.UseShellExecute = false;
                 lameI.RedirectStandardError = true;
@@ -417,11 +409,12 @@ namespace CustomizeMii
                         {
                             string thisFrame = thisLine.Remove(thisLine.IndexOf('/'));
                             thisFrame = thisFrame.Remove(0, thisFrame.LastIndexOf(' ') + 1);
+
                             string Frames = thisLine.Remove(0, thisLine.IndexOf('/') + 1);
                             Frames = Frames.Remove(Frames.IndexOf(' '));
 
                             int thisProgress = (int)((Convert.ToDouble(thisFrame) / Convert.ToDouble(Frames)) * 100);
-                            bwConvertMp3.ReportProgress(thisProgress);
+                            bwConvertMp3.ReportProgress(thisProgress, "Converting MP3...");
                         }
                     }
                 }
@@ -429,17 +422,19 @@ namespace CustomizeMii
                 lame.WaitForExit();
                 lame.Close();
 
-                if (File.Exists("C:\\cmtempmp3wav.wav"))
+                if (File.Exists(Application.StartupPath + Path.DirectorySeparatorChar + "customizemii_temp.wav"))
                 {
-                    FileInfo fi = new FileInfo("C:\\cmtempmp3wav.wav");
-                    fi.MoveTo(TempWavePath);
+                    newSoundBin = Headers.IMD5.AddHeader(File.ReadAllBytes(Application.StartupPath + Path.DirectorySeparatorChar + "customizemii_temp.wav"));
+                    File.Delete(Application.StartupPath + Path.DirectorySeparatorChar + "customizemii_temp.wav");
+
+                    replacedSound = (string)e.Argument;
                 }
             }
             catch (Exception ex)
             {
-                if (File.Exists(TempWavePath)) File.Delete(TempWavePath);
-                Mp3Path = string.Empty;
-                ErrorBox("Error during conversion:\n" + ex.Message);
+                if (File.Exists(Application.StartupPath + Path.DirectorySeparatorChar + "customizemii_temp.wav")) File.Delete(Application.StartupPath + Path.DirectorySeparatorChar + "customizemii_temp.wav");
+                replacedSound = string.Empty;
+                errorBox("Error during conversion:\n" + ex.Message);
             }
         }
 
@@ -464,128 +459,106 @@ namespace CustomizeMii
             try
             {
                 BackgroundWorker bwLoadChannel = sender as BackgroundWorker;
-                EventHandler Initialize = new EventHandler(this.Initialize);
-                EventHandler SetSourceWad = new EventHandler(this.SetSourceWad);
-                byte[] WadFile = Wii.Tools.LoadFileToByteArray((string)e.Argument);
-                bool hashesMatch = true;
+                initialize();
 
-                this.Invoke(Initialize);
-
-                if (Directory.Exists(TempUnpackPath)) Directory.Delete(TempUnpackPath, true);
+                if (e.Argument is string) setControlText(tbSourceWad, (string)e.Argument);
+                else if (e.Argument is DownloadDataCompletedEventArgs) setControlText(tbSourceWad, (string)((DownloadDataCompletedEventArgs)e.Argument).UserState);
 
                 bwLoadChannel.ReportProgress(0, "Loading WAD...");
-                Wii.WadUnpack.UnpackWad(WadFile, TempUnpackPath, out hashesMatch);
-                if (Wii.U8.CheckU8(TempUnpackPath + "00000000.app") == false)
+
+                if (e.Argument is string) sourceWad.LoadFile((string)e.Argument);
+                else if (e.Argument is DownloadDataCompletedEventArgs) sourceWad.LoadFile(((DownloadDataCompletedEventArgs)e.Argument).Result);
+
+                if (!sourceWad.HasBanner)
                     throw new Exception("CustomizeMii only edits Channel WADs!");
 
-                SourceWad = (string)e.Argument;
-                this.Invoke(SetSourceWad);
-
-                bwLoadChannel.ReportProgress(25, "Loading 00000000.app...");
-                Wii.U8.UnpackU8(TempUnpackPath + "00000000.app", TempUnpackPath + "00000000.app_OUT");
-
-                bwLoadChannel.ReportProgress(50, "Loading banner.bin...");
-                Wii.U8.UnpackU8(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin", TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT");
-
-                bwLoadChannel.ReportProgress(75, "Loading icon.bin...");
-                Wii.U8.UnpackU8(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin", TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT");
-
-                bwLoadChannel.ReportProgress(90, "Gathering Information...");
-                string[] ChannelTitles = Wii.WadInfo.GetChannelTitles(WadFile);
-                string TitleID = Wii.WadInfo.GetTitleID(WadFile, 1);
-                string IosFlag = Wii.WadInfo.GetIosFlag(WadFile).Replace("IOS", string.Empty);
-
-                bool allLangs = true;
-                SetText(tbTitleID, TitleID);
-                SetText(tbStartupIos, IosFlag);
-
-                if (ChannelTitles[0] != ChannelTitles[1]) SetText(tbJapanese, ChannelTitles[0]);
-                else allLangs = false;
-                if (ChannelTitles[2] != ChannelTitles[1]) SetText(tbGerman, ChannelTitles[2]);
-                else allLangs = false;
-                if (ChannelTitles[3] != ChannelTitles[1]) SetText(tbFrench, ChannelTitles[3]);
-                else allLangs = false;
-                if (ChannelTitles[4] != ChannelTitles[1]) SetText(tbSpanish, ChannelTitles[4]);
-                else allLangs = false;
-                if (ChannelTitles[5] != ChannelTitles[1]) SetText(tbItalian, ChannelTitles[5]);
-                else allLangs = false;
-                if (ChannelTitles[6] != ChannelTitles[1]) SetText(tbDutch, ChannelTitles[6]);
-                else allLangs = false;
-                if (ChannelTitles[7] != ChannelTitles[1]) SetText(tbKorean, ChannelTitles[7]);
-
-                if (allLangs) SetText(tbEnglish, ChannelTitles[1]);
-                else SetText(tbAllLanguages, ChannelTitles[1]);
-
-                string[] trailer = Directory.GetFiles(TempUnpackPath, "*.trailer");
-                if (trailer.Length > 0)
+                int progressValue = 30;
+                for (int i = 0; i < sourceWad.BannerApp.NumOfNodes; i++)
                 {
-                    DateTime timestamp = Wii.WadInfo.GetCreationTime(trailer[0]);
-
-                    if (timestamp > new DateTime(1970, 1, 1))
+                    if (sourceWad.BannerApp.StringTable[i].ToLower() == "banner.bin")
                     {
-                        SetLabel(lbCreatedValue, timestamp.ToString() + " (UTC)");
+                        progressValue += 20;
+                        bwLoadChannel.ReportProgress(progressValue, "Loading banner.bin...");
+                        bannerBin.LoadFile(sourceWad.BannerApp.Data[i]);
+                    }
+                    else if (sourceWad.BannerApp.StringTable[i].ToLower() == "icon.bin")
+                    {
+                        progressValue += 20;
+                        bwLoadChannel.ReportProgress(progressValue, "Loading icon.bin...");
+                        iconBin.LoadFile(sourceWad.BannerApp.Data[i]);
                     }
-                    else SetLabel(lbCreatedValue, "No Timestamp!");
                 }
-                else SetLabel(lbCreatedValue, "No Timestamp!");
 
-                EventHandler AddBannerTpls = new EventHandler(this.AddBannerTpls);
-                EventHandler AddIconTpls = new EventHandler(this.AddIconTpls);
-                EventHandler AddBrlyts = new EventHandler(this.AddBrlyts);
-                EventHandler AddBrlans = new EventHandler(this.AddBrlans);
-                this.Invoke(AddBannerTpls);
-                this.Invoke(AddIconTpls);
-                this.Invoke(AddBrlyts);
-                this.Invoke(AddBrlans);
+                bwLoadChannel.ReportProgress(90, "Loading Channel Information...");
+                setControlText(tbTitleID, sourceWad.UpperTitleID);
+                setControlText(tbStartupIos, ((int)sourceWad.StartupIOS).ToString());
 
-                bwLoadChannel.ReportProgress(100);
-                EventHandler EnableCtrls = new EventHandler(this.EnableControls);
-                this.Invoke(EnableCtrls);
+                string[] channelTitles = ((Headers.IMET)sourceWad.BannerApp.Header).GetTitles();
+                bool allLangs = true;
 
-                SetButton(btnBrowseSource, "Clear");
+                if (channelTitles[0] != channelTitles[1]) setControlText(tbJapanese, channelTitles[0]);
+                else allLangs = false;
+                if (channelTitles[2] != channelTitles[1]) setControlText(tbGerman, channelTitles[2]);
+                else allLangs = false;
+                if (channelTitles[3] != channelTitles[1]) setControlText(tbFrench, channelTitles[3]);
+                else allLangs = false;
+                if (channelTitles[4] != channelTitles[1]) setControlText(tbSpanish, channelTitles[4]);
+                else allLangs = false;
+                if (channelTitles[5] != channelTitles[1]) setControlText(tbItalian, channelTitles[5]);
+                else allLangs = false;
+                if (channelTitles[6] != channelTitles[1]) setControlText(tbDutch, channelTitles[6]);
+                else allLangs = false;
+                if (channelTitles[7] != channelTitles[1]) setControlText(tbKorean, channelTitles[7]);
 
-                if (!hashesMatch)
-                    System.Windows.Forms.MessageBox.Show("At least one content's hash doesn't match the hash in the TMD!\n" +
-                        "Some files of the WAD might be corrupted, thus it might brick your Wii!", "Warning",
-                        System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Warning);
+                if (allLangs) setControlText(tbEnglish, channelTitles[1]);
+                else setControlText(tbAllLanguages, channelTitles[1]);
+
+                bwLoadChannel.ReportProgress(95, "Loading Footer...");
+                if (sourceWad.CreationTimeUTC > new DateTime(1970, 1, 1))
+                    setControlText(lbCreatedValue, sourceWad.CreationTimeUTC.ToString() + " (UTC)");
+                else setControlText(lbCreatedValue, "No Timestamp!");
+
+                addTpls();
+                addBrlyts();
+                addBrlans();
+
+                enableControls();
+
+                setControlText(btnBrowseSource, "Clear");
             }
             catch (Exception ex)
             {
-                if (Directory.Exists(TempUnpackPath)) Directory.Delete(TempUnpackPath, true);
-                SourceWad = string.Empty;
-                SetText(tbSourceWad, string.Empty);
-                ErrorBox(ex.Message);
+                setControlText(tbSourceWad, string.Empty);
+                errorBox(ex.Message);
             }
         }
 
         void bwTransmit_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            EventHandler EnableControls = new EventHandler(this.EnableControls);
-            EventHandler Initialize = new EventHandler(this.Initialize);
             currentProgress.progressValue = 100;
             currentProgress.progressState = " ";
 
             this.Invoke(ProgressUpdate);
-            this.Invoke(EnableControls);
+            enableControls();
 
             if (transmitInfo.timeElapsed > 0)
             {
-                System.Windows.Forms.DialogResult dlg;
+                DialogResult dlg;
 
-                if (transmitInfo.usedCompression)
-                    dlg = System.Windows.Forms.MessageBox.Show(
+                if (transmitInfo.compressionRatio > 0)
+                    dlg = MessageBox.Show(
                         string.Format("Transmitted {0} kB in {1} milliseconds...\nCompression Ratio: {2}%\n\nDo you want to save the wad file?",
                         transmitInfo.transmittedLength, transmitInfo.timeElapsed, transmitInfo.compressionRatio),
-                        "Save File?", System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Question);
+                        "Save File?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
                 else
-                    dlg = System.Windows.Forms.MessageBox.Show(
+                    dlg = MessageBox.Show(
                         string.Format("Transmitted {0} kB in {1} milliseconds...\n\nDo you want to save the wad file?",
                         transmitInfo.transmittedLength, transmitInfo.timeElapsed),
-                        "Save File?", System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Question);
+                        "Save File?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
 
-                if (dlg == System.Windows.Forms.DialogResult.Yes)
+                if (dlg == DialogResult.Yes)
                 {
-                    System.Windows.Forms.SaveFileDialog sfd = new System.Windows.Forms.SaveFileDialog();
+                    SaveFileDialog sfd = new SaveFileDialog();
                     sfd.Filter = "Wii Channels|*.wad";
 
                     if (!string.IsNullOrEmpty(tbAllLanguages.Text))
@@ -593,15 +566,15 @@ namespace CustomizeMii
                     else
                         sfd.FileName = tbEnglish.Text + " - " + tbTitleID.Text.ToUpper() + ".wad";
 
-                    if (sfd.ShowDialog() == System.Windows.Forms.DialogResult.OK)
-                        File.Copy(TempPath + "SendToWii.wad", sfd.FileName, true);
+                    if (sfd.ShowDialog() == DialogResult.OK)
+                    {
+                        if (File.Exists(sfd.FileName)) File.Delete(sfd.FileName);
+                        File.WriteAllBytes(sfd.FileName, wadCreationInfo.wadFile);
+                    }
                 }
 
-                this.Invoke(Initialize);
+                initialize();
             }
-
-            try { File.Delete(TempPath + "SendToWii.wad"); }
-            catch { }
         }
 
         void bwTransmit_ProgressChanged(object sender, ProgressChangedEventArgs e)
@@ -620,164 +593,56 @@ namespace CustomizeMii
 
                 //Insert wad into stub dol
                 string fileName = "CMiiInstaller.dol";
-                byte[] fileData = CustomizeMiiInstaller.InstallerHelper.CreateInstaller(TempPath + "SendToWii.wad", (byte)wadCreationInfo.transmitIos).ToArray();
+                byte[] fileData = CustomizeMiiInstaller.InstallerHelper.CreateInstaller(wadCreationInfo.wadFile, (byte)wadCreationInfo.transmitIos).ToArray();
 
                 //Transmit installer
-                transmitInfo.timeElapsed = 0; TransmitTimer.Reset(); TransmitTimer.Start();
-                bool compress = File.Exists(System.Windows.Forms.Application.StartupPath + "\\zlib1.dll");
+                Stopwatch transmitTimer = new Stopwatch();
 
-                if (!Environment.OSVersion.ToString().Contains("Windows"))
-                    compress = false;
+                HbcTransmitter transmitter = new HbcTransmitter(wadCreationInfo.transmitProtocol, wadCreationInfo.transmitIp);
+                transmitter.Progress += new EventHandler<ProgressChangedEventArgs>(transmitter_Progress);
 
-                if ((int)(wadCreationInfo.transmitProtocol) == 1) compress = false;
+                transmitter_Progress(null, new ProgressChangedEventArgs(0, null));
+                transmitTimer.Start();
 
-                TcpClient theClient = new TcpClient();
+                bool success = transmitter.TransmitFile(fileName, fileData);
 
-                byte[] compFileData;
-                int Blocksize = 4 * 1024;
-                if (wadCreationInfo.transmitProtocol != TransmitProtocol.JODI) Blocksize = 16 * 1024;
-                byte[] buffer = new byte[4];
-                string theIP = wadCreationInfo.transmitIp;
+                transmitTimer.Stop();
 
-                bwTransmit.ReportProgress(0, "Connecting...");
-                //StatusUpdate("Connecting...");
-                try { theClient.Connect(theIP, 4299); }
-                catch (Exception ex) { theClient.Close(); throw new Exception("Connection Failed:\n" + ex.Message); }
-                NetworkStream theStream = theClient.GetStream();
-
-                bwTransmit.ReportProgress(0, "Connected... Sending Magic...");
-                //StatusUpdate("Connected... Sending Magic...");
-                buffer[0] = (byte)'H';
-                buffer[1] = (byte)'A';
-                buffer[2] = (byte)'X';
-                buffer[3] = (byte)'X';
-                try { theStream.Write(buffer, 0, 4); }
-                catch (Exception ex) { theStream.Close(); theClient.Close(); throw new Exception("Error sending Magic:\n" + ex.Message); }
-
-                bwTransmit.ReportProgress(0, "Magic Sent... Sending Version Info...");
-                //StatusUpdate("Magic Sent... Sending Version Info...");
-                buffer[0] = 0;
-                buffer[1] = wadCreationInfo.transmitProtocol == TransmitProtocol.JODI ? (byte)5 : (byte)4;
-                buffer[2] = (byte)(((fileName.Length + 2) >> 8) & 0xff);
-                buffer[3] = (byte)((fileName.Length + 2) & 0xff);
-
-                try { theStream.Write(buffer, 0, 4); }
-                catch (Exception ex) { theStream.Close(); theClient.Close(); throw new Exception("Error sending Version Info:\n" + ex.Message); }
-
-                if (compress)
-                {
-                    bwTransmit.ReportProgress(0, "Version Info Sent... Compressing File...");
-                    //StatusUpdate("Version Info Sent... Compressing File...");
-                    try { compFileData = TransmitMii.zlib.Compress(fileData); }
-                    catch (Exception ex)
-                    {
-                        ErrorBox(ex.Message);
-                        //Compression failed, let's continue without compression
-                        compFileData = fileData;
-                        fileData = new byte[0];
-                    }
-
-                    bwTransmit.ReportProgress(0, "Compressed File... Sending Filesize...");
-                    //StatusUpdate("Compressed File... Sending Filesize...");
-                }
+                if (!success) errorBox(transmitter.LastError);
                 else
                 {
-                    compFileData = fileData;
-                    fileData = new byte[0];
-
-                    bwTransmit.ReportProgress(0, "Version Info Sent... Sending Filesize...");
-                    //StatusUpdate("Version Info Sent... Sending Filesize...");
+                    transmitInfo.timeElapsed = (int)transmitTimer.ElapsedMilliseconds;
+                    transmitInfo.compressionRatio = transmitter.CompressionRatio;
+                    transmitInfo.transmittedLength = Math.Round(transmitter.TransmittedLength * 0.0009765625, 2);
                 }
-
-                //First compressed filesize, then uncompressed filesize
-                buffer[0] = (byte)((compFileData.Length >> 24) & 0xff);
-                buffer[1] = (byte)((compFileData.Length >> 16) & 0xff);
-                buffer[2] = (byte)((compFileData.Length >> 8) & 0xff);
-                buffer[3] = (byte)(compFileData.Length & 0xff);
-                try { theStream.Write(buffer, 0, 4); }
-                catch (Exception ex) { theStream.Close(); theClient.Close(); throw new Exception("Error sending Filesize:\n" + ex.Message); }
-
-                if (wadCreationInfo.transmitProtocol != TransmitProtocol.HAXX)
-                {
-                    buffer[0] = (byte)((fileData.Length >> 24) & 0xff);
-                    buffer[1] = (byte)((fileData.Length >> 16) & 0xff);
-                    buffer[2] = (byte)((fileData.Length >> 8) & 0xff);
-                    buffer[3] = (byte)(fileData.Length & 0xff);
-                    try { theStream.Write(buffer, 0, 4); }
-                    catch (Exception ex) { theStream.Close(); theClient.Close(); throw new Exception("Error sending Filesize:\n" + ex.Message); }
-                }
-
-                bwTransmit.ReportProgress(0, "Filesize Sent... Sending File...");
-                //StatusUpdate("Filesize Sent... Sending File...");
-                int off = 0;
-                int cur = 0;
-                int count = compFileData.Length / Blocksize;
-                int left = compFileData.Length % Blocksize;
-
-                try
-                {
-                    do
-                    {
-                        bwTransmit.ReportProgress((cur + 1) * 100 / count, "Sending File...");
-                        //StatusUpdate("Sending File: " + ((cur + 1) * 100 / count).ToString() + "%");
-                        theStream.Write(compFileData, off, Blocksize);
-                        off += Blocksize;
-                        cur++;
-                    } while (cur < count);
-
-                    if (left > 0)
-                    {
-                        theStream.Write(compFileData, off, compFileData.Length - off);
-                    }
-                }
-                catch (Exception ex) { theStream.Close(); theClient.Close(); throw new Exception("Error sending File:\n" + ex.Message); }
-
-                bwTransmit.ReportProgress(0, "File Sent... Sending Arguments...");
-                //StatusUpdate("File Sent... Sending Arguments...");
-                byte[] theArgs = new byte[fileName.Length + 2];
-                for (int i = 0; i < fileName.Length; i++) { theArgs[i] = (byte)fileName.ToCharArray()[i]; }
-                try { theStream.Write(theArgs, 0, theArgs.Length); }
-                catch (Exception ex) { theStream.Close(); theClient.Close(); throw new Exception("Error sending Arguments:\n" + ex.Message); }
-
-                theStream.Close();
-                theClient.Close();
-
-                bwTransmit.ReportProgress(0, string.Empty);
-                //StatusUpdate(string.Empty);
-
-                TransmitTimer.Stop();
-                transmitInfo.timeElapsed = (int)TransmitTimer.ElapsedMilliseconds;
-                transmitInfo.usedCompression = compress;
-                transmitInfo.transmittedLength = Math.Round(compFileData.Length * 0.0009765625, 2);
-                if (compress && fileData.Length != 0)
-                    transmitInfo.compressionRatio = (compFileData.Length * 100) / fileData.Length;
-            }
-            catch (Exception ex)
-            {
-                ErrorBox(ex.Message);
             }
+            catch (Exception ex) { errorBox(ex.Message); }
+        }
+
+        void transmitter_Progress(object sender, ProgressChangedEventArgs e)
+        {
+            currentProgress.progressValue = e.ProgressPercentage;
+            currentProgress.progressState = "Sending File...";
+
+            this.Invoke(ProgressUpdate);
         }
 
         void bwCreateWad_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
-            if (!this.sendToWii)
+            if (!wadCreationInfo.sendToWii)
             {
-                EventHandler EnableControls = new EventHandler(this.EnableControls);
                 currentProgress.progressValue = 100;
                 currentProgress.progressState = " ";
 
                 this.Invoke(ProgressUpdate);
-                this.Invoke(EnableControls);
+                enableControls();
 
                 if (wadCreationInfo.success)
-                {
-                    EventHandler Initialize = new EventHandler(this.Initialize);
-                    this.Invoke(Initialize);
-                }
+                    initialize();
             }
             else
             {
-                if (sendWadReady == 1)
+                if (wadCreationInfo.sendWadReady == true)
                 {
                     //Start new BackgroundWorker to Transmit
                     BackgroundWorker bwTransmit = new BackgroundWorker();
@@ -787,6 +652,14 @@ namespace CustomizeMii
                     bwTransmit.RunWorkerCompleted += new RunWorkerCompletedEventHandler(bwTransmit_RunWorkerCompleted);
                     bwTransmit.RunWorkerAsync();
                 }
+                else
+                {
+                    currentProgress.progressValue = 100;
+                    currentProgress.progressState = " ";
+
+                    this.Invoke(ProgressUpdate);
+                    enableControls();
+                }
             }
         }
 
@@ -800,229 +673,162 @@ namespace CustomizeMii
 
         void bwCreateWad_DoWork(object sender, DoWorkEventArgs e)
         {
-            //try
-            //{
-                BackgroundWorker bwCreateWad = sender as BackgroundWorker;
+            BackgroundWorker bwCreateWad = sender as BackgroundWorker;
+            Stopwatch creationTimer = new Stopwatch();
+            creationTimer.Start();
+
+            try
+            {
                 WadCreationInfo wadInfo = (WadCreationInfo)e.Argument;
-                EventHandler DisableControls = new EventHandler(this.DisableControls);
-                this.Invoke(DisableControls);
 
-                this.sendToWii = wadInfo.sendToWii;
-                sendWadReady = 0;
 
+                disableControls();
+
+                //Check Startup IOS
+                if (wadInfo.startupIos < 0 || wadInfo.startupIos > 255)
+                    throw new Exception("Startup IOS must be between 0 and 255!");
+
+                wadInfo.success = false;
+                wadInfo.sendWadReady = false;
                 wadCreationInfo = wadInfo;
-                wadCreationInfo.success = false;
 
-                bwCreateWad.ReportProgress(0, "Making TPLs transparent");
-                MakeBannerTplsTransparent();
-                MakeIconTplsTransparent();
+                //Make TPLs transparent
+                makeBannerTplsTransparent();
+                makeIconTplsTransparent();
 
-                bwCreateWad.ReportProgress(3, "Fixing TPL Filters...");
-                FixTpls();
-
-                bwCreateWad.ReportProgress(5, "Packing icon.bin...");
-                byte[] iconbin;
-
-                if (!string.IsNullOrEmpty(IconReplace))
-                    iconbin = Wii.U8.PackU8(TempIconPath);
-                else
-                    iconbin = Wii.U8.PackU8(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT");
-
-                if (cbLz77.Checked == true) iconbin = Wii.Lz77.Compress(iconbin);
-                iconbin = Wii.U8.AddHeaderIMD5(iconbin);
-                Wii.Tools.SaveFileFromByteArray(iconbin, TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin");
-                Directory.Delete(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT", true);
-
-                bwCreateWad.ReportProgress(25, "Packing banner.bin...");
-                byte[] bannerbin;
-
-                if (!string.IsNullOrEmpty(BannerReplace))
-                    bannerbin = Wii.U8.PackU8(TempBannerPath);
-                else
-                    bannerbin = Wii.U8.PackU8(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT");
-
-                if (cbLz77.Checked == true) bannerbin = Wii.Lz77.Compress(bannerbin);
-                bannerbin = Wii.U8.AddHeaderIMD5(bannerbin);
-                Wii.Tools.SaveFileFromByteArray(bannerbin, TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin");
-                Directory.Delete(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT", true);
-
-                if (!string.IsNullOrEmpty(SoundReplace) || !string.IsNullOrEmpty(wadInfo.sound))
+                //Pack icon.bin
+                bwCreateWad.ReportProgress(0, "Packing icon.bin...");
+                if (string.IsNullOrEmpty(replacedIcon))
                 {
-                    bwCreateWad.ReportProgress(50, "Packing sound.bin...");
+                    iconBin.AddHeaderImd5();
+                    iconBin.Lz77Compress = wadInfo.lz77;
 
-                    if (!string.IsNullOrEmpty(SoundReplace))
-                    {
-                        File.Delete(TempUnpackPath + "00000000.app_OUT\\meta\\sound.bin");
-                        File.Copy(TempSoundPath, TempUnpackPath + "00000000.app_OUT\\meta\\sound.bin");
-                    }
-                    else if (!string.IsNullOrEmpty(wadInfo.sound))
-                    {
-                        if (tbSound.Text.EndsWith(".bns"))
-                        {
-                            Wii.Sound.BnsToSoundBin(wadInfo.sound, TempUnpackPath + "00000000.app_OUT\\meta\\sound.bin", false);
-                        }
-                        else if (wadInfo.sound.StartsWith("BNS:"))
-                        {
-                            Wii.Sound.BnsToSoundBin(TempBnsPath, TempUnpackPath + "00000000.app_OUT\\meta\\sound.bin", false);
-                        }
-                        else
-                        {
-                            string SoundFile = wadInfo.sound;
-                            if (wadInfo.sound.EndsWith(".mp3")) SoundFile = TempWavePath;
+                    for (int i = 0; i < sourceWad.BannerApp.NumOfNodes; i++)
+                        if (sourceWad.BannerApp.StringTable[i].ToLower() == "icon.bin")
+                        { sourceWad.BannerApp.ReplaceFile(i, iconBin.ToByteArray()); break; }
+                }
+                else
+                {
+                    newIconBin.AddHeaderImd5();
+                    newIconBin.Lz77Compress = wadInfo.lz77;
 
-                            Wii.Sound.WaveToSoundBin(SoundFile, TempUnpackPath + "00000000.app_OUT\\meta\\sound.bin", false);
-                        }
-                    }
+                    for (int i = 0; i < sourceWad.BannerApp.NumOfNodes; i++)
+                        if (sourceWad.BannerApp.StringTable[i].ToLower() == "icon.bin")
+                        { sourceWad.BannerApp.ReplaceFile(i, newIconBin.ToByteArray()); break; }
                 }
 
-                bwCreateWad.ReportProgress(60, "Packing 00000000.app...");
-                int[] Sizes = new int[3];
-                
+                //Pack banner.bin
+                bwCreateWad.ReportProgress(20, "Packing banner.bin...");
+                if (string.IsNullOrEmpty(replacedBanner))
+                {
+                    bannerBin.AddHeaderImd5();
+                    bannerBin.Lz77Compress = wadInfo.lz77;
 
-                for (int i = 0; i < wadInfo.titles.Length; i++)
-                    if (string.IsNullOrEmpty(wadInfo.titles[i])) wadInfo.titles[i] = wadInfo.allLangTitle;
+                    for (int i = 0; i < sourceWad.BannerApp.NumOfNodes; i++)
+                        if (sourceWad.BannerApp.StringTable[i].ToLower() == "banner.bin")
+                        { sourceWad.BannerApp.ReplaceFile(i, bannerBin.ToByteArray()); break; }
+                }
+                else
+                {
+                    newBannerBin.AddHeaderImd5();
+                    bannerBin.Lz77Compress = wadInfo.lz77;
 
-                byte[] nullapp = Wii.U8.PackU8(TempUnpackPath + "00000000.app_OUT", out Sizes[0], out Sizes[1], out Sizes[2]);               
-                nullapp = Wii.U8.AddHeaderIMET(nullapp, wadInfo.titles, Sizes);
-                Wii.Tools.SaveFileFromByteArray(nullapp, TempUnpackPath + "00000000.app");
-                Directory.Delete(TempUnpackPath + "00000000.app_OUT", true);
+                    for (int i = 0; i < sourceWad.BannerApp.NumOfNodes; i++)
+                        if (sourceWad.BannerApp.StringTable[i].ToLower() == "banner.bin")
+                        { sourceWad.BannerApp.ReplaceFile(i, newBannerBin.ToByteArray()); break; }
+                }
 
-                string[] tikfile = Directory.GetFiles(TempUnpackPath, "*.tik");
-                string[] tmdfile = Directory.GetFiles(TempUnpackPath, "*.tmd");
-                byte[] tmd = Wii.Tools.LoadFileToByteArray(tmdfile[0]);
+                //Pack sound.bin
+                bwCreateWad.ReportProgress(40, "Packing sound.bin...");
+                if (!string.IsNullOrEmpty(replacedSound) || !string.IsNullOrEmpty(wadInfo.sound))
+                {
+                    for (int i = 0; i < sourceWad.BannerApp.NumOfNodes; i++)
+                        if (sourceWad.BannerApp.StringTable[i].ToLower() == "sound.bin")
+                        { sourceWad.BannerApp.ReplaceFile(i, newSoundBin); break; }
+                }
 
+                //Insert new dol
                 if (!string.IsNullOrEmpty(wadInfo.dol))
                 {
-                    bwCreateWad.ReportProgress(80, "Inserting new DOL...");
-                    string[] AppFiles = Directory.GetFiles(TempUnpackPath, "*.app");
+                    bwCreateWad.ReportProgress(50, "Inserting DOL...");
+                    sourceWad.RemoveAllContents();
 
-                    foreach (string thisApp in AppFiles)
-                        if (!thisApp.EndsWith("00000000.app")) File.Delete(thisApp);
-
-                    if (wadInfo.nandLoader == 0)
+                    if (wadInfo.nandLoader == WadCreationInfo.NandLoader.comex)
                     {
-                        using (BinaryReader nandloader = new BinaryReader(System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("CustomizeMii.Resources.comex.app")))
-                        {
-                            using (FileStream fs = new FileStream(TempUnpackPath + "\\00000001.app", FileMode.Create))
-                            {
-                                byte[] temp = nandloader.ReadBytes((int)nandloader.BaseStream.Length);
-                                fs.Write(temp, 0, temp.Length);
-                            }
-                        }
+                        sourceWad.AddContent(Properties.Resources.comex, 1, 1, ContentType.Normal);
 
                         if (wadInfo.dol.StartsWith("Simple Forwarder:"))
-                        {
-                            CreateForwarderSimple(TempUnpackPath + "\\00000002.app");
-                        }
+                            sourceWad.AddContent(createForwarderSimple(), 2, 2, ContentType.Normal);
                         else if (wadInfo.dol.StartsWith("Complex Forwarder"))
                         {
-                            bwCreateWad.ReportProgress(82, "Compiling Forwarder...");
-                            CreateForwarderComplex(TempUnpackPath + "\\00000002.app");
-                        }
-                        else if (wadInfo.dol == "Internal" || wadInfo.dol.EndsWith(".wad"))
-                        {
-                            File.Copy(TempDolPath, TempUnpackPath + "\\00000002.app");
+                            bwCreateWad.ReportProgress(55, "Compiling Forwarder...");
+                            sourceWad.AddContent(createForwarderComplex(), 2, 2, ContentType.Normal);
                         }
                         else
-                        {
-                            File.Copy(wadInfo.dol, TempUnpackPath + "\\00000002.app");
-                        }
+                            sourceWad.AddContent(newDol, 2, 2, ContentType.Normal);
 
-                        tmd = Wii.WadEdit.ChangeTmdBootIndex(tmd, 1);
+                        sourceWad.BootIndex = 1;
                     }
                     else
                     {
-                        using (BinaryReader nandloader = new BinaryReader(System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream("CustomizeMii.Resources.Waninkoko.app")))
-                        {
-                            using (FileStream fs = new FileStream(TempUnpackPath + "\\00000002.app", FileMode.Create))
-                            {
-                                byte[] temp = nandloader.ReadBytes((int)nandloader.BaseStream.Length);
-                                fs.Write(temp, 0, temp.Length);
-                            }
-                        }
+                        sourceWad.AddContent(Properties.Resources.Waninkoko, 2, 2, ContentType.Normal);
 
                         if (wadInfo.dol.StartsWith("Simple Forwarder:"))
-                        {
-                            CreateForwarderSimple(TempUnpackPath + "\\00000001.app");
-                        }
+                            sourceWad.AddContent(createForwarderSimple(), 1, 1, ContentType.Normal);
                         else if (wadInfo.dol.StartsWith("Complex Forwarder"))
                         {
-                            bwCreateWad.ReportProgress(82, "Compiling Forwarder...");
-                            CreateForwarderComplex(TempUnpackPath + "\\00000001.app");
-                        }
-                        else if (wadInfo.dol == "Internal")
-                        {
-                            File.Copy(TempDolPath, TempUnpackPath + "\\00000001.app");
+                            bwCreateWad.ReportProgress(55, "Compiling Forwarder...");
+                            sourceWad.AddContent(createForwarderComplex(), 1, 1, ContentType.Normal);
                         }
                         else
-                        {
-                            File.Copy(tbDol.Text, TempUnpackPath + "\\00000001.app");
-                        }
+                            sourceWad.AddContent(newDol, 1, 1, ContentType.Normal);
 
-                        tmd = Wii.WadEdit.ChangeTmdBootIndex(tmd, 2);
-                    }
-
-                    tmd = Wii.WadEdit.ChangeTmdContentCount(tmd, 3);
-
-                    bwCreateWad.ReportProgress(85, "Updating TMD...");
-                    File.Delete(tmdfile[0]);
-                    using (FileStream fs = new FileStream(tmdfile[0], FileMode.Create))
-                    {
-                        byte[] tmdconts = new byte[108];
-                        tmdconts[7] = 0x01;
-                        tmdconts[39] = 0x01;
-                        tmdconts[41] = 0x01;
-                        tmdconts[43] = 0x01;
-                        tmdconts[75] = 0x02;
-                        tmdconts[77] = 0x02;
-                        tmdconts[79] = 0x01;
-
-                        fs.Write(tmd, 0, 484);
-                        fs.Write(tmdconts, 0, tmdconts.Length);
+                        sourceWad.BootIndex = 2;
                     }
                 }
 
-                bwCreateWad.ReportProgress(85, "Updating TMD...");
-                Wii.WadEdit.ChangeIosFlag(tmdfile[0], wadInfo.requiredIos);
-                Wii.WadEdit.UpdateTmdContents(tmdfile[0]);
+                //Change channel information
+                for (int i = 0; i < wadInfo.titles.Length; i++)
+                    if (string.IsNullOrEmpty(wadInfo.titles[i]))
+                        wadInfo.titles[i] = wadInfo.allLangTitle;
 
+                bwCreateWad.ReportProgress(75, "Updating Channel Information...");
+                sourceWad.ChangeStartupIOS(wadInfo.startupIos);
+                sourceWad.ChangeChannelTitles(wadInfo.titles);
                 if (!string.IsNullOrEmpty(wadInfo.titleId))
-                {
-                    Wii.WadEdit.ChangeTitleID(tikfile[0], 0, wadInfo.titleId);
-                    Wii.WadEdit.ChangeTitleID(tmdfile[0], 1, wadInfo.titleId);
-                }
+                    sourceWad.ChangeTitleID(LowerTitleID.Channel, wadInfo.titleId);
 
-                bwCreateWad.ReportProgress(90, "Trucha Signing...");
-                Wii.WadEdit.TruchaSign(tmdfile[0], 1);
-                Wii.WadEdit.TruchaSign(tikfile[0], 0);
+                sourceWad.FakeSign = true;
+                sourceWad.ChangeTitleKey("GottaGetSomeBeer");
 
-                bwCreateWad.ReportProgress(95, "Packing WAD...");
-                if (File.Exists(wadInfo.outFile)) File.Delete(wadInfo.outFile);
-                Wii.WadPack.PackWad(TempUnpackPath, wadInfo.outFile);
+                //Pack WAD
+                bwCreateWad.ReportProgress(80, "Packing WAD...");
+                if (!wadInfo.sendToWii) sourceWad.Save(wadInfo.outFile);
+                else wadInfo.wadFile = sourceWad.ToByteArray();
 
                 bwCreateWad.ReportProgress(100, " ");
-                CreationTimer.Stop();
+                creationTimer.Stop();
 
-                if (!sendToWii)
+                if (!wadInfo.sendToWii)
                 {
                     FileInfo fi = new FileInfo(wadInfo.outFile);
                     double fileSize = Math.Round(fi.Length * 0.0009765625 * 0.0009765625, 2);
 
-                    InfoBox(string.Format("Successfully created custom channel!\nTime elapsed: {0} ms\nFilesize: {1} MB\nApprox. Blocks: {2}", CreationTimer.ElapsedMilliseconds, fileSize, Wii.WadInfo.GetNandBlocks(wadInfo.outFile)));
+                    infoBox(string.Format("Successfully created custom channel!\nTime elapsed: {0} ms\nFilesize: {1} MB\nApprox. Blocks: {2}", creationTimer.ElapsedMilliseconds, fileSize, sourceWad.NandBlocks));
                 }
-                else sendWadReady = 1;
+                else wadInfo.sendWadReady = true;
 
                 wadCreationInfo = wadInfo;
                 wadCreationInfo.success = true;
-            //}
-            //catch (Exception ex)
-            //{
-            //    sendWadReady = -1;
-            //    CreationTimer.Stop();
-            //    EventHandler EnableControls = new EventHandler(this.EnableControls);
-            //    this.Invoke(EnableControls);
-            //    ErrorBox(ex.Message);
-            //}
+            }
+            catch (Exception ex)
+            {
+                wadCreationInfo.sendWadReady = false;
+                creationTimer.Stop();
+
+                enableControls();
+                errorBox(ex.Message);
+            }
         }
     }
 }
diff --git a/CustomizeMii/CustomizeMii_BnsConvert.cs b/CustomizeMii/CustomizeMii_BnsConvert.cs
index d85cd9e..d8e8a5e 100644
--- a/CustomizeMii/CustomizeMii_BnsConvert.cs
+++ b/CustomizeMii/CustomizeMii_BnsConvert.cs
@@ -19,8 +19,8 @@ using System;
 using System.IO;
 using System.Windows.Forms;
 using System.ComponentModel;
-using WaveFile;
 using System.Media;
+using libWiiSharp;
 
 namespace CustomizeMii
 {
@@ -40,6 +40,7 @@ namespace CustomizeMii
         private int sampleCount;
         private SoundPlayer sPlayer;
         private bool mp3LengthKnown = false;
+        private byte[] sourceSound = new byte[0];
 
         public string AudioFile { get { return tbAudioFile.Text; } }
         public bool LoopNone { get { return rbNone.Checked; } }
@@ -47,6 +48,7 @@ namespace CustomizeMii
         public bool LoopManually { get { return rbEnterManually.Checked; } }
         public int LoopStartSample { get { return loopStartSample; } }
         public int ChannelCount { get { return channelCount; } }
+        public byte[] SourceSound { get { return sourceSound; } set { sourceSound = value; } }
 
         public CustomizeMii_BnsConvert(bool lameExists)
         {
@@ -60,17 +62,15 @@ namespace CustomizeMii
             this.Size = new System.Drawing.Size(btnCancel.Location.X + btnCancel.Size.Width + 15, this.Size.Height);
 
             this.CenterToParent();
+
             bwGatherInfo = new BackgroundWorker();
             bwGatherInfo.WorkerSupportsCancellation = true;
-
             bwGatherInfo.DoWork += new DoWorkEventHandler(bwGatherInfo_DoWork);
 
-            byte[] soundBin = Wii.Tools.LoadFileToByteArray(CustomizeMii_Main.TempUnpackPath + "00000000.app_OUT\\meta\\sound.bin", 32, 16);
-
-            if (soundBin[0] == 'R' && soundBin[1] == 'I' && soundBin[2] == 'F' && soundBin[3] == 'F')
+            if (sourceSound[0] == 'R' && sourceSound[1] == 'I' && sourceSound[2] == 'F' && sourceSound[3] == 'F')
             { cbSourceSound.Enabled = true; }
-            else if (soundBin[0] == 'L' && soundBin[1] == 'Z' && soundBin[2] == '7' && soundBin[3] == '7')
-                if (soundBin[9] == 'R' && soundBin[10] == 'I' && soundBin[11] == 'F' && soundBin[12] == 'F')
+            else if (sourceSound[0] == 'L' && sourceSound[1] == 'Z' && sourceSound[2] == '7' && sourceSound[3] == '7')
+                if (sourceSound[9] == 'R' && sourceSound[10] == 'I' && sourceSound[11] == 'F' && sourceSound[12] == 'F')
                 { cbSourceSound.Enabled = true; }
         }
 
@@ -133,16 +133,8 @@ namespace CustomizeMii
             {
                 tbAudioFile.Text = "Internal Sound";
 
-                FileStream fs = new FileStream(CustomizeMii_Main.TempUnpackPath + "00000000.app_OUT\\meta\\sound.bin", FileMode.Open);
-                byte[] audio = new byte[fs.Length - 32];
-                int offset = 0;
-
-                fs.Seek(32, SeekOrigin.Begin);
-                fs.Read(audio, 0, audio.Length);
-                fs.Close();
-
-                if ((offset = Wii.Lz77.GetLz77Offset(audio)) != -1)
-                    audio = Wii.Lz77.Decompress(audio, offset);
+                if (Lz77.IsLz77Compressed(sourceSound))
+                { Lz77 l = new Lz77(); sourceSound = l.Decompress(sourceSound); }
 
                 foreach (Label thisLabel in gbWaveInfo.Controls)
                     if (thisLabel.Name.ToLower().Contains("value"))
@@ -151,7 +143,7 @@ namespace CustomizeMii
                         thisLabel.Text = "Gathering";
                     }
 
-                bwGatherInfo.RunWorkerAsync(audio);
+                bwGatherInfo.RunWorkerAsync(sourceSound);
 
                 //this.Size = new System.Drawing.Size(510, 220);
                 this.Size = new System.Drawing.Size(gbWaveInfo.Location.X + gbWaveInfo.Size.Width + 15, this.Size.Height);
@@ -258,15 +250,6 @@ namespace CustomizeMii
 
                 if (!cancelled)
                     this.Invoke(UpdateValues);
-
-                if (e.Argument is byte[])
-                {
-                    byte[] audio = e.Argument as byte[];
-                    using (FileStream fs = new FileStream(CustomizeMii_Main.TempWavePath, FileMode.Create))
-                    {
-                        fs.Write(audio, 0, audio.Length);
-                    }
-                }
             }
             catch
             {
@@ -407,14 +390,7 @@ namespace CustomizeMii
                     Wave wave;
                     if (cbSourceSound.Checked)
                     {
-                        using (FileStream fs = new FileStream(CustomizeMii_Main.TempUnpackPath + "00000000.app_OUT\\meta\\sound.bin", FileMode.Open))
-                        {
-                            byte[] audio = new byte[fs.Length - 32];
-                            fs.Seek(32, SeekOrigin.Begin);
-                            fs.Read(audio, 0, audio.Length);
-
-                            wave = new Wave(audio);
-                        }
+                        wave = new Wave(sourceSound);
                     }
                     else wave = new Wave(tbAudioFile.Text);
 
diff --git a/CustomizeMii/CustomizeMii_ComplexForwarder.Designer.cs b/CustomizeMii/CustomizeMii_ComplexForwarder.Designer.cs
index 6a3b39c..fb75ba9 100644
--- a/CustomizeMii/CustomizeMii_ComplexForwarder.Designer.cs
+++ b/CustomizeMii/CustomizeMii_ComplexForwarder.Designer.cs
@@ -93,6 +93,7 @@ namespace CustomizeMii
             this.tb1.Size = new System.Drawing.Size(311, 20);
             this.tb1.TabIndex = 1;
             this.tb1.Text = "SD:/apps/example/boot.dol";
+            this.tb1.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // cbImage43
             // 
@@ -124,6 +125,7 @@ namespace CustomizeMii
             this.tbImage43.Enabled = false;
             this.tbImage43.Location = new System.Drawing.Point(94, 280);
             this.tbImage43.Name = "tbImage43";
+            this.tbImage43.ReadOnly = true;
             this.tbImage43.Size = new System.Drawing.Size(171, 20);
             this.tbImage43.TabIndex = 4;
             // 
@@ -133,6 +135,7 @@ namespace CustomizeMii
             this.tbImage169.Enabled = false;
             this.tbImage169.Location = new System.Drawing.Point(94, 309);
             this.tbImage169.Name = "tbImage169";
+            this.tbImage169.ReadOnly = true;
             this.tbImage169.Size = new System.Drawing.Size(171, 20);
             this.tbImage169.TabIndex = 5;
             // 
@@ -212,6 +215,7 @@ namespace CustomizeMii
             this.tb2.Size = new System.Drawing.Size(311, 20);
             this.tb2.TabIndex = 1;
             this.tb2.Text = "SD:/apps/example/boot.elf";
+            this.tb2.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tb3
             // 
@@ -220,6 +224,7 @@ namespace CustomizeMii
             this.tb3.Size = new System.Drawing.Size(311, 20);
             this.tb3.TabIndex = 1;
             this.tb3.Text = "USB:/apps/example/boot.dol";
+            this.tb3.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tb4
             // 
@@ -228,6 +233,7 @@ namespace CustomizeMii
             this.tb4.Size = new System.Drawing.Size(311, 20);
             this.tb4.TabIndex = 1;
             this.tb4.Text = "USB:/apps/example/boot.elf";
+            this.tb4.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tabPaths
             // 
@@ -288,6 +294,7 @@ namespace CustomizeMii
             this.tb5.Name = "tb5";
             this.tb5.Size = new System.Drawing.Size(311, 20);
             this.tb5.TabIndex = 4;
+            this.tb5.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tb6
             // 
@@ -296,6 +303,7 @@ namespace CustomizeMii
             this.tb6.Name = "tb6";
             this.tb6.Size = new System.Drawing.Size(311, 20);
             this.tb6.TabIndex = 5;
+            this.tb6.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tb7
             // 
@@ -304,6 +312,7 @@ namespace CustomizeMii
             this.tb7.Name = "tb7";
             this.tb7.Size = new System.Drawing.Size(311, 20);
             this.tb7.TabIndex = 2;
+            this.tb7.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tb8
             // 
@@ -312,6 +321,7 @@ namespace CustomizeMii
             this.tb8.Name = "tb8";
             this.tb8.Size = new System.Drawing.Size(311, 20);
             this.tb8.TabIndex = 3;
+            this.tb8.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tabOptional2
             // 
@@ -346,6 +356,7 @@ namespace CustomizeMii
             this.tb9.Name = "tb9";
             this.tb9.Size = new System.Drawing.Size(311, 20);
             this.tb9.TabIndex = 9;
+            this.tb9.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tb10
             // 
@@ -354,6 +365,7 @@ namespace CustomizeMii
             this.tb10.Name = "tb10";
             this.tb10.Size = new System.Drawing.Size(311, 20);
             this.tb10.TabIndex = 10;
+            this.tb10.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tb11
             // 
@@ -362,6 +374,7 @@ namespace CustomizeMii
             this.tb11.Name = "tb11";
             this.tb11.Size = new System.Drawing.Size(311, 20);
             this.tb11.TabIndex = 7;
+            this.tb11.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tb12
             // 
@@ -370,6 +383,7 @@ namespace CustomizeMii
             this.tb12.Name = "tb12";
             this.tb12.Size = new System.Drawing.Size(311, 20);
             this.tb12.TabIndex = 8;
+            this.tb12.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tabOptional3
             // 
@@ -404,6 +418,7 @@ namespace CustomizeMii
             this.tb13.Name = "tb13";
             this.tb13.Size = new System.Drawing.Size(311, 20);
             this.tb13.TabIndex = 9;
+            this.tb13.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tb14
             // 
@@ -412,6 +427,7 @@ namespace CustomizeMii
             this.tb14.Name = "tb14";
             this.tb14.Size = new System.Drawing.Size(311, 20);
             this.tb14.TabIndex = 10;
+            this.tb14.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tb15
             // 
@@ -420,6 +436,7 @@ namespace CustomizeMii
             this.tb15.Name = "tb15";
             this.tb15.Size = new System.Drawing.Size(311, 20);
             this.tb15.TabIndex = 7;
+            this.tb15.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // tb16
             // 
@@ -428,6 +445,7 @@ namespace CustomizeMii
             this.tb16.Name = "tb16";
             this.tb16.Size = new System.Drawing.Size(311, 20);
             this.tb16.TabIndex = 8;
+            this.tb16.TextChanged += new System.EventHandler(this.tb_TextChanged);
             // 
             // CustomizeMii_ComplexForwarder
             // 
diff --git a/CustomizeMii/CustomizeMii_ComplexForwarder.cs b/CustomizeMii/CustomizeMii_ComplexForwarder.cs
index 78c8dee..f6ae54e 100644
--- a/CustomizeMii/CustomizeMii_ComplexForwarder.cs
+++ b/CustomizeMii/CustomizeMii_ComplexForwarder.cs
@@ -152,5 +152,29 @@ namespace CustomizeMii
                 if (!cbPack3.Checked) thisTb.Text = string.Empty;
             }
         }
+
+        private void tb_TextChanged(object sender, EventArgs e)
+        {
+            TextBox tbSender = sender as TextBox;
+
+            int curPos = tbSender.SelectionStart;
+
+            if (tbSender.Text.Contains("\\"))
+                tbSender.Text = tbSender.Text.Replace("\\", "/");
+
+            if (tbSender.Text.Contains("sd:"))
+                tbSender.Text = tbSender.Text.Replace("sd:", "SD:");
+
+            if (tbSender.Text.Contains("usb:"))
+                tbSender.Text = tbSender.Text.Replace("usb:", "USB:");
+
+            if (tbSender.Text.Contains(".DOL"))
+                tbSender.Text = tbSender.Text.Replace(".DOL", ".dol");
+
+            if (tbSender.Text.Contains(".ELF"))
+                tbSender.Text = tbSender.Text.Replace(".ELF", ".elf");
+
+            tbSender.SelectionStart = curPos;
+        }
     }
 }
diff --git a/CustomizeMii/CustomizeMii_DragDrop.cs b/CustomizeMii/CustomizeMii_DragDrop.cs
index 95e3faa..5bd7769 100644
--- a/CustomizeMii/CustomizeMii_DragDrop.cs
+++ b/CustomizeMii/CustomizeMii_DragDrop.cs
@@ -20,6 +20,7 @@ using System.ComponentModel;
 using System.IO;
 using System.Windows.Forms;
 using System.Collections.Generic;
+using libWiiSharp;
 
 namespace CustomizeMii
 {
@@ -42,7 +43,7 @@ namespace CustomizeMii
 
             if (data.Length == 1 && data[0].ToLower().EndsWith(".wad"))
             {
-                LoadChannel(data[0]);
+                loadChannel(data[0]);
             }
         }
 
@@ -78,7 +79,7 @@ namespace CustomizeMii
                 data[0].ToLower().EndsWith("icon.bin") ||
                 data[0].ToLower().EndsWith("banner.bin")))
             {
-                ReplacePart(data[0]);
+                replacePart(data[0]);
             }
         }
 
@@ -101,44 +102,35 @@ namespace CustomizeMii
             {
                 try
                 {
-                    byte[] wad = Wii.Tools.LoadFileToByteArray(data[0]);
+                    WAD tmpWad = WAD.Load(data[0]);
 
-                    int numContents = Wii.WadInfo.GetContentNum(wad);
-
-                    if (numContents == 3)
+                    if (tmpWad.NumOfContents == 3)
                     {
-                        int bootIndex = Wii.WadInfo.GetBootIndex(wad);
-                        string appFile = string.Empty;
+                        int appIndex = 0;
+                        if (tmpWad.BootIndex == 1) appIndex = 2;
+                        else if (tmpWad.BootIndex == 2) appIndex = 1;
 
-                        if (bootIndex == 1)
-                        { appFile = "00000002.app"; }
-                        else if (bootIndex == 2)
-                        { appFile = "00000001.app"; }
-
-                        if (!string.IsNullOrEmpty(appFile))
+                        if (appIndex > 0)
                         {
-                            if (Directory.Exists(TempTempPath + "TempWad")) Directory.Delete(TempTempPath + "TempWad", true);
-                            Wii.WadUnpack.UnpackWad(data[0], TempTempPath + "TempWad");
-
-                            File.Copy(TempTempPath + "TempWad\\" + appFile, TempDolPath, true);
-                            SetText(tbDol, data[0]);
+                            newDol = tmpWad.Contents[appIndex];
+                            setControlText(tbDol, data[0]);
                             btnBrowseDol.Text = "Clear";
                         }
-                        else
-                            ErrorBox("The DOL file couldn't be found!");
+                        else errorBox("The DOL file couldn't be found!");
                     }
-                    else
-                        ErrorBox("The DOL file couldn't be found!");
+                    else errorBox("The DOL file couldn't be found!");
                 }
                 catch (Exception ex)
                 {
-                    SetText(tbDol, string.Empty);
-                    ErrorBox(ex.Message);
+                    setControlText(tbDol, string.Empty);
+                    btnBrowseDol.Text = "Browse...";
+                    errorBox(ex.Message);
                 }
             }
             else if (data[0].ToLower().EndsWith(".dol"))
             {
-                SetText(tbDol, data[0]);
+                newDol = File.ReadAllBytes(data[0]);
+                setControlText(tbDol, data[0]);
                 btnBrowseDol.Text = "Clear";
             }
         }
@@ -149,7 +141,7 @@ namespace CustomizeMii
             {
                 string[] data = (string[])e.Data.GetData(DataFormats.FileDrop);
 
-                if (File.Exists(Application.StartupPath + "\\lame.exe"))
+                if (File.Exists(Application.StartupPath + Path.DirectorySeparatorChar + "lame.exe"))
                 {
                     if (data.Length == 1 && (data[0].ToLower().EndsWith(".wav") ||
                         data[0].ToLower().EndsWith(".bns") ||
@@ -171,20 +163,17 @@ namespace CustomizeMii
 
             if (data[0].ToLower().EndsWith(".mp3"))
             {
-                ConvertMp3ToWave(data[0]);
+                convertMp3ToWave(data[0]);
             }
             else
             {
-                SetText(tbSound, data[0]);
-
+                replacedSound = data[0];
+                setControlText(tbSound, data[0]);
                 btnBrowseSound.Text = "Clear";
 
-                if (!string.IsNullOrEmpty(SoundReplace))
-                {
-                    SoundReplace = string.Empty;
-                    if (cmbReplace.SelectedIndex == 2) SetText(tbReplace, SoundReplace);
-                    if (File.Exists(TempSoundPath)) File.Delete(TempSoundPath);
-                }
+                newSoundBin = Headers.IMD5.AddHeader(File.ReadAllBytes(data[0]));
+
+                if (cmbReplace.SelectedIndex == 2) setControlText(tbReplace, string.Empty);
             }
         }
 
@@ -216,14 +205,14 @@ namespace CustomizeMii
             {
                 try
                 {
-                    AddTpl(lbxBannerTpls, thisFile);
+                    addTpl(lbxBannerTpls, thisFile);
                 }
                 catch { errors.Add(thisFile); }
             }
 
             if (errors.Count > 0)
             {
-                ErrorBox(string.Format("These files were not added, because either they already exist or an error occured during conversion:\n\n{0}", string.Join("\n", (errors.ToArray()))));
+                errorBox(string.Format("These files were not added, because either they already exist or an error occured during conversion:\n\n{0}", string.Join("\n", (errors.ToArray()))));
             }
         }
 
@@ -255,14 +244,14 @@ namespace CustomizeMii
             {
                 try
                 {
-                    AddTpl(lbxIconTpls, thisFile);
+                    addTpl(lbxIconTpls, thisFile);
                 }
                 catch { errors.Add(thisFile); }
             }
 
             if (errors.Count > 0)
             {
-                ErrorBox(string.Format("These files were not added, because either they already exist or an error occured during conversion:\n\n{0}", string.Join("\n", (errors.ToArray()))));
+                errorBox(string.Format("These files were not added, because either they already exist or an error occured during conversion:\n\n{0}", string.Join("\n", (errors.ToArray()))));
             }
         }
     }
diff --git a/CustomizeMii/CustomizeMii_Forwarders.cs b/CustomizeMii/CustomizeMii_Forwarders.cs
index e6d1094..a37ddf8 100644
--- a/CustomizeMii/CustomizeMii_Forwarders.cs
+++ b/CustomizeMii/CustomizeMii_Forwarders.cs
@@ -58,6 +58,12 @@ namespace CustomizeMii
                 Forwarder.Save(Destination, true);
             }
 
+            public byte[] ToByteArray()
+            {
+                GXForwarder Forwarder = new GXForwarder(image43, image169, paths);
+                return Forwarder.ToByteArray();
+            }
+
             public void Clear()
             {
                 paths[0] = "SD:/apps/example/boot.dol";
@@ -84,10 +90,7 @@ namespace CustomizeMii
             public string AppFolder { get { return thisAppFolder; } set { thisAppFolder = value; } }
             public bool ForwardToElf { get { return toElf; } set { toElf = value; } }
 
-            public Simple()
-            {
-
-            }
+            public Simple() { }
 
             public void Save(string Destination)
             {
@@ -95,6 +98,12 @@ namespace CustomizeMii
                 Forwarder.Save(Destination, true);
             }
 
+            public byte[] ToByteArray()
+            {
+                SDSDHC_Forwarder Forwarder = new SDSDHC_Forwarder(thisAppFolder, toElf);
+                return Forwarder.ToByteArray();
+            }
+
             public void Clear()
             {
                 thisAppFolder = string.Empty;
diff --git a/CustomizeMii/CustomizeMii_InputBox.Designer.cs b/CustomizeMii/CustomizeMii_InputBox.Designer.cs
index a78a8b1..4144e53 100644
--- a/CustomizeMii/CustomizeMii_InputBox.Designer.cs
+++ b/CustomizeMii/CustomizeMii_InputBox.Designer.cs
@@ -50,6 +50,7 @@ namespace CustomizeMii
             this.btnOK = new System.Windows.Forms.Button();
             this.btnExit = new System.Windows.Forms.Button();
             this.cbElf = new System.Windows.Forms.CheckBox();
+            this.tbInput2 = new System.Windows.Forms.TextBox();
             this.SuspendLayout();
             // 
             // tbInput
@@ -106,6 +107,14 @@ namespace CustomizeMii
             this.cbElf.UseVisualStyleBackColor = true;
             this.cbElf.Visible = false;
             // 
+            // tbInput2
+            // 
+            this.tbInput2.Location = new System.Drawing.Point(121, 34);
+            this.tbInput2.Name = "tbInput2";
+            this.tbInput2.Size = new System.Drawing.Size(108, 20);
+            this.tbInput2.TabIndex = 1;
+            this.tbInput2.Visible = false;
+            // 
             // CustomizeMii_InputBox
             // 
             this.AcceptButton = this.btnOK;
@@ -114,6 +123,7 @@ namespace CustomizeMii
             this.BackColor = System.Drawing.SystemColors.Control;
             this.CancelButton = this.btnExit;
             this.ClientSize = new System.Drawing.Size(238, 92);
+            this.Controls.Add(this.tbInput2);
             this.Controls.Add(this.cbElf);
             this.Controls.Add(this.btnExit);
             this.Controls.Add(this.btnOK);
@@ -136,5 +146,6 @@ namespace CustomizeMii
         public System.Windows.Forms.TextBox tbInput;
         public System.Windows.Forms.Button btnExit;
         public System.Windows.Forms.CheckBox cbElf;
+        public System.Windows.Forms.TextBox tbInput2;
     }
 }
\ No newline at end of file
diff --git a/CustomizeMii/CustomizeMii_InputBox.cs b/CustomizeMii/CustomizeMii_InputBox.cs
index 957bdbe..399a105 100644
--- a/CustomizeMii/CustomizeMii_InputBox.cs
+++ b/CustomizeMii/CustomizeMii_InputBox.cs
@@ -16,22 +16,18 @@
  */
  
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace CustomizeMii
 {
     public partial class CustomizeMii_InputBox : Form
     {
+        //Wow, need to change this whole thing, but too lazy ~~
+
         public bool CommonKeyMode = true;
-        public string Input
-        {
-            get { return tbInput.Text; }
-        }
+        public string Input { get { return tbInput.Text; } set { tbInput.Text = value; } }
+        public string Description { get { return lbInfo.Text; } set { lbInfo.Text = value; } }
+        public string Input2 { get { return tbInput2.Text; } set { tbInput2.Text = value; } }
 
         public CustomizeMii_InputBox()
         {
@@ -76,7 +72,7 @@ namespace CustomizeMii
             }
             else
             {
-                if (tbInput.Text.Length > 2)
+                if (tbInput.Text.Length > 0)
                 {
                     this.DialogResult = DialogResult.OK;
                     this.Close();
diff --git a/CustomizeMii/CustomizeMii_Main.Designer.cs b/CustomizeMii/CustomizeMii_Main.Designer.cs
index fbfc4ea..167e6c7 100644
--- a/CustomizeMii/CustomizeMii_Main.Designer.cs
+++ b/CustomizeMii/CustomizeMii_Main.Designer.cs
@@ -86,7 +86,7 @@ namespace CustomizeMii
             this.tabOptions = new System.Windows.Forms.TabPage();
             this.btnOptionsExtract = new System.Windows.Forms.Button();
             this.btnForwarder = new System.Windows.Forms.Button();
-            this.cbFailureChecks = new System.Windows.Forms.CheckBox();
+            this.cbSecurityChecksOff = new System.Windows.Forms.CheckBox();
             this.cbLz77 = new System.Windows.Forms.CheckBox();
             this.lbOptionsOptional = new System.Windows.Forms.Label();
             this.btnBrowseSound = new System.Windows.Forms.Button();
@@ -147,13 +147,15 @@ namespace CustomizeMii
             this.tabInstructions = new System.Windows.Forms.TabPage();
             this.rtbInstructions = new System.Windows.Forms.RichTextBox();
             this.tabCredits = new System.Windows.Forms.TabPage();
+            this.lbLicense = new System.Windows.Forms.Label();
             this.lbCreditInstaller = new System.Windows.Forms.Label();
             this.panCredits = new System.Windows.Forms.Panel();
             this.lbCreditThanks = new System.Windows.Forms.Label();
             this.llbUpdateAvailable = new System.Windows.Forms.LinkLabel();
             this.llbSite = new System.Windows.Forms.LinkLabel();
             this.lbCreditVersion = new System.Windows.Forms.Label();
-            this.lbCreditInfo = new System.Windows.Forms.Label();
+            this.cmTpls = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.cmRename = new System.Windows.Forms.ToolStripMenuItem();
             this.ssMain = new System.Windows.Forms.StatusStrip();
             this.lbStatus = new System.Windows.Forms.ToolStripStatusLabel();
             this.lbStatusText = new System.Windows.Forms.ToolStripStatusLabel();
@@ -181,6 +183,7 @@ namespace CustomizeMii
             this.cmDol = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.cmLoadDol = new System.Windows.Forms.ToolStripMenuItem();
             this.cmDolFromSource = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmResize = new System.Windows.Forms.ToolStripMenuItem();
             this.tabControl.SuspendLayout();
             this.tabSource.SuspendLayout();
             this.tabTitle.SuspendLayout();
@@ -192,6 +195,7 @@ namespace CustomizeMii
             this.tabInstructions.SuspendLayout();
             this.tabCredits.SuspendLayout();
             this.panCredits.SuspendLayout();
+            this.cmTpls.SuspendLayout();
             this.ssMain.SuspendLayout();
             this.cmForwarder.SuspendLayout();
             this.cmOptionsExtract.SuspendLayout();
@@ -595,7 +599,7 @@ namespace CustomizeMii
             // 
             this.tabOptions.Controls.Add(this.btnOptionsExtract);
             this.tabOptions.Controls.Add(this.btnForwarder);
-            this.tabOptions.Controls.Add(this.cbFailureChecks);
+            this.tabOptions.Controls.Add(this.cbSecurityChecksOff);
             this.tabOptions.Controls.Add(this.cbLz77);
             this.tabOptions.Controls.Add(this.lbOptionsOptional);
             this.tabOptions.Controls.Add(this.btnBrowseSound);
@@ -638,16 +642,16 @@ namespace CustomizeMii
             this.btnForwarder.UseVisualStyleBackColor = true;
             this.btnForwarder.Click += new System.EventHandler(this.btnForwarder_Click);
             // 
-            // cbFailureChecks
+            // cbSecurityChecksOff
             // 
-            this.cbFailureChecks.AutoSize = true;
-            this.cbFailureChecks.Location = new System.Drawing.Point(263, 180);
-            this.cbFailureChecks.Name = "cbFailureChecks";
-            this.cbFailureChecks.Size = new System.Drawing.Size(172, 17);
-            this.cbFailureChecks.TabIndex = 12;
-            this.cbFailureChecks.Tag = "Independent";
-            this.cbFailureChecks.Text = "/!\\ Turn off security checks /!\\";
-            this.cbFailureChecks.UseVisualStyleBackColor = true;
+            this.cbSecurityChecksOff.AutoSize = true;
+            this.cbSecurityChecksOff.Location = new System.Drawing.Point(263, 180);
+            this.cbSecurityChecksOff.Name = "cbSecurityChecksOff";
+            this.cbSecurityChecksOff.Size = new System.Drawing.Size(172, 17);
+            this.cbSecurityChecksOff.TabIndex = 12;
+            this.cbSecurityChecksOff.Tag = "Independent";
+            this.cbSecurityChecksOff.Text = "/!\\ Turn off security checks /!\\";
+            this.cbSecurityChecksOff.UseVisualStyleBackColor = true;
             // 
             // cbLz77
             // 
@@ -922,6 +926,7 @@ namespace CustomizeMii
             this.lbxBannerTpls.Size = new System.Drawing.Size(343, 173);
             this.lbxBannerTpls.Sorted = true;
             this.lbxBannerTpls.TabIndex = 0;
+            this.lbxBannerTpls.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lbxBannerTpls_MouseUp);
             this.lbxBannerTpls.SelectedIndexChanged += new System.EventHandler(this.lbxBannerTpls_SelectedIndexChanged);
             this.lbxBannerTpls.DragDrop += new System.Windows.Forms.DragEventHandler(this.lbxBannerTpls_DragDrop);
             this.lbxBannerTpls.DragEnter += new System.Windows.Forms.DragEventHandler(this.lbxBannerTpls_DragEnter);
@@ -1057,6 +1062,7 @@ namespace CustomizeMii
             this.lbxIconTpls.Size = new System.Drawing.Size(343, 173);
             this.lbxIconTpls.Sorted = true;
             this.lbxIconTpls.TabIndex = 6;
+            this.lbxIconTpls.MouseUp += new System.Windows.Forms.MouseEventHandler(this.lbxIconTpls_MouseUp);
             this.lbxIconTpls.SelectedIndexChanged += new System.EventHandler(this.lbxIconTpls_SelectedIndexChanged);
             this.lbxIconTpls.DragDrop += new System.Windows.Forms.DragEventHandler(this.lbxIconTpls_DragDrop);
             this.lbxIconTpls.DragEnter += new System.Windows.Forms.DragEventHandler(this.lbxIconTpls_DragEnter);
@@ -1308,12 +1314,12 @@ namespace CustomizeMii
             // 
             // tabCredits
             // 
+            this.tabCredits.Controls.Add(this.lbLicense);
             this.tabCredits.Controls.Add(this.lbCreditInstaller);
             this.tabCredits.Controls.Add(this.panCredits);
             this.tabCredits.Controls.Add(this.llbUpdateAvailable);
             this.tabCredits.Controls.Add(this.llbSite);
             this.tabCredits.Controls.Add(this.lbCreditVersion);
-            this.tabCredits.Controls.Add(this.lbCreditInfo);
             this.tabCredits.Location = new System.Drawing.Point(4, 22);
             this.tabCredits.Name = "tabCredits";
             this.tabCredits.Padding = new System.Windows.Forms.Padding(3);
@@ -1322,6 +1328,16 @@ namespace CustomizeMii
             this.tabCredits.Text = "About";
             this.tabCredits.UseVisualStyleBackColor = true;
             // 
+            // lbLicense
+            // 
+            this.lbLicense.Location = new System.Drawing.Point(0, 92);
+            this.lbLicense.Name = "lbLicense";
+            this.lbLicense.Size = new System.Drawing.Size(443, 30);
+            this.lbLicense.TabIndex = 8;
+            this.lbLicense.Text = "CustomizeMii is licensed under the terms of the GNU General Public License v3,\r\ns" +
+                "ee License.txt for more information!";
+            this.lbLicense.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+            // 
             // lbCreditInstaller
             // 
             this.lbCreditInstaller.Location = new System.Drawing.Point(0, 28);
@@ -1335,7 +1351,7 @@ namespace CustomizeMii
             // 
             this.panCredits.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.panCredits.Controls.Add(this.lbCreditThanks);
-            this.panCredits.Location = new System.Drawing.Point(0, 94);
+            this.panCredits.Location = new System.Drawing.Point(0, 125);
             this.panCredits.Name = "panCredits";
             this.panCredits.Size = new System.Drawing.Size(443, 79);
             this.panCredits.TabIndex = 5;
@@ -1383,15 +1399,20 @@ namespace CustomizeMii
             this.lbCreditVersion.Text = "CustomizeMii Version X by Leathl";
             this.lbCreditVersion.TextAlign = System.Drawing.ContentAlignment.TopCenter;
             // 
-            // lbCreditInfo
+            // cmTpls
             // 
-            this.lbCreditInfo.ForeColor = System.Drawing.Color.Red;
-            this.lbCreditInfo.Location = new System.Drawing.Point(0, 189);
-            this.lbCreditInfo.Name = "lbCreditInfo";
-            this.lbCreditInfo.Size = new System.Drawing.Size(443, 16);
-            this.lbCreditInfo.TabIndex = 0;
-            this.lbCreditInfo.Text = "Thanks to icefire / Xuzz for the basic idea of this Application!";
-            this.lbCreditInfo.TextAlign = System.Drawing.ContentAlignment.TopCenter;
+            this.cmTpls.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cmRename,
+            this.cmResize});
+            this.cmTpls.Name = "cmTpls";
+            this.cmTpls.Size = new System.Drawing.Size(153, 70);
+            // 
+            // cmRename
+            // 
+            this.cmRename.Name = "cmRename";
+            this.cmRename.Size = new System.Drawing.Size(117, 22);
+            this.cmRename.Text = "Rename";
+            this.cmRename.Click += new System.EventHandler(this.cmRename_Click);
             // 
             // ssMain
             // 
@@ -1603,6 +1624,13 @@ namespace CustomizeMii
             this.cmDolFromSource.Text = "Take From Source WAD";
             this.cmDolFromSource.Click += new System.EventHandler(this.cmDolFromSource_Click);
             // 
+            // cmResize
+            // 
+            this.cmResize.Name = "cmResize";
+            this.cmResize.Size = new System.Drawing.Size(152, 22);
+            this.cmResize.Text = "Resize";
+            this.cmResize.Click += new System.EventHandler(this.cmResize_Click);
+            // 
             // CustomizeMii_Main
             // 
             this.AllowDrop = true;
@@ -1639,6 +1667,7 @@ namespace CustomizeMii
             this.tabInstructions.ResumeLayout(false);
             this.tabCredits.ResumeLayout(false);
             this.panCredits.ResumeLayout(false);
+            this.cmTpls.ResumeLayout(false);
             this.ssMain.ResumeLayout(false);
             this.ssMain.PerformLayout();
             this.cmForwarder.ResumeLayout(false);
@@ -1707,7 +1736,6 @@ namespace CustomizeMii
         private System.Windows.Forms.Button btnExtractIcon;
         private System.Windows.Forms.Button btnReplaceIcon;
         private System.Windows.Forms.ListBox lbxIconTpls;
-        private System.Windows.Forms.Label lbCreditInfo;
         private System.Windows.Forms.Label lbCreditVersion;
         private System.Windows.Forms.Label lbCreditThanks;
         private System.Windows.Forms.StatusStrip ssMain;
@@ -1749,7 +1777,7 @@ namespace CustomizeMii
         private System.Windows.Forms.CheckBox cbIconMakeTransparent;
         private System.Windows.Forms.TabPage tabInstructions;
         private System.Windows.Forms.RichTextBox rtbInstructions;
-        private System.Windows.Forms.CheckBox cbFailureChecks;
+        private System.Windows.Forms.CheckBox cbSecurityChecksOff;
         private System.Windows.Forms.Button btnForwarder;
         private System.Windows.Forms.ContextMenuStrip cmForwarder;
         private System.Windows.Forms.ToolStripMenuItem cmSimpleForwarder;
@@ -1786,6 +1814,10 @@ namespace CustomizeMii
         private System.Windows.Forms.Label lbKorean;
         private System.Windows.Forms.LinkLabel llbBannerMultiReplace;
         private System.Windows.Forms.LinkLabel llbIconMultiReplace;
+        private System.Windows.Forms.Label lbLicense;
+        private System.Windows.Forms.ContextMenuStrip cmTpls;
+        private System.Windows.Forms.ToolStripMenuItem cmRename;
+        private System.Windows.Forms.ToolStripMenuItem cmResize;
     }
 }
 
diff --git a/CustomizeMii/CustomizeMii_Main.cs b/CustomizeMii/CustomizeMii_Main.cs
index ab65499..c4865ac 100644
--- a/CustomizeMii/CustomizeMii_Main.cs
+++ b/CustomizeMii/CustomizeMii_Main.cs
@@ -15,9 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//#define Mono //Change all "\\" to "/" (in all files; without quotes) while compiling for OS X / Linux (Mono)
-//#define Debug //Always remember to turn off :)
-
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -27,194 +24,121 @@ using System.IO;
 using System.Net;
 using System.Windows.Forms;
 using ForwardMii;
+using libWiiSharp;
 
 namespace CustomizeMii
 {
     public partial class CustomizeMii_Main : Form
     {
         #region Constants
-        const string version = "2.31"; //Hint for myself: Never use a char in the Version (UpdateCheck)!
-        const int SoundMaxLength = 30; //In seconds
-        const int SoundWarningLength = 20; //In seconds
-        const int BnsWarningLength = 45; //In seconds
-        const int CreditsScrollSpeed = 75; //Timer Intervall for the scrolling Credits
+        private const string version = "3.0"; //Hint for myself: Never use a char in the Version (UpdateCheck)!
+        private const int soundMaxLength = 40; //In seconds
+        private const int soundWarningLength = 25; //In seconds
+        private const int bnsWarningLength = 45; //In seconds
+        private const int creditsScrollSpeed = 75; //Timer Intervall for the scrolling Credits
+        private const int creditsReturnValue = -150; //Need to change this when the credits label gets longer
         #endregion
 
         #region Variables
-        public static bool Mono = false;
-        public static string TempPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\";
-        public static string TempWadPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\TempWad.wad";
-        public static string TempUnpackPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Unpack\\";
-        public static string TempBannerPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Banner\\";
-        public static string TempIconPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Icon\\";
-        public static string TempSoundPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\sound.bin";
-        public static string TempWavePath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Temp.wav";
-        public static string TempBnsPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Temp.bns";
-        public static string TempDolPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Temp.dol";
-        public static string TempTempPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Temp\\";
-        public static string TempUnpackBannerTplPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Unpack\\00000000.app_OUT\\meta\\banner.bin_OUT\\arc\\timg\\";
-        public static string TempUnpackIconTplPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Unpack\\00000000.app_OUT\\meta\\icon.bin_OUT\\arc\\timg\\";
-        public static string TempUnpackBannerBrlytPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Unpack\\00000000.app_OUT\\meta\\banner.bin_OUT\\arc\\blyt\\";
-        public static string TempUnpackIconBrlytPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Unpack\\00000000.app_OUT\\meta\\icon.bin_OUT\\arc\\blyt\\";
-        public static string TempUnpackBannerBrlanPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Unpack\\00000000.app_OUT\\meta\\banner.bin_OUT\\arc\\anim\\";
-        public static string TempUnpackIconBrlanPath = Path.GetTempPath() + "CustomizeMii_Temp\\XXX\\Unpack\\00000000.app_OUT\\meta\\icon.bin_OUT\\arc\\anim\\";
-        //public static string[] ButtonTexts = new string[] { "Create WAD!", "Fire!", "Go Go Go!", "Let's do it!", "What are you waitin' for?", "I want my Channel!", "Houston, We've Got a Problem!", "Error, please contact anyone!", "Isn't she sweet?", "Is that milk?", "In your face!", "_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_", "Take me to a higher place!", "What's goin' on?", "I'm a Button!", "Click!", "Today's date is " + DateTime.Now.ToShortDateString(), "Launch Time: " + DateTime.Now.ToLongTimeString(), string.Format("My name is {0}", Environment.UserName) };
         public static string[] SourceWadUrls = new string[] { "StaticBase.wad", "MPlayer_CE_Short.wad", "MPlayer_CE_Long.wad", "Snes9xGX.wad", "FCE_Ultra_wilsoff.wad", "FCE_Ultra_Leathl.wad", "Wii64.wad", "WiiSX_Full.wad", "WiiSX_Retro.wad", "WADder_Base_1.wad", "WADder_Base_2.wad", "WADder_Base_3.wad", "UniiLoader.wad", "Backup_Channel.wad" };
         public static string[] SourceWadPreviewUrls = new string[] { "http://www.youtube.com/watch?v=pFNKldTYQq0", "http://www.youtube.com/watch?v=Up1RZebUc_U", "http://www.youtube.com/watch?v=Up1RZebUc_U", "http://www.youtube.com/watch?v=P-Mxd6DMvFY", "http://www.youtube.com/watch?v=wrbrg-DH_h4", "http://www.youtube.com/watch?v=MfiVbQaiXw8", "http://www.youtube.com/watch?v=krCQ2J7ZH8Y", "http://www.youtube.com/watch?v=rZC1DKUM6QI", "http://www.youtube.com/watch?v=Uiy8w-bp1kI", "http://www.youtube.com/watch?v=BbSYCSI8tz8", "http://www.youtube.com/watch?v=PIFZevHQ8lQ", "http://www.youtube.com/watch?v=OIhvDNjphhc", "http://www.youtube.com/watch?v=KLcncEArQLY&NR=1", "http://www.youtube.com/watch?v=xE_EgdCRV1I" };
-        public static string BannerReplace = string.Empty;
-        public static string IconReplace = string.Empty;
-        public static string BannerTplPath = string.Empty;
-        public static string IconTplPath = string.Empty;
-        private string SourceWad = string.Empty;
-        private string BannerBrlytPath = string.Empty;
-        private string IconBrlytPath = string.Empty;
-        private string BannerBrlanPath = string.Empty;
-        private string IconBrlanPath = string.Empty;
-        private string SoundReplace = string.Empty;
-        private bool BrlytChanged = false;
-        private bool BrlanChanged = false;
+        private bool brlytChanged = false;
+        private bool brlanChanged = false;
         private Progress currentProgress;
         private EventHandler ProgressUpdate;
-        private int UnpackFolderErrorCount = 0;
-        private List<string> BannerTransparents = new List<string>();
-        private List<string> IconTransparents = new List<string>();
-        private string Mp3Path;
+        private List<string> bannerTransparents = new List<string>();
+        private List<string> iconTransparents = new List<string>();
         private double separatorBtn;
         private Timer tmrCredits = new Timer();
         private ToolTip tTip = new ToolTip();
         #endregion
-
-        public CustomizeMii_Main()
+        
+        public CustomizeMii_Main(string[] args)
         {
             InitializeComponent();
             this.Icon = global::CustomizeMii.Properties.Resources.CustomizeMii;
+
+            if (args.Length > 0 && File.Exists(args[0]) && args[0].ToLower().EndsWith(".wad"))
+            {
+                loadChannel(args[0]);
+            }
         }
 
         private void CustomizeMii_Main_Load(object sender, EventArgs e)
         {
-#if !Mono
             this.Text = this.Text.Replace("X", version);
             this.lbCreditVersion.Text = this.lbCreditVersion.Text.Replace("X", version);
-            CommonKeyCheck();
-#endif
-#if Mono
-            this.Text = this.Text.Replace("X", version + " (Mono)");
-            this.lbCreditVersion.Text = this.lbCreditVersion.Text.Replace("X", version + " (Mono)");
-            Mono = true;
-            //TextBox.MaxLength is not implemented in Mono, so don't use it
-            for (int i = 0; i < tabControl.TabPages.Count; i++)
-                for(int j=0;j<tabControl.TabPages[i].Controls.Count;j++)
-                    if (tabControl.TabPages[i].Controls[j] is TextBox) ((TextBox)tabControl.TabPages[i].Controls[j]).MaxLength = 32000;
-#endif
 
-            if (File.Exists(Application.StartupPath + "\\CustomizeMiiInstaller.dll"))
-                this.lbCreditInstaller.Text = this.lbCreditInstaller.Text.Replace("X", GetInstallerVersion());
+            if (!Environment.OSVersion.VersionString.ToLower().Contains("windows"))
+            {
+                //TextBox.MaxLength is not implemented in Mono, so don't use it
+                for (int i = 0; i < tabControl.TabPages.Count; i++)
+                    for (int j = 0; j < tabControl.TabPages[i].Controls.Count; j++)
+                        if (tabControl.TabPages[i].Controls[j] is TextBox) ((TextBox)tabControl.TabPages[i].Controls[j]).MaxLength = 32000;
+            }
+
+            if (File.Exists(Application.StartupPath + Path.DirectorySeparatorChar + "CustomizeMiiInstaller.dll"))
+                this.lbCreditInstaller.Text = this.lbCreditInstaller.Text.Replace("X", getInstallerVersion());
             else this.lbCreditInstaller.Text = this.lbCreditInstaller.Text.Replace(" X", string.Empty);
 
-            MethodInvoker Update = new MethodInvoker(UpdateCheck);
-            Update.BeginInvoke(null, null);
+            if (!version.ToLower().Contains("beta"))
+            {
+                MethodInvoker Update = new MethodInvoker(updateCheck);
+                Update.BeginInvoke(null, null);
+            }
 
-            UpdatePaths();
-            InitializeStartup();
+            byte[] t = new byte[45];
+
+            initialize();
         }
 
         private void CustomizeMii_Main_FormClosing(object sender, FormClosingEventArgs e)
         {
-            try { 
-                if (Directory.Exists(TempPath)) Directory.Delete(TempPath, true);
-                if (File.Exists("C:\\cmtempmp3wav.wav")) File.Delete("C:\\cmtempmp3wav.wav");
-            }
-            catch { }
             Environment.Exit(0);
         }
 
-        private void UpdatePaths()
+        private void sourceWad_Warning(object sender, MessageEventArgs e)
         {
-            string thisGuid = Guid.NewGuid().ToString();
-
-            TempPath = TempPath.Replace("XXX", thisGuid);
-            TempWadPath = TempWadPath.Replace("XXX", thisGuid);
-            TempUnpackPath = TempUnpackPath.Replace("XXX", thisGuid);
-            TempBannerPath = TempBannerPath.Replace("XXX", thisGuid);
-            TempIconPath = TempIconPath.Replace("XXX", thisGuid);
-            TempSoundPath = TempSoundPath.Replace("XXX", thisGuid);
-            TempWavePath = TempWavePath.Replace("XXX", thisGuid);
-            TempBnsPath = TempBnsPath.Replace("XXX", thisGuid);
-            TempDolPath = TempDolPath.Replace("XXX", thisGuid);
-            TempTempPath = TempTempPath.Replace("XXX", thisGuid);
-            TempUnpackBannerTplPath = TempUnpackBannerTplPath.Replace("XXX", thisGuid);
-            TempUnpackIconTplPath = TempUnpackIconTplPath.Replace("XXX", thisGuid);
-            TempUnpackBannerBrlytPath = TempUnpackBannerBrlytPath.Replace("XXX", thisGuid);
-            TempUnpackIconBrlytPath = TempUnpackIconBrlytPath.Replace("XXX", thisGuid);
-            TempUnpackBannerBrlanPath = TempUnpackBannerBrlanPath.Replace("XXX", thisGuid);
-            TempUnpackIconBrlanPath = TempUnpackIconBrlanPath.Replace("XXX", thisGuid);
+            MessageBox.Show(e.Message, "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
         }
 
-        private void InitializeStartup()
+        private void initialize()
         {
-            if (Directory.Exists(TempPath)) Directory.Delete(TempPath, true);
-            ProgressUpdate = new EventHandler(this.UpdateProgress);
-            btnBrowseSource.Text = "Browse...";
-            DrawCreateButton();
+            if (this.InvokeRequired)
+            {
+                this.Invoke(new MethodInvoker(initialize));
+                return;
+            }
+
+            drawCreateButton();
+            setToolTips();
+
+            ProgressUpdate = new EventHandler(this.updateProgress);
+            tmrCredits.Tick += new EventHandler(tmrCredits_Tick);
+            rtbInstructions.LinkClicked += new LinkClickedEventHandler(rtbInstructions_LinkClicked);
+
             cmbNandLoader.SelectedIndex = 0;
             cmbFormatBanner.SelectedIndex = 0;
             cmbFormatIcon.SelectedIndex = 0;
             cmbReplace.SelectedIndex = 0;
+
             pbProgress.Value = 100;
-            BrlanChanged = false;
-            BrlytChanged = false;
-            SetToolTips();
+            tmrCredits.Interval = creditsScrollSpeed;
+
+            brlanChanged = false;
+            brlytChanged = false;
+
+            btnBrowseSource.Text = "Browse...";
             btnBrowseDol.Text = "Browse...";
             btnBrowseSound.Text = "Browse...";
+
             rtbInstructions.Rtf = Properties.Resources.Instructions;
-            rtbInstructions.LinkClicked += new LinkClickedEventHandler(rtbInstructions_LinkClicked);
-            tmrCredits.Interval = CreditsScrollSpeed;
-            tmrCredits.Tick += new EventHandler(tmrCredits_Tick);
 
-#if !Debug
-            DisableControls(null, null);
-#endif
+            clearAll();
+            disableControls();
         }
 
-        private void CommonKeyCheck()
-        {
-            if (!File.Exists(Application.StartupPath + "\\common-key.bin") && !File.Exists(Application.StartupPath + "\\key.bin"))
-            {
-                CustomizeMii_InputBox ib = new CustomizeMii_InputBox();
-
-                if (ib.ShowDialog() == DialogResult.OK)
-                {
-                    Wii.Tools.CreateCommonKey(ib.Input, Application.StartupPath);
-                }
-            }
-            else
-            {
-                if (File.Exists(Application.StartupPath + "\\common-key.bin"))
-                {
-                    if (Wii.Tools.CheckCommonKey(Application.StartupPath + "\\common-key.bin") == false)
-                    {
-                        File.Delete(Application.StartupPath + "\\common-key.bin");
-                        CommonKeyCheck();
-                    }
-                }
-                else if (File.Exists(Application.StartupPath + "\\key.bin"))
-                {
-                    if (Wii.Tools.CheckCommonKey(Application.StartupPath + "\\key.bin") == false)
-                    {
-                        File.Delete(Application.StartupPath + "\\key.bin");
-                        CommonKeyCheck();
-                    }
-                }
-            }
-        }
-
-        private void Initialize(object sender, EventArgs e)
-        {
-            InitializeStartup();
-            ClearAll();
-        }
-
-        private void ClearAll()
+        private void clearAll()
         {
             tbAllLanguages.Text = string.Empty;
             tbDol.Text = string.Empty;
@@ -232,12 +156,7 @@ namespace CustomizeMii
             tbTitleID.Text = string.Empty;
             tbStartupIos.Text = string.Empty;
 
-            BannerReplace = string.Empty;
-            IconReplace = string.Empty;
-            SoundReplace = string.Empty;
-            SourceWad = string.Empty;
-            BannerTplPath = string.Empty;
-            IconTplPath = string.Empty;
+            lbCreatedValue.Text = string.Empty;
 
             lbxBannerTpls.Items.Clear();
             lbxBrlanBanner.Items.Clear();
@@ -246,18 +165,32 @@ namespace CustomizeMii
             lbxBrlytIcon.Items.Clear();
             lbxIconTpls.Items.Clear();
 
+            replacedBanner = string.Empty;
+            replacedIcon = string.Empty;
+            replacedSound = string.Empty;
+
+            sourceWad = new WAD();
+            bannerBin = new U8();
+            newBannerBin = new U8();
+            iconBin = new U8();
+            newIconBin = new U8();
+            newSoundBin = new byte[0];
+            newDol = new byte[0];
+
+            sourceWad.Warning += new EventHandler<MessageEventArgs>(sourceWad_Warning);
+
             cbLz77.Checked = true;
             cbIconMakeTransparent.Checked = false;
             cbBannerMakeTransparent.Checked = false;
 
-            BannerTransparents.Clear();
-            IconTransparents.Clear();
+            bannerTransparents.Clear();
+            iconTransparents.Clear();
 
-            SimpleForwarder.Clear();
-            ComplexForwarder.Clear();
+            simpleForwarder.Clear();
+            complexForwarder.Clear();
         }
 
-        private void SetToolTips()
+        private void setToolTips()
         {
             tTip.SetToolTip(btnCreateWad, "Create and save the WAD or send it directly to the Wii...\nBe sure the Homebrew Channel is running and connected if you want to send the WAD...");
             tTip.SetToolTip(btnBrowseSource, "Browse for a WAD that is used as a Base...");
@@ -291,12 +224,12 @@ namespace CustomizeMii
             tTip.SetToolTip(llbTranslateChannel, "Translates the word \"Channel\" to each language...");
 
             tTip.SetToolTip(cbLz77, "Use Lz77 compression for the banner.bin and icon.bin...\nIf the created WAD does not work, try it without compression first...");
-            tTip.SetToolTip(cbFailureChecks, "Turn off the security checks...\nNot recommended, you may get a bricking WAD...");
+            tTip.SetToolTip(cbSecurityChecksOff, "Turn off the security checks...\nNot recommended, you may get a bricking WAD...");
         }
 
-        private bool CheckForForwardMii()
+        private bool checkForForwardMii()
         {
-            if (File.Exists(Application.StartupPath + "\\ForwardMii.dll"))
+            if (File.Exists(Application.StartupPath + Path.DirectorySeparatorChar + "ForwardMii.dll"))
                 return true;
             else
                 return false;
@@ -308,29 +241,27 @@ namespace CustomizeMii
             {
                 Process.Start(e.LinkText);
             }
-            catch (Exception ex) { ErrorBox(ex.Message); }
+            catch (Exception ex) { errorBox(ex.Message); }
         }
 
-#if !Mono
-        private bool CheckDevKit()
+        private bool checkDevKit()
         {
             return ForwardMii_Plugin.CheckDevKit();
         }
-#endif
 
-        private void CreateForwarderSimple(string Output)
+        private byte[] createForwarderSimple()
         {
-            SimpleForwarder.Save(Output);
+            return simpleForwarder.ToByteArray();
         }
 
-        private void CreateForwarderComplex(string Output)
+        private byte[] createForwarderComplex()
         {
-            ComplexForwarder.Save(Output);
+            return complexForwarder.ToByteArray();
         }
 
-        private void ConvertMp3ToWave(string mp3File)
+        private void convertMp3ToWave(string mp3File)
         {
-            if (File.Exists(Application.StartupPath + "\\lame.exe"))
+            if (File.Exists(Application.StartupPath + Path.DirectorySeparatorChar + "lame.exe"))
             {
                 try
                 {
@@ -340,17 +271,16 @@ namespace CustomizeMii
                     bwConvertMp3.ProgressChanged += new ProgressChangedEventHandler(bwConvertMp3_ProgressChanged);
                     bwConvertMp3.WorkerReportsProgress = true;
 
-                    lbStatusText.Text = "Converting MP3...";
                     bwConvertMp3.RunWorkerAsync(mp3File);
                 }
                 catch (Exception ex)
                 {
-                    ErrorBox(ex.Message);
+                    errorBox(ex.Message);
                 }
             }
         }
 
-        private void DrawCreateButton()
+        private void drawCreateButton()
         {
             btnCreateWad.Text = string.Empty;
 
@@ -365,43 +295,34 @@ namespace CustomizeMii
 
                 Image tmpCreate = Properties.Resources.btnCreate;
                 Image tmpSend = Properties.Resources.btnSend;
-                gImg.DrawImage(ResizeImage(tmpCreate, tmpCreate.Width, tmpCreate.Height), new Point(280, 0));
-                gImg.DrawImage(ResizeImage(tmpSend, tmpSend.Width, tmpSend.Height), new Point(55, 0));
+                gImg.DrawImage(resizeImage(tmpCreate, tmpCreate.Width, tmpCreate.Height), new Point(280, 0));
+                gImg.DrawImage(resizeImage(tmpSend, tmpSend.Width, tmpSend.Height), new Point(55, 0));
 
                 btnCreateWad.Image = tmpImg;
             }
         }
 
-        private bool CheckInet()
+        private bool checkInet()
         {
             try
             {
                 System.Net.IPHostEntry ipHost = System.Net.Dns.GetHostEntry("www.google.com");
                 return true;
             }
-            catch
-            {
-                return false;
-            }
+            catch { return false; }
         }
 
-        private void UpdateProgress(object sender, EventArgs e)
+        private void updateProgress(object sender, EventArgs e)
         {
             pbProgress.Value = currentProgress.progressValue;
 
             if (!string.IsNullOrEmpty(currentProgress.progressState))
             {
-                if (currentProgress.progressState == " ") currentProgress.progressState = string.Empty;
                 lbStatusText.Text = currentProgress.progressState;
                 currentProgress.progressState = string.Empty;
             }
         }
 
-        private void SetSourceWad(object sender, EventArgs e)
-        {
-            tbSourceWad.Text = SourceWad;
-        }
-
         private void tabControl_Selecting(object sender, TabControlCancelEventArgs e)
         {
             tmrCredits.Stop();
@@ -411,22 +332,28 @@ namespace CustomizeMii
                 lbxBannerTpls.SelectedIndex = -1;
                 cbBannerMakeTransparent.Checked = false;
                 cbBannerMakeTransparent.Enabled = false;
-                AddBannerTpls(null, null);
+
+                try { addTpls(); }
+                catch { }
             }
             else if (tabControl.SelectedTab == tabIcon)
             {
                 lbxIconTpls.SelectedIndex = -1;
                 cbIconMakeTransparent.Checked = false;
                 cbIconMakeTransparent.Enabled = false;
-                AddIconTpls(null, null);
+
+                try { addTpls(); }
+                catch { }
             }
             else if (tabControl.SelectedTab == tabBrlyt)
             {
-                AddBrlyts(null, null);
+                try { addBrlyts(); }
+                catch { }
             }
             else if (tabControl.SelectedTab == tabBrlan)
             {
-                AddBrlans(null, null);
+                try { addBrlans(); }
+                catch { }
             }
             else if (tabControl.SelectedTab == tabCredits)
             {
@@ -437,7 +364,7 @@ namespace CustomizeMii
 
         private void tmrCredits_Tick(object sender, EventArgs e)
         {
-            if (lbCreditThanks.Location.Y == -130) lbCreditThanks.Location = new Point(lbCreditThanks.Location.X, panCredits.Height);
+            if (lbCreditThanks.Location.Y == creditsReturnValue) lbCreditThanks.Location = new Point(lbCreditThanks.Location.X, panCredits.Height);
             lbCreditThanks.Location = new Point(lbCreditThanks.Location.X, lbCreditThanks.Location.Y - 1);
         }
 
@@ -445,91 +372,25 @@ namespace CustomizeMii
         {
             if (string.IsNullOrEmpty(lbStatusText.Text) && pbProgress.Value == 100)
             {
-                if (tabControl.SelectedTab == tabBanner)
-                {
-                    try
-                    {
-                        string[] BannerTpls;
-                        if (string.IsNullOrEmpty(BannerReplace))
-                            BannerTpls = Directory.GetFiles(TempUnpackBannerTplPath);
-                        else
-                            BannerTpls = Directory.GetFiles(TempBannerPath + "arc\\timg");
-
-                        AddBannerTpls(BannerTpls);
-                    }
-                    catch { }
-                }
-                else if (tabControl.SelectedTab == tabIcon)
-                {
-                    try
-                    {
-                        string[] IconTpls;
-                        if (string.IsNullOrEmpty(IconReplace))
-                            IconTpls = Directory.GetFiles(TempUnpackIconTplPath);
-                        else
-                            IconTpls = Directory.GetFiles(TempIconPath + "arc\\timg");
-
-                        AddIconTpls(IconTpls);
-                    }
-                    catch { }
-                }
+                if (tabControl.SelectedTab == tabBanner ||
+                    tabControl.SelectedTab == tabIcon)
+                    addTpls();
                 else if (tabControl.SelectedTab == tabBrlyt)
-                {
-                    try
-                    {
-                        string[] BannerBrlyt;
-                        if (string.IsNullOrEmpty(BannerReplace))
-                            BannerBrlyt = Directory.GetFiles(TempUnpackBannerBrlytPath);
-                        else
-                            BannerBrlyt = Directory.GetFiles(TempBannerPath + "arc\\blyt");
-
-                        string[] IconBrlyt;
-                        if (string.IsNullOrEmpty(IconReplace))
-                            IconBrlyt = Directory.GetFiles(TempUnpackIconBrlytPath);
-                        else
-                            IconBrlyt = Directory.GetFiles(TempIconPath + "arc\\blyt");
-
-                        AddBannerBrlyt(BannerBrlyt);
-                        AddIconBrlyt(IconBrlyt);
-                    }
-                    catch { }
-                }
+                    addBrlyts();
                 else if (tabControl.SelectedTab == tabBrlan)
-                {
-                    try
-                    {
-                        string[] BannerBrlan;
-                        if (string.IsNullOrEmpty(BannerReplace))
-                            BannerBrlan = Directory.GetFiles(TempUnpackBannerBrlanPath);
-                        else
-                            BannerBrlan = Directory.GetFiles(TempBannerPath + "arc\\anim");
-
-                        string[] IconBrlan;
-                        if (string.IsNullOrEmpty(IconReplace))
-                            IconBrlan = Directory.GetFiles(TempUnpackIconBrlanPath);
-                        else
-                            IconBrlan = Directory.GetFiles(TempIconPath + "arc\\anim");
-
-                        AddBannerBrlan(BannerBrlan);
-                        AddIconBrlan(IconBrlan);
-                    }
-                    catch { }
-                }
+                    addBrlans();
             }
         }
 
-        private void UpdateCheck()
+        private void updateCheck()
         {
-            if (CheckInet() == true)
+            if (checkInet() == true)
             {
                 try
                 {
                     WebClient GetVersion = new WebClient();
-#if Mono
-                    string NewVersion = GetVersion.DownloadString("http://customizemii.googlecode.com/svn/monoversion.txt");
-#else
                     string NewVersion = GetVersion.DownloadString("http://customizemii.googlecode.com/svn/version.txt");
-#endif
+
                     int newVersion = Convert.ToInt32(NewVersion.Replace(".", string.Empty).Length == 2 ? (NewVersion.Replace(".", string.Empty) + "0") : NewVersion.Replace(".", string.Empty));
                     int thisVersion = Convert.ToInt32(version.Replace(".", string.Empty).Length == 2 ? (version.Replace(".", string.Empty) + "0") : version.Replace(".", string.Empty));
 
@@ -551,17 +412,15 @@ namespace CustomizeMii
             }
         }
 
-        private string GetInstallerVersion()
+        private string getInstallerVersion()
         {
             return CustomizeMiiInstaller.CustomizeMiiInstaller_Plugin.GetVersion();
         }
 
-#if !Mono
-        private string GetForwardMiiVersion()
+        private string getForwardMiiVersion()
         {
             return ForwardMii_Plugin.GetVersion();
         }
-#endif
 
         private void llbSite_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
@@ -570,13 +429,13 @@ namespace CustomizeMii
                 llbSite.LinkVisited = true;
                 Process.Start("http://customizemii.googlecode.com");
             }
-            catch (Exception ex) { ErrorBox(ex.Message); }
+            catch (Exception ex) { errorBox(ex.Message); }
         }
 
         private void btnBrowseSource_Click(object sender, EventArgs e)
         {
-            if (btnBrowseSource.Text.ToLower() == "clear") { Initialize(null, null); }
-            else LoadChannel();
+            if (btnBrowseSource.Text.ToLower() == "clear") { initialize(); }
+            else loadChannel();
         }
 
         private void btnLoadBaseWad_Click(object sender, EventArgs e)
@@ -585,84 +444,71 @@ namespace CustomizeMii
             {
                 if (pbProgress.Value == 100)
                 {
-                    if (CheckInet() == true)
+                    if (checkInet() == true)
                     {
-#if Mono
-                        CommonKeyCheck();
-#endif
-
                         if (tbSourceWad.Text != SourceWadUrls[lbxBaseWads.SelectedIndex])
                         {
-                            SourceWad = "http://customizemii.googlecode.com/svn/branches/Base_WADs/" + SourceWadUrls[lbxBaseWads.SelectedIndex];
-                            tbSourceWad.Text = SourceWad;
+                            tbSourceWad.Text = "http://customizemii.googlecode.com/svn/branches/Base_WADs/" + SourceWadUrls[lbxBaseWads.SelectedIndex];
 
-                            System.Threading.Thread dlThread = new System.Threading.Thread(new System.Threading.ThreadStart(DownloadBaseWad));
-                            dlThread.Start();
+                            System.Threading.Thread dlThread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(downloadBaseWad));
+                            dlThread.Start(tbSourceWad.Text);
                         }
                     }
                     else
                     {
-                        ErrorBox("You're not connected to the Internet!");
+                        errorBox("You're not connected to the Internet!");
                     }
                 }
             }
         }
 
-        void DownloadBaseWad()
+        private void downloadBaseWad(object uri)
         {
             try
             {
-                WebClient Client = new WebClient();
-                Client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(Client_DownloadProgressChanged);
-                Client.DownloadFileCompleted += new AsyncCompletedEventHandler(Client_DownloadFileCompleted);
+                WebClient client = new WebClient();
+                client.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged);
+                client.DownloadDataCompleted += new DownloadDataCompletedEventHandler(client_DownloadDataCompleted);
 
                 currentProgress.progressState = "Downloading Base WAD...";
-                currentProgress.progressValue= 0;
+                currentProgress.progressValue = 0;
                 this.Invoke(ProgressUpdate);
 
-                if (!Directory.Exists(TempWadPath.Remove(TempWadPath.LastIndexOf('\\'))))
-                    Directory.CreateDirectory(TempWadPath.Remove(TempWadPath.LastIndexOf('\\')));
-                Client.DownloadFileAsync(new Uri(SourceWad), TempWadPath);
+                client.DownloadDataAsync(new Uri((string)uri), uri);
             }
             catch (Exception ex)
             {
-                SetText(tbSourceWad, string.Empty);
-                ErrorBox(ex.Message);
+                setControlText(tbSourceWad, string.Empty);
+                errorBox(ex.Message);
             }
         }
 
-        void Client_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
+        void client_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
         {
             currentProgress.progressValue = e.ProgressPercentage;
             currentProgress.progressState = "Downloading Base WAD...";
             this.Invoke(ProgressUpdate);
         }
 
-        void Client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
+        void client_DownloadDataCompleted(object sender, DownloadDataCompletedEventArgs e)
         {
             currentProgress.progressValue = 0;
             currentProgress.progressState = string.Empty;
             this.Invoke(ProgressUpdate);
 
-            if (File.Exists(TempWadPath))
+            if (e.Error != null)
             {
-                FileInfo fi = new FileInfo(TempWadPath);
-
-                if (fi.Length > 0)
-                {
-                    BackgroundWorker bwLoadChannel = new BackgroundWorker();
-                    bwLoadChannel.DoWork += new DoWorkEventHandler(bwLoadChannel_DoWork);
-                    bwLoadChannel.ProgressChanged += new ProgressChangedEventHandler(bwLoadChannel_ProgressChanged);
-                    bwLoadChannel.RunWorkerCompleted += new RunWorkerCompletedEventHandler(bwLoadChannel_RunWorkerCompleted);
-                    bwLoadChannel.WorkerReportsProgress = true;
-                    bwLoadChannel.RunWorkerAsync(TempWadPath);
-                }
-                else
-                {
-                    SetText(tbSourceWad, string.Empty);
-                    File.Delete(TempWadPath);
-                    ErrorBox("The requested file couldn't be downloaded.");
-                }
+                setControlText(tbSourceWad, string.Empty);
+                errorBox("The requested file couldn't be downloaded: " + e.Error.Message);
+            }
+            else
+            {
+                BackgroundWorker bwLoadChannel = new BackgroundWorker();
+                bwLoadChannel.DoWork += new DoWorkEventHandler(bwLoadChannel_DoWork);
+                bwLoadChannel.ProgressChanged += new ProgressChangedEventHandler(bwLoadChannel_ProgressChanged);
+                bwLoadChannel.RunWorkerCompleted += new RunWorkerCompletedEventHandler(bwLoadChannel_RunWorkerCompleted);
+                bwLoadChannel.WorkerReportsProgress = true;
+                bwLoadChannel.RunWorkerAsync(e);
             }
         }
 
@@ -670,23 +516,16 @@ namespace CustomizeMii
         {
             if (lbxBaseWads.SelectedIndex != -1)
             {
-                if (CheckInet() == true)
+                if (checkInet() == true)
                 {
                     if (!string.IsNullOrEmpty(SourceWadPreviewUrls[lbxBaseWads.SelectedIndex]))
                     {
-                        try
-                        {
-                            Process.Start(SourceWadPreviewUrls[lbxBaseWads.SelectedIndex]);
-                        }
-                        catch (Exception ex) { ErrorBox(ex.Message); }
+                        try { Process.Start(SourceWadPreviewUrls[lbxBaseWads.SelectedIndex]); }
+                        catch (Exception ex) { errorBox(ex.Message); }
                     }
-                    else
-                        InfoBox("There's no preview of this channel available, sorry!");
-                }
-                else
-                {
-                    ErrorBox("You're not connected to the Internet!");
+                    else infoBox("There's no preview of this channel available, sorry!");
                 }
+                else errorBox("You're not connected to the Internet!");
             }
         }
 
@@ -694,7 +533,7 @@ namespace CustomizeMii
         {
             if (lbxBaseWads.SelectedIndex != -1)
             {
-                if (CheckInet() == true)
+                if (checkInet() == true)
                 {
                     if (pbProgress.Value == 100)
                     {
@@ -705,55 +544,52 @@ namespace CustomizeMii
 
                         if (sfd.ShowDialog() == DialogResult.OK)
                         {
-                            if (tbSourceWad.Text == Url && File.Exists(TempWadPath))
+                            if (tbSourceWad.Text == Url)
                             {
-                                File.Copy(TempWadPath, sfd.FileName, true);
-                                InfoBox(string.Format("Saved channel as {0}", Path.GetFileName(sfd.FileName)));
+                                sourceWad.Save(sfd.FileName);
+                                infoBox(string.Format("Saved channel as {0}", Path.GetFileName(sfd.FileName)));
                             }
                             else
                             {
-                                System.Threading.Thread saveThread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(SaveBaseWad));
-                                saveThread.Start((object) new string[] { Url, sfd.FileName });
+                                System.Threading.Thread saveThread = new System.Threading.Thread(new System.Threading.ParameterizedThreadStart(saveBaseWad));
+                                saveThread.Start((object)new string[] { Url, sfd.FileName });
                             }
                         }
                     }
 
                 }
-                else
-                {
-                    ErrorBox("You're not connected to the Internet!");
-                }
+                else errorBox("You're not connected to the Internet!");
             }
         }
 
-        void SaveBaseWad(object urlAndSavePath)
+        private void saveBaseWad(object urlAndSavePath)
         {
             try
             {
-                WebClient SaveClient = new WebClient();
-                SaveClient.DownloadProgressChanged += new DownloadProgressChangedEventHandler(SaveClient_DownloadProgressChanged);
-                SaveClient.DownloadFileCompleted += new AsyncCompletedEventHandler(SaveClient_DownloadFileCompleted);
+                WebClient saveClient = new WebClient();
+                saveClient.DownloadProgressChanged += new DownloadProgressChangedEventHandler(saveClient_DownloadProgressChanged);
+                saveClient.DownloadFileCompleted += new AsyncCompletedEventHandler(saveClient_DownloadFileCompleted);
 
                 currentProgress.progressValue = 0;
                 currentProgress.progressState = "Downloading Base WAD...";
                 this.Invoke(ProgressUpdate);
 
-                SaveClient.DownloadFileAsync(new Uri(((string[])urlAndSavePath)[0]), ((string[])urlAndSavePath)[1]);
+                saveClient.DownloadFileAsync(new Uri(((string[])urlAndSavePath)[0]), ((string[])urlAndSavePath)[1]);
             }
             catch (Exception ex)
             {
-                ErrorBox(ex.Message);
+                errorBox(ex.Message);
             }
         }
 
-        void SaveClient_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
+        void saveClient_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
         {
             currentProgress.progressValue = e.ProgressPercentage;
             currentProgress.progressState = "Downloading Base WAD...";
             this.Invoke(ProgressUpdate);
         }
 
-        void SaveClient_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
+        void saveClient_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
         {
             currentProgress.progressValue = 100;
             currentProgress.progressState = " ";
@@ -765,13 +601,17 @@ namespace CustomizeMii
             switch (cmbReplace.SelectedIndex)
             {
                 case 1:
-                    tbReplace.Text = IconReplace;
+                    tbReplace.Text = replacedIcon;
                     break;
                 case 2:
-                    tbReplace.Text = SoundReplace;
+                    if (replacedSound.ToLower().EndsWith(".wad") ||
+                        replacedSound.ToLower().EndsWith(".app") ||
+                        replacedSound.ToLower().EndsWith(".bin"))
+                        tbReplace.Text = replacedSound;
+                    else tbReplace.Text = string.Empty;
                     break;
                 default:
-                    tbReplace.Text = BannerReplace;
+                    tbReplace.Text = replacedBanner;
                     break;
             }
         }
@@ -792,195 +632,143 @@ namespace CustomizeMii
 
         private void btnBrowseReplace_Click(object sender, EventArgs e)
         {
-            if (btnBrowseReplace.Text == "Clear")
+            if (btnBrowseReplace.Text.ToLower() == "clear")
             {
                 if (cmbReplace.SelectedIndex == 2) //sound
                 {
-                    SoundReplace = string.Empty;
-                    SetText(tbReplace, SoundReplace);
-                    if (File.Exists(TempSoundPath)) File.Delete(TempSoundPath);
-                    SetText(tbSound, string.Empty);
+                    replacedSound = string.Empty;
+                    setControlText(tbReplace, string.Empty);
+
+                    newSoundBin = new byte[0];
                 }
                 else if (cmbReplace.SelectedIndex == 1) //icon
                 {
-                    IconReplace = string.Empty;
-                    SetText(tbReplace, IconReplace);
-                    if (Directory.Exists(TempIconPath)) Directory.Delete(TempIconPath, true);
+                    replacedIcon = string.Empty;
+                    setControlText(tbReplace, string.Empty);
+
+                    newIconBin = new U8();
+
+                    iconTransparents.Clear();
+
+                    addTpls();
+                    addBrlans();
+                    addBrlyts();
                 }
                 else //banner
                 {
-                    BannerReplace = string.Empty;
-                    SetText(tbReplace, BannerReplace);
-                    if (Directory.Exists(TempBannerPath)) Directory.Delete(TempBannerPath, true);
+                    replacedBanner = string.Empty;
+                    setControlText(tbReplace, string.Empty);
+
+                    newBannerBin = new U8();
+
+                    bannerTransparents.Clear();
+
+                    addTpls();
+                    addBrlans();
+                    addBrlyts();
                 }
             }
-            else
-            {
-                ReplacePart();
-            }
+            else replacePart();
         }
 
         private void btnBrowseDol_Click(object sender, EventArgs e)
         {
-            if (btnBrowseDol.Text == "Clear")
+            if (btnBrowseDol.Text.ToLower() == "clear")
             {
-                if (Directory.Exists(TempTempPath + "TempWad")) Directory.Delete(TempTempPath + "TempWad", true);
-                if (File.Exists(TempDolPath)) File.Delete(TempDolPath);
-
-                SetText(tbDol, string.Empty);
+                setControlText(tbDol, string.Empty);
                 btnBrowseDol.Text = "Browse...";
+                newDol = new byte[0];
 
-                SimpleForwarder.Clear();
-                ComplexForwarder.Clear();
-            }
-            else
-            {
-                cmDol.Show(MousePosition);
+                simpleForwarder.Clear();
+                complexForwarder.Clear();
             }
+            else cmDol.Show(MousePosition);
         }
 
         private void btnBrowseSound_Click(object sender, EventArgs e)
         {
-            if (btnBrowseSound.Text == "Clear")
+            if (btnBrowseSound.Text.ToLower() == "clear")
             {
-                if (File.Exists(TempWavePath)) File.Delete(TempWavePath);
-                if (File.Exists(TempBnsPath)) File.Delete(TempBnsPath);
-                SetText(tbSound, string.Empty);
+                setControlText(tbSound, string.Empty);
                 btnBrowseSound.Text = "Browse...";
+                newSoundBin = new byte[0];
             }
-            else
-                cmSound.Show(MousePosition);
+            else cmSound.Show(MousePosition);
         }
 
         private void lbxBannerTpls_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (lbxBannerTpls.SelectedIndex != -1)
             {
-                try
-                {
-                    cbBannerMakeTransparent.Enabled = true;
-                    cbBannerMakeTransparent.Checked = lbxBannerTpls.SelectedItem.ToString().EndsWith("(Transparent)");
+                cbBannerMakeTransparent.Enabled = true;
+                cbBannerMakeTransparent.Checked = lbxBannerTpls.SelectedItem.ToString().EndsWith("(Transparent)");
 
-                    string TplFile = BannerTplPath + lbxBannerTpls.SelectedItem.ToString().Remove(lbxBannerTpls.SelectedItem.ToString().IndexOf('(', 0) - 1);
-                    int TplFormat = Wii.TPL.GetTextureFormat(TplFile);
-
-                    switch (TplFormat)
-                    {
-                        case 0:
-                            cmbFormatBanner.SelectedIndex = 6;
-                            break;
-                        case 1:
-                            cmbFormatBanner.SelectedIndex = 5;
-                            break;
-                        case 2:
-                            cmbFormatBanner.SelectedIndex = 4;
-                            break;
-                        case 3:
-                            cmbFormatBanner.SelectedIndex = 3;
-                            break;
-                        case 4:
-                            cmbFormatBanner.SelectedIndex = 1;
-                            break;
-                        case 5:
-                            cmbFormatBanner.SelectedIndex = 2;
-                            break;
-                        case 6:
-                            cmbFormatBanner.SelectedIndex = 0;
-                            break;
-                        case 8:
-                            cmbFormatBanner.SelectedIndex = 7;
-                            break;
-                        case 9:
-                            cmbFormatBanner.SelectedIndex = 8;
-                            break;
-                        case 10:
-                            cmbFormatBanner.SelectedIndex = 9;
-                            break;
-                        case 14:
-                            cmbFormatBanner.SelectedIndex = 10;
-                            break;
-                        default:
-                            cmbFormatBanner.SelectedIndex = -1;
-                            break;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    ErrorBox(ex.Message);
-                }
+                if (lbxBannerTpls.SelectedItem.ToString().Substring(lbxBannerTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(RGBA8"))
+                { cmbFormatBanner.SelectedIndex = 0; }
+                else if (lbxBannerTpls.SelectedItem.ToString().Substring(lbxBannerTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(RGB565"))
+                { cmbFormatBanner.SelectedIndex = 1; }
+                else if (lbxBannerTpls.SelectedItem.ToString().Substring(lbxBannerTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(RGB5A3"))
+                { cmbFormatBanner.SelectedIndex = 2; }
+                else if (lbxBannerTpls.SelectedItem.ToString().Substring(lbxBannerTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(IA8"))
+                { cmbFormatBanner.SelectedIndex = 3; }
+                else if (lbxBannerTpls.SelectedItem.ToString().Substring(lbxBannerTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(IA4"))
+                { cmbFormatBanner.SelectedIndex = 4; }
+                else if (lbxBannerTpls.SelectedItem.ToString().Substring(lbxBannerTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(I8"))
+                { cmbFormatBanner.SelectedIndex = 5; }
+                else if (lbxBannerTpls.SelectedItem.ToString().Substring(lbxBannerTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(I4"))
+                { cmbFormatBanner.SelectedIndex = 6; }
+                else if (lbxBannerTpls.SelectedItem.ToString().Substring(lbxBannerTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(CI4"))
+                { cmbFormatBanner.SelectedIndex = 7; }
+                else if (lbxBannerTpls.SelectedItem.ToString().Substring(lbxBannerTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(CI8"))
+                { cmbFormatBanner.SelectedIndex = 8; }
+                else if (lbxBannerTpls.SelectedItem.ToString().Substring(lbxBannerTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(CI14X2"))
+                { cmbFormatBanner.SelectedIndex = 9; }
+                else if (lbxBannerTpls.SelectedItem.ToString().Substring(lbxBannerTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(CMP"))
+                { cmbFormatBanner.SelectedIndex = 10; }
             }
-            else
-                cbBannerMakeTransparent.Enabled = false;
+            else cbBannerMakeTransparent.Enabled = false;
         }
 
         private void lbxIconTpls_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (lbxIconTpls.SelectedIndex != -1)
             {
-                try
-                {
-                    cbIconMakeTransparent.Enabled = true;
-                    cbIconMakeTransparent.Checked = lbxIconTpls.SelectedItem.ToString().EndsWith("(Transparent)");
+                cbIconMakeTransparent.Enabled = true;
+                cbIconMakeTransparent.Checked = lbxIconTpls.SelectedItem.ToString().EndsWith("(Transparent)");
 
-                    string TplFile = IconTplPath + lbxIconTpls.SelectedItem.ToString().Remove(lbxIconTpls.SelectedItem.ToString().IndexOf('(', 0) - 1);
-                    int TplFormat = Wii.TPL.GetTextureFormat(TplFile);
-
-                    switch (TplFormat)
-                    {
-                        case 0:
-                            cmbFormatIcon.SelectedIndex = 6;
-                            break;
-                        case 1:
-                            cmbFormatIcon.SelectedIndex = 5;
-                            break;
-                        case 2:
-                            cmbFormatIcon.SelectedIndex = 4;
-                            break;
-                        case 3:
-                            cmbFormatIcon.SelectedIndex = 3;
-                            break;
-                        case 4:
-                            cmbFormatIcon.SelectedIndex = 1;
-                            break;
-                        case 5:
-                            cmbFormatIcon.SelectedIndex = 2;
-                            break;
-                        case 6:
-                            cmbFormatIcon.SelectedIndex = 0;
-                            break;
-                        case 8:
-                            cmbFormatBanner.SelectedIndex = 7;
-                            break;
-                        case 9:
-                            cmbFormatBanner.SelectedIndex = 8;
-                            break;
-                        case 10:
-                            cmbFormatBanner.SelectedIndex = 9;
-                            break;
-                        case 14:
-                            cmbFormatBanner.SelectedIndex = 10;
-                            break;
-                        default:
-                            cmbFormatIcon.SelectedIndex = -1;
-                            break;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    ErrorBox(ex.Message);
-                }
+                if (lbxIconTpls.SelectedItem.ToString().Substring(lbxIconTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(RGBA8"))
+                { cmbFormatIcon.SelectedIndex = 0; }
+                else if (lbxIconTpls.SelectedItem.ToString().Substring(lbxIconTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(RGB565"))
+                { cmbFormatIcon.SelectedIndex = 1; }
+                else if (lbxIconTpls.SelectedItem.ToString().Substring(lbxIconTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(RGB5A3"))
+                { cmbFormatIcon.SelectedIndex = 2; }
+                else if (lbxIconTpls.SelectedItem.ToString().Substring(lbxIconTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(IA8"))
+                { cmbFormatIcon.SelectedIndex = 3; }
+                else if (lbxIconTpls.SelectedItem.ToString().Substring(lbxIconTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(IA4"))
+                { cmbFormatIcon.SelectedIndex = 4; }
+                else if (lbxIconTpls.SelectedItem.ToString().Substring(lbxIconTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(I8"))
+                { cmbFormatIcon.SelectedIndex = 5; }
+                else if (lbxIconTpls.SelectedItem.ToString().Substring(lbxIconTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(I4"))
+                { cmbFormatIcon.SelectedIndex = 6; }
+                else if (lbxIconTpls.SelectedItem.ToString().Substring(lbxIconTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(CI4"))
+                { cmbFormatIcon.SelectedIndex = 7; }
+                else if (lbxIconTpls.SelectedItem.ToString().Substring(lbxIconTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(CI8"))
+                { cmbFormatIcon.SelectedIndex = 8; }
+                else if (lbxIconTpls.SelectedItem.ToString().Substring(lbxIconTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(CI14X2"))
+                { cmbFormatIcon.SelectedIndex = 9; }
+                else if (lbxIconTpls.SelectedItem.ToString().Substring(lbxIconTpls.SelectedItem.ToString().IndexOf('(')).ToUpper().Contains("(CMP"))
+                { cmbFormatIcon.SelectedIndex = 10; }
             }
-            else
-                cbIconMakeTransparent.Enabled = false;
+            else cbIconMakeTransparent.Enabled = false;
         }
 
         private void btnReplaceBanner_Click(object sender, EventArgs e)
         {
             if (lbxBannerTpls.SelectedIndex != -1)
             {
-                int Format = cmbFormatBanner.SelectedIndex;
+                int format = cmbFormatBanner.SelectedIndex;
 
-                if (Format < 7)
+                if (format < 7)
                 {
                     OpenFileDialog ofd = new OpenFileDialog();
                     ofd.Filter = "PNG|*.png|JPG|*.jpg|GIF|*.gif|BMP|*.bmp|TPL|*.tpl|All|*.png;*.jpg;*.gif;*.bmp;*.tpl";
@@ -990,60 +778,63 @@ namespace CustomizeMii
                     {
                         try
                         {
-                            string Tpl = BannerTplPath + lbxBannerTpls.SelectedItem.ToString().Remove(lbxBannerTpls.SelectedItem.ToString().IndexOf('(', 0) - 1);
-                            byte[] TplArray = Wii.Tools.LoadFileToByteArray(Tpl);
-                            Image Img;
+                            string tplName = lbxBannerTpls.SelectedItem.ToString().Remove(lbxBannerTpls.SelectedItem.ToString().IndexOf('(', 0) - 3);
+                            TPL tmpTpl;
+                            Image img;
 
-                            if (!ofd.FileName.ToLower().EndsWith(".tpl")) Img = Image.FromFile(ofd.FileName);
-                            else Img = Wii.TPL.ConvertFromTPL(ofd.FileName);
+                            if (string.IsNullOrEmpty(replacedBanner))
+                                tmpTpl = TPL.Load(bannerBin.Data[bannerBin.GetNodeIndex(tplName)]);
+                            else tmpTpl = TPL.Load(newBannerBin.Data[newBannerBin.GetNodeIndex(tplName)]);
 
-                            int TplFormat;
-                            int X = Wii.TPL.GetTextureWidth(TplArray);
-                            int Y = Wii.TPL.GetTextureHeight(TplArray);
-
-                            if (X != Img.Width ||
-                                Y != Img.Height)
+                            if (!ofd.FileName.ToLower().EndsWith(".tpl")) img = Image.FromFile(ofd.FileName);
+                            else
                             {
-                                Img = ResizeImage(Img, X, Y);
+                                TPL newTpl = TPL.Load(ofd.FileName);
+                                img = newTpl.ExtractTexture();
                             }
 
-                            switch (Format)
+                            if (img.Width != tmpTpl.GetTextureSize(0).Width ||
+                                img.Height != tmpTpl.GetTextureSize(0).Height)
+                                img = resizeImage(img, tmpTpl.GetTextureSize(0).Width, tmpTpl.GetTextureSize(0).Height);
+
+                            switch (format)
                             {
                                 case 6: //I4
-                                    TplFormat = 0;
+                                    format = 0;
                                     break;
                                 case 5: //I8
-                                    TplFormat = 1;
+                                    format = 1;
                                     break;
                                 case 4: //IA4
-                                    TplFormat = 2;
+                                    format = 2;
                                     break;
                                 case 3: //IA8
-                                    TplFormat = 3;
+                                    format = 3;
                                     break;
                                 case 1:
-                                    TplFormat = 4;
+                                    format = 4;
                                     break;
                                 case 2:
-                                    TplFormat = 5;
+                                    format = 5;
                                     break;
                                 default:
-                                    TplFormat = 6;
+                                    format = 6;
                                     break;
                             }
 
-                            Wii.TPL.ConvertToTPL(Img, Tpl, TplFormat);
-                        }
-                        catch (Exception ex)
-                        {
-                            ErrorBox(ex.Message);
+                            tmpTpl.RemoveTexture(0);
+                            tmpTpl.AddTexture(img, (TPL_Format)format);
+
+                            if (string.IsNullOrEmpty(replacedBanner))
+                                bannerBin.ReplaceFile(bannerBin.GetNodeIndex(tplName), tmpTpl.ToByteArray());
+                            else newBannerBin.ReplaceFile(newBannerBin.GetNodeIndex(tplName), tmpTpl.ToByteArray());
+
+                            addTpls();
                         }
+                        catch (Exception ex) { errorBox(ex.Message); }
                     }
                 }
-                else
-                {
-                    ErrorBox("This format is not supported, you must choose a different one!");
-                }
+                else { errorBox("This format is not supported, you must choose a different one!"); }
             }
         }
 
@@ -1051,48 +842,46 @@ namespace CustomizeMii
         {
             if (lbxBannerTpls.SelectedIndex != -1)
             {
-                string Tpl = BannerTplPath + lbxBannerTpls.SelectedItem.ToString().Remove(lbxBannerTpls.SelectedItem.ToString().IndexOf('(', 0) - 1);
-                int format = Wii.TPL.GetTextureFormat(Tpl);
-                if (format == 8 || format == 9 || format == 10) { ErrorBox("This format is not supported!"); return; }
-
                 SaveFileDialog sfd = new SaveFileDialog();
                 sfd.Filter = "PNG|*.png|JPG|*.jpg|GIF|*.gif|BMP|*.bmp|TPL|*.tpl|All|*.png;*.jpg;*.gif;*.bmp;*.tpl";
                 sfd.FilterIndex = 6;
-                sfd.FileName = lbxBannerTpls.SelectedItem.ToString().Replace(".tpl", string.Empty);
+                sfd.FileName = lbxBannerTpls.SelectedItem.ToString().Remove(lbxBannerTpls.SelectedItem.ToString().IndexOf('(', 0) - 3).Replace(".tpl", string.Empty);
 
                 if (sfd.ShowDialog() == DialogResult.OK)
                 {
                     try
                     {
+                        string tplName = lbxBannerTpls.SelectedItem.ToString().Remove(lbxBannerTpls.SelectedItem.ToString().IndexOf('(', 0) - 3);
+                        TPL tmpTpl;
+
+                        if (string.IsNullOrEmpty(replacedBanner))
+                            tmpTpl = TPL.Load(bannerBin.Data[bannerBin.GetNodeIndex(tplName)]);
+                        else tmpTpl = TPL.Load(newBannerBin.Data[newBannerBin.GetNodeIndex(tplName)]);
+
+                        if (File.Exists(sfd.FileName)) File.Delete(sfd.FileName);
                         if (!sfd.FileName.ToLower().EndsWith(".tpl"))
                         {
-                            Image Img = Wii.TPL.ConvertFromTPL(Tpl);
+                            Image img = tmpTpl.ExtractTexture();
 
                             switch (sfd.FileName.Remove(0, sfd.FileName.LastIndexOf('.')))
                             {
                                 case ".jpg":
-                                    Img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Jpeg);
+                                    img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Jpeg);
                                     break;
                                 case ".gif":
-                                    Img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Gif);
+                                    img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Gif);
                                     break;
                                 case ".bmp":
-                                    Img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Bmp);
+                                    img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Bmp);
                                     break;
                                 default:
-                                    Img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Png);
+                                    img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Png);
                                     break;
                             }
                         }
-                        else
-                        {
-                            File.Copy(Tpl, sfd.FileName, true);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        ErrorBox(ex.Message);
+                        else tmpTpl.Save(sfd.FileName);
                     }
+                    catch (Exception ex) { errorBox(ex.Message); }
                 }
             }
         }
@@ -1104,14 +893,20 @@ namespace CustomizeMii
                 try
                 {
                     CustomizeMii_Preview pvw = new CustomizeMii_Preview();
-                    pvw.startTPL = lbxBannerTpls.SelectedItem.ToString().Remove(lbxBannerTpls.SelectedItem.ToString().IndexOf('(', 0) - 1);
+
+                    pvw.StartTPL = lbxBannerTpls.SelectedItem.ToString().Remove(lbxBannerTpls.SelectedItem.ToString().IndexOf('(', 0) - 3);
+
+                    if (string.IsNullOrEmpty(replacedBanner)) pvw.BannerBin = bannerBin;
+                    else pvw.BannerBin = newBannerBin;
+                    if (string.IsNullOrEmpty(replacedIcon)) pvw.IconBin = iconBin;
+                    else pvw.IconBin = newIconBin;
+
                     pvw.ShowDialog();
                     pvw = null;
+
+                    addTpls();
                 }
-                catch (Exception ex)
-                {
-                    ErrorBox(ex.Message);
-                }
+                catch (Exception ex) { errorBox(ex.Message); }
 
                 lbxBannerTpls.Focus();
             }
@@ -1121,9 +916,9 @@ namespace CustomizeMii
         {
             if (lbxIconTpls.SelectedIndex != -1)
             {
-                int Format = cmbFormatIcon.SelectedIndex;
+                int format = cmbFormatIcon.SelectedIndex;
 
-                if (Format < 7)
+                if (format < 7)
                 {
                     OpenFileDialog ofd = new OpenFileDialog();
                     ofd.Filter = "PNG|*.png|JPG|*.jpg|GIF|*.gif|BMP|*.bmp|TPL|*.tpl|All|*.png;*.jpg;*.gif;*.bmp;*.tpl";
@@ -1133,60 +928,63 @@ namespace CustomizeMii
                     {
                         try
                         {
-                            string Tpl = IconTplPath + lbxIconTpls.SelectedItem.ToString().Remove(lbxIconTpls.SelectedItem.ToString().IndexOf('(', 0) - 1);
-                            byte[] TplArray = Wii.Tools.LoadFileToByteArray(Tpl);
-                            Image Img;
+                            string tplName = lbxIconTpls.SelectedItem.ToString().Remove(lbxIconTpls.SelectedItem.ToString().IndexOf('(', 0) - 3);
+                            TPL tmpTpl;
+                            Image img;
 
-                            if (!ofd.FileName.ToLower().EndsWith(".tpl")) Img = Image.FromFile(ofd.FileName);
-                            else Img = Wii.TPL.ConvertFromTPL(ofd.FileName);
+                            if (string.IsNullOrEmpty(replacedIcon))
+                                tmpTpl = TPL.Load(iconBin.Data[iconBin.GetNodeIndex(tplName)]);
+                            else tmpTpl = TPL.Load(newIconBin.Data[newIconBin.GetNodeIndex(tplName)]);
 
-                            int TplFormat;
-                            int X = Wii.TPL.GetTextureWidth(TplArray);
-                            int Y = Wii.TPL.GetTextureHeight(TplArray);
-
-                            if (X != Img.Width ||
-                                Y != Img.Height)
+                            if (!ofd.FileName.ToLower().EndsWith(".tpl")) img = Image.FromFile(ofd.FileName);
+                            else
                             {
-                                Img = ResizeImage(Img, X, Y);
+                                TPL newTpl = TPL.Load(ofd.FileName);
+                                img = newTpl.ExtractTexture();
                             }
 
-                            switch (Format)
+                            if (img.Width != tmpTpl.GetTextureSize(0).Width ||
+                                img.Height != tmpTpl.GetTextureSize(0).Height)
+                                img = resizeImage(img, tmpTpl.GetTextureSize(0).Width, tmpTpl.GetTextureSize(0).Height);
+
+                            switch (format)
                             {
                                 case 6: //I4
-                                    TplFormat = 0;
+                                    format = 0;
                                     break;
                                 case 5: //I8
-                                    TplFormat = 1;
+                                    format = 1;
                                     break;
                                 case 4: //IA4
-                                    TplFormat = 2;
+                                    format = 2;
                                     break;
                                 case 3: //IA8
-                                    TplFormat = 3;
+                                    format = 3;
                                     break;
                                 case 1:
-                                    TplFormat = 4;
+                                    format = 4;
                                     break;
                                 case 2:
-                                    TplFormat = 5;
+                                    format = 5;
                                     break;
                                 default:
-                                    TplFormat = 6;
+                                    format = 6;
                                     break;
                             }
 
-                            Wii.TPL.ConvertToTPL(Img, Tpl, TplFormat);
-                        }
-                        catch (Exception ex)
-                        {
-                            ErrorBox(ex.Message);
+                            tmpTpl.RemoveTexture(0);
+                            tmpTpl.AddTexture(img, (TPL_Format)format);
+
+                            if (string.IsNullOrEmpty(replacedIcon))
+                                iconBin.ReplaceFile(iconBin.GetNodeIndex(tplName), tmpTpl.ToByteArray());
+                            else newIconBin.ReplaceFile(newIconBin.GetNodeIndex(tplName), tmpTpl.ToByteArray());
+
+                            addTpls();
                         }
+                        catch (Exception ex) { errorBox(ex.Message); }
                     }
                 }
-                else
-                {
-                    ErrorBox("This format is not supported, you must choose a different one!");
-                }
+                else errorBox("This format is not supported, you must choose a different one!");
             }
         }
 
@@ -1194,48 +992,46 @@ namespace CustomizeMii
         {
             if (lbxIconTpls.SelectedIndex != -1)
             {
-                string Tpl = IconTplPath + lbxIconTpls.SelectedItem.ToString().Remove(lbxIconTpls.SelectedItem.ToString().IndexOf('(', 0) - 1);
-                int format = Wii.TPL.GetTextureFormat(Tpl);
-                if (format == 8 || format == 9 || format == 10) { ErrorBox("This format is not supported!"); return; }
-
                 SaveFileDialog sfd = new SaveFileDialog();
                 sfd.Filter = "PNG|*.png|JPG|*.jpg|GIF|*.gif|BMP|*.bmp|TPL|*.tpl|All|*.png;*.jpg;*.gif;*.bmp;*.tpl";
                 sfd.FilterIndex = 6;
-                sfd.FileName = lbxIconTpls.SelectedItem.ToString().Replace(".tpl", string.Empty);
+                sfd.FileName = lbxIconTpls.SelectedItem.ToString().Remove(lbxIconTpls.SelectedItem.ToString().IndexOf('(', 0) - 3).Replace(".tpl", string.Empty);
 
                 if (sfd.ShowDialog() == DialogResult.OK)
                 {
                     try
                     {
+                        string tplName = lbxIconTpls.SelectedItem.ToString().Remove(lbxIconTpls.SelectedItem.ToString().IndexOf('(', 0) - 3);
+                        TPL tmpTpl;
+
+                        if (string.IsNullOrEmpty(replacedIcon))
+                            tmpTpl = TPL.Load(iconBin.Data[iconBin.GetNodeIndex(tplName)]);
+                        else tmpTpl = TPL.Load(newIconBin.Data[newIconBin.GetNodeIndex(tplName)]);
+
+                        if (File.Exists(sfd.FileName)) File.Delete(sfd.FileName);
                         if (!sfd.FileName.ToLower().EndsWith(".tpl"))
                         {
-                            Image Img = Wii.TPL.ConvertFromTPL(Tpl);
+                            Image img = tmpTpl.ExtractTexture();
 
                             switch (sfd.FileName.Remove(0, sfd.FileName.LastIndexOf('.')))
                             {
                                 case ".jpg":
-                                    Img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Jpeg);
+                                    img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Jpeg);
                                     break;
                                 case ".gif":
-                                    Img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Gif);
+                                    img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Gif);
                                     break;
                                 case ".bmp":
-                                    Img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Bmp);
+                                    img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Bmp);
                                     break;
                                 default:
-                                    Img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Png);
+                                    img.Save(sfd.FileName, System.Drawing.Imaging.ImageFormat.Png);
                                     break;
                             }
                         }
-                        else
-                        {
-                            File.Copy(Tpl, sfd.FileName, true);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        ErrorBox(ex.Message);
+                        else tmpTpl.Save(sfd.FileName);
                     }
+                    catch (Exception ex) { errorBox(ex.Message); }
                 }
             }
         }
@@ -1247,15 +1043,21 @@ namespace CustomizeMii
                 try
                 {
                     CustomizeMii_Preview pvw = new CustomizeMii_Preview();
-                    pvw.startIcon = true;
-                    pvw.startTPL = lbxIconTpls.SelectedItem.ToString().Remove(lbxIconTpls.SelectedItem.ToString().IndexOf('(', 0) - 1);
+
+                    pvw.StartIcon = true;
+                    pvw.StartTPL = lbxIconTpls.SelectedItem.ToString().Remove(lbxIconTpls.SelectedItem.ToString().IndexOf('(', 0) - 3);
+
+                    if (string.IsNullOrEmpty(replacedBanner)) pvw.BannerBin = bannerBin;
+                    else pvw.BannerBin = newBannerBin;
+                    if (string.IsNullOrEmpty(replacedIcon)) pvw.IconBin = iconBin;
+                    else pvw.IconBin = newIconBin;
+                 
                     pvw.ShowDialog();
                     pvw = null;
+
+                    addTpls();
                 }
-                catch (Exception ex)
-                {
-                    ErrorBox(ex.Message);
-                }
+                catch (Exception ex) { errorBox(ex.Message); }
 
                 lbxIconTpls.Focus();
             }
@@ -1272,13 +1074,11 @@ namespace CustomizeMii
                 {
                     if (!string.IsNullOrEmpty(tbSourceWad.Text))
                     {
-                        if (!File.Exists(Application.StartupPath + "\\CustomizeMiiInstaller.dll"))
-                        {
-                            ErrorBox("CustomizeMiiInstaller.dll wasn't found!");
-                        }
+                        if (!File.Exists(Application.StartupPath + Path.DirectorySeparatorChar + "CustomizeMiiInstaller.dll"))
+                            errorBox("CustomizeMiiInstaller.dll wasn't found!");
                         else
                         {
-                            if (cbFailureChecks.Checked == true || FailureCheck() == true)
+                            if (cbSecurityChecksOff.Checked == true || securityChecks() == true)
                             {
                                 CustomizeMii_Transmit cmt = new CustomizeMii_Transmit();
 
@@ -1287,17 +1087,19 @@ namespace CustomizeMii
                                     try
                                     {
                                         WadCreationInfo wadInfo = new WadCreationInfo();
-                                        wadInfo.outFile = TempPath + "SendToWii.wad";
+
+                                        if (!int.TryParse(tbStartupIos.Text, out wadInfo.startupIos)) { errorBox("Please enter a valid startup IOS! (0 - 255)"); return; }
                                         wadInfo.titles = new string[] { tbJapanese.Text, tbEnglish.Text, tbGerman.Text, tbFrench.Text, tbSpanish.Text, tbItalian.Text, tbDutch.Text, tbKorean.Text };
                                         wadInfo.allLangTitle = tbAllLanguages.Text;
                                         wadInfo.nandLoader = (WadCreationInfo.NandLoader)cmbNandLoader.SelectedIndex;
                                         wadInfo.sendToWii = true;
-                                        wadInfo.transmitProtocol = (TransmitProtocol)cmt.Protocol;
+                                        wadInfo.transmitProtocol = (cmt.Protocol == 1) ? Protocol.HAXX : Protocol.JODI;
                                         wadInfo.transmitIp = cmt.IPAddress;
                                         wadInfo.transmitIos = int.Parse(cmt.IOS);
                                         wadInfo.titleId = tbTitleID.Text;
                                         wadInfo.sound = tbSound.Text;
                                         wadInfo.dol = tbDol.Text;
+                                        wadInfo.lz77 = cbLz77.Checked;
 
                                         BackgroundWorker bwCreateWad = new BackgroundWorker();
                                         bwCreateWad.DoWork += new DoWorkEventHandler(bwCreateWad_DoWork);
@@ -1306,10 +1108,7 @@ namespace CustomizeMii
                                         bwCreateWad.WorkerReportsProgress = true;
                                         bwCreateWad.RunWorkerAsync(wadInfo);
                                     }
-                                    catch (Exception ex)
-                                    {
-                                        ErrorBox(ex.Message);
-                                    }
+                                    catch (Exception ex) { errorBox(ex.Message); }
                                 }
                             }
                         }
@@ -1323,31 +1122,36 @@ namespace CustomizeMii
                 {
                     if (!string.IsNullOrEmpty(tbSourceWad.Text))
                     {
-                        if (cbFailureChecks.Checked == true || FailureCheck() == true)
+                        if (cbSecurityChecksOff.Checked == true || securityChecks() == true)
                         {
                             SaveFileDialog sfd = new SaveFileDialog();
                             sfd.Filter = "Wii Channels|*.wad";
 
+                            string fileName;
+
                             if (!string.IsNullOrEmpty(tbAllLanguages.Text))
-                                sfd.FileName = tbAllLanguages.Text + " - " + tbTitleID.Text.ToUpper() + ".wad";
+                                fileName = tbAllLanguages.Text + " - " + tbTitleID.Text.ToUpper() + ".wad";
                             else
-                                sfd.FileName = tbEnglish.Text + " - " + tbTitleID.Text.ToUpper() + ".wad";
+                                fileName = tbEnglish.Text + " - " + tbTitleID.Text.ToUpper() + ".wad";
+
+                            foreach (char invalidChar in Path.GetInvalidFileNameChars())
+                                fileName = fileName.Replace(invalidChar.ToString(), string.Empty);
+
+                            sfd.FileName = fileName;
 
                             if (sfd.ShowDialog() == DialogResult.OK)
                             {
                                 try
                                 {
-                                    CreationTimer.Reset();
-                                    CreationTimer.Start();
-
                                     WadCreationInfo wadInfo = new WadCreationInfo();
 
-                                    if (!int.TryParse(tbStartupIos.Text, out wadInfo.requiredIos)) { ErrorBox("Please enter a valid Required IOS! (0 - 255)"); return; }
+                                    if (!int.TryParse(tbStartupIos.Text, out wadInfo.startupIos)) { errorBox("Please enter a valid startup IOS! (0 - 255)"); return; }
                                     wadInfo.titles = new string[] { tbJapanese.Text, tbEnglish.Text, tbGerman.Text, tbFrench.Text, tbSpanish.Text, tbItalian.Text, tbDutch.Text, tbKorean.Text };
                                     wadInfo.allLangTitle = tbAllLanguages.Text;
                                     wadInfo.titleId = tbTitleID.Text;
                                     wadInfo.sound = tbSound.Text;
                                     wadInfo.dol = tbDol.Text;
+                                    wadInfo.lz77 = cbLz77.Checked;
 
                                     wadInfo.outFile = sfd.FileName;
                                     wadInfo.nandLoader = (WadCreationInfo.NandLoader)cmbNandLoader.SelectedIndex;
@@ -1363,8 +1167,7 @@ namespace CustomizeMii
                                 }
                                 catch (Exception ex)
                                 {
-                                    CreationTimer.Stop();
-                                    ErrorBox(ex.Message);
+                                    errorBox(ex.Message);
                                 }
                             }
                         }
@@ -1432,46 +1235,44 @@ namespace CustomizeMii
                 {
                     try
                     {
-                        bool Exists = false;
-
-                        if (lbBrlanActions.Text == "Banner")
+                        if (lbBrlanActions.Text.ToLower() == "banner")
                         {
                             for (int i = 0; i < lbxBrlanBanner.Items.Count; i++)
-                                if (lbxBrlanBanner.Items[i].ToString() == ofd.FileName.Remove(0, ofd.FileName.LastIndexOf('\\') + 1))
-                                    Exists = true;
+                                if (lbxBrlanBanner.Items[i].ToString().ToLower() == Path.GetFileName(ofd.FileName).ToLower())
+                                { errorBox("This file already exists, use the Replace button!"); return; }
 
-                            if (Exists == true)
-                                ErrorBox("This file already exists, use the Replace button!");
+                            if (string.IsNullOrEmpty(replacedBanner))
+                            {
+                                bannerBin.AddFile("/arc/anim/" + Path.GetFileName(ofd.FileName), File.ReadAllBytes(ofd.FileName));
+                            }
                             else
                             {
-                                if (string.IsNullOrEmpty(BannerReplace))
-                                    File.Copy(ofd.FileName, TempUnpackBannerBrlanPath + ofd.FileName.Remove(0, ofd.FileName.LastIndexOf('\\') + 1), true);
-                                else
-                                    File.Copy(ofd.FileName, BannerBrlanPath + ofd.FileName.Remove(0, ofd.FileName.LastIndexOf('\\') + 1), true);
-                                lbxBrlanBanner.Items.Add(ofd.FileName.Remove(0, ofd.FileName.LastIndexOf('\\') + 1));
-                                BrlanChanged = true;
+                                newBannerBin.AddFile("/arc/anim/" + Path.GetFileName(ofd.FileName), File.ReadAllBytes(ofd.FileName));
                             }
+
+                            brlanChanged = true;
+                            addBrlans();
                         }
                         else
                         {
                             for (int i = 0; i < lbxBrlanIcon.Items.Count; i++)
-                                if (lbxBrlanIcon.Items[i].ToString() == ofd.FileName.Remove(0, ofd.FileName.LastIndexOf('\\') + 1))
-                                    Exists = true;
+                                if (lbxBrlanIcon.Items[i].ToString().ToLower() == Path.GetFileName(ofd.FileName).ToLower())
+                                { errorBox("This file already exists, use the Replace button!"); return; }
 
-                            if (Exists == true)
-                                ErrorBox("This file already exists, use the Replace button!");
+                            if (string.IsNullOrEmpty(replacedIcon))
+                            {
+                                iconBin.AddFile("/arc/anim/" + Path.GetFileName(ofd.FileName), File.ReadAllBytes(ofd.FileName));
+                            }
                             else
                             {
-                                if (string.IsNullOrEmpty(IconReplace))
-                                    File.Copy(ofd.FileName, TempUnpackIconBrlanPath + ofd.FileName.Remove(0, ofd.FileName.LastIndexOf('\\') + 1), true);
-                                else
-                                    File.Copy(ofd.FileName, IconBrlanPath + ofd.FileName.Remove(0, ofd.FileName.LastIndexOf('\\') + 1), true);
-                                lbxBrlanIcon.Items.Add(ofd.FileName.Remove(0, ofd.FileName.LastIndexOf('\\') + 1));
-                                BrlanChanged = true;
+                                newIconBin.AddFile("/arc/anim/" + Path.GetFileName(ofd.FileName), File.ReadAllBytes(ofd.FileName)); ;
                             }
+
+                            brlanChanged = true;
+                            addBrlans();
                         }
                     }
-                    catch (Exception ex) { ErrorBox(ex.Message); }
+                    catch (Exception ex) { errorBox(ex.Message); }
                 }
             }
         }
@@ -1483,7 +1284,7 @@ namespace CustomizeMii
                 SaveFileDialog sfd = new SaveFileDialog();
                 sfd.Filter = "brlyt Files|*.brlyt";
 
-                if (lbBrlytActions.Text == "Banner")
+                if (lbBrlytActions.Text.ToLower() == "banner")
                     sfd.FileName = lbxBrlytBanner.SelectedItem.ToString();
                 else
                     sfd.FileName = lbxBrlytIcon.SelectedItem.ToString();
@@ -1492,26 +1293,22 @@ namespace CustomizeMii
                 {
                     try
                     {
-                        string brlytFile;
-
-                        if (lbBrlytActions.Text == "Banner")
+                        if (lbBrlytActions.Text.ToLower() == "banner")
                         {
-                            if (string.IsNullOrEmpty(BannerReplace))
-                                brlytFile = TempUnpackBannerBrlytPath + lbxBrlytBanner.SelectedItem.ToString();
+                            if (string.IsNullOrEmpty(replacedBanner))
+                                File.WriteAllBytes(sfd.FileName, bannerBin.Data[bannerBin.GetNodeIndex(lbxBrlytBanner.SelectedItem.ToString())]);
                             else
-                                brlytFile = BannerBrlytPath + lbxBrlytBanner.Items.ToString();
+                                File.WriteAllBytes(sfd.FileName, newBannerBin.Data[newBannerBin.GetNodeIndex(lbxBrlytBanner.SelectedItem.ToString())]);
                         }
                         else
                         {
-                            if (string.IsNullOrEmpty(IconReplace))
-                                brlytFile = TempUnpackIconBrlytPath + lbxBrlytIcon.SelectedItem.ToString();
+                            if (string.IsNullOrEmpty(replacedIcon))
+                                File.WriteAllBytes(sfd.FileName, iconBin.Data[iconBin.GetNodeIndex(lbxBrlytIcon.SelectedItem.ToString())]);
                             else
-                                brlytFile = IconBrlytPath + lbxBrlytIcon.Items.ToString();
+                                File.WriteAllBytes(sfd.FileName, newIconBin.Data[newIconBin.GetNodeIndex(lbxBrlytIcon.SelectedItem.ToString())]);
                         }
-
-                        File.Copy(brlytFile, sfd.FileName, true);
                     }
-                    catch (Exception ex) { ErrorBox(ex.Message); }
+                    catch (Exception ex) { errorBox(ex.Message); }
                 }
             }
         }
@@ -1523,7 +1320,7 @@ namespace CustomizeMii
                 SaveFileDialog sfd = new SaveFileDialog();
                 sfd.Filter = "brlan Files|*.brlan";
 
-                if (lbBrlanActions.Text == "Banner")
+                if (lbBrlanActions.Text.ToLower() == "banner")
                     sfd.FileName = lbxBrlanBanner.SelectedItem.ToString();
                 else
                     sfd.FileName = lbxBrlanIcon.SelectedItem.ToString();
@@ -1532,26 +1329,22 @@ namespace CustomizeMii
                 {
                     try
                     {
-                        string brlanFile;
-
-                        if (lbBrlanActions.Text == "Banner")
+                        if (lbBrlanActions.Text.ToLower() == "banner")
                         {
-                            if (string.IsNullOrEmpty(BannerReplace))
-                                brlanFile = TempUnpackBannerBrlanPath + lbxBrlanBanner.SelectedItem.ToString();
+                            if (string.IsNullOrEmpty(replacedBanner))
+                                File.WriteAllBytes(sfd.FileName, bannerBin.Data[bannerBin.GetNodeIndex(lbxBrlanBanner.SelectedItem.ToString())]);
                             else
-                                brlanFile = BannerBrlanPath + lbxBrlanBanner.Items.ToString();
+                                File.WriteAllBytes(sfd.FileName, newBannerBin.Data[newBannerBin.GetNodeIndex(lbxBrlanBanner.SelectedItem.ToString())]);
                         }
                         else
                         {
-                            if (string.IsNullOrEmpty(IconReplace))
-                                brlanFile = TempUnpackIconBrlanPath + lbxBrlanIcon.SelectedItem.ToString();
+                            if (string.IsNullOrEmpty(replacedIcon))
+                                File.WriteAllBytes(sfd.FileName, iconBin.Data[iconBin.GetNodeIndex(lbxBrlanIcon.SelectedItem.ToString())]);
                             else
-                                brlanFile = IconBrlanPath + lbxBrlanIcon.Items.ToString();
+                                File.WriteAllBytes(sfd.FileName, newIconBin.Data[newIconBin.GetNodeIndex(lbxBrlanIcon.SelectedItem.ToString())]);
                         }
-
-                        File.Copy(brlanFile, sfd.FileName, true);
                     }
-                    catch (Exception ex) { ErrorBox(ex.Message); }
+                    catch (Exception ex) { errorBox(ex.Message); }
                 }
             }
         }
@@ -1562,43 +1355,43 @@ namespace CustomizeMii
             {
                 try
                 {
-                    string brlanFile;
-
-                    if (lbBrlanActions.Text == "Banner")
+                    if (lbBrlanActions.Text.ToLower() == "banner")
                     {
                         if (lbxBrlanBanner.Items.Count > 1)
                         {
-                            if (string.IsNullOrEmpty(BannerReplace))
-                                brlanFile = TempUnpackBannerBrlanPath + lbxBrlanBanner.SelectedItem.ToString();
+                            if (string.IsNullOrEmpty(replacedBanner))
+                            {
+                                bannerBin.RemoveFile("/arc/anim/" + lbxBrlanBanner.SelectedItem.ToString());
+                            }
                             else
-                                brlanFile = BannerBrlanPath + lbxBrlanBanner.SelectedItem.ToString();
+                            {
+                                newBannerBin.RemoveFile("/arc/anim/" + lbxBrlanBanner.SelectedItem.ToString());
+                            }
 
-                            lbxBrlanBanner.Items.Remove(lbxBrlanBanner.SelectedItem);
-                            File.Delete(brlanFile);
-                            BrlanChanged = true;
+                            brlanChanged = true;
+                            addBrlans();
                         }
                         else
-                        {
-                            ErrorBox("You can't delete the last file.\nAdd a new one first in order to delete this one.");
-                        }
+                            errorBox("You can't delete the last file.\nAdd a new one first in order to delete this one.");
                     }
                     else
                     {
                         if (lbxBrlanIcon.Items.Count > 1)
                         {
-                            if (string.IsNullOrEmpty(IconReplace))
-                                brlanFile = TempUnpackIconBrlanPath + lbxBrlanIcon.SelectedItem.ToString();
+                            if (string.IsNullOrEmpty(replacedIcon))
+                            {
+                                iconBin.RemoveFile("/arc/anim/" + lbxBrlanBanner.SelectedItem.ToString());
+                            }
                             else
-                                brlanFile = IconBrlanPath + lbxBrlanIcon.SelectedItem.ToString();
+                            {
+                                newIconBin.RemoveFile("/arc/anim/" + lbxBrlanBanner.SelectedItem.ToString());
+                            }
 
-                            lbxBrlanIcon.Items.Remove(lbxBrlanIcon.SelectedItem);
-                            File.Delete(brlanFile);
-                            BrlanChanged = true;
+                            brlanChanged = true;
+                            addBrlans();
                         }
                         else
-                        {
-                            ErrorBox("You can't delete the last file.\nAdd a new one first in order to delete this one.");
-                        }
+                            errorBox("You can't delete the last file.\nAdd a new one first in order to delete this one.");
                     }
                 }
                 catch { }
@@ -1616,38 +1409,26 @@ namespace CustomizeMii
                 {
                     try
                     {
-                        if (lbBrlytActions.Text == "Banner")
+                        if (lbBrlytActions.Text.ToLower() == "banner")
                         {
-                            if (string.IsNullOrEmpty(BannerReplace))
-                            {
-                                File.Delete(TempUnpackBannerBrlytPath + lbxBrlytBanner.SelectedItem.ToString());
-                                File.Copy(ofd.FileName, TempUnpackBannerBrlytPath + lbxBrlytBanner.SelectedItem.ToString(), true);
-                                BrlytChanged = true;
-                            }
+                            if (string.IsNullOrEmpty(replacedBanner))
+                                bannerBin.ReplaceFile(bannerBin.GetNodeIndex(lbxBrlytBanner.SelectedItem.ToString()), File.ReadAllBytes(ofd.FileName));
                             else
-                            {
-                                File.Delete(BannerBrlytPath + lbxBrlytBanner.SelectedItem.ToString());
-                                File.Copy(ofd.FileName, BannerBrlytPath + lbxBrlytBanner.SelectedItem.ToString(), true);
-                                BrlytChanged = true;
-                            }
+                                newBannerBin.ReplaceFile(newBannerBin.GetNodeIndex(lbxBrlytBanner.SelectedItem.ToString()), File.ReadAllBytes(ofd.FileName));
+
+                            brlytChanged = true;
                         }
                         else
                         {
-                            if (string.IsNullOrEmpty(IconReplace))
-                            {
-                                File.Delete(TempUnpackIconBrlytPath + lbxBrlytIcon.SelectedItem.ToString());
-                                File.Copy(ofd.FileName, TempUnpackIconBrlytPath + lbxBrlytIcon.SelectedItem.ToString(), true);
-                                BrlytChanged = true;
-                            }
+                            if (string.IsNullOrEmpty(replacedIcon))
+                                iconBin.ReplaceFile(iconBin.GetNodeIndex(lbxBrlytIcon.SelectedItem.ToString()), File.ReadAllBytes(ofd.FileName));
                             else
-                            {
-                                File.Delete(IconBrlytPath + lbxBrlytIcon.SelectedItem.ToString());
-                                File.Copy(ofd.FileName, IconBrlytPath + lbxBrlytIcon.SelectedItem.ToString(), true);
-                                BrlytChanged = true;
-                            }
+                                newIconBin.ReplaceFile(newIconBin.GetNodeIndex(lbxBrlytIcon.SelectedItem.ToString()), File.ReadAllBytes(ofd.FileName));
+
+                            brlytChanged = true;
                         }
                     }
-                    catch (Exception ex) { ErrorBox(ex.Message); }
+                    catch (Exception ex) { errorBox(ex.Message); }
                 }
             }
         }
@@ -1663,38 +1444,26 @@ namespace CustomizeMii
                 {
                     try
                     {
-                        if (lbBrlanActions.Text == "Banner")
+                        if (lbBrlanActions.Text.ToLower() == "banner")
                         {
-                            if (string.IsNullOrEmpty(BannerReplace))
-                            {
-                                File.Delete(TempUnpackBannerBrlanPath + lbxBrlanBanner.SelectedItem.ToString());
-                                File.Copy(ofd.FileName, TempUnpackBannerBrlanPath + lbxBrlanBanner.SelectedItem.ToString(), true);
-                                BrlanChanged = true;
-                            }
+                            if (string.IsNullOrEmpty(replacedBanner))
+                                bannerBin.ReplaceFile(bannerBin.GetNodeIndex(lbxBrlanBanner.SelectedItem.ToString()), File.ReadAllBytes(ofd.FileName));
                             else
-                            {
-                                File.Delete(BannerBrlanPath + lbxBrlanBanner.SelectedItem.ToString());
-                                File.Copy(ofd.FileName, BannerBrlanPath + lbxBrlanBanner.SelectedItem.ToString(), true);
-                                BrlanChanged = true;
-                            }
+                                newBannerBin.ReplaceFile(newBannerBin.GetNodeIndex(lbxBrlanBanner.SelectedItem.ToString()), File.ReadAllBytes(ofd.FileName));
+
+                            brlanChanged = true;
                         }
                         else
                         {
-                            if (string.IsNullOrEmpty(IconReplace))
-                            {
-                                File.Delete(TempUnpackIconBrlanPath + lbxBrlanIcon.SelectedItem.ToString());
-                                File.Copy(ofd.FileName, TempUnpackIconBrlanPath + lbxBrlanIcon.SelectedItem.ToString(), true);
-                                BrlanChanged = true;
-                            }
+                            if (string.IsNullOrEmpty(replacedIcon))
+                                iconBin.ReplaceFile(iconBin.GetNodeIndex(lbxBrlanIcon.SelectedItem.ToString()), File.ReadAllBytes(ofd.FileName));
                             else
-                            {
-                                File.Delete(IconBrlanPath + lbxBrlanIcon.SelectedItem.ToString());
-                                File.Copy(ofd.FileName, IconBrlanPath + lbxBrlanIcon.SelectedItem.ToString(), true);
-                                BrlanChanged = true;
-                            }
+                                newIconBin.ReplaceFile(newIconBin.GetNodeIndex(lbxBrlanIcon.SelectedItem.ToString()), File.ReadAllBytes(ofd.FileName));
+
+                            brlanChanged = true;
                         }
                     }
-                    catch (Exception ex) { ErrorBox(ex.Message); }
+                    catch (Exception ex) { errorBox(ex.Message); }
                 }
             }
         }
@@ -1706,7 +1475,7 @@ namespace CustomizeMii
                 llbUpdateAvailable.LinkVisited = true;
                 Process.Start("http://code.google.com/p/customizemii/downloads/list");
             }
-            catch (Exception ex) { ErrorBox(ex.Message); }
+            catch (Exception ex) { errorBox(ex.Message); }
         }
 
         private void btnDeleteBanner_Click(object sender, EventArgs e)
@@ -1717,21 +1486,47 @@ namespace CustomizeMii
 
                 try
                 {
-                    string TplName = lbxBannerTpls.SelectedItem.ToString().Remove(lbxBannerTpls.SelectedItem.ToString().IndexOf('(', 0) - 1);
-                    string CurBannerPath = GetCurBannerPath();
-                    string[] brlytTpls = Wii.Brlyt.GetBrlytTpls(CurBannerPath + "blyt\\banner.brlyt", (File.Exists(CurBannerPath + "anim\\banner.brlan")) ? CurBannerPath + "anim\\banner.brlan" : CurBannerPath + "anim\\banner_loop.brlan");
+                    string tplName = lbxBannerTpls.SelectedItem.ToString().Remove(lbxBannerTpls.SelectedItem.ToString().IndexOf('(', 0) - 3);
+                    string[] requiredTpls = new string[0];
 
-                    if (!Wii.Tools.StringExistsInStringArray(TplName, brlytTpls) || cbFailureChecks.Checked)
+                    if (string.IsNullOrEmpty(replacedBanner))
                     {
-                        File.Delete(CurBannerPath + "timg\\" + TplName);
-                        lbxBannerTpls.Items.Remove(lbxBannerTpls.SelectedItem);
+                        for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                        {
+                            if (bannerBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                            { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlyt.GetBrlytTpls(bannerBin.Data[i])); }
+                            else if (bannerBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                            { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlan.GetBrlanTpls(bannerBin.Data[i])); }
+                        }
                     }
                     else
                     {
-                        ErrorBox("This TPL is required by your banner.brlyt and thus can't be deleted!\nYou can still replace the image using the Replace button!");
+                        for (int i = 0; i < newBannerBin.NumOfNodes; i++)
+                        {
+                            if (newBannerBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                            { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlyt.GetBrlytTpls(newBannerBin.Data[i])); }
+                            else if (newBannerBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                            { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlan.GetBrlanTpls(newBannerBin.Data[i])); }
+                        }
                     }
+
+                    if (!Array.Exists(requiredTpls, thisTpl => thisTpl.ToLower() == tplName.ToLower()) || cbSecurityChecksOff.Checked)
+                    {
+                        if (string.IsNullOrEmpty(replacedBanner))
+                        {
+                            bannerBin.RemoveFile("/arc/timg/" + tplName);
+                        }
+                        else
+                        {
+                            newBannerBin.RemoveFile("/arc/timg/" + tplName);
+                        }
+
+                        addTpls();
+                    }
+                    else
+                        errorBox("This TPL is required by your banner.brlyt and thus can't be deleted!\nYou can still replace the image using the Replace button!");
                 }
-                catch (Exception ex) { ErrorBox(ex.Message); }
+                catch (Exception ex) { errorBox(ex.Message); }
 
                 for (; ; )
                 {
@@ -1741,6 +1536,8 @@ namespace CustomizeMii
                         break;
                     }
                     catch { idx--; }
+
+                    if (idx < -1) break;
                 }
             }
 
@@ -1755,22 +1552,47 @@ namespace CustomizeMii
 
                 try
                 {
-                    string TplName = lbxIconTpls.SelectedItem.ToString().Remove(lbxIconTpls.SelectedItem.ToString().IndexOf('(', 0) - 1);
-                    string CurIconPath = GetCurIconPath();
+                    string tplName = lbxIconTpls.SelectedItem.ToString().Remove(lbxIconTpls.SelectedItem.ToString().IndexOf('(', 0) - 3);
+                    string[] requiredTpls = new string[0];
 
-                    string[] brlytTpls = Wii.Brlyt.GetBrlytTpls(CurIconPath + "blyt\\icon.brlyt", CurIconPath + "anim\\icon.brlan");
-
-                    if (!Wii.Tools.StringExistsInStringArray(TplName, brlytTpls) || cbFailureChecks.Checked)
+                    if (string.IsNullOrEmpty(replacedIcon))
                     {
-                        File.Delete(CurIconPath + "timg\\" + TplName);
-                        lbxIconTpls.Items.Remove(lbxIconTpls.SelectedItem);
+                        for (int i = 0; i < iconBin.NumOfNodes; i++)
+                        {
+                            if (iconBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                            { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlyt.GetBrlytTpls(iconBin.Data[i])); }
+                            else if (iconBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                            { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlan.GetBrlanTpls(iconBin.Data[i])); }
+                        }
                     }
                     else
                     {
-                        ErrorBox("This TPL is required by your icon.brlyt and thus can't be deleted!\nYou can still replace the image using the Replace button!");
+                        for (int i = 0; i < newIconBin.NumOfNodes; i++)
+                        {
+                            if (newIconBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                            { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlyt.GetBrlytTpls(newIconBin.Data[i])); }
+                            else if (newIconBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                            { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlan.GetBrlanTpls(newIconBin.Data[i])); }
+                        }
                     }
+
+                    if (!Array.Exists(requiredTpls, thisTpl => thisTpl.ToLower() == tplName.ToLower()) || cbSecurityChecksOff.Checked)
+                    {
+                        if (string.IsNullOrEmpty(replacedIcon))
+                        {
+                            iconBin.RemoveFile("/arc/timg/" + tplName);
+                        }
+                        else
+                        {
+                            newIconBin.RemoveFile("/arc/timg/" + tplName);
+                        }
+
+                        addTpls();
+                    }
+                    else
+                        errorBox("This TPL is required by your icon.brlyt and thus can't be deleted!\nYou can still replace the image using the Replace button!");
                 }
-                catch (Exception ex) { ErrorBox(ex.Message); }
+                catch (Exception ex) { errorBox(ex.Message); }
 
                 for (; ; )
                 {
@@ -1780,6 +1602,8 @@ namespace CustomizeMii
                         break;
                     }
                     catch { idx--; }
+
+                    if (idx < -1) break;
                 }
             }
 
@@ -1788,34 +1612,74 @@ namespace CustomizeMii
 
         private void btnAddBanner_Click(object sender, EventArgs e)
         {
-            try { AddTpl(lbxBannerTpls); }
-            catch (Exception ex) { ErrorBox(ex.Message); }
+            try { addTpl(lbxBannerTpls); }
+            catch (Exception ex) { errorBox(ex.Message); }
         }
 
         private void btnAddIcon_Click(object sender, EventArgs e)
         {
-            try { AddTpl(lbxIconTpls); }
-            catch (Exception ex) { ErrorBox(ex.Message); }
+            try { addTpl(lbxIconTpls); }
+            catch (Exception ex) { errorBox(ex.Message); }
         }
 
         private void btnBrlytListTpls_Click(object sender, EventArgs e)
         {
-            if (lbBrlytActions.Text == "Banner")
+            if (lbBrlytActions.Text.ToLower() == "banner")
             {
-                string CurBannerPath = GetCurBannerPath();
-                string[] brlytTpls = Wii.Brlyt.GetBrlytTpls(CurBannerPath + "blyt\\banner.brlyt", (File.Exists(CurBannerPath + "anim\\banner.brlan")) ? CurBannerPath + "anim\\banner.brlan" : CurBannerPath + "anim\\banner_loop.brlan");
+                string[] requiredTpls = new string[0];
+
+                if (string.IsNullOrEmpty(replacedBanner))
+                {
+                    for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                    {
+                        if (bannerBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                        { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlyt.GetBrlytTpls(bannerBin.Data[i])); }
+                        else if (bannerBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                        { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlan.GetBrlanTpls(bannerBin.Data[i])); }
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < newBannerBin.NumOfNodes; i++)
+                    {
+                        if (newBannerBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                        { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlyt.GetBrlytTpls(newBannerBin.Data[i])); }
+                        else if (newBannerBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                        { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlan.GetBrlanTpls(newBannerBin.Data[i])); }
+                    }
+                }
 
                 MessageBox.Show("These are the TPLs required by your banner.brlyt:\n\n" +
-                    string.Join("\n", brlytTpls), "TPLs specified in banner.brlyt", MessageBoxButtons.OK,
+                    string.Join("\n", requiredTpls), "TPLs specified in banner.brlyt", MessageBoxButtons.OK,
                     MessageBoxIcon.Information);
             }
             else
             {
-                string CurIconPath = GetCurIconPath();
-                string[] brlytTpls = Wii.Brlyt.GetBrlytTpls(CurIconPath + "blyt\\icon.brlyt", CurIconPath + "anim\\icon.brlan");
+                string[] requiredTpls = new string[0];
+
+                if (string.IsNullOrEmpty(replacedIcon))
+                {
+                    for (int i = 0; i < iconBin.NumOfNodes; i++)
+                    {
+                        if (iconBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                        { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlyt.GetBrlytTpls(iconBin.Data[i])); }
+                        else if (iconBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                        { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlan.GetBrlanTpls(iconBin.Data[i])); }
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < newIconBin.NumOfNodes; i++)
+                    {
+                        if (newIconBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                        { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlyt.GetBrlytTpls(newIconBin.Data[i])); }
+                        else if (newIconBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                        { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlan.GetBrlanTpls(newIconBin.Data[i])); }
+                    }
+                }
 
                 MessageBox.Show("These are the TPLs required by your icon.brlyt:\n\n" +
-                    string.Join("\n", brlytTpls), "TPLs specified in icon.brlyt", MessageBoxButtons.OK,
+                    string.Join("\n", requiredTpls), "TPLs specified in icon.brlyt", MessageBoxButtons.OK,
                     MessageBoxIcon.Information);
             }
         }
@@ -1834,7 +1698,7 @@ namespace CustomizeMii
                             lbxBannerTpls.Items.Remove(lbxBannerTpls.SelectedItem);
                             lbxBannerTpls.Items.Add(thisItem + " (Transparent)");
                             lbxBannerTpls.SelectedItem = thisItem + " (Transparent)";
-                            BannerTransparents.Add(thisItem.Remove(thisItem.IndexOf('(', 0) - 1));
+                            bannerTransparents.Add(thisItem.Remove(thisItem.IndexOf('(', 0) - 3));
                         }
                     }
                     catch { }
@@ -1847,7 +1711,7 @@ namespace CustomizeMii
                         lbxBannerTpls.Items.Remove(lbxBannerTpls.SelectedItem);
                         lbxBannerTpls.Items.Add(thisItem.Replace(" (Transparent)", string.Empty));
                         lbxBannerTpls.SelectedItem = thisItem.Replace(" (Transparent)", string.Empty);
-                        BannerTransparents.Remove(thisItem.Remove(thisItem.IndexOf('(', 0) - 1));
+                        bannerTransparents.Remove(thisItem.Remove(thisItem.IndexOf('(', 0) - 3));
                     }
                     catch { }
                 }
@@ -1870,7 +1734,7 @@ namespace CustomizeMii
                             lbxIconTpls.Items.Remove(lbxIconTpls.SelectedItem);
                             lbxIconTpls.Items.Add(thisItem + " (Transparent)");
                             lbxIconTpls.SelectedItem = thisItem + " (Transparent)";
-                            IconTransparents.Add(thisItem.Remove(thisItem.IndexOf('(', 0) - 1));
+                            iconTransparents.Add(thisItem.Remove(thisItem.IndexOf('(', 0) - 3));
                         }
                     }
                     catch { }
@@ -1883,7 +1747,7 @@ namespace CustomizeMii
                         lbxIconTpls.Items.Remove(lbxIconTpls.SelectedItem);
                         lbxIconTpls.Items.Add(thisItem.Replace(" (Transparent)", string.Empty));
                         lbxIconTpls.SelectedItem = thisItem.Replace(" (Transparent)", string.Empty);
-                        IconTransparents.Remove(thisItem.Remove(thisItem.IndexOf('(', 0) - 1));
+                        iconTransparents.Remove(thisItem.Remove(thisItem.IndexOf('(', 0) - 3));
                     }
                     catch { }
                 }
@@ -1894,59 +1758,27 @@ namespace CustomizeMii
 
         private void btnForwarder_Click(object sender, EventArgs e)
         {
-#if Mono
-            ErrorBox("This feature doesn't work under Mono!");
-#endif
-
-#if !Mono
-            if (CheckForForwardMii() == true)
+            if (checkForForwardMii() == true)
             {
-                if (CheckDevKit() == false)
-                {
-                    ForwarderDialogSimple();
-                }
+                if (checkDevKit() == false)
+                    forwarderDialogSimple();
                 else
-                {
                     cmForwarder.Show(MousePosition);
-                }
             }
-            else
-            {
-                if (MessageBox.Show("You don't have the ForwardMii.dll in your application folder.\nYou can download it on the project page, do you want the page to be opened?", "Plugin not available", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes)
-                {
-                    Process.Start("http://code.google.com/p/customizemii/downloads/list");
-                }
-            }
-#endif
+            else errorBox("ForwardMii.dll wasn't found!");
         }
 
         private void cmForwarderItem_Click(object sender, EventArgs e)
         {
-#if !Mono
             ToolStripMenuItem cmSender = sender as ToolStripMenuItem;
 
             if (cmSender == cmSimpleForwarder)
-                ForwarderDialogSimple();
+                forwarderDialogSimple();
             else
             {
-                try
-                {
-                    string CurrentVersion = GetForwardMiiVersion();
-                    int cVersion = Convert.ToInt32(CurrentVersion.Replace(".", string.Empty).Length == 2 ? (CurrentVersion.Replace(".", string.Empty) + "0") : CurrentVersion.Replace(".", string.Empty));
-
-                    if (cVersion < 110)
-                    {
-                        ErrorBox("Version 1.1 or higher of the ForwardMii.dll is required!");
-                        return;
-                    }
-                    ForwarderDialogComplex();
-                }
-                catch (Exception ex)
-                {
-                    ErrorBox(ex.Message);
-                }
+                try { forwarderDialogComplex(); }
+                catch (Exception ex) { errorBox(ex.Message); }
             }
-#endif
         }
 
         private void btnOptionsExtract_Click(object sender, EventArgs e)
@@ -1983,88 +1815,134 @@ namespace CustomizeMii
                                 iconPath = fbd.SelectedPath;
                                 break;
                             default: //both
-                                bannerPath = fbd.SelectedPath + "\\Banner";
-                                iconPath = fbd.SelectedPath + "\\Icon";
+                                bannerPath = fbd.SelectedPath + Path.DirectorySeparatorChar + "Banner";
+                                iconPath = fbd.SelectedPath + Path.DirectorySeparatorChar + "Icon";
                                 break;
                         }
 
                         if (!string.IsNullOrEmpty(bannerPath))
                         {
                             if (!Directory.Exists(bannerPath)) Directory.CreateDirectory(bannerPath);
-                            string[] tplFiles = Directory.GetFiles(BannerTplPath, "*.tpl");
-                            Image img;
 
-                            foreach (string thisTpl in tplFiles)
+                            if (string.IsNullOrEmpty(replacedBanner))
                             {
-                                img = Wii.TPL.ConvertFromTPL(thisTpl);
-                                img.Save(bannerPath + "\\" + Path.GetFileNameWithoutExtension(thisTpl) + ".png",
-                                    System.Drawing.Imaging.ImageFormat.Png);
+                                for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                                {
+                                    if (bannerBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                                    {
+                                        Image img = TPL.Load(bannerBin.Data[i]).ExtractTexture();
+                                        img.Save(bannerPath + Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(bannerBin.StringTable[i]) + ".png");
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                for (int i = 0; i < newBannerBin.NumOfNodes; i++)
+                                {
+                                    if (newBannerBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                                    {
+                                        Image img = TPL.Load(newBannerBin.Data[i]).ExtractTexture();
+                                        img.Save(bannerPath + Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(newBannerBin.StringTable[i]) + ".png");
+                                    }
+                                }
                             }
                         }
+
                         if (!string.IsNullOrEmpty(iconPath))
                         {
                             if (!Directory.Exists(iconPath)) Directory.CreateDirectory(iconPath);
-                            string[] tplFiles = Directory.GetFiles(IconTplPath, "*.tpl");
-                            Image img;
 
-                            foreach (string thisTpl in tplFiles)
+                            if (string.IsNullOrEmpty(replacedIcon))
                             {
-                                img = Wii.TPL.ConvertFromTPL(thisTpl);
-                                img.Save(iconPath + "\\" + Path.GetFileNameWithoutExtension(thisTpl) + ".png",
-                                    System.Drawing.Imaging.ImageFormat.Png);
+                                for (int i = 0; i < iconBin.NumOfNodes; i++)
+                                {
+                                    if (iconBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                                    {
+                                        Image img = TPL.Load(iconBin.Data[i]).ExtractTexture();
+                                        img.Save(iconPath + Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(iconBin.StringTable[i]) + ".png");
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                for (int i = 0; i < newIconBin.NumOfNodes; i++)
+                                {
+                                    if (newIconBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                                    {
+                                        Image img = TPL.Load(newIconBin.Data[i]).ExtractTexture();
+                                        img.Save(iconPath + Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(newIconBin.StringTable[i]) + ".png");
+                                    }
+                                }
                             }
                         }
 
-                        InfoBox("Extracted images successfully!");
+                        infoBox("Extracted images successfully!");
                     }
                 }
-                catch (Exception ex) { ErrorBox(ex.Message); }
+                catch (Exception ex) { errorBox(ex.Message); }
             }
             else if (cmSender.OwnerItem == tsExtractSound)
             {
                 try
                 {
-                SaveFileDialog sfd = new SaveFileDialog();
-                if (cmSender.Name.ToLower() == "cmextractsoundasbin") { sfd.Filter = "BIN|*.bin"; sfd.FileName = "sound.bin"; }
-                else if (cmSender.Name.ToLower() == "cmextractsoundasaudio")
-                {
-                    byte[] soundBin = Wii.Tools.LoadFileToByteArray(TempUnpackPath + "00000000.app_OUT\\meta\\sound.bin", 32, 16);
+                    byte[] soundFile = new byte[0];
 
-                    if (soundBin[0] == 'R' && soundBin[1] == 'I' && soundBin[2] == 'F' && soundBin[3] == 'F')
-                    { sfd.Filter = "Wave|*.wav"; sfd.FileName = "sound.wav"; }
-                    else if (soundBin[0] == 'B' && soundBin[1] == 'N' && soundBin[2] == 'S' && soundBin[3] == ' ')
-                    { sfd.Filter = "BNS|*.bns"; sfd.FileName = "sound.bns"; }
-                    else if (soundBin[0] == 'F' && soundBin[1] == 'O' && soundBin[2] == 'R' && soundBin[3] == 'M')
-                    { sfd.Filter = "AIFF|*.aif;*.aiff"; sfd.FileName = "sound.aif"; }
-                    else if (soundBin[0] == 'L' && soundBin[1] == 'Z' && soundBin[2] == '7' && soundBin[3] == '7')
+                    if (string.IsNullOrEmpty(replacedSound))
                     {
-                        if (soundBin[9] == 'R' && soundBin[10] == 'I' && soundBin[11] == 'F' && soundBin[12] == 'F')
-                        { sfd.Filter = "Wave|*.wav"; sfd.FileName = "sound.wav"; }
-                        else if (soundBin[9] == 'B' && soundBin[10] == 'N' && soundBin[11] == 'S' && soundBin[12] == ' ')
-                        { sfd.Filter = "BNS|*.bns"; sfd.FileName = "sound.bns"; }
-                        else if (soundBin[9] == 'F' && soundBin[10] == 'O' && soundBin[11] == 'R' && soundBin[12] == 'M')
-                        { sfd.Filter = "AIFF|*.aif;*.aiff"; sfd.FileName = "sound.aif"; }
-                        else throw new Exception("Unsupported Audio Format!");
-                    }
-                    else throw new Exception("Unsupported Audio Format!");
-
-                }
-
-                if (sfd.ShowDialog() == DialogResult.OK)
-                {
-                    if (sfd.FileName.ToLower().EndsWith(".bin"))
-                    {
-                        File.Copy(TempUnpackPath + "00000000.app_OUT\\meta\\sound.bin", sfd.FileName, true);
-                        InfoBox("The sound.bin was successfully extraced!");
+                        for (int i = 0; i < sourceWad.BannerApp.NumOfNodes; i++)
+                        {
+                            if (sourceWad.BannerApp.StringTable[i].ToLower() == "sound.bin")
+                                soundFile = sourceWad.BannerApp.Data[i];
+                        }
                     }
                     else
+                    { soundFile = newSoundBin; }
+
+                    SaveFileDialog sfd = new SaveFileDialog();
+                    if (cmSender.Name.ToLower() == "cmextractsoundasbin") { sfd.Filter = "BIN|*.bin"; sfd.FileName = "sound.bin"; }
+                    else if (cmSender.Name.ToLower() == "cmextractsoundasaudio")
                     {
-                        Wii.Sound.SoundBinToAudio(TempUnpackPath + "00000000.app_OUT\\meta\\sound.bin", sfd.FileName);
-                        InfoBox(string.Format("The sound.bin was successfully converted to {0}!", Path.GetFileName(sfd.FileName)));
+                        if (soundFile[0] == 'R' && soundFile[1] == 'I' && soundFile[2] == 'F' && soundFile[3] == 'F')
+                        { sfd.Filter = "Wave|*.wav"; sfd.FileName = "sound.wav"; }
+                        else if (soundFile[0] == 'B' && soundFile[1] == 'N' && soundFile[2] == 'S' && soundFile[3] == ' ')
+                        { sfd.Filter = "BNS|*.bns"; sfd.FileName = "sound.bns"; }
+                        else if (soundFile[0] == 'F' && soundFile[1] == 'O' && soundFile[2] == 'R' && soundFile[3] == 'M')
+                        { sfd.Filter = "AIFF|*.aif;*.aiff"; sfd.FileName = "sound.aif"; }
+                        else if (soundFile[0] == 'L' && soundFile[1] == 'Z' && soundFile[2] == '7' && soundFile[3] == '7')
+                        {
+                            if (soundFile[9] == 'R' && soundFile[10] == 'I' && soundFile[11] == 'F' && soundFile[12] == 'F')
+                            { sfd.Filter = "Wave|*.wav"; sfd.FileName = "sound.wav"; }
+                            else if (soundFile[9] == 'B' && soundFile[10] == 'N' && soundFile[11] == 'S' && soundFile[12] == ' ')
+                            { sfd.Filter = "BNS|*.bns"; sfd.FileName = "sound.bns"; }
+                            else if (soundFile[9] == 'F' && soundFile[10] == 'O' && soundFile[11] == 'R' && soundFile[12] == 'M')
+                            { sfd.Filter = "AIFF|*.aif;*.aiff"; sfd.FileName = "sound.aif"; }
+                            else throw new Exception("Unsupported Audio Format!");
+                        }
+                        else throw new Exception("Unsupported Audio Format!");
+                    }
+
+                    if (sfd.ShowDialog() == DialogResult.OK)
+                    {
+                        if (File.Exists(sfd.FileName)) File.Delete(sfd.FileName);
+
+                        if (sfd.FileName.ToLower().EndsWith(".bin"))
+                        {
+                            File.WriteAllBytes(sfd.FileName, soundFile);
+                            infoBox("The sound.bin was successfully extraced!");
+                        }
+                        else
+                        {
+                            soundFile = Headers.IMD5.RemoveHeader(soundFile);
+
+                            if (Lz77.IsLz77Compressed(soundFile))
+                            { Lz77 l = new Lz77(); soundFile = l.Decompress(soundFile); }
+
+                            File.WriteAllBytes(sfd.FileName, soundFile);
+                            infoBox(string.Format("The sound.bin was successfully converted to {0}!", Path.GetFileName(sfd.FileName)));
+                        }
                     }
                 }
-                }
-                catch (Exception ex) { ErrorBox(ex.Message); }
+                catch (Exception ex) { errorBox(ex.Message); }
             }
             else if (cmSender.OwnerItem == tsExtractBrl)
             {
@@ -2078,71 +1956,111 @@ namespace CustomizeMii
                         if (cmSender == cmExtractBrlyt || cmSender == cmExtractBothBrl)
                         {
                             //Extract brlyts
-                            string[] bannerFiles = Directory.GetFiles(GetCurBannerPath() + "blyt", "*.brlyt");
-                            string[] iconFiles = Directory.GetFiles(GetCurIconPath() + "blyt", "*.brlyt");
+                            if (string.IsNullOrEmpty(replacedBanner))
+                            {
+                                for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                                {
+                                    if (bannerBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                                    { File.WriteAllBytes(fbd.SelectedPath + Path.DirectorySeparatorChar + bannerBin.StringTable[i], bannerBin.Data[i]); }
+                                }
+                            }
+                            else
+                            {
+                                for (int i = 0; i < newBannerBin.NumOfNodes; i++)
+                                {
+                                    if (newBannerBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                                    { File.WriteAllBytes(fbd.SelectedPath + Path.DirectorySeparatorChar + newBannerBin.StringTable[i], newBannerBin.Data[i]); }
+                                }
+                            }
 
-                            foreach (string thisFile in bannerFiles)
-                                File.Copy(thisFile, fbd.SelectedPath + "\\" + Path.GetFileName(thisFile),true);
-
-                            foreach (string thisFile in iconFiles)
-                                File.Copy(thisFile, fbd.SelectedPath + "\\" + Path.GetFileName(thisFile), true);
+                            if (string.IsNullOrEmpty(replacedIcon))
+                            {
+                                for (int i = 0; i < iconBin.NumOfNodes; i++)
+                                {
+                                    if (iconBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                                    { File.WriteAllBytes(fbd.SelectedPath + Path.DirectorySeparatorChar + iconBin.StringTable[i], iconBin.Data[i]); }
+                                }
+                            }
+                            else
+                            {
+                                for (int i = 0; i < newIconBin.NumOfNodes; i++)
+                                {
+                                    if (newIconBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                                    { File.WriteAllBytes(fbd.SelectedPath + Path.DirectorySeparatorChar + newIconBin.StringTable[i], newIconBin.Data[i]); }
+                                }
+                            }
                         }
 
                         if (cmSender == cmExtractBothBrl || cmSender == cmExtractBrlan)
                         {
                             //Extract brlans
-                            string[] bannerFiles = Directory.GetFiles(GetCurBannerPath() + "anim", "*.brlan");
-                            string[] iconFiles = Directory.GetFiles(GetCurIconPath() + "anim", "*.brlan");
+                            if (string.IsNullOrEmpty(replacedBanner))
+                            {
+                                for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                                {
+                                    if (bannerBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                                    { File.WriteAllBytes(fbd.SelectedPath + Path.DirectorySeparatorChar + bannerBin.StringTable[i], bannerBin.Data[i]); }
+                                }
+                            }
+                            else
+                            {
+                                for (int i = 0; i < newBannerBin.NumOfNodes; i++)
+                                {
+                                    if (newBannerBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                                    { File.WriteAllBytes(fbd.SelectedPath + Path.DirectorySeparatorChar + newBannerBin.StringTable[i], newBannerBin.Data[i]); }
+                                }
+                            }
 
-                            foreach (string thisFile in bannerFiles)
-                                File.Copy(thisFile, fbd.SelectedPath + "\\" + Path.GetFileName(thisFile), true);
-
-                            foreach (string thisFile in iconFiles)
-                                File.Copy(thisFile, fbd.SelectedPath + "\\" + Path.GetFileName(thisFile), true);
+                            if (string.IsNullOrEmpty(replacedIcon))
+                            {
+                                for (int i = 0; i < iconBin.NumOfNodes; i++)
+                                {
+                                    if (iconBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                                    { File.WriteAllBytes(fbd.SelectedPath + Path.DirectorySeparatorChar + iconBin.StringTable[i], iconBin.Data[i]); }
+                                }
+                            }
+                            else
+                            {
+                                for (int i = 0; i < newIconBin.NumOfNodes; i++)
+                                {
+                                    if (newIconBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                                    { File.WriteAllBytes(fbd.SelectedPath + Path.DirectorySeparatorChar + newIconBin.StringTable[i], newIconBin.Data[i]); }
+                                }
+                            }
                         }
 
-                        InfoBox("Extracted files successfully!");
+                        infoBox("Extracted files successfully!");
                     }
                 }
-                catch (Exception ex) { ErrorBox(ex.Message); }
+                catch (Exception ex) { errorBox(ex.Message); }
             }
             else //DOL
             {
                 try
                 {
-                    string[] tmdFile = Directory.GetFiles(TempUnpackPath, "*.tmd");
-                    byte[] tmd = Wii.Tools.LoadFileToByteArray(tmdFile[0]);
-
-                    int numContents = Wii.WadInfo.GetContentNum(tmd);
-
-                    if (numContents == 3)
+                    if (sourceWad.NumOfContents == 3)
                     {
-                        int bootIndex = Wii.WadInfo.GetBootIndex(tmd);
-                        string appFile = string.Empty;
+                        int appIndex = 0;
+                        if (sourceWad.BootIndex == 1) appIndex = 2;
+                        else if (sourceWad.BootIndex == 2) appIndex = 1;
 
-                        if (bootIndex == 1)
-                        { appFile = "00000002.app"; }
-                        else if (bootIndex == 2)
-                        { appFile = "00000001.app"; }
-
-                        if (!string.IsNullOrEmpty(appFile))
+                        if (appIndex > 0)
                         {
                             SaveFileDialog sfd = new SaveFileDialog();
                             sfd.Filter = "Wii Executables|*.dol"; sfd.FileName = (string.IsNullOrEmpty(tbAllLanguages.Text) ? tbEnglish.Text : tbAllLanguages.Text) + ".dol";
 
                             if (sfd.ShowDialog() == DialogResult.OK)
                             {
-                                File.Copy(TempUnpackPath + appFile, sfd.FileName, true);
-                                InfoBox(string.Format("The DOL file was successfully extracted to {0}!", Path.GetFileName(sfd.FileName)));
+                                if (File.Exists(sfd.FileName)) File.Delete(sfd.FileName);
+                                File.WriteAllBytes(sfd.FileName, sourceWad.Contents[appIndex]);
+                                infoBox(string.Format("The DOL file was successfully extracted to {0}!", Path.GetFileName(sfd.FileName)));
                             }
                         }
-                        else
-                            ErrorBox("The DOL file couldn't be found!");
+                        else errorBox("The DOL file couldn't be found!");
                     }
-                    else
-                        ErrorBox("The DOL file couldn't be found!");
+                    else errorBox("The DOL file couldn't be found!");
                 }
-                catch (Exception ex) { ErrorBox(ex.Message); }
+                catch (Exception ex) { errorBox(ex.Message); }
             }
         }
 
@@ -2152,7 +2070,7 @@ namespace CustomizeMii
             {
                 OpenFileDialog ofd = new OpenFileDialog();
 
-                if (File.Exists(Application.StartupPath + "\\lame.exe"))
+                if (File.Exists(Application.StartupPath + Path.DirectorySeparatorChar + "lame.exe"))
                 {
                     ofd.Filter = "Wave Files|*.wav|Mp3 Files|*.mp3|BNS Files|*.bns|All|*.wav;*.mp3;*.bns";
                     ofd.FilterIndex = 4;
@@ -2167,20 +2085,17 @@ namespace CustomizeMii
                 {
                     if (ofd.FileName.ToLower().EndsWith(".mp3"))
                     {
-                        ConvertMp3ToWave(ofd.FileName);
+                        convertMp3ToWave(ofd.FileName);
                     }
                     else
                     {
-                        SetText(tbSound, ofd.FileName);
-
+                        replacedSound = ofd.FileName;
+                        setControlText(tbSound, ofd.FileName);
                         btnBrowseSound.Text = "Clear";
 
-                        if (!string.IsNullOrEmpty(SoundReplace))
-                        {
-                            SoundReplace = string.Empty;
-                            if (cmbReplace.SelectedIndex == 2) SetText(tbReplace, SoundReplace);
-                            if (File.Exists(TempSoundPath)) File.Delete(TempSoundPath);
-                        }
+                        newSoundBin = Headers.IMD5.AddHeader(File.ReadAllBytes(ofd.FileName));
+
+                        if (cmbReplace.SelectedIndex == 2) setControlText(tbReplace, string.Empty);
                     }
                 }
             }
@@ -2190,27 +2105,33 @@ namespace CustomizeMii
         {
             if (pbProgress.Value == 100)
             {
-                CustomizeMii_BnsConvert bnsConvert = new CustomizeMii_BnsConvert(File.Exists(Application.StartupPath + "\\lame.exe"));
+                CustomizeMii_BnsConvert bnsConvert = new CustomizeMii_BnsConvert(File.Exists(Application.StartupPath + Path.DirectorySeparatorChar + "lame.exe"));
+
+                for (int i = 0; i < sourceWad.BannerApp.NumOfNodes; i++)
+                {
+                    if (sourceWad.BannerApp.StringTable[i].ToLower() == "sound.bin")
+                        bnsConvert.SourceSound = Headers.IMD5.RemoveHeader(sourceWad.BannerApp.Data[i]);
+                }
 
                 if (bnsConvert.ShowDialog() == DialogResult.OK)
                 {
                     BnsConversionInfo bnsInfo = new BnsConversionInfo();
 
-                    bnsInfo.AudioFile = bnsConvert.AudioFile;
-                    bnsInfo.StereoToMono = false;
+                    bnsInfo.audioFile = bnsConvert.AudioFile;
+                    bnsInfo.stereoToMono = false;
 
                     if (bnsConvert.ChannelCount == 2)
                     {
                         if (MessageBox.Show("Do you want to convert the stereo Wave file to a mono BNS file?\nOnly the left channel will be taken.",
                             "Convert to Mono?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-                            bnsInfo.StereoToMono = true;
+                            bnsInfo.stereoToMono = true;
                     }
 
                     if (bnsConvert.LoopFromAudio)
-                    { bnsInfo.Loop = BnsConversionInfo.LoopType.FromWave; }
+                    { bnsInfo.loopType = BnsConversionInfo.LoopType.FromWave; }
                     else if (bnsConvert.LoopManually)
-                    { bnsInfo.LoopStartSample = bnsConvert.LoopStartSample; bnsInfo.Loop = BnsConversionInfo.LoopType.Manual; }
-                    else bnsInfo.Loop = BnsConversionInfo.LoopType.None;
+                    { bnsInfo.loopStartSample = bnsConvert.LoopStartSample; bnsInfo.loopType = BnsConversionInfo.LoopType.Manual; }
+                    else bnsInfo.loopType = BnsConversionInfo.LoopType.None;
 
                     BackgroundWorker bwConvertToBns = new BackgroundWorker();
                     bwConvertToBns.WorkerReportsProgress = true;
@@ -2225,20 +2146,17 @@ namespace CustomizeMii
 
         private void cmExtractWad_Click(object sender, EventArgs e)
         {
+            string unpackDir = string.Format("{0} - {1}", sourceWad.ChannelTitles[1], sourceWad.UpperTitleID);
+
             FolderBrowserDialog fbd = new FolderBrowserDialog();
-            string unpackDir = string.Format("{0} - {1}", Wii.WadInfo.GetChannelTitlesFromApp(TempUnpackPath + "00000000.app")[1], Wii.WadInfo.GetTitleID(Directory.GetFiles(TempUnpackPath, "*.tmd")[0], 1));
             fbd.Description = string.Format("Choose the path where the WAD will be extracted to. A folder called \"{0}\" containing the contents will be created!", unpackDir);
 
             if (fbd.ShowDialog() == DialogResult.OK)
             {
-                unpackDir = fbd.SelectedPath + "\\" + unpackDir;
-                string[] files = Directory.GetFiles(TempUnpackPath);
-                if (!Directory.Exists(unpackDir)) Directory.CreateDirectory(unpackDir);
-                
-                foreach (string thisFile in files)
-                    File.Copy(thisFile, unpackDir + "\\" + Path.GetFileName(thisFile), true);
+                if (!Directory.Exists(fbd.SelectedPath + Path.DirectorySeparatorChar + unpackDir)) Directory.CreateDirectory(fbd.SelectedPath + Path.DirectorySeparatorChar + unpackDir);
+                sourceWad.Unpack(fbd.SelectedPath + Path.DirectorySeparatorChar + unpackDir, false);
 
-                InfoBox("Successfully extracted WAD file!");
+                infoBox("Successfully extracted WAD file!");
             }
         }
 
@@ -2254,44 +2172,35 @@ namespace CustomizeMii
                 {
                     try
                     {
-                        byte[] wad = Wii.Tools.LoadFileToByteArray(ofd.FileName);
+                        WAD tmpWad = WAD.Load(ofd.FileName);
 
-                        int numContents = Wii.WadInfo.GetContentNum(wad);
-
-                        if (numContents == 3)
+                        if (tmpWad.NumOfContents == 3)
                         {
-                            int bootIndex = Wii.WadInfo.GetBootIndex(wad);
-                            string appFile = string.Empty;
+                            int appIndex = 0;
+                            if (tmpWad.BootIndex == 1) appIndex = 2;
+                            else if (tmpWad.BootIndex == 2) appIndex = 1;
 
-                            if (bootIndex == 1)
-                            { appFile = "00000002.app"; }
-                            else if (bootIndex == 2)
-                            { appFile = "00000001.app"; }
-
-                            if (!string.IsNullOrEmpty(appFile))
+                            if (appIndex > 0)
                             {
-                                if (Directory.Exists(TempTempPath + "TempWad")) Directory.Delete(TempTempPath + "TempWad", true);
-                                Wii.WadUnpack.UnpackWad(ofd.FileName, TempTempPath + "TempWad");
-
-                                File.Copy(TempTempPath + "TempWad\\" + appFile, TempDolPath, true);
-                                SetText(tbDol, ofd.FileName);
+                                newDol = tmpWad.Contents[appIndex];
+                                setControlText(tbDol, ofd.FileName);
                                 btnBrowseDol.Text = "Clear";
                             }
-                            else
-                                ErrorBox("The DOL file couldn't be found!");
+                            else errorBox("The DOL file couldn't be found!");
                         }
-                        else
-                            ErrorBox("The DOL file couldn't be found!");
+                        else errorBox("The DOL file couldn't be found!");
                     }
                     catch (Exception ex)
                     {
-                        SetText(tbDol, string.Empty);
-                        ErrorBox(ex.Message);
+                        setControlText(tbDol, string.Empty);
+                        btnBrowseDol.Text = "Browse...";
+                        errorBox(ex.Message);
                     }
                 }
                 else
                 {
-                    SetText(tbDol, ofd.FileName);
+                    newDol = File.ReadAllBytes(ofd.FileName);
+                    setControlText(tbDol, ofd.FileName);
                     btnBrowseDol.Text = "Clear";
                 }
             }
@@ -2301,38 +2210,27 @@ namespace CustomizeMii
         {
             try
             {
-                string[] tmdFile = Directory.GetFiles(TempUnpackPath, "*.tmd");
-                byte[] tmd = Wii.Tools.LoadFileToByteArray(tmdFile[0]);
-
-                int numContents = Wii.WadInfo.GetContentNum(tmd);
-
-                if (numContents == 3)
+                if (sourceWad.NumOfContents == 3)
                 {
-                    int bootIndex = Wii.WadInfo.GetBootIndex(tmd);
-                    string appFile = string.Empty;
+                    int appIndex = 0;
+                    if (sourceWad.BootIndex == 1) appIndex = 2;
+                    else if (sourceWad.BootIndex == 2) appIndex = 1;
 
-                    if (bootIndex == 1)
-                    { appFile = "00000002.app"; }
-                    else if (bootIndex == 2)
-                    { appFile = "00000001.app"; }
-
-                    if (!string.IsNullOrEmpty(appFile))
+                    if (appIndex > 0)
                     {
-                        File.Copy(TempUnpackPath + appFile, TempDolPath, true);
-                        SetText(tbDol, "Internal");
+                        newDol = sourceWad.Contents[appIndex];
+                        setControlText(tbDol, "Internal");
                         btnBrowseDol.Text = "Clear";
                     }
-                    else
-                        ErrorBox("The DOL file couldn't be found!");
+                    else errorBox("The DOL file couldn't be found!");
                 }
-                else
-                    ErrorBox("The DOL file couldn't be found!");
+                else errorBox("The DOL file couldn't be found!");
             }
-            catch (Exception ex) 
+            catch (Exception ex)
             {
-                SetText(tbDol, string.Empty);
+                setControlText(tbDol, string.Empty);
                 btnBrowseDol.Text = "Browse...";
-                ErrorBox(ex.Message);
+                errorBox(ex.Message);
             }
         }
 
@@ -2390,7 +2288,7 @@ namespace CustomizeMii
                 tbDutch.Text = string.Empty;
                 tbKorean.Text = string.Empty;
 
-                ErrorBox(ex.Message);
+                errorBox(ex.Message);
             }
         }
 
@@ -2406,7 +2304,147 @@ namespace CustomizeMii
 
         private void llbMultiReplace_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            MultiReplace(sender == llbBannerMultiReplace);
+            multiReplace(sender == llbBannerMultiReplace);
+        }
+
+        private void lbxBannerTpls_MouseUp(object sender, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Right)
+            {
+                lbxBannerTpls.SelectedIndex = lbxBannerTpls.IndexFromPoint(e.X, e.Y);
+                cmTpls.Tag = "banner";
+                cmTpls.Show(MousePosition);
+            }
+        }
+
+        private void lbxIconTpls_MouseUp(object sender, MouseEventArgs e)
+        {
+            if (e.Button == MouseButtons.Right)
+            {
+                lbxIconTpls.SelectedIndex = lbxIconTpls.IndexFromPoint(e.X, e.Y);
+                cmTpls.Tag = "icon";
+                cmTpls.Show(MousePosition);
+            }
+        }
+
+        private void cmRename_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                ListBox lbx = (((ToolStripMenuItem)sender).Owner.Tag.ToString().ToLower().Contains("banner")) ? lbxBannerTpls : lbxIconTpls;
+
+                string oldNameFull = lbx.SelectedItem.ToString();
+                string oldName = lbx.SelectedItem.ToString().Remove(lbx.SelectedItem.ToString().IndexOf('(') - 3);
+                CustomizeMii_InputBox ib = new CustomizeMii_InputBox();
+                ib.Description = "Please enter a new name:";
+                ib.Input = oldName;
+                ib.CommonKeyMode = false;
+                ib.tbInput.MaxLength = 127;
+                ib.btnExit.Text = "Close";
+
+                if (ib.ShowDialog() == DialogResult.OK && oldName != ib.Input && !string.IsNullOrEmpty(ib.Input))
+                {
+                    string newName = ib.Input;
+                    if (!newName.ToLower().EndsWith(".tpl")) newName += ".tpl";
+
+                    foreach (char thisChar in Path.GetInvalidFileNameChars())
+                        if (newName.Contains(thisChar.ToString()))
+                            throw new Exception(string.Format("Invalid path char \"{0}\" found in new name!", thisChar));
+
+                    if (lbx == lbxBannerTpls)
+                        if (string.IsNullOrEmpty(replacedBanner))
+                            bannerBin.RenameNode(oldName, newName);
+                        else
+                            newBannerBin.RenameNode(oldName, newName);
+                    else
+                        if (string.IsNullOrEmpty(replacedIcon))
+                            iconBin.RenameNode(oldName, newName);
+                        else
+                            newIconBin.RenameNode(oldName, newName);
+
+                    addTpls();
+
+                    try { lbx.SelectedItem = oldNameFull.Replace(oldName, newName); }
+                    catch { }
+                }
+            }
+            catch (Exception ex) { errorBox(ex.Message); }
+        }
+
+        private void cmResize_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                ListBox lbx = (((ToolStripMenuItem)sender).Owner.Tag.ToString().ToLower().Contains("banner")) ? lbxBannerTpls : lbxIconTpls;
+
+                int selectedIndex = lbx.SelectedIndex;
+                string tplName = lbx.SelectedItem.ToString().Remove(lbx.SelectedItem.ToString().IndexOf('(') - 3);
+
+                Size oldSize;
+
+                if (lbx == lbxBannerTpls)
+                    if (string.IsNullOrEmpty(replacedBanner))
+                    { oldSize = TPL.Load(bannerBin.Data[bannerBin.GetNodeIndex(tplName)]).GetTextureSize(0); }
+                    else
+                    { oldSize = TPL.Load(newBannerBin.Data[newBannerBin.GetNodeIndex(tplName)]).GetTextureSize(0); }
+                else
+                    if (string.IsNullOrEmpty(replacedIcon))
+                    { oldSize = TPL.Load(iconBin.Data[iconBin.GetNodeIndex(tplName)]).GetTextureSize(0); }
+                    else
+                    { oldSize = TPL.Load(newIconBin.Data[newIconBin.GetNodeIndex(tplName)]).GetTextureSize(0); }
+                
+                CustomizeMii_InputBox ib = new CustomizeMii_InputBox();
+                ib.Description = "Please enter a new size:";
+                ib.tbInput.Size = new Size(ib.btnExit.Width, ib.tbInput.Height);
+                ib.tbInput2.Visible = true;
+                ib.CommonKeyMode = false;
+                ib.tbInput.MaxLength = 127;
+                ib.btnExit.Text = "Close";
+                ib.Input = oldSize.Width.ToString();
+                ib.Input2 = oldSize.Height.ToString();
+
+                if (ib.ShowDialog() == DialogResult.OK)
+                {
+                    Size newSize = new Size(int.Parse(ib.Input), int.Parse(ib.Input2));
+                    if (newSize == oldSize) return;
+
+                    TPL tmpTpl;
+
+                    if (lbx == lbxBannerTpls)
+                        if (string.IsNullOrEmpty(replacedBanner))
+                            tmpTpl = TPL.Load(bannerBin.Data[bannerBin.GetNodeIndex(tplName)]);
+                        else
+                            tmpTpl = TPL.Load(newBannerBin.Data[newBannerBin.GetNodeIndex(tplName)]);
+                    else
+                        if (string.IsNullOrEmpty(replacedIcon))
+                            tmpTpl = TPL.Load(iconBin.Data[iconBin.GetNodeIndex(tplName)]);
+                        else
+                            tmpTpl = TPL.Load(newIconBin.Data[newIconBin.GetNodeIndex(tplName)]);
+
+                    TPL_Format tplFormat = tmpTpl.GetTextureFormat(0);
+                    Image newImg = resizeImage(tmpTpl.ExtractTexture(0), newSize.Width, newSize.Height);
+
+                    tmpTpl.RemoveTexture(0);
+                    tmpTpl.AddTexture(newImg, tplFormat);
+
+                    if (lbx == lbxBannerTpls)
+                        if (string.IsNullOrEmpty(replacedBanner))
+                            bannerBin.ReplaceFile(bannerBin.GetNodeIndex(tplName), tmpTpl.ToByteArray());
+                        else
+                            newBannerBin.ReplaceFile(newBannerBin.GetNodeIndex(tplName), tmpTpl.ToByteArray());
+                    else
+                        if (string.IsNullOrEmpty(replacedIcon))
+                            iconBin.ReplaceFile(iconBin.GetNodeIndex(tplName), tmpTpl.ToByteArray());
+                        else
+                            newIconBin.ReplaceFile(newIconBin.GetNodeIndex(tplName), tmpTpl.ToByteArray());
+
+                    addTpls();
+
+                    try { lbx.SelectedIndex = selectedIndex; }
+                    catch { }
+                }
+            }
+            catch (Exception ex) { errorBox(ex.Message); }
         }
     }
 }
diff --git a/CustomizeMii/CustomizeMii_Main.resx b/CustomizeMii/CustomizeMii_Main.resx
index 2f855fe..0fc55f9 100644
--- a/CustomizeMii/CustomizeMii_Main.resx
+++ b/CustomizeMii/CustomizeMii_Main.resx
@@ -127,8 +127,12 @@ SquidMan for Zetsubou
 Andre Perrot for gbalzss
 comex and Waninkoko for both their NAND Loader
 djdynamite123 for his forwarder base files
-The USB Loader GX Team for their forwarder source</value>
+The USB Loader GX Team for their forwarder source
+wilsoff for helping me debugging 3.0</value>
   </data>
+  <metadata name="cmTpls.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>566, 7</value>
+  </metadata>
   <metadata name="ssMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>16, 7</value>
   </metadata>
diff --git a/CustomizeMii/CustomizeMii_Preview.Designer.cs b/CustomizeMii/CustomizeMii_Preview.Designer.cs
index b62e502..623bf40 100644
--- a/CustomizeMii/CustomizeMii_Preview.Designer.cs
+++ b/CustomizeMii/CustomizeMii_Preview.Designer.cs
@@ -47,6 +47,7 @@ namespace CustomizeMii
         {
             this.components = new System.ComponentModel.Container();
             this.Panel = new System.Windows.Forms.Panel();
+            this.cbCheckerBoard = new System.Windows.Forms.CheckBox();
             this.btnReplace = new System.Windows.Forms.Button();
             this.btnClose = new System.Windows.Forms.Button();
             this.cbIcon = new System.Windows.Forms.ComboBox();
@@ -67,6 +68,15 @@ namespace CustomizeMii
             this.cmIA4 = new System.Windows.Forms.ToolStripMenuItem();
             this.cmI8 = new System.Windows.Forms.ToolStripMenuItem();
             this.cmI4 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+            this.cmChangeFormat = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmToRGBA8 = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmToRGB565 = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmToRGB5A3 = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmToIA8 = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmToIA4 = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmToI8 = new System.Windows.Forms.ToolStripMenuItem();
+            this.cmToI4 = new System.Windows.Forms.ToolStripMenuItem();
             this.lbNoPreview = new System.Windows.Forms.Label();
             this.Panel.SuspendLayout();
             this.panel1.SuspendLayout();
@@ -76,6 +86,7 @@ namespace CustomizeMii
             // 
             // Panel
             // 
+            this.Panel.Controls.Add(this.cbCheckerBoard);
             this.Panel.Controls.Add(this.btnReplace);
             this.Panel.Controls.Add(this.btnClose);
             this.Panel.Controls.Add(this.cbIcon);
@@ -88,10 +99,24 @@ namespace CustomizeMii
             this.Panel.Size = new System.Drawing.Size(817, 28);
             this.Panel.TabIndex = 0;
             // 
+            // cbCheckerBoard
+            // 
+            this.cbCheckerBoard.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+            this.cbCheckerBoard.AutoSize = true;
+            this.cbCheckerBoard.Checked = true;
+            this.cbCheckerBoard.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.cbCheckerBoard.Location = new System.Drawing.Point(390, 7);
+            this.cbCheckerBoard.Name = "cbCheckerBoard";
+            this.cbCheckerBoard.Size = new System.Drawing.Size(93, 17);
+            this.cbCheckerBoard.TabIndex = 4;
+            this.cbCheckerBoard.Text = "Checkerboard";
+            this.cbCheckerBoard.UseVisualStyleBackColor = true;
+            this.cbCheckerBoard.CheckedChanged += new System.EventHandler(this.cbCheckerBoard_CheckedChanged);
+            // 
             // btnReplace
             // 
             this.btnReplace.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnReplace.Location = new System.Drawing.Point(512, 4);
+            this.btnReplace.Location = new System.Drawing.Point(513, 4);
             this.btnReplace.Name = "btnReplace";
             this.btnReplace.Size = new System.Drawing.Size(137, 21);
             this.btnReplace.TabIndex = 3;
@@ -116,7 +141,7 @@ namespace CustomizeMii
             this.cbIcon.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.cbIcon.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cbIcon.FormattingEnabled = true;
-            this.cbIcon.Location = new System.Drawing.Point(239, 4);
+            this.cbIcon.Location = new System.Drawing.Point(234, 4);
             this.cbIcon.MaxDropDownItems = 20;
             this.cbIcon.Name = "cbIcon";
             this.cbIcon.Size = new System.Drawing.Size(121, 21);
@@ -127,7 +152,7 @@ namespace CustomizeMii
             // 
             this.lbIcon.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.lbIcon.AutoSize = true;
-            this.lbIcon.Location = new System.Drawing.Point(203, 7);
+            this.lbIcon.Location = new System.Drawing.Point(198, 7);
             this.lbIcon.Name = "lbIcon";
             this.lbIcon.Size = new System.Drawing.Size(31, 13);
             this.lbIcon.TabIndex = 2;
@@ -208,6 +233,7 @@ namespace CustomizeMii
             // 
             // pbPic
             // 
+            this.pbPic.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbPic.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pbPic.Location = new System.Drawing.Point(0, 22);
             this.pbPic.Name = "pbPic";
@@ -225,9 +251,11 @@ namespace CustomizeMii
             this.cmIA8,
             this.cmIA4,
             this.cmI8,
-            this.cmI4});
+            this.cmI4,
+            this.toolStripSeparator1,
+            this.cmChangeFormat});
             this.cmFormat.Name = "cmFormat";
-            this.cmFormat.Size = new System.Drawing.Size(234, 158);
+            this.cmFormat.Size = new System.Drawing.Size(234, 186);
             // 
             // cmRGBA8
             // 
@@ -285,6 +313,81 @@ namespace CustomizeMii
             this.cmI4.Text = "As I4 (B/W)";
             this.cmI4.Click += new System.EventHandler(this.cmFormat_Click);
             // 
+            // toolStripSeparator1
+            // 
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
+            this.toolStripSeparator1.Size = new System.Drawing.Size(230, 6);
+            // 
+            // cmChangeFormat
+            // 
+            this.cmChangeFormat.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.cmToRGBA8,
+            this.cmToRGB565,
+            this.cmToRGB5A3,
+            this.cmToIA8,
+            this.cmToIA4,
+            this.cmToI8,
+            this.cmToI4});
+            this.cmChangeFormat.Name = "cmChangeFormat";
+            this.cmChangeFormat.Size = new System.Drawing.Size(233, 22);
+            this.cmChangeFormat.Text = "Change Format";
+            // 
+            // cmToRGBA8
+            // 
+            this.cmToRGBA8.Name = "cmToRGBA8";
+            this.cmToRGBA8.Size = new System.Drawing.Size(234, 22);
+            this.cmToRGBA8.Tag = "rgba8";
+            this.cmToRGBA8.Text = "To RGBA8 (High Quality)";
+            this.cmToRGBA8.Click += new System.EventHandler(this.cmChangeFormat_Click);
+            // 
+            // cmToRGB565
+            // 
+            this.cmToRGB565.Name = "cmToRGB565";
+            this.cmToRGB565.Size = new System.Drawing.Size(234, 22);
+            this.cmToRGB565.Tag = "rgb565";
+            this.cmToRGB565.Text = "To RGB565 (Moderate Quality)";
+            this.cmToRGB565.Click += new System.EventHandler(this.cmChangeFormat_Click);
+            // 
+            // cmToRGB5A3
+            // 
+            this.cmToRGB5A3.Name = "cmToRGB5A3";
+            this.cmToRGB5A3.Size = new System.Drawing.Size(234, 22);
+            this.cmToRGB5A3.Tag = "rgb5a3";
+            this.cmToRGB5A3.Text = "To RGB5A3 (Low Quality)";
+            this.cmToRGB5A3.Click += new System.EventHandler(this.cmChangeFormat_Click);
+            // 
+            // cmToIA8
+            // 
+            this.cmToIA8.Name = "cmToIA8";
+            this.cmToIA8.Size = new System.Drawing.Size(234, 22);
+            this.cmToIA8.Tag = "ia8";
+            this.cmToIA8.Text = "To IA8 (B/W with Alpha)";
+            this.cmToIA8.Click += new System.EventHandler(this.cmChangeFormat_Click);
+            // 
+            // cmToIA4
+            // 
+            this.cmToIA4.Name = "cmToIA4";
+            this.cmToIA4.Size = new System.Drawing.Size(234, 22);
+            this.cmToIA4.Tag = "ia4";
+            this.cmToIA4.Text = "To IA4 (B/W with Alpha)";
+            this.cmToIA4.Click += new System.EventHandler(this.cmChangeFormat_Click);
+            // 
+            // cmToI8
+            // 
+            this.cmToI8.Name = "cmToI8";
+            this.cmToI8.Size = new System.Drawing.Size(234, 22);
+            this.cmToI8.Tag = "i8";
+            this.cmToI8.Text = "To I8 (B/W)";
+            this.cmToI8.Click += new System.EventHandler(this.cmChangeFormat_Click);
+            // 
+            // cmToI4
+            // 
+            this.cmToI4.Name = "cmToI4";
+            this.cmToI4.Size = new System.Drawing.Size(234, 22);
+            this.cmToI4.Tag = "i4";
+            this.cmToI4.Text = "To I4 (B/W)";
+            this.cmToI4.Click += new System.EventHandler(this.cmChangeFormat_Click);
+            // 
             // lbNoPreview
             // 
             this.lbNoPreview.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -347,5 +450,15 @@ namespace CustomizeMii
         private System.Windows.Forms.ToolStripMenuItem cmI8;
         private System.Windows.Forms.ToolStripMenuItem cmI4;
         private System.Windows.Forms.Label lbNoPreview;
+        private System.Windows.Forms.ToolStripMenuItem cmChangeFormat;
+        private System.Windows.Forms.ToolStripMenuItem cmToRGBA8;
+        private System.Windows.Forms.ToolStripMenuItem cmToRGB565;
+        private System.Windows.Forms.ToolStripMenuItem cmToRGB5A3;
+        private System.Windows.Forms.ToolStripMenuItem cmToIA8;
+        private System.Windows.Forms.ToolStripMenuItem cmToIA4;
+        private System.Windows.Forms.ToolStripMenuItem cmToI8;
+        private System.Windows.Forms.ToolStripMenuItem cmToI4;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.CheckBox cbCheckerBoard;
     }
 }
\ No newline at end of file
diff --git a/CustomizeMii/CustomizeMii_Preview.cs b/CustomizeMii/CustomizeMii_Preview.cs
index 24d8422..a1dd582 100644
--- a/CustomizeMii/CustomizeMii_Preview.cs
+++ b/CustomizeMii/CustomizeMii_Preview.cs
@@ -16,17 +16,25 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
 using System.Windows.Forms;
+using libWiiSharp;
 
 namespace CustomizeMii
 {
     public partial class CustomizeMii_Preview : Form
     {
-        public string startTPL;
-        public bool startIcon = false;
-        private TplImage[,] images;
+        private TplImage[][] images = new TplImage[2][];
+        private U8 bannerBin;
+        private U8 iconBin;
+        private string startTPL;
+        private bool startIcon = false;
+
+        public U8 BannerBin { get { return bannerBin; } set { bannerBin = value; } }
+        public U8 IconBin { get { return iconBin; } set { iconBin = value; } }
+        public string StartTPL { get { return startTPL; } set { startTPL = value; } }
+        public bool StartIcon { get { return startIcon; } set { startIcon = value; } }
 
         public CustomizeMii_Preview()
         {
@@ -49,51 +57,67 @@ namespace CustomizeMii
         private void Preview_Load(object sender, EventArgs e)
         {
             this.CenterToParent();
-
-            string[] bannerpics;
-            string[] iconpics;
-
-            if (string.IsNullOrEmpty(CustomizeMii_Main.BannerReplace))
-                bannerpics = Directory.GetFiles(CustomizeMii_Main.TempUnpackBannerTplPath, "*.tpl");
-            else bannerpics = Directory.GetFiles(CustomizeMii_Main.BannerTplPath, "*.tpl");
-
-            if (string.IsNullOrEmpty(CustomizeMii_Main.IconReplace))
-                iconpics = Directory.GetFiles(CustomizeMii_Main.TempUnpackIconTplPath, "*.tpl");
-            else iconpics = Directory.GetFiles(CustomizeMii_Main.IconTplPath, "*.tpl");
+            cbBanner.Items.Clear();
+            cbIcon.Items.Clear();
 
             int startIndex = -1;
-            if (!startIcon)
+
+            List<TplImage> bannerImages = new List<TplImage>();
+            List<TplImage> iconImages = new List<TplImage>();
+
+            for (int i = 0; i < bannerBin.NumOfNodes; i++)
             {
-                for (int i = 0; i < bannerpics.Length; i++)
-                    if (Path.GetFileName(bannerpics[i]) == startTPL)
-                        startIndex = i;
+                if (bannerBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                {
+                    TplImage tmpImage = new TplImage();
+                    TPL tmpTpl = TPL.Load(bannerBin.Data[i]);
+
+                    if (i == 10) { }
+
+                    tmpImage.fileName = bannerBin.StringTable[i];
+                    tmpImage.tplFormat = tmpTpl.GetTextureFormat(0).ToString();
+                    tmpImage.tplImage = tmpTpl.ExtractTexture();
+                    tmpImage.checkerBoard = createCheckerBoard(tmpImage.tplImage.Width, tmpImage.tplImage.Height);
+
+                    bannerImages.Add(tmpImage);
+                }
             }
-            else
+
+            for (int i = 0; i < iconBin.NumOfNodes; i++)
             {
-                for (int i = 0; i < iconpics.Length; i++)
-                    if (Path.GetFileName(iconpics[i]) == startTPL)
+                if (iconBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                {
+                    TplImage tmpImage = new TplImage();
+                    TPL tmpTpl = TPL.Load(iconBin.Data[i]);
+
+                    tmpImage.fileName = iconBin.StringTable[i];
+                    tmpImage.tplFormat = tmpTpl.GetTextureFormat(0).ToString();
+                    tmpImage.tplImage = tmpTpl.ExtractTexture();
+                    tmpImage.checkerBoard = createCheckerBoard(tmpImage.tplImage.Width, tmpImage.tplImage.Height);
+
+                    iconImages.Add(tmpImage);
+                }
+            }
+
+            images[0] = bannerImages.ToArray();
+            images[1] = iconImages.ToArray();
+
+            for (int i = 0; i < images[0].Length; i++)
+            {
+                cbBanner.Items.Add(images[0][i].fileName);
+                if (!startIcon)
+                    if (images[0][i].fileName.ToLower() == startTPL.ToLower())
                         startIndex = i;
             }
 
-            foreach (string thispic in bannerpics)
+            for (int i = 0; i < images[1].Length; i++)
             {
-                string picname = thispic.Remove(0, thispic.LastIndexOf('\\') + 1);
-                picname = picname.Remove(picname.LastIndexOf('.'));
-                cbBanner.Items.Add((object)picname);
+                cbIcon.Items.Add(images[1][i].fileName);
+                if (startIcon)
+                    if (images[1][i].fileName.ToLower() == startTPL.ToLower())
+                        startIndex = i;
             }
 
-            foreach (string thispic in iconpics)
-            {
-                string picname = thispic.Remove(0, thispic.LastIndexOf('\\') + 1);
-                picname = picname.Remove(picname.LastIndexOf('.'));
-                cbIcon.Items.Add((object)picname);
-            }
-
-            if (bannerpics.Length > iconpics.Length)
-                images = new TplImage[2, bannerpics.Length];
-            else
-                images = new TplImage[2, iconpics.Length];
-
             try
             {
                 if (startIndex != -1)
@@ -112,44 +136,11 @@ namespace CustomizeMii
         {
             if (cbBanner.SelectedIndex != -1)
             {
-                if (images[0, cbBanner.SelectedIndex].tplImage == null) 
-                {
-                    byte[] tpl;
+                pbPic.Image = images[0][cbBanner.SelectedIndex].tplImage;
+                lbFormat.Text = images[0][cbBanner.SelectedIndex].tplFormat;
+                lbSize.Text = string.Format("{0} x {1}", images[0][cbBanner.SelectedIndex].tplImage.Width, images[0][cbBanner.SelectedIndex].tplImage.Height);
 
-                    if (string.IsNullOrEmpty(CustomizeMii_Main.BannerReplace))
-                        tpl = Wii.Tools.LoadFileToByteArray(CustomizeMii_Main.TempUnpackBannerTplPath + cbBanner.SelectedItem.ToString() + ".tpl");
-                    else tpl = Wii.Tools.LoadFileToByteArray(CustomizeMii_Main.BannerTplPath + cbBanner.SelectedItem.ToString() + ".tpl");
-
-                    lbSize.Text = Wii.TPL.GetTextureWidth(tpl).ToString() + " x " + Wii.TPL.GetTextureHeight(tpl).ToString();
-                    images[0, cbBanner.SelectedIndex].tplFormat = Wii.TPL.GetTextureFormatName(tpl);
-                    lbFormat.Text = images[0, cbBanner.SelectedIndex].tplFormat;
-
-                    if (images[0, cbBanner.SelectedIndex].tplFormat.ToLower() == "ci4" ||
-                        images[0, cbBanner.SelectedIndex].tplFormat.ToLower() == "ci8" ||
-                        images[0, cbBanner.SelectedIndex].tplFormat.ToLower() == "ci14x2")
-                    {
-                        int tempW = Wii.TPL.GetTextureWidth(tpl);
-                        int tempH = Wii.TPL.GetTextureHeight(tpl);
-
-                        images[0, cbBanner.SelectedIndex].tplImage = new Bitmap(tempW, tempH);
-                    }
-                    else
-                    {
-                        images[0, cbBanner.SelectedIndex].tplImage = Wii.TPL.ConvertFromTPL(tpl);
-                    }
-
-                    tpl = null;
-                }
-
-                pbPic.Image = images[0, cbBanner.SelectedIndex].tplImage;
-                lbFormat.Text = images[0, cbBanner.SelectedIndex].tplFormat;
-                lbSize.Text = string.Format("{0} x {1}", images[0, cbBanner.SelectedIndex].tplImage.Width, images[0, cbBanner.SelectedIndex].tplImage.Height);
-
-                if (images[0, cbBanner.SelectedIndex].tplFormat.ToLower() == "ci4" ||
-                    images[0, cbBanner.SelectedIndex].tplFormat.ToLower() == "ci8" ||
-                    images[0, cbBanner.SelectedIndex].tplFormat.ToLower() == "ci14x2")
-                    lbNoPreview.Visible = true;
-                else lbNoPreview.Visible = false;
+                if (cbCheckerBoard.Checked) pbPic.BackgroundImage = images[0][cbBanner.SelectedIndex].checkerBoard;
 
                 cbIcon.SelectedIndex = -1;
             }
@@ -159,68 +150,61 @@ namespace CustomizeMii
         {
             if (cbIcon.SelectedIndex != -1)
             {
-                if (images[1, cbIcon.SelectedIndex].tplImage == null)
-                {
-                    byte[] tpl;
+                pbPic.Image = images[1][cbIcon.SelectedIndex].tplImage;
+                lbFormat.Text = images[1][cbIcon.SelectedIndex].tplFormat;
+                lbSize.Text = string.Format("{0} x {1}", images[1][cbIcon.SelectedIndex].tplImage.Width, images[1][cbIcon.SelectedIndex].tplImage.Height);
 
-                    if (string.IsNullOrEmpty(CustomizeMii_Main.IconReplace))
-                        tpl = Wii.Tools.LoadFileToByteArray(CustomizeMii_Main.TempUnpackIconTplPath + cbIcon.SelectedItem.ToString() + ".tpl");
-                    else tpl = Wii.Tools.LoadFileToByteArray(CustomizeMii_Main.IconTplPath + cbIcon.SelectedItem.ToString() + ".tpl");
-
-                    lbSize.Text = Wii.TPL.GetTextureWidth(tpl).ToString() + " x " + Wii.TPL.GetTextureHeight(tpl).ToString();
-                    images[1, cbIcon.SelectedIndex].tplFormat = Wii.TPL.GetTextureFormatName(tpl);
-                    lbFormat.Text = images[1, cbIcon.SelectedIndex].tplFormat;
-
-                    if (images[1, cbIcon.SelectedIndex].tplFormat.ToLower() == "ci4" ||
-                        images[1, cbIcon.SelectedIndex].tplFormat.ToLower() == "ci8" ||
-                        images[1, cbIcon.SelectedIndex].tplFormat.ToLower() == "ci14x2")
-                    {
-                        int tempW = Wii.TPL.GetTextureWidth(tpl);
-                        int tempH = Wii.TPL.GetTextureHeight(tpl);
-
-                        images[1, cbIcon.SelectedIndex].tplImage = new Bitmap(tempW, tempH);
-                    }
-                    else
-                    {
-                        images[1, cbIcon.SelectedIndex].tplImage = Wii.TPL.ConvertFromTPL(tpl);
-                    }
-
-                    tpl = null;
-                }
-
-                pbPic.Image = images[1, cbIcon.SelectedIndex].tplImage;
-                lbFormat.Text = images[1, cbIcon.SelectedIndex].tplFormat;
-                lbSize.Text = string.Format("{0} x {1}", images[1, cbIcon.SelectedIndex].tplImage.Width, images[1, cbIcon.SelectedIndex].tplImage.Height);
-
-                if (images[1, cbIcon.SelectedIndex].tplFormat.ToLower() == "ci4" ||
-                    images[1, cbIcon.SelectedIndex].tplFormat.ToLower() == "ci8" ||
-                    images[1, cbIcon.SelectedIndex].tplFormat.ToLower() == "ci14x2")
-                    lbNoPreview.Visible = true;
-                else lbNoPreview.Visible = false;
+                if (cbCheckerBoard.Checked) pbPic.BackgroundImage = images[1][cbIcon.SelectedIndex].checkerBoard;
 
                 cbBanner.SelectedIndex = -1;
             }
         }
 
-        private void cmSave_Click(object sender, EventArgs e)
-        {
-            SaveFileDialog sfd = new SaveFileDialog();
-            sfd.FileName = pbPic.ImageLocation.Remove(0, pbPic.ImageLocation.LastIndexOf('\\') + 1);
-            sfd.Filter = "PNG|*.png";
-            if (sfd.ShowDialog() == DialogResult.OK)
-                File.Copy(pbPic.ImageLocation, sfd.FileName);
-        }
-
-        private Image ResizeImage(Image img, int x, int y)
+        private Image resizeImage(Image img, int x, int y)
         {
             Image newimage = new Bitmap(x, y);
+
             using (Graphics gfx = Graphics.FromImage(newimage))
-            {
                 gfx.DrawImage(img, 0, 0, x, y);
-            }
+
             return newimage;
         }
 
+        private Image createCheckerBoard(int w, int h)
+        {
+            Color darkColor = Color.DarkGray;
+            Color lightColor = Color.White;
+            int tileSize = 10;
+
+            Bitmap img = new Bitmap(w, h);
+
+            using (Graphics g = Graphics.FromImage(img))
+            {
+                g.Clear(lightColor);
+
+                for (int col = 0; col < w; col += tileSize)
+                {
+                    for (int row = 0; row < h; row += tileSize)
+                    {
+                        Color curColor;
+
+                        if ((col / tileSize) % 2 == 0)
+                            curColor = (row / tileSize) % 2 == 0 ? darkColor : lightColor;
+                        else
+                            curColor = (row / tileSize) % 2 == 0 ? lightColor : darkColor;
+
+
+                        if (curColor == lightColor) continue;
+
+                        Rectangle rect = new Rectangle(col, row, tileSize, tileSize);
+                        g.FillRectangle(new SolidBrush(darkColor), rect);
+                    }
+                }
+            }
+
+            return (Image)img;
+        }
+
         private void btnReplace_Click(object sender, EventArgs e)
         {
             cmFormat.Show(MousePosition);
@@ -236,79 +220,83 @@ namespace CustomizeMii
             {
                 try
                 {
-                    string Tpl;
+                    string tplName;
+                    TPL tmpTpl = new TPL();
+                    Image newImg;
 
-                    if (cbBanner.SelectedIndex != -1) { Tpl = CustomizeMii_Main.BannerTplPath + cbBanner.SelectedItem + ".tpl"; }
-                    else { Tpl = CustomizeMii_Main.IconTplPath + cbIcon.SelectedItem + ".tpl"; }
-
-                    byte[] TplArray = Wii.Tools.LoadFileToByteArray(Tpl);
-                    Image Img;
-
-                    if (!ofd.FileName.ToLower().EndsWith(".tpl")) Img = Image.FromFile(ofd.FileName);
-                    else Img = Wii.TPL.ConvertFromTPL(ofd.FileName);
-
-                    int TplFormat;
-                    int X = Wii.TPL.GetTextureWidth(TplArray);
-                    int Y = Wii.TPL.GetTextureHeight(TplArray);
-
-                    if (X != Img.Width ||
-                        Y != Img.Height)
+                    if (cbIcon.SelectedIndex == -1)
                     {
-                        Img = ResizeImage(Img, X, Y);
+                        tplName = cbBanner.SelectedItem.ToString().ToLower();
+                        tmpTpl.LoadFile(bannerBin.Data[bannerBin.GetNodeIndex(tplName)]);
                     }
+                    else
+                    {
+                        tplName = cbIcon.SelectedItem.ToString().ToLower();
+                        tmpTpl.LoadFile(iconBin.Data[iconBin.GetNodeIndex(tplName)]);
+                    }
+
+                    if (!ofd.FileName.ToLower().EndsWith(".tpl")) newImg = Image.FromFile(ofd.FileName);
+                    else
+                    {
+                        TPL newTpl = TPL.Load(ofd.FileName);
+                        newImg = newTpl.ExtractTexture();
+                    }
+
+                    Size tplSize = tmpTpl.GetTextureSize(0);
+                    TPL_Format tplFormat;
+
+                    if (newImg.Width != tplSize.Width ||
+                        newImg.Height != tplSize.Height)
+                        newImg = resizeImage(newImg, tplSize.Width, tplSize.Height);
 
                     ToolStripMenuItem cmSender = sender as ToolStripMenuItem;
                     switch (cmSender.Tag.ToString().ToLower())
                     {
                         case "i4":
-                            TplFormat = 0;
-                            lbFormat.Text = "I4";
+                            tplFormat = TPL_Format.I4;
                             break;
                         case "i8":
-                            TplFormat = 1;
-                            lbFormat.Text = "I8";
+                            tplFormat = TPL_Format.I8;
                             break;
                         case "ia4":
-                            TplFormat = 2;
-                            lbFormat.Text = "IA4";
+                            tplFormat = TPL_Format.IA4;
                             break;
                         case "ia8":
-                            TplFormat = 3;
-                            lbFormat.Text = "IA8";
+                            tplFormat = TPL_Format.IA8;
                             break;
                         case "rgb565":
-                            TplFormat = 4;
-                            lbFormat.Text = "RGB565";
+                            tplFormat = TPL_Format.RGB565;
                             break;
                         case "rgb5a3":
-                            TplFormat = 5;
-                            lbFormat.Text = "RGB5A3";
+                            tplFormat = TPL_Format.RGB5A3;
                             break;
                         default:
-                            TplFormat = 6;
-                            lbFormat.Text = "RGBA8";
+                            tplFormat = TPL_Format.RGBA8;
                             break;
                     }
 
-                    Wii.TPL.ConvertToTPL(Img, Tpl, TplFormat);
+                    tmpTpl.RemoveTexture(0);
+                    tmpTpl.AddTexture(newImg, tplFormat);
 
                     if (cbBanner.SelectedIndex != -1)
                     {
-                        images[0, cbBanner.SelectedIndex].tplImage = Wii.TPL.ConvertFromTPL(Tpl);
-                        images[0, cbBanner.SelectedIndex].tplFormat = Wii.TPL.GetTextureFormatName(File.ReadAllBytes(Tpl));
+                        bannerBin.ReplaceFile(bannerBin.GetNodeIndex(tplName), tmpTpl.ToByteArray());
+                        images[0][cbBanner.SelectedIndex].tplImage = tmpTpl.ExtractTexture();
+                        images[0][cbBanner.SelectedIndex].tplFormat = tmpTpl.GetTextureFormat(0).ToString();
 
-                        pbPic.Image = images[0, cbBanner.SelectedIndex].tplImage;
-                        lbFormat.Text = images[0, cbBanner.SelectedIndex].tplFormat;
-                        lbSize.Text = string.Format("{0} x {1}", images[0, cbBanner.SelectedIndex].tplImage.Width, images[0, cbBanner.SelectedIndex].tplImage.Height);
+                        pbPic.Image = images[0][cbBanner.SelectedIndex].tplImage;
+                        lbFormat.Text = images[0][cbBanner.SelectedIndex].tplFormat;
+                        lbSize.Text = string.Format("{0} x {1}", images[0][cbBanner.SelectedIndex].tplImage.Width, images[0][cbBanner.SelectedIndex].tplImage.Height);
                     }
                     else
                     {
-                        images[1, cbIcon.SelectedIndex].tplImage = Wii.TPL.ConvertFromTPL(Tpl);
-                        images[1, cbIcon.SelectedIndex].tplFormat = Wii.TPL.GetTextureFormatName(File.ReadAllBytes(Tpl));
+                        iconBin.ReplaceFile(iconBin.GetNodeIndex(tplName), tmpTpl.ToByteArray());
+                        images[1][cbIcon.SelectedIndex].tplImage = tmpTpl.ExtractTexture();
+                        images[1][cbIcon.SelectedIndex].tplFormat = tmpTpl.GetTextureFormat(0).ToString();
 
-                        pbPic.Image = images[1, cbIcon.SelectedIndex].tplImage;
-                        lbFormat.Text = images[1, cbIcon.SelectedIndex].tplFormat;
-                        lbSize.Text = string.Format("{0} x {1}", images[1, cbIcon.SelectedIndex].tplImage.Width, images[1, cbIcon.SelectedIndex].tplImage.Height);
+                        pbPic.Image = images[1][cbIcon.SelectedIndex].tplImage;
+                        lbFormat.Text = images[1][cbIcon.SelectedIndex].tplFormat;
+                        lbSize.Text = string.Format("{0} x {1}", images[1][cbIcon.SelectedIndex].tplImage.Width, images[1][cbIcon.SelectedIndex].tplImage.Height);
                     }
 
                     if (cbBanner.SelectedIndex != -1) cbBanner.Select();
@@ -318,5 +306,104 @@ namespace CustomizeMii
                 { MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); }
             }
         }
+
+        private void cmChangeFormat_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                string tplName;
+                TPL tmpTpl = new TPL();
+                Image newImg;
+
+                if (cbIcon.SelectedIndex == -1)
+                {
+                    tplName = cbBanner.SelectedItem.ToString().ToLower();
+                    tmpTpl.LoadFile(bannerBin.Data[bannerBin.GetNodeIndex(tplName)]);
+                }
+                else
+                {
+                    tplName = cbIcon.SelectedItem.ToString().ToLower();
+                    tmpTpl.LoadFile(iconBin.Data[iconBin.GetNodeIndex(tplName)]);
+                }
+
+                newImg = tmpTpl.ExtractTexture();
+                TPL_Format tplFormat;
+
+                ToolStripMenuItem cmSender = sender as ToolStripMenuItem;
+                switch (cmSender.Tag.ToString().ToLower())
+                {
+                    case "i4":
+                        tplFormat = TPL_Format.I4;
+                        break;
+                    case "i8":
+                        tplFormat = TPL_Format.I8;
+                        break;
+                    case "ia4":
+                        tplFormat = TPL_Format.IA4;
+                        break;
+                    case "ia8":
+                        tplFormat = TPL_Format.IA8;
+                        break;
+                    case "rgb565":
+                        tplFormat = TPL_Format.RGB565;
+                        break;
+                    case "rgb5a3":
+                        tplFormat = TPL_Format.RGB5A3;
+                        break;
+                    default:
+                        tplFormat = TPL_Format.RGBA8;
+                        break;
+                }
+
+                if (tmpTpl.GetTextureFormat(0) == tplFormat) return;
+
+                tmpTpl.RemoveTexture(0);
+                tmpTpl.AddTexture(newImg, tplFormat);
+
+                if (cbBanner.SelectedIndex != -1)
+                {
+                    bannerBin.ReplaceFile(bannerBin.GetNodeIndex(tplName), tmpTpl.ToByteArray());
+                    images[0][cbBanner.SelectedIndex].tplImage = tmpTpl.ExtractTexture();
+                    images[0][cbBanner.SelectedIndex].tplFormat = tmpTpl.GetTextureFormat(0).ToString();
+
+
+                    pbPic.Image = images[0][cbBanner.SelectedIndex].tplImage;
+                    lbFormat.Text = images[0][cbBanner.SelectedIndex].tplFormat;
+                    lbSize.Text = string.Format("{0} x {1}", images[0][cbBanner.SelectedIndex].tplImage.Width, images[0][cbBanner.SelectedIndex].tplImage.Height);
+                }
+                else
+                {
+                    iconBin.ReplaceFile(iconBin.GetNodeIndex(tplName), tmpTpl.ToByteArray());
+                    images[1][cbIcon.SelectedIndex].tplImage = tmpTpl.ExtractTexture();
+                    images[1][cbIcon.SelectedIndex].tplFormat = tmpTpl.GetTextureFormat(0).ToString();
+
+                    pbPic.Image = images[1][cbIcon.SelectedIndex].tplImage;
+                    lbFormat.Text = images[1][cbIcon.SelectedIndex].tplFormat;
+                    lbSize.Text = string.Format("{0} x {1}", images[1][cbIcon.SelectedIndex].tplImage.Width, images[1][cbIcon.SelectedIndex].tplImage.Height);
+                }
+
+                if (cbBanner.SelectedIndex != -1) cbBanner.Select();
+                else if (cbIcon.SelectedIndex != -1) cbIcon.Select();
+            }
+            catch (Exception ex)
+            { MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); }
+        }
+
+        private void cbCheckerBoard_CheckedChanged(object sender, EventArgs e)
+        {
+            if (cbCheckerBoard.Checked)
+            {
+                if (cbBanner.SelectedIndex != -1)
+                    pbPic.BackgroundImage = images[0][cbBanner.SelectedIndex].checkerBoard;
+                else
+                    pbPic.BackgroundImage = images[1][cbIcon.SelectedIndex].checkerBoard;
+            }
+            else pbPic.BackgroundImage = null;
+
+            if (cbBanner.SelectedIndex != -1)
+                cbBanner.Focus();
+            else
+                cbIcon.Focus();
+        }
     }
 }
diff --git a/CustomizeMii/CustomizeMii_PrivateFunctions.cs b/CustomizeMii/CustomizeMii_PrivateFunctions.cs
index eca3af7..299f416 100644
--- a/CustomizeMii/CustomizeMii_PrivateFunctions.cs
+++ b/CustomizeMii/CustomizeMii_PrivateFunctions.cs
@@ -22,366 +22,23 @@ using System.Drawing;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
+using libWiiSharp;
 
 namespace CustomizeMii
 {
     partial class CustomizeMii_Main
     {
-        private Forwarder.Simple SimpleForwarder = new Forwarder.Simple();
-        private Forwarder.Complex ComplexForwarder = new Forwarder.Complex();
-        private delegate void BoxInvoker(string message);
-        private delegate void SetTextInvoker(string text, TextBox tb);
-        private delegate void SetLabelInvoker(string text, Label lb);
-        private delegate void SetButtonInvoker(string text, Button btn);
+        private Forwarder.Simple simpleForwarder = new Forwarder.Simple();
+        private Forwarder.Complex complexForwarder = new Forwarder.Complex();
+        private delegate void messageInvoker(string message);
+        private delegate void controlTextInvoker(Control ctrl, string text);
 
-        private bool CheckUnpackFolder()
+        private bool securityChecks()
         {
+            if (cbSecurityChecksOff.Checked) return true;
+
             try
             {
-                //Check Unpack Root
-                string[] RootFiles = Directory.GetFiles(TempUnpackPath);
-                string[] RootDirs = Directory.GetDirectories(TempUnpackPath);
-
-                foreach (string thisFile in RootFiles)
-                {
-                    if (!thisFile.ToLower().EndsWith(".app") &&
-                        !thisFile.ToLower().EndsWith(".cert") &&
-                        !thisFile.ToLower().EndsWith(".tik") &&
-                        !thisFile.ToLower().EndsWith(".tmd"))
-                        File.Delete(thisFile);
-                }
-
-                if (RootDirs.Length > 1)
-                {
-                    foreach (string thisDir in RootDirs)
-                    {
-                        if (!thisDir.EndsWith("00000000.app_OUT"))
-                            Directory.Delete(thisDir, true);
-                    }
-                }
-
-                //Check 00000000.app_OUT
-                string[] MetaFiles = Directory.GetFiles(TempUnpackPath + "00000000.app_OUT");
-                string[] MetaDirs = Directory.GetDirectories(TempUnpackPath + "00000000.app_OUT");
-
-                foreach (string thisFile in MetaFiles)
-                    File.Delete(thisFile);
-                foreach (string thisDir in MetaDirs)
-                    if (!thisDir.ToLower().EndsWith("meta"))
-                        Directory.Delete(thisDir, true);
-
-                string[] AppFiles = Directory.GetFiles(TempUnpackPath + "00000000.app_OUT\\meta");
-                string[] AppDirs = Directory.GetDirectories(TempUnpackPath + "00000000.app_OUT\\meta");
-
-                foreach (string thisFile in AppFiles)
-                {
-                    if (!thisFile.ToLower().EndsWith("banner.bin") &&
-                        !thisFile.ToLower().EndsWith("icon.bin") &&
-                        !thisFile.ToLower().EndsWith("sound.bin"))
-                        File.Delete(thisFile);
-                }
-
-                if (AppDirs.Length > 2)
-                {
-                    foreach (string thisDir in AppDirs)
-                    {
-                        if (!thisDir.EndsWith("banner.bin_OUT") &&
-                            !thisDir.EndsWith("icon.bin_OUT"))
-                            Directory.Delete(thisDir, true);
-                    }
-                }
-
-                //Check banner.bin_OUT / Banner Replace Path
-                if (string.IsNullOrEmpty(BannerReplace))
-                {
-                    string[] ArcFiles = Directory.GetFiles(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT");
-                    string[] ArcDirs = Directory.GetDirectories(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT");
-
-                    foreach (string thisFile in ArcFiles)
-                        File.Delete(thisFile);
-                    foreach (string thisDir in ArcDirs)
-                        if (!thisDir.ToLower().EndsWith("arc"))
-                            Directory.Delete(thisDir, true);
-
-                    string[] BannerFiles = Directory.GetFiles(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT\\arc");
-                    string[] BannerDirs = Directory.GetDirectories(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT\\arc");
-
-                    foreach (string thisFile in BannerFiles)
-                        File.Delete(thisFile);
-
-                    if (BannerDirs.Length > 3)
-                    {
-                        foreach (string thisDir in BannerDirs)
-                        {
-                            if (!thisDir.ToLower().EndsWith("anim") &&
-                                !thisDir.ToLower().EndsWith("blyt") &&
-                                !thisDir.ToLower().EndsWith("timg"))
-                                Directory.Delete(thisDir, true);
-                        }
-                    }
-
-                    string[] AnimFiles = Directory.GetFiles(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT\\arc\\anim");
-                    string[] AnimDirs = Directory.GetDirectories(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT\\arc\\anim");
-
-                    foreach (string thisFile in AnimFiles)
-                    {
-                        if (!thisFile.ToLower().EndsWith(".brlan"))
-                            File.Delete(thisFile);
-                    }
-
-                    foreach (string thisDir in AnimDirs)
-                        Directory.Delete(thisDir, true);
-
-                    string[] BlytFiles = Directory.GetFiles(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT\\arc\\blyt");
-                    string[] BlytDirs = Directory.GetDirectories(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT\\arc\\blyt");
-
-                    foreach (string thisFile in BlytFiles)
-                    {
-                        if (!thisFile.ToLower().EndsWith(".brlyt"))
-                            File.Delete(thisFile);
-                    }
-
-                    foreach (string thisDir in BlytDirs)
-                        Directory.Delete(thisDir, true);
-
-                    string[] TimgFiles = Directory.GetFiles(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT\\arc\\timg");
-                    string[] TimgDirs = Directory.GetDirectories(TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT\\arc\\timg");
-
-                    foreach (string thisFile in TimgFiles)
-                    {
-                        if (!thisFile.ToLower().EndsWith(".tpl"))
-                            File.Delete(thisFile);
-                    }
-
-                    foreach (string thisDir in TimgDirs)
-                        Directory.Delete(thisDir, true);
-                }
-                else
-                {
-                    string[] ArcFiles = Directory.GetFiles(TempBannerPath);
-                    string[] ArcDirs = Directory.GetDirectories(TempBannerPath);
-
-                    foreach (string thisFile in ArcFiles)
-                        File.Delete(thisFile);
-                    foreach (string thisDir in ArcDirs)
-                        if (!thisDir.ToLower().EndsWith("arc"))
-                            Directory.Delete(thisDir, true);
-
-                    string[] BannerFiles = Directory.GetFiles(TempBannerPath + "arc");
-                    string[] BannerDirs = Directory.GetDirectories(TempBannerPath + "arc");
-
-                    foreach (string thisFile in BannerFiles)
-                        File.Delete(thisFile);
-
-                    if (BannerDirs.Length > 3)
-                    {
-                        foreach (string thisDir in BannerDirs)
-                        {
-                            if (!thisDir.ToLower().EndsWith("anim") &&
-                                !thisDir.ToLower().EndsWith("blyt") &&
-                                !thisDir.ToLower().EndsWith("timg"))
-                                Directory.Delete(thisDir, true);
-                        }
-                    }
-
-                    string[] AnimFiles = Directory.GetFiles(TempBannerPath + "arc\\anim");
-                    string[] AnimDirs = Directory.GetDirectories(TempBannerPath + "arc\\anim");
-
-                    foreach (string thisFile in AnimFiles)
-                    {
-                        if (!thisFile.ToLower().EndsWith(".brlan"))
-                            File.Delete(thisFile);
-                    }
-
-                    foreach (string thisDir in AnimDirs)
-                        Directory.Delete(thisDir, true);
-
-                    string[] BlytFiles = Directory.GetFiles(TempBannerPath + "arc\\blyt");
-                    string[] BlytDirs = Directory.GetDirectories(TempBannerPath + "arc\\blyt");
-
-                    foreach (string thisFile in BlytFiles)
-                    {
-                        if (!thisFile.ToLower().EndsWith(".brlyt"))
-                            File.Delete(thisFile);
-                    }
-
-                    foreach (string thisDir in BlytDirs)
-                        Directory.Delete(thisDir, true);
-
-                    string[] TimgFiles = Directory.GetFiles(TempBannerPath + "arc\\timg");
-                    string[] TimgDirs = Directory.GetDirectories(TempBannerPath + "arc\\timg");
-
-                    foreach (string thisFile in TimgFiles)
-                    {
-                        if (!thisFile.ToLower().EndsWith(".tpl"))
-                            File.Delete(thisFile);
-                    }
-
-                    foreach (string thisDir in TimgDirs)
-                        Directory.Delete(thisDir, true);
-                }
-
-                //Check icon.bin_OUT / Icon Replace Path
-                if (string.IsNullOrEmpty(IconReplace))
-                {
-                    string[] ArcFiles = Directory.GetFiles(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT");
-                    string[] ArcDirs = Directory.GetDirectories(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT");
-
-                    foreach (string thisFile in ArcFiles)
-                        File.Delete(thisFile);
-                    foreach (string thisDir in ArcDirs)
-                        if (!thisDir.ToLower().EndsWith("arc"))
-                            Directory.Delete(thisDir, true);
-
-                    string[] IconFiles = Directory.GetFiles(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT\\arc");
-                    string[] IconDirs = Directory.GetDirectories(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT\\arc");
-
-                    foreach (string thisFile in IconFiles)
-                        File.Delete(thisFile);
-
-                    if (IconDirs.Length > 3)
-                    {
-                        foreach (string thisDir in IconDirs)
-                        {
-                            if (!thisDir.ToLower().EndsWith("anim") &&
-                                !thisDir.ToLower().EndsWith("blyt") &&
-                                !thisDir.ToLower().EndsWith("timg"))
-                                Directory.Delete(thisDir, true);
-                        }
-                    }
-
-                    string[] AnimFiles = Directory.GetFiles(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT\\arc\\anim");
-                    string[] AnimDirs = Directory.GetDirectories(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT\\arc\\anim");
-
-                    foreach (string thisFile in AnimFiles)
-                    {
-                        if (!thisFile.ToLower().EndsWith(".brlan"))
-                            File.Delete(thisFile);
-                    }
-
-                    foreach (string thisDir in AnimDirs)
-                        Directory.Delete(thisDir, true);
-
-                    string[] BlytFiles = Directory.GetFiles(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT\\arc\\blyt");
-                    string[] BlytDirs = Directory.GetDirectories(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT\\arc\\blyt");
-
-                    foreach (string thisFile in BlytFiles)
-                    {
-                        if (!thisFile.ToLower().EndsWith(".brlyt"))
-                            File.Delete(thisFile);
-                    }
-
-                    foreach (string thisDir in BlytDirs)
-                        Directory.Delete(thisDir, true);
-
-                    string[] TimgFiles = Directory.GetFiles(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT\\arc\\timg");
-                    string[] TimgDirs = Directory.GetDirectories(TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT\\arc\\timg");
-
-                    foreach (string thisFile in TimgFiles)
-                    {
-                        if (!thisFile.ToLower().EndsWith(".tpl"))
-                            File.Delete(thisFile);
-                    }
-
-                    foreach (string thisDir in TimgDirs)
-                        Directory.Delete(thisDir, true);
-                }
-                else
-                {
-                    string[] ArcFiles = Directory.GetFiles(TempIconPath);
-                    string[] ArcDirs = Directory.GetDirectories(TempIconPath);
-
-                    foreach (string thisFile in ArcFiles)
-                        File.Delete(thisFile);
-                    foreach (string thisDir in ArcDirs)
-                        if (!thisDir.ToLower().EndsWith("arc"))
-                            Directory.Delete(thisDir, true);
-
-                    string[] IconFiles = Directory.GetFiles(TempIconPath + "arc");
-                    string[] IconDirs = Directory.GetDirectories(TempIconPath + "arc");
-
-                    foreach (string thisFile in IconFiles)
-                        File.Delete(thisFile);
-
-                    if (IconDirs.Length > 3)
-                    {
-                        foreach (string thisDir in IconDirs)
-                        {
-                            if (!thisDir.ToLower().EndsWith("anim") &&
-                                !thisDir.ToLower().EndsWith("blyt") &&
-                                !thisDir.ToLower().EndsWith("timg"))
-                                Directory.Delete(thisDir, true);
-                        }
-                    }
-
-                    string[] AnimFiles = Directory.GetFiles(TempIconPath + "arc\\anim");
-                    string[] AnimDirs = Directory.GetDirectories(TempIconPath + "arc\\anim");
-
-                    foreach (string thisFile in AnimFiles)
-                    {
-                        if (!thisFile.ToLower().EndsWith(".brlan"))
-                            File.Delete(thisFile);
-                    }
-
-                    foreach (string thisDir in AnimDirs)
-                        Directory.Delete(thisDir, true);
-
-                    string[] BlytFiles = Directory.GetFiles(TempIconPath + "arc\\blyt");
-                    string[] BlytDirs = Directory.GetDirectories(TempIconPath + "arc\\blyt");
-
-                    foreach (string thisFile in BlytFiles)
-                    {
-                        if (!thisFile.ToLower().EndsWith(".brlyt"))
-                            File.Delete(thisFile);
-                    }
-
-                    foreach (string thisDir in BlytDirs)
-                        Directory.Delete(thisDir, true);
-
-                    string[] TimgFiles = Directory.GetFiles(TempIconPath + "arc\\timg");
-                    string[] TimgDirs = Directory.GetDirectories(TempIconPath + "arc\\timg");
-
-                    foreach (string thisFile in TimgFiles)
-                    {
-                        if (!thisFile.ToLower().EndsWith(".tpl"))
-                            File.Delete(thisFile);
-                    }
-
-                    foreach (string thisDir in TimgDirs)
-                        Directory.Delete(thisDir, true);
-                }
-
-                return true;
-            }
-            catch { return false; }
-        }
-
-        private bool FailureCheck()
-        {
-            try
-            {
-                currentProgress.progressValue = 100;
-                currentProgress.progressState = "Error Checks...";
-                this.Invoke(ProgressUpdate);
-
-                //Check Unpack Folder
-                if (CheckUnpackFolder() == false)
-                {
-                    if (UnpackFolderErrorCount > 0)
-                    {
-                        ErrorBox("Something's wrong with the temporary files.\nYou may have to start again." +
-                            "\n\nIf this message keeps bothering you, please report as much information " +
-                            "as possible at the issue tracker: http://code.google.com/p/customizemii/issues/list");
-                    }
-                    else
-                    {
-                        ErrorBox("Something's wrong with the temporary files.\nYou may have to start again.");
-                    }
-
-                    UnpackFolderErrorCount++;
-                    return false;
-                }
-
                 //Check Channel Title Boxes
                 if (!(!string.IsNullOrEmpty(tbAllLanguages.Text) ||
                     (!string.IsNullOrEmpty(tbEnglish.Text) &&
@@ -392,114 +49,130 @@ namespace CustomizeMii
                     !string.IsNullOrEmpty(tbItalian.Text) &&
                     !string.IsNullOrEmpty(tbDutch.Text))))
                 {
-                    ErrorBox("You must either enter a general Channel Title or one for each language!");
+                    errorBox("You must either enter a general Channel Title or one for each language!");
                     return false;
                 }
 
                 //Check Title ID Length + Chars
                 if (tbTitleID.Text.Length != 4)
-                {
-                    ErrorBox("The Title ID must be 4 characters long!"); return false;
-                }
+                { errorBox("The Title ID must be 4 characters long!"); return false; }
 
                 Regex allowedchars = new Regex("[A-Z0-9]{4}$");
                 if (!allowedchars.IsMatch(tbTitleID.Text.ToUpper()))
-                {
-                    ErrorBox("Please enter a valid Title ID!"); return false;
-                }
+                { errorBox("Please enter a valid Title ID!"); return false; }
 
-                //Check Required IOS Box
+                //Check Startup IOS Box
                 int tmp;
                 if (!int.TryParse(tbStartupIos.Text, out tmp))
-                {
-                    ErrorBox("Please enter a valid Required IOS! (0 - 255)"); return false;
-                }
+                { errorBox("Please enter a valid Startup IOS! (0 - 255)"); return false; }
                 else if (tmp < 0 || tmp > 255)
-                {
-                    ErrorBox("Please enter a valid Required IOS! (0 - 255)"); return false;
-                }
+                { errorBox("Please enter a valid Startup IOS! (0 - 255)"); return false; }
 
                 //Check brlan files
-                string[] ValidBrlans = new string[] { "banner.brlan", "icon.brlan", "banner_loop.brlan", "icon_loop.brlan", "banner_start.brlan", "icon_start.brlan" };
+                string[] validBrlans = new string[] { "banner.brlan", "icon.brlan", "banner_loop.brlan", "banner_start.brlan" };
                 foreach (string thisBrlan in lbxBrlanBanner.Items)
                 {
-                    if (!Wii.Tools.StringExistsInStringArray(thisBrlan.ToLower(), ValidBrlans))
-                    {
-                        ErrorBox(thisBrlan + " is not a valid brlan filename!");
-                        return false;
-                    }
+                    if (!Array.Exists(validBrlans, brlanName => brlanName.ToLower() == thisBrlan.ToLower()))
+                    { errorBox(thisBrlan + " is not a valid brlan filename!"); return false; }
                 }
                 foreach (string thisBrlan in lbxBrlanIcon.Items)
                 {
-                    if (!Wii.Tools.StringExistsInStringArray(thisBrlan.ToLower(), ValidBrlans))
-                    {
-                        ErrorBox(thisBrlan + " is not a valid brlan filename!");
-                        return false;
-                    }
+                    if (!Array.Exists(validBrlans, brlanName => brlanName.ToLower() == thisBrlan.ToLower()))
+                    { errorBox(thisBrlan + " is not a valid brlan filename!"); return false; }
                 }
 
                 //Check TPLs
-                List<string> BannerTpls = new List<string>();
-                List<string> IconTpls = new List<string>();
-                foreach (string thisTpl in lbxBannerTpls.Items) BannerTpls.Add(thisTpl.Remove(thisTpl.IndexOf('(', 0) - 1));
-                foreach (string thisTpl in lbxIconTpls.Items) IconTpls.Add(thisTpl.Remove(thisTpl.IndexOf('(', 0) - 1));
+                string[] bannerRequiredTpls = new string[0];
+                string[] iconRequiredTpls = new string[0];
+                List<string> bannerTpls = new List<string>();
+                List<string> iconTpls = new List<string>();
 
-                string[] BannerBrlytPath;
-                string[] BannerBrlanPath;
-                string[] IconBrlytPath;
-                string[] IconBrlanPath;
-
-                if (string.IsNullOrEmpty(BannerReplace))
+                if (string.IsNullOrEmpty(replacedBanner))
                 {
-                    BannerBrlytPath = Directory.GetFiles(TempUnpackBannerBrlytPath);
-                    BannerBrlanPath = Directory.GetFiles(TempUnpackBannerBrlanPath);
+                    for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                    {
+                        if (bannerBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                        { bannerRequiredTpls = Shared.MergeStringArrays(bannerRequiredTpls, Brlyt.GetBrlytTpls(bannerBin.Data[i])); }
+                        else if (bannerBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                        { bannerRequiredTpls = Shared.MergeStringArrays(bannerRequiredTpls, Brlan.GetBrlanTpls(bannerBin.Data[i])); }
+                        else if (bannerBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                        { bannerTpls.Add(bannerBin.StringTable[i]); }
+                    }
                 }
                 else
                 {
-                    BannerBrlytPath = Directory.GetFiles(TempBannerPath + "arc\\blyt");
-                    BannerBrlanPath = Directory.GetFiles(TempBannerPath + "arc\\anim");
+                    for (int i = 0; i < newBannerBin.NumOfNodes; i++)
+                    {
+                        if (newBannerBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                        { bannerRequiredTpls = Shared.MergeStringArrays(bannerRequiredTpls, Brlyt.GetBrlytTpls(newBannerBin.Data[i])); }
+                        else if (newBannerBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                        { bannerRequiredTpls = Shared.MergeStringArrays(bannerRequiredTpls, Brlan.GetBrlanTpls(newBannerBin.Data[i])); }
+                        else if (newBannerBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                        { bannerTpls.Add(newBannerBin.StringTable[i]); }
+                    }
                 }
-                if (string.IsNullOrEmpty(IconReplace))
+
+                if (string.IsNullOrEmpty(replacedIcon))
                 {
-                    IconBrlytPath = Directory.GetFiles(TempUnpackIconBrlytPath);
-                    IconBrlanPath = Directory.GetFiles(TempUnpackIconBrlanPath);
+                    for (int i = 0; i < iconBin.NumOfNodes; i++)
+                    {
+                        if (iconBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                        { iconRequiredTpls = Shared.MergeStringArrays(iconRequiredTpls, Brlyt.GetBrlytTpls(iconBin.Data[i])); }
+                        else if (iconBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                        { iconRequiredTpls = Shared.MergeStringArrays(iconRequiredTpls, Brlan.GetBrlanTpls(iconBin.Data[i])); }
+                        else if (iconBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                        { iconTpls.Add(iconBin.StringTable[i]); }
+                    }
                 }
                 else
                 {
-                    IconBrlytPath = Directory.GetFiles(TempIconPath + "arc\\blyt");
-                    IconBrlanPath = Directory.GetFiles(TempIconPath + "arc\\anim");
+                    for (int i = 0; i < newIconBin.NumOfNodes; i++)
+                    {
+                        if (newIconBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                        { iconRequiredTpls = Shared.MergeStringArrays(iconRequiredTpls, Brlyt.GetBrlytTpls(newIconBin.Data[i])); }
+                        else if (newIconBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                        { iconRequiredTpls = Shared.MergeStringArrays(iconRequiredTpls, Brlan.GetBrlanTpls(newIconBin.Data[i])); }
+                        else if (newIconBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                        { iconTpls.Add(newIconBin.StringTable[i]); }
+                    }
                 }
 
-                string[] BannerMissing;
-                string[] BannerUnused;
-                string[] IconMissing;
-                string[] IconUnused;
-
                 //Check for missing TPLs
-                if (Wii.Brlyt.CheckForMissingTpls(BannerBrlytPath[0], BannerBrlanPath[0], BannerTpls.ToArray(), out BannerMissing) == true)
+                List<string> missingTpls = new List<string>();
+
+                for (int i = 0; i < bannerRequiredTpls.Length; i++)
+                    if (!Array.Exists(bannerTpls.ToArray(), thisTpl => thisTpl.ToLower() == bannerRequiredTpls[i].ToLower()))
+                        missingTpls.Add(bannerRequiredTpls[i]);
+
+                if (missingTpls.Count > 0)
                 {
-                    ErrorBox("The following Banner TPLs are required by the banner.brlyt, but missing:\n\n" + string.Join("\n", BannerMissing));
+                    errorBox("The following Banner TPLs are required by the banner.brlyt, but missing:\n\n" + string.Join("\n", missingTpls.ToArray()));
                     return false;
                 }
-                if (Wii.Brlyt.CheckForMissingTpls(IconBrlytPath[0], IconBrlanPath[0], IconTpls.ToArray(), out IconMissing) == true)
+
+                missingTpls.Clear();
+
+                for (int i = 0; i < iconRequiredTpls.Length; i++)
+                    if (!Array.Exists(iconTpls.ToArray(), thisTpl => thisTpl.ToLower() == iconRequiredTpls[i].ToLower()))
+                        missingTpls.Add(iconRequiredTpls[i]);
+
+                if (missingTpls.Count > 0)
                 {
-                    ErrorBox("The following Icon TPLs are required by the icon.brlyt, but missing:\n\n" + string.Join("\n", IconMissing));
+                    errorBox("The following Icon TPLs are required by the icon.brlyt, but missing:\n\n" + string.Join("\n", missingTpls.ToArray()));
                     return false;
                 }
 
                 //Check Sound length
                 int soundLength = 0;
-                if (!string.IsNullOrEmpty(tbSound.Text) && string.IsNullOrEmpty(SoundReplace))
+                if (!string.IsNullOrEmpty(replacedSound))
                 {
                     if (!tbSound.Text.ToLower().EndsWith(".bns") && !tbSound.Text.StartsWith("BNS:"))
                     {
-                        string SoundFile = tbSound.Text;
-                        if (tbSound.Text.ToLower().EndsWith(".mp3")) SoundFile = TempWavePath;
-
-                        soundLength = Wii.Sound.GetWaveLength(SoundFile);
-                        if (soundLength > SoundMaxLength)
+                        Wave w = new Wave(Headers.IMD5.RemoveHeader(newSoundBin));
+                        soundLength = w.GetWaveLength();
+                        if (soundLength > soundMaxLength)
                         {
-                            ErrorBox(string.Format("Your Sound is longer than {0} seconds and thus not supported.\nIt is recommended to use a Sound shorter than {1} seconds, the maximum length is {0} seconds!", SoundMaxLength, SoundWarningLength));
+                            errorBox(string.Format("Your wave sound is longer than {0} seconds and thus not supported.\nIt is recommended to use a sound shorter than {1} seconds, the maximum length is {0} seconds!\nThis limit doesn't affect BNS sounds!", soundMaxLength, soundWarningLength));
                             return false;
                         }
                     }
@@ -508,75 +181,95 @@ namespace CustomizeMii
                 /*Errors till here..
                   From here only Warnings!*/
 
-                if (soundLength > SoundWarningLength)
+                if (soundLength > soundWarningLength)
                 {
-                    if (MessageBox.Show(string.Format("Your Sound is longer than {0} seconds.\nIt is recommended to use Sounds that are shorter than {0} seconds!\nDo you still want to continue?", SoundWarningLength), "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
+                    if (MessageBox.Show(string.Format("Your Sound is longer than {0} seconds.\nIt is recommended to use Sounds that are shorter than {0} seconds!\nDo you still want to continue?", soundWarningLength), "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
                         return false;
                 }
 
                 //Check BNS sound length
                 if (tbSound.Text.StartsWith("BNS:") || tbSound.Text.ToLower().EndsWith(".bns"))
                 {
-                    string bnsFile = tbSound.Text;
-                    if (tbSound.Text.StartsWith("BNS:")) bnsFile = TempBnsPath;
-
-                    int bnsLength = Wii.Sound.GetBnsLength(bnsFile);
-                    if (bnsLength > BnsWarningLength)
+                    int bnsLength = BNS.GetBnsLength(Headers.IMD5.RemoveHeader(newSoundBin));
+                    if (bnsLength > bnsWarningLength)
                     {
-                        if (MessageBox.Show(string.Format("Your BNS Sound is longer than {0} seconds.\nIt is recommended to use Sounds that are shorter than {0} seconds!\nDo you still want to continue?", BnsWarningLength), "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
+                        if (MessageBox.Show(string.Format("Your BNS Sound is longer than {0} seconds.\nIt is recommended to use Sounds that are shorter than {0} seconds!\nDo you still want to continue?", bnsWarningLength), "Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
                             return false;
                     }
                 }
 
                 //Check if brlyt or brlan were changed
-                if (BrlytChanged == true && BrlanChanged == false)
+                if (brlytChanged && !brlanChanged)
                 {
                     if (MessageBox.Show("You have changed the brlyt, but didn't change the brlan.\nAre you sure this is correct?", "brlyt Changed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
                         return false;
                 }
-                else if (BrlanChanged == true && BrlytChanged == false)
+                else if (brlanChanged && !brlytChanged)
                 {
                     if (MessageBox.Show("You have changed the brlan, but didn't change the brlyt.\nAre you sure this is correct?", "brlan Changed", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
                         return false;
                 }
 
-                //Check for unused TPLs (Do this at the end of the failure checks, because we don't want a
-                //                       MessageBox asking if unused TPLs should be deleted and after that any error)           
-                if (Wii.Brlyt.CheckForUnusedTpls(BannerBrlytPath[0], BannerBrlanPath[0], BannerTpls.ToArray(), out BannerUnused) == true)
+                //Check for unused TPLs
+                List<string> unusedTpls = new List<string>();
+
+                for (int i = 0; i < bannerTpls.Count; i++)
+                    if (!Array.Exists(bannerRequiredTpls, thisTpl => thisTpl.ToLower() == bannerTpls[i].ToLower()))
+                        unusedTpls.Add(bannerTpls[i]);
+
+                if (unusedTpls.Count > 0)
                 {
                     DialogResult dlgresult = MessageBox.Show(
                         "The following Banner TPLs are unused by the banner.brlyt:\n\n" +
-                        string.Join("\n", BannerUnused) +
+                        string.Join("\n", unusedTpls.ToArray()) +
                         "\n\nDo you want them to be deleted before the WAD is being created? (Saves space!)",
                         "Delete unused TPLs?", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
                     if (dlgresult == DialogResult.Yes)
                     {
-                        foreach (string thisTpl in BannerUnused)
+                        if (string.IsNullOrEmpty(replacedBanner))
                         {
-                            if (string.IsNullOrEmpty(BannerReplace))
-                                File.Delete(TempUnpackBannerTplPath + thisTpl);
-                            else
-                                File.Delete(TempBannerPath + "arc\\timg\\" + thisTpl);
+                            foreach (string thisTpl in unusedTpls)
+                                bannerBin.RemoveFile("/arc/timg/" + thisTpl);
                         }
+                        else
+                        {
+                            foreach (string thisTpl in unusedTpls)
+                                newBannerBin.RemoveFile("/arc/timg/" + thisTpl);
+                        }
+
+                        addTpls();
                     }
                     else if (dlgresult == DialogResult.Cancel) return false;
                 }
-                if (Wii.Brlyt.CheckForUnusedTpls(IconBrlytPath[0], IconBrlanPath[0], IconTpls.ToArray(), out IconUnused) == true)
+
+                unusedTpls.Clear();
+
+                for (int i = 0; i < iconTpls.Count; i++)
+                    if (!Array.Exists(iconRequiredTpls, thisTpl => thisTpl.ToLower() == iconTpls[i].ToLower()))
+                        unusedTpls.Add(iconTpls[i]);
+
+
+                if (unusedTpls.Count > 0)
                 {
                     DialogResult dlgresult = MessageBox.Show(
                         "The following Icon TPLs are unused by the icon.brlyt:\n\n" +
-                        string.Join("\n", IconUnused) +
+                        string.Join("\n", unusedTpls.ToArray()) +
                         "\n\nDo you want them to be deleted before the WAD is being created? (Saves memory!)",
                         "Delete unused TPLs?", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
                     if (dlgresult == DialogResult.Yes)
                     {
-                        foreach (string thisTpl in IconUnused)
+                        if (string.IsNullOrEmpty(replacedIcon))
                         {
-                            if (string.IsNullOrEmpty(IconReplace))
-                                File.Delete(TempUnpackIconTplPath + thisTpl);
-                            else
-                                File.Delete(TempIconPath + "arc\\timg\\" + thisTpl);
+                            foreach (string thisTpl in unusedTpls)
+                                iconBin.RemoveFile("/arc/timg/" + thisTpl);
                         }
+                        else
+                        {
+                            foreach (string thisTpl in unusedTpls)
+                                newIconBin.RemoveFile("/arc/timg/" + thisTpl);
+                        }
+
+                        addTpls();
                     }
                     else if (dlgresult == DialogResult.Cancel) return false;
                 }
@@ -589,12 +282,12 @@ namespace CustomizeMii
             }
             catch (Exception ex)
             {
-                ErrorBox(ex.Message);
+                errorBox(ex.Message);
                 return false;
             }
         }
 
-        private void ForwarderDialogSimple()
+        private void forwarderDialogSimple()
         {
             CustomizeMii_InputBox ib = new CustomizeMii_InputBox(false);
             ib.Size = new Size(ib.Size.Width, 120);
@@ -603,80 +296,74 @@ namespace CustomizeMii
             ib.btnExit.Text = "Cancel";
             ib.cbElf.Visible = true;
 
-            ib.tbInput.Text = SimpleForwarder.AppFolder;
-            ib.cbElf.Checked = SimpleForwarder.ForwardToElf;
+            ib.tbInput.Text = simpleForwarder.AppFolder;
+            ib.cbElf.Checked = simpleForwarder.ForwardToElf;
 
             if (ib.ShowDialog() == DialogResult.OK)
             {
-                SimpleForwarder.ForwardToElf = ib.cbElf.Checked;
-                SimpleForwarder.AppFolder = ib.Input;
-                SetText(tbDol, string.Format("Simple Forwarder: \"SD:\\apps\\{0}\\boot.{1}\"",
-                    SimpleForwarder.AppFolder, SimpleForwarder.ForwardToElf == true ? "elf" : "dol"));
+                simpleForwarder.ForwardToElf = ib.cbElf.Checked;
+                simpleForwarder.AppFolder = ib.Input;
+                setControlText(tbDol, string.Format("Simple Forwarder: \"SD:\\apps\\{0}\\boot.{1}\"",
+                    simpleForwarder.AppFolder, simpleForwarder.ForwardToElf == true ? "elf" : "dol"));
                 btnBrowseDol.Text = "Clear";
             }
         }
 
-        private void ForwarderDialogComplex()
+        private void forwarderDialogComplex()
         {
             CustomizeMii_ComplexForwarder cf = new CustomizeMii_ComplexForwarder();
 
             TextBox[] tbs = new TextBox[] { cf.tb1, cf.tb2, cf.tb3, cf.tb4, cf.tb5, cf.tb6, cf.tb7, cf.tb8,
                                             cf.tb9, cf.tb10, cf.tb11, cf.tb12, cf.tb13, cf.tb14, cf.tb15, cf.tb16};
             for (int i = 0; i < tbs.Length; i++)
-                tbs[i].Text = ComplexForwarder.GetPath(i);
+                tbs[i].Text = complexForwarder.GetPath(i);
 
-            cf.cbPack1.Checked = ComplexForwarder.Packs[0];
-            cf.cbPack2.Checked = ComplexForwarder.Packs[1];
-            cf.cbPack3.Checked = ComplexForwarder.Packs[2];
+            cf.cbPack1.Checked = complexForwarder.Packs[0];
+            cf.cbPack2.Checked = complexForwarder.Packs[1];
+            cf.cbPack3.Checked = complexForwarder.Packs[2];
 
-            if (!string.IsNullOrEmpty(ComplexForwarder.Image43))
+            if (!string.IsNullOrEmpty(complexForwarder.Image43))
             {
                 cf.cbImage43.Checked = true;
                 cf.tbImage43.Enabled = true;
                 cf.btnBrowseImage43.Enabled = true;
 
-                cf.tbImage43.Text = ComplexForwarder.Image43;
+                cf.tbImage43.Text = complexForwarder.Image43;
             }
-            if (!string.IsNullOrEmpty(ComplexForwarder.Image169))
+            if (!string.IsNullOrEmpty(complexForwarder.Image169))
             {
                 cf.cbImage169.Checked = true;
                 cf.tbImage169.Enabled = true;
                 cf.btnBrowseImage169.Enabled = true;
 
-                cf.tbImage169.Text = ComplexForwarder.Image169;
+                cf.tbImage169.Text = complexForwarder.Image169;
             }
 
             if (cf.ShowDialog() == DialogResult.OK)
             {
                 for (int i = 0; i < tbs.Length; i++)
-                    ComplexForwarder.SetPath(i, tbs[i].Text.Replace('\\', '/'));
+                    complexForwarder.SetPath(i, tbs[i].Text.Replace('\\', '/'));
 
-                ComplexForwarder.Packs[0] = cf.cbPack1.Checked;
-                ComplexForwarder.Packs[1] = cf.cbPack2.Checked;
-                ComplexForwarder.Packs[2] = cf.cbPack3.Checked;
+                complexForwarder.Packs[0] = cf.cbPack1.Checked;
+                complexForwarder.Packs[1] = cf.cbPack2.Checked;
+                complexForwarder.Packs[2] = cf.cbPack3.Checked;
 
-                ComplexForwarder.Image43 = cf.tbImage43.Text;
-                ComplexForwarder.Image169 = cf.tbImage169.Text;
+                complexForwarder.Image43 = (cf.cbImage43.Checked) ? cf.tbImage43.Text : string.Empty;
+                complexForwarder.Image169 = (cf.cbImage169.Checked) ? cf.tbImage169.Text : string.Empty;
 
-                SetText(tbDol, string.Format("Complex Forwarder"));
+                setControlText(tbDol, string.Format("Complex Forwarder"));
                 btnBrowseDol.Text = "Clear";
             }
         }
 
-        private void FixTpls()
+        private void enableControls()
         {
-            string[] bannerTpls = Directory.GetFiles(GetCurBannerPath() + "timg\\", "*.tpl");
-            string[] iconTpls = Directory.GetFiles(GetCurIconPath() + "timg\\", "*.tpl");
+            if (this.InvokeRequired)
+            {
+               this.Invoke(new MethodInvoker(enableControls));
+               return;
+            }
 
-            foreach (string thisTpl in bannerTpls)
-                Wii.TPL.FixFilter(thisTpl);
-            
-            foreach (string thisTpl in iconTpls)
-                Wii.TPL.FixFilter(thisTpl);
-        }
-
-        private void EnableControls(object sender, EventArgs e)
-        {
             for (int i = 0; i < tabControl.TabCount; i++)
             {
                 if (tabControl.TabPages[i] != tabSource)
@@ -691,10 +378,19 @@ namespace CustomizeMii
                     }
                 }
             }
+
+            llbBannerMultiReplace.Enabled = true;
+            llbIconMultiReplace.Enabled = true;
         }
 
-        private void DisableControls(object sender, EventArgs e)
+        private void disableControls()
         {
+            if (this.InvokeRequired)
+            {
+                this.Invoke(new MethodInvoker(disableControls));
+                return;
+            }
+
             for (int i = 0; i < tabControl.TabCount; i++)
             {
                 if (tabControl.TabPages[i] != tabSource)
@@ -709,9 +405,12 @@ namespace CustomizeMii
                     }
                 }
             }
+
+            llbBannerMultiReplace.Enabled = false;
+            llbIconMultiReplace.Enabled = false;
         }
 
-        private Image ResizeImage(Image img, int x, int y)
+        private Image resizeImage(Image img, int x, int y)
         {
             Image newimage = new Bitmap(x, y);
             using (Graphics gfx = Graphics.FromImage(newimage))
@@ -721,141 +420,150 @@ namespace CustomizeMii
             return newimage;
         }
 
-        private string GetCurBannerPath()
+        private void setControlText(Control ctrl, string text)
         {
-            if (string.IsNullOrEmpty(BannerReplace))
-                return TempUnpackPath + "00000000.app_OUT\\meta\\banner.bin_OUT\\arc\\";
-            else
-                return TempBannerPath + "arc\\";
-        }
-
-        private string GetCurIconPath()
-        {
-            if (string.IsNullOrEmpty(IconReplace))
-                return TempUnpackPath + "00000000.app_OUT\\meta\\icon.bin_OUT\\arc\\";
-            else
-                return TempIconPath + "arc\\";
-        }
-
-        private void SetText(TextBox tb, string text)
-        {
-            SetTextInvoker invoker = new SetTextInvoker(this.SetText);
-            this.Invoke(invoker, text, tb);
-        }
-
-        private void SetText(string text, TextBox tb)
-        {
-            tb.Text = text;
-        }
-
-        private void SetLabel(Label lb, string text)
-        {
-            SetLabelInvoker invoker = new SetLabelInvoker(this.SetLabel);
-            this.Invoke(invoker, text, lb);
-        }
-
-        private void SetLabel(string text, Label lb)
-        {
-            lb.Text = text;
-        }
-
-        private void SetButton(Button btn, string text)
-        {
-            SetButtonInvoker invoker = new SetButtonInvoker(this.SetButton);
-            this.Invoke(invoker, text, btn);
-        }
-
-        private void SetButton(string text, Button btn)
-        {
-            btn.Text = text;
-        }
-
-        private void AddBannerTpls(object sender, EventArgs e)
-        {
-            try
+            if (this.InvokeRequired)
             {
-                string[] BannerTpls;
-                if (string.IsNullOrEmpty(BannerReplace))
-                    BannerTpls = Directory.GetFiles(TempUnpackBannerTplPath);
-                else
-                    BannerTpls = Directory.GetFiles(TempBannerPath + "arc\\timg");
-
-                AddBannerTpls(BannerTpls);
+                this.Invoke(new controlTextInvoker(setControlText), ctrl, text);
+                return;
             }
-            catch { }
+
+            ctrl.Text = text;
         }
 
-        private void AddIconTpls(object sender, EventArgs e)
+        private void addTpls()
         {
-            try
+            if (this.InvokeRequired)
             {
-                string[] IconTpls;
-                if (string.IsNullOrEmpty(IconReplace))
-                    IconTpls = Directory.GetFiles(TempUnpackIconTplPath);
-                else
-                    IconTpls = Directory.GetFiles(TempIconPath + "arc\\timg");
-
-                AddIconTpls(IconTpls);
+                this.Invoke(new MethodInvoker(addTpls));
+                return;
             }
-            catch { }
+
+            List<string> bannerTpls = new List<string>();
+
+            if (string.IsNullOrEmpty(replacedBanner))
+            {
+                for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                    if (bannerBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                    {
+                        try
+                        {
+                            TPL tmpTpl = TPL.Load(bannerBin.Data[i]);
+                            bannerTpls.Add(string.Format("{0}   ({3},   {1} x {2},   {4})", bannerBin.StringTable[i], tmpTpl.GetTextureSize(0).Width, tmpTpl.GetTextureSize(0).Height, tmpTpl.GetTextureFormat(0).ToString(), getSizeString(bannerBin.Data[i].Length)));
+                        }
+                        catch { }
+                    }
+            }
+            else
+            {
+                for (int i = 0; i < newBannerBin.NumOfNodes; i++)
+                    if (newBannerBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                    {
+                        try
+                        {
+                            TPL tmpTpl = TPL.Load(newBannerBin.Data[i]);
+                            bannerTpls.Add(string.Format("{0}   ({3},   {1} x {2},   {4})", newBannerBin.StringTable[i], tmpTpl.GetTextureSize(0).Width, tmpTpl.GetTextureSize(0).Height, tmpTpl.GetTextureFormat(0).ToString(), getSizeString(newBannerBin.Data[i].Length)));
+                        }
+                        catch { }
+                    }
+            }
+
+            _addBannerTpls(bannerTpls.ToArray());
+
+            List<string> iconTpls = new List<string>();
+
+            if (string.IsNullOrEmpty(replacedIcon))
+            {
+                for (int i = 0; i < iconBin.NumOfNodes; i++)
+                    if (iconBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                    {
+                        try
+                        {
+                            TPL tmpTpl = TPL.Load(iconBin.Data[i]);
+                            iconTpls.Add(string.Format("{0}   ({3},   {1} x {2},   {4})", iconBin.StringTable[i], tmpTpl.GetTextureSize(0).Width, tmpTpl.GetTextureSize(0).Height, tmpTpl.GetTextureFormat(0).ToString(), getSizeString(iconBin.Data[i].Length)));
+                        }
+                        catch { }
+                    }
+            }
+            else
+            {
+                for (int i = 0; i < newIconBin.NumOfNodes; i++)
+                    if (newIconBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                    {
+                        try
+                        {
+                            TPL tmpTpl = TPL.Load(newIconBin.Data[i]);
+                            iconTpls.Add(string.Format("{0}   ({3},   {1} x {2},   {4})", newIconBin.StringTable[i], tmpTpl.GetTextureSize(0).Width, tmpTpl.GetTextureSize(0).Height, tmpTpl.GetTextureFormat(0).ToString(), getSizeString(newIconBin.Data[i].Length)));
+                        }
+                        catch { }
+                    }
+            }
+
+            _addIconTpls(iconTpls.ToArray());
         }
 
-        private void AddBannerTpls(string[] tpls)
+        private string getSizeString(int dataLength)
         {
+            if (dataLength > 1022976)
+                return string.Format("{0}MB", Math.Round(dataLength / 1024d / 1024d, 2)).Replace(',', ',');
+            else
+                return string.Format("{0}KB", Math.Round(dataLength / 1024d, 2)).Replace(',', '.');
+        }
+
+        private void _addBannerTpls(string[] tpls)
+        {
+            lbxBannerTpls.Items.Clear();
+
             if (tpls.Length > 0)
             {
-                lbxBannerTpls.Items.Clear();
-                BannerTplPath = tpls[0].Remove(tpls[0].LastIndexOf('\\') + 1);
-
                 for (int i = 0; i < tpls.Length; i++)
                 {
-                    if (BannerTransparents.Contains(tpls[i].Remove(0, tpls[i].LastIndexOf('\\') + 1)))
-                        lbxBannerTpls.Items.Add(tpls[i].Remove(0, tpls[i].LastIndexOf('\\') + 1) +
-                            string.Format(" ({0} x {1})", Wii.TPL.GetTextureWidth(File.ReadAllBytes(tpls[i])), Wii.TPL.GetTextureHeight(File.ReadAllBytes(tpls[i]))) + " (Transparent)");
+                    if (bannerTransparents.Contains(tpls[i].Remove(tpls[i].IndexOf('(') - 3)))
+                        lbxBannerTpls.Items.Add(tpls[i] + " (Transparent)");
                     else
-                        lbxBannerTpls.Items.Add(tpls[i].Remove(0, tpls[i].LastIndexOf('\\') + 1) +
-                            string.Format(" ({0} x {1})", Wii.TPL.GetTextureWidth(File.ReadAllBytes(tpls[i])), Wii.TPL.GetTextureHeight(File.ReadAllBytes(tpls[i]))));
+                        lbxBannerTpls.Items.Add(tpls[i]);
                 }
             }
         }
 
-        private void AddIconTpls(string[] tpls)
+        private void _addIconTpls(string[] tpls)
         {
+            lbxIconTpls.Items.Clear();
+
             if (tpls.Length > 0)
             {
-                lbxIconTpls.Items.Clear();
-                IconTplPath = tpls[0].Remove(tpls[0].LastIndexOf('\\') + 1);
-
                 for (int i = 0; i < tpls.Length; i++)
                 {
-                    if (IconTransparents.Contains(tpls[i].Remove(0, tpls[i].LastIndexOf('\\') + 1)))
-                        lbxIconTpls.Items.Add(tpls[i].Remove(0, tpls[i].LastIndexOf('\\') + 1) +
-                            string.Format(" ({0} x {1})", Wii.TPL.GetTextureWidth(File.ReadAllBytes(tpls[i])), Wii.TPL.GetTextureHeight(File.ReadAllBytes(tpls[i]))) + " (Transparent)");
+                    if (iconTransparents.Contains(tpls[i].Remove(tpls[i].IndexOf('(') - 3)))
+                        lbxIconTpls.Items.Add(tpls[i] + " (Transparent)");
                     else
-                        lbxIconTpls.Items.Add(tpls[i].Remove(0, tpls[i].LastIndexOf('\\') + 1) +
-                            string.Format(" ({0} x {1})", Wii.TPL.GetTextureWidth(File.ReadAllBytes(tpls[i])), Wii.TPL.GetTextureHeight(File.ReadAllBytes(tpls[i]))));
+                        lbxIconTpls.Items.Add(tpls[i]);
                 }
             }
         }
 
-        private void AddBrlyts(object sender, EventArgs e)
+        private void addBrlyts()
         {
+            if (this.InvokeRequired)
+            {
+                this.Invoke(new MethodInvoker(addBrlyts));
+                return;
+            }
+
             try
             {
-                string[] BannerBrlyt;
-                if (string.IsNullOrEmpty(BannerReplace))
-                    BannerBrlyt = Directory.GetFiles(TempUnpackBannerBrlytPath);
-                else
-                    BannerBrlyt = Directory.GetFiles(TempBannerPath + "arc\\blyt");
+                List<string> bannerBrlyts = new List<string>();
+                for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                    if (bannerBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                        bannerBrlyts.Add(bannerBin.StringTable[i]);
 
-                string[] IconBrlyt;
-                if (string.IsNullOrEmpty(IconReplace))
-                    IconBrlyt = Directory.GetFiles(TempUnpackIconBrlytPath);
-                else
-                    IconBrlyt = Directory.GetFiles(TempIconPath + "arc\\blyt");
+                List<string> iconBrlyts = new List<string>();
+                for (int i = 0; i < iconBin.NumOfNodes; i++)
+                    if (iconBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                        iconBrlyts.Add(iconBin.StringTable[i]);
 
-                AddBannerBrlyt(BannerBrlyt);
-                AddIconBrlyt(IconBrlyt);
+                _addBannerBrlyt(bannerBrlyts.ToArray());
+                _addIconBrlyt(iconBrlyts.ToArray());
 
                 if (lbxBrlytBanner.SelectedIndex == -1 && lbxBrlytIcon.SelectedIndex == -1)
                 {
@@ -866,24 +574,29 @@ namespace CustomizeMii
             catch { }
         }
 
-        private void AddBrlans(object sender, EventArgs e)
+        private void addBrlans()
         {
+            if (this.InvokeRequired)
+            {
+                this.Invoke(new MethodInvoker(addBrlans));
+                return;
+            }
+
             try
             {
-                string[] BannerBrlan;
-                if (string.IsNullOrEmpty(BannerReplace))
-                    BannerBrlan = Directory.GetFiles(TempUnpackBannerBrlanPath);
-                else
-                    BannerBrlan = Directory.GetFiles(TempBannerPath + "arc\\anim");
+                List<string> bannerBrlans = new List<string>();
 
-                string[] IconBrlan;
-                if (string.IsNullOrEmpty(IconReplace))
-                    IconBrlan = Directory.GetFiles(TempUnpackIconBrlanPath);
-                else
-                    IconBrlan = Directory.GetFiles(TempIconPath + "arc\\anim");
+                for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                    if (bannerBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                        bannerBrlans.Add(bannerBin.StringTable[i]);
 
-                AddBannerBrlan(BannerBrlan);
-                AddIconBrlan(IconBrlan);
+                List<string> iconBrlans = new List<string>();
+                for (int i = 0; i < iconBin.NumOfNodes; i++)
+                    if (iconBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                        iconBrlans.Add(iconBin.StringTable[i]);
+
+                _addBannerBrlan(bannerBrlans.ToArray());
+                _addIconBrlan(iconBrlans.ToArray());
 
                 if (lbxBrlanBanner.SelectedIndex == -1 && lbxBrlanIcon.SelectedIndex == -1)
                 {
@@ -894,127 +607,173 @@ namespace CustomizeMii
             catch { }
         }
 
-        private void AddBannerBrlyt(string[] brlyt)
+        private void _addBannerBrlyt(string[] brlyt)
         {
             if (brlyt.Length > 0)
             {
                 lbxBrlytBanner.Items.Clear();
-                BannerBrlytPath = brlyt[0].Remove(brlyt[0].LastIndexOf('\\') + 1);
 
                 for (int i = 0; i < brlyt.Length; i++)
-                {
-                    lbxBrlytBanner.Items.Add(brlyt[i].Remove(0, brlyt[i].LastIndexOf('\\') + 1));
-                }
+                    lbxBrlytBanner.Items.Add(brlyt[i]);
             }
         }
 
-        private void AddIconBrlyt(string[] brlyt)
+        private void _addIconBrlyt(string[] brlyt)
         {
             if (brlyt.Length > 0)
             {
                 lbxBrlytIcon.Items.Clear();
-                IconBrlytPath = brlyt[0].Remove(brlyt[0].LastIndexOf('\\') + 1);
 
                 for (int i = 0; i < brlyt.Length; i++)
-                {
-                    lbxBrlytIcon.Items.Add(brlyt[i].Remove(0, brlyt[i].LastIndexOf('\\') + 1));
-                }
+                    lbxBrlytIcon.Items.Add(brlyt[i]);
             }
         }
 
-        private void AddBannerBrlan(string[] brlan)
+        private void _addBannerBrlan(string[] brlan)
         {
             if (brlan.Length > 0)
             {
                 lbxBrlanBanner.Items.Clear();
-                BannerBrlanPath = brlan[0].Remove(brlan[0].LastIndexOf('\\') + 1);
 
                 for (int i = 0; i < brlan.Length; i++)
-                {
-                    lbxBrlanBanner.Items.Add(brlan[i].Remove(0, brlan[i].LastIndexOf('\\') + 1));
-                }
+                    lbxBrlanBanner.Items.Add(brlan[i]);
             }
         }
 
-        private void AddIconBrlan(string[] brlan)
+        private void _addIconBrlan(string[] brlan)
         {
             if (brlan.Length > 0)
             {
                 lbxBrlanIcon.Items.Clear();
-                IconBrlanPath = brlan[0].Remove(brlan[0].LastIndexOf('\\') + 1);
 
                 for (int i = 0; i < brlan.Length; i++)
-                {
-                    lbxBrlanIcon.Items.Add(brlan[i].Remove(0, brlan[i].LastIndexOf('\\') + 1));
-                }
+                    lbxBrlanIcon.Items.Add(brlan[i]);
             }
         }
 
-        private void ErrorBox(string message)
-        {
-            BoxInvoker invoker = new BoxInvoker(this.errorBox);
-            this.Invoke(invoker, new object[] { message });
-        }
-
         private void errorBox(string message)
         {
-            MessageBox.Show(message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-        }
+            if (this.InvokeRequired)
+            {
+                this.Invoke(new messageInvoker(errorBox), message);
+                return;
+            }
 
-        private void InfoBox(string message)
-        {
-            BoxInvoker invoker = new BoxInvoker(this.infoBox);
-            this.Invoke(invoker, new object[] { message });
+            MessageBox.Show(message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
 
         private void infoBox(string message)
         {
+            if (this.InvokeRequired)
+            {
+                this.Invoke(new messageInvoker(infoBox), message);
+                return;
+            }
+
             MessageBox.Show(message, "Information", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
 
-        private void MakeBannerTplsTransparent()
+        private void makeBannerTplsTransparent()
         {
             foreach (string thisTpl in lbxBannerTpls.Items)
             {
                 if (thisTpl.EndsWith("(Transparent)"))
                 {
-                    string Tpl = GetCurBannerPath() + "timg\\" + thisTpl.Remove(thisTpl.IndexOf('(', 0) - 1);
-                    byte[] TplArray = Wii.Tools.LoadFileToByteArray(Tpl);
-                    int Width = Wii.TPL.GetTextureWidth(TplArray);
-                    int Height = Wii.TPL.GetTextureHeight(TplArray);
+                    if (string.IsNullOrEmpty(replacedBanner))
+                    {
+                        for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                        {
+                            if (thisTpl.Remove(thisTpl.IndexOf('(', 0) - 3).ToLower() == bannerBin.StringTable[i].ToLower())
+                            {
+                                TPL tmpTpl = TPL.Load(bannerBin.Data[i]);
+                                Size tSize = tmpTpl.GetTextureSize(0);
 
-                    Image Img = new Bitmap(Width, Height);
-                    Wii.TPL.ConvertToTPL(Img, Tpl, 5);
+                                Image tImg = new Bitmap(tSize.Width, tSize.Height);
+                                tmpTpl.RemoveTexture(0);
+                                tmpTpl.AddTexture(tImg, TPL_Format.IA4);
+
+                                bannerBin.Data[i] = tmpTpl.ToByteArray();
+                            }
+                        }
+                    }
+                    else
+                    {
+                        for (int i = 0; i < newBannerBin.NumOfNodes; i++)
+                        {
+                            if (thisTpl.Remove(thisTpl.IndexOf('(', 0) - 3).ToLower() == newBannerBin.StringTable[i].ToLower())
+                            {
+                                TPL tmpTpl = TPL.Load(newBannerBin.Data[i]);
+                                Size tSize = tmpTpl.GetTextureSize(0);
+
+                                Image tImg = new Bitmap(tSize.Width, tSize.Height);
+                                tmpTpl.RemoveTexture(0);
+                                tmpTpl.AddTexture(tImg, TPL_Format.IA4);
+
+                                newBannerBin.Data[i] = tmpTpl.ToByteArray();
+                            }
+                        }
+                    }
                 }
             }
         }
 
-        private void MakeIconTplsTransparent()
+        private void makeIconTplsTransparent()
         {
             foreach (string thisTpl in lbxIconTpls.Items)
             {
                 if (thisTpl.EndsWith("(Transparent)"))
                 {
-                    string Tpl = GetCurIconPath() + "timg\\" + thisTpl.Remove(thisTpl.IndexOf('(', 0) - 1);
-                    byte[] TplArray = Wii.Tools.LoadFileToByteArray(Tpl);
-                    int Width = Wii.TPL.GetTextureWidth(TplArray);
-                    int Height = Wii.TPL.GetTextureHeight(TplArray);
+                    if (string.IsNullOrEmpty(replacedIcon))
+                    {
+                        for (int i = 0; i < iconBin.NumOfNodes; i++)
+                        {
+                            if (thisTpl.Remove(thisTpl.IndexOf('(', 0) - 3).ToLower() == iconBin.StringTable[i].ToLower())
+                            {
+                                TPL tmpTpl = TPL.Load(iconBin.Data[i]);
+                                Size tSize = tmpTpl.GetTextureSize(0);
 
-                    Image Img = new Bitmap(Width, Height);
-                    Wii.TPL.ConvertToTPL(Img, Tpl, 5);
+                                Image tImg = new Bitmap(tSize.Width, tSize.Height);
+                                tmpTpl.RemoveTexture(0);
+                                tmpTpl.AddTexture(tImg, TPL_Format.IA4);
+
+                                iconBin.Data[i] = tmpTpl.ToByteArray();
+                            }
+                        }
+                    }
+                    else
+                    {
+                        for (int i = 0; i < newIconBin.NumOfNodes; i++)
+                        {
+                            if (thisTpl.Remove(thisTpl.IndexOf('(', 0) - 3).ToLower() == newIconBin.StringTable[i].ToLower())
+                            {
+                                TPL tmpTpl = TPL.Load(newIconBin.Data[i]);
+                                Size tSize = tmpTpl.GetTextureSize(0);
+
+                                Image tImg = new Bitmap(tSize.Width, tSize.Height);
+                                tmpTpl.RemoveTexture(0);
+                                tmpTpl.AddTexture(tImg, TPL_Format.IA4);
+
+                                newIconBin.Data[i] = tmpTpl.ToByteArray();
+                            }
+                        }
+                    }
                 }
             }
         }
 
-        private void AddTpl(ListBox lbx)
+        private void addTpl(ListBox lbx)
         {
-            AddTpl(lbx, null);
+            addTpl(lbx, null);
         }
 
-        private void AddTpl(ListBox lbx, string inputFile)
+        private void addTpl(ListBox lbx, string inputFile)
         {
             try
             {
+                int switchVal = lbx == lbxBannerTpls ? cmbFormatBanner.SelectedIndex : cmbFormatIcon.SelectedIndex;
+                if (switchVal > 6)
+                    throw new Exception("This format is not supported, you must choose a different one!");
+
                 if (string.IsNullOrEmpty(inputFile))
                 {
                     OpenFileDialog ofd = new OpenFileDialog();
@@ -1022,49 +781,127 @@ namespace CustomizeMii
                     ofd.FilterIndex = 6;
 
                     if (ofd.ShowDialog() == DialogResult.OK)
-                    {
                         inputFile = ofd.FileName;
-                    }
                 }
 
                 if (!string.IsNullOrEmpty(inputFile))
                 {
-                    for (int i = 0; i < lbx.Items.Count; i++)
-                        if (lbx.Items[i].ToString().ToLower() == Path.GetFileNameWithoutExtension(inputFile).ToLower() + ".tpl")
-                            throw new Exception("This TPL already exists, use the Replace button");
+                    string tplName = Path.GetFileNameWithoutExtension(inputFile) + ".tpl";
 
-                    string CurPath;
-                    if (lbx == lbxBannerTpls) CurPath = GetCurBannerPath();
-                    else CurPath = GetCurIconPath();
+                    if (lbx == lbxBannerTpls)
+                    {
+                        if (string.IsNullOrEmpty(replacedBanner))
+                        {
+                            for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                                if (bannerBin.StringTable[i].ToLower() == tplName.ToLower())
+                                { errorBox("This TPL already exists, use the Replace button"); return; }
+                        }
+                        else
+                        {
+                            for (int i = 0; i < newBannerBin.NumOfNodes; i++)
+                                if (newBannerBin.StringTable[i].ToLower() == tplName.ToLower())
+                                { errorBox("This TPL already exists, use the Replace button"); return; }
+                        }
+                    }
+                    else
+                    {
+                        if (string.IsNullOrEmpty(replacedIcon))
+                        {
+                            for (int i = 0; i < iconBin.NumOfNodes; i++)
+                                if (iconBin.StringTable[i].ToLower() == tplName.ToLower())
+                                { errorBox("This TPL already exists, use the Replace button"); return; }
+                        }
+                        else
+                        {
+                            for (int i = 0; i < newIconBin.NumOfNodes; i++)
+                                if (newIconBin.StringTable[i].ToLower() == tplName.ToLower())
+                                { errorBox("This TPL already exists, use the Replace button"); return; }
+                        }
+                    }
 
-                    string[] brlytTpls = Wii.Brlyt.GetBrlytTpls(CurPath + string.Format("blyt\\{0}.brlyt", lbx == lbxBannerTpls ? "banner" : "icon"),
-                        CurPath + string.Format("anim\\{0}.brlan", lbx == lbxBannerTpls ? (File.Exists(CurPath + "anim\\banner.brlan")) ? "banner" : "banner_loop" : "icon"));
-                    string TplName = Path.GetFileNameWithoutExtension(inputFile) + ".tpl";
-                    int TplFormat = 6;
+                    string[] requiredTpls = new string[0];
+
+                    if (lbx == lbxBannerTpls)
+                    {
+                        if (string.IsNullOrEmpty(replacedBanner))
+                        {
+                            for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                            {
+                                if (bannerBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                                { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlyt.GetBrlytTpls(bannerBin.Data[i])); }
+                                else if (bannerBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                                { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlan.GetBrlanTpls(bannerBin.Data[i])); }
+                            }
+                        }
+                        else
+                        {
+                            for (int i = 0; i < newBannerBin.NumOfNodes; i++)
+                            {
+                                if (newBannerBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                                { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlyt.GetBrlytTpls(newBannerBin.Data[i])); }
+                                else if (newBannerBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                                { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlan.GetBrlanTpls(newBannerBin.Data[i])); }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        if (string.IsNullOrEmpty(replacedIcon))
+                        {
+                            for (int i = 0; i < iconBin.NumOfNodes; i++)
+                            {
+                                if (iconBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                                { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlyt.GetBrlytTpls(iconBin.Data[i])); }
+                                else if (iconBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                                { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlan.GetBrlanTpls(iconBin.Data[i])); }
+                            }
+                        }
+                        else
+                        {
+                            for (int i = 0; i < newIconBin.NumOfNodes; i++)
+                            {
+                                if (newIconBin.StringTable[i].ToLower().EndsWith(".brlyt"))
+                                { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlyt.GetBrlytTpls(newIconBin.Data[i])); }
+                                else if (newIconBin.StringTable[i].ToLower().EndsWith(".brlan"))
+                                { requiredTpls = Shared.MergeStringArrays(requiredTpls, Brlan.GetBrlanTpls(newIconBin.Data[i])); }
+                            }
+                        }
+                    }
+
+                    if (!Array.Exists(requiredTpls, thisTpl => thisTpl.ToLower() == tplName.ToLower()))
+                    {
+                        if (MessageBox.Show(
+                            string.Format("{0} is not required by your {1}.brlyt and thus only wastes memory!\n" +
+                            "Do you still want to add it?", tplName, lbx == lbxBannerTpls ? "banner" : "icon"),
+                            "TPL not required", MessageBoxButtons.YesNo, MessageBoxIcon.Information) ==
+                            DialogResult.No)
+                            return;
+                    }
+
+                    int tplFormat = 6;
 
-                    int switchVal = lbx == lbxBannerTpls ? cmbFormatBanner.SelectedIndex : cmbFormatIcon.SelectedIndex;
                     switch (switchVal)
                     {
                         case 6: //I4
-                            TplFormat = 0;
+                            tplFormat = 0;
                             break;
                         case 5: //I8
-                            TplFormat = 1;
+                            tplFormat = 1;
                             break;
                         case 4: //IA4
-                            TplFormat = 2;
+                            tplFormat = 2;
                             break;
                         case 3: //IA8
-                            TplFormat = 3;
+                            tplFormat = 3;
                             break;
                         case 0:
-                            TplFormat = 6;
+                            tplFormat = 6;
                             break;
                         case 1:
-                            TplFormat = 4;
+                            tplFormat = 4;
                             break;
                         case 2:
-                            TplFormat = 5;
+                            tplFormat = 5;
                             break;
                         default:
                             if (!inputFile.ToLower().EndsWith(".tpl"))
@@ -1072,39 +909,40 @@ namespace CustomizeMii
                             break;
                     }
 
-                    if (!Wii.Tools.StringExistsInStringArray(TplName, brlytTpls))
-                    {
-                        if (MessageBox.Show(string.Format("{0} is not required by your {1}.brlyt and thus only wastes memory!\nDo you still want to add it?", TplName, lbx == lbxBannerTpls ? "banner" : "icon"), "TPL not required", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No)
-                            return;
-                    }
-
+                    byte[] newTpl;
                     if (inputFile.ToLower().EndsWith(".tpl"))
+                        newTpl = File.ReadAllBytes(inputFile);
+                    else
+                        newTpl = TPL.FromImage(inputFile, (TPL_Format)tplFormat).ToByteArray();
+
+                    if (lbx == lbxBannerTpls)
                     {
-                        File.Copy(inputFile, CurPath + "timg\\" + TplName, true);
-                        lbx.Items.Add(TplName);
+                        if (string.IsNullOrEmpty(replacedBanner))
+                        { bannerBin.AddFile("/arc/timg/" + tplName, newTpl); }
+                        else
+                        { newBannerBin.AddFile("/arc/timg/" + tplName, newTpl); }
                     }
                     else
                     {
-                        using (Image img = Image.FromFile(inputFile))
-                        {
-                            Wii.TPL.ConvertToTPL(img, CurPath + "timg\\" + TplName, TplFormat);
-                            lbx.Items.Add(TplName + string.Format(" ({0} x {1})", img.Width, img.Height));
-                        }
+                        if (string.IsNullOrEmpty(replacedIcon))
+                        { iconBin.AddFile("/arc/timg/" + tplName, newTpl); }
+                        else
+                        { newIconBin.AddFile("/arc/timg/" + tplName, newTpl); }
                     }
+
+                    addTpls();
                 }
             }
             catch (Exception ex) { throw ex; }
         }
 
-        private void LoadChannel()
+        private void loadChannel()
         {
-            LoadChannel(null);
+            loadChannel(null);
         }
 
-        private void LoadChannel(string inputFile)
+        private void loadChannel(string inputFile)
         {
-            if (Mono) CommonKeyCheck();
-
             if (pbProgress.Value == 100)
             {
                 if (string.IsNullOrEmpty(inputFile))
@@ -1134,12 +972,12 @@ namespace CustomizeMii
             }
         }
 
-        private void ReplacePart()
+        private void replacePart()
         {
-            ReplacePart(null);
+            replacePart(null);
         }
 
-        private void ReplacePart(string inputFile)
+        private void replacePart(string inputFile)
         {
             if (!string.IsNullOrEmpty(tbSourceWad.Text))
             {
@@ -1159,8 +997,6 @@ namespace CustomizeMii
                                 {
                                     if (ofd.FileName != tbSourceWad.Text)
                                     {
-                                        SoundReplace = ofd.FileName;
-                                        SetText(tbReplace, SoundReplace);
                                         BackgroundWorker bwSoundReplace = new BackgroundWorker();
                                         bwSoundReplace.DoWork += new DoWorkEventHandler(bwSoundReplace_DoWork);
                                         bwSoundReplace.ProgressChanged += new ProgressChangedEventHandler(bwSoundReplace_ProgressChanged);
@@ -1174,8 +1010,6 @@ namespace CustomizeMii
                             {
                                 if (inputFile != tbSourceWad.Text)
                                 {
-                                    SoundReplace = inputFile;
-                                    SetText(tbReplace, SoundReplace);
                                     BackgroundWorker bwSoundReplace = new BackgroundWorker();
                                     bwSoundReplace.DoWork += new DoWorkEventHandler(bwSoundReplace_DoWork);
                                     bwSoundReplace.ProgressChanged += new ProgressChangedEventHandler(bwSoundReplace_ProgressChanged);
@@ -1184,12 +1018,15 @@ namespace CustomizeMii
                                     bwSoundReplace.RunWorkerAsync(inputFile);
                                 }
                             }
+
+                            tbSound.Text = string.Empty;
+                            btnBrowseSound.Text = "Browse...";
                         }
                         catch (Exception ex)
                         {
-                            SoundReplace = string.Empty;
-                            SetText(tbReplace, SoundReplace);
-                            ErrorBox(ex.Message);
+                            replacedSound = string.Empty;
+                            setControlText(tbReplace, string.Empty);
+                            errorBox(ex.Message);
                         }
                     }
                     else if (cmbReplace.SelectedIndex == 1) //icon
@@ -1206,8 +1043,6 @@ namespace CustomizeMii
                                 {
                                     if (ofd.FileName != tbSourceWad.Text)
                                     {
-                                        IconReplace = ofd.FileName;
-                                        SetText(tbReplace, IconReplace);
                                         BackgroundWorker bwIconReplace = new BackgroundWorker();
                                         bwIconReplace.DoWork += new DoWorkEventHandler(bwIconReplace_DoWork);
                                         bwIconReplace.ProgressChanged += new ProgressChangedEventHandler(bwIconReplace_ProgressChanged);
@@ -1221,8 +1056,6 @@ namespace CustomizeMii
                             {
                                 if (inputFile != tbSourceWad.Text)
                                 {
-                                    IconReplace = inputFile;
-                                    SetText(tbReplace, IconReplace);
                                     BackgroundWorker bwIconReplace = new BackgroundWorker();
                                     bwIconReplace.DoWork += new DoWorkEventHandler(bwIconReplace_DoWork);
                                     bwIconReplace.ProgressChanged += new ProgressChangedEventHandler(bwIconReplace_ProgressChanged);
@@ -1234,9 +1067,9 @@ namespace CustomizeMii
                         }
                         catch (Exception ex)
                         {
-                            IconReplace = string.Empty;
-                            SetText(tbReplace, IconReplace);
-                            ErrorBox(ex.Message);
+                            replacedIcon = string.Empty;
+                            setControlText(tbReplace, string.Empty);
+                            errorBox(ex.Message);
                         }
                     }
                     else //banner
@@ -1253,8 +1086,6 @@ namespace CustomizeMii
                                 {
                                     if (ofd.FileName != tbSourceWad.Text)
                                     {
-                                        BannerReplace = ofd.FileName;
-                                        SetText(tbReplace, BannerReplace);
                                         BackgroundWorker bwBannerReplace = new BackgroundWorker();
                                         bwBannerReplace.DoWork += new DoWorkEventHandler(bwBannerReplace_DoWork);
                                         bwBannerReplace.ProgressChanged += new ProgressChangedEventHandler(bwBannerReplace_ProgressChanged);
@@ -1268,8 +1099,6 @@ namespace CustomizeMii
                             {
                                 if (inputFile != tbSourceWad.Text)
                                 {
-                                    BannerReplace = inputFile;
-                                    SetText(tbReplace, BannerReplace);
                                     BackgroundWorker bwBannerReplace = new BackgroundWorker();
                                     bwBannerReplace.DoWork += new DoWorkEventHandler(bwBannerReplace_DoWork);
                                     bwBannerReplace.ProgressChanged += new ProgressChangedEventHandler(bwBannerReplace_ProgressChanged);
@@ -1281,16 +1110,16 @@ namespace CustomizeMii
                         }
                         catch (Exception ex)
                         {
-                            BannerReplace = string.Empty;
-                            SetText(tbReplace, BannerReplace);
-                            ErrorBox(ex.Message);
+                            replacedBanner = string.Empty;
+                            setControlText(tbReplace, string.Empty);
+                            errorBox(ex.Message);
                         }
                     }
                 }
             }
         }
 
-        private void MultiReplace(bool banner)
+        private void multiReplace(bool banner)
         {
             FolderBrowserDialog fbd = new FolderBrowserDialog();
             fbd.Description = "Please select the folder where the images are in.\nThe images must have the same filename as the TPLs!";
@@ -1298,39 +1127,137 @@ namespace CustomizeMii
             if (fbd.ShowDialog() == DialogResult.OK)
             {
                 string imageDir = fbd.SelectedPath;
-                string tplDir = ((banner) ? GetCurBannerPath() : GetCurIconPath()) + "timg\\";
-                string[] tpls = Directory.GetFiles(tplDir, "*.tpl");
 
+                List<string> tpls = new List<string>();
                 List<string> replacedTpls = new List<string>();
+
+                if (banner)
+                {
+                    if (string.IsNullOrEmpty(replacedBanner))
+                    {
+                        for (int i = 0; i < bannerBin.NumOfNodes; i++)
+                            if (bannerBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                                tpls.Add(bannerBin.StringTable[i]);
+                    }
+                    else
+                    {
+                        for (int i = 0; i < newBannerBin.NumOfNodes; i++)
+                            if (newBannerBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                                tpls.Add(newBannerBin.StringTable[i]);
+                    }
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(replacedIcon))
+                    {
+                        for (int i = 0; i < iconBin.NumOfNodes; i++)
+                            if (iconBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                                tpls.Add(iconBin.StringTable[i]);
+                    }
+                    else
+                    {
+                        for (int i = 0; i < newIconBin.NumOfNodes; i++)
+                            if (newIconBin.StringTable[i].ToLower().EndsWith(".tpl"))
+                                tpls.Add(newIconBin.StringTable[i]);
+                    }
+                }
+
                 foreach (string thisTpl in tpls)
                 {
                     string image = string.Empty;
 
-                    if (File.Exists(imageDir + "\\" + Path.GetFileNameWithoutExtension(thisTpl) + ".png"))
-                        image = imageDir + "\\" + Path.GetFileNameWithoutExtension(thisTpl) + ".png";
-                    else if (File.Exists(imageDir + "\\" + Path.GetFileNameWithoutExtension(thisTpl) + ".jpg"))
-                        image = imageDir + "\\" + Path.GetFileNameWithoutExtension(thisTpl) + ".jpg";
-                    else if (File.Exists(imageDir + "\\" + Path.GetFileNameWithoutExtension(thisTpl) + ".gif"))
-                        image = imageDir + "\\" + Path.GetFileNameWithoutExtension(thisTpl) + ".gif";
-                    else if (File.Exists(imageDir + "\\" + Path.GetFileNameWithoutExtension(thisTpl) + ".bmp"))
-                        image = imageDir + "\\" + Path.GetFileNameWithoutExtension(thisTpl) + ".bmp";
+                    string path = imageDir + Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(thisTpl);
+
+                    if (File.Exists(path + ".png"))
+                        image = path + ".png";
+                    else if (File.Exists(path + ".jpg"))
+                        image = path + ".jpg";
+                    else if (File.Exists(path + ".gif"))
+                        image = path + ".gif";
+                    else if (File.Exists(path + ".bmp"))
+                        image = path + ".bmp";
                     else continue;
 
                     try
                     {
-                        Image img = Image.FromFile(image);
-                        byte[] temp = File.ReadAllBytes(thisTpl);
-                        int width = Wii.TPL.GetTextureWidth(temp);
-                        int height = Wii.TPL.GetTextureHeight(temp);
-                        int format = Wii.TPL.GetTextureFormat(temp);
+                        if (banner)
+                        {
+                            if (string.IsNullOrEmpty(replacedBanner))
+                            {
+                                TPL tmpTpl = TPL.Load(bannerBin.Data[bannerBin.GetNodeIndex(thisTpl)]);
+                                Image img = Image.FromFile(image);
 
-                        if (img.Width != width || img.Height != height) 
-                            img = ResizeImage(img, width, height);
+                                TPL_Format tplFormat = tmpTpl.GetTextureFormat(0);
+                                Size tplSize = tmpTpl.GetTextureSize(0);
 
-                        File.Delete(thisTpl);
-                        Wii.TPL.ConvertToTPL(img, thisTpl, format);
+                                if (tplSize.Width != img.Width ||
+                                    tplSize.Height != img.Height)
+                                    img = resizeImage(img, tplSize.Width, tplSize.Height);
 
-                        replacedTpls.Add(Path.GetFileName(thisTpl));
+                                tmpTpl.RemoveTexture(0);
+                                tmpTpl.AddTexture(img, tplFormat);
+
+                                bannerBin.ReplaceFile(bannerBin.GetNodeIndex(thisTpl), tmpTpl.ToByteArray());
+                                replacedTpls.Add(thisTpl);
+                            }
+                            else
+                            {
+                                TPL tmpTpl = TPL.Load(newBannerBin.Data[newBannerBin.GetNodeIndex(thisTpl)]);
+                                Image img = Image.FromFile(image);
+
+                                TPL_Format tplFormat = tmpTpl.GetTextureFormat(0);
+                                Size tplSize = tmpTpl.GetTextureSize(0);
+
+                                if (tplSize.Width != img.Width ||
+                                    tplSize.Height != img.Height)
+                                    img = resizeImage(img, tplSize.Width, tplSize.Height);
+
+                                tmpTpl.RemoveTexture(0);
+                                tmpTpl.AddTexture(img, tplFormat);
+
+                                newBannerBin.ReplaceFile(newBannerBin.GetNodeIndex(thisTpl), tmpTpl.ToByteArray());
+                                replacedTpls.Add(thisTpl);
+                            }
+                        }
+                        else
+                        {
+                            if (string.IsNullOrEmpty(replacedIcon))
+                            {
+                                TPL tmpTpl = TPL.Load(iconBin.Data[iconBin.GetNodeIndex(thisTpl)]);
+                                Image img = Image.FromFile(image);
+
+                                TPL_Format tplFormat = tmpTpl.GetTextureFormat(0);
+                                Size tplSize = tmpTpl.GetTextureSize(0);
+
+                                if (tplSize.Width != img.Width ||
+                                    tplSize.Height != img.Height)
+                                    img = resizeImage(img, tplSize.Width, tplSize.Height);
+
+                                tmpTpl.RemoveTexture(0);
+                                tmpTpl.AddTexture(img, tplFormat);
+
+                                iconBin.ReplaceFile(iconBin.GetNodeIndex(thisTpl), tmpTpl.ToByteArray());
+                                replacedTpls.Add(thisTpl);
+                            }
+                            else
+                            {
+                                TPL tmpTpl = TPL.Load(newIconBin.Data[newIconBin.GetNodeIndex(thisTpl)]);
+                                Image img = Image.FromFile(image);
+
+                                TPL_Format tplFormat = tmpTpl.GetTextureFormat(0);
+                                Size tplSize = tmpTpl.GetTextureSize(0);
+
+                                if (tplSize.Width != img.Width ||
+                                    tplSize.Height != img.Height)
+                                    img = resizeImage(img, tplSize.Width, tplSize.Height);
+
+                                tmpTpl.RemoveTexture(0);
+                                tmpTpl.AddTexture(img, tplFormat);
+
+                                newIconBin.ReplaceFile(newIconBin.GetNodeIndex(thisTpl), tmpTpl.ToByteArray());
+                                replacedTpls.Add(thisTpl);
+                            }
+                        }
                     }
                     catch { }
                 }
@@ -1338,9 +1265,9 @@ namespace CustomizeMii
                 if (replacedTpls.Count > 0)
                 {
                     string replaced = string.Join("\n", replacedTpls.ToArray());
-                    InfoBox(string.Format("The following TPLs were successfully replaced:\n\n{0}", replaced));
+                    infoBox(string.Format("The following TPLs were successfully replaced:\n\n{0}", replaced));
                 }
-                else ErrorBox("No TPLs were replaced, did you name the images right?");
+                else errorBox("No TPLs were replaced, did you name the images right?");
             }
         }
     }
diff --git a/CustomizeMii/CustomizeMii_Structs.cs b/CustomizeMii/CustomizeMii_Structs.cs
index 13b05cb..b22f249 100644
--- a/CustomizeMii/CustomizeMii_Structs.cs
+++ b/CustomizeMii/CustomizeMii_Structs.cs
@@ -20,23 +20,18 @@ namespace CustomizeMii
     public struct TplImage
     {
         public System.Drawing.Image tplImage;
+        public System.Drawing.Image checkerBoard;
         public string tplFormat;
+        public string fileName;
     }
 
     public struct TransmitInfo
     {
-        public bool usedCompression;
         public double compressionRatio;
         public double transmittedLength;
         public int timeElapsed;
     }
 
-    public enum TransmitProtocol : int
-    {
-        JODI = 0,
-        HAXX = 1
-    }
-
     public struct BnsConversionInfo
     {
         public enum LoopType
@@ -46,10 +41,10 @@ namespace CustomizeMii
             Manual
         }
 
-        public LoopType Loop;
-        public int LoopStartSample;
-        public string AudioFile;
-        public bool StereoToMono;
+        public LoopType loopType;
+        public int loopStartSample;
+        public string audioFile;
+        public bool stereoToMono;
     }
 
     public struct WadCreationInfo
@@ -57,23 +52,26 @@ namespace CustomizeMii
         public enum NandLoader : int
         {
             comex = 0,
-            Waninkoko = 1
+            Waninkoko = 1,
         }
 
         public string titleId;
         public string[] titles;
         public string allLangTitle;
-        public int requiredIos;
+        public int startupIos;
         public string sound;
         public string dol;
         public string outFile;
         public NandLoader nandLoader;
         public bool sendToWii;
-        public TransmitProtocol transmitProtocol;
+        public libWiiSharp.Protocol transmitProtocol;
         public string transmitIp;
         public int transmitIos;
         public bool saveAfterTransmit;
         public bool success;
+        public bool sendWadReady;
+        public byte[] wadFile;
+        public bool lz77;
     }
 
     public struct Progress
diff --git a/CustomizeMii/Program.cs b/CustomizeMii/Program.cs
index ab8ed21..e6c89c8 100644
--- a/CustomizeMii/Program.cs
+++ b/CustomizeMii/Program.cs
@@ -24,33 +24,21 @@ namespace CustomizeMii
 {
     static class Program
     {
-        static Mutex mtx;
-
         /// <summary>
         /// Der Haupteinstiegspunkt für die Anwendung.
         /// </summary>
         [STAThread]
-        static void Main()
+        static void Main(string[] args)
         {
-            CleanupRemains();
+            if (!File.Exists(Application.StartupPath + Path.DirectorySeparatorChar + "libWiiSharp.dll"))
+            {
+                MessageBox.Show("libWiiSharp.dll wasn't found!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                Environment.Exit(-1);
+            }
 
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new CustomizeMii_Main());
-        }
-
-        static void CleanupRemains()
-        {
-            bool firstInstance = false;
-            mtx = new System.Threading.Mutex(false, "CustomizeMii", out firstInstance);
-
-            if (firstInstance)
-            {
-                if (Directory.Exists(Path.GetTempPath() + "CustomizeMii_Temp"))
-                    Directory.Delete(Path.GetTempPath() + "CustomizeMii_Temp", true);
-                if (Directory.Exists(Path.GetTempPath() + "ForwardMii_Temp"))
-                    Directory.Delete(Path.GetTempPath() + "ForwardMii_Temp", true);
-            }
+            Application.Run(new CustomizeMii_Main(args));
         }
     }
 }
diff --git a/CustomizeMii/Properties/AssemblyInfo.cs b/CustomizeMii/Properties/AssemblyInfo.cs
index 7e06016..bb20754 100644
--- a/CustomizeMii/Properties/AssemblyInfo.cs
+++ b/CustomizeMii/Properties/AssemblyInfo.cs
@@ -50,6 +50,6 @@ using System.Resources;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.1.0")]
-[assembly: AssemblyFileVersion("2.3.1.0")]
+[assembly: AssemblyVersion("3.0.0.0")]
+[assembly: AssemblyFileVersion("3.0.0.0")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/CustomizeMii/Properties/Resources.Designer.cs b/CustomizeMii/Properties/Resources.Designer.cs
index 2e3a4cb..3137e88 100644
--- a/CustomizeMii/Properties/Resources.Designer.cs
+++ b/CustomizeMii/Properties/Resources.Designer.cs
@@ -1,21 +1,4 @@
-/* This file is part of CustomizeMii
- * Copyright (C) 2009 Leathl
- * 
- * CustomizeMii is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * CustomizeMii is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     Dieser Code wurde von einem Tool generiert.
 //     Laufzeitversion:2.0.50727.4927
@@ -91,6 +74,13 @@ namespace CustomizeMii.Properties {
             }
         }
         
+        internal static byte[] comex {
+            get {
+                object obj = ResourceManager.GetObject("comex", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         internal static System.Drawing.Icon CustomizeMii {
             get {
                 object obj = ResourceManager.GetObject("CustomizeMii", resourceCulture);
@@ -113,5 +103,12 @@ namespace CustomizeMii.Properties {
                 return ResourceManager.GetString("Instructions", resourceCulture);
             }
         }
+        
+        internal static byte[] Waninkoko {
+            get {
+                object obj = ResourceManager.GetObject("Waninkoko", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
     }
 }
diff --git a/CustomizeMii/Properties/Resources.resx b/CustomizeMii/Properties/Resources.resx
index 4063328..8ee3630 100644
--- a/CustomizeMii/Properties/Resources.resx
+++ b/CustomizeMii/Properties/Resources.resx
@@ -118,16 +118,22 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="CustomizeMii" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CustomizeMii.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Instructions" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\instructions.rtf;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
   <data name="btnCreate" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\btnCreate.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="btnSend" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\btnSend.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="comex" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\comex.app;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="CustomizeMii" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CustomizeMii.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Instructions" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\instructions.rtf;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
+  </data>
+  <data name="Waninkoko" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\waninkoko.app;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/CustomizeMii/Readme.txt b/CustomizeMii/Readme.txt
index c7bc232..767c6d0 100644
--- a/CustomizeMii/Readme.txt
+++ b/CustomizeMii/Readme.txt
@@ -2,13 +2,24 @@ CustomizeMii is a custom channel creator for the Wii.
 The .NET Framework 2.0 is required to run this application!
 
 For any further information, see: http://customizemii.googlecode.com
-Please use the Issue Tracker there to report any occuring bugs.
+Please use the issue tracker there to report any occuring bugs.
 
-Thanks to icefire / Xuzz for the basic idea of this Application!
+Thanks to icefire / Xuzz for the basic idea of this application!
 
 -----------------------------------------------------------------------------------------
 Changelog:
 
+Version 3.0
+	- Switched backend to libWiiSharp (http://libwiisharp.googlecode.com)
+	- Speed improvements through using RAM instead of temp files on HDD
+	- No separate Mono version anymore, the normal version works with Mono (even compiling forwarders!)
+	- Fixed complex forwarder loading screen to be fullscreen (thanks wilsoff / tantric!)
+	- Fixed bug where startup IOS was set to 0 when sending channel to Wii
+	- Doesn't require common-key.bin anymore
+	- Added checkerboard for transparent areas in images (preview window)
+	- Added ability to change a TPLs format (preview window)
+	- Added ability to rename and resize TPLs (right click on listbox)
+
 Version 2.31
 	- Fixed sending to Wii
 
@@ -105,6 +116,7 @@ Andre Perrot for gbalzss
 comex and Waninkoko for both their NAND Loader
 djdynamite123 for the forwarder base files
 The USB Loader GX Team for their forwarder source
+wilsoff for helping me debugging 3.0
 -----------------------------------------------------------------------------------------
 
 -----------------------------------------------------------------------------------------
diff --git a/CustomizeMii/Wave.cs b/CustomizeMii/Wave.cs
deleted file mode 100644
index f940085..0000000
--- a/CustomizeMii/Wave.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-/* This file is part of CustomizeMii
- * Copyright (C) 2009 Leathl
- * 
- * CustomizeMii is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * CustomizeMii is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-using System;
-using System.IO;
-
-namespace WaveFile
-{
-    /// <summary>
-    /// A class for RIFF Wave files
-    /// </summary>
-    public class Wave
-    {
-        //Private Variables
-        private int fmtOffset;
-        private int dataOffset;
-        private int smplOffset;
-        private byte[] waveFile;
-
-
-
-        //Public Variables
-        /// <summary>
-        /// The Samplerate of the Wave file
-        /// </summary>
-        public int SampleRate { get { return GetSampleRate(); } }
-        /// <summary>
-        /// The Bitdepth of the Wave file
-        /// </summary>
-        public int BitDepth { get { return GetBitDepth(); } }
-        /// <summary>
-        /// The number of channels of the Wave file
-        /// </summary>
-        public int ChannelCount { get { return GetChannelCount(); } }
-        /// <summary>
-        /// The format of the Wave file's data. 1 = PCM
-        /// </summary>
-        public int DataFormat { get { return GetDataFormat(); } }
-        /// <summary>
-        /// The number of Loops in the Wave file
-        /// </summary>
-        public int LoopCount { get { return GetLoopCount(); } }
-        /// <summary>
-        /// The start sample of the first Loop (if exist)
-        /// </summary>
-        public int LoopStart { get { return GetLoopStart(); } }
-        /// <summary>
-        /// The total number of Frames
-        /// </summary>
-        public int SampleCount { get { return GetFrameCount(); } }
-
-
-
-        //Public Functions
-
-        public Wave(string waveFile)
-        {
-            using (FileStream fs = new FileStream(waveFile, FileMode.Open))
-            {
-                byte[] temp = new byte[fs.Length];
-                fs.Read(temp, 0, temp.Length);
-
-                this.waveFile = temp;
-            }
-
-            if (!CheckWave()) throw new Exception("This is not a supported PCM Wave File!");
-
-            if (!GetFmtOffset()) throw new Exception("The format section couldn't be found!");
-            if (!GetDataOffset()) throw new Exception("The data section couldn't be found!");
-            GetSmplOffset();
-        }
-
-        public Wave(byte[] waveFile)
-        {
-            this.waveFile = waveFile;
-
-            if (!CheckWave()) throw new Exception("This is not a supported PCM Wave File!");
-
-            if (!GetFmtOffset()) throw new Exception("The format section couldn't be found!");
-            if (!GetDataOffset()) throw new Exception("The data section couldn't be found!");
-            GetSmplOffset();
-        }
-
-        /// <summary>
-        /// Returns the Wave file as a Byte Array
-        /// </summary>
-        /// <returns></returns>
-        public byte[] ToByteArray()
-        {
-            return waveFile;
-        }
-
-        /// <summary>
-        /// Returns the Wave file as a Memory Stream
-        /// </summary>
-        /// <returns></returns>
-        public MemoryStream ToMemoryStream()
-        {
-            return new MemoryStream(waveFile);
-        }
-
-        /// <summary>
-        /// Returns only the audio data of the Wave file (No header or anything else)
-        /// </summary>
-        /// <returns></returns>
-        public byte[] GetAllFrames()
-        {
-            int dataLength = GetDataLength();
-
-            MemoryStream ms = new MemoryStream();
-            ms.Write(waveFile, dataOffset, dataLength);
-
-            return ms.ToArray();
-        }
-
-        /// <summary>
-        /// Trims the start of the wave to the given sample
-        /// </summary>
-        /// <param name="newStartSample"></param>
-        /// <returns></returns>
-        public MemoryStream TrimStart(int newStartSample)
-        {
-            if (newStartSample > this.SampleCount) throw new Exception(string.Format("The loop start sample ({0}) is higher than the total number of samples ({1}) in this file!", newStartSample, this.SampleCount));
-
-            MemoryStream msOut = new MemoryStream();
-            msOut.Seek(0, SeekOrigin.Begin);
-
-            if (newStartSample == 0)
-            {
-                msOut.Write(waveFile, 0, waveFile.Length);
-                msOut.Seek(0, SeekOrigin.Begin);
-                return msOut;
-            }
-
-            msOut.Write(waveFile, 0, this.dataOffset + 8);
-            msOut.Write(waveFile, this.ChannelCount * 2 * newStartSample, waveFile.Length - (this.dataOffset + 8 + (this.ChannelCount * 2 * newStartSample)));
-
-            int cutted = (this.ChannelCount * 2 * newStartSample) - (this.dataOffset + 8);
-
-            byte[] newLength = BitConverter.GetBytes((UInt32)msOut.Position);
-            byte[] dataLength = BitConverter.GetBytes(BitConverter.ToInt32(waveFile, this.dataOffset + 4) - cutted);
-
-            msOut.Seek(4, SeekOrigin.Begin);
-            msOut.Write(newLength, 0, newLength.Length);
-            msOut.Seek(this.dataOffset + 4, SeekOrigin.Begin);
-            msOut.Write(dataLength, 0, dataLength.Length);
-
-            msOut.Seek(0, SeekOrigin.Begin);
-            return msOut;
-        }
-
-        /// <summary>
-        /// Closes the Wave file
-        /// </summary>
-        public void Close()
-        {
-            waveFile = null;
-        }
-
-
-
-        //Private Functions
-
-        private int GetFrameCount()
-        {
-            int dataLength = GetDataLength();
-
-            return (dataLength / (this.ChannelCount * 2));
-        }
-
-        private int GetLoopStart()
-        {
-            if (smplOffset == -1) return 0;
-
-            byte[] temp = new byte[4];
-
-            temp[0] = waveFile[smplOffset + 52];
-            temp[1] = waveFile[smplOffset + 53];
-            temp[2] = waveFile[smplOffset + 54];
-            temp[3] = waveFile[smplOffset + 55];
-
-            return BitConverter.ToInt32(temp, 0);
-        }
-
-        private int GetLoopCount()
-        {
-            if (smplOffset == -1) return 0;
-
-            byte[] temp = new byte[4];
-
-            temp[0] = waveFile[smplOffset + 36];
-            temp[1] = waveFile[smplOffset + 37];
-            temp[2] = waveFile[smplOffset + 38];
-            temp[3] = waveFile[smplOffset + 39];
-
-            return BitConverter.ToInt32(temp, 0);
-        }
-
-        private bool GetSmplOffset()
-        {
-            try
-            {
-                int length = (waveFile.Length > 5004 ? (waveFile.Length - 5000) : 0);
-                for (int i = waveFile.Length - 4; i > length; i--)
-                {
-                    if (waveFile[i] == 's' &&
-                        waveFile[i + 1] == 'm' &&
-                        waveFile[i + 2] == 'p' &&
-                        waveFile[i + 3] == 'l')
-                    {
-                        this.smplOffset = i;
-                        return true;
-                    }
-                }
-            }
-            catch { }
-
-            for (int i = 0; i < waveFile.Length - 4; i++)
-            {
-                if (waveFile[i] == 's' &&
-                    waveFile[i + 1] == 'm' &&
-                    waveFile[i + 2] == 'p' &&
-                    waveFile[i + 3] == 'l')
-                {
-                    this.smplOffset = i;
-                    return true;
-                }
-            }
-
-            this.smplOffset = -1;
-            return false;
-        }
-
-        private bool GetFmtOffset()
-        {
-            if (waveFile[12] == 'f' &&
-                waveFile[13] == 'm' &&
-                waveFile[14] == 't' &&
-                waveFile[15] == ' ')
-            {
-                this.fmtOffset = 12;
-                return true;
-            }
-
-            int length = (waveFile.Length > 5004 ? 5000 : waveFile.Length - 4);
-            for (int i = 0; i < length; i++)
-            {
-                if (waveFile[i] == 'f' &&
-                    waveFile[i + 1] == 'm' &&
-                    waveFile[i + 2] == 't' &&
-                    waveFile[i + 3] == ' ')
-                {
-                    this.fmtOffset = i;
-                    return true;
-                }
-            }
-
-            this.fmtOffset = -1;
-            return false;
-        }
-
-        private int GetDataLength()
-        {
-            byte[] temp = new byte[4];
-
-            temp[0] = waveFile[dataOffset + 4];
-            temp[1] = waveFile[dataOffset + 5];
-            temp[2] = waveFile[dataOffset + 6];
-            temp[3] = waveFile[dataOffset + 7];
-
-            return BitConverter.ToInt32(temp, 0);
-        }
-
-        private bool GetDataOffset()
-        {
-            if (waveFile[40] == 'd' &&
-                waveFile[41] == 'a' &&
-                waveFile[42] == 't' &&
-                waveFile[43] == 'a')
-            {
-                this.dataOffset = 40;
-                return true;
-            }
-
-            for (int i = 0; i < waveFile.Length - 4; i++)
-            {
-                if (waveFile[i] == 'd' &&
-                waveFile[i + 1] == 'a' &&
-                waveFile[i + 2] == 't' &&
-                waveFile[i + 3] == 'a')
-                {
-                    this.dataOffset = i;
-                    return true;
-                }
-            }
-
-            this.dataOffset = -1;
-            return false;
-        }
-
-        private int GetSampleRate()
-        {
-            byte[] temp = new byte[4];
-
-            temp[0] = waveFile[fmtOffset + 12];
-            temp[1] = waveFile[fmtOffset + 13];
-            temp[2] = waveFile[fmtOffset + 14];
-            temp[3] = waveFile[fmtOffset + 15];
-
-            return BitConverter.ToInt32(temp, 0);
-        }
-
-        private int GetBitDepth()
-        {
-            byte[] temp = new byte[2];
-
-            temp[0] = waveFile[fmtOffset + 22];
-            temp[1] = waveFile[fmtOffset + 23];
-
-            return BitConverter.ToInt16(temp, 0);
-        }
-
-        private int GetChannelCount()
-        {
-            byte[] temp = new byte[2];
-
-            temp[0] = waveFile[fmtOffset + 10];
-            temp[1] = waveFile[fmtOffset + 11];
-
-            return BitConverter.ToInt16(temp, 0);
-        }
-
-        private int GetDataFormat()
-        {
-            byte[] temp = new byte[2];
-
-            temp[0] = waveFile[fmtOffset + 8];
-            temp[1] = waveFile[fmtOffset + 9];
-
-            return BitConverter.ToInt16(temp, 0);
-        }
-
-        private bool CheckWave()
-        {
-            if (waveFile[0] != 'R' ||
-                waveFile[1] != 'I' ||
-                waveFile[2] != 'F' ||
-                waveFile[3] != 'F' ||
-
-                waveFile[8] != 'W' ||
-                waveFile[9] != 'A' ||
-                waveFile[10] != 'V' ||
-                waveFile[11] != 'E') return false;
-
-            return true;
-        }
-    }
-}
diff --git a/CustomizeMii/Wii.cs b/CustomizeMii/Wii.cs
deleted file mode 100644
index 729454d..0000000
--- a/CustomizeMii/Wii.cs
+++ /dev/null
@@ -1,6391 +0,0 @@
-/* This file is part of ShowMiiWads
- * Copyright (C) 2009 Leathl
- * 
- * ShowMiiWads is free software: you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as published
- * by the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ShowMiiWads is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-//Wii.py by Xuzz, SquidMan, megazig, Matt_P, Omega and The Lemon Man was the base for TPL conversion
-//Zetsubou by SquidMan was a reference for TPL conversion
-//gbalzss by Andre Perrot was the base for LZ77 (de-)compression
-//Thanks to the authors!
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Net;
-using System.Security.Cryptography;
-using System.Text;
-
-namespace Wii
-{
-    public class Tools
-    {
-        public static event EventHandler<ProgressChangedEventArgs> ProgressChanged;
-
-        public static void ChangeProgress(int ProgressPercent)
-        {
-            EventHandler<ProgressChangedEventArgs> progressChanged = ProgressChanged;
-            if (progressChanged != null)
-            {
-                progressChanged(new object(), new ProgressChangedEventArgs(ProgressPercent));
-            }
-        }
-
-        /// <summary>
-        /// Writes the small Byte Array into the big one at the given offset
-        /// </summary>
-        /// <param name="big"></param>
-        /// <param name="small"></param>
-        /// <param name="offset"></param>
-        /// <returns></returns>
-        public static byte[] InsertByteArray(byte[] big, byte[] small, int offset)
-        {
-            for (int i = 0; i < small.Length; i++)
-                big[offset + i] = small[i];
-            return big;
-        }
-
-        /// <summary>
-        /// Returns the current UTC Unix Timestamp as a Byte Array
-        /// </summary>
-        /// <returns></returns>
-        public static byte[] GetTimestamp()
-        {
-            DateTime dtNow = DateTime.UtcNow;
-            TimeSpan tsTimestamp = (dtNow - new DateTime(1970, 1, 1, 0, 0, 0));
-
-            int timestamp = (int)tsTimestamp.TotalSeconds;
-            ASCIIEncoding enc = new ASCIIEncoding();
-            byte[] timestampBytes = enc.GetBytes("CMiiUT" + timestamp.ToString());
-            return timestampBytes;
-        }
-
-        /// <summary>
-        /// Creates a new Byte Array out of the given one
-        /// from the given offset with the specified length
-        /// </summary>
-        /// <param name="array"></param>
-        /// <param name="offset"></param>
-        /// <param name="length"></param>
-        /// <returns></returns>
-        public static byte[] GetPartOfByteArray(byte[] array, int offset, int length)
-        {
-            byte[] ret = new byte[length];
-            for (int i = 0; i < length; i++)
-                ret[i] = array[offset + i];
-            return ret;
-        }
-
-        /// <summary>
-        /// Converts UInt16 Array into Byte Array
-        /// </summary>
-        /// <param name="array"></param>
-        /// <returns></returns>
-        public static byte[] UIntArrayToByteArray(UInt16[] array)
-        {
-            List<byte> results = new List<byte>();
-            foreach (UInt16 value in array)
-            {
-                byte[] converted = BitConverter.GetBytes(value);
-                results.AddRange(converted);
-            }
-            return results.ToArray();
-        }
-
-        /// <summary>
-        /// Converts UInt16 Array into Byte Array
-        /// </summary>
-        /// <param name="array"></param>
-        /// <returns></returns>
-        public static byte[] UIntArrayToByteArray(uint[] array)
-        {
-            List<byte> results = new List<byte>();
-            foreach (uint value in array)
-            {
-                byte[] converted = BitConverter.GetBytes(value);
-                results.AddRange(converted);
-            }
-            return results.ToArray();
-        }
-
-        /// <summary>
-        /// Converts Byte Array into UInt16 Array
-        /// </summary>
-        /// <param name="array"></param>
-        /// <returns></returns>
-        public static UInt32[] ByteArrayToUInt32Array(byte[] array)
-        {
-            UInt32[] converted = new UInt32[array.Length / 2];
-            int j = 0;
-            for (int i = 0; i < array.Length; i += 4)
-            {
-                converted[j] = BitConverter.ToUInt32(array, i);
-                j++;
-            }
-            return converted;
-        }
-
-        /// <summary>
-        /// Converts Byte Array into UInt16 Array
-        /// </summary>
-        /// <param name="array"></param>
-        /// <returns></returns>
-        public static UInt16[] ByteArrayToUInt16Array(byte[] array)
-        {
-            UInt16[] converted = new UInt16[array.Length / 2];
-            int j = 0;
-            for (int i = 0; i < array.Length; i += 2)
-            {
-                converted[j] = BitConverter.ToUInt16(array, i);
-                j++;
-            }
-            return converted;
-        }
-
-        /// <summary>
-        /// Returns the file length as a Byte Array
-        /// </summary>
-        /// <param name="filelength"></param>
-        /// <returns></returns>
-        public static byte[] FileLengthToByteArray(int filelength)
-        {
-            byte[] length = BitConverter.GetBytes(filelength);
-            Array.Reverse(length);
-            return length;
-        }
-
-        /// <summary>
-        /// Adds a padding to the next 64 bytes, if necessary
-        /// </summary>
-        /// <param name="size"></param>
-        /// <returns></returns>
-        public static int AddPadding(int value)
-        {
-            return AddPadding(value, 64);
-        }
-
-        /// <summary>
-        /// Adds a padding to the given value, if necessary
-        /// </summary>
-        /// <param name="value"></param>
-        /// <param name="padding"></param>
-        /// <returns></returns>
-        public static int AddPadding(int value, int padding)
-        {
-            if (value % padding != 0)
-            {
-                value = value + (padding - (value % padding));
-            }
-
-            return value;
-        }
-
-        /// <summary>
-        /// Converts a Hex-String to Int
-        /// </summary>
-        /// <param name="hexstring"></param>
-        /// <returns></returns>
-        public static int HexStringToInt(string hexstring)
-        {
-            try { return int.Parse(hexstring, System.Globalization.NumberStyles.HexNumber); }
-            catch { throw new Exception("An Error occured, maybe the Wad file is corrupt!"); }
-        }
-
-        /// <summary>
-        /// Converts a Hex-String to Long
-        /// </summary>
-        /// <param name="hexstring"></param>
-        /// <returns></returns>
-        public static long HexStringToLong(string hexstring)
-        {
-            try { return long.Parse(hexstring, System.Globalization.NumberStyles.HexNumber); }
-            catch { throw new Exception("An Error occured, maybe the Wad file is corrupt!"); }
-        }
-
-        /// <summary>
-        /// Writes a Byte Array to a file
-        /// </summary>
-        /// <param name="file"></param>
-        public static void SaveFileFromByteArray(byte[] file, string destination)
-        {
-            using (FileStream fs = new FileStream(destination, FileMode.Create))
-                fs.Write(file, 0, file.Length);
-        }
-
-        /// <summary>
-        /// Loads a file into a Byte Array
-        /// </summary>
-        /// <param name="sourcefile"></param>
-        /// <returns></returns>
-        public static byte[] LoadFileToByteArray(string sourcefile)
-        {
-            if (File.Exists(sourcefile))
-            {
-                using (FileStream fs = new FileStream(sourcefile, FileMode.Open))
-                {
-                    byte[] filearray = new byte[fs.Length];
-                    fs.Read(filearray, 0, filearray.Length);
-                    return filearray;
-                }
-            }
-            else throw new FileNotFoundException("File couldn't be found:\r\n" + sourcefile);
-        }
-
-        /// <summary>
-        /// Loads a file into a Byte Array
-        /// </summary>
-        /// <param name="sourcefile"></param>
-        /// <returns></returns>
-        public static byte[] LoadFileToByteArray(string sourcefile, int offset, int length)
-        {
-            if (File.Exists(sourcefile))
-            {
-                using (FileStream fs = new FileStream(sourcefile, FileMode.Open))
-                {
-                    if (fs.Length < length) length = (int)fs.Length;
-                    byte[] filearray = new byte[length];
-                    fs.Seek(offset, SeekOrigin.Begin);
-                    fs.Read(filearray, 0, length);
-                    return filearray;
-                }
-            }
-            else throw new FileNotFoundException("File couldn't be found:\r\n" + sourcefile);
-        }
-
-        /// <summary>
-        /// Checks the SHA1 of the Common-Key
-        /// </summary>
-        /// <param name="pathtocommonkey"></param>
-        /// <returns></returns>
-        public static bool CheckCommonKey(string pathtocommonkey)
-        {
-            byte[] sum = new byte[] { 0xEB, 0xEA, 0xE6, 0xD2, 0x76, 0x2D, 0x4D, 0x3E, 0xA1, 0x60, 0xA6, 0xD8, 0x32, 0x7F, 0xAC, 0x9A, 0x25, 0xF8, 0x06, 0x2B };
-            
-            FileInfo fi = new FileInfo(pathtocommonkey);
-            if (fi.Length != 16) return false;
-            else
-            {
-                byte[] ckey = LoadFileToByteArray(pathtocommonkey);
-
-                SHA1Managed sha1 = new SHA1Managed();
-                byte[] newsum = sha1.ComputeHash(ckey);
-
-                if (CompareByteArrays(sum, newsum) == true) return true;
-                else return false;
-            }
-        }
-
-        /// <summary>
-        /// Creates the Common Key
-        /// </summary>
-        /// <param name="fat">Must be "45e"</param>
-        /// <param name="destination">Destination Path</param>
-        public static void CreateCommonKey(string fat, string destinationpath)
-        {
-            //What an effort, lol
-            byte[] encryptedwater = new byte[] { 0x4d, 0x89, 0x21, 0x34, 0x62, 0x81, 0xe4, 0x02, 0x37, 0x36, 0xc4, 0xb4, 0xde, 0x40, 0x32, 0xab };
-            byte[] key = new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, byte.Parse(fat.Remove(2), System.Globalization.NumberStyles.HexNumber), byte.Parse(fat.Remove(0, 2) + "0", System.Globalization.NumberStyles.HexNumber) };
-            byte[] decryptedwater = new byte[10];
-
-            RijndaelManaged decryptkey = new RijndaelManaged();
-            decryptkey.Mode = CipherMode.CBC;
-            decryptkey.Padding = PaddingMode.None;
-            decryptkey.KeySize = 128;
-            decryptkey.BlockSize = 128;
-            decryptkey.Key = key;
-            Array.Reverse(key);
-            decryptkey.IV = key;
-
-            ICryptoTransform cryptor = decryptkey.CreateDecryptor();
-
-            using (MemoryStream memory = new MemoryStream(encryptedwater))
-            {
-                using (CryptoStream crypto = new CryptoStream(memory, cryptor, CryptoStreamMode.Read))
-                    crypto.Read(decryptedwater, 0, 10);
-            }
-
-            string water = BitConverter.ToString(decryptedwater).Replace("-", "").ToLower() + " ";
-
-            water = water.Insert(0, fat[2].ToString());
-            water = water.Insert(2, fat[2].ToString());
-            water = water.Insert(7, fat[2].ToString());
-            water = water.Insert(11, fat[2].ToString());
-
-            water = water.Insert(7, fat[1].ToString());
-            water = water.Insert(10, fat[1].ToString());
-            water = water.Insert(18, fat[1].ToString());
-            water = water.Insert(19, fat[1].ToString());
-
-            water = water.Insert(3, fat[0].ToString());
-            water = water.Insert(15, fat[0].ToString());
-            water = water.Insert(16, fat[0].ToString());
-            water = water.Insert(22, fat[0].ToString());
-
-            byte[] cheese = new byte[16];
-            int count = -1;
-
-            for (int i = 0; i < 32; i += 2)
-                cheese[++count] = byte.Parse(water.Remove(0, i).Remove(2), System.Globalization.NumberStyles.HexNumber);
-
-            if (destinationpath[destinationpath.Length - 1] != '\\') destinationpath = destinationpath + "\\";
-            using (FileStream keystream = new FileStream(destinationpath + "\\common-key.bin", FileMode.Create))
-            {
-                keystream.Write(cheese, 0, cheese.Length);
-            }
-        }
-
-        /// <summary>
-        /// Counts the appearance of a specific character in a string
-        /// </summary>
-        /// <param name="theString"></param>
-        /// <param name="theChar"></param>
-        /// <returns></returns>
-        public static int CountCharsInString(string theString, char theChar)
-        {
-            int count = 0;
-            foreach (char thisChar in theString)
-            {
-                if (thisChar == theChar)
-                    count++;
-            }
-            return count;
-        }
-
-        /// <summary>
-        /// Compares two Byte Arrays and returns true, if they match
-        /// </summary>
-        /// <param name="first"></param>
-        /// <param name="second"></param>
-        /// <returns></returns>
-        public static bool CompareByteArrays(byte[] first, byte[] second)
-        {
-            if (first.Length != second.Length) return false;
-            else
-            {
-                for (int i = 0; i < first.Length; i++)
-                    if (first[i] != second[i]) return false;
-
-                return true;
-            }
-        }
-
-        /// <summary>
-        /// Converts a Hex String to a Byte Array
-        /// </summary>
-        /// <param name="hexstring"></param>
-        /// <returns></returns>
-        public static byte[] HexStringToByteArray(string hexstring)
-        {
-            byte[] ba = new byte[hexstring.Length / 2];
-
-            for (int i = 0; i < hexstring.Length / 2; i++)
-            {
-                ba[i] = byte.Parse(hexstring.Substring(i * 2, 2), System.Globalization.NumberStyles.HexNumber);
-            }
-
-            return ba;
-        }
-        
-        /// <summary>
-        /// Checks, if the given string does exist in the string Array
-        /// </summary>
-        /// <param name="theString"></param>
-        /// <param name="theStringArray"></param>
-        /// <returns></returns>
-        public static bool StringExistsInStringArray(string theString, string[] theStringArray)
-        {
-            return Array.Exists(theStringArray, thisString => thisString == theString);
-        }
-
-        /// <summary>
-        /// Copies an entire Directoy
-        /// </summary>
-        /// <param name="source"></param>
-        /// <param name="destination"></param>
-        public static void CopyDirectory(string source, string destination)
-        {
-            string[] subdirs = Directory.GetDirectories(source);
-            string[] files = Directory.GetFiles(source);
-
-            foreach (string thisFile in files)
-            {
-                if (!Directory.Exists(destination)) Directory.CreateDirectory(destination);
-                if (File.Exists(destination + "\\" + Path.GetFileName(thisFile))) File.Delete(destination + "\\" + Path.GetFileName(thisFile));
-                File.Copy(thisFile, destination + "\\" + Path.GetFileName(thisFile));
-            }
-
-            foreach (string thisDir in subdirs)
-            {
-                CopyDirectory(thisDir, destination + "\\" + thisDir.Remove(0, thisDir.LastIndexOf('\\') + 1));
-            }
-        }
-    }
-
-    public class WadInfo
-    {
-        public const int Headersize = 64;
-        public static string[] RegionCode = new string[4] { "Japan", "USA", "Europe", "Region Free" };
-
-        /// <summary>
-        /// Returns the Header of a Wadfile
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static byte[] GetHeader(byte[] wadfile)
-        {
-            byte[] Header = new byte[0x20];
-
-            for (int i = 0; i < Header.Length; i++)
-            {
-                Header[i] = wadfile[i];
-            }
-
-            return Header;
-        }
-
-        /// <summary>
-        /// Returns the size of the Certificate
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static int GetCertSize(byte[] wadfile)
-        {
-            int size = int.Parse(wadfile[0x08].ToString("x2") + wadfile[0x09].ToString("x2") + wadfile[0x0a].ToString("x2") + wadfile[0x0b].ToString("x2"), System.Globalization.NumberStyles.HexNumber);
-            return size;
-        }
-
-        /// <summary>
-        /// Returns the size of the Ticket
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static int GetTikSize(byte[] wadfile)
-        {
-            int size = int.Parse(wadfile[0x10].ToString("x2") + wadfile[0x11].ToString("x2") + wadfile[0x12].ToString("x2") + wadfile[0x13].ToString("x2"), System.Globalization.NumberStyles.HexNumber);
-            return size;
-        }
-
-        /// <summary>
-        /// Returns the size of the TMD
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static int GetTmdSize(byte[] wadfile)
-        {
-            int size = int.Parse(wadfile[0x14].ToString("x2") + wadfile[0x15].ToString("x2") + wadfile[0x16].ToString("x2") + wadfile[0x17].ToString("x2"), System.Globalization.NumberStyles.HexNumber);
-            return size;
-        }
-
-        /// <summary>
-        /// Returns the size of all Contents
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static int GetContentSize(byte[] wadfile)
-        {
-            int size = int.Parse(wadfile[0x18].ToString("x2") + wadfile[0x19].ToString("x2") + wadfile[0x1a].ToString("x2") + wadfile[0x1b].ToString("x2"), System.Globalization.NumberStyles.HexNumber);
-            return size;
-        }
-
-        /// <summary>
-        /// Returns the size of the Footer
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static int GetFooterSize(byte[] wadfile)
-        {
-            int size = int.Parse(wadfile[0x1c].ToString("x2") + wadfile[0x1d].ToString("x2") + wadfile[0x1e].ToString("x2") + wadfile[0x1f].ToString("x2"), System.Globalization.NumberStyles.HexNumber);
-            return size;
-        }
-
-        /// <summary>
-        /// Returns the position of the tmd in the wad file
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static int GetTmdPos(byte[] wadfile)
-        {
-            return Headersize + Tools.AddPadding(GetCertSize(wadfile)) + Tools.AddPadding(GetTikSize(wadfile));
-        }
-
-        /// <summary>
-        /// Returns the position of the ticket in the wad file, ticket or tmd
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static int GetTikPos(byte[] wadfile)
-        {
-            return Headersize + Tools.AddPadding(GetCertSize(wadfile));
-        }
-
-        /// <summary>
-        /// Returns the title ID of the wad file.
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <param name="type">0 = Tik, 1 = Tmd</param>
-        /// <returns></returns>
-        public static string GetTitleID(string wadtiktmd, int type)
-        {
-            byte[] temp = Tools.LoadFileToByteArray(wadtiktmd);
-            return GetTitleID(temp, type);
-        }
-
-        /// <summary>
-        /// Returns the title ID of the wad file.
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <param name="type">0 = Tik, 1 = Tmd</param>
-        /// <returns></returns>
-        public static string GetTitleID(byte[] wadtiktmd, int type)
-        {
-            string channeltype = GetChannelType(wadtiktmd, type);
-            int tikpos = 0;
-            int tmdpos = 0;
-
-            if (IsThisWad(wadtiktmd) == true)
-            {
-                //It's a wad
-                tikpos = GetTikPos(wadtiktmd);
-                tmdpos = GetTmdPos(wadtiktmd);
-            }
-
-            if (type == 1)
-            {
-                if (!channeltype.Contains("System:"))
-                {
-                    string tmdid = Convert.ToChar(wadtiktmd[tmdpos + 0x190]).ToString() + Convert.ToChar(wadtiktmd[tmdpos + 0x191]).ToString() + Convert.ToChar(wadtiktmd[tmdpos + 0x192]).ToString() + Convert.ToChar(wadtiktmd[tmdpos + 0x193]).ToString();
-                    return tmdid;
-                }
-                else if (channeltype.Contains("IOS"))
-                {
-                    int tmdid = Tools.HexStringToInt(wadtiktmd[tmdpos + 0x190].ToString("x2") + wadtiktmd[tmdpos + 0x191].ToString("x2") + wadtiktmd[tmdpos + 0x192].ToString("x2") + wadtiktmd[tmdpos + 0x193].ToString("x2"));               
-                    return "IOS" + tmdid;
-                }
-                else if (channeltype.Contains("System")) return "SYSTEM";
-                else return "";
-            }
-            else
-            {
-                if (!channeltype.Contains("System:"))
-                {
-                    string tikid = Convert.ToChar(wadtiktmd[tikpos + 0x1e0]).ToString() + Convert.ToChar(wadtiktmd[tikpos + 0x1e1]).ToString() + Convert.ToChar(wadtiktmd[tikpos + 0x1e2]).ToString() + Convert.ToChar(wadtiktmd[tikpos + 0x1e3]).ToString();
-                    return tikid;
-                }
-                else if (channeltype.Contains("MIOS"))
-                {
-                    return "MIOS";
-                }
-                else if (channeltype.Contains("BC"))
-                {
-                    return "BC";
-                }
-                else if (channeltype.Contains("IOS"))
-                {
-                    int tikid = Tools.HexStringToInt(wadtiktmd[tikpos + 0x1e0].ToString("x2") + wadtiktmd[tikpos + 0x1e1].ToString("x2") + wadtiktmd[tikpos + 0x1e2].ToString("x2") + wadtiktmd[tikpos + 0x1e3].ToString("x2"));
-                    return "IOS" + tikid;
-                }
-                else if (channeltype.Contains("System")) return "SYSTEM";
-                else return "";
-            }
-        }
-
-        /// <summary>
-        /// Returns the full title ID of the wad file as a hex string.
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <param name="type">0 = Tik, 1 = Tmd</param>
-        /// <returns></returns>
-        public static string GetFullTitleID(byte[] wadtiktmd, int type)
-        {
-            int tikpos = 0;
-            int tmdpos = 0;
-
-            if (IsThisWad(wadtiktmd) == true)
-            {
-                //It's a wad
-                tikpos = GetTikPos(wadtiktmd);
-                tmdpos = GetTmdPos(wadtiktmd);
-            }
-
-            if (type == 1)
-            {
-                string tmdid = wadtiktmd[tmdpos + 0x18c].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x18d].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x18e].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x18f].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x190].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x191].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x192].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x193].ToString("x2");
-                return tmdid;
-            }
-            else
-            {
-                string tikid = wadtiktmd[tikpos + 0x1dc].ToString() +
-                    wadtiktmd[tikpos + 0x1dd].ToString() +
-                    wadtiktmd[tikpos + 0x1de].ToString() +
-                    wadtiktmd[tikpos + 0x1df].ToString() +
-                    wadtiktmd[tikpos + 0x1e0].ToString() +
-                    wadtiktmd[tikpos + 0x1e1].ToString() +
-                    wadtiktmd[tikpos + 0x1e2].ToString() +
-                    wadtiktmd[tikpos + 0x1e3].ToString();
-                return tikid;
-            }
-        }
-
-        /// <summary>
-        /// Returns the title for each language of a wad file.
-        /// Order: Jap, Eng, Ger, Fra, Spa, Ita, Dut
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static string[] GetChannelTitles(string wadfile)
-        {
-            byte[] wadarray = Tools.LoadFileToByteArray(wadfile);
-            return GetChannelTitles(wadarray);
-        }
-
-        /// <summary>
-        /// Returns the title for each language of a wad file.
-        /// Order: Jap, Eng, Ger, Fra, Spa, Ita, Dut
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static string[] GetChannelTitles(byte[] wadfile)
-        {
-            if (File.Exists(System.Windows.Forms.Application.StartupPath + "\\common-key.bin") || File.Exists(System.Windows.Forms.Application.StartupPath + "\\key.bin"))
-            {
-                string channeltype = GetChannelType(wadfile, 0);
-
-                if (!channeltype.Contains("System:"))
-                {
-                    if (!channeltype.Contains("Hidden"))
-                    {
-                        string[] titles = new string[8];
-
-                        string[,] conts = GetContentInfo(wadfile);
-                        byte[] titlekey = GetTitleKey(wadfile);
-                        int nullapp = 0;
-
-                        for (int i = 0; i < conts.GetLength(0); i++)
-                        {
-                            if (conts[i, 1] == "00000000")
-                                nullapp = i;
-                        }
-
-                        byte[] contenthandle = WadEdit.DecryptContent(wadfile, nullapp, titlekey);
-                        int imetpos = 0;
-
-                        if (contenthandle.Length < 400) return new string[7];
-
-                        if (!channeltype.Contains("Downloaded"))
-                        {
-                            for (int z = 0; z < 400; z++)
-                            {
-                                if (Convert.ToChar(contenthandle[z]) == 'I')
-                                    if (Convert.ToChar(contenthandle[z + 1]) == 'M')
-                                        if (Convert.ToChar(contenthandle[z + 2]) == 'E')
-                                            if (Convert.ToChar(contenthandle[z + 3]) == 'T')
-                                            {
-                                                imetpos = z;
-                                                break;
-                                            }
-                            }
-
-                            int jappos = imetpos + 29;
-                            int count = 0;
-
-                            for (int i = jappos; i < jappos + 588; i += 84)
-                            {
-                                for (int j = 0; j < 40; j += 2)
-                                {
-                                    if (contenthandle[i + j] != 0x00)
-                                    {
-                                        char temp = BitConverter.ToChar(new byte[] { contenthandle[i + j], contenthandle[i + j - 1] }, 0);
-                                        titles[count] += temp;
-                                    }
-                                }
-
-                                count++;
-                            }
-
-                            for (int i = jappos + (9 * 84); i < (jappos + (9 * 84)) + 40; i += 2)
-                            {
-                                if (contenthandle[i] != 0x00)
-                                {
-                                    char temp = BitConverter.ToChar(new byte[] { contenthandle[i], contenthandle[i - 1] }, 0);
-                                    titles[count] += temp;
-                                }
-                            }
-
-                            return titles;
-                        }
-                        else
-                        {
-                            //DLC's
-                            for (int j = 97; j < 97 + 40; j += 2)
-                            {
-                                if (contenthandle[j] != 0x00)
-                                {
-                                    char temp = BitConverter.ToChar(new byte[] { contenthandle[j], contenthandle[j - 1] }, 0);
-                                    titles[0] += temp;
-                                }
-                            }
-
-                            for (int i = 1; i < 8; i++)
-                                titles[i] = titles[0];
-
-                            return titles;
-                        }
-                    }
-                    else return new string[8];
-                }
-                else return new string[8];
-            }
-            else return new string[8];
-        }
-
-        /// <summary>
-        /// Returns the title for each language of a 00.app file
-        /// Order: Jap, Eng, Ger, Fra, Spa, Ita, Dut
-        /// </summary>
-        /// <param name="app"></param>
-        /// <returns></returns>
-        public static string[] GetChannelTitlesFromApp(string app)
-        {
-            byte[] tmp = Tools.LoadFileToByteArray(app);
-            return GetChannelTitlesFromApp(tmp);
-        }
-
-        /// <summary>
-        /// Returns the title for each language of a 00.app file
-        /// Order: Jap, Eng, Ger, Fra, Spa, Ita, Dut
-        /// </summary>
-        /// <param name="app"></param>
-        /// <returns></returns>
-        public static string[] GetChannelTitlesFromApp(byte[] app)
-        {
-            string[] titles = new string[8];
-
-            int imetpos = 0;
-            int length = 400;
-
-            if (app.Length < 400) length = app.Length - 4;
-
-            for (int z = 0; z < length; z++)
-            {
-                if (Convert.ToChar(app[z]) == 'I')
-                    if (Convert.ToChar(app[z + 1]) == 'M')
-                        if (Convert.ToChar(app[z + 2]) == 'E')
-                            if (Convert.ToChar(app[z + 3]) == 'T')
-                            {
-                                imetpos = z;
-                                break;
-                            }
-            }
-
-            if (imetpos != 0)
-            {
-                int jappos = imetpos + 29;
-                int count = 0;
-
-                for (int i = jappos; i < jappos + 588; i += 84)
-                {
-                    for (int j = 0; j < 40; j += 2)
-                    {
-                        if (app[i + j] != 0x00)
-                        {
-                            char temp = BitConverter.ToChar(new byte[] { app[i + j], app[i + j - 1] }, 0);
-                            titles[count] += temp;
-                        }
-                    }
-
-                    count++;
-                }
-
-                for (int i = jappos + (9 * 84); i < (jappos + (9 * 84)) + 40; i += 2)
-                {
-                    if (app[i] != 0x00)
-                    {
-                        char temp = BitConverter.ToChar(new byte[] { app[i], app[i - 1] }, 0);
-                        titles[count] += temp;
-                    }
-                }
-            }
-
-            return titles;
-        }
-
-        /// <summary>
-        /// Returns the Type of the Channel as a string
-        /// Wad or Tik needed for WiiWare / VC detection!
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static string GetChannelType(byte[] wadtiktmd, int type)
-        {
-            int tikpos = 0;
-            int tmdpos = 0;
-
-            if (IsThisWad(wadtiktmd) == true)
-            {
-                //It's a wad
-                tikpos = GetTikPos(wadtiktmd);
-                tmdpos = GetTmdPos(wadtiktmd);
-            }
-
-            string thistype = "";
-
-            if (type == 0)
-            { thistype = wadtiktmd[tikpos + 0x1dc].ToString("x2") + wadtiktmd[tikpos + 0x1dd].ToString("x2") + wadtiktmd[tikpos + 0x1de].ToString("x2") + wadtiktmd[tikpos + 0x1df].ToString("x2"); }
-            else { thistype = wadtiktmd[tmdpos + 0x18c].ToString("x2") + wadtiktmd[tmdpos + 0x18d].ToString("x2") + wadtiktmd[tmdpos + 0x18e].ToString("x2") + wadtiktmd[tmdpos + 0x18f].ToString("x2"); }
-            string channeltype = "Unknown";
-
-            if (thistype == "00010001")
-            {
-                channeltype = CheckWiiWareVC(wadtiktmd, type);
-            }
-            else if (thistype == "00010002") channeltype = "System Channel";
-            else if (thistype == "00010004" || thistype == "00010000") channeltype = "Game Channel";
-            else if (thistype == "00010005") channeltype = "Downloaded Content";
-            else if (thistype == "00010008") channeltype = "Hidden Channel";
-            else if (thistype == "00000001")
-            {
-                channeltype = "System: IOS";
-
-                string thisid = "";
-                if (type == 0) { thisid = wadtiktmd[tikpos + 0x1e0].ToString("x2") + wadtiktmd[tikpos + 0x1e1].ToString("x2") + wadtiktmd[tikpos + 0x1e2].ToString("x2") + wadtiktmd[tikpos + 0x1e3].ToString("x2"); }
-                else { thisid = wadtiktmd[tmdpos + 0x190].ToString("x2") + wadtiktmd[tmdpos + 0x191].ToString("x2") + wadtiktmd[tmdpos + 0x192].ToString("x2") + wadtiktmd[tmdpos + 0x193].ToString("x2"); }
-
-                if (thisid == "00000001") channeltype = "System: Boot2";
-                else if (thisid == "00000002") channeltype = "System: Menu";
-                else if (thisid == "00000100") channeltype = "System: BC";
-                else if (thisid == "00000101") channeltype = "System: MIOS";
-            }
-
-            return channeltype;
-        }
-
-        /// <summary>
-        /// Returns the amount of included Contents (app-files)
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static int GetContentNum(byte[] wadtmd)
-        {
-            int tmdpos = 0;
-
-            if (IsThisWad(wadtmd) == true)
-            {
-                //It's a wad file, so get the tmd position
-                tmdpos = GetTmdPos(wadtmd);
-            }
-
-            int contents = Tools.HexStringToInt(wadtmd[tmdpos + 0x1de].ToString("x2") + wadtmd[tmdpos + 0x1df].ToString("x2"));
-
-            return contents;
-        }
-
-        /// <summary>
-        /// Returns the boot index specified in the tmd
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static int GetBootIndex(byte[] wadtmd)
-        {
-            int tmdpos = 0;
-
-            if (IsThisWad(wadtmd))
-                tmdpos = GetTmdPos(wadtmd);
-
-            int bootIndex = Tools.HexStringToInt(wadtmd[tmdpos + 0x1e0].ToString("x2") + wadtmd[tmdpos + 0x1e1].ToString("x2"));
-
-            return bootIndex;
-        }
-
-        /// <summary>
-        /// Returns the approx. destination size on the Wii
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static string GetNandSize(byte[] wadtmd, bool ConvertToMB)
-        {
-            int tmdpos = 0;
-            int minsize = 0;
-            int maxsize = 0;
-            int numcont = GetContentNum(wadtmd);
-
-            if (IsThisWad(wadtmd) == true)
-            {
-                //It's a wad
-                tmdpos = GetTmdPos(wadtmd);
-            }
-
-            for (int i = 0; i < numcont; i++)
-            {
-                int cont = 36 * i;
-                int contentsize = Tools.HexStringToInt(wadtmd[tmdpos + 0x1e4 + 8 + cont].ToString("x2") +
-                    wadtmd[tmdpos + 0x1e5 + 8 + cont].ToString("x2") +
-                    wadtmd[tmdpos + 0x1e6 + 8 + cont].ToString("x2") +
-                    wadtmd[tmdpos + 0x1e7 + 8 + cont].ToString("x2") +
-                    wadtmd[tmdpos + 0x1e8 + 8 + cont].ToString("x2") +
-                    wadtmd[tmdpos + 0x1e9 + 8 + cont].ToString("x2") +
-                    wadtmd[tmdpos + 0x1ea + 8 + cont].ToString("x2") +
-                    wadtmd[tmdpos + 0x1eb + 8 + cont].ToString("x2"));
-
-                string type = wadtmd[tmdpos + 0x1e4 + 6 + cont].ToString("x2") + wadtmd[tmdpos + 0x1e5 + 6 + cont].ToString("x2");
-
-                if (type == "0001")
-                {
-                    minsize += contentsize;
-                    maxsize += contentsize;
-                }
-                else if (type == "8001")
-                    maxsize += contentsize;
-            }
-
-            string size = "";
-
-            if (maxsize == minsize) size = maxsize.ToString();
-            else size = minsize.ToString() + " - " + maxsize.ToString();
-
-            if (ConvertToMB == true)
-            {
-                if (size.Contains("-"))
-                {
-                    string min = size.Remove(size.IndexOf(' '));
-                    string max = size.Remove(0, size.IndexOf('-') + 2);
-
-                    min = Convert.ToString(Math.Round(Convert.ToDouble(min) * 0.0009765625 * 0.0009765625, 2));
-                    max = Convert.ToString(Math.Round(Convert.ToDouble(max) * 0.0009765625 * 0.0009765625, 2));
-                    if (min.Length > 4) { min = min.Remove(4); }
-                    if (max.Length > 4) { max = max.Remove(4); }
-                    size = min + " - " + max + " MB";
-                }
-                else
-                {
-                    size = Convert.ToString(Math.Round(Convert.ToDouble(size) * 0.0009765625 * 0.0009765625, 2));
-                    if (size.Length > 4) { size = size.Remove(4); }
-                    size = size + " MB";
-                }
-            }
-
-            return size.Replace(",", ".");
-        }
-
-        /// <summary>
-        /// Returns the approx. destination block on the Wii
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static string GetNandBlocks(string wadtmd)
-        {
-            using (FileStream fs = new FileStream(wadtmd, FileMode.Open))
-            {
-                byte[] temp = new byte[fs.Length];
-                fs.Read(temp, 0, temp.Length);
-                return GetNandBlocks(temp);
-            }
-        }
-
-        /// <summary>
-        /// Returns the approx. destination block on the Wii
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static string GetNandBlocks(byte[] wadtmd)
-        {
-            string size = GetNandSize(wadtmd, false);
-
-            if (size.Contains("-"))
-            {
-                string size1 = size.Remove(size.IndexOf(' '));
-                string size2 = size.Remove(0, size.LastIndexOf(' ') + 1);
-
-                double blocks1 = (double)((Convert.ToDouble(size1) / 1024) / 128);
-                double blocks2 = (double)((Convert.ToDouble(size2) / 1024) / 128);
-
-                return Math.Ceiling(blocks1) + " - " + Math.Ceiling(blocks2);
-            }
-            else
-            {
-                double blocks = (double)((Convert.ToDouble(size) / 1024) / 128);
-
-                return Math.Ceiling(blocks).ToString();
-            }
-        }
-
-        /// <summary>
-        /// Returns the title version of the wad file
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static int GetTitleVersion(string wadtmd)
-        {
-            byte[] temp = Tools.LoadFileToByteArray(wadtmd, 0, 10000);
-            return GetTitleVersion(temp);
-        }
-
-        /// <summary>
-        /// Returns the title version of the wad file
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static int GetTitleVersion(byte[] wadtmd)
-        {
-            int tmdpos = 0;
-
-            if (IsThisWad(wadtmd) == true) { tmdpos = GetTmdPos(wadtmd); }
-            return Tools.HexStringToInt(wadtmd[tmdpos + 0x1dc].ToString("x2") + wadtmd[tmdpos + 0x1dd].ToString("x2"));
-        }
-
-        /// <summary>
-        /// Returns the IOS that is needed by the wad file
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static string GetIosFlag(byte[] wadtmd)
-        {
-            string type = GetChannelType(wadtmd, 1);
-
-            if (!type.Contains("IOS") && !type.Contains("BC"))
-            {
-                int tmdpos = 0;
-                if (IsThisWad(wadtmd) == true) { tmdpos = GetTmdPos(wadtmd); }
-                return "IOS" + Tools.HexStringToInt(wadtmd[tmdpos + 0x188].ToString("x2") + wadtmd[tmdpos + 0x189].ToString("x2") + wadtmd[tmdpos + 0x18a].ToString("x2") + wadtmd[tmdpos + 0x18b].ToString("x2"));
-            }
-            else return "";
-        }
-
-        /// <summary>
-        /// Returns the region of the wad file
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static string GetRegionFlag(byte[] wadtmd)
-        {
-            int tmdpos = 0;
-            string channeltype = GetChannelType(wadtmd, 1);
-
-            if (IsThisWad(wadtmd) == true) { tmdpos = GetTmdPos(wadtmd); }
-
-            if (!channeltype.Contains("System:"))
-            {
-                int region = Tools.HexStringToInt(wadtmd[tmdpos + 0x19d].ToString("x2"));
-                return RegionCode[region];
-            }
-            else return "";
-        }
-
-        /// <summary>
-        /// Returns the Path where the wad will be installed on the Wii
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static string GetNandPath(string wadfile)
-        {
-            byte[] wad = Tools.LoadFileToByteArray(wadfile);
-            return GetNandPath(wad, 0);
-        }
-
-        /// <summary>
-        /// Returns the Path where the wad will be installed on the Wii
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <param name="type">0 = Tik, 1 = Tmd</param>
-        /// <returns></returns>
-        public static string GetNandPath(byte[] wadtiktmd, int type)
-        {
-            int tikpos = 0;
-            int tmdpos = 0;
-
-            if (IsThisWad(wadtiktmd) == true)
-            {
-                tikpos = GetTikPos(wadtiktmd);
-                tmdpos = GetTmdPos(wadtiktmd);
-            }
-
-            string thispath = "";
-
-            if (type == 0)
-            {
-                thispath = wadtiktmd[tikpos + 0x1dc].ToString("x2") +
-                    wadtiktmd[tikpos + 0x1dd].ToString("x2") +
-                    wadtiktmd[tikpos + 0x1de].ToString("x2") +
-                    wadtiktmd[tikpos + 0x1df].ToString("x2") +
-                    wadtiktmd[tikpos + 0x1e0].ToString("x2") +
-                    wadtiktmd[tikpos + 0x1e1].ToString("x2") +
-                    wadtiktmd[tikpos + 0x1e2].ToString("x2") +
-                    wadtiktmd[tikpos + 0x1e3].ToString("x2");
-            }
-            else
-            {
-                thispath = wadtiktmd[tmdpos + 0x18c].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x18d].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x18e].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x18f].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x190].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x191].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x192].ToString("x2") +
-                    wadtiktmd[tmdpos + 0x193].ToString("x2");
-            }
-
-            thispath = thispath.Insert(8, "\\");
-            return thispath;
-        }
-
-        /// <summary>
-        /// Returns true, if the wad file is a WiiWare / VC title.
-        /// </summary>
-        /// <param name="wadtiktmd"></param>
-        /// <param name="type">0 = Tik, 1 = Tmd</param>
-        /// <returns></returns>
-        public static string CheckWiiWareVC(byte[] wadtiktmd, int type)
-        {
-            int tiktmdpos = 0;
-            int offset = 0x221;
-            int idoffset = 0x1e0;
-
-            if (type == 1) { offset = 0x197; idoffset = 0x190; }
-            if (IsThisWad(wadtiktmd) == true)
-            {
-                if (type == 1) tiktmdpos = GetTmdPos(wadtiktmd);
-                else tiktmdpos = GetTikPos(wadtiktmd);
-            }
-
-            if (wadtiktmd[tiktmdpos + offset] == 0x01)
-            {
-                char idchar = Convert.ToChar(wadtiktmd[tiktmdpos + idoffset]);
-                char idchar2 = Convert.ToChar(wadtiktmd[tiktmdpos + idoffset + 1]);
-
-                if (idchar == 'H') return "System Channel";
-                else if (idchar == 'W') return "WiiWare";
-                else
-                {
-                    if (idchar == 'C') return "C64";
-                    else if (idchar == 'E' && idchar2 == 'A') return "NeoGeo";
-                    else if (idchar == 'E') return "VC - Arcade";
-                    else if (idchar == 'F') return "NES";
-                    else if (idchar == 'J') return "SNES";
-                    else if (idchar == 'L') return "Sega Master System";
-                    else if (idchar == 'M') return "Sega Genesis";
-                    else if (idchar == 'N') return "Nintendo 64";
-                    else if (idchar == 'P') return "Turbografx";
-                    else if (idchar == 'Q') return "Turbografx CD";
-                    else return "Channel Title";
-                }
-            }
-            else return "Channel Title";
-        }
-
-        /// <summary>
-        /// Returns all information stored in the tmd for all contents in the wad file.
-        /// [x, 0] = Content ID, [x, 1] = Index, [x, 2] = Type, [x, 3] = Size, [x, 4] = Sha1
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static string[,] GetContentInfo(byte[] wadtmd)
-        {
-            int tmdpos = 0;
-
-            if (IsThisWad(wadtmd) == true) { tmdpos = GetTmdPos(wadtmd); }
-            int contentcount = GetContentNum(wadtmd);
-            string[,] contentinfo = new string[contentcount, 5];
-
-            for (int i = 0; i < contentcount; i++)
-            {
-                contentinfo[i, 0] = wadtmd[tmdpos + 0x1e4 + (36 * i)].ToString("x2") +
-                    wadtmd[tmdpos + 0x1e5 + (36 * i)].ToString("x2") +
-                    wadtmd[tmdpos + 0x1e6 + (36 * i)].ToString("x2") +
-                    wadtmd[tmdpos + 0x1e7 + (36 * i)].ToString("x2");
-                contentinfo[i, 1] = "0000" +
-                    wadtmd[tmdpos + 0x1e8 + (36 * i)].ToString("x2") +
-                    wadtmd[tmdpos + 0x1e9 + (36 * i)].ToString("x2");
-                contentinfo[i, 2] = wadtmd[tmdpos + 0x1ea + (36 * i)].ToString("x2") +
-                    wadtmd[tmdpos + 0x1eb + (36 * i)].ToString("x2");
-                contentinfo[i, 3] = Tools.HexStringToInt(
-                    wadtmd[tmdpos + 0x1ec + (36 * i)].ToString("x2") +
-                    wadtmd[tmdpos + 0x1ed + (36 * i)].ToString("x2") +
-                    wadtmd[tmdpos + 0x1ee + (36 * i)].ToString("x2") +
-                    wadtmd[tmdpos + 0x1ef + (36 * i)].ToString("x2") +
-                    wadtmd[tmdpos + 0x1f0 + (36 * i)].ToString("x2") +
-                    wadtmd[tmdpos + 0x1f1 + (36 * i)].ToString("x2") +
-                    wadtmd[tmdpos + 0x1f2 + (36 * i)].ToString("x2") +
-                    wadtmd[tmdpos + 0x1f3 + (36 * i)].ToString("x2")).ToString();
-
-                for (int j = 0; j < 20; j++)
-                {
-                    contentinfo[i, 4] += wadtmd[tmdpos + 0x1f4 + (36 * i) + j].ToString("x2");
-                }
-            }
-
-            return contentinfo;
-        }
-
-        /// <summary>
-        /// Returns the Tik of the wad file as a Byte-Array
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static byte[] ReturnTik(byte[] wadfile)
-        {
-            int tikpos = GetTikPos(wadfile);
-            int tiksize = GetTikSize(wadfile);
-
-            byte[] tik = new byte[tiksize];
-
-            for (int i = 0; i < tiksize; i++)
-            {
-                tik[i] = wadfile[tikpos + i];
-            }
-
-            return tik;
-        }
-
-        /// <summary>
-        /// Returns the Tmd of the wad file as a Byte-Array
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static byte[] ReturnTmd(byte[] wadfile)
-        {
-            int tmdpos = GetTmdPos(wadfile);
-            int tmdsize = GetTmdSize(wadfile);
-
-            byte[] tmd = new byte[tmdsize];
-
-            for (int i = 0; i < tmdsize; i++)
-            {
-                tmd[i] = wadfile[tmdpos + i];
-            }
-
-            return tmd;
-        }
-
-        /// <summary>
-        /// Checks, if the given file is a wad
-        /// </summary>
-        /// <param name="wadtiktmd"></param>
-        /// <returns></returns>
-        public static bool IsThisWad(byte[] wadtiktmd)
-        {
-            if (wadtiktmd[0] == 0x00 &&
-                wadtiktmd[1] == 0x00 &&
-                wadtiktmd[2] == 0x00 &&
-                wadtiktmd[3] == 0x20 &&
-                wadtiktmd[4] == 0x49 &&
-                wadtiktmd[5] == 0x73)
-            { return true; }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Returns the decrypted TitleKey
-        /// </summary>
-        /// <param name="wadtik"></param>
-        /// <returns></returns>
-        public static byte[] GetTitleKey(byte[] wadtik)
-        {
-            byte[] commonkey = new byte[16];
-
-            if (File.Exists(System.Windows.Forms.Application.StartupPath + "\\common-key.bin"))
-            { commonkey = Tools.LoadFileToByteArray(System.Windows.Forms.Application.StartupPath + "\\common-key.bin"); }
-            else if (File.Exists(System.Windows.Forms.Application.StartupPath + "\\key.bin"))
-            { commonkey = Tools.LoadFileToByteArray(System.Windows.Forms.Application.StartupPath + "\\key.bin"); }
-            else { throw new FileNotFoundException("The (common-)key.bin must be in the application directory!"); }
-
-            byte[] encryptedkey = new byte[16];
-            byte[] iv = new byte[16];
-            int tikpos = 0;
-
-            if (IsThisWad(wadtik) == true)
-            {
-                //It's a wad file, so get the tik position
-                tikpos = GetTikPos(wadtik);
-            }
-
-            for (int i = 0; i < 16; i++)
-            {
-                encryptedkey[i] = wadtik[tikpos + 0x1bf + i];
-            }
-
-            for (int j = 0; j < 8; j++)
-            {
-                iv[j] = wadtik[tikpos + 0x1dc + j];
-                iv[j + 8] = 0x00;
-            }
-
-            RijndaelManaged decrypt = new RijndaelManaged();
-            decrypt.Mode = CipherMode.CBC;
-            decrypt.Padding = PaddingMode.None;
-            decrypt.KeySize = 128;
-            decrypt.BlockSize = 128;
-            decrypt.Key = commonkey;
-            decrypt.IV = iv;
-
-            ICryptoTransform cryptor = decrypt.CreateDecryptor();
-
-            MemoryStream memory = new MemoryStream(encryptedkey);
-            CryptoStream crypto = new CryptoStream(memory, cryptor, CryptoStreamMode.Read);
-
-            byte[] decryptedkey = new byte[16];
-            crypto.Read(decryptedkey, 0, decryptedkey.Length);
-
-            crypto.Close();
-            memory.Close();
-
-            return decryptedkey;
-        }
-
-        /// <summary>
-        /// Decodes the Timestamp in the Trailer, if available.
-        /// Returns null if no Timestamp was found.
-        /// </summary>
-        /// <param name="trailer"></param>
-        /// <returns></returns>
-        public static DateTime GetCreationTime(string trailer)
-        {
-            byte[] bTrailer = Tools.LoadFileToByteArray(trailer);
-            return GetCreationTime(bTrailer);
-        }
-
-        /// <summary>
-        /// Decodes the Timestamp in the Trailer, if available.
-        /// Returns null if no Timestamp was found.
-        /// </summary>
-        /// <param name="trailer"></param>
-        /// <returns></returns>
-        public static DateTime GetCreationTime(byte[] trailer)
-        {
-            DateTime result = new DateTime(1970, 1, 1);
-
-            if (trailer[0] == 'C' &&
-                trailer[1] == 'M' &&
-                trailer[2] == 'i' &&
-                trailer[3] == 'i' &&
-                trailer[4] == 'U' &&
-                trailer[5] == 'T')
-            {
-                ASCIIEncoding enc = new ASCIIEncoding();
-                string stringSeconds = enc.GetString(trailer, 6, 10);
-                int seconds = 0;
-
-                if (int.TryParse(stringSeconds, out seconds))
-                {
-                    result = result.AddSeconds((double)seconds);
-                    return result;
-                }
-                else return result;
-            }
-
-            return result;
-        }
-    }
-
-    public class WadEdit
-    {
-        /// <summary>
-        /// Changes the region of the wad file
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <param name="region">0 = JAP, 1 = USA, 2 = EUR, 3 = FREE</param>
-        /// <returns></returns>
-        public static byte[] ChangeRegion(byte[] wadfile, int region)
-        {
-
-            int tmdpos = WadInfo.GetTmdPos(wadfile);
-
-            if (region == 0) wadfile[tmdpos + 0x19d] = 0x00;
-            else if (region == 1) wadfile[tmdpos + 0x19d] = 0x01;
-            else if (region == 2) wadfile[tmdpos + 0x19d] = 0x02;
-            else wadfile[tmdpos + 0x19d] = 0x03;
-
-            wadfile = TruchaSign(wadfile, 1);
-
-            return wadfile;
-        }
-
-        /// <summary>
-        /// Changes the region of the wad file
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <param name="region"></param>
-        public static void ChangeRegion(string wadfile, int region)
-        {
-            byte[] wadarray = Tools.LoadFileToByteArray(wadfile);
-            wadarray = ChangeRegion(wadarray, region);
-
-            using (FileStream fs = new FileStream(wadfile, FileMode.Open, FileAccess.Write))
-            {
-                fs.Seek(0, SeekOrigin.Begin);
-                fs.Write(wadarray, 0, wadarray.Length);
-            }
-        }
-
-        /// <summary>
-        /// Changes the Channel Title of the wad file
-        /// All languages have the same title
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <param name="title"></param>
-        /// <returns></returns>
-        public static byte[] ChangeChannelTitle(byte[] wadfile, string title)
-        {
-            return ChangeChannelTitle(wadfile, title, title, title, title, title, title, title, title);
-        }
-
-        /// <summary>
-        /// Changes the Channel Title of the wad file.
-        /// Each language has a specific title.
-        /// 0 = Japanese, 1 = English, 2 = German, 3 = French, 4 = Spanish, 5 = Italian, 6 = Dutch, 7 = Korean
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <param name="jap"></param>
-        /// <param name="eng"></param>
-        /// <param name="ger"></param>
-        /// <param name="fra"></param>
-        /// <param name="spa"></param>
-        /// <param name="ita"></param>
-        /// <param name="dut"></param>
-        public static void ChangeChannelTitle(string wadfile, params string[] titles)
-        {
-            byte[] wadarray = Tools.LoadFileToByteArray(wadfile);
-            wadarray = ChangeChannelTitle(wadarray, titles[0], titles[1], titles[2], titles[3], titles[4], titles[5], titles[6], (titles.Length > 7) ? titles[8] : "");
-
-            using (FileStream fs = new FileStream(wadfile, FileMode.Open, FileAccess.Write))
-            {
-                fs.Seek(0, SeekOrigin.Begin);
-                fs.Write(wadarray, 0, wadarray.Length);
-            }
-        }
-
-        /// <summary>
-        /// Changes the Channel Title of the wad file.
-        /// Each language has a specific title.
-        /// 0 = Japanese, 1 = English, 2 = German, 3 = French, 4 = Spanish, 5 = Italian, 6 = Dutch, 7 = Korean
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static byte[] ChangeChannelTitle(byte[] wadfile, params string[] titles)
-        {
-            if (titles.Length < 7) throw new Exception("A title must be given for each language!");
-
-            Tools.ChangeProgress(0);
-
-            char[] japchars = titles[0].ToCharArray();
-            char[] engchars = titles[1].ToCharArray();
-            char[] gerchars = titles[2].ToCharArray();
-            char[] frachars = titles[3].ToCharArray();
-            char[] spachars = titles[4].ToCharArray();
-            char[] itachars = titles[5].ToCharArray();
-            char[] dutchars = titles[6].ToCharArray();
-            char[] korchars = new char[] { };
-            if (titles.Length > 7) korchars = titles[7].ToCharArray();
-
-            byte[] titlekey = WadInfo.GetTitleKey(wadfile);
-            string[,] conts = WadInfo.GetContentInfo(wadfile);
-            int tmdpos = WadInfo.GetTmdPos(wadfile);
-            int tmdsize = WadInfo.GetTmdSize(wadfile);
-            int nullapp = 0;
-            int contentpos = 64 + Tools.AddPadding(WadInfo.GetCertSize(wadfile)) + Tools.AddPadding(WadInfo.GetTikSize(wadfile)) + Tools.AddPadding(WadInfo.GetTmdSize(wadfile));
-            SHA1Managed sha1 = new SHA1Managed();
-
-            Tools.ChangeProgress(10);
-
-            for (int i = 0; i < conts.GetLength(0); i++)
-            {
-                if (conts[i, 1] == "00000000")
-                {
-                    nullapp = i;
-                    break;
-                }
-                else
-                    contentpos += Tools.AddPadding(Convert.ToInt32(conts[i, 3]));
-            }
-
-            byte[] contenthandle = DecryptContent(wadfile, nullapp, titlekey);
-
-            Tools.ChangeProgress(25);
-
-            int imetpos = 0;
-
-            for (int z = 0; z < 400; z++)
-            {
-                if (Convert.ToChar(contenthandle[z]) == 'I')
-                    if (Convert.ToChar(contenthandle[z + 1]) == 'M')
-                        if (Convert.ToChar(contenthandle[z + 2]) == 'E')
-                            if (Convert.ToChar(contenthandle[z + 3]) == 'T')
-                            {
-                                imetpos = z;
-                                break;
-                            }
-            }
-
-            Tools.ChangeProgress(40);
-
-            int count = 0;
-
-            for (int x = imetpos; x < imetpos + 40; x += 2)
-            {
-                if (japchars.Length > count)
-                {
-                    contenthandle[x + 29] = BitConverter.GetBytes(japchars[count])[0];
-                    contenthandle[x + 28] = BitConverter.GetBytes(japchars[count])[1];
-                }
-                else { contenthandle[x + 29] = 0x00; contenthandle[x + 28] = 0x00; }
-                if (engchars.Length > count)
-                {
-                    contenthandle[x + 29 + 84] = BitConverter.GetBytes(engchars[count])[0];
-                    contenthandle[x + 29 + 84 - 1] = BitConverter.GetBytes(engchars[count])[1];
-                }
-                else { contenthandle[x + 29 + 84] = 0x00; contenthandle[x + 29 + 84 - 1] = 0x00; }
-                if (gerchars.Length > count)
-                {
-                    contenthandle[x + 29 + 84 * 2] = BitConverter.GetBytes(gerchars[count])[0];
-                    contenthandle[x + 29 + 84 * 2 - 1] = BitConverter.GetBytes(gerchars[count])[1];
-                }
-                else { contenthandle[x + 29 + 84 * 2] = 0x00; contenthandle[x + 29 + 84 * 2 - 1] = 0x00; }
-                if (frachars.Length > count)
-                {
-                    contenthandle[x + 29 + 84 * 3] = BitConverter.GetBytes(frachars[count])[0];
-                    contenthandle[x + 29 + 84 * 3 - 1] = BitConverter.GetBytes(frachars[count])[1];
-                }
-                else { contenthandle[x + 29 + 84 * 3] = 0x00; contenthandle[x + 29 + 84 * 3 - 1] = 0x00; }
-                if (spachars.Length > count)
-                {
-                    contenthandle[x + 29 + 84 * 4] = BitConverter.GetBytes(spachars[count])[0];
-                    contenthandle[x + 29 + 84 * 4 - 1] = BitConverter.GetBytes(spachars[count])[1];
-                }
-                else { contenthandle[x + 29 + 84 * 4] = 0x00; contenthandle[x + 29 + 84 * 4 - 1] = 0x00; }
-                if (itachars.Length > count)
-                {
-                    contenthandle[x + 29 + 84 * 5] = BitConverter.GetBytes(itachars[count])[0];
-                    contenthandle[x + 29 + 84 * 5 - 1] = BitConverter.GetBytes(itachars[count])[1];
-                }
-                else { contenthandle[x + 29 + 84 * 5] = 0x00; contenthandle[x + 29 + 84 * 5 - 1] = 0x00; }
-                if (dutchars.Length > count)
-                {
-                    contenthandle[x + 29 + 84 * 6] = BitConverter.GetBytes(dutchars[count])[0];
-                    contenthandle[x + 29 + 84 * 6 - 1] = BitConverter.GetBytes(dutchars[count])[1];
-                }
-                else { contenthandle[x + 29 + 84 * 6] = 0x00; contenthandle[x + 29 + 84 * 6 - 1] = 0x00; }
-                if (korchars.Length > count)
-                {
-                    contenthandle[x + 29 + 84 * 9] = BitConverter.GetBytes(korchars[count])[0];
-                    contenthandle[x + 29 + 84 * 9 - 1] = BitConverter.GetBytes(korchars[count])[1];
-                }
-                else { contenthandle[x + 29 + 84 * 9] = 0x00; contenthandle[x + 29 + 84 * 9 - 1] = 0x00; }
-
-                count++;
-            }
-
-            Tools.ChangeProgress(50);
-
-            byte[] newmd5 = new byte[16];
-            contenthandle = FixMD5InImet(contenthandle, out newmd5);
-            byte[] newsha = sha1.ComputeHash(contenthandle);
-
-            contenthandle = EncryptContent(contenthandle, WadInfo.ReturnTmd(wadfile), nullapp, titlekey, false);
-
-            Tools.ChangeProgress(70);
-
-            for (int y = 0; y < contenthandle.Length; y++)
-            {
-                wadfile[contentpos + y] = contenthandle[y];
-            }
-
-			Tools.ChangeProgress(80);
-            //SHA1 in TMD
-            byte[] tmd = Tools.GetPartOfByteArray(wadfile, tmdpos, tmdsize);
-            for (int i = 0; i < 20; i++)
-                tmd[0x1f4 + (36 * nullapp) + i] = newsha[i];
-            TruchaSign(tmd, 1);
-            wadfile = Tools.InsertByteArray(wadfile, tmd, tmdpos);
-
-            Tools.ChangeProgress(100);
-            return wadfile;
-        }
-
-        /// <summary>
-        /// Changes the Title ID in the Tik or Tmd file
-        /// </summary>
-        /// <param name="tiktmd"></param>
-        /// <param name="type">0 = Tik, 1 = Tmd</param>
-        /// <returns></returns>
-        public static void ChangeTitleID(string tiktmdfile, int type, string titleid)
-        {
-            byte[] temp = Tools.LoadFileToByteArray(tiktmdfile);
-            temp = ChangeTitleID(temp, type, titleid);
-            Tools.SaveFileFromByteArray(temp, tiktmdfile);
-        }
-
-        /// <summary>
-        /// Changes the Title ID in the Tik or Tmd file
-        /// </summary>
-        /// <param name="tiktmd"></param>
-        /// <param name="type">0 = Tik, 1 = Tmd</param>
-        /// <returns></returns>
-        public static byte[] ChangeTitleID(byte[] tiktmd, int type, string titleid)
-        {
-            int offset = 0x1e0;
-            if (type == 1) offset = 0x190;
-            char[] id = titleid.ToCharArray();
-
-            tiktmd[offset] = (byte)id[0];
-            tiktmd[offset + 1] = (byte)id[1];
-            tiktmd[offset + 2] = (byte)id[2];
-            tiktmd[offset + 3] = (byte)id[3];
-
-            tiktmd = TruchaSign(tiktmd, type);
-
-            return tiktmd;
-        }
-
-        /// <summary>
-        /// Changes the title ID of the wad file
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <param name="titleid"></param>
-        /// <returns></returns>
-        public static byte[] ChangeTitleID(byte[] wadfile, string titleid)
-        {
-            Tools.ChangeProgress(0);
-
-            int tikpos = WadInfo.GetTikPos(wadfile);
-            int tmdpos = WadInfo.GetTmdPos(wadfile);
-            char[] id = titleid.ToCharArray();
-
-            byte[] oldtitlekey = WadInfo.GetTitleKey(wadfile);
-
-            Tools.ChangeProgress(20);
-
-            //Change the ID in the ticket
-            wadfile[tikpos + 0x1e0] = (byte)id[0];
-            wadfile[tikpos + 0x1e1] = (byte)id[1];
-            wadfile[tikpos + 0x1e2] = (byte)id[2];
-            wadfile[tikpos + 0x1e3] = (byte)id[3];
-
-            //Change the ID in the tmd
-            wadfile[tmdpos + 0x190] = (byte)id[0];
-            wadfile[tmdpos + 0x191] = (byte)id[1];
-            wadfile[tmdpos + 0x192] = (byte)id[2];
-            wadfile[tmdpos + 0x193] = (byte)id[3];
-
-            Tools.ChangeProgress(40);
-
-            //Trucha-Sign both
-            wadfile = TruchaSign(wadfile, 0);
-
-            Tools.ChangeProgress(50);
-
-            wadfile = TruchaSign(wadfile, 1);
-
-            Tools.ChangeProgress(60);
-
-            byte[] newtitlekey = WadInfo.GetTitleKey(wadfile);
-            byte[] tmd = WadInfo.ReturnTmd(wadfile);
-
-            int contentcount = WadInfo.GetContentNum(wadfile);
-
-            wadfile = ReEncryptAllContents(wadfile, oldtitlekey, newtitlekey);
-
-            Tools.ChangeProgress(100);
-            return wadfile;
-        }
-
-        /// <summary>
-        /// Changes the title ID of the wad file
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <param name="titleid"></param>
-        public static void ChangeTitleID(string wadfile, string titleid)
-        {
-            byte[] wadarray = Tools.LoadFileToByteArray(wadfile);
-            wadarray = ChangeTitleID(wadarray, titleid);
-
-            using (FileStream fs = new FileStream(wadfile, FileMode.Open, FileAccess.Write))
-            {
-                fs.Seek(0, SeekOrigin.Begin);
-                fs.Write(wadarray, 0, wadarray.Length);
-            }
-        }
-
-        /// <summary>
-        /// Clears the Signature of the Tik / Tmd to 0x00
-        /// </summary>
-        /// <param name="wadtiktmd">Wad, Tik or Tmd</param>
-        /// <param name="type">0 = Tik, 1 = Tmd</param>
-        /// <returns></returns>
-        public static byte[] ClearSignature(byte[] wadtiktmd, int type)
-        {
-            int tmdtikpos = 0;
-            int tmdtiksize = wadtiktmd.Length; ;
-
-            if (WadInfo.IsThisWad(wadtiktmd) == true)
-            {
-                //It's a wad file, so get the tik or tmd position and length
-                switch (type)
-                {
-                    case 1:
-                        tmdtikpos = WadInfo.GetTmdPos(wadtiktmd);
-                        tmdtiksize = WadInfo.GetTmdSize(wadtiktmd);
-                        break;
-                    default:
-                        tmdtikpos = WadInfo.GetTikPos(wadtiktmd);
-                        tmdtiksize = WadInfo.GetTikSize(wadtiktmd);
-                        break;
-                }
-            }
-
-            for (int i = 4; i < 260; i++)
-            {
-                wadtiktmd[tmdtikpos + i] = 0x00;
-            }
-
-            return wadtiktmd;
-        }
-
-        /// <summary>
-        /// Trucha-Signs the Tik or Tmd
-        /// </summary>
-        /// <param name="file">Wad or Tik or Tmd</param>
-        /// <param name="type">0 = Tik, 1 = Tmd</param>
-        /// <returns></returns>
-        public static void TruchaSign(string file, int type)
-        {
-            byte[] temp = Tools.LoadFileToByteArray(file);
-            temp = TruchaSign(temp, type);
-            Tools.SaveFileFromByteArray(temp, file);
-        }
-
-        /// <summary>
-        /// Trucha-Signs the Tik or Tmd
-        /// </summary>
-        /// <param name="wadortmd">Wad or Tik or Tmd</param>
-        /// <param name="type">0 = Tik, 1 = Tmd</param>
-        /// <returns></returns>
-        public static byte[] TruchaSign(byte[] wadtiktmd, int type)
-        {
-            SHA1Managed sha = new SHA1Managed();
-            int[] position = new int[2] { 0x1f2, 0x1d4 };
-            int[] tosign = new int[2] { 0x140, 0x140 };
-            int tiktmdpos = 0;
-            int tiktmdsize = wadtiktmd.Length;
-
-            if (sha.ComputeHash(wadtiktmd, tiktmdpos + tosign[type], tiktmdsize - tosign[type])[0] != 0x00)
-            {
-                ClearSignature(wadtiktmd, type);
-
-                if (WadInfo.IsThisWad(wadtiktmd) == true)
-                {
-                    //It's a wad file
-                    if (type == 0) //Get Tik position and size
-                    {
-                        tiktmdpos = WadInfo.GetTikPos(wadtiktmd);
-                        tiktmdsize = WadInfo.GetTikSize(wadtiktmd);
-                    }
-                    else //Get Tmd position and size
-                    {
-                        tiktmdpos = WadInfo.GetTmdPos(wadtiktmd);
-                        tiktmdsize = WadInfo.GetTmdSize(wadtiktmd);
-                    }
-                }
-
-                byte[] sha1 = new byte[20];
-
-                for (UInt16 i = 0; i < 65535; i++)
-                {
-                    byte[] hex = BitConverter.GetBytes(i);
-                    wadtiktmd[tiktmdpos + position[type]] = hex[0];
-                    wadtiktmd[tiktmdpos + position[type] + 1] = hex[1];
-
-                    sha1 = sha.ComputeHash(wadtiktmd, tiktmdpos + tosign[type], tiktmdsize - tosign[type]);
-                    if (sha1[0] == 0x00) break;
-                }
-
-                return wadtiktmd;
-            }
-            else return wadtiktmd;
-        }
-
-        /// <summary>
-        /// Decrypts the given content
-        /// </summary>
-        /// <param name="content"></param>
-        /// <returns></returns>
-        public static byte[] DecryptContent(byte[] wadfile, int contentcount, byte[] titlekey)
-        {
-            int tmdpos = WadInfo.GetTmdPos(wadfile);
-            byte[] iv = new byte[16];
-            string[,] continfo = WadInfo.GetContentInfo(wadfile);
-            int contentsize = Convert.ToInt32(continfo[contentcount, 3]);
-            int paddedsize = Tools.AddPadding(contentsize, 16);
-
-            int contentpos = 64 + Tools.AddPadding(WadInfo.GetCertSize(wadfile)) + Tools.AddPadding(WadInfo.GetTikSize(wadfile)) + Tools.AddPadding(WadInfo.GetTmdSize(wadfile));
-
-            for (int x = 0; x < contentcount; x++)
-            {
-                contentpos += Tools.AddPadding(Convert.ToInt32(continfo[x, 3]));
-            }
-
-            iv[0] = wadfile[tmdpos + 0x1e8 + (0x24 * contentcount)];
-            iv[1] = wadfile[tmdpos + 0x1e9 + (0x24 * contentcount)];
-
-            RijndaelManaged decrypt = new RijndaelManaged();
-            decrypt.Mode = CipherMode.CBC;
-            decrypt.Padding = PaddingMode.None;
-            decrypt.KeySize = 128;
-            decrypt.BlockSize = 128;
-            decrypt.Key = titlekey;
-            decrypt.IV = iv;
-
-            ICryptoTransform cryptor = decrypt.CreateDecryptor();
-
-            MemoryStream memory = new MemoryStream(wadfile, contentpos, paddedsize);
-            CryptoStream crypto = new CryptoStream(memory, cryptor, CryptoStreamMode.Read);
-
-            bool fullread = false;
-            byte[] buffer = new byte[16384];
-            byte[] cont = new byte[1];
-
-            using (MemoryStream ms = new MemoryStream())
-            {
-                while (fullread == false)
-                {
-                    int len = 0;
-                    if ((len = crypto.Read(buffer, 0, buffer.Length)) <= 0)
-                    {
-                        fullread = true;
-                        cont = ms.ToArray();
-                    }
-                    ms.Write(buffer, 0, len);
-                }
-            }
-
-            memory.Close();
-            crypto.Close();
-
-            Array.Resize(ref cont, contentsize);
-
-            return cont;
-        }
-
-        /// <summary>
-        /// Decrypts the given content
-        /// </summary>
-        /// <param name="content"></param>
-        /// <param name="tmd"></param>
-        /// <param name="contentcount"></param>
-        /// <param name="titlekey"></param>
-        /// <returns></returns>
-        public static byte[] DecryptContent(byte[] content, byte[] tmd, int contentcount, byte[] titlekey)
-        {
-            byte[] iv = new byte[16];
-            string[,] continfo = WadInfo.GetContentInfo(tmd);
-            int contentsize = content.Length;
-            int paddedsize = Tools.AddPadding(contentsize, 16);
-            Array.Resize(ref content, paddedsize);
-
-            iv[0] = tmd[0x1e8 + (0x24 * contentcount)];
-            iv[1] = tmd[0x1e9 + (0x24 * contentcount)];
-
-            RijndaelManaged decrypt = new RijndaelManaged();
-            decrypt.Mode = CipherMode.CBC;
-            decrypt.Padding = PaddingMode.None;
-            decrypt.KeySize = 128;
-            decrypt.BlockSize = 128;
-            decrypt.Key = titlekey;
-            decrypt.IV = iv;
-
-            ICryptoTransform cryptor = decrypt.CreateDecryptor();
-
-            MemoryStream memory = new MemoryStream(content, 0, paddedsize);
-            CryptoStream crypto = new CryptoStream(memory, cryptor, CryptoStreamMode.Read);
-
-            bool fullread = false;
-            byte[] buffer = new byte[memory.Length];
-            byte[] cont = new byte[1];
-
-            using (MemoryStream ms = new MemoryStream())
-            {
-                while (fullread == false)
-                {
-                    int len = 0;
-                    if ((len = crypto.Read(buffer, 0, buffer.Length)) <= 0)
-                    {
-                        fullread = true;
-                        cont = ms.ToArray();
-                    }
-                    ms.Write(buffer, 0, len);
-                }
-            }
-
-            memory.Close();
-            crypto.Close();
-
-            return cont;
-        }
-
-        /// <summary>
-        /// Encrypts the given content and adds a padding to the next 64 bytes
-        /// </summary>
-        /// <param name="content"></param>
-        /// <param name="tmd"></param>
-        /// <param name="contentcount"></param>
-        /// <param name="titlekey"></param>
-        /// <returns></returns>
-        public static byte[] EncryptContent(byte[] content, byte[] tmd, int contentcount, byte[] titlekey, bool addpadding)
-        {
-            byte[] iv = new byte[16];
-            string[,] continfo = WadInfo.GetContentInfo(tmd);
-            int contentsize = content.Length;
-            int paddedsize = Tools.AddPadding(contentsize, 16);
-            Array.Resize(ref content, paddedsize);
-
-            iv[0] = tmd[0x1e8 + (0x24 * contentcount)];
-            iv[1] = tmd[0x1e9 + (0x24 * contentcount)];
-
-            RijndaelManaged encrypt = new RijndaelManaged();
-            encrypt.Mode = CipherMode.CBC;
-            encrypt.Padding = PaddingMode.None;
-            encrypt.KeySize = 128;
-            encrypt.BlockSize = 128;
-            encrypt.Key = titlekey;
-            encrypt.IV = iv;
-
-            ICryptoTransform cryptor = encrypt.CreateEncryptor();
-
-            MemoryStream memory = new MemoryStream(content, 0, paddedsize);
-            CryptoStream crypto = new CryptoStream(memory, cryptor, CryptoStreamMode.Read);
-
-            bool fullread = false;
-            byte[] buffer = new byte[memory.Length];
-            byte[] cont = new byte[1];
-
-            using (MemoryStream ms = new MemoryStream())
-            {
-                while (fullread == false)
-                {
-                    int len = 0;
-                    if ((len = crypto.Read(buffer, 0, buffer.Length)) <= 0)
-                    {
-                        fullread = true;
-                        cont = ms.ToArray();
-                    }
-                    ms.Write(buffer, 0, len);
-                }
-            }
-
-            memory.Close();
-            crypto.Close();
-
-            if (addpadding == true) { Array.Resize(ref cont, Tools.AddPadding(cont.Length)); }
-            return cont;
-        }
-
-        /// <summary>
-        /// Re-Encrypts the given content
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static byte[] ReEncryptAllContents(byte[] wadfile, byte[] oldtitlekey, byte[] newtitlekey)
-        {
-            int contentnum = WadInfo.GetContentNum(wadfile);
-            int certsize = WadInfo.GetCertSize(wadfile);
-            int tiksize = WadInfo.GetTikSize(wadfile);
-            int tmdsize = WadInfo.GetTmdSize(wadfile);
-            int contentpos = 64 + Tools.AddPadding(certsize) + Tools.AddPadding(tiksize) + Tools.AddPadding(tmdsize);
-
-            for (int i = 0; i < contentnum; i++)
-            {
-                byte[] tmd = WadInfo.ReturnTmd(wadfile);
-                byte[] decryptedcontent = DecryptContent(wadfile, i, oldtitlekey);
-                byte[] encryptedcontent = EncryptContent(decryptedcontent, tmd, i, newtitlekey, false);
-
-                for (int j = 0; j < encryptedcontent.Length; j++)
-                {
-                    wadfile[contentpos + j] = encryptedcontent[j];
-                }
-                contentpos += Tools.AddPadding(encryptedcontent.Length);
-            }
-
-            return wadfile;
-        }
-
-        /// <summary>
-        /// Fixes the MD5 Sum in the IMET Header
-        /// </summary>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        public static byte[] FixMD5InImet(byte[] file, out byte[] newmd5)
-        {
-            if (Convert.ToChar(file[128]) == 'I' &&
-                Convert.ToChar(file[129]) == 'M' &&
-                Convert.ToChar(file[130]) == 'E' &&
-                Convert.ToChar(file[131]) == 'T')
-            {
-                byte[] buffer = new byte[1536];
-
-                using (MemoryStream ms = new MemoryStream())
-                {
-                    ms.Write(file, 0x40, 1536);
-                    buffer = ms.ToArray();
-                }
-
-                for (int i = 0; i < 16; i++)
-                    buffer[1520 + i] = 0x00;
-
-                MD5 md5 = new MD5CryptoServiceProvider();
-                byte[] hash = md5.ComputeHash(buffer);
-
-                for (int i = 0; i < 16; i++)
-                    file[1584 + i] = hash[i];
-
-                newmd5 = hash;
-                return file;
-            }
-            else
-            {
-                byte[] oldmd5 = new byte[16];
-
-                using (MemoryStream ms = new MemoryStream())
-                {
-                    ms.Write(file, 1584, 16);
-                    oldmd5 = ms.ToArray();
-                }
-
-                newmd5 = oldmd5;
-                return file;
-            }
-        }
-
-        /// <summary>
-        /// Fixes the MD5 Sum in the IMET Header.
-        /// </summary>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        public static byte[] FixMD5InImet(byte[] file)
-        {
-            byte[] tmp = new byte[16];
-            return FixMD5InImet(file, out tmp);
-        }
-
-        /// <summary>
-        /// Updates the Content Info in the Tmd.
-        /// Tmd and Contents must be in the same Directory
-        /// </summary>
-        /// <param name="tmdfile"></param>
-        public static void UpdateTmdContents(string tmdfile)
-        {
-            FileStream tmd = new FileStream(tmdfile, FileMode.Open, FileAccess.ReadWrite);
-
-            tmd.Seek(0x1de, SeekOrigin.Begin);
-            int contentcount = Tools.HexStringToInt(tmd.ReadByte().ToString("x2") + tmd.ReadByte().ToString("x2"));
-
-            for (int i = 0; i < contentcount; i++)
-            {
-                int oldsize = 0;
-                int contentpos = 0x1e4 + (36 * i);
-
-                tmd.Seek(contentpos + 4, SeekOrigin.Begin);
-                string index = "0000" + tmd.ReadByte().ToString("x2") + tmd.ReadByte().ToString("x2");
-
-                tmd.Seek(contentpos + 8, SeekOrigin.Begin);
-                try
-                {
-                    oldsize = Tools.HexStringToInt(tmd.ReadByte().ToString("x2") +
-                        tmd.ReadByte().ToString("x2") +
-                        tmd.ReadByte().ToString("x2") +
-                        tmd.ReadByte().ToString("x2") +
-                        tmd.ReadByte().ToString("x2") +
-                        tmd.ReadByte().ToString("x2") +
-                        tmd.ReadByte().ToString("x2") +
-                        tmd.ReadByte().ToString("x2"));
-                }
-                catch { }
-
-                byte[] oldsha1 = new byte[20];
-                tmd.Read(oldsha1, 0, oldsha1.Length);
-
-                if (File.Exists(tmdfile.Remove(tmdfile.LastIndexOf('\\') + 1) + index + ".app"))
-                {
-                    byte[] content = Wii.Tools.LoadFileToByteArray(tmdfile.Remove(tmdfile.LastIndexOf('\\') + 1) + index + ".app");
-                    int newsize = content.Length;
-                    
-                    if (newsize != oldsize)
-                    {
-                        byte[] changedsize = Tools.FileLengthToByteArray(newsize);
-
-                        tmd.Seek(contentpos + 8, SeekOrigin.Begin);
-                        for (int x = 8; x > changedsize.Length; x--) tmd.WriteByte(0x00);
-                        tmd.Write(changedsize, 0, changedsize.Length);
-                    }
-
-                    SHA1Managed sha1 = new SHA1Managed();
-                    byte[] newsha1 = sha1.ComputeHash(content);
-                    sha1.Clear();
-
-                    if (Tools.CompareByteArrays(newsha1, oldsha1) == false)
-                    {
-                        tmd.Seek(contentpos + 16, SeekOrigin.Begin);
-                        tmd.Write(newsha1, 0, newsha1.Length);
-                    }
-                }
-                else
-                {
-                    throw new Exception("At least one content file wasn't found!");
-                }
-            }
-
-            tmd.Close();
-        }
-
-        /// <summary>
-        /// Changes the Boot Index in the Tmd to the given value
-        /// </summary>
-        /// <param name="wadtmd"></param>
-        /// <returns></returns>
-        public static byte[] ChangeTmdBootIndex(byte[] wadtmd, int newindex)
-        {
-            int tmdpos = 0;
-
-            if (WadInfo.IsThisWad(wadtmd) == true)
-                tmdpos = WadInfo.GetTmdPos(wadtmd);
-
-            byte[] index = BitConverter.GetBytes((UInt16)newindex);
-            wadtmd[tmdpos + 0x1e0] = index[1];
-            wadtmd[tmdpos + 0x1e1] = index[0];
-
-            return wadtmd;
-        }
-
-        /// <summary>
-        /// Changes the Content Count in the Tmd
-        /// </summary>
-        /// <param name="wadtmd"></param>
-        /// <param name="newcount"></param>
-        /// <returns></returns>
-        public static byte[] ChangeTmdContentCount(byte[] wadtmd, int newcount)
-        {
-            int tmdpos = 0;
-
-            if (WadInfo.IsThisWad(wadtmd) == true)
-                tmdpos = WadInfo.GetTmdPos(wadtmd);
-
-            byte[] count = BitConverter.GetBytes((UInt16)newcount);
-            wadtmd[tmdpos + 0x1de] = count[1];
-            wadtmd[tmdpos + 0x1df] = count[0];
-
-            return wadtmd;
-        }
-
-        /// <summary>
-        /// Changes the Slot where the IOS Wad will be installed to
-        /// </summary>
-        /// <param name="wad"></param>
-        /// <param name="newslot"></param>
-        /// <returns></returns>
-        public static byte[] ChangeIosSlot(byte[] wadfile, int newslot)
-        {
-            Tools.ChangeProgress(0);
-
-            int tikpos = WadInfo.GetTikPos(wadfile);
-            int tmdpos = WadInfo.GetTmdPos(wadfile);
-            byte[] slot = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(newslot));
-
-            byte[] oldtitlekey = WadInfo.GetTitleKey(wadfile);
-
-            Tools.ChangeProgress(20);
-
-            //Change the ID in the ticket
-            wadfile[tikpos + 0x1e0] = slot[0];
-            wadfile[tikpos + 0x1e1] = slot[1];
-            wadfile[tikpos + 0x1e2] = slot[2];
-            wadfile[tikpos + 0x1e3] = slot[3];
-
-            //Change the ID in the tmd
-            wadfile[tmdpos + 0x190] = slot[0];
-            wadfile[tmdpos + 0x191] = slot[1];
-            wadfile[tmdpos + 0x192] = slot[2];
-            wadfile[tmdpos + 0x193] = slot[3];
-
-            Tools.ChangeProgress(40);
-
-            //Trucha-Sign both
-            wadfile = TruchaSign(wadfile, 0);
-
-            Tools.ChangeProgress(50);
-
-            wadfile = TruchaSign(wadfile, 1);
-
-            Tools.ChangeProgress(60);
-
-            byte[] newtitlekey = WadInfo.GetTitleKey(wadfile);
-            byte[] tmd = WadInfo.ReturnTmd(wadfile);
-
-            int contentcount = WadInfo.GetContentNum(wadfile);
-
-            wadfile = ReEncryptAllContents(wadfile, oldtitlekey, newtitlekey);
-
-            Tools.ChangeProgress(100);
-            return wadfile;
-        }
-
-        /// <summary>
-        /// Changes the Title Version of a Wad or Tmd
-        /// </summary>
-        /// <param name="wadtmd"></param>
-        /// <param name="newversion"></param>
-        /// <returns></returns>
-        public static byte[] ChangeTitleVersion(byte[] wadtmd, int newversion)
-        {
-            if (newversion > 65535) throw new Exception("Version can be max. 65535");
-
-            int offset = 0x1dc;
-            int tmdpos = 0;
-
-            if (WadInfo.IsThisWad(wadtmd))
-                tmdpos = WadInfo.GetTmdPos(wadtmd);
-
-            byte[] version = BitConverter.GetBytes((UInt16)newversion);
-            Array.Reverse(version);
-
-            wadtmd[tmdpos + offset] = version[0];
-            wadtmd[tmdpos + offset + 1] = version[1];
-
-            wadtmd = TruchaSign(wadtmd, 1);
-
-            return wadtmd;
-        }
-
-        /// <summary>
-        /// Changes the Title Key in the Tik
-        /// </summary>
-        /// <param name="tik"></param>
-        /// <returns></returns>
-        public static byte[] ChangeTitleKey(byte[] tik)
-        {
-            byte[] newKey = new byte[] { 0x47, 0x6f, 0x74, 0x74, 0x61, 0x47, 0x65, 0x74, 0x53, 0x6f, 0x6d, 0x65, 0x42, 0x65, 0x65, 0x72 };
-            Tools.InsertByteArray(tik, newKey, 447);
-            return tik;
-        }
-
-        /// <summary>
-        /// Returns the decrypted TitleKey
-        /// </summary>
-        /// <param name="wadtik"></param>
-        /// <returns></returns>
-        public static byte[] GetTitleKey(byte[] encryptedkey, byte[] titleid)
-        {
-            byte[] commonkey = new byte[16];
-
-            if (File.Exists(System.Windows.Forms.Application.StartupPath + "\\common-key.bin"))
-            { commonkey = Tools.LoadFileToByteArray(System.Windows.Forms.Application.StartupPath + "\\common-key.bin"); }
-            else if (File.Exists(System.Windows.Forms.Application.StartupPath + "\\key.bin"))
-            { commonkey = Tools.LoadFileToByteArray(System.Windows.Forms.Application.StartupPath + "\\key.bin"); }
-            else { throw new FileNotFoundException("The (common-)key.bin must be in the application directory!"); }
-
-            Array.Resize(ref titleid, 16);
-
-            RijndaelManaged decrypt = new RijndaelManaged();
-            decrypt.Mode = CipherMode.CBC;
-            decrypt.Padding = PaddingMode.None;
-            decrypt.KeySize = 128;
-            decrypt.BlockSize = 128;
-            decrypt.Key = commonkey;
-            decrypt.IV = titleid;
-
-            ICryptoTransform cryptor = decrypt.CreateDecryptor();
-
-            MemoryStream memory = new MemoryStream(encryptedkey);
-            CryptoStream crypto = new CryptoStream(memory, cryptor, CryptoStreamMode.Read);
-
-            byte[] decryptedkey = new byte[16];
-            crypto.Read(decryptedkey, 0, decryptedkey.Length);
-
-            crypto.Close();
-            memory.Close();
-
-            return decryptedkey;
-        }
-
-        /// <summary>
-        /// Changes the IOS flag (IOS used to launch the title)
-        /// </summary>
-        /// <param name="wadtmd"></param>
-        /// <returns></returns>
-        public static void ChangeIosFlag(string wadtmd, int newIos)
-        {
-            if (newIos < 0 || newIos > 255) throw new Exception("IOS must be between 0 and 255!");
-
-            Tools.SaveFileFromByteArray(ChangeIosFlag(Tools.LoadFileToByteArray(wadtmd), newIos), wadtmd);
-        }
-
-        /// <summary>
-        /// Changes the IOS flag (IOS used to launch the title)
-        /// </summary>
-        /// <param name="wadtmd"></param>
-        /// <returns></returns>
-        public static byte[] ChangeIosFlag(byte[] wadtmd, int newIos)
-        {
-            if (newIos < 0 || newIos > 255) throw new Exception("IOS must be between 0 and 255!");
-
-            int tmdpos = 0;
-            if (WadInfo.IsThisWad(wadtmd)) tmdpos = WadInfo.GetTmdPos(wadtmd);
-
-            wadtmd[tmdpos + 395] = (byte)newIos;
-            return wadtmd;
-        }
-    }
-
-    public class WadUnpack
-    {
-        /// <summary>
-        /// Unpacks the 00000000.app of a wad
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static void UnpackNullApp(string wadfile, string destination)
-        {
-            if (!destination.EndsWith(".app")) destination += "\\00000000.app";
-
-            byte[] wad = Tools.LoadFileToByteArray(wadfile);
-            byte[] nullapp = UnpackNullApp(wad);
-            Tools.SaveFileFromByteArray(nullapp, destination);
-        }
-
-        /// <summary>
-        /// Unpacks the 00000000.app of a wad
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <returns></returns>
-        public static byte[] UnpackNullApp(byte[] wadfile)
-        {
-            int certsize = WadInfo.GetCertSize(wadfile);
-            int tiksize = WadInfo.GetTikSize(wadfile);
-            int tmdpos = WadInfo.GetTmdPos(wadfile);
-            int tmdsize = WadInfo.GetTmdSize(wadfile);
-            int contentpos = 64 + Tools.AddPadding(certsize) + Tools.AddPadding(tiksize) + Tools.AddPadding(tmdsize);
-
-            byte[] titlekey = WadInfo.GetTitleKey(wadfile);
-            string[,] contents = WadInfo.GetContentInfo(wadfile);
-
-            for (int i = 0; i < contents.GetLength(0); i++)
-            {
-                if (contents[i, 1] == "00000000")
-                {
-                    return WadEdit.DecryptContent(wadfile, i, titlekey);
-                }
-            }
-
-            throw new Exception("00000000.app couldn't be found in the Wad");
-        }
-
-        /// <summary>
-        /// Unpacks the the wad file
-        /// </summary>
-        public static void UnpackWad(string pathtowad, string destinationpath)
-        {
-            byte[] wadfile = Tools.LoadFileToByteArray(pathtowad);
-            UnpackWad(wadfile, destinationpath);
-        }
-
-        /// <summary>
-        /// Unpacks the the wad file
-        /// </summary>
-        public static void UnpackWad(string pathtowad, string destinationpath, out bool hashesmatch)
-        {
-            byte[] wadfile = Tools.LoadFileToByteArray(pathtowad);
-            UnpackWad(wadfile, destinationpath, out hashesmatch);
-        }
-
-        /// <summary>
-        /// Unpacks the wad file to *wadpath*\wadunpack\
-        /// </summary>
-        /// <param name="pathtowad"></param>
-        public static void UnpackWad(string pathtowad)
-        {
-            string destinationpath = pathtowad.Remove(pathtowad.LastIndexOf('\\'));
-            byte[] wadfile = Tools.LoadFileToByteArray(pathtowad);
-            UnpackWad(wadfile, destinationpath);
-        }
-
-        /// <summary>
-        /// Unpacks the wad file
-        /// </summary>
-        public static void UnpackWad(byte[] wadfile, string destinationpath)
-        {
-            bool temp;
-            UnpackWad(wadfile, destinationpath, out temp);
-        }
-
-        /// <summary>
-        /// Unpacks the wad file
-        /// </summary>
-        public static void UnpackWad(byte[] wadfile, string destinationpath, out bool hashesmatch)
-        {
-            if (destinationpath[destinationpath.Length - 1] != '\\')
-            { destinationpath = destinationpath + "\\"; }
-
-            hashesmatch = true;
-
-            if (!Directory.Exists(destinationpath))
-            { Directory.CreateDirectory(destinationpath); }
-            if (Directory.GetFiles(destinationpath, "*.app").Length > 0)
-            {
-                throw new Exception("At least one of the files to unpack already exists!");
-            }
-
-            int certpos = 0x40;
-            int certsize = WadInfo.GetCertSize(wadfile);
-            int tikpos = WadInfo.GetTikPos(wadfile);
-            int tiksize = WadInfo.GetTikSize(wadfile);
-            int tmdpos = WadInfo.GetTmdPos(wadfile);
-            int tmdsize = WadInfo.GetTmdSize(wadfile);
-            int contentlength = WadInfo.GetContentSize(wadfile);
-            int footersize = WadInfo.GetFooterSize(wadfile);
-            int footerpos = 64 + Tools.AddPadding(certsize) + Tools.AddPadding(tiksize) + Tools.AddPadding(tmdsize) + Tools.AddPadding(contentlength);
-            string wadpath = WadInfo.GetNandPath(wadfile, 0).Remove(8, 1);
-            string[,] contents = WadInfo.GetContentInfo(wadfile);
-            byte[] titlekey = WadInfo.GetTitleKey(wadfile);
-            int contentpos = 64 + Tools.AddPadding(certsize) + Tools.AddPadding(tiksize) + Tools.AddPadding(tmdsize);
-
-            //unpack cert
-            using (FileStream cert = new FileStream(destinationpath + wadpath + ".cert", FileMode.Create))
-            {
-                cert.Seek(0, SeekOrigin.Begin);
-                cert.Write(wadfile, certpos, certsize);
-            }
-
-            //unpack ticket
-            using (FileStream tik = new FileStream(destinationpath + wadpath + ".tik", FileMode.Create))
-            {
-                tik.Seek(0, SeekOrigin.Begin);
-                tik.Write(wadfile, tikpos, tiksize);
-            }
-
-            //unpack tmd
-            using (FileStream tmd = new FileStream(destinationpath + wadpath + ".tmd", FileMode.Create))
-            {
-                tmd.Seek(0, SeekOrigin.Begin);
-                tmd.Write(wadfile, tmdpos, tmdsize);
-            }
-
-            //unpack trailer
-            try
-            {
-                if (footersize > 0)
-                {
-                    using (FileStream trailer = new FileStream(destinationpath + wadpath + ".trailer", FileMode.Create))
-                    {
-                        trailer.Seek(0, SeekOrigin.Begin);
-                        trailer.Write(wadfile, footerpos, footersize);
-                    }
-                }
-            }
-            catch { } //who cares if the trailer doesn't extract properly?
-
-            Tools.ChangeProgress(0);
-
-            //unpack contents
-            for (int i = 0; i < contents.GetLength(0); i++)
-            {
-                Tools.ChangeProgress((i + 1) * 100 / contents.GetLength(0));
-                byte[] thiscontent = WadEdit.DecryptContent(wadfile, i, titlekey);
-                FileStream content = new FileStream(destinationpath + contents[i, 1] + ".app", FileMode.Create);
-
-                content.Write(thiscontent, 0, thiscontent.Length);
-                content.Close();
-
-                contentpos += Tools.AddPadding(thiscontent.Length);
-
-                //sha1 comparison
-                SHA1Managed sha1 = new SHA1Managed();
-                byte[] thishash = sha1.ComputeHash(thiscontent);
-                byte[] tmdhash = Tools.HexStringToByteArray(contents[i, 4]);
-
-                if (Tools.CompareByteArrays(thishash, tmdhash) == false) hashesmatch = false;
-                //    throw new Exception("At least one content's hash doesn't match the hash in the Tmd!");
-            }
-        }
-
-        /// <summary>
-        /// Unpacks the wad file to the given directory.
-        /// Shared contents will be unpacked to /shared1
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <param name="nandpath"></param>
-        public static void UnpackToNand(string wadfile, string nandpath)
-        {
-            byte[] wadarray = Tools.LoadFileToByteArray(wadfile);
-            UnpackToNand(wadarray, nandpath);
-        }
-
-        /// <summary>
-        /// Unpacks the wad file to the given directory.
-        /// Shared contents will be unpacked to /shared1
-        /// </summary>
-        /// <param name="wadfile"></param>
-        /// <param name="nandpath"></param>
-        public static void UnpackToNand(byte[] wadfile, string nandpath)
-        {
-            string path = WadInfo.GetNandPath(wadfile, 0);
-            string path1 = path.Remove(path.IndexOf('\\'));
-            string path2 = path.Remove(0, path.IndexOf('\\') + 1);
-
-            if (nandpath[nandpath.Length - 1] != '\\') { nandpath = nandpath + "\\"; }
-
-            if (!Directory.Exists(nandpath + "ticket")) { Directory.CreateDirectory(nandpath + "ticket"); }
-            if (!Directory.Exists(nandpath + "title")) { Directory.CreateDirectory(nandpath + "title"); }
-            if (!Directory.Exists(nandpath + "ticket\\" + path1)) { Directory.CreateDirectory(nandpath + "ticket\\" + path1); }
-            if (!Directory.Exists(nandpath + "title\\" + path1)) { Directory.CreateDirectory(nandpath + "title\\" + path1); }
-            if (!Directory.Exists(nandpath + "title\\" + path1 + "\\" + path2)) { Directory.CreateDirectory(nandpath + "title\\" + path1 + "\\" + path2); }
-            if (!Directory.Exists(nandpath + "title\\" + path1 + "\\" + path2 + "\\content")) { Directory.CreateDirectory(nandpath + "title\\" + path1 + "\\" + path2 + "\\content"); }
-            if (!Directory.Exists(nandpath + "title\\" + path1 + "\\" + path2 + "\\data")) { Directory.CreateDirectory(nandpath + "title\\" + path1 + "\\" + path2 + "\\data"); }
-            if (!Directory.Exists(nandpath + "shared1")) Directory.CreateDirectory(nandpath + "shared1");
-
-            int certsize = WadInfo.GetCertSize(wadfile);
-            int tikpos = WadInfo.GetTikPos(wadfile);
-            int tiksize = WadInfo.GetTikSize(wadfile);
-            int tmdpos = WadInfo.GetTmdPos(wadfile);
-            int tmdsize = WadInfo.GetTmdSize(wadfile);
-            int contentlength = WadInfo.GetContentSize(wadfile);
-            string[,] contents = WadInfo.GetContentInfo(wadfile);
-            byte[] titlekey = WadInfo.GetTitleKey(wadfile);
-            int contentpos = 64 + Tools.AddPadding(certsize) + Tools.AddPadding(tiksize) + Tools.AddPadding(tmdsize);
-
-            //unpack ticket
-            using (FileStream tik = new FileStream(nandpath + "ticket\\" + path1 + "\\" + path2 + ".tik", FileMode.Create))
-            {
-                tik.Seek(0, SeekOrigin.Begin);
-                tik.Write(wadfile, tikpos, tiksize);
-            }
-
-            //unpack tmd
-            using (FileStream tmd = new FileStream(nandpath + "title\\" + path1 + "\\" + path2 + "\\content\\title.tmd", FileMode.Create))
-            {
-                tmd.Seek(0, SeekOrigin.Begin);
-                tmd.Write(wadfile, tmdpos, tmdsize);
-            }
-
-            Tools.ChangeProgress(0);
-
-            //unpack contents
-            for (int i = 0; i < contents.GetLength(0); i++)
-            {
-                Tools.ChangeProgress((i + 1) * 100 / contents.GetLength(0));
-                byte[] thiscontent = WadEdit.DecryptContent(wadfile, i, titlekey);
-
-                if (contents[i, 2] == "8001")
-                {
-                    if (File.Exists(nandpath + "shared1\\content.map"))
-                    {
-                        byte[] contmap = Tools.LoadFileToByteArray(nandpath + "shared1\\content.map");
-
-                        if (ContentMap.CheckSharedContent(contmap, contents[i, 4]) == false)
-                        {
-                            string newname = ContentMap.GetNewSharedContentName(contmap);
-
-                            FileStream content = new FileStream(nandpath + "shared1\\" + newname + ".app", FileMode.Create);
-                            content.Write(thiscontent, 0, thiscontent.Length);
-                            content.Close();
-                            ContentMap.AddSharedContent(nandpath + "shared1\\content.map", newname, contents[i, 4]);
-                        }
-                    }
-                    else
-                    {
-                        FileStream content = new FileStream(nandpath + "shared1\\00000000.app", FileMode.Create);
-                        content.Write(thiscontent, 0, thiscontent.Length);
-                        content.Close();
-                        ContentMap.AddSharedContent(nandpath + "shared1\\content.map", "00000000", contents[i, 4]);
-                    }
-                }
-                else
-                {
-                    FileStream content = new FileStream(nandpath + "title\\" + path1 + "\\" + path2 + "\\content\\" + contents[i, 0] + ".app", FileMode.Create);
-
-                    content.Write(thiscontent, 0, thiscontent.Length);
-                    content.Close();
-                }
-
-                contentpos += Tools.AddPadding(thiscontent.Length);
-            }
-
-            //add titleid to uid.sys, if it doesn't exist
-            string titleid = WadInfo.GetFullTitleID(wadfile, 1);
-
-            if (File.Exists(nandpath + "\\sys\\uid.sys"))
-            {
-                FileStream fs = new FileStream(nandpath + "\\sys\\uid.sys", FileMode.Open);
-                byte[] uidsys = new byte[fs.Length];
-                fs.Read(uidsys, 0, uidsys.Length);
-                fs.Close();
-
-                if (UID.CheckUID(uidsys, titleid) == false)
-                {
-                    uidsys = UID.AddUID(uidsys, titleid);
-                    Tools.SaveFileFromByteArray(uidsys, nandpath + "\\sys\\uid.sys");
-                }
-            }
-            else
-            {
-                if (!Directory.Exists(nandpath + "\\sys")) Directory.CreateDirectory(nandpath + "\\sys");
-                byte[] uidsys = UID.AddUID(new byte[0], titleid);
-                Tools.SaveFileFromByteArray(uidsys, nandpath + "\\sys\\uid.sys");
-            }
-        }
-    }
-
-    public class WadPack
-    {
-        public static byte[] wadheader = new byte[8] { 0x00, 0x00, 0x00, 0x20, 0x49, 0x73, 0x00, 0x00 };
-
-        /// <summary>
-        /// Gets the estimated size, might be !WRONG! due to Lz77 compression
-        /// </summary>
-        /// <param name="contentFolder"></param>
-        public static int GetEstimatedSize(string contentdirectory)
-        {
-            if (contentdirectory[contentdirectory.Length - 1] != '\\') { contentdirectory = contentdirectory + "\\"; }
-
-            if (!Directory.Exists(contentdirectory)) throw new DirectoryNotFoundException("The directory doesn't exists:\r\n" + contentdirectory);
-            if (Directory.GetFiles(contentdirectory, "*.app").Length < 1) throw new Exception("No *.app file was found");
-            if (Directory.GetFiles(contentdirectory, "*.cert").Length < 1) throw new Exception("No *.cert file was found");
-            if (Directory.GetFiles(contentdirectory, "*.tik").Length < 1) throw new Exception("No *.tik file was found");
-            if (Directory.GetFiles(contentdirectory, "*.tmd").Length < 1) throw new Exception("No *.tmd file was found");
-
-            int size = 64; //Wad Header
-
-            string[] certfile = Directory.GetFiles(contentdirectory, "*.cert");
-            string[] tikfile = Directory.GetFiles(contentdirectory, "*.tik");
-            string[] tmdfile = Directory.GetFiles(contentdirectory, "*.tmd");
-            string[,] contents = WadInfo.GetContentInfo(File.ReadAllBytes(tmdfile[0]));
-
-            FileInfo fi = new FileInfo(certfile[0]);
-            size += Tools.AddPadding((int)fi.Length);
-            fi = new FileInfo(tikfile[0]);
-            size += Tools.AddPadding((int)fi.Length);
-            fi = new FileInfo(tmdfile[0]);
-            size += Tools.AddPadding((int)fi.Length);
-
-            for (int i = 0; i < contents.GetLength(0); i++)
-                size += Tools.AddPadding(int.Parse(contents[i, 3]));
-
-            return size + 16; //Footer Timestamp
-        }
-
-        /// <summary>
-        /// Packs the contents in the given directory and creates the destination wad file 
-        /// </summary>
-        /// <param name="directory"></param>
-        public static void PackWad(string contentdirectory, string destinationfile)
-        {
-            if (contentdirectory[contentdirectory.Length - 1] != '\\') { contentdirectory = contentdirectory + "\\"; }
-
-            if (!Directory.Exists(contentdirectory)) throw new DirectoryNotFoundException("The directory doesn't exists:\r\n" + contentdirectory);
-            if (Directory.GetFiles(contentdirectory, "*.app").Length < 1) throw new Exception("No *.app file was found");
-            if (Directory.GetFiles(contentdirectory, "*.cert").Length < 1) throw new Exception("No *.cert file was found");
-            if (Directory.GetFiles(contentdirectory, "*.tik").Length < 1) throw new Exception("No *.tik file was found");
-            if (Directory.GetFiles(contentdirectory, "*.tmd").Length < 1) throw new Exception("No *.tmd file was found");
-            if (File.Exists(destinationfile)) throw new Exception("The destination file already exists!");
-
-            string[] certfile = Directory.GetFiles(contentdirectory, "*.cert");
-            string[] tikfile = Directory.GetFiles(contentdirectory, "*.tik");
-            string[] tmdfile = Directory.GetFiles(contentdirectory, "*.tmd");
-
-            byte[] cert = Tools.LoadFileToByteArray(certfile[0]);
-            byte[] tik = Tools.LoadFileToByteArray(tikfile[0]);
-            byte[] tmd = Tools.LoadFileToByteArray(tmdfile[0]);
-
-            tik = WadEdit.ChangeTitleKey(tik);
-
-            string[,] contents = WadInfo.GetContentInfo(tmd);
-
-            FileStream wadstream = new FileStream(destinationfile, FileMode.Create);
-
-            //Trucha-Sign Tik and Tmd, if they aren't already
-            WadEdit.TruchaSign(tik, 0);
-            WadEdit.TruchaSign(tmd, 1);
-
-            //Write Cert
-            wadstream.Seek(64, SeekOrigin.Begin);
-            wadstream.Write(cert, 0, cert.Length);
-
-            //Write Tik
-            wadstream.Seek(64 + Tools.AddPadding(cert.Length), SeekOrigin.Begin);
-            wadstream.Write(tik, 0, tik.Length);
-
-            //Write Tmd
-            wadstream.Seek(64 + Tools.AddPadding(cert.Length) + Tools.AddPadding(tik.Length), SeekOrigin.Begin);
-            wadstream.Write(tmd, 0, tmd.Length);
-
-            //Write Content
-            int allcont = 0;
-            int contpos = 64 + Tools.AddPadding(cert.Length) + Tools.AddPadding(tik.Length) + Tools.AddPadding(tmd.Length);
-            int contcount = WadInfo.GetContentNum(tmd);
-
-            Tools.ChangeProgress(0);
-            byte[] titlekey = WadInfo.GetTitleKey(tik);
-
-            for (int i = 0; i < contents.GetLength(0); i++)
-            {
-                Tools.ChangeProgress((i + 1) * 100 / contents.GetLength(0));
-                byte[] thiscont = Tools.LoadFileToByteArray(contentdirectory + contents[i, 1] + ".app");
-
-                //if (i == contents.GetLength(0) - 1) { thiscont = WadEdit.EncryptContent(thiscont, tmd, i, titlekey, false); }
-                //else { thiscont = WadEdit.EncryptContent(thiscont, tmd, i, titlekey, true); }
-                thiscont = WadEdit.EncryptContent(thiscont, tmd, i, titlekey, true);
-
-                wadstream.Seek(contpos, SeekOrigin.Begin);
-                wadstream.Write(thiscont, 0, thiscont.Length);
-                contpos += thiscont.Length;
-                allcont += thiscont.Length;
-            }
-
-            //Write Footer Timestamp
-            byte[] footer = Tools.GetTimestamp();
-            Array.Resize(ref footer, Tools.AddPadding(footer.Length));
-
-            wadstream.Seek(Tools.AddPadding(contpos), SeekOrigin.Begin);
-            wadstream.Write(footer, 0, footer.Length);
-
-            //Write Header
-            byte[] certsize = Tools.FileLengthToByteArray(cert.Length);
-            byte[] tiksize = Tools.FileLengthToByteArray(tik.Length);
-            byte[] tmdsize = Tools.FileLengthToByteArray(tmd.Length);
-            byte[] allcontsize = Tools.FileLengthToByteArray(allcont);
-            byte[] footersize = Tools.FileLengthToByteArray(footer.Length);
-
-            wadstream.Seek(0x00, SeekOrigin.Begin);
-            wadstream.Write(wadheader, 0, wadheader.Length);
-            wadstream.Seek(0x08, SeekOrigin.Begin);
-            wadstream.Write(certsize, 0, certsize.Length);
-            wadstream.Seek(0x10, SeekOrigin.Begin);
-            wadstream.Write(tiksize, 0, tiksize.Length);
-            wadstream.Seek(0x14, SeekOrigin.Begin);
-            wadstream.Write(tmdsize, 0, tmdsize.Length);
-            wadstream.Seek(0x18, SeekOrigin.Begin);
-            wadstream.Write(allcontsize, 0, allcontsize.Length);
-            wadstream.Seek(0x1c, SeekOrigin.Begin);
-            wadstream.Write(footersize, 0, footersize.Length);
-
-            wadstream.Close();
-        }
-
-        /// <summary>
-        /// Packs a Wad from a title installed on Nand
-        /// Returns: 0 = OK, 1 = Files missing, 2 = Shared contents missing, 3 = Cert missing
-        /// </summary>
-        /// <param name="nandpath"></param>
-        /// <param name="path">XXXXXXXX\XXXXXXXX</param>
-        /// <param name="destinationfile"></param>
-        /// <returns></returns>
-        public static void PackWadFromNand(string nandpath, string path, string destinationfile)
-        {
-            if (nandpath[nandpath.Length - 1] != '\\') { nandpath = nandpath + "\\"; }
-            string path1 = path.Remove(8);
-            string path2 = path.Remove(0, 9);
-            string ticketdir = nandpath + "ticket\\" + path1 + "\\";
-            string contentdir = nandpath + "title\\" + path1 + "\\" + path2 + "\\content\\";
-            string sharedir = nandpath + "shared1\\";
-            string certdir = nandpath + "sys\\";
-
-            if (!Directory.Exists(ticketdir) ||
-                !Directory.Exists(contentdir)) throw new DirectoryNotFoundException("Directory doesn't exist:\r\n" + contentdir);
-            if (!Directory.Exists(sharedir)) throw new DirectoryNotFoundException("Directory doesn't exist:\r\n" + sharedir);
-            if (!File.Exists(certdir + "cert.sys")) throw new FileNotFoundException("File doesn't exist:\r\n" + certdir + "cert.sys");
-
-            byte[] cert = Tools.LoadFileToByteArray(certdir + "cert.sys");
-            byte[] tik = Tools.LoadFileToByteArray(ticketdir + path2 + ".tik");
-            byte[] tmd = Tools.LoadFileToByteArray(contentdir + "title.tmd");
-
-            tik = WadEdit.ChangeTitleKey(tik);
-
-            string[,] contents = WadInfo.GetContentInfo(tmd);
-
-            FileStream wadstream = new FileStream(destinationfile, FileMode.Create);
-
-            //Trucha-Sign Tik and Tmd, if they aren't already
-            WadEdit.TruchaSign(tik, 0);
-            WadEdit.TruchaSign(tmd, 1);
-
-            //Write Cert
-            wadstream.Seek(64, SeekOrigin.Begin);
-            wadstream.Write(cert, 0, cert.Length);
-
-            //Write Tik
-            wadstream.Seek(64 + Tools.AddPadding(cert.Length), SeekOrigin.Begin);
-            wadstream.Write(tik, 0, tik.Length);
-
-            //Write Tmd
-            wadstream.Seek(64 + Tools.AddPadding(cert.Length) + Tools.AddPadding(tik.Length), SeekOrigin.Begin);
-            wadstream.Write(tmd, 0, tmd.Length);
-
-            //Write Content
-            int allcont = 0;
-            int contpos = 64 + Tools.AddPadding(cert.Length) + Tools.AddPadding(tik.Length) + Tools.AddPadding(tmd.Length);
-            int contcount = WadInfo.GetContentNum(tmd);
-
-            Tools.ChangeProgress(0);
-            byte[] titlekey = WadInfo.GetTitleKey(tik);
-            byte[] contentmap = Tools.LoadFileToByteArray(sharedir + "content.map");
-
-            for (int i = 0; i < contents.GetLength(0); i++)
-            {
-                Tools.ChangeProgress((i + 1) * 100 / contents.GetLength(0));
-                byte[] thiscont = new byte[1];
-
-                if (contents[i, 2] == "8001")
-                {
-                    string contname = ContentMap.GetSharedContentName(contentmap, contents[i, 4]);
-                    
-                    if (contname == "fail")
-                    {
-                        wadstream.Close();
-                        File.Delete(destinationfile);
-                        throw new FileNotFoundException("At least one shared content is missing!");
-                    }
-                    
-                    thiscont = Tools.LoadFileToByteArray(sharedir + contname + ".app");
-                }
-                else thiscont = Tools.LoadFileToByteArray(contentdir + contents[i, 0] + ".app");
-
-                //if (i == contents.GetLength(0) - 1) { thiscont = WadEdit.EncryptContent(thiscont, tmd, i, titlekey, false); }
-                //else { thiscont = WadEdit.EncryptContent(thiscont, tmd, i, titlekey, true); }
-                thiscont = WadEdit.EncryptContent(thiscont, tmd, i, titlekey, true);
-
-                wadstream.Seek(contpos, SeekOrigin.Begin);
-                wadstream.Write(thiscont, 0, thiscont.Length);
-                contpos += thiscont.Length;
-                allcont += thiscont.Length;
-            }
-
-            //Write Footer Timestamp
-            byte[] footer = Tools.GetTimestamp();
-            Array.Resize(ref footer, Tools.AddPadding(footer.Length));
-
-            int footerLength = footer.Length;
-            wadstream.Seek(Tools.AddPadding(contpos), SeekOrigin.Begin);
-            wadstream.Write(footer, 0, footer.Length);
-
-            //Write Header
-            byte[] certsize = Tools.FileLengthToByteArray(cert.Length);
-            byte[] tiksize = Tools.FileLengthToByteArray(tik.Length);
-            byte[] tmdsize = Tools.FileLengthToByteArray(tmd.Length);
-            byte[] allcontsize = Tools.FileLengthToByteArray(allcont);
-            byte[] footersize = Tools.FileLengthToByteArray(footerLength);
-
-            wadstream.Seek(0x00, SeekOrigin.Begin);
-            wadstream.Write(wadheader, 0, wadheader.Length);
-            wadstream.Seek(0x08, SeekOrigin.Begin);
-            wadstream.Write(certsize, 0, certsize.Length);
-            wadstream.Seek(0x10, SeekOrigin.Begin);
-            wadstream.Write(tiksize, 0, tiksize.Length);
-            wadstream.Seek(0x14, SeekOrigin.Begin);
-            wadstream.Write(tmdsize, 0, tmdsize.Length);
-            wadstream.Seek(0x18, SeekOrigin.Begin);
-            wadstream.Write(allcontsize, 0, allcontsize.Length);
-            wadstream.Seek(0x1c, SeekOrigin.Begin);
-            wadstream.Write(footersize, 0, footersize.Length);
-
-            wadstream.Close();
-        }
-    }
-
-    public class UID
-    {
-        /// <summary>
-        /// Checks if the given Title ID exists in the uid.sys
-        /// </summary>
-        /// <param name="uidsys"></param>
-        /// <param name="fulltitleid"></param>
-        /// <returns></returns>
-        public static bool CheckUID(byte[] uidsys, string fulltitleid)
-        {
-            for (int i = 0; i < uidsys.Length; i += 12)
-            {
-                string temp = "";
-
-                for (int y = i; y < i + 8; y++)
-                    temp += uidsys[y].ToString("x2");
-
-                if (temp == fulltitleid) return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Gets a new UID
-        /// </summary>
-        /// <param name="uidsys"></param>
-        /// <returns></returns>
-        public static string GetNewUID(byte[] uidsys)
-        {
-            string lastuid = uidsys[uidsys.Length - 4].ToString("x2") +
-                uidsys[uidsys.Length - 3].ToString("x2") +
-                uidsys[uidsys.Length - 2].ToString("x2") +
-                uidsys[uidsys.Length - 1].ToString("x2");
-
-            string newuid = (int.Parse(lastuid, System.Globalization.NumberStyles.HexNumber) + 1).ToString("x8");
-            return newuid;
-        }
-
-        /// <summary>
-        /// Adds a Title ID to uid.sys
-        /// </summary>
-        /// <param name="uidsys"></param>
-        /// <param name="fulltitleid"></param>
-        /// <returns></returns>
-        public static byte[] AddUID(byte[] uidsys, string fulltitleid)
-        {
-            if (uidsys.Length > 11)
-            {
-                MemoryStream uid = new MemoryStream();
-                byte[] titleid = Tools.HexStringToByteArray(fulltitleid);
-                byte[] newuid = Tools.HexStringToByteArray(GetNewUID(uidsys));
-
-                uid.Write(uidsys, 0, uidsys.Length);
-                uid.Write(titleid, 0, titleid.Length);
-                uid.Write(newuid, 0, newuid.Length);
-
-                return uid.ToArray();
-            }
-            else
-            {
-                MemoryStream uid = new MemoryStream();
-                byte[] titleid = Tools.HexStringToByteArray(fulltitleid);
-                byte[] newuid = new byte[] { 0x00, 0x00, 0x10, 0x00 };
-
-                uid.Write(titleid, 0, titleid.Length);
-                uid.Write(newuid, 0, newuid.Length);
-
-                return uid.ToArray();
-            }
-        }
-    }
-
-    public class ContentMap
-    {
-        /// <summary>
-        /// Gets the name of the shared content in /shared1/.
-        /// Returns "fail", if the content doesn't exist
-        /// </summary>
-        /// <param name="contentmap"></param>
-        /// <param name="sha1ofcontent"></param>
-        /// <returns></returns>
-        public static string GetSharedContentName(byte[] contentmap, string sha1ofcontent)
-        {
-            int contindex = 0;
-            string result = "";
-
-            for (int i = 0; i < contentmap.Length - 19; i++)
-            {
-                string tmp = "";
-                for (int y = 0; y < 20; y++)
-                {
-                    tmp += contentmap[i + y].ToString("x2");
-                }
-
-                if (tmp == sha1ofcontent)
-                {
-                    contindex = i;
-                    break;
-                }
-            }
-
-            if (contindex == 0) return "fail";
-
-            result += Convert.ToChar(contentmap[contindex - 8]);
-            result += Convert.ToChar(contentmap[contindex - 7]);
-            result += Convert.ToChar(contentmap[contindex - 6]);
-            result += Convert.ToChar(contentmap[contindex - 5]);
-            result += Convert.ToChar(contentmap[contindex - 4]);
-            result += Convert.ToChar(contentmap[contindex - 3]);
-            result += Convert.ToChar(contentmap[contindex - 2]);
-            result += Convert.ToChar(contentmap[contindex - 1]);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Checks, if the shared content exists
-        /// </summary>
-        /// <param name="contentmap"></param>
-        /// <param name="sha1ofcontent"></param>
-        /// <returns></returns>
-        public static bool CheckSharedContent(byte[] contentmap, string sha1ofcontent)
-        {
-            for (int i = 0; i < contentmap.Length - 19; i++)
-            {
-                string tmp = "";
-                for (int y = 0; y < 20; y++)
-                {
-                    tmp += contentmap[i + y].ToString("x2");
-                }
-
-                if (tmp == sha1ofcontent) return true;
-            }
-
-            return false;
-        }
-
-        public static string GetNewSharedContentName(byte[] contentmap)
-        {
-            string name = "";
-
-            name += Convert.ToChar(contentmap[contentmap.Length - 28]);
-            name += Convert.ToChar(contentmap[contentmap.Length - 27]);
-            name += Convert.ToChar(contentmap[contentmap.Length - 26]);
-            name += Convert.ToChar(contentmap[contentmap.Length - 25]);
-            name += Convert.ToChar(contentmap[contentmap.Length - 24]);
-            name += Convert.ToChar(contentmap[contentmap.Length - 23]);
-            name += Convert.ToChar(contentmap[contentmap.Length - 22]);
-            name += Convert.ToChar(contentmap[contentmap.Length - 21]);
-
-            string newname = (int.Parse(name, System.Globalization.NumberStyles.HexNumber) + 1).ToString("x8");
-
-            return newname;
-        }
-
-        public static void AddSharedContent(string contentmap, string contentname, string sha1ofcontent)
-        {
-            byte[] name = new byte[8];
-            byte[] sha1 = new byte[20];
-
-            for (int i = 0; i < 8; i++)
-            {
-                name[i] = (byte)contentname[i];
-            }
-
-            for (int i = 0; i < sha1ofcontent.Length; i += 2)
-            {
-                sha1[i / 2] = Convert.ToByte(sha1ofcontent.Substring(i, 2), 16);
-            }
-
-            using (FileStream map = new FileStream(contentmap, FileMode.OpenOrCreate, FileAccess.ReadWrite))
-            {
-                map.Seek(0, SeekOrigin.End);
-                map.Write(name, 0, name.Length);
-                map.Write(sha1, 0, sha1.Length);
-            }
-        }
-    }
-
-    public class U8
-    {
-        /// <summary>
-        /// Checks if the given file is a U8 Archive
-        /// </summary>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        public static bool CheckU8(byte[] file)
-        {
-            int length = 2500;
-            if (file.Length < length) length = file.Length - 4;
-
-            for (int i = 0; i < length; i++)
-            {
-                if (file[i] == 0x55 && file[i + 1] == 0xAA && file[i + 2] == 0x38 && file[i + 3] == 0x2D)
-                    return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Checks if the given file is a U8 Archive
-        /// </summary>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        public static bool CheckU8(string file)
-        {
-            byte[] buff = Tools.LoadFileToByteArray(file, 0, 2500);
-            return CheckU8(buff);
-        }
-
-        /// <summary>
-        /// Gets all contents of a folder (including (sub-)files and (sub-)folders)
-        /// </summary>
-        /// <param name="dir"></param>
-        /// <param name="root"></param>
-        /// <returns></returns>
-        public static string[] GetDirContent(string dir, bool root)
-        {
-            string[] files = Directory.GetFiles(dir);
-            string[] dirs = Directory.GetDirectories(dir);
-            string all = "";
-
-            if (root == false)
-                all += dir + "\n";
-
-            for (int i = 0; i < files.Length; i++)
-                all += files[i] + "\n";
-
-            foreach (string thisDir in dirs)
-            {
-                string[] temp = GetDirContent(thisDir, false);
-
-                foreach (string thisTemp in temp)
-                    all += thisTemp + "\n";
-            }
-
-            return all.Split(new char[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
-        }
-
-        /// <summary>
-        /// Detecs if the U8 file has an IMD5 or IMET Header.
-        /// Return: 0 = No Header, 1 = IMD5, 2 = IMET
-        /// </summary>
-        /// <param name="file"></param>
-        public static int DetectHeader(string file)
-        {
-            byte[] temp = Tools.LoadFileToByteArray(file, 0, 400);
-            return DetectHeader(temp);
-        }
-
-        /// <summary>
-        /// Detecs if the U8 file has an IMD5 or IMET Header.
-        /// Return: 0 = No Header, 1 = IMD5, 2 = IMET
-        /// </summary>
-        /// <param name="file"></param>
-        public static int DetectHeader(byte[] file)
-        {
-            for (int i = 0; i < 16; i++) //Just to be safe
-            {
-                if (Convert.ToChar(file[i]) == 'I')
-                    if (Convert.ToChar(file[i + 1]) == 'M')
-                        if (Convert.ToChar(file[i + 2]) == 'D')
-                            if (Convert.ToChar(file[i + 3]) == '5')
-                                return 1;
-            }
-
-            int length = 400;
-            if (file.Length < 400) length = file.Length - 4;
-
-            for (int z = 0; z < length; z++)
-            {
-                if (Convert.ToChar(file[z]) == 'I')
-                    if (Convert.ToChar(file[z + 1]) == 'M')
-                        if (Convert.ToChar(file[z + 2]) == 'E')
-                            if (Convert.ToChar(file[z + 3]) == 'T')
-                                return 2;
-            }
-
-            return 0;
-        }
-
-        /// <summary>
-        /// Adds an IMD5 Header to the given U8 Archive
-        /// </summary>
-        /// <param name="u8archive"></param>
-        /// <returns></returns>
-        public static byte[] AddHeaderIMD5(byte[] u8archive)
-        {
-            MemoryStream ms = new MemoryStream();
-            MD5 md5 = MD5.Create();
-            
-            byte[] imd5 = new byte[4];
-            imd5[0] = (byte)'I';
-            imd5[1] = (byte)'M';
-            imd5[2] = (byte)'D';
-            imd5[3] = (byte)'5';
-
-            byte[] size = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(u8archive.Length));
-            byte[] hash = md5.ComputeHash(u8archive, 0, u8archive.Length);
-
-            ms.Seek(0, SeekOrigin.Begin);
-            ms.Write(imd5, 0, imd5.Length);
-            ms.Write(size, 0, size.Length);
-
-            ms.Seek(0x10, SeekOrigin.Begin);
-            ms.Write(hash, 0, hash.Length);
-
-            ms.Write(u8archive, 0, u8archive.Length);
-
-            md5.Clear();
-            return ms.ToArray();
-        }
-
-        /// <summary>
-        /// Adds an IMET Header to the given 00.app
-        /// </summary>
-        /// <param name="u8archive"></param>
-        /// <param name="channeltitles">Order: Jap, Eng, Ger, Fra, Spa, Ita, Dut</param>
-        /// <param name="sizes">Order: Banner.bin, Icon.bin, Sound.bin</param>
-        /// <returns></returns>
-        public static byte[] AddHeaderIMET(byte[] nullapp, string[] channeltitles, int[] sizes)
-        {
-            if (channeltitles.Length < 7) return nullapp;
-            for (int i = 0; i < channeltitles.Length; i++)
-                if (channeltitles[i].Length > 20) return nullapp;
-
-            MemoryStream ms = new MemoryStream();
-            MD5 md5 = MD5.Create();
-
-            byte[] imet = new byte[4];
-            imet[0] = (byte)'I';
-            imet[1] = (byte)'M';
-            imet[2] = (byte)'E';
-            imet[3] = (byte)'T';
-
-            byte[] unknown = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(0x0000060000000003));
-
-            byte[] iconsize = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(sizes[1]));
-            byte[] bannersize = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(sizes[0]));
-            byte[] soundsize = BitConverter.GetBytes(IPAddress.HostToNetworkOrder(sizes[2]));
-
-            byte[] japtitle = new byte[84];
-            byte[] engtitle = new byte[84];
-            byte[] gertitle = new byte[84];
-            byte[] fratitle = new byte[84];
-            byte[] spatitle = new byte[84];
-            byte[] itatitle = new byte[84];
-            byte[] duttitle = new byte[84];
-            byte[] kortitle = new byte[84];
-
-            for (int i = 0; i < 20; i++)
-            {
-                if (channeltitles[0].Length > i)
-                {
-                    japtitle[i * 2] = BitConverter.GetBytes(channeltitles[0][i])[1];
-                    japtitle[i * 2 + 1] = BitConverter.GetBytes(channeltitles[0][i])[0];
-                }
-                if (channeltitles[1].Length > i)
-                {
-                    engtitle[i * 2] = BitConverter.GetBytes(channeltitles[1][i])[1];
-                    engtitle[i * 2 + 1] = BitConverter.GetBytes(channeltitles[1][i])[0];
-                }
-                if (channeltitles[2].Length > i)
-                {
-                    gertitle[i * 2] = BitConverter.GetBytes(channeltitles[2][i])[1];
-                    gertitle[i * 2 + 1] = BitConverter.GetBytes(channeltitles[2][i])[0];
-                }
-                if (channeltitles[3].Length > i)
-                {
-                    fratitle[i * 2] = BitConverter.GetBytes(channeltitles[3][i])[1];
-                    fratitle[i * 2 + 1] = BitConverter.GetBytes(channeltitles[3][i])[0];
-                }
-                if (channeltitles[4].Length > i)
-                {
-                    spatitle[i * 2] = BitConverter.GetBytes(channeltitles[4][i])[1];
-                    spatitle[i * 2 + 1] = BitConverter.GetBytes(channeltitles[4][i])[0];
-                }
-                if (channeltitles[5].Length > i)
-                {
-                    itatitle[i * 2] = BitConverter.GetBytes(channeltitles[5][i])[1];
-                    itatitle[i * 2 + 1] = BitConverter.GetBytes(channeltitles[5][i])[0];
-                }
-                if (channeltitles[6].Length > i)
-                {
-                    duttitle[i * 2] = BitConverter.GetBytes(channeltitles[6][i])[1];
-                    duttitle[i * 2 + 1] = BitConverter.GetBytes(channeltitles[6][i])[0];
-                }
-                if (channeltitles.Length > 7)
-                {
-                    if (channeltitles[7].Length > i)
-                    {
-                        kortitle[i * 2] = BitConverter.GetBytes(channeltitles[7][i])[1];
-                        kortitle[i * 2 + 1] = BitConverter.GetBytes(channeltitles[7][i])[0];
-                    }
-                }
-            }
-
-            byte[] crypto = new byte[16];
-
-            ms.Seek(128, SeekOrigin.Begin);
-            ms.Write(imet, 0, imet.Length);
-            ms.Write(unknown, 0, unknown.Length);
-            ms.Write(iconsize, 0, iconsize.Length);
-            ms.Write(bannersize, 0, bannersize.Length);
-            ms.Write(soundsize, 0, soundsize.Length);
-
-            ms.Seek(4, SeekOrigin.Current);
-            ms.Write(japtitle, 0, japtitle.Length);
-            ms.Write(engtitle, 0, engtitle.Length);
-            ms.Write(gertitle, 0, gertitle.Length);
-            ms.Write(fratitle, 0, fratitle.Length);
-            ms.Write(spatitle, 0, spatitle.Length);
-            ms.Write(itatitle, 0, itatitle.Length);
-            ms.Write(duttitle, 0, duttitle.Length);
-
-            ms.Seek(0x390, SeekOrigin.Begin);
-            ms.Write(kortitle, 0, kortitle.Length);
-
-            ms.Seek(0x630, SeekOrigin.Begin);
-            ms.Write(crypto, 0, crypto.Length);
-
-            byte[] tohash = ms.ToArray();
-            crypto = md5.ComputeHash(tohash, 0x40, 0x600);
-
-            ms.Seek(-16, SeekOrigin.Current);
-            ms.Write(crypto, 0, crypto.Length);
-            ms.Write(nullapp, 0, nullapp.Length);
-
-            md5.Clear();
-            return ms.ToArray();
-        }
-
-        /// <summary>
-        /// Packs a U8 Archive
-        /// </summary>
-        /// <param name="folder"></param>
-        /// <param name="outfile"></param>
-        public static void PackU8(string folder, string outfile)
-        {
-            byte[] u8 = PackU8(folder);
-
-            using (FileStream fs = new FileStream(outfile, FileMode.Create))
-                fs.Write(u8, 0, u8.Length);
-        }
-
-        /// <summary>
-        /// Packs a U8 Archive
-        /// </summary>
-        /// <param name="folder"></param>
-        /// <param name="outfile"></param>
-        public static void PackU8(string folder, string outfile, bool addimd5header)
-        {
-            byte[] u8 = PackU8(folder);
-
-            if (addimd5header == true)
-                u8 = AddHeaderIMD5(u8);
-
-            using (FileStream fs = new FileStream(outfile, FileMode.Create))
-                fs.Write(u8, 0, u8.Length);
-        }
-
-        /// <summary>
-        /// Packs a U8 Archive
-        /// </summary>
-        /// <param name="folder"></param>
-        /// <param name="outfile"></param>
-        public static byte[] PackU8(string folder)
-        {
-            int a = 0, b = 0, c = 0;
-            return PackU8(folder, out a, out b, out c);
-        }
-
-        /// <summary>
-        /// Packs a U8 Archive
-        /// </summary>
-        /// <param name="folder"></param>
-        /// <param name="outfile"></param>
-        public static byte[] PackU8(string folder, bool addimd5header)
-        {
-            byte[] u8 = PackU8(folder);
-
-            if (addimd5header == true)
-                u8 = AddHeaderIMD5(u8);
-            
-            return u8;
-        }
-
-        /// <summary>
-        /// Packs a U8 Archive
-        /// </summary>
-        /// <param name="folder"></param>
-        /// <param name="outfile"></param>
-        public static byte[] PackU8(string folder, out int bannersize, out int iconsize, out int soundsize)
-        {
-            int datapad = 32, stringtablepad = 32; //Biggie seems to use these paddings, so let's do it, too ;)
-            string rootpath = folder;
-            if (rootpath[rootpath.Length - 1] != '\\') rootpath = rootpath + "\\";
-
-            bannersize = 0; iconsize = 0; soundsize = 0;
-
-            string[] files = GetDirContent(folder, true);
-            int nodecount = files.Length + 1; //All files and dirs + rootnode
-            int recursion = 0;
-            int currentnodes = 0;
-            string name = string.Empty;
-            string stringtable = "\0";
-            byte[] tempnode = new byte[12];
-
-            MemoryStream nodes = new MemoryStream();
-            MemoryStream data = new MemoryStream();
-            BinaryWriter writedata = new BinaryWriter(data);
-
-            tempnode[0] = 0x01;
-            tempnode[1] = 0x00;
-            tempnode[2] = 0x00;
-            tempnode[3] = 0x00;
-            tempnode[4] = 0x00;
-            tempnode[5] = 0x00;
-            tempnode[6] = 0x00;
-            tempnode[7] = 0x00;
-
-            byte[] temp = BitConverter.GetBytes((UInt32)files.Length + 1); Array.Reverse(temp);
-            tempnode[8] = temp[0];
-            tempnode[9] = temp[1];
-            tempnode[10] = temp[2];
-            tempnode[11] = temp[3];
-
-            nodes.Write(tempnode, 0, tempnode.Length);
-
-            for (int i = 0; i < files.Length; i++)
-            {
-                files[i] = files[i].Remove(0, rootpath.Length - 1);
-
-                recursion = Tools.CountCharsInString(files[i], '\\') - 1;
-                name = files[i].Remove(0, files[i].LastIndexOf('\\') + 1);
-
-                byte[] temp1 = BitConverter.GetBytes((UInt16)stringtable.Length); Array.Reverse(temp1);
-                tempnode[2] = temp1[0];
-                tempnode[3] = temp1[1];
-
-                stringtable += name + "\0";
-
-                if (Directory.Exists(rootpath + files[i])) //It's a dir
-                {
-                    tempnode[0] = 0x01;
-                    tempnode[1] = 0x00;
-
-                    byte[] temp2 = BitConverter.GetBytes((UInt32)recursion); Array.Reverse(temp2);
-                    tempnode[4] = temp2[0];
-                    tempnode[5] = temp2[1];
-                    tempnode[6] = temp2[2];
-                    tempnode[7] = temp2[3];
-
-                    int size = currentnodes + 1;
-
-                    for (int j = i; j < files.Length; j++)
-                        if (files[j].Contains(files[i])) size++;
-
-                    byte[] temp3 = BitConverter.GetBytes((UInt32)size); Array.Reverse(temp3);
-                    tempnode[8] = temp3[0];
-                    tempnode[9] = temp3[1];
-                    tempnode[10] = temp3[2];
-                    tempnode[11] = temp3[3];
-                }
-                else //It's a file
-                {
-                    byte[] tempfile = new byte[0x40];
-                    int lzoffset = -1;
-
-                    if (files[i].EndsWith("banner.bin"))
-                    {
-                        tempfile = Wii.Tools.LoadFileToByteArray(rootpath + files[i], 0, tempfile.Length);
-
-                        for (int x = 0; x < tempfile.Length; x++)
-                        {
-                           if (tempfile[x] == 'L')
-                               if (tempfile[x + 1] == 'Z')
-                                   if (tempfile[x + 2] == '7')
-                                       if (tempfile[x + 3] == '7')
-                                       {
-                                           lzoffset = x;
-                                           break;
-                                       }
-                        }
-
-                        if (lzoffset != -1)
-                        {
-                            bannersize = BitConverter.ToInt32(new byte[] { tempfile[lzoffset + 5], tempfile[lzoffset + 6], tempfile[lzoffset + 7], tempfile[lzoffset + 8] }, 0);
-                        }
-                        else
-                        {
-                            FileInfo fibanner = new FileInfo(rootpath + files[i]);
-                            bannersize = (int)fibanner.Length - 32;
-                        }
-                    }
-                    else if (files[i].EndsWith("icon.bin"))
-                    {tempfile = Wii.Tools.LoadFileToByteArray(rootpath + files[i], 0, tempfile.Length);
-
-                        for (int x = 0; x < tempfile.Length; x++)
-                        {
-                           if (tempfile[x] == 'L')
-                               if (tempfile[x + 1] == 'Z')
-                                   if (tempfile[x + 2] == '7')
-                                       if (tempfile[x + 3] == '7')
-                                       {
-                                           lzoffset = x;
-                                       }
-                        }
-
-                        if (lzoffset != -1)
-                        {
-                            iconsize = BitConverter.ToInt32(new byte[] { tempfile[lzoffset + 5], tempfile[lzoffset + 6], tempfile[lzoffset + 7], tempfile[lzoffset + 8] }, 0);
-                        }
-                        else
-                        {
-                            FileInfo fiicon = new FileInfo(rootpath + files[i]);
-                            iconsize = (int)fiicon.Length - 32;
-                        }
-                    }
-                    else if (files[i].EndsWith("sound.bin"))
-                    {tempfile = Wii.Tools.LoadFileToByteArray(rootpath + files[i], 0, tempfile.Length);
-
-                        for (int x = 0; x < tempfile.Length; x++)
-                        {
-                            if (tempfile[x] == 'L')
-                                if (tempfile[x + 1] == 'Z')                                
-                                    if (tempfile[x + 2] == '7')
-                                        if (tempfile[x + 3] == '7')
-                                        {
-                                            lzoffset = x;
-                                            break;
-                                        }
-                        }
-
-                        if (lzoffset != -1)
-                        {
-                            soundsize = BitConverter.ToInt32(new byte[] { tempfile[lzoffset + 5], tempfile[lzoffset + 6], tempfile[lzoffset + 7], tempfile[lzoffset + 8] }, 0);
-                        }
-                        else
-                        {
-                            FileInfo fisound = new FileInfo(rootpath + files[i]);
-                            soundsize = (int)fisound.Length - 32;
-                        }
-                    }
-
-                    tempnode[0] = 0x00;
-                    tempnode[1] = 0x00;
-
-                    byte[] temp2 = BitConverter.GetBytes((UInt32)data.Position); Array.Reverse(temp2);
-                    tempnode[4] = temp2[0];
-                    tempnode[5] = temp2[1];
-                    tempnode[6] = temp2[2];
-                    tempnode[7] = temp2[3];
-
-                    FileInfo fi = new FileInfo(rootpath + files[i]);
-                    byte[] temp3 = BitConverter.GetBytes((UInt32)fi.Length); Array.Reverse(temp3);
-                    tempnode[8] = temp3[0];
-                    tempnode[9] = temp3[1];
-                    tempnode[10] = temp3[2];
-                    tempnode[11] = temp3[3];
-
-                    using (FileStream fs = new FileStream(rootpath + files[i], FileMode.Open))
-                    using (BinaryReader br = new BinaryReader(fs))
-                        writedata.Write(br.ReadBytes((int)br.BaseStream.Length));
-
-                    writedata.Seek(Tools.AddPadding((int)data.Position, datapad), SeekOrigin.Begin);
-                }
-
-                nodes.Write(tempnode, 0, tempnode.Length);
-                currentnodes++;
-            }
-
-            byte[] type = new byte[2];
-            byte[] curpos = new byte[4];
-
-            for (int x = 0; x < nodecount * 12; x += 12)
-            {
-                nodes.Seek(x, SeekOrigin.Begin);
-                nodes.Read(type, 0, 2);
-
-                if (type[0] == 0x00 && type[1] == 0x00)
-                {
-                    nodes.Seek(x + 4, SeekOrigin.Begin);
-                    nodes.Read(curpos, 0, 4);
-                    Array.Reverse(curpos);
-
-                    UInt32 newpos = BitConverter.ToUInt32(curpos, 0) + (UInt32)(Tools.AddPadding(0x20 + ((12 * nodecount) + stringtable.Length), stringtablepad));
-
-                    nodes.Seek(x + 4, SeekOrigin.Begin);
-                    byte[] temp2 = BitConverter.GetBytes(newpos); Array.Reverse(temp2);
-                    nodes.Write(temp2, 0, 4);
-                }
-            }
-
-            writedata.Close();
-            MemoryStream output = new MemoryStream();
-            BinaryWriter writeout = new BinaryWriter(output);
-
-            writeout.Write((UInt32)0x2d38aa55);
-            writeout.Write(IPAddress.HostToNetworkOrder((ushort)0x20));
-            writeout.Write(IPAddress.HostToNetworkOrder((ushort)((12 * nodecount) + stringtable.Length)));
-            writeout.Write(IPAddress.HostToNetworkOrder((ushort)(Tools.AddPadding(0x20 + ((12 * nodecount) + stringtable.Length), stringtablepad))));
-
-            writeout.Seek(0x10, SeekOrigin.Current);
-
-            writeout.Write(nodes.ToArray());
-            writeout.Write(ASCIIEncoding.ASCII.GetBytes(stringtable));
-
-            writeout.Seek(Tools.AddPadding(0x20 + ((12 * nodecount) + stringtable.Length), stringtablepad), SeekOrigin.Begin);
-
-            writeout.Write(data.ToArray());
-
-            output.Seek(0, SeekOrigin.End);
-            for (int i = (int)output.Position; i < Tools.AddPadding((int)output.Position, datapad); i++)
-                output.WriteByte(0);
-
-            writeout.Close();
-            output.Close();
-
-            return output.ToArray();
-        }
-
-        /// <summary>
-        /// Unpacks the given U8 archive
-        /// If the archive is Lz77 compressed, it will be decompressed first!
-        /// </summary>
-        /// <param name="u8archive"></param>
-        /// <param name="unpackpath"></param>
-        public static void UnpackU8(string u8archive, string unpackpath)
-        {
-            byte[] u8 = Wii.Tools.LoadFileToByteArray(u8archive);
-            UnpackU8(u8, unpackpath);
-        }
-
-        /// <summary>
-        /// Unpacks the given U8 archive
-        /// If the archive is Lz77 compressed, it will be decompressed first!
-        /// </summary>
-        /// <param name="u8archive"></param>
-        /// <param name="unpackpath"></param>
-        public static void UnpackU8(byte[] u8archive, string unpackpath)
-        {
-            int lz77offset = Lz77.GetLz77Offset(u8archive);
-            if (lz77offset != -1) { u8archive = Lz77.Decompress(u8archive, lz77offset); }
-
-            if (unpackpath[unpackpath.Length - 1] != '\\') { unpackpath = unpackpath + "\\"; }
-            if (!Directory.Exists(unpackpath)) Directory.CreateDirectory(unpackpath);
-
-            int u8offset = -1;
-            int length = 2500;
-            if (u8archive.Length < length) length = u8archive.Length - 4;
-
-            for (int i = 0; i < length; i++)
-            {
-                if (u8archive[i] == 0x55 && u8archive[i + 1] == 0xAA && u8archive[i + 2] == 0x38 && u8archive[i + 3] == 0x2D)
-                {
-                    u8offset = i;
-                    break;
-                }
-            }
-            
-            if (u8offset == -1) throw new Exception("File is not a valid U8 Archive!");
-
-            int nodecount = Tools.HexStringToInt(u8archive[u8offset + 0x28].ToString("x2") + u8archive[u8offset + 0x29].ToString("x2") + u8archive[u8offset + 0x2a].ToString("x2") + u8archive[u8offset + 0x2b].ToString("x2"));
-            int nodeoffset = 0x20;
-
-            string[,] nodes = new string[nodecount, 5];
-
-            for (int j = 0; j < nodecount; j++)
-            {
-                nodes[j, 0] = u8archive[u8offset + nodeoffset].ToString("x2") + u8archive[u8offset + nodeoffset + 1].ToString("x2");
-                nodes[j, 1] = u8archive[u8offset + nodeoffset + 2].ToString("x2") + u8archive[u8offset + nodeoffset + 3].ToString("x2");
-                nodes[j, 2] = u8archive[u8offset + nodeoffset + 4].ToString("x2") + u8archive[u8offset + nodeoffset + 5].ToString("x2") + u8archive[u8offset + nodeoffset + 6].ToString("x2") + u8archive[u8offset + nodeoffset + 7].ToString("x2");
-                nodes[j, 3] = u8archive[u8offset + nodeoffset + 8].ToString("x2") + u8archive[u8offset + nodeoffset + 9].ToString("x2") + u8archive[u8offset + nodeoffset + 10].ToString("x2") + u8archive[u8offset + nodeoffset + 11].ToString("x2");
-
-                nodeoffset += 12;
-            }
-
-            int stringtablepos = u8offset + nodeoffset;
-
-            for (int x = 0; x < nodecount; x++)
-            {
-                bool end = false;
-                int nameoffset = Tools.HexStringToInt(nodes[x, 1]);
-                string thisname = "";
-
-                do
-                {
-                    if (u8archive[stringtablepos + nameoffset] != 0x00)
-                    {
-                        char tempchar = Convert.ToChar(u8archive[stringtablepos + nameoffset]);
-                        thisname += tempchar.ToString();
-                        nameoffset++;
-                    }
-                    else end = true;
-                } while (end == false);
-
-                nodes[x, 4] = thisname;
-            }
-
-            string[] dirs = new string[nodecount];
-            dirs[0] = unpackpath;
-            int[] dircount = new int[nodecount];
-            int dirindex = 0;
-
-            try
-            {
-                for (int y = 1; y < nodecount; y++)
-                {
-                    switch (nodes[y, 0])
-                    {
-                        case "0100":
-                            if (dirs[dirindex][dirs[dirindex].Length - 1] != '\\') { dirs[dirindex] = dirs[dirindex] + "\\"; }
-                            Directory.CreateDirectory(dirs[dirindex] + nodes[y, 4]);
-                            dirs[dirindex + 1] = dirs[dirindex] + nodes[y, 4];
-                            dirindex++;
-                            dircount[dirindex] = Tools.HexStringToInt(nodes[y, 3]);
-                            break;
-                        default:
-                            int filepos = u8offset + Tools.HexStringToInt(nodes[y, 2]);
-                            int filesize = Tools.HexStringToInt(nodes[y, 3]);
-
-                            using (FileStream fs = new FileStream(dirs[dirindex] + "\\" + nodes[y, 4], FileMode.Create))
-                            {
-                                fs.Write(u8archive, filepos, filesize);
-                            }
-                            break;
-                    }
-
-                    while (dirindex > 0 && dircount[dirindex] == (y + 1))
-                    {
-                        dirindex--;
-                    }
-                }
-            }
-            catch { }
-        }
-
-        /// <summary>
-        /// Gets the Banner.bin out of the 00000000.app
-        /// </summary>
-        /// <param name="nullapp"></param>
-        /// <returns></returns>
-        public static byte[] GetBannerBin(byte[] nullapp)
-        {
-            int lz77offset = Lz77.GetLz77Offset(nullapp);
-            if (lz77offset != -1) { nullapp = Lz77.Decompress(nullapp, lz77offset); }
-
-            int u8offset = -1;
-            for (int i = 0; i < 2500; i++)
-            {
-                if (nullapp[i] == 0x55 && nullapp[i + 1] == 0xAA && nullapp[i + 2] == 0x38 && nullapp[i + 3] == 0x2D)
-                {
-                    u8offset = i;
-                    break;
-                }
-            }
-
-            if (u8offset == -1) throw new Exception("File is not a valid U8 Archive!");
-
-            int nodecount = Tools.HexStringToInt(nullapp[u8offset + 0x28].ToString("x2") + nullapp[u8offset + 0x29].ToString("x2") + nullapp[u8offset + 0x2a].ToString("x2") + nullapp[u8offset + 0x2b].ToString("x2"));
-            int nodeoffset = 0x20;
-
-            string[,] nodes = new string[nodecount, 5];
-
-            for (int j = 0; j < nodecount; j++)
-            {
-                nodes[j, 0] = nullapp[u8offset + nodeoffset].ToString("x2") + nullapp[u8offset + nodeoffset + 1].ToString("x2");
-                nodes[j, 1] = nullapp[u8offset + nodeoffset + 2].ToString("x2") + nullapp[u8offset + nodeoffset + 3].ToString("x2");
-                nodes[j, 2] = nullapp[u8offset + nodeoffset + 4].ToString("x2") + nullapp[u8offset + nodeoffset + 5].ToString("x2") + nullapp[u8offset + nodeoffset + 6].ToString("x2") + nullapp[u8offset + nodeoffset + 7].ToString("x2");
-                nodes[j, 3] = nullapp[u8offset + nodeoffset + 8].ToString("x2") + nullapp[u8offset + nodeoffset + 9].ToString("x2") + nullapp[u8offset + nodeoffset + 10].ToString("x2") + nullapp[u8offset + nodeoffset + 11].ToString("x2");
-
-                nodeoffset += 12;
-            }
-
-            int stringtablepos = u8offset + nodeoffset;
-
-            for (int x = 0; x < nodecount; x++)
-            {
-                bool end = false;
-                int nameoffset = Tools.HexStringToInt(nodes[x, 1]);
-                string thisname = "";
-
-                while (end == false)
-                {
-                    if (nullapp[stringtablepos + nameoffset] != 0x00)
-                    {
-                        char tempchar = Convert.ToChar(nullapp[stringtablepos + nameoffset]);
-                        thisname += tempchar.ToString();
-                        nameoffset++;
-                    }
-                    else end = true;
-                }
-
-                nodes[x, 4] = thisname;
-            }
-
-            for (int y = 1; y < nodecount; y++)
-            {
-                if (nodes[y, 4] == "banner.bin")
-                {
-                    int filepos = u8offset + Tools.HexStringToInt(nodes[y, 2]);
-                    int filesize = Tools.HexStringToInt(nodes[y, 3]);
-
-                    MemoryStream ms = new MemoryStream(nullapp);
-                    byte[] banner = new byte[filesize];
-                    ms.Seek(filepos, SeekOrigin.Begin);
-                    ms.Read(banner, 0, filesize);
-                    ms.Close();
-
-                    return banner;
-                }
-            }
-
-            throw new Exception("This file doesn't contain banner.bin!");
-        }
-
-        /// <summary>
-        /// Gets the Icon.bin out of the 00000000.app
-        /// </summary>
-        /// <param name="nullapp"></param>
-        /// <returns></returns>
-        public static byte[] GetIconBin(byte[] nullapp)
-        {
-            int lz77offset = Lz77.GetLz77Offset(nullapp);
-            if (lz77offset != -1) { nullapp = Lz77.Decompress(nullapp, lz77offset); }
-
-            int u8offset = -1;
-            for (int i = 0; i < 2500; i++)
-            {
-                if (nullapp[i] == 0x55 && nullapp[i + 1] == 0xAA && nullapp[i + 2] == 0x38 && nullapp[i + 3] == 0x2D)
-                {
-                    u8offset = i;
-                    break;
-                }
-            }
-
-            if (u8offset == -1) throw new Exception("File is not a valid U8 Archive!");
-
-            int nodecount = Tools.HexStringToInt(nullapp[u8offset + 0x28].ToString("x2") + nullapp[u8offset + 0x29].ToString("x2") + nullapp[u8offset + 0x2a].ToString("x2") + nullapp[u8offset + 0x2b].ToString("x2"));
-            int nodeoffset = 0x20;
-
-            string[,] nodes = new string[nodecount, 5];
-
-            for (int j = 0; j < nodecount; j++)
-            {
-                nodes[j, 0] = nullapp[u8offset + nodeoffset].ToString("x2") + nullapp[u8offset + nodeoffset + 1].ToString("x2");
-                nodes[j, 1] = nullapp[u8offset + nodeoffset + 2].ToString("x2") + nullapp[u8offset + nodeoffset + 3].ToString("x2");
-                nodes[j, 2] = nullapp[u8offset + nodeoffset + 4].ToString("x2") + nullapp[u8offset + nodeoffset + 5].ToString("x2") + nullapp[u8offset + nodeoffset + 6].ToString("x2") + nullapp[u8offset + nodeoffset + 7].ToString("x2");
-                nodes[j, 3] = nullapp[u8offset + nodeoffset + 8].ToString("x2") + nullapp[u8offset + nodeoffset + 9].ToString("x2") + nullapp[u8offset + nodeoffset + 10].ToString("x2") + nullapp[u8offset + nodeoffset + 11].ToString("x2");
-
-                nodeoffset += 12;
-            }
-
-            int stringtablepos = u8offset + nodeoffset;
-
-            for (int x = 0; x < nodecount; x++)
-            {
-                bool end = false;
-                int nameoffset = Tools.HexStringToInt(nodes[x, 1]);
-                string thisname = "";
-
-                while (end == false)
-                {
-                    if (nullapp[stringtablepos + nameoffset] != 0x00)
-                    {
-                        char tempchar = Convert.ToChar(nullapp[stringtablepos + nameoffset]);
-                        thisname += tempchar.ToString();
-                        nameoffset++;
-                    }
-                    else end = true;
-                }
-
-                nodes[x, 4] = thisname;
-            }
-
-            for (int y = 1; y < nodecount; y++)
-            {
-                if (nodes[y, 4] == "icon.bin")
-                {
-                    int filepos = u8offset + Tools.HexStringToInt(nodes[y, 2]);
-                    int filesize = Tools.HexStringToInt(nodes[y, 3]);
-
-                    MemoryStream ms = new MemoryStream(nullapp);
-                    byte[] icon = new byte[filesize];
-                    ms.Seek(filepos, SeekOrigin.Begin);
-                    ms.Read(icon, 0, filesize);
-                    ms.Close();
-
-                    return icon;
-                }
-            }
-
-            throw new Exception("This file doesn't contain icon.bin!");
-        }
-
-        /// <summary>
-        /// Extracts all Tpl's to the given path
-        /// </summary>
-        /// <param name="u8archive"></param>
-        /// <param name="path"></param>
-        public static void UnpackTpls(byte[] u8archive, string unpackpath)
-        {
-            int lz77offset = Lz77.GetLz77Offset(u8archive);
-            if (lz77offset != -1) { u8archive = Lz77.Decompress(u8archive, lz77offset); }
-
-            if (unpackpath[unpackpath.Length - 1] != '\\') { unpackpath = unpackpath + "\\"; }
-            if (!Directory.Exists(unpackpath)) Directory.CreateDirectory(unpackpath);
-
-            int u8offset = -1;
-            int length = 2500;
-            if (u8archive.Length < 2500) length = u8archive.Length - 4;
-
-            for (int i = 0; i < 2500; i++)
-            {
-                if (u8archive[i] == 0x55 && u8archive[i + 1] == 0xAA && u8archive[i + 2] == 0x38 && u8archive[i + 3] == 0x2D)
-                {
-                    u8offset = i;
-                    break;
-                }
-            }
-
-            if (u8offset == -1) throw new Exception("File is not a valid U8 Archive!");
-
-            int nodecount = Tools.HexStringToInt(u8archive[u8offset + 0x28].ToString("x2") + u8archive[u8offset + 0x29].ToString("x2") + u8archive[u8offset + 0x2a].ToString("x2") + u8archive[u8offset + 0x2b].ToString("x2"));
-            int nodeoffset = 0x20;
-
-            string[,] nodes = new string[nodecount, 5];
-
-            for (int j = 0; j < nodecount; j++)
-            {
-                nodes[j, 0] = u8archive[u8offset + nodeoffset].ToString("x2") + u8archive[u8offset + nodeoffset + 1].ToString("x2");
-                nodes[j, 1] = u8archive[u8offset + nodeoffset + 2].ToString("x2") + u8archive[u8offset + nodeoffset + 3].ToString("x2");
-                nodes[j, 2] = u8archive[u8offset + nodeoffset + 4].ToString("x2") + u8archive[u8offset + nodeoffset + 5].ToString("x2") + u8archive[u8offset + nodeoffset + 6].ToString("x2") + u8archive[u8offset + nodeoffset + 7].ToString("x2");
-                nodes[j, 3] = u8archive[u8offset + nodeoffset + 8].ToString("x2") + u8archive[u8offset + nodeoffset + 9].ToString("x2") + u8archive[u8offset + nodeoffset + 10].ToString("x2") + u8archive[u8offset + nodeoffset + 11].ToString("x2");
-
-                nodeoffset += 12;
-            }
-
-            int stringtablepos = u8offset + nodeoffset;
-
-            for (int x = 0; x < nodecount; x++)
-            {
-                bool end = false;
-                int nameoffset = Tools.HexStringToInt(nodes[x, 1]);
-                string thisname = "";
-
-                while (end == false)
-                {
-                    if (u8archive[stringtablepos + nameoffset] != 0x00)
-                    {
-                        char tempchar = Convert.ToChar(u8archive[stringtablepos + nameoffset]);
-                        thisname += tempchar.ToString();
-                        nameoffset++;
-                    }
-                    else end = true;
-                }
-
-                nodes[x, 4] = thisname;
-            }
-
-            for (int y = 1; y < nodecount; y++)
-            {
-                if (nodes[y, 4].Contains("."))
-                {
-                    if (nodes[y, 4].Remove(0, nodes[y, 4].LastIndexOf('.')) == ".tpl")
-                    {
-                        int filepos = u8offset + Tools.HexStringToInt(nodes[y, 2]);
-                        int filesize = Tools.HexStringToInt(nodes[y, 3]);
-
-                        using (FileStream fs = new FileStream(unpackpath + nodes[y, 4], FileMode.Create))
-                        {
-                            fs.Write(u8archive, filepos, filesize);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    public class Lz77
-    {
-        private const int N = 4096;
-        private const int F = 18;
-        private const int threshold = 2;
-        private static int[] lson = new int[N + 1];
-        private static int[] rson = new int[N + 257];
-        private static int[] dad = new int[N + 1];
-        private static ushort[] text_buf = new ushort[N + 17];
-        private static int match_position = 0, match_length = 0;
-        private static int textsize = 0;
-        private static int codesize = 0;
-
-        /// <summary>
-        /// Returns the Offset to the Lz77 Header
-        /// -1 will be returned, if the file is not Lz77 compressed
-        /// </summary>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        public static int GetLz77Offset(byte[] data)
-        {
-            int length = 5000;
-            if (data.Length < 5000) length = data.Length - 4;
-
-            for (int i = 0; i < length; i++)
-            {
-                if (data[i] == 0x55 && data[i + 1] == 0xAA && data[i + 2] == 0x38 && data[i + 3] == 0x2D)
-                {
-                    break;
-                }
-
-                UInt32 tmp = BitConverter.ToUInt32(data, i);
-                if (tmp == 0x37375a4c) return i;
-            }
-
-            return -1;
-        }
-
-        /// <summary>
-        /// Decompresses the given file
-        /// </summary>
-        /// <param name="infile"></param>
-        /// <param name="outfile"></param>
-        public static void Decompress(string infile, string outfile)
-        {
-            byte[] input = Tools.LoadFileToByteArray(infile);
-            int offset = GetLz77Offset(input);
-            if (offset == -1) throw new Exception("File is not Lz77 compressed!");
-            Tools.SaveFileFromByteArray(Decompress(input, offset), outfile);
-        }
-
-        /// <summary>
-        /// Decompresses the given data
-        /// </summary>
-        /// <param name="compressed"></param>
-        /// <param name="offset"></param>
-        /// <returns></returns>
-        public static byte[] Decompress(byte[] compressed, int offset)
-        {
-            int i, j, k, r, c, z;
-            uint flags;
-            UInt32 decomp_size;
-            UInt32 cur_size = 0;
-
-            MemoryStream infile = new MemoryStream(compressed);
-            MemoryStream outfile = new MemoryStream();
-
-            UInt32 gbaheader = new UInt32();
-            byte[] temp = new byte[4];
-            infile.Seek(offset + 4, SeekOrigin.Begin);
-            infile.Read(temp, 0, 4);
-            gbaheader = BitConverter.ToUInt32(temp, 0);
-
-            decomp_size = gbaheader >> 8;
-            byte[] text_buf = new byte[N + 17];
-
-            for (i = 0; i < N - F; i++) text_buf[i] = 0xdf;
-            r = N - F; flags = 7; z = 7;
-
-            while (true)
-            {
-                flags <<= 1;
-                z++;
-                if (z == 8)
-                {
-                    if ((c = (char)infile.ReadByte()) == -1) break;
-                    flags = (uint)c;
-                    z = 0;
-                }
-                if ((flags & 0x80) == 0)
-                {
-                    if ((c = infile.ReadByte()) == infile.Length - 1) break;
-                    if (cur_size < decomp_size) outfile.WriteByte((byte)c);
-                    text_buf[r++] = (byte)c;
-                    r &= (N - 1);
-                    cur_size++;
-                }
-                else
-                {
-                    if ((i = infile.ReadByte()) == -1) break;
-                    if ((j = infile.ReadByte()) == -1) break;
-                    j = j | ((i << 8) & 0xf00);
-                    i = ((i >> 4) & 0x0f) + threshold;
-                    for (k = 0; k <= i; k++)
-                    {
-                        c = text_buf[(r - j - 1) & (N - 1)];
-                        if (cur_size < decomp_size) outfile.WriteByte((byte)c); text_buf[r++] = (byte)c; r &= (N - 1); cur_size++;
-                    }
-                }
-            }
-
-            return outfile.ToArray();
-        }
-
-        public static void InitTree()
-        {
-            int i;
-            for (i = N + 1; i <= N + 256; i++) rson[i] = N;
-            for (i = 0; i < N; i++) dad[i] = N;
-        }
-
-        public static void InsertNode(int r)
-        {
-            int i, p, cmp;
-            cmp = 1;
-            p = N + 1 + (text_buf[r] == 0xffff ? 0 : text_buf[r]); //text_buf[r];
-            rson[r] = lson[r] = N; match_length = 0;
-            for (; ; )
-            {
-                if (cmp >= 0)
-                {
-                    if (rson[p] != N) p = rson[p];
-                    else { rson[p] = r; dad[r] = p; return; }
-                }
-                else
-                {
-                    if (lson[p] != N) p = lson[p];
-                    else { lson[p] = r; dad[r] = p; return; }
-                }
-                for (i = 1; i < F; i++)
-                    if ((cmp = text_buf[r + i] - text_buf[p + i]) != 0) break;
-                if (i > match_length)
-                {
-                    match_position = p;
-                    if ((match_length = i) >= F) break;
-                }
-            }
-            dad[r] = dad[p]; lson[r] = lson[p]; rson[r] = rson[p];
-            dad[lson[p]] = r; dad[rson[p]] = r;
-            if (rson[dad[p]] == p) rson[dad[p]] = r;
-            else lson[dad[p]] = r;
-            dad[p] = N;
-        }
-
-        public static void DeleteNode(int p)
-        {
-            int q;
-
-            if (dad[p] == N) return;  /* not in tree */
-            if (rson[p] == N) q = lson[p];
-            else if (lson[p] == N) q = rson[p];
-            else
-            {
-                q = lson[p];
-                if (rson[q] != N)
-                {
-                    do { q = rson[q]; } while (rson[q] != N);
-                    rson[dad[q]] = lson[q]; dad[lson[q]] = dad[q];
-                    lson[q] = lson[p]; dad[lson[p]] = q;
-                }
-                rson[q] = rson[p]; dad[rson[p]] = q;
-            }
-            dad[q] = dad[p];
-            if (rson[dad[p]] == p) rson[dad[p]] = q; else lson[dad[p]] = q;
-            dad[p] = N;
-        }
-
-        /// <summary>
-        /// Lz77 compresses the given File
-        /// </summary>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        public static void Compress(string infile, string outfile)
-        {
-            byte[] thisfile = Tools.LoadFileToByteArray(infile);
-            thisfile = Compress(thisfile);
-            Tools.SaveFileFromByteArray(thisfile, outfile);
-        }
-
-        /// <summary>
-        /// Lz77 compresses the given and saves it to the given Path
-        /// </summary>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        public static void Compress(byte[] file, string outfile)
-        {
-            byte[] temp = Compress(file);
-            Tools.SaveFileFromByteArray(temp, outfile);
-        }
-
-        /// <summary>
-        /// Lz77 compresses the given Byte Array
-        /// </summary>
-        /// <param name="file"></param>
-        /// <returns></returns>
-        public static byte[] Compress(byte[] file)
-        {
-            int i, c, len, r, s, last_match_length, code_buf_ptr;
-            int[] code_buf = new int[17];
-            int mask;
-            UInt32 filesize = ((Convert.ToUInt32(file.Length)) << 8) + 0x10;
-            byte[] filesizebytes = BitConverter.GetBytes(filesize);
-
-            MemoryStream output = new MemoryStream();
-            output.WriteByte((byte)'L'); output.WriteByte((byte)'Z'); output.WriteByte((byte)'7'); output.WriteByte((byte)'7');
-            MemoryStream infile = new MemoryStream(file);
-
-            output.Write(filesizebytes, 0, filesizebytes.Length);
-
-            InitTree();
-            code_buf[0] = 0;
-            code_buf_ptr = 1;
-            mask = 0x80;
-            s = 0;
-            r = N - F;
-
-            for (i = s; i < r; i++) text_buf[i] = 0xffff;
-            for (len = 0; len < F && (c = (int)infile.ReadByte()) != -1; len++)
-                text_buf[r + len] = (ushort)c;
-
-            if ((textsize = len) == 0) return file;
-
-            for (i = 1; i <= F; i++) InsertNode(r - i);
-
-            InsertNode(r);
-
-            do
-            {
-                if (match_length > len) match_length = len;
-
-                if (match_length <= threshold)
-                {
-                    match_length = 1;
-                    code_buf[code_buf_ptr++] = text_buf[r];
-                }
-                else
-                {
-                    code_buf[0] |= mask;
-
-                    code_buf[code_buf_ptr++] = (char)
-                        (((r - match_position - 1) >> 8) & 0x0f) |
-                        ((match_length - (threshold + 1)) << 4);
-
-                    code_buf[code_buf_ptr++] = (char)((r - match_position - 1) & 0xff);
-                }
-                if ((mask >>= 1) == 0)
-                {
-                    for (i = 0; i < code_buf_ptr; i++)
-                        output.WriteByte((byte)code_buf[i]);
-                    codesize += code_buf_ptr;
-                    code_buf[0] = 0; code_buf_ptr = 1;
-                    mask = 0x80;
-                }
-
-                last_match_length = match_length;
-                for (i = 0; i < last_match_length &&
-                        (c = (int)infile.ReadByte()) != -1; i++)
-                {
-                    DeleteNode(s);
-                    text_buf[s] = (ushort)c;
-                    if (s < F - 1) text_buf[s + N] = (ushort)c;
-                    s = (s + 1) & (N - 1); r = (r + 1) & (N - 1);
-                    InsertNode(r);
-                }
-
-                while (i++ < last_match_length)
-                {
-                    DeleteNode(s);
-                    s = (s + 1) & (N - 1); r = (r + 1) & (N - 1);
-                    if (--len != 0) InsertNode(r);
-                }
-            } while (len > 0);
-
-
-            if (code_buf_ptr > 1)
-            {
-                for (i = 0; i < code_buf_ptr; i++) output.WriteByte((byte)code_buf[i]);
-                codesize += code_buf_ptr;
-            }
-
-            if (codesize % 4 != 0)
-                for (i = 0; i < 4 - (codesize % 4); i++)
-                    output.WriteByte(0x00);
-
-            infile.Close();
-            return output.ToArray();
-        }
-    }
-
-    public class TPL
-    {
-        /// <summary>
-        /// Fixes rough edges (artifacts), if necessary
-        /// </summary>
-        /// <param name="tplFile"></param>
-        public static void FixFilter(string tplFile)
-        {
-            using (FileStream fs = new FileStream(tplFile, FileMode.Open))
-            {
-                fs.Seek(41, SeekOrigin.Begin);
-                if (fs.ReadByte() == 0x01)
-                {
-                    fs.Seek(-1, SeekOrigin.Current);
-                    fs.Write(new byte[] { 0x00, 0x00, 0x01 }, 0, 3);
-                }
-
-                fs.Seek(45, SeekOrigin.Begin);
-                if (fs.ReadByte() == 0x01)
-                {
-                    fs.Seek(-1, SeekOrigin.Current);
-                    fs.Write(new byte[] { 0x00, 0x00, 0x01 }, 0, 3);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Converts a Tpl to a Bitmap
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static Bitmap ConvertFromTPL(string tpl)
-        {
-            byte[] tplarray = Wii.Tools.LoadFileToByteArray(tpl);
-            return ConvertFromTPL(tplarray);
-        }
-
-        /// <summary>
-        /// Converts a Tpl to a Bitmap
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static Bitmap ConvertFromTPL(byte[] tpl)
-        {
-            if (GetTextureCount(tpl) > 1) throw new Exception("Tpl's containing more than one Texture are not supported!");
-
-            int width = GetTextureWidth(tpl);
-            int height = GetTextureHeight(tpl);
-            int format = GetTextureFormat(tpl);
-            if (format == -1) throw new Exception("The Texture has an unsupported format!");
-
-            switch (format)
-            {
-                case 0:
-                    byte[] temp0 = FromI4(tpl);
-                    return ConvertPixelToBitmap(temp0, width, height);
-                case 1:
-                    byte[] temp1 = FromI8(tpl);
-                    return ConvertPixelToBitmap(temp1, width, height);
-                case 2:
-                    byte[] temp2 = FromIA4(tpl);
-                    return ConvertPixelToBitmap(temp2, width, height);
-                case 3:
-                    byte[] temp3 = FromIA8(tpl);
-                    return ConvertPixelToBitmap(temp3, width, height);
-                case 4:
-                    byte[] temp4 = FromRGB565(tpl);
-                    return ConvertPixelToBitmap(temp4, width, height);
-                case 5:
-                    byte[] temp5 = FromRGB5A3(tpl);
-                    return ConvertPixelToBitmap(temp5, width, height);
-                case 6:
-                    byte[] temp6 = FromRGBA8(tpl);
-                    return ConvertPixelToBitmap(temp6, width, height);
-                case 8:
-                    byte[] temp8 = FromCI4(tpl);
-                    return ConvertPixelToBitmap(temp8, width, height);
-                case 9:
-                    byte[] temp9 = FromCI8(tpl);
-                    return ConvertPixelToBitmap(temp9, width, height);
-                case 10:
-                    byte[] temp10 = FromCI14X2(tpl);
-                    return ConvertPixelToBitmap(temp10, width, height);
-                case 14:
-                    byte[] temp14 = FromCMP(tpl);
-                    return ConvertPixelToBitmap(temp14, width, height);
-                default:
-                    throw new Exception("The Texture has an unsupported format!");
-            }
-        }
-
-        /// <summary>
-        /// Converts the Pixel Data into a Png Image
-        /// </summary>
-        /// <param name="data">Byte array with pixel data</param>
-        public static System.Drawing.Bitmap ConvertPixelToBitmap(byte[] data, int width, int height)
-        {
-            if (width == 0) width = 1;
-            if (height == 0) height = 1;
-
-            System.Drawing.Bitmap bmp = new System.Drawing.Bitmap(width, height, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
-            System.Drawing.Imaging.BitmapData bmpData = bmp.LockBits(
-                                 new System.Drawing.Rectangle(0, 0, bmp.Width, bmp.Height),
-                                 System.Drawing.Imaging.ImageLockMode.WriteOnly, bmp.PixelFormat);
-
-            System.Runtime.InteropServices.Marshal.Copy(data, 0, bmpData.Scan0, data.Length);
-            bmp.UnlockBits(bmpData);
-            return bmp;
-        }
-
-        /// <summary>
-        /// Gets the offset to the Texture Header
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static int GetTextureHeaderOffset(byte[] tpl)
-        {
-            byte[] tmp = new byte[] { tpl[15], tpl[14], tpl[13], tpl[12] };
-            return BitConverter.ToInt32(tmp, 0);
-        }
-
-        /// <summary>
-        /// Gets the offset to the Texture Palette Header
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static int GetTexturePaletteHeaderOffset(byte[] tpl)
-        {
-            byte[] tmp = new byte[] { tpl[19], tpl[18], tpl[17], tpl[16] };
-            return BitConverter.ToInt32(tmp, 0);
-        }
-
-        /// <summary>
-        /// Gets the offset to the Texture Palette
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static int GetTexturePaletteOffset(byte[] tpl)
-        {
-            int paletteheaderoffset = GetTexturePaletteHeaderOffset(tpl);
-
-            byte[] tmp = new byte[] { tpl[paletteheaderoffset + 11],
-                tpl[paletteheaderoffset + 10], tpl[paletteheaderoffset + 9], tpl[paletteheaderoffset + 8] };
-            return BitConverter.ToInt32(tmp, 0);
-        }
-
-        /// <summary>
-        /// Gets the Texture Palette Format
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static int GetTexturePaletteFormat(byte[] tpl)
-        {
-            int paletteheaderoffset = GetTexturePaletteHeaderOffset(tpl);
-
-            byte[] tmp = new byte[] { tpl[paletteheaderoffset + 7],
-                tpl[paletteheaderoffset + 6], tpl[paletteheaderoffset + 5], tpl[paletteheaderoffset + 4] };
-            return BitConverter.ToInt32(tmp, 0);
-        }
-
-        /// <summary>
-        /// Gets the item count of the Texture Palette
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static int GetTexturePaletteItemCount(byte[] tpl)
-        {
-            int paletteheaderoffset = GetTexturePaletteHeaderOffset(tpl);
-
-            byte[] tmp = new byte[] { tpl[paletteheaderoffset + 1], tpl[paletteheaderoffset] };
-            return BitConverter.ToInt16(tmp, 0);
-        }
-
-        /// <summary>
-        /// Gets the Texture Palette of the TPL
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static uint[] GetTexturePalette(byte[] tpl)
-        {
-            int paletteoffset = GetTexturePaletteOffset(tpl);
-            int paletteformat = GetTexturePaletteFormat(tpl);
-            int itemcount = GetTexturePaletteItemCount(tpl);
-            int r, g, b, a;
-
-            uint[] output = new uint[itemcount];
-            for (int i = 0; i < itemcount; i++)
-            {
-                if (i >= itemcount) continue;
-
-                UInt16 pixel = BitConverter.ToUInt16(new byte[] { tpl[i * 2 + 1], tpl[i * 2] }, 0);
-
-                if (paletteformat == 0) //IA8
-                {
-                    r = (pixel >> 8);
-                    b = r;
-                    g = r;
-                    a = ((pixel >> 0) & 0xff);
-                }
-                else if (paletteformat == 1) //RGB565
-                {
-                    b = (((pixel >> 11) & 0x1F) << 3) & 0xff;
-                    g = (((pixel >> 5) & 0x3F) << 2) & 0xff;
-                    r = (((pixel >> 0) & 0x1F) << 3) & 0xff;
-                    a = 255;
-                }
-                else //RGB5A3
-                {
-                    if ((pixel & (1 << 15)) != 0) //RGB555
-                    {
-                        a = 255;
-                        b = (((pixel >> 10) & 0x1F) * 255) / 31;
-                        g = (((pixel >> 5) & 0x1F) * 255) / 31;
-                        r = (((pixel >> 0) & 0x1F) * 255) / 31;
-                    }
-                    else //RGB4A3
-                    {
-                        a = (((pixel >> 12) & 0x07) * 255) / 7;
-                        b = (((pixel >> 8) & 0x0F) * 255) / 15;
-                        g = (((pixel >> 4) & 0x0F) * 255) / 15;
-                        r = (((pixel >> 0) & 0x0F) * 255) / 15;
-                    }
-                }
-
-                output[i] = (uint)((r << 0) | (g << 8) | (b << 16) | (a << 24));
-            }
-
-            return output;
-        }
-
-        /// <summary>
-        /// Gets the Number of Textures in a Tpl
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static int GetTextureCount(byte[] tpl)
-        {
-            byte[] tmp = new byte[4];
-            tmp[3] = tpl[4];
-            tmp[2] = tpl[5];
-            tmp[1] = tpl[6];
-            tmp[0] = tpl[7];
-            return BitConverter.ToInt32(tmp, 0);
-        }
-
-        /// <summary>
-        /// Gets the Format of the Texture in the Tpl
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static int GetTextureFormat(string tpl)
-        {
-            byte[] temp = Tools.LoadFileToByteArray(tpl, 0, 512);
-            return GetTextureFormat(temp);
-        }
-
-        /// <summary>
-        /// Gets the Format of the Texture in the Tpl
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static int GetTextureFormat(byte[] tpl)
-        {
-            int offset = GetTextureHeaderOffset(tpl);
-
-            byte[] tmp = new byte[4];
-            tmp[3] = tpl[offset + 4];
-            tmp[2] = tpl[offset + 5];
-            tmp[1] = tpl[offset + 6];
-            tmp[0] = tpl[offset + 7];
-            UInt32 format = BitConverter.ToUInt32(tmp, 0);
-
-            if (format == 0 ||
-                format == 1 ||
-                format == 2 ||
-                format == 3 ||
-                format == 4 ||
-                format == 5 ||
-                format == 6 ||
-                format == 8 ||
-                format == 9 ||
-                format == 10 ||
-                format == 14) return (int)format;
-
-            else return -1; //Unsupported Format
-        }
-
-        /// <summary>
-        /// Gets the Format Name of the Texture in the Tpl
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static string GetTextureFormatName(byte[] tpl)
-        {
-            switch (GetTextureFormat(tpl))
-            {
-                case 0:
-                    return "I4";
-                case 1:
-                    return "I8";
-                case 2:
-                    return "IA4";
-                case 3:
-                    return "IA8";
-                case 4:
-                    return "RGB565";
-                case 5:
-                    return "RGB5A3";
-                case 6:
-                    return "RGBA8";
-                case 8:
-                    return "CI4";
-                case 9:
-                    return "CI8";
-                case 10:
-                    return "CI14X2";
-                case 14:
-                    return "CMP";
-                default:
-                    return "Unknown";
-            }
-        }
-
-        public static int avg(int w0, int w1, int c0, int c1)
-        {
-            int a0 = c0 >> 11;
-            int a1 = c1 >> 11;
-            int a = (w0 * a0 + w1 * a1) / (w0 + w1);
-            int c = (a << 11) & 0xffff;
-
-            a0 = (c0 >> 5) & 63;
-            a1 = (c1 >> 5) & 63;
-            a = (w0 * a0 + w1 * a1) / (w0 + w1);
-            c = c | ((a << 5) & 0xffff);
-
-            a0 = c0 & 31;
-            a1 = c1 & 31;
-            a = (w0 * a0 + w1 * a1) / (w0 + w1);
-            c = c | a;
-
-            return c;
-        }
-
-        /// <summary>
-        /// Gets the Width of the Texture in the Tpl
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static int GetTextureWidth(byte[] tpl)
-        {
-            int offset = GetTextureHeaderOffset(tpl);
-
-            byte[] tmp = new byte[2];
-            tmp[1] = tpl[offset + 2];
-            tmp[0] = tpl[offset + 3];
-            return BitConverter.ToInt16(tmp, 0);
-        }
-
-        /// <summary>
-        /// Gets the Height of the Texture in the Tpl
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static int GetTextureHeight(byte[] tpl)
-        {
-            int offset = GetTextureHeaderOffset(tpl);
-
-            byte[] tmp = new byte[2];
-            tmp[1] = tpl[offset];
-            tmp[0] = tpl[offset + 1];
-            return BitConverter.ToInt16(tmp, 0);
-        }
-
-        /// <summary>
-        /// Gets the offset to the Texturedata in the Tpl
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static int GetTextureOffset(byte[] tpl)
-        {
-            int offset = GetTextureHeaderOffset(tpl);
-
-            byte[] tmp = new byte[4];
-            tmp[3] = tpl[offset + 8];
-            tmp[2] = tpl[offset + 9];
-            tmp[1] = tpl[offset + 10];
-            tmp[0] = tpl[offset + 11];
-            return BitConverter.ToInt32(tmp, 0);
-        }
-
-        /// <summary>
-        /// Converts RGBA8 Tpl Array to RGBA Byte Array
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static byte[] FromRGBA8(byte[] tpl)
-        {
-            int width = GetTextureWidth(tpl);
-            int height = GetTextureHeight(tpl);
-            int offset = GetTextureOffset(tpl);
-            UInt32[] output = new UInt32[width * height];
-            int inp = 0;
-            for (int y = 0; y < height; y += 4)
-            {
-                for (int x = 0; x < width; x += 4)
-                {
-                    for (int k = 0; k < 2; k++)
-                    {
-                        for (int y1 = y; y1 < y + 4; y1++)
-                        {
-                            for (int x1 = x; x1 < x + 4; x1++)
-                            {
-                                byte[] pixelbytes = new byte[2];
-                                pixelbytes[1] = tpl[offset + inp * 2];
-                                pixelbytes[0] = tpl[offset + inp * 2 + 1];
-                                UInt16 pixel = BitConverter.ToUInt16(pixelbytes, 0);
-                                inp++;
-
-                                if ((x1 >= width) || (y1 >= height))
-                                    continue;
-
-                                if (k == 0)
-                                {
-                                    int a = (pixel >> 8) & 0xff;
-                                    int r = (pixel >> 0) & 0xff;
-                                    output[x1 + (y1 * width)] |= (UInt32)((r << 16) | (a << 24));
-                                }
-                                else
-                                {
-                                    int g = (pixel >> 8) & 0xff;
-                                    int b = (pixel >> 0) & 0xff;
-                                    output[x1 + (y1 * width)] |= (UInt32)((g << 8) | (b << 0));
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            return Tools.UIntArrayToByteArray(output);
-        }
-
-        /// <summary>
-        /// Converts RGB5A3 Tpl Array to RGBA Byte Array
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static byte[] FromRGB5A3(byte[] tpl)
-        {
-            int width = GetTextureWidth(tpl);
-            int height = GetTextureHeight(tpl);
-            int offset = GetTextureOffset(tpl);
-            UInt32[] output = new UInt32[width * height];
-            int inp = 0;
-            int r, g, b;
-            int a = 0;
-            for (int y = 0; y < height; y += 4)
-            {
-                for (int x = 0; x < width; x += 4)
-                {
-                    for (int y1 = y; y1 < y + 4; y1++)
-                    {
-                        for (int x1 = x; x1 < x + 4; x1++)
-                        {
-                            byte[] pixelbytes = new byte[2];
-                            pixelbytes[1] = tpl[offset + inp * 2];
-                            pixelbytes[0] = tpl[offset + inp * 2 + 1];
-                            UInt16 pixel = BitConverter.ToUInt16(pixelbytes, 0);
-                            inp++;
-
-                            if (y1 >= height || x1 >= width)
-                                continue;
-
-                            if ((pixel & (1 << 15)) != 0)
-                            {
-                                b = (((pixel >> 10) & 0x1F) * 255) / 31;
-                                g = (((pixel >> 5) & 0x1F) * 255) / 31;
-                                r = (((pixel >> 0) & 0x1F) * 255) / 31;
-                                a = 255;
-                            }
-                            else
-                            {
-                                a = (((pixel >> 12) & 0x07) * 255) / 7;
-                                b = (((pixel >> 8) & 0x0F) * 255) / 15;
-                                g = (((pixel >> 4) & 0x0F) * 255) / 15;
-                                r = (((pixel >> 0) & 0x0F) * 255) / 15;
-                            }
-
-                            int rgba = (r << 0) | (g << 8) | (b << 16) | (a << 24);
-                            output[(y1 * width) + x1] = (UInt32)rgba;
-                        }
-                    }
-                }
-            }
-
-            return Tools.UIntArrayToByteArray(output);
-        }
-
-        /// <summary>
-        /// Converts RGB565 Tpl Array to RGBA Byte Array
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static byte[] FromRGB565(byte[] tpl)
-        {
-            int width = GetTextureWidth(tpl);
-            int height = GetTextureHeight(tpl);
-            int offset = GetTextureOffset(tpl);
-            UInt32[] output = new UInt32[width * height];
-            int inp = 0;
-            for (int y = 0; y < height; y += 4)
-            {
-                for (int x = 0; x < width; x += 4)
-                {
-                    for (int y1 = y; y1 < y + 4; y1++)
-                    {
-                        for (int x1 = x; x1 < x + 4; x1++)
-                        {
-                            byte[] pixelbytes = new byte[2];
-                            pixelbytes[1] = tpl[offset + inp * 2];
-                            pixelbytes[0] = tpl[offset + inp * 2 + 1];
-                            UInt16 pixel = BitConverter.ToUInt16(pixelbytes, 0);
-                            inp++;
-
-                            if (y1 >= height || x1 >= width)
-                                continue;
-
-                            int b = (((pixel >> 11) & 0x1F) << 3) & 0xff;
-                            int g = (((pixel >> 5) & 0x3F) << 2) & 0xff;
-                            int r = (((pixel >> 0) & 0x1F) << 3) & 0xff;
-                            int a = 255;
-
-                            int rgba = (r << 0) | (g << 8) | (b << 16) | (a << 24);
-                            output[y1 * width + x1] = (UInt32)rgba;
-                        }
-                    }
-                }
-            }
-
-            return Tools.UIntArrayToByteArray(output);
-        }
-
-        /// <summary>
-        /// Converts I4 Tpl Array to RGBA Byte Array
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static byte[] FromI4(byte[] tpl)
-        {
-            int width = GetTextureWidth(tpl);
-            int height = GetTextureHeight(tpl);
-            int offset = GetTextureOffset(tpl);
-            UInt32[] output = new UInt32[width * height];
-            int inp = 0;
-
-            for (int y = 0; y < height; y += 8)
-            {
-                for (int x = 0; x < width; x += 8)
-                {
-                    for (int y1 = y; y1 < y + 8; y1++)
-                    {
-                        for (int x1 = x; x1 < x + 8; x1 += 2)
-                        {
-                            int pixel = tpl[offset + inp++];
-
-                            if (y1 >= height || x1 >= width)
-                                continue;
-
-                            int r = (pixel >> 4) * 255 / 15;
-                            int g = (pixel >> 4) * 255 / 15;
-                            int b = (pixel >> 4) * 255 / 15;
-                            int a = 255;
-
-                            int rgba = (r << 0) | (g << 8) | (b << 16) | (a << 24);
-                            output[y1 * width + x1] = (UInt32)rgba;
-
-                            r = (pixel & 0x0F) * 255 / 15;
-                            g = (pixel & 0x0F) * 255 / 15;
-                            b = (pixel & 0x0F) * 255 / 15;
-                            a = 255;
-
-                            rgba = (r << 0) | (g << 8) | (b << 16) | (a << 24);
-                            output[y1 * width + x1 + 1] = (UInt32)rgba;
-                        }
-                    }
-                }
-            }
-
-            return Tools.UIntArrayToByteArray(output);
-        }
-
-        /// <summary>
-        /// Converts IA4 Tpl Array to RGBA Byte Array
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static byte[] FromIA4(byte[] tpl)
-        {
-            int width = GetTextureWidth(tpl);
-            int height = GetTextureHeight(tpl);
-            int offset = GetTextureOffset(tpl);
-            UInt32[] output = new UInt32[width * height];
-            int inp = 0;
-
-            for (int y = 0; y < height; y += 4)
-            {
-                for (int x = 0; x < width; x += 8)
-                {
-                    for (int y1 = y; y1 < y + 4; y1++)
-                    {
-                        for (int x1 = x; x1 < x + 8; x1++)
-                        {
-                            int pixel = tpl[offset + inp];
-                            inp++;
-
-                            if (y1 >= height || x1 >= width)
-                                continue;
-
-                            int r = ((pixel & 0x0F) * 255 / 15) & 0xff;
-                            int g = ((pixel & 0x0F) * 255 / 15) & 0xff;
-                            int b = ((pixel & 0x0F) * 255 / 15) & 0xff;
-                            int a = (((pixel >> 4) * 255) / 15) & 0xff;
-
-                            int rgba = (r << 0) | (g << 8) | (b << 16) | (a << 24);
-                            output[y1 * width + x1] = (UInt32)rgba;
-                        }
-                    }
-                }
-            }
-
-            return Tools.UIntArrayToByteArray(output);
-        }
-
-        /// <summary>
-        /// Converts I8 Tpl Array to RGBA Byte Array
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static byte[] FromI8(byte[] tpl)
-        {
-            int width = GetTextureWidth(tpl);
-            int height = GetTextureHeight(tpl);
-            int offset = GetTextureOffset(tpl);
-            UInt32[] output = new UInt32[width * height];
-            int inp = 0;
-
-            for (int y = 0; y < height; y += 4)
-            {
-                for (int x = 0; x < width; x += 8)
-                {
-                    for (int y1 = y; y1 < y + 4; y1++)
-                    {
-                        for (int x1 = x; x1 < x + 8; x1++)
-                        {
-                            int pixel = tpl[offset + inp];
-                            inp++;
-
-                            if (y1 >= height || x1 >= width)
-                                continue;
-
-                            int r = pixel;
-                            int g = pixel;
-                            int b = pixel;
-                            int a = 255;
-
-                            int rgba = (r << 0) | (g << 8) | (b << 16) | (a << 24);
-                            output[y1 * width + x1] = (UInt32)rgba;
-                        }
-                    }
-                }
-            }
-
-            return Tools.UIntArrayToByteArray(output);
-        }
-
-        /// <summary>
-        /// Converts IA8 Tpl Array to RGBA Byte Array
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static byte[] FromIA8(byte[] tpl)
-        {
-            int width = GetTextureWidth(tpl);
-            int height = GetTextureHeight(tpl);
-            int offset = GetTextureOffset(tpl);
-            UInt32[] output = new UInt32[width * height];
-            int inp = 0;
-
-            for (int y = 0; y < height; y += 4)
-            {
-                for (int x = 0; x < width; x += 4)
-                {
-                    for (int y1 = y; y1 < y + 4; y1++)
-                    {
-                        for (int x1 = x; x1 < x + 4; x1++)
-                        {
-                            byte[] pixelbytes = new byte[2];
-                            pixelbytes[1] = tpl[offset + inp * 2];
-                            pixelbytes[0] = tpl[offset + inp * 2 + 1];
-                            UInt16 pixel = BitConverter.ToUInt16(pixelbytes, 0);
-                            inp++;
-
-                            if (y1 >= height || x1 >= width)
-                                continue;
-
-                            int r = (pixel >> 8);// &0xff;
-                            int g = (pixel >> 8);// &0xff;
-                            int b = (pixel >> 8);// &0xff;
-                            int a = (pixel >> 0) & 0xff;
-
-                            int rgba = (r << 0) | (g << 8) | (b << 16) | (a << 24);
-                            output[y1 * width + x1] = (UInt32)rgba;
-                        }
-                    }
-                }
-            }
-
-            return Tools.UIntArrayToByteArray(output);
-        }
-
-        /// <summary>
-        /// Converts CMP Tpl Array to RGBA Byte Array
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static byte[] FromCMP(byte[] tpl)
-        {
-            int width = GetTextureWidth(tpl);
-            int height = GetTextureHeight(tpl);
-            int offset = GetTextureOffset(tpl);
-            UInt32[] output = new UInt32[width * height];
-            UInt16[] c = new UInt16[4];
-            int[] pix = new int[4];
-            int inp = 0;
-
-            for (int y = 0; y < height; y++)
-            {
-                for (int x = 0; x < width; x++)
-                {
-                    int ww = Tools.AddPadding(width, 8);
-
-                    int x0 = x & 0x03;
-                    int x1 = (x >> 2) & 0x01;
-                    int x2 = x >> 3;
-
-                    int y0 = y & 0x03;
-                    int y1 = (y >> 2) & 0x01;
-                    int y2 = y >> 3;
-
-                    int off = (8 * x1) + (16 * y1) + (32 * x2) + (4 * ww * y2);
-
-                    byte[] tmp1 = new byte[2];
-                    tmp1[1] = tpl[offset + off];
-                    tmp1[0] = tpl[offset + off + 1];
-                    c[0] = BitConverter.ToUInt16(tmp1, 0);
-                    tmp1[1] = tpl[offset + off + 2];
-                    tmp1[0] = tpl[offset + off + 3];
-                    c[1] = BitConverter.ToUInt16(tmp1, 0);
-
-                    if (c[0] > c[1])
-                    {
-                        c[2] = (UInt16)avg(2, 1, c[0], c[1]);
-                        c[3] = (UInt16)avg(1, 2, c[0], c[1]);
-                    }
-                    else
-                    {
-                        c[2] = (UInt16)avg(1, 1, c[0], c[1]);
-                        c[3] = 0;
-                    }
-
-                    byte[] pixeldata = new byte[4];
-                    pixeldata[3] = tpl[offset + off + 4];
-                    pixeldata[2] = tpl[offset + off + 5];
-                    pixeldata[1] = tpl[offset + off + 6];
-                    pixeldata[0] = tpl[offset + off + 7];
-                    UInt32 pixel = BitConverter.ToUInt32(pixeldata, 0);
-
-                    int ix = x0 + (4 * y0);
-                    int raw = c[(pixel >> (30 - (2 * ix))) & 0x03];
-
-                    pix[0] = (raw >> 8) & 0xf8;
-                    pix[1] = (raw >> 3) & 0xf8;
-                    pix[2] = (raw << 3) & 0xf8;
-                    pix[3] = 0xff;
-                    if (((pixel >> (30 - (2 * ix))) & 0x03) == 3 && c[0] <= c[1]) pix[3] = 0x00;
-
-                    int intout = (pix[0] << 16) | (pix[1] << 8) | (pix[2] << 0) | (pix[3] << 24);
-                    output[inp] = (UInt32)intout;
-                    inp++;
-                }
-            }
-
-            return Tools.UIntArrayToByteArray(output);
-        }
-
-        /// <summary>
-        /// Converts CI4 Tpl Array to RGBA Byte Array
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static byte[] FromCI4(byte[] tpl)
-        {
-            uint[] palette = GetTexturePalette(tpl);
-
-            int width = GetTextureWidth(tpl);
-            int height = GetTextureHeight(tpl);
-            int offset = GetTextureOffset(tpl);
-            UInt32[] output = new UInt32[width * height + 1];
-            int i = 0;
-
-            for (int y = 0; y < height; y += 8)
-            {
-                for (int x = 0; x < width; x += 8)
-                {
-                    for (int y1 = y; y1 < y + 8; y1++)
-                    {
-                        for (int x1 = x; x1 < x + 8; x1 += 2)
-                        {
-                            if (y1 >= height || x1 >= width)
-                                continue;
-                            
-                            UInt16 pixel = tpl[offset + i++];
-
-                            uint r = ((palette[pixel >> 4] & 0xFF000000) >> 24);
-                            uint g = (uint)((palette[pixel >> 4] & 0x00FF0000) >> 16);
-                            uint b = (uint)((palette[pixel >> 4] & 0x0000FF00) >> 8);
-                            uint a = (uint)((palette[pixel >> 4] & 0x000000FF) >> 0);
-
-                            uint rgba = (r << 0) | (g << 8) | (b << 16) | (a << 24);
-						    output[y1 * width + x1] = rgba;
-
-                            r = ((palette[pixel & 0x0F] & 0xFF000000) >> 24);
-                            g = (uint)((palette[pixel & 0x0F] & 0x00FF0000) >> 16);
-                            b = (uint)((palette[pixel & 0x0F] & 0x0000FF00) >> 8);
-                            a = (uint)((palette[pixel & 0x0F] & 0x000000FF) >> 0);
-
-                            rgba = (r << 0) | (g << 8) | (b << 16) | (a << 24);
-
-                            output[y1 * width + x1 + 1] = rgba;
-                        }
-                    }
-                }
-            }
-
-            return Tools.UIntArrayToByteArray(output);
-        }
-
-        /// <summary>
-        /// Converts CI8 Tpl Array to RGBA Byte Array
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static byte[] FromCI8(byte[] tpl)
-        {
-            uint[] palette = GetTexturePalette(tpl);
-
-            int width = GetTextureWidth(tpl);
-            int height = GetTextureHeight(tpl);
-            int offset = GetTextureOffset(tpl);
-            UInt32[] output = new UInt32[width * height];
-            int i = 0;
-
-            for (int y = 0; y < height; y += 4)
-            {
-                for (int x = 0; x < width; x += 8)
-                {
-                    for (int y1 = y; y1 < y + 4; y1++)
-                    {
-                        for (int x1 = x; x1 < x + 8; x1++)
-                        {
-                            if (y1 >= height || x1 >= width)
-                                continue;
-
-                            UInt16 pixel = tpl[offset + i++];
-
-                            uint r = ((palette[pixel] & 0xFF000000) >> 24);
-                            uint g = (uint)((palette[pixel] & 0x00FF0000) >> 16);
-                            uint b = (uint)((palette[pixel] & 0x0000FF00) >> 8);
-                            uint a = (uint)((palette[pixel] & 0x000000FF) >> 0);
-
-                            uint rgba = (r << 0) | (g << 8) | (b << 16) | (a << 24);
-                            output[y1 * width + x1] = rgba;
-                        }
-                    }
-                }
-            }
-
-            return Tools.UIntArrayToByteArray(output);
-        }
-
-        /// <summary>
-        /// Converts CI14X2 Tpl Array to RGBA Byte Array
-        /// </summary>
-        /// <param name="tpl"></param>
-        /// <returns></returns>
-        public static byte[] FromCI14X2(byte[] tpl)
-        {
-            uint[] palette = GetTexturePalette(tpl);
-
-            int width = GetTextureWidth(tpl);
-            int height = GetTextureHeight(tpl);
-            int offset = GetTextureOffset(tpl);
-            UInt32[] output = new UInt32[width * height];
-            int i = 0;
-
-            for (int y = 0; y < height; y += 4)
-            {
-                for (int x = 0; x < width; x += 4)
-                {
-                    for (int y1 = y; y1 < y + 4; y1++)
-                    {
-                        for (int x1 = x; x1 < x + 4; x1++)
-                        {
-                            if (y1 >= height || x1 >= width)
-                                continue;
-
-                            UInt16 pixel = tpl[offset + i++];
-
-                            uint r = ((palette[pixel & 0x3FFF] & 0xFF000000) >> 24);
-                            uint g = (uint)((palette[pixel & 0x3FFF] & 0x00FF0000) >> 16);
-                            uint b = (uint)((palette[pixel & 0x3FFF] & 0x0000FF00) >> 8);
-                            uint a = (uint)((palette[pixel & 0x3FFF] & 0x000000FF) >> 0);
-
-                            uint rgba = (r << 0) | (g << 8) | (b << 16) | (a << 24);
-                            output[y1 * width + x1] = rgba;
-                        }
-                    }
-                }
-            }
-
-            return Tools.UIntArrayToByteArray(output);
-        }
-
-        /// <summary>
-        /// Gets the pixel data of a Bitmap as a Byte Array
-        /// </summary>
-        /// <param name="img"></param>
-        /// <returns></returns>
-        public static uint[] BitmapToRGBA(Bitmap img)
-        {
-            int x = img.Width;
-            int y = img.Height;
-            UInt32[] rgba = new UInt32[x * y];
-
-            for (int i = 0; i < y; i += 4)
-            {
-                for (int j = 0; j < x; j += 4)
-                {
-                    for (int y1 = i; y1 < i + 4; y1++)
-                    {
-                        for (int x1 = j; x1 < j + 4; x1++)
-                        {
-                            if (y1 >= y || x1 >= x)
-                                continue;
-
-                            Color color = img.GetPixel(x1, y1);
-                            rgba[x1 + (y1 * x)] = (UInt32)color.ToArgb();
-                        }
-                    }
-                }
-            }
-
-            return rgba;
-        }
-
-        /// <summary>
-        /// Converts an Image to a Tpl
-        /// </summary>
-        /// <param name="img"></param>
-        /// <param name="format">0 = I4, 1 = I8, 2 = IA4, 3 = IA8, 4 = RGB565, 5 = RGB5A3, 6 = RGBA8</param>
-        /// <returns></returns>
-        public static void ConvertToTPL(Bitmap img, string destination, int format)
-        {
-            byte[] tpl = ConvertToTPL(img, format);
-
-            using (FileStream fs = new FileStream(destination, FileMode.Create))
-            {
-                fs.Write(tpl, 0, tpl.Length);
-            }
-        }
-
-        /// <summary>
-        /// Converts an Image to a Tpl
-        /// </summary>
-        /// <param name="img"></param>
-        /// <param name="format">0 = I4, 1 = I8, 2 = IA4, 3 = IA8, 4 = RGB565, 5 = RGB5A3, 6 = RGBA8</param>
-        /// <returns></returns>
-        public static void ConvertToTPL(Image img, string destination, int format)
-        {
-            byte[] tpl = ConvertToTPL((Bitmap)img, format);
-
-            using (FileStream fs = new FileStream(destination, FileMode.Create))
-            {
-                fs.Write(tpl, 0, tpl.Length);
-            }
-        }
-
-        /// <summary>
-        /// Converts an Image to a Tpl
-        /// </summary>
-        /// <param name="img"></param>
-        /// <param name="format">0 = I4, 1 = I8, 2 = IA4, 3 = IA8, 4 = RGB565, 5 = RGB5A3, 6 = RGBA8</param>
-        /// <returns></returns>
-        public static byte[] ConvertToTPL(Image img, int format)
-        {
-            return ConvertToTPL((Bitmap)img, format);
-        }
-
-        /// <summary>
-        /// Converts an Image to a Tpl
-        /// </summary>
-        /// <param name="img"></param>
-        /// <param name="format">0 = I4, 1 = I8, 2 = IA4, 3 = IA8, 4 = RGB565, 5 = RGB5A3, 6 = RGBA8</param>
-        /// <returns></returns>
-        public static byte[] ConvertToTPL(Bitmap img, int format)
-        {
-            using (MemoryStream ms = new MemoryStream())
-            {
-                byte[] rgbaData;
-
-                UInt32 tplmagic = 0x20af30;
-                UInt32 ntextures = 0x1;
-                UInt32 headersize = 0xc;
-                UInt32 texheaderoff = 0x14;
-                UInt32 texpaletteoff = 0x0;
-
-                UInt16 texheight = (UInt16)img.Height;
-                UInt16 texwidth = (UInt16)img.Width;
-                UInt32 texformat;
-                UInt32 texdataoffset = 0x40;
-                byte[] rest = new byte[] { 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 01, 00, 00, 00, 01, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00, 00 };
-                //This should do it for our needs.. rest includes padding
-
-                switch (format)
-                {
-                    case 0: //I4
-                        texformat = 0x0;
-                        rgbaData = ToI4(img);
-                        break;
-                    case 1: //I8
-                        texformat = 0x1;
-                        rgbaData = ToI8(img);
-                        break;
-                    case 2: //IA4
-                        texformat = 0x2;
-                        rgbaData = ToIA4(img);
-                        break;
-                    case 3: //IA8
-                        texformat = 0x3;
-                        rgbaData = ToIA8(img);
-                        break;
-                    case 4: //RGB565
-                        texformat = 0x4;
-                        rgbaData = ToRGB565(img);
-                        break;
-                    case 5: //RGB5A3
-                        texformat = 0x5;
-                        rgbaData = ToRGB5A3(img);
-                        break;
-                    case 6: //RGBA8
-                        texformat = 0x6;
-                        rgbaData = ToRGBA8(img);
-                        break;
-                    default:
-                        throw new FormatException();
-                }
-
-                byte[] buffer = BitConverter.GetBytes(tplmagic); Array.Reverse(buffer);
-                ms.Seek(0, SeekOrigin.Begin);
-                ms.Write(buffer, 0, buffer.Length);
-
-                buffer = BitConverter.GetBytes(ntextures); Array.Reverse(buffer);
-                ms.Write(buffer, 0, buffer.Length);
-
-                buffer = BitConverter.GetBytes(headersize); Array.Reverse(buffer);
-                ms.Write(buffer, 0, buffer.Length);
-
-                buffer = BitConverter.GetBytes(texheaderoff); Array.Reverse(buffer);
-                ms.Write(buffer, 0, buffer.Length);
-
-                buffer = BitConverter.GetBytes(texpaletteoff); Array.Reverse(buffer);
-                ms.Write(buffer, 0, buffer.Length);
-
-                buffer = BitConverter.GetBytes(texheight); Array.Reverse(buffer);
-                ms.Write(buffer, 0, buffer.Length);
-
-                buffer = BitConverter.GetBytes(texwidth); Array.Reverse(buffer);
-                ms.Write(buffer, 0, buffer.Length);
-
-                buffer = BitConverter.GetBytes(texformat); Array.Reverse(buffer);
-                ms.Write(buffer, 0, buffer.Length);
-
-                buffer = BitConverter.GetBytes(texdataoffset); Array.Reverse(buffer);
-                ms.Write(buffer, 0, buffer.Length);
-
-                ms.Write(rest, 0, rest.Length);
-
-                ms.Write(rgbaData, 0, rgbaData.Length);
-
-                return ms.ToArray();
-            }
-        }
-
-        /// <summary>
-        /// Converts an Image to RGBA8 Tpl data
-        /// </summary>
-        /// <param name="img"></param>
-        /// <returns></returns>
-        public static byte[] ToRGBA8(Bitmap img)
-        {
-            uint[] pixeldata = BitmapToRGBA(img);
-            int w = img.Width;
-            int h = img.Height;
-            int z = 0, iv = 0;
-            byte[] output = new byte[Tools.AddPadding(w, 4) * Tools.AddPadding(h, 4) * 4];
-            uint[] lr = new uint[32], lg = new uint[32], lb = new uint[32], la = new uint[32];
-
-            for (int y1 = 0; y1 < h; y1 += 4)
-            {
-                for (int x1 = 0; x1 < w; x1 += 4)
-                {
-                    for (int y = y1; y < (y1 + 4); y++)
-                    {
-                        for (int x = x1; x < (x1 + 4); x++)
-                        {
-                            UInt32 rgba;
-
-                            if (y >= h || x >= w)
-                            {
-                                rgba = 0;
-                            }
-                            else
-                            {
-                                rgba = pixeldata[x + (y * w)];
-                            }
-
-                            lr[z] = (uint)(rgba >> 16) & 0xff;
-                            lg[z] = (uint)(rgba >> 8) & 0xff;
-                            lb[z] = (uint)(rgba >> 0) & 0xff;
-                            la[z] = (uint)(rgba >> 24) & 0xff;
-
-                            z++;
-                        }
-                    }
-
-                    if (z == 16)
-                    {
-                        for (int i = 0; i < 16; i++)
-                        {
-                            output[iv++] = (byte)(la[i]);
-                            output[iv++] = (byte)(lr[i]);
-                        }
-                        for (int i = 0; i < 16; i++)
-                        {
-                            output[iv++] = (byte)(lg[i]);
-                            output[iv++] = (byte)(lb[i]);
-                        }
-
-                        z = 0;
-                    }
-                }
-            }
-
-
-            return output;
-        }
-
-        /// <summary>
-        /// Converts an Image to RGBA565 Tpl data
-        /// </summary>
-        /// <param name="img"></param>
-        /// <returns></returns>
-        public static byte[] ToRGB565(Bitmap img)
-        {
-            uint[] pixeldata = BitmapToRGBA(img);
-            int w = img.Width;
-            int h = img.Height;
-            int z = -1;
-            byte[] output = new byte[Tools.AddPadding(w, 4) * Tools.AddPadding(h, 4) * 2];
-
-            for (int y1 = 0; y1 < h; y1 += 4)
-            {
-                for (int x1 = 0; x1 < w; x1 += 4)
-                {
-                    for (int y = y1; y < y1 + 4; y++)
-                    {
-                        for (int x = x1; x < x1 + 4; x++)
-                        {
-                            UInt16 newpixel;
-
-                            if (y >= h || x >= w)
-                            {
-                                newpixel = 0;
-                            }
-                            else
-                            {
-                                uint rgba = pixeldata[x + (y * w)];
-
-                                uint b = (rgba >> 16) & 0xff;
-                                uint g = (rgba >> 8) & 0xff;
-                                uint r = (rgba >> 0) & 0xff;
-
-                                newpixel = (UInt16)(((b >> 3) << 11) | ((g >> 2) << 5) | ((r >> 3) << 0));
-                            }
-
-                            byte[] temp = BitConverter.GetBytes(newpixel);
-                            Array.Reverse(temp);
-
-                            output[++z] = temp[0];
-                            output[++z] = temp[1];
-                        }
-                    }
-                }
-            }
-
-            return output;
-        }
-
-        /// <summary>
-        /// Converts an Image to RGBA5A3 Tpl data
-        /// </summary>
-        /// <param name="img"></param>
-        /// <returns></returns>
-        public static byte[] ToRGB5A3(Bitmap img)
-        {
-            uint[] pixeldata = BitmapToRGBA(img);
-            int w = img.Width;
-            int h = img.Height;
-            int z = -1;
-            byte[] output = new byte[Tools.AddPadding(w, 4) * Tools.AddPadding(h, 4) * 2];
-
-            for (int y1 = 0; y1 < h; y1 += 4)
-            {
-                for (int x1 = 0; x1 < w; x1 += 4)
-                {
-                    for (int y = y1; y < y1 + 4; y++)
-                    {
-                        for (int x = x1; x < x1 + 4; x++)
-                        {
-                            int newpixel;
-
-                            if (y >= h || x >= w)
-                            {
-                                newpixel = 0;
-                            }
-                            else
-                            {
-                                int rgba = (int)pixeldata[x + (y * w)];
-                                newpixel = 0;
-
-                                int r = (rgba >> 16) & 0xff;
-                                int g = (rgba >> 8) & 0xff;
-                                int b = (rgba >> 0) & 0xff;
-                                int a = (rgba >> 24) & 0xff;
-
-                                if (a <= 0xda)
-                                {
-                                    //RGB4A3
-
-                                    newpixel &= ~(1 << 15);
-
-                                    r = ((r * 15) / 255) & 0xf;
-                                    g = ((g * 15) / 255) & 0xf;
-                                    b = ((b * 15) / 255) & 0xf;
-                                    a = ((a * 7) / 255) & 0x7;
-
-                                    newpixel |= a << 12;
-                                    newpixel |= b << 0;
-                                    newpixel |= g << 4;
-                                    newpixel |= r << 8;
-                                }
-                                else
-                                {
-                                    //RGB5
-
-                                    newpixel |= (1 << 15);
-
-                                    r = ((r * 31) / 255) & 0x1f;
-                                    g = ((g * 31) / 255) & 0x1f;
-                                    b = ((b * 31) / 255) & 0x1f;
-
-                                    newpixel |= b << 0;
-                                    newpixel |= g << 5;
-                                    newpixel |= r << 10;
-                                }
-                            }
-
-                            byte[] temp = BitConverter.GetBytes((UInt16)newpixel);
-                            Array.Reverse(temp);
-
-                            output[++z] = temp[0];
-                            output[++z] = temp[1];
-                        }
-                    }
-                }
-            }
-
-            return output;
-        }
-
-        /// <summary>
-        /// Converts an Image to I4 Tpl data
-        /// </summary>
-        /// <param name="img"></param>
-        /// <returns></returns>
-        public static byte[] ToI4(Bitmap img)
-        {
-            uint[] pixeldata = BitmapToRGBA(img);
-            int w = img.Width;
-            int h = img.Height;
-            int inp = -1;
-            byte[] output = new byte[Tools.AddPadding(w, 8) * Tools.AddPadding(h, 8) / 2];
-
-            for (int y1 = 0; y1 < h; y1 += 8)
-            {
-                for (int x1 = 0; x1 < w; x1 += 8)
-                {
-                    for (int y = y1; y < y1 + 8; y++)
-                    {
-                        for (int x = x1; x < x1 + 8; x += 2)
-                        {
-                            byte newpixel;
-
-                            if (x >= w || y >= h)
-                            {
-                                newpixel = 0;
-                            }
-                            else
-                            {
-                                uint rgba = pixeldata[x + (y * w)];
-
-                                uint Red = (rgba >> 0) & 0xff;
-                                uint Green = (rgba >> 8) & 0xff;
-                                uint Blue = (rgba >> 16) & 0xff;
-
-                                uint Intensity1 = ((Red + Green + Blue) / 3) & 0xff;
-
-                                rgba = pixeldata[x + (y * w) + 1];
-
-                                Red = (rgba >> 0) & 0xff;
-                                Green = (rgba >> 8) & 0xff;
-                                Blue = (rgba >> 16) & 0xff;
-
-                                uint Intensity2 = ((Red + Green + Blue) / 3) & 0xff;
-
-                                newpixel = (byte)((((Intensity1 * 15) / 255) << 4) | (((Intensity2 * 15) / 255) & 0xf));
-                            }
-
-                            output[++inp] = newpixel;
-                        }
-                    }
-                }
-            }
-
-            return output;
-        }
-
-        /// <summary>
-        /// Converts an Image to I8 Tpl data
-        /// </summary>
-        /// <param name="img"></param>
-        /// <returns></returns>
-        public static byte[] ToI8(Bitmap img)
-        {
-            uint[] pixeldata = BitmapToRGBA(img);
-            int w = img.Width;
-            int h = img.Height;
-            int inp = -1;
-            byte[] output = new byte[Tools.AddPadding(w, 8) * Tools.AddPadding(h, 4)];
-
-            for (int y1 = 0; y1 < h; y1 += 4)
-            {
-                for (int x1 = 0; x1 < w; x1 += 8)
-                {
-                    for (int y = y1; y < y1 + 4; y++)
-                    {
-                        for (int x = x1; x < x1 + 8; x++)
-                        {
-                            byte newpixel;
-
-                            if (x >= w || y >= h)
-                            {
-                                newpixel = 0;
-                            }
-                            else
-                            {
-                                uint rgba = pixeldata[x + (y * w)];
-
-                                uint Red = (rgba >> 0) & 0xff;
-                                uint Green = (rgba >> 8) & 0xff;
-                                uint Blue = (rgba >> 16) & 0xff;
-
-                                newpixel = (byte)(((Red + Green + Blue) / 3) & 0xff);
-                            }
-
-                            output[++inp] = newpixel;
-                        }
-                    }
-                }
-            }
-
-            return output;
-        }
-
-        /// <summary>
-        /// Converts an Image to IA4 Tpl data
-        /// </summary>
-        /// <param name="img"></param>
-        /// <returns></returns>
-        public static byte[] ToIA4(Bitmap img)
-        {
-            uint[] pixeldata = BitmapToRGBA(img);
-            int w = img.Width;
-            int h = img.Height;
-            int inp = -1;
-            byte[] output = new byte[Tools.AddPadding(w, 8) * Tools.AddPadding(h, 4)];
-
-            for (int y1 = 0; y1 < h; y1 += 4)
-            {
-                for (int x1 = 0; x1 < w; x1 += 8)
-                {
-                    for (int y = y1; y < y1 + 4; y++)
-                    {
-                        for (int x = x1; x < x1 + 8; x++)
-                        {
-                            byte newpixel;
-
-                            if (x >= w || y >= h)
-                            {
-                                newpixel = 0;
-                            }
-                            else
-                            {
-                                uint rgba = pixeldata[x + (y * w)];
-
-                                uint Red = (rgba >> 0) & 0xff;
-                                uint Green = (rgba >> 8) & 0xff;
-                                uint Blue = (rgba >> 16) & 0xff;
-
-                                uint Intensity = ((Red + Green + Blue) / 3) & 0xff;
-                                uint Alpha = (rgba >> 24) & 0xff;
-
-                                newpixel = (byte)((((Intensity * 15) / 255) & 0xf) | (((Alpha * 15) / 255) << 4));
-                            }
-
-                            output[++inp] = newpixel;
-                        }
-                    }
-                }
-            }
-
-            return output;
-        }
-
-        /// <summary>
-        /// Converts an Image to IA8 Tpl data
-        /// </summary>
-        /// <param name="img"></param>
-        /// <returns></returns>
-        public static byte[] ToIA8(Bitmap img)
-        {
-            uint[] pixeldata = BitmapToRGBA(img);
-            int w = img.Width;
-            int h = img.Height;
-            int inp = -1;
-            byte[] output = new byte[Tools.AddPadding(w, 4) * Tools.AddPadding(h, 4) * 2];
-
-            for (int y1 = 0; y1 < h; y1 += 4)
-            {
-                for (int x1 = 0; x1 < w; x1 += 4)
-                {
-                    for (int y = y1; y < y1 + 4; y++)
-                    {
-                        for (int x = x1; x < x1 + 4; x++)
-                        {
-                            UInt16 newpixel;
-
-                            if (x >= w || y >= h)
-                            {
-                                newpixel = 0;
-                            }
-                            else
-                            {
-                                uint rgba = pixeldata[x + (y * w)];
-
-                                uint Red = (rgba >> 0) & 0xff;
-                                uint Green = (rgba >> 8) & 0xff;
-                                uint Blue = (rgba >> 16) & 0xff;
-
-                                uint Intensity = ((Red + Green + Blue) / 3) & 0xff;
-                                uint Alpha = (rgba >> 24) & 0xff;
-
-                                newpixel = (ushort)((Intensity << 8) | Alpha);
-                            }
-
-                            byte[] temp = BitConverter.GetBytes(newpixel);
-                            Array.Reverse(temp);
-
-                            output[++inp] = temp[0];
-                            output[++inp] = temp[1];
-                        }
-                    }
-                }
-            }
-
-            return output;
-        }
-    }
-
-    public class NAND
-    {
-        /// <summary>
-        /// Backups all Saves from a NAND Backup
-        /// </summary>
-        /// <param name="nandpath"></param>
-        /// <param name="destinationpath"></param>
-        public static void BackupSaves(string nandpath, string destinationpath)
-        {
-            string titlefolder = nandpath + "\\title";
-            string[] lowerdirs = Directory.GetDirectories(titlefolder);
-            Tools.ChangeProgress(0);
-
-            for (int i = 0; i < lowerdirs.Length; i++)
-            {
-                Tools.ChangeProgress((i + 1) * 100 / lowerdirs.Length);
-                string[] upperdirs = Directory.GetDirectories(lowerdirs[i]);
-
-                for (int j = 0; j < upperdirs.Length; j++)
-                {
-                    if (Directory.Exists(upperdirs[j] + "\\data"))
-                    {
-                        if (Directory.GetFiles(upperdirs[j] + "\\data").Length > 0 ||
-                            Directory.GetDirectories(upperdirs[j] + "\\data").Length > 0)
-                        {
-                            Tools.CopyDirectory(upperdirs[j] + "\\data", (upperdirs[j] + "\\data").Replace(nandpath, destinationpath).Replace("\\title", ""));
-                        }
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Restores all Saves for existing titles to a NAND Backup
-        /// </summary>
-        /// <param name="backupdir"></param>
-        /// <param name="nandpath"></param>
-        public static void RestoreSaves(string backuppath, string nandpath)
-        {
-            string titlefolder = nandpath + "\\title";
-            string[] lowerdirs = Directory.GetDirectories(backuppath);
-            Tools.ChangeProgress(0);
-
-            for (int i = 0; i < lowerdirs.Length; i++)
-            {
-                Tools.ChangeProgress((i + 1) * 100 / lowerdirs.Length);
-                string[] upperdirs = Directory.GetDirectories(lowerdirs[i]);
-
-                for (int j = 0; j < upperdirs.Length; j++)
-                {
-                    string[] datafiles = Directory.GetFiles(upperdirs[j] + "\\data");
-                    string upperdirnand = upperdirs[j].Replace(backuppath, titlefolder);
-
-                    if (Directory.Exists(upperdirnand) &&
-                        (Directory.GetFiles(upperdirs[j] + "\\data").Length > 0 ||
-                         Directory.GetDirectories(upperdirs[j] + "\\data").Length > 0))
-                    {
-                        if (!Directory.Exists(upperdirnand + "\\data")) Directory.CreateDirectory(upperdirnand + "\\data");
-                        Tools.CopyDirectory(upperdirs[j] + "\\data", (upperdirs[j] + "\\data").Replace(backuppath, titlefolder));
-                    }
-                }
-            }
-
-            Tools.ChangeProgress(100);
-        }
-
-        /// <summary>
-        /// Backups a single Save
-        /// </summary>
-        /// <param name="nandpath"></param>
-        /// <param name="titlepath">Format: XXXXXXXX\XXXXXXXX</param>
-        /// <param name="destinationpath"></param>
-        public static void BackupSingleSave(string nandpath, string titlepath, string destinationpath)
-        {
-            string datafolder = nandpath + "\\title\\" + titlepath + "\\data";
-
-            if (Directory.GetFiles(datafolder).Length > 0 ||
-                Directory.GetDirectories(datafolder).Length > 0)
-            {
-                string savefolder = datafolder.Replace(nandpath, destinationpath).Replace("\\title", "");
-                if (!Directory.Exists(savefolder)) Directory.CreateDirectory(savefolder);
-
-                Tools.CopyDirectory(datafolder, savefolder);
-            }
-            else
-            {
-                throw new Exception("No save data was found!");
-            }
-        }
-
-        /// <summary>
-        /// Restores a singe Save, if the title exists on NAND Backup
-        /// </summary>
-        /// <param name="backuppath"></param>
-        /// <param name="titlepath">Format: XXXXXXXX\XXXXXXXX</param>
-        /// <param name="nandpath"></param>
-        public static void RestoreSingleSave(string backuppath, string titlepath, string nandpath)
-        {
-            string titlefoldernand = nandpath + "\\title\\" + titlepath;
-            string titlefolder = titlefoldernand.Replace(nandpath, backuppath).Replace("\\title", "");
-
-            if (Directory.Exists(titlefoldernand) &&
-                (Directory.GetFiles(titlefolder + "\\data").Length > 0 ||
-                 Directory.GetDirectories(titlefolder + "\\data").Length > 0))
-            {
-                if (!Directory.Exists(titlefoldernand + "\\data")) Directory.CreateDirectory(titlefoldernand + "\\data");
-                Tools.CopyDirectory(titlefolder + "\\data", titlefoldernand + "\\data");
-            }
-            else
-            {
-                throw new Exception("Title not found in NAND Backup!");
-            }
-        }
-
-        /// <summary>
-        /// Checks, if save data exists in the given title folder
-        /// </summary>
-        /// <param name="nandpath"></param>
-        /// <param name="titlepath">Format: XXXXXXXX\XXXXXXXX</param>
-        public static bool CheckForSaveData(string nandpath, string titlepath)
-        {
-            string datafolder = nandpath + "\\title\\" + titlepath + "\\data";
-
-            if (!Directory.Exists(datafolder)) return false;
-            else
-            {
-                string[] datafiles = Directory.GetFiles(datafolder);
-
-                if (datafiles.Length > 0) return true;
-                else return false;
-            }
-        }
-
-        /// <summary>
-        /// Checks, if save data exists in the given title folder
-        /// </summary>
-        /// <param name="nandpath"></param>
-        /// <param name="titlepath">Format: XXXXXXXX\XXXXXXXX</param>
-        public static bool CheckForBackupData(string backuppath, string titlepath)
-        {
-            string datafolder = backuppath + "\\" + titlepath + "\\data";
-
-            if (!Directory.Exists(datafolder)) return false;
-            else
-            {
-                string[] datafiles = Directory.GetFiles(datafolder);
-
-                if (datafiles.Length > 0) return true;
-                else return false;
-            }
-        }
-    }
-
-    public class Sound
-    {
-        /// <summary>
-        /// Checks if the given Wave is a proper PCM WAV file
-        /// </summary>
-        /// <param name="wavefile"></param>
-        /// <returns></returns>
-        public static bool CheckWave(string wavefile)
-        {
-            byte[] wave = Tools.LoadFileToByteArray(wavefile, 0, 256);
-            return CheckWave(wave);
-        }
-
-        /// <summary>
-        /// Checks if the given Wave is a proper PCM WAV file
-        /// </summary>
-        /// <param name="wavefile"></param>
-        /// <returns></returns>
-        public static bool CheckWave(byte[] wavefile)
-        {
-            if (wavefile[0] != 'R' ||
-                wavefile[1] != 'I' ||
-                wavefile[2] != 'F' ||
-                wavefile[3] != 'F' ||
-
-                wavefile[8] != 'W' ||
-                wavefile[9] != 'A' ||
-                wavefile[10] != 'V' ||
-                wavefile[11] != 'E' ||
-
-                wavefile[12] != 'f' ||
-                wavefile[13] != 'm' ||
-                wavefile[14] != 't' ||
-
-                wavefile[20] != 0x01 || //Format = PCM
-                wavefile[21] != 0x00 ||
-
-                wavefile[34] != 0x10 || //Bitrate (16bit)
-                wavefile[35] != 0x00
-                ) return false;
-
-            return true;
-        }
-
-        /// <summary>
-        /// Returns the playlength of the Wave file in seconds
-        /// </summary>
-        /// <param name="wavefile"></param>
-        /// <returns></returns>
-        public static int GetWaveLength(string wavefile)
-        {
-            byte[] wave = Tools.LoadFileToByteArray(wavefile, 0, 256);
-            return GetWaveLength(wave);
-        }
-
-        /// <summary>
-        /// Returns the playlength of the Wave file in seconds
-        /// </summary>
-        /// <param name="wavefile"></param>
-        /// <returns></returns>
-        public static int GetWaveLength(byte[] wavefile)
-        {
-            if (CheckWave(wavefile) == true)
-            {
-                byte[] BytesPerSec = new byte[] { wavefile[28], wavefile[29], wavefile[30], wavefile[31] };
-                int bps = BitConverter.ToInt32(BytesPerSec, 0);
-
-                byte[] Chunksize = new byte[] { wavefile[4], wavefile[5], wavefile[6], wavefile[7] };
-                int chunks = BitConverter.ToInt32(Chunksize, 0);
-
-                return Math.Abs(chunks / bps);
-            }
-            else
-                throw new Exception("This is not a supported PCM Wave file!");
-        }
-
-        /// <summary>
-        /// Converts a wave file to a sound.bin
-        /// </summary>
-        /// <param name="wavefile"></param>
-        /// <param name="soundbin"></param>
-        public static void WaveToSoundBin(string wavefile, string soundbin, bool compress)
-        {
-            if (CheckWave(wavefile) == true)
-            {
-                byte[] sound = Tools.LoadFileToByteArray(wavefile);
-                if (compress == true) sound = Lz77.Compress(sound);
-                sound = U8.AddHeaderIMD5(sound);
-                Wii.Tools.SaveFileFromByteArray(sound, soundbin);
-            }
-            else
-                throw new Exception("This is not a supported 16bit PCM Wave file!");
-        }
-
-        /// <summary>
-        /// Converts a sound.bin to a wave file
-        /// </summary>
-        /// <param name="soundbin"></param>
-        /// <param name="wavefile"></param>
-        public static void SoundBinToAudio(string soundbin, string audiofile)
-        {
-            FileStream fs = new FileStream(soundbin, FileMode.Open);
-            byte[] audio = new byte[fs.Length - 32];
-            int offset = 0;
-
-            fs.Seek(32, SeekOrigin.Begin);
-            fs.Read(audio, 0, audio.Length);
-            fs.Close();
-
-            if ((offset = Lz77.GetLz77Offset(audio)) != -1)
-                audio = Lz77.Decompress(audio, offset);
-
-            Tools.SaveFileFromByteArray(audio, audiofile);
-        }
-
-        /// <summary>
-        /// Converts a BNS file to a sound.bin
-        /// </summary>
-        /// <param name="bnsFile"></param>
-        /// <param name="soundBin"></param>
-        public static void BnsToSoundBin(string bnsFile, string soundBin, bool compress)
-        {
-            byte[] bns = Tools.LoadFileToByteArray(bnsFile);
-
-            if (bns[0] != 'B' || bns[1] != 'N' || bns[2] != 'S')
-                throw new Exception("This is not a supported BNS file!");
-
-            if (compress) bns = Lz77.Compress(bns);
-            bns = U8.AddHeaderIMD5(bns);
-
-            Tools.SaveFileFromByteArray(bns, soundBin);
-        }
-
-        /// <summary>
-        /// Returns the length of the BNS audio file in seconds
-        /// </summary>
-        /// <param name="bnsFile"></param>
-        /// <returns></returns>
-        public static int GetBnsLength(string bnsFile)
-        {
-            byte[] temp = Tools.LoadFileToByteArray(bnsFile, 0, 100);
-            return GetBnsLength(temp);
-        }
-
-        /// <summary>
-        /// Returns the length of the BNS audio file in seconds
-        /// </summary>
-        /// <param name="bnsFile"></param>
-        /// <returns></returns>
-        public static int GetBnsLength(byte[] bnsFile)
-        {
-            byte[] temp = new byte[4];
-            temp[0] = bnsFile[45];
-            temp[1] = bnsFile[44];
-
-            int sampleRate = BitConverter.ToInt16(temp, 0);
-
-            temp[0] = bnsFile[55];
-            temp[1] = bnsFile[54];
-            temp[2] = bnsFile[53];
-            temp[3] = bnsFile[52];
-
-            int sampleCount = BitConverter.ToInt32(temp, 0);
-
-            return sampleCount / sampleRate;
-        }
-    }
-
-    public class Brlyt
-    {
-        /// <summary>
-        /// Checks, if the TPLs match the TPLs specified in the brlyt
-        /// </summary>
-        /// <param name="brlyt"></param>
-        /// <param name="tpls"></param>
-        /// <returns></returns>
-        public static bool CheckBrlytTpls(string brlyt, string[] tpls)
-        {
-            byte[] brlytArray = Tools.LoadFileToByteArray(brlyt);
-            return CheckBrlytTpls(brlytArray, tpls);
-        }
-
-        /// <summary>
-        /// Checks, if the TPLs match the TPLs specified in the brlyt
-        /// </summary>
-        /// <param name="brlyt"></param>
-        /// <param name="tpls"></param>
-        /// <returns></returns>
-        public static bool CheckBrlytTpls(byte[] brlyt, string[] tpls)
-        {
-            int texcount = Tools.HexStringToInt(brlyt[44].ToString("x2") + brlyt[45].ToString("x2"));
-            if (tpls.Length != texcount) return false;
-
-            int texnamepos = 48 + (texcount * 8);
-            for (int i = 0; i < texcount; i++)
-            {
-                string thisTex = "";
-                while (brlyt[texnamepos] != 0x00)
-                {
-                    thisTex += Convert.ToChar(brlyt[texnamepos]);
-                    texnamepos++;
-                }
-                texnamepos++;
-
-                bool exists = Array.Exists(tpls,tpl => tpl == thisTex);
-                if (exists == false) return false;
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Checks, if one or more Tpls specified in the brlyt are missing and returns 
-        /// the names of the missing ones.
-        /// </summary>
-        /// <param name="brlyt"></param>
-        /// <param name="tpls"></param>
-        /// <param name="missingtpls"></param>
-        /// <returns></returns>
-        public static bool CheckForMissingTpls(string brlyt, string brlan, string[] tpls, out string[] missingtpls)
-        {
-            byte[] brlytArray = Tools.LoadFileToByteArray(brlyt);
-            byte[] brlanArray = Tools.LoadFileToByteArray(brlan);
-            return CheckForMissingTpls(brlytArray, brlanArray, tpls, out missingtpls);
-        }
-
-        /// <summary>
-        /// Checks, if one or more Tpls specified in the brlyt are missing and returns 
-        /// the names of the missing ones.
-        /// </summary>
-        /// <param name="brlyt"></param>
-        /// <param name="tpls"></param>
-        /// <param name="missingtpls"></param>
-        /// <returns></returns>
-        public static bool CheckForMissingTpls(byte[] brlyt, byte[] brlan, string[] tpls, out string[] missingtpls)
-        {
-            List<string> missings = new List<string>();
-            string[] brlytTpls = GetBrlytTpls(brlyt, brlan);
-            bool missing = false;
-
-            for (int i = 0; i < brlytTpls.Length; i++)
-            {
-                if (Tools.StringExistsInStringArray(brlytTpls[i], tpls) == false)
-                {
-                    missings.Add(brlytTpls[i]);
-                    missing = true;
-                }
-            }
-
-            missingtpls = missings.ToArray();
-            return missing;
-        }
-
-        /// <summary>
-        /// Checks, if one or more Tpls are not specified in the brlyt and returns 
-        /// the names of the missing ones.
-        /// </summary>
-        /// <param name="brly"></param>
-        /// <param name="tpls"></param>
-        /// <param name="unusedtpls"></param>
-        /// <returns></returns>
-        public static bool CheckForUnusedTpls(string brlyt, string brlan, string[] tpls, out string[] unusedtpls)
-        {
-            byte[] brlytArray = Tools.LoadFileToByteArray(brlyt);
-            byte[] brlanArray = Tools.LoadFileToByteArray(brlan);
-            return CheckForUnusedTpls(brlytArray, brlanArray, tpls, out unusedtpls);
-        }
-
-        /// <summary>
-        /// Checks, if one or more Tpls are not specified in the brlyt and returns 
-        /// the names of the missing ones.
-        /// </summary>
-        /// <param name="brly"></param>
-        /// <param name="tpls"></param>
-        /// <param name="unusedtpls"></param>
-        /// <returns></returns>
-        public static bool CheckForUnusedTpls(byte[] brlyt, byte[] brlan, string[] tpls, out string[] unusedtpls)
-        {
-            List<string> unuseds = new List<string>();
-            string[] brlytTpls = GetBrlytTpls(brlyt, brlan);
-            bool missing = false;
-
-            for (int i = 0; i < tpls.Length; i++)
-            {
-                if (Tools.StringExistsInStringArray(tpls[i], brlytTpls) == false)
-                {
-                    string wonum = tpls[i].Remove(tpls[i].LastIndexOf('.') - 1) + "00.tpl";
-                    string wonum2 = tpls[i].Remove(tpls[i].LastIndexOf('.') - 2) + "00.tpl";
-                    string wonum3 = tpls[i].Remove(tpls[i].LastIndexOf('.') - 1) + "01.tpl";
-                    string wonum4 = tpls[i].Remove(tpls[i].LastIndexOf('.') - 2) + "01.tpl";
-
-                    if (Tools.StringExistsInStringArray(wonum, brlytTpls) == false &&
-                        Tools.StringExistsInStringArray(wonum2, brlytTpls) == false &&
-                        Tools.StringExistsInStringArray(wonum3, brlytTpls) == false &&
-                        Tools.StringExistsInStringArray(wonum4, brlytTpls) == false)
-                    {
-                        unuseds.Add(tpls[i]);
-                        missing = true;
-                    }
-                }
-            }
-
-            unusedtpls = unuseds.ToArray();
-            return missing;
-        }
-
-        /// <summary>
-        /// Returns the name of all Tpls specified in the brlyt
-        /// </summary>
-        /// <param name="brlyt"></param>
-        /// <returns></returns>
-        public static string[] GetBrlytTpls(string brlyt, string brlan)
-        {
-            byte[] temp = Tools.LoadFileToByteArray(brlyt);
-            byte[] temp2 = Tools.LoadFileToByteArray(brlan);
-            return GetBrlytTpls(temp, temp2);
-        }
-
-        /// <summary>
-        /// Returns the name of all Tpls specified in the brlyt
-        /// </summary>
-        /// <param name="brlyt"></param>
-        /// <returns></returns>
-        public static string[] GetBrlytTpls(byte[] brlyt, byte[] brlan)
-        {
-            int texcount = Tools.HexStringToInt(brlyt[44].ToString("x2") + brlyt[45].ToString("x2"));
-            int texnamepos = 48 + (texcount * 8);
-            List<string> Tpls = new List<string>();
-
-            for (int i = 0; i < texcount; i++)
-            {
-                string thisTex = "";
-                while (brlyt[texnamepos] != 0x00)
-                {
-                    thisTex += Convert.ToChar(brlyt[texnamepos]);
-                    texnamepos++;
-                }
-                Tpls.Add(thisTex);
-                texnamepos++;
-            }
-
-            //Lets also get brlan tpls (frame animations)
-            try
-            {
-                string[] brlanTpls = GetBrlanTpls(brlan);
-                foreach (string thisTpl in brlanTpls)
-                {
-                    if (thisTpl.EndsWith(".tpl"))
-                    {
-                        if (!Tpls.Contains(thisTpl))
-                            Tpls.Add(thisTpl);
-                    }
-                }
-            }
-            catch { } //If it throws any error, it's probably an empty brlan
-
-            return Tpls.ToArray();
-        }
-
-        /// <summary>
-        /// Returns the name of all Tpls specified in the brlan
-        /// </summary>
-        /// <param name="brlyt"></param>
-        /// <returns></returns>
-        public static string[] GetBrlanTpls(string brlan)
-        {
-            byte[] temp = Tools.LoadFileToByteArray(brlan);
-            return GetBrlanTpls(temp);
-        }
-
-        /// <summary>
-        /// Returns the name of all Tpls specified in the brlan
-        /// </summary>
-        /// <param name="brlyt"></param>
-        /// <returns></returns>
-        public static string[] GetBrlanTpls(byte[] brlan)
-        {
-            List<string> tpls = new List<string>();
-            int texcount = Tools.HexStringToInt(brlan[28].ToString("x2") + brlan[29].ToString("x2"));
-            int pailen;
-            if (brlan[32] == 0x00 && brlan[33] == 0x00 && brlan[34] == 0x00 && brlan[35] == 0x00)
-                pailen = Tools.HexStringToInt(brlan[36].ToString("x2") + brlan[37].ToString("x2") + brlan[38].ToString("x2") + brlan[39].ToString("x2"));
-            else
-                pailen = Tools.HexStringToInt(brlan[32].ToString("x2") + brlan[33].ToString("x2") + brlan[34].ToString("x2") + brlan[35].ToString("x2"));
-
-            int texnameendpos = 16 + pailen;
-
-            for (int i = texnameendpos; i > 0; i--)
-            {
-                if (brlan[i] != 0x00)
-                { texnameendpos = i + 1; break; }
-            }
-
-            for (int i = 0; i < texcount; i++)
-            {
-                List<char> thisTex = new List<char>();
-                while (brlan[texnameendpos] != 0x00)
-                {
-                    thisTex.Add((char)brlan[texnameendpos--]);
-                }
-
-                thisTex.Reverse();
-                tpls.Add(new string(thisTex.ToArray()));
-                texnameendpos--;
-            }
-
-            tpls.Reverse();
-            return tpls.ToArray();
-        }
-
-        /// <summary>
-        /// Returns true, if the given Tpl is specified in the brlyt.
-        /// TplName must end with ".tpl"!
-        /// </summary>
-        /// <param name="brlyt"></param>
-        /// <param name="TplName"></param>
-        /// <returns></returns>
-        public static bool IsTplInBrlyt(byte[] brlyt, byte[] brlan, string TplName)
-        {
-            string[] brlytTpls = GetBrlytTpls(brlyt, brlan);
-            bool exists = Array.Exists(brlytTpls, Tpl => Tpl == TplName);
-            return exists;
-        }
-    }
-
-    public class ProgressChangedEventArgs : EventArgs
-    {
-        private readonly int p_Percent = 0;
-
-        public int PercentProgress
-        {
-            get { return p_Percent; }
-        }
-
-        internal ProgressChangedEventArgs(int PercentProgress)
-            : base()
-        {
-            this.p_Percent = PercentProgress;
-        }
-    }
-}
\ No newline at end of file
diff --git a/CustomizeMii/libWiiSharp.dll b/CustomizeMii/libWiiSharp.dll
new file mode 100644
index 0000000..562da8e
Binary files /dev/null and b/CustomizeMii/libWiiSharp.dll differ
diff --git a/CustomizeMiiInstaller/InstallerHelper.cs b/CustomizeMiiInstaller/InstallerHelper.cs
index a370862..7334ce0 100644
--- a/CustomizeMiiInstaller/InstallerHelper.cs
+++ b/CustomizeMiiInstaller/InstallerHelper.cs
@@ -35,17 +35,21 @@ namespace CustomizeMiiInstaller
     public class InstallerHelper
     {
         public static MemoryStream CreateInstaller(string wadFile, byte iosToUse)
+        {
+            return CreateInstaller(File.ReadAllBytes(wadFile), iosToUse);
+        }
+
+        public static MemoryStream CreateInstaller(byte[] wadFileBytes, byte iosToUse)
         {
             const int injectionPosition = 0x5A74C;
             const int maxAllowedSizeForWads = 4 * 1024 * 1024 - 32; //(Max 4MB-32bytes )
 
             //0. Read length of the wad to ensure it has an allowed size
-            byte[] wadFileBytes = File.ReadAllBytes(wadFile);
             uint wadLength = (uint)wadFileBytes.Length;
 
             if (wadLength > maxAllowedSizeForWads)
             {
-                throw new ArgumentException(String.Format("The file {0} is sized above the max allowed limit of {1} for network installation.", wadFile, maxAllowedSizeForWads));
+                throw new ArgumentException(String.Format("The file is sized above the max allowed limit of {1} for network installation.", maxAllowedSizeForWads));
             }
 
             //1. Open the stub installer from resources
diff --git a/ForwardMii/ForwardMii.cs b/ForwardMii/ForwardMii.cs
index 5c2b7a1..2d03f31 100644
--- a/ForwardMii/ForwardMii.cs
+++ b/ForwardMii/ForwardMii.cs
@@ -33,7 +33,10 @@ namespace ForwardMii
             if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DEVKITPRO")) ||
                 string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DEVKITPPC"))) return false;
 
-            if (!System.IO.Directory.Exists(Environment.GetEnvironmentVariable("DEVKITPRO").Remove(0, 1).Insert(1, ":") + "/libogc")) return false;
+            if (Environment.OSVersion.VersionString.ToLower().Contains("windows"))
+            { if (!System.IO.Directory.Exists(Environment.GetEnvironmentVariable("DEVKITPRO").Remove(0, 1).Insert(1, ":") + "/libogc")) return false; }
+            else
+            { if (!System.IO.Directory.Exists(Environment.GetEnvironmentVariable("DEVKITPRO") + "/libogc")) return false; }
 
             return true;
         }
diff --git a/ForwardMii/ForwardMii_GX.cs b/ForwardMii/ForwardMii_GX.cs
index 5570ca9..d7e1e1b 100644
--- a/ForwardMii/ForwardMii_GX.cs
+++ b/ForwardMii/ForwardMii_GX.cs
@@ -28,7 +28,7 @@ namespace ForwardMii
 {
     public class GXForwarder
     {
-        private readonly string TempDir = Path.GetTempPath() + "ForwardMii_Temp\\" + Guid.NewGuid() + "\\";
+        private readonly string TempDir = Path.GetTempPath() + "ForwardMii_Temp" + Path.DirectorySeparatorChar + Guid.NewGuid() + Path.DirectorySeparatorChar;
         private bool[] packs = new bool[] { false, false, false };
         private string[] paths = new string[16]; //Maximum 16 Paths
         private string image43;
@@ -180,18 +180,18 @@ namespace ForwardMii
                     Image img = Image.FromFile(image43);
                     if (img.Width != 640 || img.Height != 480)
                         img = ResizeImage(img, 640, 480);
-                    img.Save(TempDir + "\\source\\images\\background.png", System.Drawing.Imaging.ImageFormat.Png);
+                    img.Save(TempDir + Path.DirectorySeparatorChar + "source" + Path.DirectorySeparatorChar + "images" + Path.DirectorySeparatorChar + "background.png", System.Drawing.Imaging.ImageFormat.Png);
                 }
                 catch
                 {
                     Bitmap img = new Bitmap(640, 480);
-                    img.Save(TempDir + "\\source\\images\\background.png", System.Drawing.Imaging.ImageFormat.Png);
+                    img.Save(TempDir + Path.DirectorySeparatorChar + "source" + Path.DirectorySeparatorChar + "images" + Path.DirectorySeparatorChar + "background.png", System.Drawing.Imaging.ImageFormat.Png);
                 }
             }
             else
             {
                 Bitmap img = new Bitmap(640, 480);
-                img.Save(TempDir + "\\source\\images\\background.png", System.Drawing.Imaging.ImageFormat.Png);
+                img.Save(TempDir + Path.DirectorySeparatorChar + "source" + Path.DirectorySeparatorChar + "images" + Path.DirectorySeparatorChar + "background.png", System.Drawing.Imaging.ImageFormat.Png);
             }
 
             if (!string.IsNullOrEmpty(image169) && File.Exists(image169))
@@ -201,18 +201,18 @@ namespace ForwardMii
                     Image img = Image.FromFile(image169);
                     if (img.Width != 640 || img.Height != 480)
                         img = ResizeImage(img, 640, 480);
-                    img.Save(TempDir + "\\source\\images\\background169.png", System.Drawing.Imaging.ImageFormat.Png);
+                    img.Save(TempDir + Path.DirectorySeparatorChar + "source" + Path.DirectorySeparatorChar + "images" + Path.DirectorySeparatorChar + "background169.png", System.Drawing.Imaging.ImageFormat.Png);
                 }
                 catch
                 {
                     Bitmap img = new Bitmap(640, 480);
-                    img.Save(TempDir + "\\source\\images\\background169.png", System.Drawing.Imaging.ImageFormat.Png);
+                    img.Save(TempDir + Path.DirectorySeparatorChar + "source" + Path.DirectorySeparatorChar + "images" + Path.DirectorySeparatorChar + "background169.png", System.Drawing.Imaging.ImageFormat.Png);
                 }
             }
             else
             {
                 Bitmap img = new Bitmap(640, 480);
-                img.Save(TempDir + "\\source\\images\\background169.png", System.Drawing.Imaging.ImageFormat.Png);
+                img.Save(TempDir + Path.DirectorySeparatorChar + "source" + Path.DirectorySeparatorChar + "images" + Path.DirectorySeparatorChar + "background169.png", System.Drawing.Imaging.ImageFormat.Png);
             }
         }
 
@@ -304,7 +304,7 @@ namespace ForwardMii
                 }
             }
 
-            using (FileStream fs = new FileStream(TempDir + "source\\main.cpp", FileMode.Create))
+            using (FileStream fs = new FileStream(TempDir + "source" + Path.DirectorySeparatorChar + "main.cpp", FileMode.Create))
             {
                 using (StreamWriter writer = new StreamWriter(fs))
                 {
@@ -319,14 +319,14 @@ namespace ForwardMii
         private void CopyResources()
         {
             if (Directory.Exists(TempDir)) Directory.Delete(TempDir, true);
-            Directory.CreateDirectory(TempDir + "source\\images");
+            Directory.CreateDirectory(TempDir + "source" + Path.DirectorySeparatorChar + "images");
             string[] Resources = new string[] { "dolloader.c", "dolloader.h", "elf_abi.h", "elfloader.c",
                 "elfloader.h", "fatmounter.c", "fatmounter.h", "filelist.h", "video.cpp", "video.h" };
 
             foreach (string thisResource in Resources)
             {
                 Stream tempStream = GetReourceStream(thisResource);
-                StreamToFile(tempStream, TempDir + "source\\" + thisResource);
+                StreamToFile(tempStream, TempDir + "source" + Path.DirectorySeparatorChar + thisResource);
             }
 
             Stream makefile = GetReourceStream("Makefile");
diff --git a/ForwardMii/Resources/GX/video.cpp b/ForwardMii/Resources/GX/video.cpp
index 345bcf0..90b7521 100644
--- a/ForwardMii/Resources/GX/video.cpp
+++ b/ForwardMii/Resources/GX/video.cpp
@@ -127,6 +127,10 @@ InitVideo ()
 	VIDEO_Init();
 	vmode = VIDEO_GetPreferredMode(NULL); // get default video mode
 
+	//Widescreen loading image fix...
+	vmode->viWidth = 678;
+	vmode->viXOrigin = (VI_MAX_WIDTH_NTSC - 678) / 2;
+	
 	VIDEO_Configure (vmode);
 
 	// Allocate the video buffers