diff --git a/WPinternals.sln b/WPinternals.sln
index 7acdd45..d8e6f9d 100644
--- a/WPinternals.sln
+++ b/WPinternals.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31606.5
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WPinternals", "WPinternals.csproj", "{AED6DEB8-F54C-4B41-9655-793E7096AE6E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WPinternals", "WPinternals\WPinternals.csproj", "{AED6DEB8-F54C-4B41-9655-793E7096AE6E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/7zip/Common/CRC.cs b/WPinternals/7zip/Common/CRC.cs
similarity index 96%
rename from 7zip/Common/CRC.cs
rename to WPinternals/7zip/Common/CRC.cs
index ce5e76c..d9260cc 100644
--- a/7zip/Common/CRC.cs
+++ b/WPinternals/7zip/Common/CRC.cs
@@ -1,64 +1,64 @@
-// Common/CRC.cs
-
-namespace SevenZip
-{
-    internal class CRC
-    {
-        public static readonly uint[] Table;
-
-        static CRC()
-        {
-            Table = new uint[256];
-            const uint kPoly = 0xEDB88320;
-            for (uint i = 0; i < 256; i++)
-            {
-                uint r = i;
-                for (int j = 0; j < 8; j++)
-                {
-                    if ((r & 1) != 0)
-                    {
-                        r = (r >> 1) ^ kPoly;
-                    }
-                    else
-                    {
-                        r >>= 1;
-                    }
-                }
-
-                Table[i] = r;
-            }
-        }
-
-        private uint _value = 0xFFFFFFFF;
-
-        public void Init() { _value = 0xFFFFFFFF; }
-
-        public void UpdateByte(byte b)
-        {
-            _value = Table[((byte)_value) ^ b] ^ (_value >> 8);
-        }
-
-        public void Update(byte[] data, uint offset, uint size)
-        {
-            for (uint i = 0; i < size; i++)
-            {
-                _value = Table[((byte)_value) ^ data[offset + i]] ^ (_value >> 8);
-            }
-        }
-
-        public uint GetDigest() { return _value ^ 0xFFFFFFFF; }
-
-        private static uint CalculateDigest(byte[] data, uint offset, uint size)
-        {
-            CRC crc = new();
-            // crc.Init();
-            crc.Update(data, offset, size);
-            return crc.GetDigest();
-        }
-
-        private static bool VerifyDigest(uint digest, byte[] data, uint offset, uint size)
-        {
-            return CalculateDigest(data, offset, size) == digest;
-        }
-    }
-}
+// Common/CRC.cs
+
+namespace SevenZip
+{
+    internal class CRC
+    {
+        public static readonly uint[] Table;
+
+        static CRC()
+        {
+            Table = new uint[256];
+            const uint kPoly = 0xEDB88320;
+            for (uint i = 0; i < 256; i++)
+            {
+                uint r = i;
+                for (int j = 0; j < 8; j++)
+                {
+                    if ((r & 1) != 0)
+                    {
+                        r = (r >> 1) ^ kPoly;
+                    }
+                    else
+                    {
+                        r >>= 1;
+                    }
+                }
+
+                Table[i] = r;
+            }
+        }
+
+        private uint _value = 0xFFFFFFFF;
+
+        public void Init() { _value = 0xFFFFFFFF; }
+
+        public void UpdateByte(byte b)
+        {
+            _value = Table[((byte)_value) ^ b] ^ (_value >> 8);
+        }
+
+        public void Update(byte[] data, uint offset, uint size)
+        {
+            for (uint i = 0; i < size; i++)
+            {
+                _value = Table[((byte)_value) ^ data[offset + i]] ^ (_value >> 8);
+            }
+        }
+
+        public uint GetDigest() { return _value ^ 0xFFFFFFFF; }
+
+        private static uint CalculateDigest(byte[] data, uint offset, uint size)
+        {
+            CRC crc = new();
+            // crc.Init();
+            crc.Update(data, offset, size);
+            return crc.GetDigest();
+        }
+
+        private static bool VerifyDigest(uint digest, byte[] data, uint offset, uint size)
+        {
+            return CalculateDigest(data, offset, size) == digest;
+        }
+    }
+}
diff --git a/7zip/Common/CommandLineParser.cs b/WPinternals/7zip/Common/CommandLineParser.cs
similarity index 97%
rename from 7zip/Common/CommandLineParser.cs
rename to WPinternals/7zip/Common/CommandLineParser.cs
index 1419528..6facd78 100644
--- a/7zip/Common/CommandLineParser.cs
+++ b/WPinternals/7zip/Common/CommandLineParser.cs
@@ -1,325 +1,325 @@
-// CommandLineParser.cs
-
-using System;
-using System.Collections;
-
-namespace SevenZip.CommandLineParser
-{
-    public enum SwitchType
-    {
-        Simple,
-        PostMinus,
-        LimitedPostString,
-        UnLimitedPostString,
-        PostChar
-    }
-
-    public class SwitchForm
-    {
-        public string IDString;
-        public SwitchType Type;
-        public bool Multi;
-        public int MinLen;
-        public int MaxLen;
-        public string PostCharSet;
-
-        public SwitchForm(string idString, SwitchType type, bool multi,
-            int minLen, int maxLen, string postCharSet)
-        {
-            IDString = idString;
-            Type = type;
-            Multi = multi;
-            MinLen = minLen;
-            MaxLen = maxLen;
-            PostCharSet = postCharSet;
-        }
-        public SwitchForm(string idString, SwitchType type, bool multi, int minLen) :
-            this(idString, type, multi, minLen, 0, "")
-        {
-        }
-        public SwitchForm(string idString, SwitchType type, bool multi) :
-            this(idString, type, multi, 0)
-        {
-        }
-    }
-
-    public class SwitchResult
-    {
-        public bool ThereIs;
-        public bool WithMinus;
-        public ArrayList PostStrings = new();
-        public int PostCharIndex;
-        public SwitchResult()
-        {
-            ThereIs = false;
-        }
-    }
-
-    public class Parser
-    {
-        public ArrayList NonSwitchStrings = new();
-        private readonly SwitchResult[] _switches;
-
-        public Parser(int numSwitches)
-        {
-            _switches = new SwitchResult[numSwitches];
-            for (int i = 0; i < numSwitches; i++)
-            {
-                _switches[i] = new SwitchResult();
-            }
-        }
-
-        private bool ParseString(string srcString, SwitchForm[] switchForms)
-        {
-            int len = srcString.Length;
-            if (len == 0)
-            {
-                return false;
-            }
-
-            int pos = 0;
-            if (!IsItSwitchChar(srcString[pos]))
-            {
-                return false;
-            }
-
-            while (pos < len)
-            {
-                if (IsItSwitchChar(srcString[pos]))
-                {
-                    pos++;
-                }
-
-                const int kNoLen = -1;
-                int matchedSwitchIndex = 0;
-                int maxLen = kNoLen;
-                for (int switchIndex = 0; switchIndex < _switches.Length; switchIndex++)
-                {
-                    int switchLen = switchForms[switchIndex].IDString.Length;
-                    if (switchLen <= maxLen || pos + switchLen > len)
-                    {
-                        continue;
-                    }
-
-                    if (String.Compare(switchForms[switchIndex].IDString, 0,
-                            srcString, pos, switchLen, true) == 0)
-                    {
-                        matchedSwitchIndex = switchIndex;
-                        maxLen = switchLen;
-                    }
-                }
-                if (maxLen == kNoLen)
-                {
-                    throw new Exception("maxLen == kNoLen");
-                }
-
-                SwitchResult matchedSwitch = _switches[matchedSwitchIndex];
-                SwitchForm switchForm = switchForms[matchedSwitchIndex];
-                if ((!switchForm.Multi) && matchedSwitch.ThereIs)
-                {
-                    throw new Exception("switch must be single");
-                }
-
-                matchedSwitch.ThereIs = true;
-                pos += maxLen;
-                int tailSize = len - pos;
-                SwitchType type = switchForm.Type;
-                switch (type)
-                {
-                    case SwitchType.PostMinus:
-                        {
-                            if (tailSize == 0)
-                            {
-                                matchedSwitch.WithMinus = false;
-                            }
-                            else
-                            {
-                                matchedSwitch.WithMinus = srcString[pos] == kSwitchMinus;
-                                if (matchedSwitch.WithMinus)
-                                {
-                                    pos++;
-                                }
-                            }
-                            break;
-                        }
-                    case SwitchType.PostChar:
-                        {
-                            if (tailSize < switchForm.MinLen)
-                            {
-                                throw new Exception("switch is not full");
-                            }
-
-                            string charSet = switchForm.PostCharSet;
-                            const int kEmptyCharValue = -1;
-                            if (tailSize == 0)
-                            {
-                                matchedSwitch.PostCharIndex = kEmptyCharValue;
-                            }
-                            else
-                            {
-                                int index = charSet.IndexOf(srcString[pos]);
-                                if (index < 0)
-                                {
-                                    matchedSwitch.PostCharIndex = kEmptyCharValue;
-                                }
-                                else
-                                {
-                                    matchedSwitch.PostCharIndex = index;
-                                    pos++;
-                                }
-                            }
-                            break;
-                        }
-                    case SwitchType.LimitedPostString:
-                    case SwitchType.UnLimitedPostString:
-                        {
-                            int minLen = switchForm.MinLen;
-                            if (tailSize < minLen)
-                            {
-                                throw new Exception("switch is not full");
-                            }
-
-                            if (type == SwitchType.UnLimitedPostString)
-                            {
-                                matchedSwitch.PostStrings.Add(srcString[pos..]);
-                                return true;
-                            }
-                            String stringSwitch = srcString.Substring(pos, minLen);
-                            pos += minLen;
-                            for (int i = minLen; i < switchForm.MaxLen && pos < len; i++, pos++)
-                            {
-                                char c = srcString[pos];
-                                if (IsItSwitchChar(c))
-                                {
-                                    break;
-                                }
-
-                                stringSwitch += c;
-                            }
-                            matchedSwitch.PostStrings.Add(stringSwitch);
-                            break;
-                        }
-                }
-            }
-            return true;
-        }
-
-        public void ParseStrings(SwitchForm[] switchForms, string[] commandStrings)
-        {
-            int numCommandStrings = commandStrings.Length;
-            bool stopSwitch = false;
-            for (int i = 0; i < numCommandStrings; i++)
-            {
-                string s = commandStrings[i];
-                if (stopSwitch)
-                {
-                    NonSwitchStrings.Add(s);
-                }
-                else
-                    if (s == kStopSwitchParsing)
-                {
-                    stopSwitch = true;
-                }
-                else
-                    if (!ParseString(s, switchForms))
-                {
-                    NonSwitchStrings.Add(s);
-                }
-            }
-        }
-
-        public SwitchResult this[int index] { get { return _switches[index]; } }
-
-        public static int ParseCommand(CommandForm[] commandForms, string commandString,
-            out string postString)
-        {
-            for (int i = 0; i < commandForms.Length; i++)
-            {
-                string id = commandForms[i].IDString;
-                if (commandForms[i].PostStringMode)
-                {
-                    if (commandString.IndexOf(id) == 0)
-                    {
-                        postString = commandString[id.Length..];
-                        return i;
-                    }
-                }
-                else
-                    if (commandString == id)
-                {
-                    postString = "";
-                    return i;
-                }
-            }
-            postString = "";
-            return -1;
-        }
-
-        private static bool ParseSubCharsCommand(int numForms, CommandSubCharsSet[] forms,
-            string commandString, ArrayList indices)
-        {
-            indices.Clear();
-            int numUsedChars = 0;
-            for (int i = 0; i < numForms; i++)
-            {
-                CommandSubCharsSet charsSet = forms[i];
-                int currentIndex = -1;
-                int len = charsSet.Chars.Length;
-                for (int j = 0; j < len; j++)
-                {
-                    char c = charsSet.Chars[j];
-                    int newIndex = commandString.IndexOf(c);
-                    if (newIndex >= 0)
-                    {
-                        if (currentIndex >= 0)
-                        {
-                            return false;
-                        }
-
-                        if (commandString.IndexOf(c, newIndex + 1) >= 0)
-                        {
-                            return false;
-                        }
-
-                        currentIndex = j;
-                        numUsedChars++;
-                    }
-                }
-                if (currentIndex == -1 && !charsSet.EmptyAllowed)
-                {
-                    return false;
-                }
-
-                indices.Add(currentIndex);
-            }
-            return numUsedChars == commandString.Length;
-        }
-        private const char kSwitchID1 = '-';
-        private const char kSwitchID2 = '/';
-
-        private const char kSwitchMinus = '-';
-        private const string kStopSwitchParsing = "--";
-
-        private static bool IsItSwitchChar(char c)
-        {
-            return c == kSwitchID1 || c == kSwitchID2;
-        }
-    }
-
-    public class CommandForm
-    {
-        public string IDString = "";
-        public bool PostStringMode = false;
-        public CommandForm(string idString, bool postStringMode)
-        {
-            IDString = idString;
-            PostStringMode = postStringMode;
-        }
-    }
-
-    internal class CommandSubCharsSet
-    {
-        public string Chars = "";
-        public bool EmptyAllowed = false;
-    }
-}
+// CommandLineParser.cs
+
+using System;
+using System.Collections;
+
+namespace SevenZip.CommandLineParser
+{
+    public enum SwitchType
+    {
+        Simple,
+        PostMinus,
+        LimitedPostString,
+        UnLimitedPostString,
+        PostChar
+    }
+
+    public class SwitchForm
+    {
+        public string IDString;
+        public SwitchType Type;
+        public bool Multi;
+        public int MinLen;
+        public int MaxLen;
+        public string PostCharSet;
+
+        public SwitchForm(string idString, SwitchType type, bool multi,
+            int minLen, int maxLen, string postCharSet)
+        {
+            IDString = idString;
+            Type = type;
+            Multi = multi;
+            MinLen = minLen;
+            MaxLen = maxLen;
+            PostCharSet = postCharSet;
+        }
+        public SwitchForm(string idString, SwitchType type, bool multi, int minLen) :
+            this(idString, type, multi, minLen, 0, "")
+        {
+        }
+        public SwitchForm(string idString, SwitchType type, bool multi) :
+            this(idString, type, multi, 0)
+        {
+        }
+    }
+
+    public class SwitchResult
+    {
+        public bool ThereIs;
+        public bool WithMinus;
+        public ArrayList PostStrings = new();
+        public int PostCharIndex;
+        public SwitchResult()
+        {
+            ThereIs = false;
+        }
+    }
+
+    public class Parser
+    {
+        public ArrayList NonSwitchStrings = new();
+        private readonly SwitchResult[] _switches;
+
+        public Parser(int numSwitches)
+        {
+            _switches = new SwitchResult[numSwitches];
+            for (int i = 0; i < numSwitches; i++)
+            {
+                _switches[i] = new SwitchResult();
+            }
+        }
+
+        private bool ParseString(string srcString, SwitchForm[] switchForms)
+        {
+            int len = srcString.Length;
+            if (len == 0)
+            {
+                return false;
+            }
+
+            int pos = 0;
+            if (!IsItSwitchChar(srcString[pos]))
+            {
+                return false;
+            }
+
+            while (pos < len)
+            {
+                if (IsItSwitchChar(srcString[pos]))
+                {
+                    pos++;
+                }
+
+                const int kNoLen = -1;
+                int matchedSwitchIndex = 0;
+                int maxLen = kNoLen;
+                for (int switchIndex = 0; switchIndex < _switches.Length; switchIndex++)
+                {
+                    int switchLen = switchForms[switchIndex].IDString.Length;
+                    if (switchLen <= maxLen || pos + switchLen > len)
+                    {
+                        continue;
+                    }
+
+                    if (String.Compare(switchForms[switchIndex].IDString, 0,
+                            srcString, pos, switchLen, true) == 0)
+                    {
+                        matchedSwitchIndex = switchIndex;
+                        maxLen = switchLen;
+                    }
+                }
+                if (maxLen == kNoLen)
+                {
+                    throw new Exception("maxLen == kNoLen");
+                }
+
+                SwitchResult matchedSwitch = _switches[matchedSwitchIndex];
+                SwitchForm switchForm = switchForms[matchedSwitchIndex];
+                if ((!switchForm.Multi) && matchedSwitch.ThereIs)
+                {
+                    throw new Exception("switch must be single");
+                }
+
+                matchedSwitch.ThereIs = true;
+                pos += maxLen;
+                int tailSize = len - pos;
+                SwitchType type = switchForm.Type;
+                switch (type)
+                {
+                    case SwitchType.PostMinus:
+                        {
+                            if (tailSize == 0)
+                            {
+                                matchedSwitch.WithMinus = false;
+                            }
+                            else
+                            {
+                                matchedSwitch.WithMinus = srcString[pos] == kSwitchMinus;
+                                if (matchedSwitch.WithMinus)
+                                {
+                                    pos++;
+                                }
+                            }
+                            break;
+                        }
+                    case SwitchType.PostChar:
+                        {
+                            if (tailSize < switchForm.MinLen)
+                            {
+                                throw new Exception("switch is not full");
+                            }
+
+                            string charSet = switchForm.PostCharSet;
+                            const int kEmptyCharValue = -1;
+                            if (tailSize == 0)
+                            {
+                                matchedSwitch.PostCharIndex = kEmptyCharValue;
+                            }
+                            else
+                            {
+                                int index = charSet.IndexOf(srcString[pos]);
+                                if (index < 0)
+                                {
+                                    matchedSwitch.PostCharIndex = kEmptyCharValue;
+                                }
+                                else
+                                {
+                                    matchedSwitch.PostCharIndex = index;
+                                    pos++;
+                                }
+                            }
+                            break;
+                        }
+                    case SwitchType.LimitedPostString:
+                    case SwitchType.UnLimitedPostString:
+                        {
+                            int minLen = switchForm.MinLen;
+                            if (tailSize < minLen)
+                            {
+                                throw new Exception("switch is not full");
+                            }
+
+                            if (type == SwitchType.UnLimitedPostString)
+                            {
+                                matchedSwitch.PostStrings.Add(srcString[pos..]);
+                                return true;
+                            }
+                            String stringSwitch = srcString.Substring(pos, minLen);
+                            pos += minLen;
+                            for (int i = minLen; i < switchForm.MaxLen && pos < len; i++, pos++)
+                            {
+                                char c = srcString[pos];
+                                if (IsItSwitchChar(c))
+                                {
+                                    break;
+                                }
+
+                                stringSwitch += c;
+                            }
+                            matchedSwitch.PostStrings.Add(stringSwitch);
+                            break;
+                        }
+                }
+            }
+            return true;
+        }
+
+        public void ParseStrings(SwitchForm[] switchForms, string[] commandStrings)
+        {
+            int numCommandStrings = commandStrings.Length;
+            bool stopSwitch = false;
+            for (int i = 0; i < numCommandStrings; i++)
+            {
+                string s = commandStrings[i];
+                if (stopSwitch)
+                {
+                    NonSwitchStrings.Add(s);
+                }
+                else
+                    if (s == kStopSwitchParsing)
+                {
+                    stopSwitch = true;
+                }
+                else
+                    if (!ParseString(s, switchForms))
+                {
+                    NonSwitchStrings.Add(s);
+                }
+            }
+        }
+
+        public SwitchResult this[int index] { get { return _switches[index]; } }
+
+        public static int ParseCommand(CommandForm[] commandForms, string commandString,
+            out string postString)
+        {
+            for (int i = 0; i < commandForms.Length; i++)
+            {
+                string id = commandForms[i].IDString;
+                if (commandForms[i].PostStringMode)
+                {
+                    if (commandString.IndexOf(id) == 0)
+                    {
+                        postString = commandString[id.Length..];
+                        return i;
+                    }
+                }
+                else
+                    if (commandString == id)
+                {
+                    postString = "";
+                    return i;
+                }
+            }
+            postString = "";
+            return -1;
+        }
+
+        private static bool ParseSubCharsCommand(int numForms, CommandSubCharsSet[] forms,
+            string commandString, ArrayList indices)
+        {
+            indices.Clear();
+            int numUsedChars = 0;
+            for (int i = 0; i < numForms; i++)
+            {
+                CommandSubCharsSet charsSet = forms[i];
+                int currentIndex = -1;
+                int len = charsSet.Chars.Length;
+                for (int j = 0; j < len; j++)
+                {
+                    char c = charsSet.Chars[j];
+                    int newIndex = commandString.IndexOf(c);
+                    if (newIndex >= 0)
+                    {
+                        if (currentIndex >= 0)
+                        {
+                            return false;
+                        }
+
+                        if (commandString.IndexOf(c, newIndex + 1) >= 0)
+                        {
+                            return false;
+                        }
+
+                        currentIndex = j;
+                        numUsedChars++;
+                    }
+                }
+                if (currentIndex == -1 && !charsSet.EmptyAllowed)
+                {
+                    return false;
+                }
+
+                indices.Add(currentIndex);
+            }
+            return numUsedChars == commandString.Length;
+        }
+        private const char kSwitchID1 = '-';
+        private const char kSwitchID2 = '/';
+
+        private const char kSwitchMinus = '-';
+        private const string kStopSwitchParsing = "--";
+
+        private static bool IsItSwitchChar(char c)
+        {
+            return c == kSwitchID1 || c == kSwitchID2;
+        }
+    }
+
+    public class CommandForm
+    {
+        public string IDString = "";
+        public bool PostStringMode = false;
+        public CommandForm(string idString, bool postStringMode)
+        {
+            IDString = idString;
+            PostStringMode = postStringMode;
+        }
+    }
+
+    internal class CommandSubCharsSet
+    {
+        public string Chars = "";
+        public bool EmptyAllowed = false;
+    }
+}
diff --git a/7zip/Common/InBuffer.cs b/WPinternals/7zip/Common/InBuffer.cs
similarity index 96%
rename from 7zip/Common/InBuffer.cs
rename to WPinternals/7zip/Common/InBuffer.cs
index 6205287..36ff6b4 100644
--- a/7zip/Common/InBuffer.cs
+++ b/WPinternals/7zip/Common/InBuffer.cs
@@ -1,78 +1,78 @@
-// InBuffer.cs
-
-namespace SevenZip.Buffer
-{
-    public class InBuffer
-    {
-        private readonly byte[] m_Buffer;
-        private uint m_Pos;
-        private uint m_Limit;
-        private readonly uint m_BufferSize;
-        private System.IO.Stream m_Stream;
-        private bool m_StreamWasExhausted;
-        private ulong m_ProcessedSize;
-
-        public InBuffer(uint bufferSize)
-        {
-            m_Buffer = new byte[bufferSize];
-            m_BufferSize = bufferSize;
-        }
-
-        public void Init(System.IO.Stream stream)
-        {
-            m_Stream = stream;
-            m_ProcessedSize = 0;
-            m_Limit = 0;
-            m_Pos = 0;
-            m_StreamWasExhausted = false;
-        }
-
-        public bool ReadBlock()
-        {
-            if (m_StreamWasExhausted)
-            {
-                return false;
-            }
-
-            m_ProcessedSize += m_Pos;
-            int aNumProcessedBytes = m_Stream.Read(m_Buffer, 0, (int)m_BufferSize);
-            m_Pos = 0;
-            m_Limit = (uint)aNumProcessedBytes;
-            m_StreamWasExhausted = aNumProcessedBytes == 0;
-            return !m_StreamWasExhausted;
-        }
-
-        public void ReleaseStream()
-        {
-            // m_Stream.Close(); 
-            m_Stream = null;
-        }
-
-        public bool ReadByte(byte b) // check it
-        {
-            if (m_Pos >= m_Limit && !ReadBlock())
-            {
-                return false;
-            }
-
-            b = m_Buffer[m_Pos++];
-            return true;
-        }
-
-        public byte ReadByte()
-        {
-            // return (byte)m_Stream.ReadByte();
-            if (m_Pos >= m_Limit && !ReadBlock())
-            {
-                return 0xFF;
-            }
-
-            return m_Buffer[m_Pos++];
-        }
-
-        public ulong GetProcessedSize()
-        {
-            return m_ProcessedSize + m_Pos;
-        }
-    }
-}
+// InBuffer.cs
+
+namespace SevenZip.Buffer
+{
+    public class InBuffer
+    {
+        private readonly byte[] m_Buffer;
+        private uint m_Pos;
+        private uint m_Limit;
+        private readonly uint m_BufferSize;
+        private System.IO.Stream m_Stream;
+        private bool m_StreamWasExhausted;
+        private ulong m_ProcessedSize;
+
+        public InBuffer(uint bufferSize)
+        {
+            m_Buffer = new byte[bufferSize];
+            m_BufferSize = bufferSize;
+        }
+
+        public void Init(System.IO.Stream stream)
+        {
+            m_Stream = stream;
+            m_ProcessedSize = 0;
+            m_Limit = 0;
+            m_Pos = 0;
+            m_StreamWasExhausted = false;
+        }
+
+        public bool ReadBlock()
+        {
+            if (m_StreamWasExhausted)
+            {
+                return false;
+            }
+
+            m_ProcessedSize += m_Pos;
+            int aNumProcessedBytes = m_Stream.Read(m_Buffer, 0, (int)m_BufferSize);
+            m_Pos = 0;
+            m_Limit = (uint)aNumProcessedBytes;
+            m_StreamWasExhausted = aNumProcessedBytes == 0;
+            return !m_StreamWasExhausted;
+        }
+
+        public void ReleaseStream()
+        {
+            // m_Stream.Close(); 
+            m_Stream = null;
+        }
+
+        public bool ReadByte(byte b) // check it
+        {
+            if (m_Pos >= m_Limit && !ReadBlock())
+            {
+                return false;
+            }
+
+            b = m_Buffer[m_Pos++];
+            return true;
+        }
+
+        public byte ReadByte()
+        {
+            // return (byte)m_Stream.ReadByte();
+            if (m_Pos >= m_Limit && !ReadBlock())
+            {
+                return 0xFF;
+            }
+
+            return m_Buffer[m_Pos++];
+        }
+
+        public ulong GetProcessedSize()
+        {
+            return m_ProcessedSize + m_Pos;
+        }
+    }
+}
diff --git a/7zip/Common/OutBuffer.cs b/WPinternals/7zip/Common/OutBuffer.cs
similarity index 96%
rename from 7zip/Common/OutBuffer.cs
rename to WPinternals/7zip/Common/OutBuffer.cs
index a9657df..b371901 100644
--- a/7zip/Common/OutBuffer.cs
+++ b/WPinternals/7zip/Common/OutBuffer.cs
@@ -1,52 +1,52 @@
-// OutBuffer.cs
-
-namespace SevenZip.Buffer
-{
-    public class OutBuffer
-    {
-        private readonly byte[] m_Buffer;
-        private uint m_Pos;
-        private readonly uint m_BufferSize;
-        private System.IO.Stream m_Stream;
-        private ulong m_ProcessedSize;
-
-        public OutBuffer(uint bufferSize)
-        {
-            m_Buffer = new byte[bufferSize];
-            m_BufferSize = bufferSize;
-        }
-
-        public void SetStream(System.IO.Stream stream) { m_Stream = stream; }
-        public void FlushStream() { m_Stream.Flush(); }
-        public void CloseStream() { m_Stream.Close(); }
-        public void ReleaseStream() { m_Stream = null; }
-
-        public void Init()
-        {
-            m_ProcessedSize = 0;
-            m_Pos = 0;
-        }
-
-        public void WriteByte(byte b)
-        {
-            m_Buffer[m_Pos++] = b;
-            if (m_Pos >= m_BufferSize)
-            {
-                FlushData();
-            }
-        }
-
-        public void FlushData()
-        {
-            if (m_Pos == 0)
-            {
-                return;
-            }
-
-            m_Stream.Write(m_Buffer, 0, (int)m_Pos);
-            m_Pos = 0;
-        }
-
-        public ulong GetProcessedSize() { return m_ProcessedSize + m_Pos; }
-    }
-}
+// OutBuffer.cs
+
+namespace SevenZip.Buffer
+{
+    public class OutBuffer
+    {
+        private readonly byte[] m_Buffer;
+        private uint m_Pos;
+        private readonly uint m_BufferSize;
+        private System.IO.Stream m_Stream;
+        private ulong m_ProcessedSize;
+
+        public OutBuffer(uint bufferSize)
+        {
+            m_Buffer = new byte[bufferSize];
+            m_BufferSize = bufferSize;
+        }
+
+        public void SetStream(System.IO.Stream stream) { m_Stream = stream; }
+        public void FlushStream() { m_Stream.Flush(); }
+        public void CloseStream() { m_Stream.Close(); }
+        public void ReleaseStream() { m_Stream = null; }
+
+        public void Init()
+        {
+            m_ProcessedSize = 0;
+            m_Pos = 0;
+        }
+
+        public void WriteByte(byte b)
+        {
+            m_Buffer[m_Pos++] = b;
+            if (m_Pos >= m_BufferSize)
+            {
+                FlushData();
+            }
+        }
+
+        public void FlushData()
+        {
+            if (m_Pos == 0)
+            {
+                return;
+            }
+
+            m_Stream.Write(m_Buffer, 0, (int)m_Pos);
+            m_Pos = 0;
+        }
+
+        public ulong GetProcessedSize() { return m_ProcessedSize + m_Pos; }
+    }
+}
diff --git a/7zip/Compress/LZ/IMatchFinder.cs b/WPinternals/7zip/Compress/LZ/IMatchFinder.cs
similarity index 96%
rename from 7zip/Compress/LZ/IMatchFinder.cs
rename to WPinternals/7zip/Compress/LZ/IMatchFinder.cs
index e0ebbd8..ae4590b 100644
--- a/7zip/Compress/LZ/IMatchFinder.cs
+++ b/WPinternals/7zip/Compress/LZ/IMatchFinder.cs
@@ -1,24 +1,24 @@
-// IMatchFinder.cs
-
-using System;
-
-namespace SevenZip.Compression.LZ
-{
-    internal interface IInWindowStream
-    {
-        void SetStream(System.IO.Stream inStream);
-        void Init();
-        void ReleaseStream();
-        Byte GetIndexByte(Int32 index);
-        UInt32 GetMatchLen(Int32 index, UInt32 distance, UInt32 limit);
-        UInt32 GetNumAvailableBytes();
-    }
-
-    internal interface IMatchFinder : IInWindowStream
-    {
-        void Create(UInt32 historySize, UInt32 keepAddBufferBefore,
-                UInt32 matchMaxLen, UInt32 keepAddBufferAfter);
-        UInt32 GetMatches(UInt32[] distances);
-        void Skip(UInt32 num);
-    }
-}
+// IMatchFinder.cs
+
+using System;
+
+namespace SevenZip.Compression.LZ
+{
+    internal interface IInWindowStream
+    {
+        void SetStream(System.IO.Stream inStream);
+        void Init();
+        void ReleaseStream();
+        Byte GetIndexByte(Int32 index);
+        UInt32 GetMatchLen(Int32 index, UInt32 distance, UInt32 limit);
+        UInt32 GetNumAvailableBytes();
+    }
+
+    internal interface IMatchFinder : IInWindowStream
+    {
+        void Create(UInt32 historySize, UInt32 keepAddBufferBefore,
+                UInt32 matchMaxLen, UInt32 keepAddBufferAfter);
+        UInt32 GetMatches(UInt32[] distances);
+        void Skip(UInt32 num);
+    }
+}
diff --git a/7zip/Compress/LZ/LzBinTree.cs b/WPinternals/7zip/Compress/LZ/LzBinTree.cs
similarity index 97%
rename from 7zip/Compress/LZ/LzBinTree.cs
rename to WPinternals/7zip/Compress/LZ/LzBinTree.cs
index c8df03c..5b02c4c 100644
--- a/7zip/Compress/LZ/LzBinTree.cs
+++ b/WPinternals/7zip/Compress/LZ/LzBinTree.cs
@@ -1,408 +1,408 @@
-// LzBinTree.cs
-
-using System;
-
-namespace SevenZip.Compression.LZ
-{
-    public class BinTree : InWindow, IMatchFinder
-    {
-        private UInt32 _cyclicBufferPos;
-        private UInt32 _cyclicBufferSize = 0;
-        private UInt32 _matchMaxLen;
-
-        private UInt32[] _son;
-        private UInt32[] _hash;
-
-        private UInt32 _cutValue = 0xFF;
-        private UInt32 _hashMask;
-        private UInt32 _hashSizeSum = 0;
-
-        private bool HASH_ARRAY = true;
-
-        private const UInt32 kHash2Size = 1 << 10;
-        private const UInt32 kHash3Size = 1 << 16;
-        private const UInt32 kBT2HashSize = 1 << 16;
-        private const UInt32 kStartMaxLen = 1;
-        private const UInt32 kHash3Offset = kHash2Size;
-        private const UInt32 kEmptyHashValue = 0;
-        private const UInt32 kMaxValForNormalize = ((UInt32)1 << 31) - 1;
-
-        private UInt32 kNumHashDirectBytes = 0;
-        private UInt32 kMinMatchCheck = 4;
-        private UInt32 kFixHashSize = kHash2Size + kHash3Size;
-
-        public void SetType(int numHashBytes)
-        {
-            HASH_ARRAY = numHashBytes > 2;
-            if (HASH_ARRAY)
-            {
-                kNumHashDirectBytes = 0;
-                kMinMatchCheck = 4;
-                kFixHashSize = kHash2Size + kHash3Size;
-            }
-            else
-            {
-                kNumHashDirectBytes = 2;
-                kMinMatchCheck = 2 + 1;
-                kFixHashSize = 0;
-            }
-        }
-
-        public new void SetStream(System.IO.Stream stream) { base.SetStream(stream); }
-        public new void ReleaseStream() { base.ReleaseStream(); }
-
-        public new void Init()
-        {
-            base.Init();
-            for (UInt32 i = 0; i < _hashSizeSum; i++)
-            {
-                _hash[i] = kEmptyHashValue;
-            }
-
-            _cyclicBufferPos = 0;
-            ReduceOffsets(-1);
-        }
-
-        public new void MovePos()
-        {
-            if (++_cyclicBufferPos >= _cyclicBufferSize)
-            {
-                _cyclicBufferPos = 0;
-            }
-
-            base.MovePos();
-            if (_pos == kMaxValForNormalize)
-            {
-                Normalize();
-            }
-        }
-
-        public new Byte GetIndexByte(Int32 index) { return base.GetIndexByte(index); }
-
-        public new UInt32 GetMatchLen(Int32 index, UInt32 distance, UInt32 limit)
-        { return base.GetMatchLen(index, distance, limit); }
-
-        public new UInt32 GetNumAvailableBytes() { return base.GetNumAvailableBytes(); }
-
-        public void Create(UInt32 historySize, UInt32 keepAddBufferBefore,
-                UInt32 matchMaxLen, UInt32 keepAddBufferAfter)
-        {
-            if (historySize > kMaxValForNormalize - 256)
-            {
-                throw new Exception();
-            }
-
-            _cutValue = 16 + (matchMaxLen >> 1);
-
-            UInt32 windowReservSize = ((historySize + keepAddBufferBefore +
-                    matchMaxLen + keepAddBufferAfter) / 2) + 256;
-
-            Create(historySize + keepAddBufferBefore, matchMaxLen + keepAddBufferAfter, windowReservSize);
-
-            _matchMaxLen = matchMaxLen;
-
-            UInt32 cyclicBufferSize = historySize + 1;
-            if (_cyclicBufferSize != cyclicBufferSize)
-            {
-                _son = new UInt32[(_cyclicBufferSize = cyclicBufferSize) * 2];
-            }
-
-            UInt32 hs = kBT2HashSize;
-
-            if (HASH_ARRAY)
-            {
-                hs = historySize - 1;
-                hs |= hs >> 1;
-                hs |= hs >> 2;
-                hs |= hs >> 4;
-                hs |= hs >> 8;
-                hs >>= 1;
-                hs |= 0xFFFF;
-                if (hs > (1 << 24))
-                {
-                    hs >>= 1;
-                }
-
-                _hashMask = hs;
-                hs++;
-                hs += kFixHashSize;
-            }
-            if (hs != _hashSizeSum)
-            {
-                _hash = new UInt32[_hashSizeSum = hs];
-            }
-        }
-
-        public UInt32 GetMatches(UInt32[] distances)
-        {
-            UInt32 lenLimit;
-            if (_pos + _matchMaxLen <= _streamPos)
-            {
-                lenLimit = _matchMaxLen;
-            }
-            else
-            {
-                lenLimit = _streamPos - _pos;
-                if (lenLimit < kMinMatchCheck)
-                {
-                    MovePos();
-                    return 0;
-                }
-            }
-
-            UInt32 offset = 0;
-            UInt32 matchMinPos = (_pos > _cyclicBufferSize) ? (_pos - _cyclicBufferSize) : 0;
-            UInt32 cur = _bufferOffset + _pos;
-            UInt32 maxLen = kStartMaxLen; // to avoid items for len < hashSize;
-            UInt32 hashValue, hash2Value = 0, hash3Value = 0;
-
-            if (HASH_ARRAY)
-            {
-                UInt32 temp = CRC.Table[_bufferBase[cur]] ^ _bufferBase[cur + 1];
-                hash2Value = temp & (kHash2Size - 1);
-                temp ^= (UInt32)_bufferBase[cur + 2] << 8;
-                hash3Value = temp & (kHash3Size - 1);
-                hashValue = (temp ^ (CRC.Table[_bufferBase[cur + 3]] << 5)) & _hashMask;
-            }
-            else
-            {
-                hashValue = _bufferBase[cur] ^ ((UInt32)_bufferBase[cur + 1] << 8);
-            }
-
-            UInt32 curMatch = _hash[kFixHashSize + hashValue];
-            if (HASH_ARRAY)
-            {
-                UInt32 curMatch2 = _hash[hash2Value];
-                UInt32 curMatch3 = _hash[kHash3Offset + hash3Value];
-                _hash[hash2Value] = _pos;
-                _hash[kHash3Offset + hash3Value] = _pos;
-                if (curMatch2 > matchMinPos && _bufferBase[_bufferOffset + curMatch2] == _bufferBase[cur])
-                {
-                    distances[offset++] = maxLen = 2;
-                    distances[offset++] = _pos - curMatch2 - 1;
-                }
-
-                if (curMatch3 > matchMinPos && _bufferBase[_bufferOffset + curMatch3] == _bufferBase[cur])
-                {
-                    if (curMatch3 == curMatch2)
-                    {
-                        offset -= 2;
-                    }
-
-                    distances[offset++] = maxLen = 3;
-                    distances[offset++] = _pos - curMatch3 - 1;
-                    curMatch2 = curMatch3;
-                }
-
-                if (offset != 0 && curMatch2 == curMatch)
-                {
-                    offset -= 2;
-                    maxLen = kStartMaxLen;
-                }
-            }
-
-            _hash[kFixHashSize + hashValue] = _pos;
-
-            UInt32 ptr0 = (_cyclicBufferPos << 1) + 1;
-            UInt32 ptr1 = _cyclicBufferPos << 1;
-
-            UInt32 len0, len1;
-            len0 = len1 = kNumHashDirectBytes;
-
-            if (kNumHashDirectBytes != 0 && curMatch > matchMinPos)
-            {
-                if (_bufferBase[_bufferOffset + curMatch + kNumHashDirectBytes] !=
-                        _bufferBase[cur + kNumHashDirectBytes])
-                {
-                    distances[offset++] = maxLen = kNumHashDirectBytes;
-                    distances[offset++] = _pos - curMatch - 1;
-                }
-            }
-
-            UInt32 count = _cutValue;
-
-            while (true)
-            {
-                if (curMatch <= matchMinPos || count-- == 0)
-                {
-                    _son[ptr0] = _son[ptr1] = kEmptyHashValue;
-                    break;
-                }
-                UInt32 delta = _pos - curMatch;
-                UInt32 cyclicPos = ((delta <= _cyclicBufferPos) ?
-                            (_cyclicBufferPos - delta) :
-                            (_cyclicBufferPos - delta + _cyclicBufferSize)) << 1;
-
-                UInt32 pby1 = _bufferOffset + curMatch;
-                UInt32 len = Math.Min(len0, len1);
-                if (_bufferBase[pby1 + len] == _bufferBase[cur + len])
-                {
-                    while (++len != lenLimit)
-                    {
-                        if (_bufferBase[pby1 + len] != _bufferBase[cur + len])
-                        {
-                            break;
-                        }
-                    }
-
-                    if (maxLen < len)
-                    {
-                        distances[offset++] = maxLen = len;
-                        distances[offset++] = delta - 1;
-                        if (len == lenLimit)
-                        {
-                            _son[ptr1] = _son[cyclicPos];
-                            _son[ptr0] = _son[cyclicPos + 1];
-                            break;
-                        }
-                    }
-                }
-                if (_bufferBase[pby1 + len] < _bufferBase[cur + len])
-                {
-                    _son[ptr1] = curMatch;
-                    ptr1 = cyclicPos + 1;
-                    curMatch = _son[ptr1];
-                    len1 = len;
-                }
-                else
-                {
-                    _son[ptr0] = curMatch;
-                    ptr0 = cyclicPos;
-                    curMatch = _son[ptr0];
-                    len0 = len;
-                }
-            }
-            MovePos();
-            return offset;
-        }
-
-        public void Skip(UInt32 num)
-        {
-            do
-            {
-                UInt32 lenLimit;
-                if (_pos + _matchMaxLen <= _streamPos)
-                {
-                    lenLimit = _matchMaxLen;
-                }
-                else
-                {
-                    lenLimit = _streamPos - _pos;
-                    if (lenLimit < kMinMatchCheck)
-                    {
-                        MovePos();
-                        continue;
-                    }
-                }
-
-                UInt32 matchMinPos = (_pos > _cyclicBufferSize) ? (_pos - _cyclicBufferSize) : 0;
-                UInt32 cur = _bufferOffset + _pos;
-
-                UInt32 hashValue;
-
-                if (HASH_ARRAY)
-                {
-                    UInt32 temp = CRC.Table[_bufferBase[cur]] ^ _bufferBase[cur + 1];
-                    UInt32 hash2Value = temp & (kHash2Size - 1);
-                    _hash[hash2Value] = _pos;
-                    temp ^= (UInt32)_bufferBase[cur + 2] << 8;
-                    UInt32 hash3Value = temp & (kHash3Size - 1);
-                    _hash[kHash3Offset + hash3Value] = _pos;
-                    hashValue = (temp ^ (CRC.Table[_bufferBase[cur + 3]] << 5)) & _hashMask;
-                }
-                else
-                {
-                    hashValue = _bufferBase[cur] ^ ((UInt32)_bufferBase[cur + 1] << 8);
-                }
-
-                UInt32 curMatch = _hash[kFixHashSize + hashValue];
-                _hash[kFixHashSize + hashValue] = _pos;
-
-                UInt32 ptr0 = (_cyclicBufferPos << 1) + 1;
-                UInt32 ptr1 = _cyclicBufferPos << 1;
-
-                UInt32 len0, len1;
-                len0 = len1 = kNumHashDirectBytes;
-
-                UInt32 count = _cutValue;
-                while (true)
-                {
-                    if (curMatch <= matchMinPos || count-- == 0)
-                    {
-                        _son[ptr0] = _son[ptr1] = kEmptyHashValue;
-                        break;
-                    }
-
-                    UInt32 delta = _pos - curMatch;
-                    UInt32 cyclicPos = ((delta <= _cyclicBufferPos) ?
-                                (_cyclicBufferPos - delta) :
-                                (_cyclicBufferPos - delta + _cyclicBufferSize)) << 1;
-
-                    UInt32 pby1 = _bufferOffset + curMatch;
-                    UInt32 len = Math.Min(len0, len1);
-                    if (_bufferBase[pby1 + len] == _bufferBase[cur + len])
-                    {
-                        while (++len != lenLimit)
-                        {
-                            if (_bufferBase[pby1 + len] != _bufferBase[cur + len])
-                            {
-                                break;
-                            }
-                        }
-
-                        if (len == lenLimit)
-                        {
-                            _son[ptr1] = _son[cyclicPos];
-                            _son[ptr0] = _son[cyclicPos + 1];
-                            break;
-                        }
-                    }
-                    if (_bufferBase[pby1 + len] < _bufferBase[cur + len])
-                    {
-                        _son[ptr1] = curMatch;
-                        ptr1 = cyclicPos + 1;
-                        curMatch = _son[ptr1];
-                        len1 = len;
-                    }
-                    else
-                    {
-                        _son[ptr0] = curMatch;
-                        ptr0 = cyclicPos;
-                        curMatch = _son[ptr0];
-                        len0 = len;
-                    }
-                }
-                MovePos();
-            }
-            while (--num != 0);
-        }
-
-        private void NormalizeLinks(UInt32[] items, UInt32 numItems, UInt32 subValue)
-        {
-            for (UInt32 i = 0; i < numItems; i++)
-            {
-                UInt32 value = items[i];
-                if (value <= subValue)
-                {
-                    value = kEmptyHashValue;
-                }
-                else
-                {
-                    value -= subValue;
-                }
-
-                items[i] = value;
-            }
-        }
-
-        private void Normalize()
-        {
-            UInt32 subValue = _pos - _cyclicBufferSize;
-            NormalizeLinks(_son, _cyclicBufferSize * 2, subValue);
-            NormalizeLinks(_hash, _hashSizeSum, subValue);
-            ReduceOffsets((Int32)subValue);
-        }
-
-        public void SetCutValue(UInt32 cutValue) { _cutValue = cutValue; }
-    }
-}
+// LzBinTree.cs
+
+using System;
+
+namespace SevenZip.Compression.LZ
+{
+    public class BinTree : InWindow, IMatchFinder
+    {
+        private UInt32 _cyclicBufferPos;
+        private UInt32 _cyclicBufferSize = 0;
+        private UInt32 _matchMaxLen;
+
+        private UInt32[] _son;
+        private UInt32[] _hash;
+
+        private UInt32 _cutValue = 0xFF;
+        private UInt32 _hashMask;
+        private UInt32 _hashSizeSum = 0;
+
+        private bool HASH_ARRAY = true;
+
+        private const UInt32 kHash2Size = 1 << 10;
+        private const UInt32 kHash3Size = 1 << 16;
+        private const UInt32 kBT2HashSize = 1 << 16;
+        private const UInt32 kStartMaxLen = 1;
+        private const UInt32 kHash3Offset = kHash2Size;
+        private const UInt32 kEmptyHashValue = 0;
+        private const UInt32 kMaxValForNormalize = ((UInt32)1 << 31) - 1;
+
+        private UInt32 kNumHashDirectBytes = 0;
+        private UInt32 kMinMatchCheck = 4;
+        private UInt32 kFixHashSize = kHash2Size + kHash3Size;
+
+        public void SetType(int numHashBytes)
+        {
+            HASH_ARRAY = numHashBytes > 2;
+            if (HASH_ARRAY)
+            {
+                kNumHashDirectBytes = 0;
+                kMinMatchCheck = 4;
+                kFixHashSize = kHash2Size + kHash3Size;
+            }
+            else
+            {
+                kNumHashDirectBytes = 2;
+                kMinMatchCheck = 2 + 1;
+                kFixHashSize = 0;
+            }
+        }
+
+        public new void SetStream(System.IO.Stream stream) { base.SetStream(stream); }
+        public new void ReleaseStream() { base.ReleaseStream(); }
+
+        public new void Init()
+        {
+            base.Init();
+            for (UInt32 i = 0; i < _hashSizeSum; i++)
+            {
+                _hash[i] = kEmptyHashValue;
+            }
+
+            _cyclicBufferPos = 0;
+            ReduceOffsets(-1);
+        }
+
+        public new void MovePos()
+        {
+            if (++_cyclicBufferPos >= _cyclicBufferSize)
+            {
+                _cyclicBufferPos = 0;
+            }
+
+            base.MovePos();
+            if (_pos == kMaxValForNormalize)
+            {
+                Normalize();
+            }
+        }
+
+        public new Byte GetIndexByte(Int32 index) { return base.GetIndexByte(index); }
+
+        public new UInt32 GetMatchLen(Int32 index, UInt32 distance, UInt32 limit)
+        { return base.GetMatchLen(index, distance, limit); }
+
+        public new UInt32 GetNumAvailableBytes() { return base.GetNumAvailableBytes(); }
+
+        public void Create(UInt32 historySize, UInt32 keepAddBufferBefore,
+                UInt32 matchMaxLen, UInt32 keepAddBufferAfter)
+        {
+            if (historySize > kMaxValForNormalize - 256)
+            {
+                throw new Exception();
+            }
+
+            _cutValue = 16 + (matchMaxLen >> 1);
+
+            UInt32 windowReservSize = ((historySize + keepAddBufferBefore +
+                    matchMaxLen + keepAddBufferAfter) / 2) + 256;
+
+            Create(historySize + keepAddBufferBefore, matchMaxLen + keepAddBufferAfter, windowReservSize);
+
+            _matchMaxLen = matchMaxLen;
+
+            UInt32 cyclicBufferSize = historySize + 1;
+            if (_cyclicBufferSize != cyclicBufferSize)
+            {
+                _son = new UInt32[(_cyclicBufferSize = cyclicBufferSize) * 2];
+            }
+
+            UInt32 hs = kBT2HashSize;
+
+            if (HASH_ARRAY)
+            {
+                hs = historySize - 1;
+                hs |= hs >> 1;
+                hs |= hs >> 2;
+                hs |= hs >> 4;
+                hs |= hs >> 8;
+                hs >>= 1;
+                hs |= 0xFFFF;
+                if (hs > (1 << 24))
+                {
+                    hs >>= 1;
+                }
+
+                _hashMask = hs;
+                hs++;
+                hs += kFixHashSize;
+            }
+            if (hs != _hashSizeSum)
+            {
+                _hash = new UInt32[_hashSizeSum = hs];
+            }
+        }
+
+        public UInt32 GetMatches(UInt32[] distances)
+        {
+            UInt32 lenLimit;
+            if (_pos + _matchMaxLen <= _streamPos)
+            {
+                lenLimit = _matchMaxLen;
+            }
+            else
+            {
+                lenLimit = _streamPos - _pos;
+                if (lenLimit < kMinMatchCheck)
+                {
+                    MovePos();
+                    return 0;
+                }
+            }
+
+            UInt32 offset = 0;
+            UInt32 matchMinPos = (_pos > _cyclicBufferSize) ? (_pos - _cyclicBufferSize) : 0;
+            UInt32 cur = _bufferOffset + _pos;
+            UInt32 maxLen = kStartMaxLen; // to avoid items for len < hashSize;
+            UInt32 hashValue, hash2Value = 0, hash3Value = 0;
+
+            if (HASH_ARRAY)
+            {
+                UInt32 temp = CRC.Table[_bufferBase[cur]] ^ _bufferBase[cur + 1];
+                hash2Value = temp & (kHash2Size - 1);
+                temp ^= (UInt32)_bufferBase[cur + 2] << 8;
+                hash3Value = temp & (kHash3Size - 1);
+                hashValue = (temp ^ (CRC.Table[_bufferBase[cur + 3]] << 5)) & _hashMask;
+            }
+            else
+            {
+                hashValue = _bufferBase[cur] ^ ((UInt32)_bufferBase[cur + 1] << 8);
+            }
+
+            UInt32 curMatch = _hash[kFixHashSize + hashValue];
+            if (HASH_ARRAY)
+            {
+                UInt32 curMatch2 = _hash[hash2Value];
+                UInt32 curMatch3 = _hash[kHash3Offset + hash3Value];
+                _hash[hash2Value] = _pos;
+                _hash[kHash3Offset + hash3Value] = _pos;
+                if (curMatch2 > matchMinPos && _bufferBase[_bufferOffset + curMatch2] == _bufferBase[cur])
+                {
+                    distances[offset++] = maxLen = 2;
+                    distances[offset++] = _pos - curMatch2 - 1;
+                }
+
+                if (curMatch3 > matchMinPos && _bufferBase[_bufferOffset + curMatch3] == _bufferBase[cur])
+                {
+                    if (curMatch3 == curMatch2)
+                    {
+                        offset -= 2;
+                    }
+
+                    distances[offset++] = maxLen = 3;
+                    distances[offset++] = _pos - curMatch3 - 1;
+                    curMatch2 = curMatch3;
+                }
+
+                if (offset != 0 && curMatch2 == curMatch)
+                {
+                    offset -= 2;
+                    maxLen = kStartMaxLen;
+                }
+            }
+
+            _hash[kFixHashSize + hashValue] = _pos;
+
+            UInt32 ptr0 = (_cyclicBufferPos << 1) + 1;
+            UInt32 ptr1 = _cyclicBufferPos << 1;
+
+            UInt32 len0, len1;
+            len0 = len1 = kNumHashDirectBytes;
+
+            if (kNumHashDirectBytes != 0 && curMatch > matchMinPos)
+            {
+                if (_bufferBase[_bufferOffset + curMatch + kNumHashDirectBytes] !=
+                        _bufferBase[cur + kNumHashDirectBytes])
+                {
+                    distances[offset++] = maxLen = kNumHashDirectBytes;
+                    distances[offset++] = _pos - curMatch - 1;
+                }
+            }
+
+            UInt32 count = _cutValue;
+
+            while (true)
+            {
+                if (curMatch <= matchMinPos || count-- == 0)
+                {
+                    _son[ptr0] = _son[ptr1] = kEmptyHashValue;
+                    break;
+                }
+                UInt32 delta = _pos - curMatch;
+                UInt32 cyclicPos = ((delta <= _cyclicBufferPos) ?
+                            (_cyclicBufferPos - delta) :
+                            (_cyclicBufferPos - delta + _cyclicBufferSize)) << 1;
+
+                UInt32 pby1 = _bufferOffset + curMatch;
+                UInt32 len = Math.Min(len0, len1);
+                if (_bufferBase[pby1 + len] == _bufferBase[cur + len])
+                {
+                    while (++len != lenLimit)
+                    {
+                        if (_bufferBase[pby1 + len] != _bufferBase[cur + len])
+                        {
+                            break;
+                        }
+                    }
+
+                    if (maxLen < len)
+                    {
+                        distances[offset++] = maxLen = len;
+                        distances[offset++] = delta - 1;
+                        if (len == lenLimit)
+                        {
+                            _son[ptr1] = _son[cyclicPos];
+                            _son[ptr0] = _son[cyclicPos + 1];
+                            break;
+                        }
+                    }
+                }
+                if (_bufferBase[pby1 + len] < _bufferBase[cur + len])
+                {
+                    _son[ptr1] = curMatch;
+                    ptr1 = cyclicPos + 1;
+                    curMatch = _son[ptr1];
+                    len1 = len;
+                }
+                else
+                {
+                    _son[ptr0] = curMatch;
+                    ptr0 = cyclicPos;
+                    curMatch = _son[ptr0];
+                    len0 = len;
+                }
+            }
+            MovePos();
+            return offset;
+        }
+
+        public void Skip(UInt32 num)
+        {
+            do
+            {
+                UInt32 lenLimit;
+                if (_pos + _matchMaxLen <= _streamPos)
+                {
+                    lenLimit = _matchMaxLen;
+                }
+                else
+                {
+                    lenLimit = _streamPos - _pos;
+                    if (lenLimit < kMinMatchCheck)
+                    {
+                        MovePos();
+                        continue;
+                    }
+                }
+
+                UInt32 matchMinPos = (_pos > _cyclicBufferSize) ? (_pos - _cyclicBufferSize) : 0;
+                UInt32 cur = _bufferOffset + _pos;
+
+                UInt32 hashValue;
+
+                if (HASH_ARRAY)
+                {
+                    UInt32 temp = CRC.Table[_bufferBase[cur]] ^ _bufferBase[cur + 1];
+                    UInt32 hash2Value = temp & (kHash2Size - 1);
+                    _hash[hash2Value] = _pos;
+                    temp ^= (UInt32)_bufferBase[cur + 2] << 8;
+                    UInt32 hash3Value = temp & (kHash3Size - 1);
+                    _hash[kHash3Offset + hash3Value] = _pos;
+                    hashValue = (temp ^ (CRC.Table[_bufferBase[cur + 3]] << 5)) & _hashMask;
+                }
+                else
+                {
+                    hashValue = _bufferBase[cur] ^ ((UInt32)_bufferBase[cur + 1] << 8);
+                }
+
+                UInt32 curMatch = _hash[kFixHashSize + hashValue];
+                _hash[kFixHashSize + hashValue] = _pos;
+
+                UInt32 ptr0 = (_cyclicBufferPos << 1) + 1;
+                UInt32 ptr1 = _cyclicBufferPos << 1;
+
+                UInt32 len0, len1;
+                len0 = len1 = kNumHashDirectBytes;
+
+                UInt32 count = _cutValue;
+                while (true)
+                {
+                    if (curMatch <= matchMinPos || count-- == 0)
+                    {
+                        _son[ptr0] = _son[ptr1] = kEmptyHashValue;
+                        break;
+                    }
+
+                    UInt32 delta = _pos - curMatch;
+                    UInt32 cyclicPos = ((delta <= _cyclicBufferPos) ?
+                                (_cyclicBufferPos - delta) :
+                                (_cyclicBufferPos - delta + _cyclicBufferSize)) << 1;
+
+                    UInt32 pby1 = _bufferOffset + curMatch;
+                    UInt32 len = Math.Min(len0, len1);
+                    if (_bufferBase[pby1 + len] == _bufferBase[cur + len])
+                    {
+                        while (++len != lenLimit)
+                        {
+                            if (_bufferBase[pby1 + len] != _bufferBase[cur + len])
+                            {
+                                break;
+                            }
+                        }
+
+                        if (len == lenLimit)
+                        {
+                            _son[ptr1] = _son[cyclicPos];
+                            _son[ptr0] = _son[cyclicPos + 1];
+                            break;
+                        }
+                    }
+                    if (_bufferBase[pby1 + len] < _bufferBase[cur + len])
+                    {
+                        _son[ptr1] = curMatch;
+                        ptr1 = cyclicPos + 1;
+                        curMatch = _son[ptr1];
+                        len1 = len;
+                    }
+                    else
+                    {
+                        _son[ptr0] = curMatch;
+                        ptr0 = cyclicPos;
+                        curMatch = _son[ptr0];
+                        len0 = len;
+                    }
+                }
+                MovePos();
+            }
+            while (--num != 0);
+        }
+
+        private void NormalizeLinks(UInt32[] items, UInt32 numItems, UInt32 subValue)
+        {
+            for (UInt32 i = 0; i < numItems; i++)
+            {
+                UInt32 value = items[i];
+                if (value <= subValue)
+                {
+                    value = kEmptyHashValue;
+                }
+                else
+                {
+                    value -= subValue;
+                }
+
+                items[i] = value;
+            }
+        }
+
+        private void Normalize()
+        {
+            UInt32 subValue = _pos - _cyclicBufferSize;
+            NormalizeLinks(_son, _cyclicBufferSize * 2, subValue);
+            NormalizeLinks(_hash, _hashSizeSum, subValue);
+            ReduceOffsets((Int32)subValue);
+        }
+
+        public void SetCutValue(UInt32 cutValue) { _cutValue = cutValue; }
+    }
+}
diff --git a/7zip/Compress/LZ/LzInWindow.cs b/WPinternals/7zip/Compress/LZ/LzInWindow.cs
similarity index 97%
rename from 7zip/Compress/LZ/LzInWindow.cs
rename to WPinternals/7zip/Compress/LZ/LzInWindow.cs
index f54e368..f9f5603 100644
--- a/7zip/Compress/LZ/LzInWindow.cs
+++ b/WPinternals/7zip/Compress/LZ/LzInWindow.cs
@@ -1,155 +1,155 @@
-// LzInWindow.cs
-
-using System;
-
-namespace SevenZip.Compression.LZ
-{
-    public class InWindow
-    {
-        public Byte[] _bufferBase = null; // pointer to buffer with data
-        private System.IO.Stream _stream;
-        private UInt32 _posLimit; // offset (from _buffer) of first byte when new block reading must be done
-        private bool _streamEndWasReached; // if (true) then _streamPos shows real end of stream
-
-        private UInt32 _pointerToLastSafePosition;
-
-        public UInt32 _bufferOffset;
-
-        public UInt32 _blockSize; // Size of Allocated memory block
-        public UInt32 _pos; // offset (from _buffer) of curent byte
-        private UInt32 _keepSizeBefore; // how many BYTEs must be kept in buffer before _pos
-        private UInt32 _keepSizeAfter; // how many BYTEs must be kept buffer after _pos
-        public UInt32 _streamPos; // offset (from _buffer) of first not read byte from Stream
-
-        public void MoveBlock()
-        {
-            UInt32 offset = _bufferOffset + _pos - _keepSizeBefore;
-            // we need one additional byte, since MovePos moves on 1 byte.
-            if (offset > 0)
-            {
-                offset--;
-            }
-
-            UInt32 numBytes = _bufferOffset + _streamPos - offset;
-
-            // check negative offset ????
-            for (UInt32 i = 0; i < numBytes; i++)
-            {
-                _bufferBase[i] = _bufferBase[offset + i];
-            }
-
-            _bufferOffset -= offset;
-        }
-
-        public virtual void ReadBlock()
-        {
-            if (_streamEndWasReached)
-            {
-                return;
-            }
-
-            while (true)
-            {
-                int size = (int)(0 - _bufferOffset + _blockSize - _streamPos);
-                if (size == 0)
-                {
-                    return;
-                }
-
-                int numReadBytes = _stream.Read(_bufferBase, (int)(_bufferOffset + _streamPos), size);
-                if (numReadBytes == 0)
-                {
-                    _posLimit = _streamPos;
-                    UInt32 pointerToPostion = _bufferOffset + _posLimit;
-                    if (pointerToPostion > _pointerToLastSafePosition)
-                    {
-                        _posLimit = _pointerToLastSafePosition - _bufferOffset;
-                    }
-
-                    _streamEndWasReached = true;
-                    return;
-                }
-                _streamPos += (UInt32)numReadBytes;
-                if (_streamPos >= _pos + _keepSizeAfter)
-                {
-                    _posLimit = _streamPos - _keepSizeAfter;
-                }
-            }
-        }
-
-        private void Free() { _bufferBase = null; }
-
-        public void Create(UInt32 keepSizeBefore, UInt32 keepSizeAfter, UInt32 keepSizeReserv)
-        {
-            _keepSizeBefore = keepSizeBefore;
-            _keepSizeAfter = keepSizeAfter;
-            UInt32 blockSize = keepSizeBefore + keepSizeAfter + keepSizeReserv;
-            if (_bufferBase == null || _blockSize != blockSize)
-            {
-                Free();
-                _blockSize = blockSize;
-                _bufferBase = new Byte[_blockSize];
-            }
-            _pointerToLastSafePosition = _blockSize - keepSizeAfter;
-        }
-
-        public void SetStream(System.IO.Stream stream) { _stream = stream; }
-        public void ReleaseStream() { _stream = null; }
-
-        public void Init()
-        {
-            _bufferOffset = 0;
-            _pos = 0;
-            _streamPos = 0;
-            _streamEndWasReached = false;
-            ReadBlock();
-        }
-
-        public void MovePos()
-        {
-            _pos++;
-            if (_pos > _posLimit)
-            {
-                UInt32 pointerToPostion = _bufferOffset + _pos;
-                if (pointerToPostion > _pointerToLastSafePosition)
-                {
-                    MoveBlock();
-                }
-
-                ReadBlock();
-            }
-        }
-
-        public Byte GetIndexByte(Int32 index) { return _bufferBase[_bufferOffset + _pos + index]; }
-
-        // index + limit have not to exceed _keepSizeAfter;
-        public UInt32 GetMatchLen(Int32 index, UInt32 distance, UInt32 limit)
-        {
-            if (_streamEndWasReached && _pos + index + limit > _streamPos)
-            {
-                limit = _streamPos - (UInt32)(_pos + index);
-            }
-
-            distance++;
-            // Byte *pby = _buffer + (size_t)_pos + index;
-            UInt32 pby = _bufferOffset + _pos + (UInt32)index;
-
-            UInt32 i;
-            for (i = 0; i < limit && _bufferBase[pby + i] == _bufferBase[pby + i - distance]; i++)
-            {
-            }
-
-            return i;
-        }
-
-        public UInt32 GetNumAvailableBytes() { return _streamPos - _pos; }
-
-        public void ReduceOffsets(Int32 subValue)
-        {
-            _bufferOffset += (UInt32)subValue;
-            _posLimit -= (UInt32)subValue;
-            _pos -= (UInt32)subValue;
-            _streamPos -= (UInt32)subValue;
-        }
-    }
-}
+// LzInWindow.cs
+
+using System;
+
+namespace SevenZip.Compression.LZ
+{
+    public class InWindow
+    {
+        public Byte[] _bufferBase = null; // pointer to buffer with data
+        private System.IO.Stream _stream;
+        private UInt32 _posLimit; // offset (from _buffer) of first byte when new block reading must be done
+        private bool _streamEndWasReached; // if (true) then _streamPos shows real end of stream
+
+        private UInt32 _pointerToLastSafePosition;
+
+        public UInt32 _bufferOffset;
+
+        public UInt32 _blockSize; // Size of Allocated memory block
+        public UInt32 _pos; // offset (from _buffer) of curent byte
+        private UInt32 _keepSizeBefore; // how many BYTEs must be kept in buffer before _pos
+        private UInt32 _keepSizeAfter; // how many BYTEs must be kept buffer after _pos
+        public UInt32 _streamPos; // offset (from _buffer) of first not read byte from Stream
+
+        public void MoveBlock()
+        {
+            UInt32 offset = _bufferOffset + _pos - _keepSizeBefore;
+            // we need one additional byte, since MovePos moves on 1 byte.
+            if (offset > 0)
+            {
+                offset--;
+            }
+
+            UInt32 numBytes = _bufferOffset + _streamPos - offset;
+
+            // check negative offset ????
+            for (UInt32 i = 0; i < numBytes; i++)
+            {
+                _bufferBase[i] = _bufferBase[offset + i];
+            }
+
+            _bufferOffset -= offset;
+        }
+
+        public virtual void ReadBlock()
+        {
+            if (_streamEndWasReached)
+            {
+                return;
+            }
+
+            while (true)
+            {
+                int size = (int)(0 - _bufferOffset + _blockSize - _streamPos);
+                if (size == 0)
+                {
+                    return;
+                }
+
+                int numReadBytes = _stream.Read(_bufferBase, (int)(_bufferOffset + _streamPos), size);
+                if (numReadBytes == 0)
+                {
+                    _posLimit = _streamPos;
+                    UInt32 pointerToPostion = _bufferOffset + _posLimit;
+                    if (pointerToPostion > _pointerToLastSafePosition)
+                    {
+                        _posLimit = _pointerToLastSafePosition - _bufferOffset;
+                    }
+
+                    _streamEndWasReached = true;
+                    return;
+                }
+                _streamPos += (UInt32)numReadBytes;
+                if (_streamPos >= _pos + _keepSizeAfter)
+                {
+                    _posLimit = _streamPos - _keepSizeAfter;
+                }
+            }
+        }
+
+        private void Free() { _bufferBase = null; }
+
+        public void Create(UInt32 keepSizeBefore, UInt32 keepSizeAfter, UInt32 keepSizeReserv)
+        {
+            _keepSizeBefore = keepSizeBefore;
+            _keepSizeAfter = keepSizeAfter;
+            UInt32 blockSize = keepSizeBefore + keepSizeAfter + keepSizeReserv;
+            if (_bufferBase == null || _blockSize != blockSize)
+            {
+                Free();
+                _blockSize = blockSize;
+                _bufferBase = new Byte[_blockSize];
+            }
+            _pointerToLastSafePosition = _blockSize - keepSizeAfter;
+        }
+
+        public void SetStream(System.IO.Stream stream) { _stream = stream; }
+        public void ReleaseStream() { _stream = null; }
+
+        public void Init()
+        {
+            _bufferOffset = 0;
+            _pos = 0;
+            _streamPos = 0;
+            _streamEndWasReached = false;
+            ReadBlock();
+        }
+
+        public void MovePos()
+        {
+            _pos++;
+            if (_pos > _posLimit)
+            {
+                UInt32 pointerToPostion = _bufferOffset + _pos;
+                if (pointerToPostion > _pointerToLastSafePosition)
+                {
+                    MoveBlock();
+                }
+
+                ReadBlock();
+            }
+        }
+
+        public Byte GetIndexByte(Int32 index) { return _bufferBase[_bufferOffset + _pos + index]; }
+
+        // index + limit have not to exceed _keepSizeAfter;
+        public UInt32 GetMatchLen(Int32 index, UInt32 distance, UInt32 limit)
+        {
+            if (_streamEndWasReached && _pos + index + limit > _streamPos)
+            {
+                limit = _streamPos - (UInt32)(_pos + index);
+            }
+
+            distance++;
+            // Byte *pby = _buffer + (size_t)_pos + index;
+            UInt32 pby = _bufferOffset + _pos + (UInt32)index;
+
+            UInt32 i;
+            for (i = 0; i < limit && _bufferBase[pby + i] == _bufferBase[pby + i - distance]; i++)
+            {
+            }
+
+            return i;
+        }
+
+        public UInt32 GetNumAvailableBytes() { return _streamPos - _pos; }
+
+        public void ReduceOffsets(Int32 subValue)
+        {
+            _bufferOffset += (UInt32)subValue;
+            _posLimit -= (UInt32)subValue;
+            _pos -= (UInt32)subValue;
+            _streamPos -= (UInt32)subValue;
+        }
+    }
+}
diff --git a/7zip/Compress/LZ/LzOutWindow.cs b/WPinternals/7zip/Compress/LZ/LzOutWindow.cs
similarity index 96%
rename from 7zip/Compress/LZ/LzOutWindow.cs
rename to WPinternals/7zip/Compress/LZ/LzOutWindow.cs
index 24bbd49..1fa77fb 100644
--- a/7zip/Compress/LZ/LzOutWindow.cs
+++ b/WPinternals/7zip/Compress/LZ/LzOutWindow.cs
@@ -1,137 +1,137 @@
-// LzOutWindow.cs
-
-namespace SevenZip.Compression.LZ
-{
-    public class OutWindow
-    {
-        private byte[] _buffer = null;
-        private uint _pos;
-        private uint _windowSize = 0;
-        private uint _streamPos;
-        private System.IO.Stream _stream;
-
-        public uint TrainSize = 0;
-
-        public void Create(uint windowSize)
-        {
-            if (_windowSize != windowSize)
-            {
-                // System.GC.Collect();
-                _buffer = new byte[windowSize];
-            }
-            _windowSize = windowSize;
-            _pos = 0;
-            _streamPos = 0;
-        }
-
-        public void Init(System.IO.Stream stream, bool solid)
-        {
-            ReleaseStream();
-            _stream = stream;
-            if (!solid)
-            {
-                _streamPos = 0;
-                _pos = 0;
-                TrainSize = 0;
-            }
-        }
-
-        public bool Train(System.IO.Stream stream)
-        {
-            long len = stream.Length;
-            uint size = (len < _windowSize) ? (uint)len : _windowSize;
-            TrainSize = size;
-            stream.Position = len - size;
-            _streamPos = _pos = 0;
-            while (size > 0)
-            {
-                uint curSize = _windowSize - _pos;
-                if (size < curSize)
-                {
-                    curSize = size;
-                }
-
-                int numReadBytes = stream.Read(_buffer, (int)_pos, (int)curSize);
-                if (numReadBytes == 0)
-                {
-                    return false;
-                }
-
-                size -= (uint)numReadBytes;
-                _pos += (uint)numReadBytes;
-                _streamPos += (uint)numReadBytes;
-                if (_pos == _windowSize)
-                {
-                    _streamPos = _pos = 0;
-                }
-            }
-            return true;
-        }
-
-        public void ReleaseStream()
-        {
-            Flush();
-            _stream = null;
-        }
-
-        public void Flush()
-        {
-            uint size = _pos - _streamPos;
-            if (size == 0)
-            {
-                return;
-            }
-
-            _stream.Write(_buffer, (int)_streamPos, (int)size);
-            if (_pos >= _windowSize)
-            {
-                _pos = 0;
-            }
-
-            _streamPos = _pos;
-        }
-
-        public void CopyBlock(uint distance, uint len)
-        {
-            uint pos = _pos - distance - 1;
-            if (pos >= _windowSize)
-            {
-                pos += _windowSize;
-            }
-
-            for (; len > 0; len--)
-            {
-                if (pos >= _windowSize)
-                {
-                    pos = 0;
-                }
-
-                _buffer[_pos++] = _buffer[pos++];
-                if (_pos >= _windowSize)
-                {
-                    Flush();
-                }
-            }
-        }
-
-        public void PutByte(byte b)
-        {
-            _buffer[_pos++] = b;
-            if (_pos >= _windowSize)
-            {
-                Flush();
-            }
-        }
-
-        public byte GetByte(uint distance)
-        {
-            uint pos = _pos - distance - 1;
-            if (pos >= _windowSize)
-            {
-                pos += _windowSize;
-            }
-
-            return _buffer[pos];
-        }
-    }
-}
+// LzOutWindow.cs
+
+namespace SevenZip.Compression.LZ
+{
+    public class OutWindow
+    {
+        private byte[] _buffer = null;
+        private uint _pos;
+        private uint _windowSize = 0;
+        private uint _streamPos;
+        private System.IO.Stream _stream;
+
+        public uint TrainSize = 0;
+
+        public void Create(uint windowSize)
+        {
+            if (_windowSize != windowSize)
+            {
+                // System.GC.Collect();
+                _buffer = new byte[windowSize];
+            }
+            _windowSize = windowSize;
+            _pos = 0;
+            _streamPos = 0;
+        }
+
+        public void Init(System.IO.Stream stream, bool solid)
+        {
+            ReleaseStream();
+            _stream = stream;
+            if (!solid)
+            {
+                _streamPos = 0;
+                _pos = 0;
+                TrainSize = 0;
+            }
+        }
+
+        public bool Train(System.IO.Stream stream)
+        {
+            long len = stream.Length;
+            uint size = (len < _windowSize) ? (uint)len : _windowSize;
+            TrainSize = size;
+            stream.Position = len - size;
+            _streamPos = _pos = 0;
+            while (size > 0)
+            {
+                uint curSize = _windowSize - _pos;
+                if (size < curSize)
+                {
+                    curSize = size;
+                }
+
+                int numReadBytes = stream.Read(_buffer, (int)_pos, (int)curSize);
+                if (numReadBytes == 0)
+                {
+                    return false;
+                }
+
+                size -= (uint)numReadBytes;
+                _pos += (uint)numReadBytes;
+                _streamPos += (uint)numReadBytes;
+                if (_pos == _windowSize)
+                {
+                    _streamPos = _pos = 0;
+                }
+            }
+            return true;
+        }
+
+        public void ReleaseStream()
+        {
+            Flush();
+            _stream = null;
+        }
+
+        public void Flush()
+        {
+            uint size = _pos - _streamPos;
+            if (size == 0)
+            {
+                return;
+            }
+
+            _stream.Write(_buffer, (int)_streamPos, (int)size);
+            if (_pos >= _windowSize)
+            {
+                _pos = 0;
+            }
+
+            _streamPos = _pos;
+        }
+
+        public void CopyBlock(uint distance, uint len)
+        {
+            uint pos = _pos - distance - 1;
+            if (pos >= _windowSize)
+            {
+                pos += _windowSize;
+            }
+
+            for (; len > 0; len--)
+            {
+                if (pos >= _windowSize)
+                {
+                    pos = 0;
+                }
+
+                _buffer[_pos++] = _buffer[pos++];
+                if (_pos >= _windowSize)
+                {
+                    Flush();
+                }
+            }
+        }
+
+        public void PutByte(byte b)
+        {
+            _buffer[_pos++] = b;
+            if (_pos >= _windowSize)
+            {
+                Flush();
+            }
+        }
+
+        public byte GetByte(uint distance)
+        {
+            uint pos = _pos - distance - 1;
+            if (pos >= _windowSize)
+            {
+                pos += _windowSize;
+            }
+
+            return _buffer[pos];
+        }
+    }
+}
diff --git a/7zip/Compress/LZMA/LzmaBase.cs b/WPinternals/7zip/Compress/LZMA/LzmaBase.cs
similarity index 97%
rename from 7zip/Compress/LZMA/LzmaBase.cs
rename to WPinternals/7zip/Compress/LZMA/LzmaBase.cs
index 6b74137..265b016 100644
--- a/7zip/Compress/LZMA/LzmaBase.cs
+++ b/WPinternals/7zip/Compress/LZMA/LzmaBase.cs
@@ -1,88 +1,88 @@
-// LzmaBase.cs
-
-namespace SevenZip.Compression.LZMA
-{
-    internal abstract class Base
-    {
-        public const uint kNumRepDistances = 4;
-        public const uint kNumStates = 12;
-
-        // static byte []kLiteralNextStates  = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
-        // static byte []kMatchNextStates    = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
-        // static byte []kRepNextStates      = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
-        // static byte []kShortRepNextStates = {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
-
-        public struct State
-        {
-            public uint Index;
-            public void Init() { Index = 0; }
-            public void UpdateChar()
-            {
-                if (Index < 4)
-                {
-                    Index = 0;
-                }
-                else if (Index < 10)
-                {
-                    Index -= 3;
-                }
-                else
-                {
-                    Index -= 6;
-                }
-            }
-            public void UpdateMatch() { Index = (uint)(Index < 7 ? 7 : 10); }
-            public void UpdateRep() { Index = (uint)(Index < 7 ? 8 : 11); }
-            public void UpdateShortRep() { Index = (uint)(Index < 7 ? 9 : 11); }
-            public bool IsCharState() { return Index < 7; }
-        }
-
-        public const int kNumPosSlotBits = 6;
-        public const int kDicLogSizeMin = 0;
-        // public const int kDicLogSizeMax = 30;
-        // public const uint kDistTableSizeMax = kDicLogSizeMax * 2;
-
-        public const int kNumLenToPosStatesBits = 2; // it's for speed optimization
-        public const uint kNumLenToPosStates = 1 << kNumLenToPosStatesBits;
-
-        public const uint kMatchMinLen = 2;
-
-        public static uint GetLenToPosState(uint len)
-        {
-            len -= kMatchMinLen;
-            if (len < kNumLenToPosStates)
-            {
-                return len;
-            }
-
-            return kNumLenToPosStates - 1;
-        }
-
-        public const int kNumAlignBits = 4;
-        public const uint kAlignTableSize = 1 << kNumAlignBits;
-        public const uint kAlignMask = kAlignTableSize - 1;
-
-        public const uint kStartPosModelIndex = 4;
-        public const uint kEndPosModelIndex = 14;
-        public const uint kNumPosModels = kEndPosModelIndex - kStartPosModelIndex;
-
-        public const uint kNumFullDistances = 1 << ((int)kEndPosModelIndex / 2);
-
-        public const uint kNumLitPosStatesBitsEncodingMax = 4;
-        public const uint kNumLitContextBitsMax = 8;
-
-        public const int kNumPosStatesBitsMax = 4;
-        public const uint kNumPosStatesMax = 1 << kNumPosStatesBitsMax;
-        public const int kNumPosStatesBitsEncodingMax = 4;
-        public const uint kNumPosStatesEncodingMax = 1 << kNumPosStatesBitsEncodingMax;
-
-        public const int kNumLowLenBits = 3;
-        public const int kNumMidLenBits = 3;
-        public const int kNumHighLenBits = 8;
-        public const uint kNumLowLenSymbols = 1 << kNumLowLenBits;
-        public const uint kNumMidLenSymbols = 1 << kNumMidLenBits;
-        public const uint kNumLenSymbols = kNumLowLenSymbols + kNumMidLenSymbols +
-                (1 << kNumHighLenBits);
-        public const uint kMatchMaxLen = kMatchMinLen + kNumLenSymbols - 1;
-    }
-}
+// LzmaBase.cs
+
+namespace SevenZip.Compression.LZMA
+{
+    internal abstract class Base
+    {
+        public const uint kNumRepDistances = 4;
+        public const uint kNumStates = 12;
+
+        // static byte []kLiteralNextStates  = {0, 0, 0, 0, 1, 2, 3, 4,  5,  6,   4, 5};
+        // static byte []kMatchNextStates    = {7, 7, 7, 7, 7, 7, 7, 10, 10, 10, 10, 10};
+        // static byte []kRepNextStates      = {8, 8, 8, 8, 8, 8, 8, 11, 11, 11, 11, 11};
+        // static byte []kShortRepNextStates = {9, 9, 9, 9, 9, 9, 9, 11, 11, 11, 11, 11};
+
+        public struct State
+        {
+            public uint Index;
+            public void Init() { Index = 0; }
+            public void UpdateChar()
+            {
+                if (Index < 4)
+                {
+                    Index = 0;
+                }
+                else if (Index < 10)
+                {
+                    Index -= 3;
+                }
+                else
+                {
+                    Index -= 6;
+                }
+            }
+            public void UpdateMatch() { Index = (uint)(Index < 7 ? 7 : 10); }
+            public void UpdateRep() { Index = (uint)(Index < 7 ? 8 : 11); }
+            public void UpdateShortRep() { Index = (uint)(Index < 7 ? 9 : 11); }
+            public bool IsCharState() { return Index < 7; }
+        }
+
+        public const int kNumPosSlotBits = 6;
+        public const int kDicLogSizeMin = 0;
+        // public const int kDicLogSizeMax = 30;
+        // public const uint kDistTableSizeMax = kDicLogSizeMax * 2;
+
+        public const int kNumLenToPosStatesBits = 2; // it's for speed optimization
+        public const uint kNumLenToPosStates = 1 << kNumLenToPosStatesBits;
+
+        public const uint kMatchMinLen = 2;
+
+        public static uint GetLenToPosState(uint len)
+        {
+            len -= kMatchMinLen;
+            if (len < kNumLenToPosStates)
+            {
+                return len;
+            }
+
+            return kNumLenToPosStates - 1;
+        }
+
+        public const int kNumAlignBits = 4;
+        public const uint kAlignTableSize = 1 << kNumAlignBits;
+        public const uint kAlignMask = kAlignTableSize - 1;
+
+        public const uint kStartPosModelIndex = 4;
+        public const uint kEndPosModelIndex = 14;
+        public const uint kNumPosModels = kEndPosModelIndex - kStartPosModelIndex;
+
+        public const uint kNumFullDistances = 1 << ((int)kEndPosModelIndex / 2);
+
+        public const uint kNumLitPosStatesBitsEncodingMax = 4;
+        public const uint kNumLitContextBitsMax = 8;
+
+        public const int kNumPosStatesBitsMax = 4;
+        public const uint kNumPosStatesMax = 1 << kNumPosStatesBitsMax;
+        public const int kNumPosStatesBitsEncodingMax = 4;
+        public const uint kNumPosStatesEncodingMax = 1 << kNumPosStatesBitsEncodingMax;
+
+        public const int kNumLowLenBits = 3;
+        public const int kNumMidLenBits = 3;
+        public const int kNumHighLenBits = 8;
+        public const uint kNumLowLenSymbols = 1 << kNumLowLenBits;
+        public const uint kNumMidLenSymbols = 1 << kNumMidLenBits;
+        public const uint kNumLenSymbols = kNumLowLenSymbols + kNumMidLenSymbols +
+                (1 << kNumHighLenBits);
+        public const uint kMatchMaxLen = kMatchMinLen + kNumLenSymbols - 1;
+    }
+}
diff --git a/7zip/Compress/LZMA/LzmaDecoder.cs b/WPinternals/7zip/Compress/LZMA/LzmaDecoder.cs
similarity index 97%
rename from 7zip/Compress/LZMA/LzmaDecoder.cs
rename to WPinternals/7zip/Compress/LZMA/LzmaDecoder.cs
index a2b0847..52efad9 100644
--- a/7zip/Compress/LZMA/LzmaDecoder.cs
+++ b/WPinternals/7zip/Compress/LZMA/LzmaDecoder.cs
@@ -1,465 +1,465 @@
-// LzmaDecoder.cs
-
-using System;
-
-namespace SevenZip.Compression.LZMA
-{
-    using RangeCoder;
-    using System.Threading;
-
-    public class Decoder : ICoder, ISetDecoderProperties // ,System.IO.Stream
-    {
-        private class LenDecoder
-        {
-            private BitDecoder m_Choice = new();
-            private BitDecoder m_Choice2 = new();
-            private readonly BitTreeDecoder[] m_LowCoder = new BitTreeDecoder[Base.kNumPosStatesMax];
-            private readonly BitTreeDecoder[] m_MidCoder = new BitTreeDecoder[Base.kNumPosStatesMax];
-            private readonly BitTreeDecoder m_HighCoder = new(Base.kNumHighLenBits);
-            private uint m_NumPosStates = 0;
-
-            public void Create(uint numPosStates)
-            {
-                for (uint posState = m_NumPosStates; posState < numPosStates; posState++)
-                {
-                    m_LowCoder[posState] = new BitTreeDecoder(Base.kNumLowLenBits);
-                    m_MidCoder[posState] = new BitTreeDecoder(Base.kNumMidLenBits);
-                }
-                m_NumPosStates = numPosStates;
-            }
-
-            public void Init()
-            {
-                m_Choice.Init();
-                for (uint posState = 0; posState < m_NumPosStates; posState++)
-                {
-                    m_LowCoder[posState].Init();
-                    m_MidCoder[posState].Init();
-                }
-                m_Choice2.Init();
-                m_HighCoder.Init();
-            }
-
-            public uint Decode(RangeCoder.Decoder rangeDecoder, uint posState)
-            {
-                if (m_Choice.Decode(rangeDecoder) == 0)
-                {
-                    return m_LowCoder[posState].Decode(rangeDecoder);
-                }
-                else
-                {
-                    uint symbol = Base.kNumLowLenSymbols;
-                    if (m_Choice2.Decode(rangeDecoder) == 0)
-                    {
-                        symbol += m_MidCoder[posState].Decode(rangeDecoder);
-                    }
-                    else
-                    {
-                        symbol += Base.kNumMidLenSymbols;
-                        symbol += m_HighCoder.Decode(rangeDecoder);
-                    }
-                    return symbol;
-                }
-            }
-        }
-
-        private class LiteralDecoder
-        {
-            private struct Decoder2
-            {
-                private BitDecoder[] m_Decoders;
-                public void Create() { m_Decoders = new BitDecoder[0x300]; }
-                public void Init() { for (int i = 0; i < 0x300; i++)
-                    {
-                        m_Decoders[i].Init();
-                    }
-                }
-
-                public byte DecodeNormal(RangeCoder.Decoder rangeDecoder)
-                {
-                    uint symbol = 1;
-                    do
-                    {
-                        symbol = (symbol << 1) | m_Decoders[symbol].Decode(rangeDecoder);
-                    }
-                    while (symbol < 0x100);
-                    return (byte)symbol;
-                }
-
-                public byte DecodeWithMatchByte(RangeCoder.Decoder rangeDecoder, byte matchByte)
-                {
-                    uint symbol = 1;
-                    do
-                    {
-                        uint matchBit = (uint)(matchByte >> 7) & 1;
-                        matchByte <<= 1;
-                        uint bit = m_Decoders[((1 + matchBit) << 8) + symbol].Decode(rangeDecoder);
-                        symbol = (symbol << 1) | bit;
-                        if (matchBit != bit)
-                        {
-                            while (symbol < 0x100)
-                            {
-                                symbol = (symbol << 1) | m_Decoders[symbol].Decode(rangeDecoder);
-                            }
-
-                            break;
-                        }
-                    }
-                    while (symbol < 0x100);
-                    return (byte)symbol;
-                }
-            }
-
-            private Decoder2[] m_Coders;
-            private int m_NumPrevBits;
-            private int m_NumPosBits;
-            private uint m_PosMask;
-
-            public void Create(int numPosBits, int numPrevBits)
-            {
-                if (m_Coders != null && m_NumPrevBits == numPrevBits &&
-                    m_NumPosBits == numPosBits)
-                {
-                    return;
-                }
-
-                m_NumPosBits = numPosBits;
-                m_PosMask = ((uint)1 << numPosBits) - 1;
-                m_NumPrevBits = numPrevBits;
-                uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits);
-                m_Coders = new Decoder2[numStates];
-                for (uint i = 0; i < numStates; i++)
-                {
-                    m_Coders[i].Create();
-                }
-            }
-
-            public void Init()
-            {
-                uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits);
-                for (uint i = 0; i < numStates; i++)
-                {
-                    m_Coders[i].Init();
-                }
-            }
-
-            private uint GetState(uint pos, byte prevByte)
-            { return ((pos & m_PosMask) << m_NumPrevBits) + (uint)(prevByte >> (8 - m_NumPrevBits)); }
-
-            public byte DecodeNormal(RangeCoder.Decoder rangeDecoder, uint pos, byte prevByte)
-            { return m_Coders[GetState(pos, prevByte)].DecodeNormal(rangeDecoder); }
-
-            public byte DecodeWithMatchByte(RangeCoder.Decoder rangeDecoder, uint pos, byte prevByte, byte matchByte)
-            { return m_Coders[GetState(pos, prevByte)].DecodeWithMatchByte(rangeDecoder, matchByte); }
-        };
-
-        private readonly LZ.OutWindow m_OutWindow = new();
-        private readonly RangeCoder.Decoder m_RangeDecoder = new();
-
-        private readonly BitDecoder[] m_IsMatchDecoders = new BitDecoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
-        private readonly BitDecoder[] m_IsRepDecoders = new BitDecoder[Base.kNumStates];
-        private readonly BitDecoder[] m_IsRepG0Decoders = new BitDecoder[Base.kNumStates];
-        private readonly BitDecoder[] m_IsRepG1Decoders = new BitDecoder[Base.kNumStates];
-        private readonly BitDecoder[] m_IsRepG2Decoders = new BitDecoder[Base.kNumStates];
-        private readonly BitDecoder[] m_IsRep0LongDecoders = new BitDecoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
-
-        private readonly BitTreeDecoder[] m_PosSlotDecoder = new BitTreeDecoder[Base.kNumLenToPosStates];
-        private readonly BitDecoder[] m_PosDecoders = new BitDecoder[Base.kNumFullDistances - Base.kEndPosModelIndex];
-
-        private readonly BitTreeDecoder m_PosAlignDecoder = new(Base.kNumAlignBits);
-
-        private readonly LenDecoder m_LenDecoder = new();
-        private readonly LenDecoder m_RepLenDecoder = new();
-
-        private readonly LiteralDecoder m_LiteralDecoder = new();
-
-        private uint m_DictionarySize;
-        private uint m_DictionarySizeCheck;
-
-        private uint m_PosStateMask;
-
-        public Decoder()
-        {
-            m_DictionarySize = 0xFFFFFFFF;
-            for (int i = 0; i < Base.kNumLenToPosStates; i++)
-            {
-                m_PosSlotDecoder[i] = new BitTreeDecoder(Base.kNumPosSlotBits);
-            }
-        }
-
-        private void SetDictionarySize(uint dictionarySize)
-        {
-            if (m_DictionarySize != dictionarySize)
-            {
-                m_DictionarySize = dictionarySize;
-                m_DictionarySizeCheck = Math.Max(m_DictionarySize, 1);
-                uint blockSize = Math.Max(m_DictionarySizeCheck, 1 << 12);
-                m_OutWindow.Create(blockSize);
-            }
-        }
-
-        private void SetLiteralProperties(int lp, int lc)
-        {
-            if (lp > 8)
-            {
-                throw new InvalidParamException();
-            }
-
-            if (lc > 8)
-            {
-                throw new InvalidParamException();
-            }
-
-            m_LiteralDecoder.Create(lp, lc);
-        }
-
-        private void SetPosBitsProperties(int pb)
-        {
-            if (pb > Base.kNumPosStatesBitsMax)
-            {
-                throw new InvalidParamException();
-            }
-
-            uint numPosStates = (uint)1 << pb;
-            m_LenDecoder.Create(numPosStates);
-            m_RepLenDecoder.Create(numPosStates);
-            m_PosStateMask = numPosStates - 1;
-        }
-
-        private bool _solid = false;
-        private void Init(System.IO.Stream inStream, System.IO.Stream outStream)
-        {
-            m_RangeDecoder.Init(inStream);
-            m_OutWindow.Init(outStream, _solid);
-
-            uint i;
-            for (i = 0; i < Base.kNumStates; i++)
-            {
-                for (uint j = 0; j <= m_PosStateMask; j++)
-                {
-                    uint index = (i << Base.kNumPosStatesBitsMax) + j;
-                    m_IsMatchDecoders[index].Init();
-                    m_IsRep0LongDecoders[index].Init();
-                }
-                m_IsRepDecoders[i].Init();
-                m_IsRepG0Decoders[i].Init();
-                m_IsRepG1Decoders[i].Init();
-                m_IsRepG2Decoders[i].Init();
-            }
-
-            m_LiteralDecoder.Init();
-            for (i = 0; i < Base.kNumLenToPosStates; i++)
-            {
-                m_PosSlotDecoder[i].Init();
-            }
-            // m_PosSpecDecoder.Init();
-            for (i = 0; i < Base.kNumFullDistances - Base.kEndPosModelIndex; i++)
-            {
-                m_PosDecoders[i].Init();
-            }
-
-            m_LenDecoder.Init();
-            m_RepLenDecoder.Init();
-            m_PosAlignDecoder.Init();
-        }
-
-        public void Code(System.IO.Stream inStream, System.IO.Stream outStream,
-            Int64 inSize, Int64 outSize, ICodeProgress progress, CancellationToken? token = null)
-        {
-            Init(inStream, outStream);
-
-            Base.State state = new();
-            state.Init();
-            uint rep0 = 0, rep1 = 0, rep2 = 0, rep3 = 0;
-
-            UInt64 nowPos64 = 0;
-            UInt64 outSize64 = (UInt64)outSize;
-            if (nowPos64 < outSize64)
-            {
-                if (m_IsMatchDecoders[state.Index << Base.kNumPosStatesBitsMax].Decode(m_RangeDecoder) != 0)
-                {
-                    throw new DataErrorException();
-                }
-
-                state.UpdateChar();
-                byte b = m_LiteralDecoder.DecodeNormal(m_RangeDecoder, 0, 0);
-                m_OutWindow.PutByte(b);
-                nowPos64++;
-            }
-
-            try
-            {
-                while (nowPos64 < outSize64)
-                {
-                    token?.ThrowIfCancellationRequested();
-
-                    // UInt64 next = Math.Min(nowPos64 + (1 << 18), outSize64);
-                    // while(nowPos64 < next)
-                    {
-                        uint posState = (uint)nowPos64 & m_PosStateMask;
-                        if (m_IsMatchDecoders[(state.Index << Base.kNumPosStatesBitsMax) + posState].Decode(m_RangeDecoder) == 0)
-                        {
-                            byte b;
-                            byte prevByte = m_OutWindow.GetByte(0);
-                            b = !state.IsCharState()
-                                ? m_LiteralDecoder.DecodeWithMatchByte(m_RangeDecoder,
-                                   (uint)nowPos64, prevByte, m_OutWindow.GetByte(rep0))
-                                : m_LiteralDecoder.DecodeNormal(m_RangeDecoder, (uint)nowPos64, prevByte);
-
-                            m_OutWindow.PutByte(b);
-                            state.UpdateChar();
-                            nowPos64++;
-                        }
-                        else
-                        {
-                            uint len;
-                            if (m_IsRepDecoders[state.Index].Decode(m_RangeDecoder) == 1)
-                            {
-                                if (m_IsRepG0Decoders[state.Index].Decode(m_RangeDecoder) == 0)
-                                {
-                                    if (m_IsRep0LongDecoders[(state.Index << Base.kNumPosStatesBitsMax) + posState].Decode(m_RangeDecoder) == 0)
-                                    {
-                                        state.UpdateShortRep();
-                                        m_OutWindow.PutByte(m_OutWindow.GetByte(rep0));
-                                        nowPos64++;
-                                        continue;
-                                    }
-                                }
-                                else
-                                {
-                                    UInt32 distance;
-                                    if (m_IsRepG1Decoders[state.Index].Decode(m_RangeDecoder) == 0)
-                                    {
-                                        distance = rep1;
-                                    }
-                                    else
-                                    {
-                                        if (m_IsRepG2Decoders[state.Index].Decode(m_RangeDecoder) == 0)
-                                        {
-                                            distance = rep2;
-                                        }
-                                        else
-                                        {
-                                            distance = rep3;
-                                            rep3 = rep2;
-                                        }
-                                        rep2 = rep1;
-                                    }
-                                    rep1 = rep0;
-                                    rep0 = distance;
-                                }
-                                len = m_RepLenDecoder.Decode(m_RangeDecoder, posState) + Base.kMatchMinLen;
-                                state.UpdateRep();
-                            }
-                            else
-                            {
-                                rep3 = rep2;
-                                rep2 = rep1;
-                                rep1 = rep0;
-                                len = Base.kMatchMinLen + m_LenDecoder.Decode(m_RangeDecoder, posState);
-                                state.UpdateMatch();
-                                uint posSlot = m_PosSlotDecoder[Base.GetLenToPosState(len)].Decode(m_RangeDecoder);
-                                if (posSlot >= Base.kStartPosModelIndex)
-                                {
-                                    int numDirectBits = (int)((posSlot >> 1) - 1);
-                                    rep0 = (2 | (posSlot & 1)) << numDirectBits;
-                                    if (posSlot < Base.kEndPosModelIndex)
-                                    {
-                                        rep0 += BitTreeDecoder.ReverseDecode(m_PosDecoders,
-                                               rep0 - posSlot - 1, m_RangeDecoder, numDirectBits);
-                                    }
-                                    else
-                                    {
-                                        rep0 += m_RangeDecoder.DecodeDirectBits(
-                                            numDirectBits - Base.kNumAlignBits) << Base.kNumAlignBits;
-                                        rep0 += m_PosAlignDecoder.ReverseDecode(m_RangeDecoder);
-                                    }
-                                }
-                                else
-                                {
-                                    rep0 = posSlot;
-                                }
-                            }
-                            if (rep0 >= m_OutWindow.TrainSize + nowPos64 || rep0 >= m_DictionarySizeCheck)
-                            {
-                                if (rep0 == 0xFFFFFFFF)
-                                {
-                                    break;
-                                }
-
-                                throw new DataErrorException();
-                            }
-                            m_OutWindow.CopyBlock(rep0, len);
-                            nowPos64 += len;
-                        }
-                    }
-                }
-            }
-            catch (OperationCanceledException)
-            {
-            }
-
-            m_OutWindow.Flush();
-            m_OutWindow.ReleaseStream();
-            m_RangeDecoder.ReleaseStream();
-        }
-
-        public void SetDecoderProperties(byte[] properties)
-        {
-            if (properties.Length < 5)
-            {
-                throw new InvalidParamException();
-            }
-
-            int lc = properties[0] % 9;
-            int remainder = properties[0] / 9;
-            int lp = remainder % 5;
-            int pb = remainder / 5;
-            if (pb > Base.kNumPosStatesBitsMax)
-            {
-                throw new InvalidParamException();
-            }
-
-            UInt32 dictionarySize = 0;
-            for (int i = 0; i < 4; i++)
-            {
-                dictionarySize += ((UInt32)properties[1 + i]) << (i * 8);
-            }
-
-            SetDictionarySize(dictionarySize);
-            SetLiteralProperties(lp, lc);
-            SetPosBitsProperties(pb);
-        }
-
-        public bool Train(System.IO.Stream stream)
-        {
-            _solid = true;
-            return m_OutWindow.Train(stream);
-        }
-
-        /*
-		public override bool CanRead { get { return true; }}
-		public override bool CanWrite { get { return true; }}
-		public override bool CanSeek { get { return true; }}
-		public override long Length { get { return 0; }}
-		public override long Position
-		{
-			get { return 0;	}
-			set { }
-		}
-		public override void Flush() { }
-		public override int Read(byte[] buffer, int offset, int count) 
-		{
-			return 0;
-		}
-		public override void Write(byte[] buffer, int offset, int count)
-		{
-		}
-		public override long Seek(long offset, System.IO.SeekOrigin origin)
-		{
-			return 0;
-		}
-		public override void SetLength(long value) {}
-		*/
-    }
-}
+// LzmaDecoder.cs
+
+using System;
+
+namespace SevenZip.Compression.LZMA
+{
+    using RangeCoder;
+    using System.Threading;
+
+    public class Decoder : ICoder, ISetDecoderProperties // ,System.IO.Stream
+    {
+        private class LenDecoder
+        {
+            private BitDecoder m_Choice = new();
+            private BitDecoder m_Choice2 = new();
+            private readonly BitTreeDecoder[] m_LowCoder = new BitTreeDecoder[Base.kNumPosStatesMax];
+            private readonly BitTreeDecoder[] m_MidCoder = new BitTreeDecoder[Base.kNumPosStatesMax];
+            private readonly BitTreeDecoder m_HighCoder = new(Base.kNumHighLenBits);
+            private uint m_NumPosStates = 0;
+
+            public void Create(uint numPosStates)
+            {
+                for (uint posState = m_NumPosStates; posState < numPosStates; posState++)
+                {
+                    m_LowCoder[posState] = new BitTreeDecoder(Base.kNumLowLenBits);
+                    m_MidCoder[posState] = new BitTreeDecoder(Base.kNumMidLenBits);
+                }
+                m_NumPosStates = numPosStates;
+            }
+
+            public void Init()
+            {
+                m_Choice.Init();
+                for (uint posState = 0; posState < m_NumPosStates; posState++)
+                {
+                    m_LowCoder[posState].Init();
+                    m_MidCoder[posState].Init();
+                }
+                m_Choice2.Init();
+                m_HighCoder.Init();
+            }
+
+            public uint Decode(RangeCoder.Decoder rangeDecoder, uint posState)
+            {
+                if (m_Choice.Decode(rangeDecoder) == 0)
+                {
+                    return m_LowCoder[posState].Decode(rangeDecoder);
+                }
+                else
+                {
+                    uint symbol = Base.kNumLowLenSymbols;
+                    if (m_Choice2.Decode(rangeDecoder) == 0)
+                    {
+                        symbol += m_MidCoder[posState].Decode(rangeDecoder);
+                    }
+                    else
+                    {
+                        symbol += Base.kNumMidLenSymbols;
+                        symbol += m_HighCoder.Decode(rangeDecoder);
+                    }
+                    return symbol;
+                }
+            }
+        }
+
+        private class LiteralDecoder
+        {
+            private struct Decoder2
+            {
+                private BitDecoder[] m_Decoders;
+                public void Create() { m_Decoders = new BitDecoder[0x300]; }
+                public void Init() { for (int i = 0; i < 0x300; i++)
+                    {
+                        m_Decoders[i].Init();
+                    }
+                }
+
+                public byte DecodeNormal(RangeCoder.Decoder rangeDecoder)
+                {
+                    uint symbol = 1;
+                    do
+                    {
+                        symbol = (symbol << 1) | m_Decoders[symbol].Decode(rangeDecoder);
+                    }
+                    while (symbol < 0x100);
+                    return (byte)symbol;
+                }
+
+                public byte DecodeWithMatchByte(RangeCoder.Decoder rangeDecoder, byte matchByte)
+                {
+                    uint symbol = 1;
+                    do
+                    {
+                        uint matchBit = (uint)(matchByte >> 7) & 1;
+                        matchByte <<= 1;
+                        uint bit = m_Decoders[((1 + matchBit) << 8) + symbol].Decode(rangeDecoder);
+                        symbol = (symbol << 1) | bit;
+                        if (matchBit != bit)
+                        {
+                            while (symbol < 0x100)
+                            {
+                                symbol = (symbol << 1) | m_Decoders[symbol].Decode(rangeDecoder);
+                            }
+
+                            break;
+                        }
+                    }
+                    while (symbol < 0x100);
+                    return (byte)symbol;
+                }
+            }
+
+            private Decoder2[] m_Coders;
+            private int m_NumPrevBits;
+            private int m_NumPosBits;
+            private uint m_PosMask;
+
+            public void Create(int numPosBits, int numPrevBits)
+            {
+                if (m_Coders != null && m_NumPrevBits == numPrevBits &&
+                    m_NumPosBits == numPosBits)
+                {
+                    return;
+                }
+
+                m_NumPosBits = numPosBits;
+                m_PosMask = ((uint)1 << numPosBits) - 1;
+                m_NumPrevBits = numPrevBits;
+                uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits);
+                m_Coders = new Decoder2[numStates];
+                for (uint i = 0; i < numStates; i++)
+                {
+                    m_Coders[i].Create();
+                }
+            }
+
+            public void Init()
+            {
+                uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits);
+                for (uint i = 0; i < numStates; i++)
+                {
+                    m_Coders[i].Init();
+                }
+            }
+
+            private uint GetState(uint pos, byte prevByte)
+            { return ((pos & m_PosMask) << m_NumPrevBits) + (uint)(prevByte >> (8 - m_NumPrevBits)); }
+
+            public byte DecodeNormal(RangeCoder.Decoder rangeDecoder, uint pos, byte prevByte)
+            { return m_Coders[GetState(pos, prevByte)].DecodeNormal(rangeDecoder); }
+
+            public byte DecodeWithMatchByte(RangeCoder.Decoder rangeDecoder, uint pos, byte prevByte, byte matchByte)
+            { return m_Coders[GetState(pos, prevByte)].DecodeWithMatchByte(rangeDecoder, matchByte); }
+        };
+
+        private readonly LZ.OutWindow m_OutWindow = new();
+        private readonly RangeCoder.Decoder m_RangeDecoder = new();
+
+        private readonly BitDecoder[] m_IsMatchDecoders = new BitDecoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
+        private readonly BitDecoder[] m_IsRepDecoders = new BitDecoder[Base.kNumStates];
+        private readonly BitDecoder[] m_IsRepG0Decoders = new BitDecoder[Base.kNumStates];
+        private readonly BitDecoder[] m_IsRepG1Decoders = new BitDecoder[Base.kNumStates];
+        private readonly BitDecoder[] m_IsRepG2Decoders = new BitDecoder[Base.kNumStates];
+        private readonly BitDecoder[] m_IsRep0LongDecoders = new BitDecoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
+
+        private readonly BitTreeDecoder[] m_PosSlotDecoder = new BitTreeDecoder[Base.kNumLenToPosStates];
+        private readonly BitDecoder[] m_PosDecoders = new BitDecoder[Base.kNumFullDistances - Base.kEndPosModelIndex];
+
+        private readonly BitTreeDecoder m_PosAlignDecoder = new(Base.kNumAlignBits);
+
+        private readonly LenDecoder m_LenDecoder = new();
+        private readonly LenDecoder m_RepLenDecoder = new();
+
+        private readonly LiteralDecoder m_LiteralDecoder = new();
+
+        private uint m_DictionarySize;
+        private uint m_DictionarySizeCheck;
+
+        private uint m_PosStateMask;
+
+        public Decoder()
+        {
+            m_DictionarySize = 0xFFFFFFFF;
+            for (int i = 0; i < Base.kNumLenToPosStates; i++)
+            {
+                m_PosSlotDecoder[i] = new BitTreeDecoder(Base.kNumPosSlotBits);
+            }
+        }
+
+        private void SetDictionarySize(uint dictionarySize)
+        {
+            if (m_DictionarySize != dictionarySize)
+            {
+                m_DictionarySize = dictionarySize;
+                m_DictionarySizeCheck = Math.Max(m_DictionarySize, 1);
+                uint blockSize = Math.Max(m_DictionarySizeCheck, 1 << 12);
+                m_OutWindow.Create(blockSize);
+            }
+        }
+
+        private void SetLiteralProperties(int lp, int lc)
+        {
+            if (lp > 8)
+            {
+                throw new InvalidParamException();
+            }
+
+            if (lc > 8)
+            {
+                throw new InvalidParamException();
+            }
+
+            m_LiteralDecoder.Create(lp, lc);
+        }
+
+        private void SetPosBitsProperties(int pb)
+        {
+            if (pb > Base.kNumPosStatesBitsMax)
+            {
+                throw new InvalidParamException();
+            }
+
+            uint numPosStates = (uint)1 << pb;
+            m_LenDecoder.Create(numPosStates);
+            m_RepLenDecoder.Create(numPosStates);
+            m_PosStateMask = numPosStates - 1;
+        }
+
+        private bool _solid = false;
+        private void Init(System.IO.Stream inStream, System.IO.Stream outStream)
+        {
+            m_RangeDecoder.Init(inStream);
+            m_OutWindow.Init(outStream, _solid);
+
+            uint i;
+            for (i = 0; i < Base.kNumStates; i++)
+            {
+                for (uint j = 0; j <= m_PosStateMask; j++)
+                {
+                    uint index = (i << Base.kNumPosStatesBitsMax) + j;
+                    m_IsMatchDecoders[index].Init();
+                    m_IsRep0LongDecoders[index].Init();
+                }
+                m_IsRepDecoders[i].Init();
+                m_IsRepG0Decoders[i].Init();
+                m_IsRepG1Decoders[i].Init();
+                m_IsRepG2Decoders[i].Init();
+            }
+
+            m_LiteralDecoder.Init();
+            for (i = 0; i < Base.kNumLenToPosStates; i++)
+            {
+                m_PosSlotDecoder[i].Init();
+            }
+            // m_PosSpecDecoder.Init();
+            for (i = 0; i < Base.kNumFullDistances - Base.kEndPosModelIndex; i++)
+            {
+                m_PosDecoders[i].Init();
+            }
+
+            m_LenDecoder.Init();
+            m_RepLenDecoder.Init();
+            m_PosAlignDecoder.Init();
+        }
+
+        public void Code(System.IO.Stream inStream, System.IO.Stream outStream,
+            Int64 inSize, Int64 outSize, ICodeProgress progress, CancellationToken? token = null)
+        {
+            Init(inStream, outStream);
+
+            Base.State state = new();
+            state.Init();
+            uint rep0 = 0, rep1 = 0, rep2 = 0, rep3 = 0;
+
+            UInt64 nowPos64 = 0;
+            UInt64 outSize64 = (UInt64)outSize;
+            if (nowPos64 < outSize64)
+            {
+                if (m_IsMatchDecoders[state.Index << Base.kNumPosStatesBitsMax].Decode(m_RangeDecoder) != 0)
+                {
+                    throw new DataErrorException();
+                }
+
+                state.UpdateChar();
+                byte b = m_LiteralDecoder.DecodeNormal(m_RangeDecoder, 0, 0);
+                m_OutWindow.PutByte(b);
+                nowPos64++;
+            }
+
+            try
+            {
+                while (nowPos64 < outSize64)
+                {
+                    token?.ThrowIfCancellationRequested();
+
+                    // UInt64 next = Math.Min(nowPos64 + (1 << 18), outSize64);
+                    // while(nowPos64 < next)
+                    {
+                        uint posState = (uint)nowPos64 & m_PosStateMask;
+                        if (m_IsMatchDecoders[(state.Index << Base.kNumPosStatesBitsMax) + posState].Decode(m_RangeDecoder) == 0)
+                        {
+                            byte b;
+                            byte prevByte = m_OutWindow.GetByte(0);
+                            b = !state.IsCharState()
+                                ? m_LiteralDecoder.DecodeWithMatchByte(m_RangeDecoder,
+                                   (uint)nowPos64, prevByte, m_OutWindow.GetByte(rep0))
+                                : m_LiteralDecoder.DecodeNormal(m_RangeDecoder, (uint)nowPos64, prevByte);
+
+                            m_OutWindow.PutByte(b);
+                            state.UpdateChar();
+                            nowPos64++;
+                        }
+                        else
+                        {
+                            uint len;
+                            if (m_IsRepDecoders[state.Index].Decode(m_RangeDecoder) == 1)
+                            {
+                                if (m_IsRepG0Decoders[state.Index].Decode(m_RangeDecoder) == 0)
+                                {
+                                    if (m_IsRep0LongDecoders[(state.Index << Base.kNumPosStatesBitsMax) + posState].Decode(m_RangeDecoder) == 0)
+                                    {
+                                        state.UpdateShortRep();
+                                        m_OutWindow.PutByte(m_OutWindow.GetByte(rep0));
+                                        nowPos64++;
+                                        continue;
+                                    }
+                                }
+                                else
+                                {
+                                    UInt32 distance;
+                                    if (m_IsRepG1Decoders[state.Index].Decode(m_RangeDecoder) == 0)
+                                    {
+                                        distance = rep1;
+                                    }
+                                    else
+                                    {
+                                        if (m_IsRepG2Decoders[state.Index].Decode(m_RangeDecoder) == 0)
+                                        {
+                                            distance = rep2;
+                                        }
+                                        else
+                                        {
+                                            distance = rep3;
+                                            rep3 = rep2;
+                                        }
+                                        rep2 = rep1;
+                                    }
+                                    rep1 = rep0;
+                                    rep0 = distance;
+                                }
+                                len = m_RepLenDecoder.Decode(m_RangeDecoder, posState) + Base.kMatchMinLen;
+                                state.UpdateRep();
+                            }
+                            else
+                            {
+                                rep3 = rep2;
+                                rep2 = rep1;
+                                rep1 = rep0;
+                                len = Base.kMatchMinLen + m_LenDecoder.Decode(m_RangeDecoder, posState);
+                                state.UpdateMatch();
+                                uint posSlot = m_PosSlotDecoder[Base.GetLenToPosState(len)].Decode(m_RangeDecoder);
+                                if (posSlot >= Base.kStartPosModelIndex)
+                                {
+                                    int numDirectBits = (int)((posSlot >> 1) - 1);
+                                    rep0 = (2 | (posSlot & 1)) << numDirectBits;
+                                    if (posSlot < Base.kEndPosModelIndex)
+                                    {
+                                        rep0 += BitTreeDecoder.ReverseDecode(m_PosDecoders,
+                                               rep0 - posSlot - 1, m_RangeDecoder, numDirectBits);
+                                    }
+                                    else
+                                    {
+                                        rep0 += m_RangeDecoder.DecodeDirectBits(
+                                            numDirectBits - Base.kNumAlignBits) << Base.kNumAlignBits;
+                                        rep0 += m_PosAlignDecoder.ReverseDecode(m_RangeDecoder);
+                                    }
+                                }
+                                else
+                                {
+                                    rep0 = posSlot;
+                                }
+                            }
+                            if (rep0 >= m_OutWindow.TrainSize + nowPos64 || rep0 >= m_DictionarySizeCheck)
+                            {
+                                if (rep0 == 0xFFFFFFFF)
+                                {
+                                    break;
+                                }
+
+                                throw new DataErrorException();
+                            }
+                            m_OutWindow.CopyBlock(rep0, len);
+                            nowPos64 += len;
+                        }
+                    }
+                }
+            }
+            catch (OperationCanceledException)
+            {
+            }
+
+            m_OutWindow.Flush();
+            m_OutWindow.ReleaseStream();
+            m_RangeDecoder.ReleaseStream();
+        }
+
+        public void SetDecoderProperties(byte[] properties)
+        {
+            if (properties.Length < 5)
+            {
+                throw new InvalidParamException();
+            }
+
+            int lc = properties[0] % 9;
+            int remainder = properties[0] / 9;
+            int lp = remainder % 5;
+            int pb = remainder / 5;
+            if (pb > Base.kNumPosStatesBitsMax)
+            {
+                throw new InvalidParamException();
+            }
+
+            UInt32 dictionarySize = 0;
+            for (int i = 0; i < 4; i++)
+            {
+                dictionarySize += ((UInt32)properties[1 + i]) << (i * 8);
+            }
+
+            SetDictionarySize(dictionarySize);
+            SetLiteralProperties(lp, lc);
+            SetPosBitsProperties(pb);
+        }
+
+        public bool Train(System.IO.Stream stream)
+        {
+            _solid = true;
+            return m_OutWindow.Train(stream);
+        }
+
+        /*
+		public override bool CanRead { get { return true; }}
+		public override bool CanWrite { get { return true; }}
+		public override bool CanSeek { get { return true; }}
+		public override long Length { get { return 0; }}
+		public override long Position
+		{
+			get { return 0;	}
+			set { }
+		}
+		public override void Flush() { }
+		public override int Read(byte[] buffer, int offset, int count) 
+		{
+			return 0;
+		}
+		public override void Write(byte[] buffer, int offset, int count)
+		{
+		}
+		public override long Seek(long offset, System.IO.SeekOrigin origin)
+		{
+			return 0;
+		}
+		public override void SetLength(long value) {}
+		*/
+    }
+}
diff --git a/7zip/Compress/LZMA/LzmaEncoder.cs b/WPinternals/7zip/Compress/LZMA/LzmaEncoder.cs
similarity index 97%
rename from 7zip/Compress/LZMA/LzmaEncoder.cs
rename to WPinternals/7zip/Compress/LZMA/LzmaEncoder.cs
index f1b8461..7d1dac9 100644
--- a/7zip/Compress/LZMA/LzmaEncoder.cs
+++ b/WPinternals/7zip/Compress/LZMA/LzmaEncoder.cs
@@ -1,1692 +1,1692 @@
-// LzmaEncoder.cs
-
-using System;
-
-namespace SevenZip.Compression.LZMA
-{
-    using RangeCoder;
-    using System.Threading;
-
-    public class Encoder : ICoder, ISetCoderProperties, IWriteCoderProperties
-    {
-        private enum EMatchFinderType
-        {
-            BT2,
-            BT4,
-        };
-
-        private const UInt32 kIfinityPrice = 0xFFFFFFF;
-
-        private static readonly Byte[] g_FastPos = new Byte[1 << 11];
-
-        static Encoder()
-        {
-            const Byte kFastSlots = 22;
-            int c = 2;
-            g_FastPos[0] = 0;
-            g_FastPos[1] = 1;
-            for (Byte slotFast = 2; slotFast < kFastSlots; slotFast++)
-            {
-                UInt32 k = (UInt32)1 << ((slotFast >> 1) - 1);
-                for (UInt32 j = 0; j < k; j++, c++)
-                {
-                    g_FastPos[c] = slotFast;
-                }
-            }
-        }
-
-        private static UInt32 GetPosSlot(UInt32 pos)
-        {
-            if (pos < (1 << 11))
-            {
-                return g_FastPos[pos];
-            }
-
-            if (pos < (1 << 21))
-            {
-                return (UInt32)(g_FastPos[pos >> 10] + 20);
-            }
-
-            return (UInt32)(g_FastPos[pos >> 20] + 40);
-        }
-
-        private static UInt32 GetPosSlot2(UInt32 pos)
-        {
-            if (pos < (1 << 17))
-            {
-                return (UInt32)(g_FastPos[pos >> 6] + 12);
-            }
-
-            if (pos < (1 << 27))
-            {
-                return (UInt32)(g_FastPos[pos >> 16] + 32);
-            }
-
-            return (UInt32)(g_FastPos[pos >> 26] + 52);
-        }
-
-        private Base.State _state = new();
-        private Byte _previousByte;
-        private readonly UInt32[] _repDistances = new UInt32[Base.kNumRepDistances];
-
-        private void BaseInit()
-        {
-            _state.Init();
-            _previousByte = 0;
-            for (UInt32 i = 0; i < Base.kNumRepDistances; i++)
-            {
-                _repDistances[i] = 0;
-            }
-        }
-
-        private const int kDefaultDictionaryLogSize = 22;
-        private const UInt32 kNumFastBytesDefault = 0x20;
-
-        private class LiteralEncoder
-        {
-            public struct Encoder2
-            {
-                private BitEncoder[] m_Encoders;
-
-                public void Create() { m_Encoders = new BitEncoder[0x300]; }
-
-                public void Init() { for (int i = 0; i < 0x300; i++)
-                    {
-                        m_Encoders[i].Init();
-                    }
-                }
-
-                public void Encode(RangeCoder.Encoder rangeEncoder, byte symbol)
-                {
-                    uint context = 1;
-                    for (int i = 7; i >= 0; i--)
-                    {
-                        uint bit = (uint)((symbol >> i) & 1);
-                        m_Encoders[context].Encode(rangeEncoder, bit);
-                        context = (context << 1) | bit;
-                    }
-                }
-
-                public void EncodeMatched(RangeCoder.Encoder rangeEncoder, byte matchByte, byte symbol)
-                {
-                    uint context = 1;
-                    bool same = true;
-                    for (int i = 7; i >= 0; i--)
-                    {
-                        uint bit = (uint)((symbol >> i) & 1);
-                        uint state = context;
-                        if (same)
-                        {
-                            uint matchBit = (uint)((matchByte >> i) & 1);
-                            state += (1 + matchBit) << 8;
-                            same = matchBit == bit;
-                        }
-                        m_Encoders[state].Encode(rangeEncoder, bit);
-                        context = (context << 1) | bit;
-                    }
-                }
-
-                public uint GetPrice(bool matchMode, byte matchByte, byte symbol)
-                {
-                    uint price = 0;
-                    uint context = 1;
-                    int i = 7;
-                    if (matchMode)
-                    {
-                        for (; i >= 0; i--)
-                        {
-                            uint matchBit = (uint)(matchByte >> i) & 1;
-                            uint bit = (uint)(symbol >> i) & 1;
-                            price += m_Encoders[((1 + matchBit) << 8) + context].GetPrice(bit);
-                            context = (context << 1) | bit;
-                            if (matchBit != bit)
-                            {
-                                i--;
-                                break;
-                            }
-                        }
-                    }
-                    for (; i >= 0; i--)
-                    {
-                        uint bit = (uint)(symbol >> i) & 1;
-                        price += m_Encoders[context].GetPrice(bit);
-                        context = (context << 1) | bit;
-                    }
-                    return price;
-                }
-            }
-
-            private Encoder2[] m_Coders;
-            private int m_NumPrevBits;
-            private int m_NumPosBits;
-            private uint m_PosMask;
-
-            public void Create(int numPosBits, int numPrevBits)
-            {
-                if (m_Coders != null && m_NumPrevBits == numPrevBits && m_NumPosBits == numPosBits)
-                {
-                    return;
-                }
-
-                m_NumPosBits = numPosBits;
-                m_PosMask = ((uint)1 << numPosBits) - 1;
-                m_NumPrevBits = numPrevBits;
-                uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits);
-                m_Coders = new Encoder2[numStates];
-                for (uint i = 0; i < numStates; i++)
-                {
-                    m_Coders[i].Create();
-                }
-            }
-
-            public void Init()
-            {
-                uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits);
-                for (uint i = 0; i < numStates; i++)
-                {
-                    m_Coders[i].Init();
-                }
-            }
-
-            public Encoder2 GetSubCoder(UInt32 pos, Byte prevByte)
-            { return m_Coders[((pos & m_PosMask) << m_NumPrevBits) + (uint)(prevByte >> (8 - m_NumPrevBits))]; }
-        }
-
-        private class LenEncoder
-        {
-            private BitEncoder _choice = new();
-            private BitEncoder _choice2 = new();
-            private readonly BitTreeEncoder[] _lowCoder = new BitTreeEncoder[Base.kNumPosStatesEncodingMax];
-            private readonly BitTreeEncoder[] _midCoder = new BitTreeEncoder[Base.kNumPosStatesEncodingMax];
-            private readonly BitTreeEncoder _highCoder = new(Base.kNumHighLenBits);
-
-            public LenEncoder()
-            {
-                for (UInt32 posState = 0; posState < Base.kNumPosStatesEncodingMax; posState++)
-                {
-                    _lowCoder[posState] = new BitTreeEncoder(Base.kNumLowLenBits);
-                    _midCoder[posState] = new BitTreeEncoder(Base.kNumMidLenBits);
-                }
-            }
-
-            public void Init(UInt32 numPosStates)
-            {
-                _choice.Init();
-                _choice2.Init();
-                for (UInt32 posState = 0; posState < numPosStates; posState++)
-                {
-                    _lowCoder[posState].Init();
-                    _midCoder[posState].Init();
-                }
-                _highCoder.Init();
-            }
-
-            public void Encode(RangeCoder.Encoder rangeEncoder, UInt32 symbol, UInt32 posState)
-            {
-                if (symbol < Base.kNumLowLenSymbols)
-                {
-                    _choice.Encode(rangeEncoder, 0);
-                    _lowCoder[posState].Encode(rangeEncoder, symbol);
-                }
-                else
-                {
-                    symbol -= Base.kNumLowLenSymbols;
-                    _choice.Encode(rangeEncoder, 1);
-                    if (symbol < Base.kNumMidLenSymbols)
-                    {
-                        _choice2.Encode(rangeEncoder, 0);
-                        _midCoder[posState].Encode(rangeEncoder, symbol);
-                    }
-                    else
-                    {
-                        _choice2.Encode(rangeEncoder, 1);
-                        _highCoder.Encode(rangeEncoder, symbol - Base.kNumMidLenSymbols);
-                    }
-                }
-            }
-
-            public void SetPrices(UInt32 posState, UInt32 numSymbols, UInt32[] prices, UInt32 st)
-            {
-                UInt32 a0 = _choice.GetPrice0();
-                UInt32 a1 = _choice.GetPrice1();
-                UInt32 b0 = a1 + _choice2.GetPrice0();
-                UInt32 b1 = a1 + _choice2.GetPrice1();
-                UInt32 i = 0;
-                for (i = 0; i < Base.kNumLowLenSymbols; i++)
-                {
-                    if (i >= numSymbols)
-                    {
-                        return;
-                    }
-
-                    prices[st + i] = a0 + _lowCoder[posState].GetPrice(i);
-                }
-                for (; i < Base.kNumLowLenSymbols + Base.kNumMidLenSymbols; i++)
-                {
-                    if (i >= numSymbols)
-                    {
-                        return;
-                    }
-
-                    prices[st + i] = b0 + _midCoder[posState].GetPrice(i - Base.kNumLowLenSymbols);
-                }
-                for (; i < numSymbols; i++)
-                {
-                    prices[st + i] = b1 + _highCoder.GetPrice(i - Base.kNumLowLenSymbols - Base.kNumMidLenSymbols);
-                }
-            }
-        };
-
-        private const UInt32 kNumLenSpecSymbols = Base.kNumLowLenSymbols + Base.kNumMidLenSymbols;
-
-        private class LenPriceTableEncoder : LenEncoder
-        {
-            private readonly UInt32[] _prices = new UInt32[Base.kNumLenSymbols << Base.kNumPosStatesBitsEncodingMax];
-            private UInt32 _tableSize;
-            private readonly UInt32[] _counters = new UInt32[Base.kNumPosStatesEncodingMax];
-
-            public void SetTableSize(UInt32 tableSize) { _tableSize = tableSize; }
-
-            public UInt32 GetPrice(UInt32 symbol, UInt32 posState)
-            {
-                return _prices[(posState * Base.kNumLenSymbols) + symbol];
-            }
-
-            private void UpdateTable(UInt32 posState)
-            {
-                SetPrices(posState, _tableSize, _prices, posState * Base.kNumLenSymbols);
-                _counters[posState] = _tableSize;
-            }
-
-            public void UpdateTables(UInt32 numPosStates)
-            {
-                for (UInt32 posState = 0; posState < numPosStates; posState++)
-                {
-                    UpdateTable(posState);
-                }
-            }
-
-            public new void Encode(RangeCoder.Encoder rangeEncoder, UInt32 symbol, UInt32 posState)
-            {
-                base.Encode(rangeEncoder, symbol, posState);
-                if (--_counters[posState] == 0)
-                {
-                    UpdateTable(posState);
-                }
-            }
-        }
-
-        private const UInt32 kNumOpts = 1 << 12;
-        private class Optimal
-        {
-            public Base.State State;
-
-            public bool Prev1IsChar;
-            public bool Prev2;
-
-            public UInt32 PosPrev2;
-            public UInt32 BackPrev2;
-
-            public UInt32 Price;
-            public UInt32 PosPrev;
-            public UInt32 BackPrev;
-
-            public UInt32 Backs0;
-            public UInt32 Backs1;
-            public UInt32 Backs2;
-            public UInt32 Backs3;
-
-            public void MakeAsChar() { BackPrev = 0xFFFFFFFF; Prev1IsChar = false; }
-            public void MakeAsShortRep() { BackPrev = 0;  Prev1IsChar = false; }
-            public bool IsShortRep() { return BackPrev == 0; }
-        };
-        private readonly Optimal[] _optimum = new Optimal[kNumOpts];
-        private LZ.IMatchFinder _matchFinder = null;
-        private readonly RangeCoder.Encoder _rangeEncoder = new();
-
-        private readonly BitEncoder[] _isMatch = new BitEncoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
-        private readonly BitEncoder[] _isRep = new BitEncoder[Base.kNumStates];
-        private readonly BitEncoder[] _isRepG0 = new BitEncoder[Base.kNumStates];
-        private readonly BitEncoder[] _isRepG1 = new BitEncoder[Base.kNumStates];
-        private readonly BitEncoder[] _isRepG2 = new BitEncoder[Base.kNumStates];
-        private readonly BitEncoder[] _isRep0Long = new BitEncoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
-
-        private readonly BitTreeEncoder[] _posSlotEncoder = new BitTreeEncoder[Base.kNumLenToPosStates];
-
-        private readonly BitEncoder[] _posEncoders = new BitEncoder[Base.kNumFullDistances - Base.kEndPosModelIndex];
-        private readonly BitTreeEncoder _posAlignEncoder = new(Base.kNumAlignBits);
-
-        private readonly LenPriceTableEncoder _lenEncoder = new();
-        private readonly LenPriceTableEncoder _repMatchLenEncoder = new();
-
-        private readonly LiteralEncoder _literalEncoder = new();
-
-        private readonly UInt32[] _matchDistances = new UInt32[(Base.kMatchMaxLen * 2) + 2];
-
-        private UInt32 _numFastBytes = kNumFastBytesDefault;
-        private UInt32 _longestMatchLength;
-        private UInt32 _numDistancePairs;
-
-        private UInt32 _additionalOffset;
-
-        private UInt32 _optimumEndIndex;
-        private UInt32 _optimumCurrentIndex;
-
-        private bool _longestMatchWasFound;
-
-        private readonly UInt32[] _posSlotPrices = new UInt32[1 << (Base.kNumPosSlotBits + Base.kNumLenToPosStatesBits)];
-        private readonly UInt32[] _distancesPrices = new UInt32[Base.kNumFullDistances << Base.kNumLenToPosStatesBits];
-        private readonly UInt32[] _alignPrices = new UInt32[Base.kAlignTableSize];
-        private UInt32 _alignPriceCount;
-
-        private UInt32 _distTableSize = kDefaultDictionaryLogSize * 2;
-
-        private int _posStateBits = 2;
-        private UInt32 _posStateMask = 4 - 1;
-        private int _numLiteralPosStateBits = 0;
-        private int _numLiteralContextBits = 3;
-
-        private UInt32 _dictionarySize = 1 << kDefaultDictionaryLogSize;
-        private UInt32 _dictionarySizePrev = 0xFFFFFFFF;
-        private UInt32 _numFastBytesPrev = 0xFFFFFFFF;
-
-        private Int64 nowPos64;
-        private bool _finished;
-        private System.IO.Stream _inStream;
-
-        private EMatchFinderType _matchFinderType = EMatchFinderType.BT4;
-        private bool _writeEndMark = false;
-
-        private bool _needReleaseMFStream;
-
-        private void Create()
-        {
-            if (_matchFinder == null)
-            {
-                LZ.BinTree bt = new();
-                int numHashBytes = 4;
-                if (_matchFinderType == EMatchFinderType.BT2)
-                {
-                    numHashBytes = 2;
-                }
-
-                bt.SetType(numHashBytes);
-                _matchFinder = bt;
-            }
-            _literalEncoder.Create(_numLiteralPosStateBits, _numLiteralContextBits);
-
-            if (_dictionarySize == _dictionarySizePrev && _numFastBytesPrev == _numFastBytes)
-            {
-                return;
-            }
-
-            _matchFinder.Create(_dictionarySize, kNumOpts, _numFastBytes, Base.kMatchMaxLen + 1);
-            _dictionarySizePrev = _dictionarySize;
-            _numFastBytesPrev = _numFastBytes;
-        }
-
-        public Encoder()
-        {
-            for (int i = 0; i < kNumOpts; i++)
-            {
-                _optimum[i] = new Optimal();
-            }
-
-            for (int i = 0; i < Base.kNumLenToPosStates; i++)
-            {
-                _posSlotEncoder[i] = new BitTreeEncoder(Base.kNumPosSlotBits);
-            }
-        }
-
-        private void SetWriteEndMarkerMode(bool writeEndMarker)
-        {
-            _writeEndMark = writeEndMarker;
-        }
-
-        private void Init()
-        {
-            BaseInit();
-            _rangeEncoder.Init();
-
-            uint i;
-            for (i = 0; i < Base.kNumStates; i++)
-            {
-                for (uint j = 0; j <= _posStateMask; j++)
-                {
-                    uint complexState = (i << Base.kNumPosStatesBitsMax) + j;
-                    _isMatch[complexState].Init();
-                    _isRep0Long[complexState].Init();
-                }
-                _isRep[i].Init();
-                _isRepG0[i].Init();
-                _isRepG1[i].Init();
-                _isRepG2[i].Init();
-            }
-            _literalEncoder.Init();
-            for (i = 0; i < Base.kNumLenToPosStates; i++)
-            {
-                _posSlotEncoder[i].Init();
-            }
-
-            for (i = 0; i < Base.kNumFullDistances - Base.kEndPosModelIndex; i++)
-            {
-                _posEncoders[i].Init();
-            }
-
-            _lenEncoder.Init((UInt32)1 << _posStateBits);
-            _repMatchLenEncoder.Init((UInt32)1 << _posStateBits);
-
-            _posAlignEncoder.Init();
-
-            _longestMatchWasFound = false;
-            _optimumEndIndex = 0;
-            _optimumCurrentIndex = 0;
-            _additionalOffset = 0;
-        }
-
-        private void ReadMatchDistances(out UInt32 lenRes, out UInt32 numDistancePairs)
-        {
-            lenRes = 0;
-            numDistancePairs = _matchFinder.GetMatches(_matchDistances);
-            if (numDistancePairs > 0)
-            {
-                lenRes = _matchDistances[numDistancePairs - 2];
-                if (lenRes == _numFastBytes)
-                {
-                    lenRes += _matchFinder.GetMatchLen((int)lenRes - 1, _matchDistances[numDistancePairs - 1],
-                        Base.kMatchMaxLen - lenRes);
-                }
-            }
-            _additionalOffset++;
-        }
-
-        private void MovePos(UInt32 num)
-        {
-            if (num > 0)
-            {
-                _matchFinder.Skip(num);
-                _additionalOffset += num;
-            }
-        }
-
-        private UInt32 GetRepLen1Price(Base.State state, UInt32 posState)
-        {
-            return _isRepG0[state.Index].GetPrice0() +
-                    _isRep0Long[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice0();
-        }
-
-        private UInt32 GetPureRepPrice(UInt32 repIndex, Base.State state, UInt32 posState)
-        {
-            UInt32 price;
-            if (repIndex == 0)
-            {
-                price = _isRepG0[state.Index].GetPrice0();
-                price += _isRep0Long[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice1();
-            }
-            else
-            {
-                price = _isRepG0[state.Index].GetPrice1();
-                if (repIndex == 1)
-                {
-                    price += _isRepG1[state.Index].GetPrice0();
-                }
-                else
-                {
-                    price += _isRepG1[state.Index].GetPrice1();
-                    price += _isRepG2[state.Index].GetPrice(repIndex - 2);
-                }
-            }
-            return price;
-        }
-
-        private UInt32 GetRepPrice(UInt32 repIndex, UInt32 len, Base.State state, UInt32 posState)
-        {
-            UInt32 price = _repMatchLenEncoder.GetPrice(len - Base.kMatchMinLen, posState);
-            return price + GetPureRepPrice(repIndex, state, posState);
-        }
-
-        private UInt32 GetPosLenPrice(UInt32 pos, UInt32 len, UInt32 posState)
-        {
-            UInt32 price;
-            UInt32 lenToPosState = Base.GetLenToPosState(len);
-            price = pos < Base.kNumFullDistances
-                ? _distancesPrices[(lenToPosState * Base.kNumFullDistances) + pos]
-                : _posSlotPrices[(lenToPosState << Base.kNumPosSlotBits) + GetPosSlot2(pos)] +
-                   _alignPrices[pos & Base.kAlignMask];
-
-            return price + _lenEncoder.GetPrice(len - Base.kMatchMinLen, posState);
-        }
-
-        private UInt32 Backward(out UInt32 backRes, UInt32 cur)
-        {
-            _optimumEndIndex = cur;
-            UInt32 posMem = _optimum[cur].PosPrev;
-            UInt32 backMem = _optimum[cur].BackPrev;
-            do
-            {
-                if (_optimum[cur].Prev1IsChar)
-                {
-                    _optimum[posMem].MakeAsChar();
-                    _optimum[posMem].PosPrev = posMem - 1;
-                    if (_optimum[cur].Prev2)
-                    {
-                        _optimum[posMem - 1].Prev1IsChar = false;
-                        _optimum[posMem - 1].PosPrev = _optimum[cur].PosPrev2;
-                        _optimum[posMem - 1].BackPrev = _optimum[cur].BackPrev2;
-                    }
-                }
-                UInt32 posPrev = posMem;
-                UInt32 backCur = backMem;
-
-                backMem = _optimum[posPrev].BackPrev;
-                posMem = _optimum[posPrev].PosPrev;
-
-                _optimum[posPrev].BackPrev = backCur;
-                _optimum[posPrev].PosPrev = cur;
-                cur = posPrev;
-            }
-            while (cur > 0);
-            backRes = _optimum[0].BackPrev;
-            _optimumCurrentIndex = _optimum[0].PosPrev;
-            return _optimumCurrentIndex;
-        }
-
-        private readonly UInt32[] reps = new UInt32[Base.kNumRepDistances];
-        private readonly UInt32[] repLens = new UInt32[Base.kNumRepDistances];
-
-        private UInt32 GetOptimum(UInt32 position, out UInt32 backRes)
-        {
-            if (_optimumEndIndex != _optimumCurrentIndex)
-            {
-                UInt32 lenRes = _optimum[_optimumCurrentIndex].PosPrev - _optimumCurrentIndex;
-                backRes = _optimum[_optimumCurrentIndex].BackPrev;
-                _optimumCurrentIndex = _optimum[_optimumCurrentIndex].PosPrev;
-                return lenRes;
-            }
-            _optimumCurrentIndex = _optimumEndIndex = 0;
-
-            UInt32 lenMain, numDistancePairs;
-            if (!_longestMatchWasFound)
-            {
-                ReadMatchDistances(out lenMain, out numDistancePairs);
-            }
-            else
-            {
-                lenMain = _longestMatchLength;
-                numDistancePairs = _numDistancePairs;
-                _longestMatchWasFound = false;
-            }
-
-            UInt32 numAvailableBytes = _matchFinder.GetNumAvailableBytes() + 1;
-            if (numAvailableBytes < 2)
-            {
-                backRes = 0xFFFFFFFF;
-                return 1;
-            }
-            if (numAvailableBytes > Base.kMatchMaxLen)
-            {
-                numAvailableBytes = Base.kMatchMaxLen;
-            }
-
-            UInt32 repMaxIndex = 0;
-            UInt32 i;
-            for (i = 0; i < Base.kNumRepDistances; i++)
-            {
-                reps[i] = _repDistances[i];
-                repLens[i] = _matchFinder.GetMatchLen(0 - 1, reps[i], Base.kMatchMaxLen);
-                if (repLens[i] > repLens[repMaxIndex])
-                {
-                    repMaxIndex = i;
-                }
-            }
-            if (repLens[repMaxIndex] >= _numFastBytes)
-            {
-                backRes = repMaxIndex;
-                UInt32 lenRes = repLens[repMaxIndex];
-                MovePos(lenRes - 1);
-                return lenRes;
-            }
-
-            if (lenMain >= _numFastBytes)
-            {
-                backRes = _matchDistances[numDistancePairs - 1] + Base.kNumRepDistances;
-                MovePos(lenMain - 1);
-                return lenMain;
-            }
-
-            Byte currentByte = _matchFinder.GetIndexByte(0 - 1);
-            Byte matchByte = _matchFinder.GetIndexByte((Int32)(0 - _repDistances[0] - 1 - 1));
-
-            if (lenMain < 2 && currentByte != matchByte && repLens[repMaxIndex] < 2)
-            {
-                backRes = 0xFFFFFFFF;
-                return 1;
-            }
-
-            _optimum[0].State = _state;
-
-            UInt32 posState = position & _posStateMask;
-
-            _optimum[1].Price = _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice0() +
-                    _literalEncoder.GetSubCoder(position, _previousByte).GetPrice(!_state.IsCharState(), matchByte, currentByte);
-            _optimum[1].MakeAsChar();
-
-            UInt32 matchPrice = _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice1();
-            UInt32 repMatchPrice = matchPrice + _isRep[_state.Index].GetPrice1();
-
-            if (matchByte == currentByte)
-            {
-                UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(_state, posState);
-                if (shortRepPrice < _optimum[1].Price)
-                {
-                    _optimum[1].Price = shortRepPrice;
-                    _optimum[1].MakeAsShortRep();
-                }
-            }
-
-            UInt32 lenEnd = (lenMain >= repLens[repMaxIndex]) ? lenMain : repLens[repMaxIndex];
-
-            if (lenEnd < 2)
-            {
-                backRes = _optimum[1].BackPrev;
-                return 1;
-            }
-
-            _optimum[1].PosPrev = 0;
-
-            _optimum[0].Backs0 = reps[0];
-            _optimum[0].Backs1 = reps[1];
-            _optimum[0].Backs2 = reps[2];
-            _optimum[0].Backs3 = reps[3];
-
-            UInt32 len = lenEnd;
-            do
-            {
-                _optimum[len--].Price = kIfinityPrice;
-            }
-            while (len >= 2);
-
-            for (i = 0; i < Base.kNumRepDistances; i++)
-            {
-                UInt32 repLen = repLens[i];
-                if (repLen < 2)
-                {
-                    continue;
-                }
-
-                UInt32 price = repMatchPrice + GetPureRepPrice(i, _state, posState);
-                do
-                {
-                    UInt32 curAndLenPrice = price + _repMatchLenEncoder.GetPrice(repLen - 2, posState);
-                    Optimal optimum = _optimum[repLen];
-                    if (curAndLenPrice < optimum.Price)
-                    {
-                        optimum.Price = curAndLenPrice;
-                        optimum.PosPrev = 0;
-                        optimum.BackPrev = i;
-                        optimum.Prev1IsChar = false;
-                    }
-                }
-                while (--repLen >= 2);
-            }
-
-            UInt32 normalMatchPrice = matchPrice + _isRep[_state.Index].GetPrice0();
-
-            len = (repLens[0] >= 2) ? repLens[0] + 1 : 2;
-            if (len <= lenMain)
-            {
-                UInt32 offs = 0;
-                while (len > _matchDistances[offs])
-                {
-                    offs += 2;
-                }
-
-                for (; ; len++)
-                {
-                    UInt32 distance = _matchDistances[offs + 1];
-                    UInt32 curAndLenPrice = normalMatchPrice + GetPosLenPrice(distance, len, posState);
-                    Optimal optimum = _optimum[len];
-                    if (curAndLenPrice < optimum.Price)
-                    {
-                        optimum.Price = curAndLenPrice;
-                        optimum.PosPrev = 0;
-                        optimum.BackPrev = distance + Base.kNumRepDistances;
-                        optimum.Prev1IsChar = false;
-                    }
-                    if (len == _matchDistances[offs])
-                    {
-                        offs += 2;
-                        if (offs == numDistancePairs)
-                        {
-                            break;
-                        }
-                    }
-                }
-            }
-
-            UInt32 cur = 0;
-
-            while (true)
-            {
-                cur++;
-                if (cur == lenEnd)
-                {
-                    return Backward(out backRes, cur);
-                }
-
-                ReadMatchDistances(out uint newLen, out numDistancePairs);
-                if (newLen >= _numFastBytes)
-                {
-                    _numDistancePairs = numDistancePairs;
-                    _longestMatchLength = newLen;
-                    _longestMatchWasFound = true;
-                    return Backward(out backRes, cur);
-                }
-                position++;
-                UInt32 posPrev = _optimum[cur].PosPrev;
-                Base.State state;
-                if (_optimum[cur].Prev1IsChar)
-                {
-                    posPrev--;
-                    if (_optimum[cur].Prev2)
-                    {
-                        state = _optimum[_optimum[cur].PosPrev2].State;
-                        if (_optimum[cur].BackPrev2 < Base.kNumRepDistances)
-                        {
-                            state.UpdateRep();
-                        }
-                        else
-                        {
-                            state.UpdateMatch();
-                        }
-                    }
-                    else
-                    {
-                        state = _optimum[posPrev].State;
-                    }
-
-                    state.UpdateChar();
-                }
-                else
-                {
-                    state = _optimum[posPrev].State;
-                }
-
-                if (posPrev == cur - 1)
-                {
-                    if (_optimum[cur].IsShortRep())
-                    {
-                        state.UpdateShortRep();
-                    }
-                    else
-                    {
-                        state.UpdateChar();
-                    }
-                }
-                else
-                {
-                    UInt32 pos;
-                    if (_optimum[cur].Prev1IsChar && _optimum[cur].Prev2)
-                    {
-                        posPrev = _optimum[cur].PosPrev2;
-                        pos = _optimum[cur].BackPrev2;
-                        state.UpdateRep();
-                    }
-                    else
-                    {
-                        pos = _optimum[cur].BackPrev;
-                        if (pos < Base.kNumRepDistances)
-                        {
-                            state.UpdateRep();
-                        }
-                        else
-                        {
-                            state.UpdateMatch();
-                        }
-                    }
-                    Optimal opt = _optimum[posPrev];
-                    if (pos < Base.kNumRepDistances)
-                    {
-                        if (pos == 0)
-                        {
-                            reps[0] = opt.Backs0;
-                            reps[1] = opt.Backs1;
-                            reps[2] = opt.Backs2;
-                            reps[3] = opt.Backs3;
-                        }
-                        else if (pos == 1)
-                        {
-                            reps[0] = opt.Backs1;
-                            reps[1] = opt.Backs0;
-                            reps[2] = opt.Backs2;
-                            reps[3] = opt.Backs3;
-                        }
-                        else if (pos == 2)
-                        {
-                            reps[0] = opt.Backs2;
-                            reps[1] = opt.Backs0;
-                            reps[2] = opt.Backs1;
-                            reps[3] = opt.Backs3;
-                        }
-                        else
-                        {
-                            reps[0] = opt.Backs3;
-                            reps[1] = opt.Backs0;
-                            reps[2] = opt.Backs1;
-                            reps[3] = opt.Backs2;
-                        }
-                    }
-                    else
-                    {
-                        reps[0] = pos - Base.kNumRepDistances;
-                        reps[1] = opt.Backs0;
-                        reps[2] = opt.Backs1;
-                        reps[3] = opt.Backs2;
-                    }
-                }
-                _optimum[cur].State = state;
-                _optimum[cur].Backs0 = reps[0];
-                _optimum[cur].Backs1 = reps[1];
-                _optimum[cur].Backs2 = reps[2];
-                _optimum[cur].Backs3 = reps[3];
-                UInt32 curPrice = _optimum[cur].Price;
-
-                currentByte = _matchFinder.GetIndexByte(0 - 1);
-                matchByte = _matchFinder.GetIndexByte((Int32)(0 - reps[0] - 1 - 1));
-
-                posState = position & _posStateMask;
-
-                UInt32 curAnd1Price = curPrice +
-                    _isMatch[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice0() +
-                    _literalEncoder.GetSubCoder(position, _matchFinder.GetIndexByte(0 - 2)).
-                    GetPrice(!state.IsCharState(), matchByte, currentByte);
-
-                Optimal nextOptimum = _optimum[cur + 1];
-
-                bool nextIsChar = false;
-                if (curAnd1Price < nextOptimum.Price)
-                {
-                    nextOptimum.Price = curAnd1Price;
-                    nextOptimum.PosPrev = cur;
-                    nextOptimum.MakeAsChar();
-                    nextIsChar = true;
-                }
-
-                matchPrice = curPrice + _isMatch[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice1();
-                repMatchPrice = matchPrice + _isRep[state.Index].GetPrice1();
-
-                if (matchByte == currentByte &&
-                    !(nextOptimum.PosPrev < cur && nextOptimum.BackPrev == 0))
-                {
-                    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(state, posState);
-                    if (shortRepPrice <= nextOptimum.Price)
-                    {
-                        nextOptimum.Price = shortRepPrice;
-                        nextOptimum.PosPrev = cur;
-                        nextOptimum.MakeAsShortRep();
-                        nextIsChar = true;
-                    }
-                }
-
-                UInt32 numAvailableBytesFull = _matchFinder.GetNumAvailableBytes() + 1;
-                numAvailableBytesFull = Math.Min(kNumOpts - 1 - cur, numAvailableBytesFull);
-                numAvailableBytes = numAvailableBytesFull;
-
-                if (numAvailableBytes < 2)
-                {
-                    continue;
-                }
-
-                if (numAvailableBytes > _numFastBytes)
-                {
-                    numAvailableBytes = _numFastBytes;
-                }
-
-                if (!nextIsChar && matchByte != currentByte)
-                {
-                    // try Literal + rep0
-                    UInt32 t = Math.Min(numAvailableBytesFull - 1, _numFastBytes);
-                    UInt32 lenTest2 = _matchFinder.GetMatchLen(0, reps[0], t);
-                    if (lenTest2 >= 2)
-                    {
-                        Base.State state2 = state;
-                        state2.UpdateChar();
-                        UInt32 posStateNext = (position + 1) & _posStateMask;
-                        UInt32 nextRepMatchPrice = curAnd1Price +
-                            _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice1() +
-                            _isRep[state2.Index].GetPrice1();
-                        {
-                            UInt32 offset = cur + 1 + lenTest2;
-                            while (lenEnd < offset)
-                            {
-                                _optimum[++lenEnd].Price = kIfinityPrice;
-                            }
-
-                            UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice(
-                                0, lenTest2, state2, posStateNext);
-                            Optimal optimum = _optimum[offset];
-                            if (curAndLenPrice < optimum.Price)
-                            {
-                                optimum.Price = curAndLenPrice;
-                                optimum.PosPrev = cur + 1;
-                                optimum.BackPrev = 0;
-                                optimum.Prev1IsChar = true;
-                                optimum.Prev2 = false;
-                            }
-                        }
-                    }
-                }
-
-                UInt32 startLen = 2; // speed optimization 
-
-                for (UInt32 repIndex = 0; repIndex < Base.kNumRepDistances; repIndex++)
-                {
-                    UInt32 lenTest = _matchFinder.GetMatchLen(0 - 1, reps[repIndex], numAvailableBytes);
-                    if (lenTest < 2)
-                    {
-                        continue;
-                    }
-
-                    UInt32 lenTestTemp = lenTest;
-                    do
-                    {
-                        while (lenEnd < cur + lenTest)
-                        {
-                            _optimum[++lenEnd].Price = kIfinityPrice;
-                        }
-
-                        UInt32 curAndLenPrice = repMatchPrice + GetRepPrice(repIndex, lenTest, state, posState);
-                        Optimal optimum = _optimum[cur + lenTest];
-                        if (curAndLenPrice < optimum.Price)
-                        {
-                            optimum.Price = curAndLenPrice;
-                            optimum.PosPrev = cur;
-                            optimum.BackPrev = repIndex;
-                            optimum.Prev1IsChar = false;
-                        }
-                    }
-                    while (--lenTest >= 2);
-                    lenTest = lenTestTemp;
-
-                    if (repIndex == 0)
-                    {
-                        startLen = lenTest + 1;
-                    }
-
-                    // if (_maxMode)
-                    if (lenTest < numAvailableBytesFull)
-                    {
-                        UInt32 t = Math.Min(numAvailableBytesFull - 1 - lenTest, _numFastBytes);
-                        UInt32 lenTest2 = _matchFinder.GetMatchLen((Int32)lenTest, reps[repIndex], t);
-                        if (lenTest2 >= 2)
-                        {
-                            Base.State state2 = state;
-                            state2.UpdateRep();
-                            UInt32 posStateNext = (position + lenTest) & _posStateMask;
-                            UInt32 curAndLenCharPrice =
-                                    repMatchPrice + GetRepPrice(repIndex, lenTest, state, posState) +
-                                    _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice0() +
-                                    _literalEncoder.GetSubCoder(position + lenTest,
-                                    _matchFinder.GetIndexByte((Int32)lenTest - 1 - 1)).GetPrice(true,
-                                    _matchFinder.GetIndexByte((Int32)lenTest - 1 - (Int32)(reps[repIndex] + 1)),
-                                    _matchFinder.GetIndexByte((Int32)lenTest - 1));
-                            state2.UpdateChar();
-                            posStateNext = (position + lenTest + 1) & _posStateMask;
-                            UInt32 nextMatchPrice = curAndLenCharPrice + _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice1();
-                            UInt32 nextRepMatchPrice = nextMatchPrice + _isRep[state2.Index].GetPrice1();
-
-                            // for(; lenTest2 >= 2; lenTest2--)
-                            {
-                                UInt32 offset = lenTest + 1 + lenTest2;
-                                while (lenEnd < cur + offset)
-                                {
-                                    _optimum[++lenEnd].Price = kIfinityPrice;
-                                }
-
-                                UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice(0, lenTest2, state2, posStateNext);
-                                Optimal optimum = _optimum[cur + offset];
-                                if (curAndLenPrice < optimum.Price)
-                                {
-                                    optimum.Price = curAndLenPrice;
-                                    optimum.PosPrev = cur + lenTest + 1;
-                                    optimum.BackPrev = 0;
-                                    optimum.Prev1IsChar = true;
-                                    optimum.Prev2 = true;
-                                    optimum.PosPrev2 = cur;
-                                    optimum.BackPrev2 = repIndex;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if (newLen > numAvailableBytes)
-                {
-                    newLen = numAvailableBytes;
-                    for (numDistancePairs = 0; newLen > _matchDistances[numDistancePairs]; numDistancePairs += 2)
-                    {
-                    }
-
-                    _matchDistances[numDistancePairs] = newLen;
-                    numDistancePairs += 2;
-                }
-                if (newLen >= startLen)
-                {
-                    normalMatchPrice = matchPrice + _isRep[state.Index].GetPrice0();
-                    while (lenEnd < cur + newLen)
-                    {
-                        _optimum[++lenEnd].Price = kIfinityPrice;
-                    }
-
-                    UInt32 offs = 0;
-                    while (startLen > _matchDistances[offs])
-                    {
-                        offs += 2;
-                    }
-
-                    for (UInt32 lenTest = startLen; ; lenTest++)
-                    {
-                        UInt32 curBack = _matchDistances[offs + 1];
-                        UInt32 curAndLenPrice = normalMatchPrice + GetPosLenPrice(curBack, lenTest, posState);
-                        Optimal optimum = _optimum[cur + lenTest];
-                        if (curAndLenPrice < optimum.Price)
-                        {
-                            optimum.Price = curAndLenPrice;
-                            optimum.PosPrev = cur;
-                            optimum.BackPrev = curBack + Base.kNumRepDistances;
-                            optimum.Prev1IsChar = false;
-                        }
-
-                        if (lenTest == _matchDistances[offs])
-                        {
-                            if (lenTest < numAvailableBytesFull)
-                            {
-                                UInt32 t = Math.Min(numAvailableBytesFull - 1 - lenTest, _numFastBytes);
-                                UInt32 lenTest2 = _matchFinder.GetMatchLen((Int32)lenTest, curBack, t);
-                                if (lenTest2 >= 2)
-                                {
-                                    Base.State state2 = state;
-                                    state2.UpdateMatch();
-                                    UInt32 posStateNext = (position + lenTest) & _posStateMask;
-                                    UInt32 curAndLenCharPrice = curAndLenPrice +
-                                        _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice0() +
-                                        _literalEncoder.GetSubCoder(position + lenTest,
-                                        _matchFinder.GetIndexByte((Int32)lenTest - 1 - 1)).
-                                        GetPrice(true,
-                                        _matchFinder.GetIndexByte((Int32)lenTest - (Int32)(curBack + 1) - 1),
-                                        _matchFinder.GetIndexByte((Int32)lenTest - 1));
-                                    state2.UpdateChar();
-                                    posStateNext = (position + lenTest + 1) & _posStateMask;
-                                    UInt32 nextMatchPrice = curAndLenCharPrice + _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice1();
-                                    UInt32 nextRepMatchPrice = nextMatchPrice + _isRep[state2.Index].GetPrice1();
-
-                                    UInt32 offset = lenTest + 1 + lenTest2;
-                                    while (lenEnd < cur + offset)
-                                    {
-                                        _optimum[++lenEnd].Price = kIfinityPrice;
-                                    }
-
-                                    curAndLenPrice = nextRepMatchPrice + GetRepPrice(0, lenTest2, state2, posStateNext);
-                                    optimum = _optimum[cur + offset];
-                                    if (curAndLenPrice < optimum.Price)
-                                    {
-                                        optimum.Price = curAndLenPrice;
-                                        optimum.PosPrev = cur + lenTest + 1;
-                                        optimum.BackPrev = 0;
-                                        optimum.Prev1IsChar = true;
-                                        optimum.Prev2 = true;
-                                        optimum.PosPrev2 = cur;
-                                        optimum.BackPrev2 = curBack + Base.kNumRepDistances;
-                                    }
-                                }
-                            }
-                            offs += 2;
-                            if (offs == numDistancePairs)
-                            {
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        private bool ChangePair(UInt32 smallDist, UInt32 bigDist)
-        {
-            const int kDif = 7;
-            return smallDist < ((UInt32)1 << (32 - kDif)) && bigDist >= (smallDist << kDif);
-        }
-
-        private void WriteEndMarker(UInt32 posState)
-        {
-            if (!_writeEndMark)
-            {
-                return;
-            }
-
-            _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].Encode(_rangeEncoder, 1);
-            _isRep[_state.Index].Encode(_rangeEncoder, 0);
-            _state.UpdateMatch();
-            const UInt32 len = Base.kMatchMinLen;
-            _lenEncoder.Encode(_rangeEncoder, len - Base.kMatchMinLen, posState);
-            const UInt32 posSlot = (1 << Base.kNumPosSlotBits) - 1;
-            UInt32 lenToPosState = Base.GetLenToPosState(len);
-            _posSlotEncoder[lenToPosState].Encode(_rangeEncoder, posSlot);
-            const int footerBits = 30;
-            const UInt32 posReduced = (((UInt32)1) << footerBits) - 1;
-            _rangeEncoder.EncodeDirectBits(posReduced >> Base.kNumAlignBits, footerBits - Base.kNumAlignBits);
-            _posAlignEncoder.ReverseEncode(_rangeEncoder, posReduced & Base.kAlignMask);
-        }
-
-        private void Flush(UInt32 nowPos)
-        {
-            ReleaseMFStream();
-            WriteEndMarker(nowPos & _posStateMask);
-            _rangeEncoder.FlushData();
-            _rangeEncoder.FlushStream();
-        }
-
-        public void CodeOneBlock(out Int64 inSize, out Int64 outSize, out bool finished)
-        {
-            inSize = 0;
-            outSize = 0;
-            finished = true;
-
-            if (_inStream != null)
-            {
-                _matchFinder.SetStream(_inStream);
-                _matchFinder.Init();
-                _needReleaseMFStream = true;
-                _inStream = null;
-                if (_trainSize > 0)
-                {
-                    _matchFinder.Skip(_trainSize);
-                }
-            }
-
-            if (_finished)
-            {
-                return;
-            }
-
-            _finished = true;
-
-            Int64 progressPosValuePrev = nowPos64;
-            if (nowPos64 == 0)
-            {
-                if (_matchFinder.GetNumAvailableBytes() == 0)
-                {
-                    Flush((UInt32)nowPos64);
-                    return;
-                }
-                // it's not used
-                ReadMatchDistances(out uint len, out uint numDistancePairs);
-                UInt32 posState = (UInt32)nowPos64 & _posStateMask;
-                _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].Encode(_rangeEncoder, 0);
-                _state.UpdateChar();
-                Byte curByte = _matchFinder.GetIndexByte((Int32)(0 - _additionalOffset));
-                _literalEncoder.GetSubCoder((UInt32)nowPos64, _previousByte).Encode(_rangeEncoder, curByte);
-                _previousByte = curByte;
-                _additionalOffset--;
-                nowPos64++;
-            }
-            if (_matchFinder.GetNumAvailableBytes() == 0)
-            {
-                Flush((UInt32)nowPos64);
-                return;
-            }
-            while (true)
-            {
-                UInt32 len = GetOptimum((UInt32)nowPos64, out uint pos);
-
-                UInt32 posState = ((UInt32)nowPos64) & _posStateMask;
-                UInt32 complexState = (_state.Index << Base.kNumPosStatesBitsMax) + posState;
-                if (len == 1 && pos == 0xFFFFFFFF)
-                {
-                    _isMatch[complexState].Encode(_rangeEncoder, 0);
-                    Byte curByte = _matchFinder.GetIndexByte((Int32)(0 - _additionalOffset));
-                    LiteralEncoder.Encoder2 subCoder = _literalEncoder.GetSubCoder((UInt32)nowPos64, _previousByte);
-                    if (!_state.IsCharState())
-                    {
-                        Byte matchByte = _matchFinder.GetIndexByte((Int32)(0 - _repDistances[0] - 1 - _additionalOffset));
-                        subCoder.EncodeMatched(_rangeEncoder, matchByte, curByte);
-                    }
-                    else
-                    {
-                        subCoder.Encode(_rangeEncoder, curByte);
-                    }
-
-                    _previousByte = curByte;
-                    _state.UpdateChar();
-                }
-                else
-                {
-                    _isMatch[complexState].Encode(_rangeEncoder, 1);
-                    if (pos < Base.kNumRepDistances)
-                    {
-                        _isRep[_state.Index].Encode(_rangeEncoder, 1);
-                        if (pos == 0)
-                        {
-                            _isRepG0[_state.Index].Encode(_rangeEncoder, 0);
-                            if (len == 1)
-                            {
-                                _isRep0Long[complexState].Encode(_rangeEncoder, 0);
-                            }
-                            else
-                            {
-                                _isRep0Long[complexState].Encode(_rangeEncoder, 1);
-                            }
-                        }
-                        else
-                        {
-                            _isRepG0[_state.Index].Encode(_rangeEncoder, 1);
-                            if (pos == 1)
-                            {
-                                _isRepG1[_state.Index].Encode(_rangeEncoder, 0);
-                            }
-                            else
-                            {
-                                _isRepG1[_state.Index].Encode(_rangeEncoder, 1);
-                                _isRepG2[_state.Index].Encode(_rangeEncoder, pos - 2);
-                            }
-                        }
-                        if (len == 1)
-                        {
-                            _state.UpdateShortRep();
-                        }
-                        else
-                        {
-                            _repMatchLenEncoder.Encode(_rangeEncoder, len - Base.kMatchMinLen, posState);
-                            _state.UpdateRep();
-                        }
-                        UInt32 distance = _repDistances[pos];
-                        if (pos != 0)
-                        {
-                            for (UInt32 i = pos; i >= 1; i--)
-                            {
-                                _repDistances[i] = _repDistances[i - 1];
-                            }
-
-                            _repDistances[0] = distance;
-                        }
-                    }
-                    else
-                    {
-                        _isRep[_state.Index].Encode(_rangeEncoder, 0);
-                        _state.UpdateMatch();
-                        _lenEncoder.Encode(_rangeEncoder, len - Base.kMatchMinLen, posState);
-                        pos -= Base.kNumRepDistances;
-                        UInt32 posSlot = GetPosSlot(pos);
-                        UInt32 lenToPosState = Base.GetLenToPosState(len);
-                        _posSlotEncoder[lenToPosState].Encode(_rangeEncoder, posSlot);
-
-                        if (posSlot >= Base.kStartPosModelIndex)
-                        {
-                            int footerBits = (int)((posSlot >> 1) - 1);
-                            UInt32 baseVal = (2 | (posSlot & 1)) << footerBits;
-                            UInt32 posReduced = pos - baseVal;
-
-                            if (posSlot < Base.kEndPosModelIndex)
-                            {
-                                BitTreeEncoder.ReverseEncode(_posEncoders,
-                                       baseVal - posSlot - 1, _rangeEncoder, footerBits, posReduced);
-                            }
-                            else
-                            {
-                                _rangeEncoder.EncodeDirectBits(posReduced >> Base.kNumAlignBits, footerBits - Base.kNumAlignBits);
-                                _posAlignEncoder.ReverseEncode(_rangeEncoder, posReduced & Base.kAlignMask);
-                                _alignPriceCount++;
-                            }
-                        }
-                        UInt32 distance = pos;
-                        for (UInt32 i = Base.kNumRepDistances - 1; i >= 1; i--)
-                        {
-                            _repDistances[i] = _repDistances[i - 1];
-                        }
-
-                        _repDistances[0] = distance;
-                        _matchPriceCount++;
-                    }
-                    _previousByte = _matchFinder.GetIndexByte((Int32)(len - 1 - _additionalOffset));
-                }
-                _additionalOffset -= len;
-                nowPos64 += len;
-                if (_additionalOffset == 0)
-                {
-                    // if (!_fastMode)
-                    if (_matchPriceCount >= (1 << 7))
-                    {
-                        FillDistancesPrices();
-                    }
-
-                    if (_alignPriceCount >= Base.kAlignTableSize)
-                    {
-                        FillAlignPrices();
-                    }
-
-                    inSize = nowPos64;
-                    outSize = _rangeEncoder.GetProcessedSizeAdd();
-                    if (_matchFinder.GetNumAvailableBytes() == 0)
-                    {
-                        Flush((UInt32)nowPos64);
-                        return;
-                    }
-
-                    if (nowPos64 - progressPosValuePrev >= (1 << 12))
-                    {
-                        _finished = false;
-                        finished = false;
-                        return;
-                    }
-                }
-            }
-        }
-
-        private void ReleaseMFStream()
-        {
-            if (_matchFinder != null && _needReleaseMFStream)
-            {
-                _matchFinder.ReleaseStream();
-                _needReleaseMFStream = false;
-            }
-        }
-
-        private void SetOutStream(System.IO.Stream outStream) { _rangeEncoder.SetStream(outStream); }
-        private void ReleaseOutStream() { _rangeEncoder.ReleaseStream(); }
-
-        private void ReleaseStreams()
-        {
-            ReleaseMFStream();
-            ReleaseOutStream();
-        }
-
-        private void SetStreams(System.IO.Stream inStream, System.IO.Stream outStream,
-                Int64 inSize, Int64 outSize)
-        {
-            _inStream = inStream;
-            _finished = false;
-            Create();
-            SetOutStream(outStream);
-            Init();
-
-            // if (!_fastMode)
-            {
-                FillDistancesPrices();
-                FillAlignPrices();
-            }
-
-            _lenEncoder.SetTableSize(_numFastBytes + 1 - Base.kMatchMinLen);
-            _lenEncoder.UpdateTables((UInt32)1 << _posStateBits);
-            _repMatchLenEncoder.SetTableSize(_numFastBytes + 1 - Base.kMatchMinLen);
-            _repMatchLenEncoder.UpdateTables((UInt32)1 << _posStateBits);
-
-            nowPos64 = 0;
-        }
-
-        public void Code(System.IO.Stream inStream, System.IO.Stream outStream,
-            Int64 inSize, Int64 outSize, ICodeProgress progress, CancellationToken? token = null)
-        {
-            _needReleaseMFStream = false;
-            try
-            {
-                SetStreams(inStream, outStream, inSize, outSize);
-                while (true)
-                {
-                    token?.ThrowIfCancellationRequested();
-                    CodeOneBlock(out long processedInSize, out long processedOutSize, out bool finished);
-                    if (finished)
-                    {
-                        return;
-                    }
-
-                    progress?.SetProgress(processedInSize, processedOutSize);
-                }
-            }
-            finally
-            {
-                ReleaseStreams();
-            }
-        }
-
-        private const int kPropSize = 5;
-        private readonly Byte[] properties = new Byte[kPropSize];
-
-        public void WriteCoderProperties(System.IO.Stream outStream)
-        {
-            properties[0] = (Byte)((((_posStateBits * 5) + _numLiteralPosStateBits) * 9) + _numLiteralContextBits);
-            for (int i = 0; i < 4; i++)
-            {
-                properties[1 + i] = (Byte)((_dictionarySize >> (8 * i)) & 0xFF);
-            }
-
-            outStream.Write(properties, 0, kPropSize);
-        }
-
-        private readonly UInt32[] tempPrices = new UInt32[Base.kNumFullDistances];
-        private UInt32 _matchPriceCount;
-
-        private void FillDistancesPrices()
-        {
-            for (UInt32 i = Base.kStartPosModelIndex; i < Base.kNumFullDistances; i++)
-            {
-                UInt32 posSlot = GetPosSlot(i);
-                int footerBits = (int)((posSlot >> 1) - 1);
-                UInt32 baseVal = (2 | (posSlot & 1)) << footerBits;
-                tempPrices[i] = BitTreeEncoder.ReverseGetPrice(_posEncoders,
-                    baseVal - posSlot - 1, footerBits, i - baseVal);
-            }
-
-            for (UInt32 lenToPosState = 0; lenToPosState < Base.kNumLenToPosStates; lenToPosState++)
-            {
-                UInt32 posSlot;
-                BitTreeEncoder encoder = _posSlotEncoder[lenToPosState];
-
-                UInt32 st = lenToPosState << Base.kNumPosSlotBits;
-                for (posSlot = 0; posSlot < _distTableSize; posSlot++)
-                {
-                    _posSlotPrices[st + posSlot] = encoder.GetPrice(posSlot);
-                }
-
-                for (posSlot = Base.kEndPosModelIndex; posSlot < _distTableSize; posSlot++)
-                {
-                    _posSlotPrices[st + posSlot] += ((posSlot >> 1) - 1 - Base.kNumAlignBits) << BitEncoder.kNumBitPriceShiftBits;
-                }
-
-                UInt32 st2 = lenToPosState * Base.kNumFullDistances;
-                UInt32 i;
-                for (i = 0; i < Base.kStartPosModelIndex; i++)
-                {
-                    _distancesPrices[st2 + i] = _posSlotPrices[st + i];
-                }
-
-                for (; i < Base.kNumFullDistances; i++)
-                {
-                    _distancesPrices[st2 + i] = _posSlotPrices[st + GetPosSlot(i)] + tempPrices[i];
-                }
-            }
-            _matchPriceCount = 0;
-        }
-
-        private void FillAlignPrices()
-        {
-            for (UInt32 i = 0; i < Base.kAlignTableSize; i++)
-            {
-                _alignPrices[i] = _posAlignEncoder.ReverseGetPrice(i);
-            }
-
-            _alignPriceCount = 0;
-        }
-
-        private static readonly string[] kMatchFinderIDs =
-        {
-            "BT2",
-            "BT4",
-        };
-
-        private static int FindMatchFinder(string s)
-        {
-            for (int m = 0; m < kMatchFinderIDs.Length; m++)
-            {
-                if (s == kMatchFinderIDs[m])
-                {
-                    return m;
-                }
-            }
-
-            return -1;
-        }
-
-        public void SetCoderProperties(CoderPropID[] propIDs, object[] properties)
-        {
-            for (UInt32 i = 0; i < properties.Length; i++)
-            {
-                object prop = properties[i];
-                switch (propIDs[i])
-                {
-                    case CoderPropID.NumFastBytes:
-                        {
-                            if (!(prop is Int32))
-                            {
-                                throw new InvalidParamException();
-                            }
-
-                            Int32 numFastBytes = (Int32)prop;
-                            if (numFastBytes < 5 || numFastBytes > Base.kMatchMaxLen)
-                            {
-                                throw new InvalidParamException();
-                            }
-
-                            _numFastBytes = (UInt32)numFastBytes;
-                            break;
-                        }
-                    case CoderPropID.Algorithm:
-                        {
-                            /*
-                            if (!(prop is Int32))
-                                throw new InvalidParamException();
-                            Int32 maximize = (Int32)prop;
-                            _fastMode = (maximize == 0);
-                            _maxMode = (maximize >= 2);
-                            */
-                            break;
-                        }
-                    case CoderPropID.MatchFinder:
-                        {
-                            if (!(prop is String))
-                            {
-                                throw new InvalidParamException();
-                            }
-
-                            EMatchFinderType matchFinderIndexPrev = _matchFinderType;
-                            int m = FindMatchFinder(((string)prop).ToUpper());
-                            if (m < 0)
-                            {
-                                throw new InvalidParamException();
-                            }
-
-                            _matchFinderType = (EMatchFinderType)m;
-                            if (_matchFinder != null && matchFinderIndexPrev != _matchFinderType)
-                            {
-                                _dictionarySizePrev = 0xFFFFFFFF;
-                                _matchFinder = null;
-                            }
-                            break;
-                        }
-                    case CoderPropID.DictionarySize:
-                        {
-                            const int kDicLogSizeMaxCompress = 30;
-                            if (!(prop is Int32))
-                            {
-                                throw new InvalidParamException();
-                            }
-                            Int32 dictionarySize = (Int32)prop;
-                            if (dictionarySize < (UInt32)(1 << Base.kDicLogSizeMin) ||
-                                dictionarySize > (UInt32)(1 << kDicLogSizeMaxCompress))
-                            {
-                                throw new InvalidParamException();
-                            }
-
-                            _dictionarySize = (UInt32)dictionarySize;
-                            int dicLogSize;
-                            for (dicLogSize = 0; dicLogSize < (UInt32)kDicLogSizeMaxCompress; dicLogSize++)
-                            {
-                                if (dictionarySize <= ((UInt32)1 << dicLogSize))
-                                {
-                                    break;
-                                }
-                            }
-
-                            _distTableSize = (UInt32)dicLogSize * 2;
-                            break;
-                        }
-                    case CoderPropID.PosStateBits:
-                        {
-                            if (!(prop is Int32))
-                            {
-                                throw new InvalidParamException();
-                            }
-
-                            Int32 v = (Int32)prop;
-                            if (v < 0 || v > (UInt32)Base.kNumPosStatesBitsEncodingMax)
-                            {
-                                throw new InvalidParamException();
-                            }
-
-                            _posStateBits = v;
-                            _posStateMask = (((UInt32)1) << _posStateBits) - 1;
-                            break;
-                        }
-                    case CoderPropID.LitPosBits:
-                        {
-                            if (!(prop is Int32))
-                            {
-                                throw new InvalidParamException();
-                            }
-
-                            Int32 v = (Int32)prop;
-                            if (v < 0 || v > Base.kNumLitPosStatesBitsEncodingMax)
-                            {
-                                throw new InvalidParamException();
-                            }
-
-                            _numLiteralPosStateBits = v;
-                            break;
-                        }
-                    case CoderPropID.LitContextBits:
-                        {
-                            if (!(prop is Int32))
-                            {
-                                throw new InvalidParamException();
-                            }
-
-                            Int32 v = (Int32)prop;
-                            if (v < 0 || v > Base.kNumLitContextBitsMax)
-                            {
-                                throw new InvalidParamException();
-                            }
-                            _numLiteralContextBits = v;
-                            break;
-                        }
-                    case CoderPropID.EndMarker:
-                        {
-                            if (!(prop is Boolean))
-                            {
-                                throw new InvalidParamException();
-                            }
-
-                            SetWriteEndMarkerMode((Boolean)prop);
-                            break;
-                        }
-                    default:
-                        throw new InvalidParamException();
-                }
-            }
-        }
-
-        private uint _trainSize = 0;
-        public void SetTrainSize(uint trainSize)
-        {
-            _trainSize = trainSize;
-        }
-    }
-}
+// LzmaEncoder.cs
+
+using System;
+
+namespace SevenZip.Compression.LZMA
+{
+    using RangeCoder;
+    using System.Threading;
+
+    public class Encoder : ICoder, ISetCoderProperties, IWriteCoderProperties
+    {
+        private enum EMatchFinderType
+        {
+            BT2,
+            BT4,
+        };
+
+        private const UInt32 kIfinityPrice = 0xFFFFFFF;
+
+        private static readonly Byte[] g_FastPos = new Byte[1 << 11];
+
+        static Encoder()
+        {
+            const Byte kFastSlots = 22;
+            int c = 2;
+            g_FastPos[0] = 0;
+            g_FastPos[1] = 1;
+            for (Byte slotFast = 2; slotFast < kFastSlots; slotFast++)
+            {
+                UInt32 k = (UInt32)1 << ((slotFast >> 1) - 1);
+                for (UInt32 j = 0; j < k; j++, c++)
+                {
+                    g_FastPos[c] = slotFast;
+                }
+            }
+        }
+
+        private static UInt32 GetPosSlot(UInt32 pos)
+        {
+            if (pos < (1 << 11))
+            {
+                return g_FastPos[pos];
+            }
+
+            if (pos < (1 << 21))
+            {
+                return (UInt32)(g_FastPos[pos >> 10] + 20);
+            }
+
+            return (UInt32)(g_FastPos[pos >> 20] + 40);
+        }
+
+        private static UInt32 GetPosSlot2(UInt32 pos)
+        {
+            if (pos < (1 << 17))
+            {
+                return (UInt32)(g_FastPos[pos >> 6] + 12);
+            }
+
+            if (pos < (1 << 27))
+            {
+                return (UInt32)(g_FastPos[pos >> 16] + 32);
+            }
+
+            return (UInt32)(g_FastPos[pos >> 26] + 52);
+        }
+
+        private Base.State _state = new();
+        private Byte _previousByte;
+        private readonly UInt32[] _repDistances = new UInt32[Base.kNumRepDistances];
+
+        private void BaseInit()
+        {
+            _state.Init();
+            _previousByte = 0;
+            for (UInt32 i = 0; i < Base.kNumRepDistances; i++)
+            {
+                _repDistances[i] = 0;
+            }
+        }
+
+        private const int kDefaultDictionaryLogSize = 22;
+        private const UInt32 kNumFastBytesDefault = 0x20;
+
+        private class LiteralEncoder
+        {
+            public struct Encoder2
+            {
+                private BitEncoder[] m_Encoders;
+
+                public void Create() { m_Encoders = new BitEncoder[0x300]; }
+
+                public void Init() { for (int i = 0; i < 0x300; i++)
+                    {
+                        m_Encoders[i].Init();
+                    }
+                }
+
+                public void Encode(RangeCoder.Encoder rangeEncoder, byte symbol)
+                {
+                    uint context = 1;
+                    for (int i = 7; i >= 0; i--)
+                    {
+                        uint bit = (uint)((symbol >> i) & 1);
+                        m_Encoders[context].Encode(rangeEncoder, bit);
+                        context = (context << 1) | bit;
+                    }
+                }
+
+                public void EncodeMatched(RangeCoder.Encoder rangeEncoder, byte matchByte, byte symbol)
+                {
+                    uint context = 1;
+                    bool same = true;
+                    for (int i = 7; i >= 0; i--)
+                    {
+                        uint bit = (uint)((symbol >> i) & 1);
+                        uint state = context;
+                        if (same)
+                        {
+                            uint matchBit = (uint)((matchByte >> i) & 1);
+                            state += (1 + matchBit) << 8;
+                            same = matchBit == bit;
+                        }
+                        m_Encoders[state].Encode(rangeEncoder, bit);
+                        context = (context << 1) | bit;
+                    }
+                }
+
+                public uint GetPrice(bool matchMode, byte matchByte, byte symbol)
+                {
+                    uint price = 0;
+                    uint context = 1;
+                    int i = 7;
+                    if (matchMode)
+                    {
+                        for (; i >= 0; i--)
+                        {
+                            uint matchBit = (uint)(matchByte >> i) & 1;
+                            uint bit = (uint)(symbol >> i) & 1;
+                            price += m_Encoders[((1 + matchBit) << 8) + context].GetPrice(bit);
+                            context = (context << 1) | bit;
+                            if (matchBit != bit)
+                            {
+                                i--;
+                                break;
+                            }
+                        }
+                    }
+                    for (; i >= 0; i--)
+                    {
+                        uint bit = (uint)(symbol >> i) & 1;
+                        price += m_Encoders[context].GetPrice(bit);
+                        context = (context << 1) | bit;
+                    }
+                    return price;
+                }
+            }
+
+            private Encoder2[] m_Coders;
+            private int m_NumPrevBits;
+            private int m_NumPosBits;
+            private uint m_PosMask;
+
+            public void Create(int numPosBits, int numPrevBits)
+            {
+                if (m_Coders != null && m_NumPrevBits == numPrevBits && m_NumPosBits == numPosBits)
+                {
+                    return;
+                }
+
+                m_NumPosBits = numPosBits;
+                m_PosMask = ((uint)1 << numPosBits) - 1;
+                m_NumPrevBits = numPrevBits;
+                uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits);
+                m_Coders = new Encoder2[numStates];
+                for (uint i = 0; i < numStates; i++)
+                {
+                    m_Coders[i].Create();
+                }
+            }
+
+            public void Init()
+            {
+                uint numStates = (uint)1 << (m_NumPrevBits + m_NumPosBits);
+                for (uint i = 0; i < numStates; i++)
+                {
+                    m_Coders[i].Init();
+                }
+            }
+
+            public Encoder2 GetSubCoder(UInt32 pos, Byte prevByte)
+            { return m_Coders[((pos & m_PosMask) << m_NumPrevBits) + (uint)(prevByte >> (8 - m_NumPrevBits))]; }
+        }
+
+        private class LenEncoder
+        {
+            private BitEncoder _choice = new();
+            private BitEncoder _choice2 = new();
+            private readonly BitTreeEncoder[] _lowCoder = new BitTreeEncoder[Base.kNumPosStatesEncodingMax];
+            private readonly BitTreeEncoder[] _midCoder = new BitTreeEncoder[Base.kNumPosStatesEncodingMax];
+            private readonly BitTreeEncoder _highCoder = new(Base.kNumHighLenBits);
+
+            public LenEncoder()
+            {
+                for (UInt32 posState = 0; posState < Base.kNumPosStatesEncodingMax; posState++)
+                {
+                    _lowCoder[posState] = new BitTreeEncoder(Base.kNumLowLenBits);
+                    _midCoder[posState] = new BitTreeEncoder(Base.kNumMidLenBits);
+                }
+            }
+
+            public void Init(UInt32 numPosStates)
+            {
+                _choice.Init();
+                _choice2.Init();
+                for (UInt32 posState = 0; posState < numPosStates; posState++)
+                {
+                    _lowCoder[posState].Init();
+                    _midCoder[posState].Init();
+                }
+                _highCoder.Init();
+            }
+
+            public void Encode(RangeCoder.Encoder rangeEncoder, UInt32 symbol, UInt32 posState)
+            {
+                if (symbol < Base.kNumLowLenSymbols)
+                {
+                    _choice.Encode(rangeEncoder, 0);
+                    _lowCoder[posState].Encode(rangeEncoder, symbol);
+                }
+                else
+                {
+                    symbol -= Base.kNumLowLenSymbols;
+                    _choice.Encode(rangeEncoder, 1);
+                    if (symbol < Base.kNumMidLenSymbols)
+                    {
+                        _choice2.Encode(rangeEncoder, 0);
+                        _midCoder[posState].Encode(rangeEncoder, symbol);
+                    }
+                    else
+                    {
+                        _choice2.Encode(rangeEncoder, 1);
+                        _highCoder.Encode(rangeEncoder, symbol - Base.kNumMidLenSymbols);
+                    }
+                }
+            }
+
+            public void SetPrices(UInt32 posState, UInt32 numSymbols, UInt32[] prices, UInt32 st)
+            {
+                UInt32 a0 = _choice.GetPrice0();
+                UInt32 a1 = _choice.GetPrice1();
+                UInt32 b0 = a1 + _choice2.GetPrice0();
+                UInt32 b1 = a1 + _choice2.GetPrice1();
+                UInt32 i = 0;
+                for (i = 0; i < Base.kNumLowLenSymbols; i++)
+                {
+                    if (i >= numSymbols)
+                    {
+                        return;
+                    }
+
+                    prices[st + i] = a0 + _lowCoder[posState].GetPrice(i);
+                }
+                for (; i < Base.kNumLowLenSymbols + Base.kNumMidLenSymbols; i++)
+                {
+                    if (i >= numSymbols)
+                    {
+                        return;
+                    }
+
+                    prices[st + i] = b0 + _midCoder[posState].GetPrice(i - Base.kNumLowLenSymbols);
+                }
+                for (; i < numSymbols; i++)
+                {
+                    prices[st + i] = b1 + _highCoder.GetPrice(i - Base.kNumLowLenSymbols - Base.kNumMidLenSymbols);
+                }
+            }
+        };
+
+        private const UInt32 kNumLenSpecSymbols = Base.kNumLowLenSymbols + Base.kNumMidLenSymbols;
+
+        private class LenPriceTableEncoder : LenEncoder
+        {
+            private readonly UInt32[] _prices = new UInt32[Base.kNumLenSymbols << Base.kNumPosStatesBitsEncodingMax];
+            private UInt32 _tableSize;
+            private readonly UInt32[] _counters = new UInt32[Base.kNumPosStatesEncodingMax];
+
+            public void SetTableSize(UInt32 tableSize) { _tableSize = tableSize; }
+
+            public UInt32 GetPrice(UInt32 symbol, UInt32 posState)
+            {
+                return _prices[(posState * Base.kNumLenSymbols) + symbol];
+            }
+
+            private void UpdateTable(UInt32 posState)
+            {
+                SetPrices(posState, _tableSize, _prices, posState * Base.kNumLenSymbols);
+                _counters[posState] = _tableSize;
+            }
+
+            public void UpdateTables(UInt32 numPosStates)
+            {
+                for (UInt32 posState = 0; posState < numPosStates; posState++)
+                {
+                    UpdateTable(posState);
+                }
+            }
+
+            public new void Encode(RangeCoder.Encoder rangeEncoder, UInt32 symbol, UInt32 posState)
+            {
+                base.Encode(rangeEncoder, symbol, posState);
+                if (--_counters[posState] == 0)
+                {
+                    UpdateTable(posState);
+                }
+            }
+        }
+
+        private const UInt32 kNumOpts = 1 << 12;
+        private class Optimal
+        {
+            public Base.State State;
+
+            public bool Prev1IsChar;
+            public bool Prev2;
+
+            public UInt32 PosPrev2;
+            public UInt32 BackPrev2;
+
+            public UInt32 Price;
+            public UInt32 PosPrev;
+            public UInt32 BackPrev;
+
+            public UInt32 Backs0;
+            public UInt32 Backs1;
+            public UInt32 Backs2;
+            public UInt32 Backs3;
+
+            public void MakeAsChar() { BackPrev = 0xFFFFFFFF; Prev1IsChar = false; }
+            public void MakeAsShortRep() { BackPrev = 0;  Prev1IsChar = false; }
+            public bool IsShortRep() { return BackPrev == 0; }
+        };
+        private readonly Optimal[] _optimum = new Optimal[kNumOpts];
+        private LZ.IMatchFinder _matchFinder = null;
+        private readonly RangeCoder.Encoder _rangeEncoder = new();
+
+        private readonly BitEncoder[] _isMatch = new BitEncoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
+        private readonly BitEncoder[] _isRep = new BitEncoder[Base.kNumStates];
+        private readonly BitEncoder[] _isRepG0 = new BitEncoder[Base.kNumStates];
+        private readonly BitEncoder[] _isRepG1 = new BitEncoder[Base.kNumStates];
+        private readonly BitEncoder[] _isRepG2 = new BitEncoder[Base.kNumStates];
+        private readonly BitEncoder[] _isRep0Long = new BitEncoder[Base.kNumStates << Base.kNumPosStatesBitsMax];
+
+        private readonly BitTreeEncoder[] _posSlotEncoder = new BitTreeEncoder[Base.kNumLenToPosStates];
+
+        private readonly BitEncoder[] _posEncoders = new BitEncoder[Base.kNumFullDistances - Base.kEndPosModelIndex];
+        private readonly BitTreeEncoder _posAlignEncoder = new(Base.kNumAlignBits);
+
+        private readonly LenPriceTableEncoder _lenEncoder = new();
+        private readonly LenPriceTableEncoder _repMatchLenEncoder = new();
+
+        private readonly LiteralEncoder _literalEncoder = new();
+
+        private readonly UInt32[] _matchDistances = new UInt32[(Base.kMatchMaxLen * 2) + 2];
+
+        private UInt32 _numFastBytes = kNumFastBytesDefault;
+        private UInt32 _longestMatchLength;
+        private UInt32 _numDistancePairs;
+
+        private UInt32 _additionalOffset;
+
+        private UInt32 _optimumEndIndex;
+        private UInt32 _optimumCurrentIndex;
+
+        private bool _longestMatchWasFound;
+
+        private readonly UInt32[] _posSlotPrices = new UInt32[1 << (Base.kNumPosSlotBits + Base.kNumLenToPosStatesBits)];
+        private readonly UInt32[] _distancesPrices = new UInt32[Base.kNumFullDistances << Base.kNumLenToPosStatesBits];
+        private readonly UInt32[] _alignPrices = new UInt32[Base.kAlignTableSize];
+        private UInt32 _alignPriceCount;
+
+        private UInt32 _distTableSize = kDefaultDictionaryLogSize * 2;
+
+        private int _posStateBits = 2;
+        private UInt32 _posStateMask = 4 - 1;
+        private int _numLiteralPosStateBits = 0;
+        private int _numLiteralContextBits = 3;
+
+        private UInt32 _dictionarySize = 1 << kDefaultDictionaryLogSize;
+        private UInt32 _dictionarySizePrev = 0xFFFFFFFF;
+        private UInt32 _numFastBytesPrev = 0xFFFFFFFF;
+
+        private Int64 nowPos64;
+        private bool _finished;
+        private System.IO.Stream _inStream;
+
+        private EMatchFinderType _matchFinderType = EMatchFinderType.BT4;
+        private bool _writeEndMark = false;
+
+        private bool _needReleaseMFStream;
+
+        private void Create()
+        {
+            if (_matchFinder == null)
+            {
+                LZ.BinTree bt = new();
+                int numHashBytes = 4;
+                if (_matchFinderType == EMatchFinderType.BT2)
+                {
+                    numHashBytes = 2;
+                }
+
+                bt.SetType(numHashBytes);
+                _matchFinder = bt;
+            }
+            _literalEncoder.Create(_numLiteralPosStateBits, _numLiteralContextBits);
+
+            if (_dictionarySize == _dictionarySizePrev && _numFastBytesPrev == _numFastBytes)
+            {
+                return;
+            }
+
+            _matchFinder.Create(_dictionarySize, kNumOpts, _numFastBytes, Base.kMatchMaxLen + 1);
+            _dictionarySizePrev = _dictionarySize;
+            _numFastBytesPrev = _numFastBytes;
+        }
+
+        public Encoder()
+        {
+            for (int i = 0; i < kNumOpts; i++)
+            {
+                _optimum[i] = new Optimal();
+            }
+
+            for (int i = 0; i < Base.kNumLenToPosStates; i++)
+            {
+                _posSlotEncoder[i] = new BitTreeEncoder(Base.kNumPosSlotBits);
+            }
+        }
+
+        private void SetWriteEndMarkerMode(bool writeEndMarker)
+        {
+            _writeEndMark = writeEndMarker;
+        }
+
+        private void Init()
+        {
+            BaseInit();
+            _rangeEncoder.Init();
+
+            uint i;
+            for (i = 0; i < Base.kNumStates; i++)
+            {
+                for (uint j = 0; j <= _posStateMask; j++)
+                {
+                    uint complexState = (i << Base.kNumPosStatesBitsMax) + j;
+                    _isMatch[complexState].Init();
+                    _isRep0Long[complexState].Init();
+                }
+                _isRep[i].Init();
+                _isRepG0[i].Init();
+                _isRepG1[i].Init();
+                _isRepG2[i].Init();
+            }
+            _literalEncoder.Init();
+            for (i = 0; i < Base.kNumLenToPosStates; i++)
+            {
+                _posSlotEncoder[i].Init();
+            }
+
+            for (i = 0; i < Base.kNumFullDistances - Base.kEndPosModelIndex; i++)
+            {
+                _posEncoders[i].Init();
+            }
+
+            _lenEncoder.Init((UInt32)1 << _posStateBits);
+            _repMatchLenEncoder.Init((UInt32)1 << _posStateBits);
+
+            _posAlignEncoder.Init();
+
+            _longestMatchWasFound = false;
+            _optimumEndIndex = 0;
+            _optimumCurrentIndex = 0;
+            _additionalOffset = 0;
+        }
+
+        private void ReadMatchDistances(out UInt32 lenRes, out UInt32 numDistancePairs)
+        {
+            lenRes = 0;
+            numDistancePairs = _matchFinder.GetMatches(_matchDistances);
+            if (numDistancePairs > 0)
+            {
+                lenRes = _matchDistances[numDistancePairs - 2];
+                if (lenRes == _numFastBytes)
+                {
+                    lenRes += _matchFinder.GetMatchLen((int)lenRes - 1, _matchDistances[numDistancePairs - 1],
+                        Base.kMatchMaxLen - lenRes);
+                }
+            }
+            _additionalOffset++;
+        }
+
+        private void MovePos(UInt32 num)
+        {
+            if (num > 0)
+            {
+                _matchFinder.Skip(num);
+                _additionalOffset += num;
+            }
+        }
+
+        private UInt32 GetRepLen1Price(Base.State state, UInt32 posState)
+        {
+            return _isRepG0[state.Index].GetPrice0() +
+                    _isRep0Long[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice0();
+        }
+
+        private UInt32 GetPureRepPrice(UInt32 repIndex, Base.State state, UInt32 posState)
+        {
+            UInt32 price;
+            if (repIndex == 0)
+            {
+                price = _isRepG0[state.Index].GetPrice0();
+                price += _isRep0Long[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice1();
+            }
+            else
+            {
+                price = _isRepG0[state.Index].GetPrice1();
+                if (repIndex == 1)
+                {
+                    price += _isRepG1[state.Index].GetPrice0();
+                }
+                else
+                {
+                    price += _isRepG1[state.Index].GetPrice1();
+                    price += _isRepG2[state.Index].GetPrice(repIndex - 2);
+                }
+            }
+            return price;
+        }
+
+        private UInt32 GetRepPrice(UInt32 repIndex, UInt32 len, Base.State state, UInt32 posState)
+        {
+            UInt32 price = _repMatchLenEncoder.GetPrice(len - Base.kMatchMinLen, posState);
+            return price + GetPureRepPrice(repIndex, state, posState);
+        }
+
+        private UInt32 GetPosLenPrice(UInt32 pos, UInt32 len, UInt32 posState)
+        {
+            UInt32 price;
+            UInt32 lenToPosState = Base.GetLenToPosState(len);
+            price = pos < Base.kNumFullDistances
+                ? _distancesPrices[(lenToPosState * Base.kNumFullDistances) + pos]
+                : _posSlotPrices[(lenToPosState << Base.kNumPosSlotBits) + GetPosSlot2(pos)] +
+                   _alignPrices[pos & Base.kAlignMask];
+
+            return price + _lenEncoder.GetPrice(len - Base.kMatchMinLen, posState);
+        }
+
+        private UInt32 Backward(out UInt32 backRes, UInt32 cur)
+        {
+            _optimumEndIndex = cur;
+            UInt32 posMem = _optimum[cur].PosPrev;
+            UInt32 backMem = _optimum[cur].BackPrev;
+            do
+            {
+                if (_optimum[cur].Prev1IsChar)
+                {
+                    _optimum[posMem].MakeAsChar();
+                    _optimum[posMem].PosPrev = posMem - 1;
+                    if (_optimum[cur].Prev2)
+                    {
+                        _optimum[posMem - 1].Prev1IsChar = false;
+                        _optimum[posMem - 1].PosPrev = _optimum[cur].PosPrev2;
+                        _optimum[posMem - 1].BackPrev = _optimum[cur].BackPrev2;
+                    }
+                }
+                UInt32 posPrev = posMem;
+                UInt32 backCur = backMem;
+
+                backMem = _optimum[posPrev].BackPrev;
+                posMem = _optimum[posPrev].PosPrev;
+
+                _optimum[posPrev].BackPrev = backCur;
+                _optimum[posPrev].PosPrev = cur;
+                cur = posPrev;
+            }
+            while (cur > 0);
+            backRes = _optimum[0].BackPrev;
+            _optimumCurrentIndex = _optimum[0].PosPrev;
+            return _optimumCurrentIndex;
+        }
+
+        private readonly UInt32[] reps = new UInt32[Base.kNumRepDistances];
+        private readonly UInt32[] repLens = new UInt32[Base.kNumRepDistances];
+
+        private UInt32 GetOptimum(UInt32 position, out UInt32 backRes)
+        {
+            if (_optimumEndIndex != _optimumCurrentIndex)
+            {
+                UInt32 lenRes = _optimum[_optimumCurrentIndex].PosPrev - _optimumCurrentIndex;
+                backRes = _optimum[_optimumCurrentIndex].BackPrev;
+                _optimumCurrentIndex = _optimum[_optimumCurrentIndex].PosPrev;
+                return lenRes;
+            }
+            _optimumCurrentIndex = _optimumEndIndex = 0;
+
+            UInt32 lenMain, numDistancePairs;
+            if (!_longestMatchWasFound)
+            {
+                ReadMatchDistances(out lenMain, out numDistancePairs);
+            }
+            else
+            {
+                lenMain = _longestMatchLength;
+                numDistancePairs = _numDistancePairs;
+                _longestMatchWasFound = false;
+            }
+
+            UInt32 numAvailableBytes = _matchFinder.GetNumAvailableBytes() + 1;
+            if (numAvailableBytes < 2)
+            {
+                backRes = 0xFFFFFFFF;
+                return 1;
+            }
+            if (numAvailableBytes > Base.kMatchMaxLen)
+            {
+                numAvailableBytes = Base.kMatchMaxLen;
+            }
+
+            UInt32 repMaxIndex = 0;
+            UInt32 i;
+            for (i = 0; i < Base.kNumRepDistances; i++)
+            {
+                reps[i] = _repDistances[i];
+                repLens[i] = _matchFinder.GetMatchLen(0 - 1, reps[i], Base.kMatchMaxLen);
+                if (repLens[i] > repLens[repMaxIndex])
+                {
+                    repMaxIndex = i;
+                }
+            }
+            if (repLens[repMaxIndex] >= _numFastBytes)
+            {
+                backRes = repMaxIndex;
+                UInt32 lenRes = repLens[repMaxIndex];
+                MovePos(lenRes - 1);
+                return lenRes;
+            }
+
+            if (lenMain >= _numFastBytes)
+            {
+                backRes = _matchDistances[numDistancePairs - 1] + Base.kNumRepDistances;
+                MovePos(lenMain - 1);
+                return lenMain;
+            }
+
+            Byte currentByte = _matchFinder.GetIndexByte(0 - 1);
+            Byte matchByte = _matchFinder.GetIndexByte((Int32)(0 - _repDistances[0] - 1 - 1));
+
+            if (lenMain < 2 && currentByte != matchByte && repLens[repMaxIndex] < 2)
+            {
+                backRes = 0xFFFFFFFF;
+                return 1;
+            }
+
+            _optimum[0].State = _state;
+
+            UInt32 posState = position & _posStateMask;
+
+            _optimum[1].Price = _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice0() +
+                    _literalEncoder.GetSubCoder(position, _previousByte).GetPrice(!_state.IsCharState(), matchByte, currentByte);
+            _optimum[1].MakeAsChar();
+
+            UInt32 matchPrice = _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice1();
+            UInt32 repMatchPrice = matchPrice + _isRep[_state.Index].GetPrice1();
+
+            if (matchByte == currentByte)
+            {
+                UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(_state, posState);
+                if (shortRepPrice < _optimum[1].Price)
+                {
+                    _optimum[1].Price = shortRepPrice;
+                    _optimum[1].MakeAsShortRep();
+                }
+            }
+
+            UInt32 lenEnd = (lenMain >= repLens[repMaxIndex]) ? lenMain : repLens[repMaxIndex];
+
+            if (lenEnd < 2)
+            {
+                backRes = _optimum[1].BackPrev;
+                return 1;
+            }
+
+            _optimum[1].PosPrev = 0;
+
+            _optimum[0].Backs0 = reps[0];
+            _optimum[0].Backs1 = reps[1];
+            _optimum[0].Backs2 = reps[2];
+            _optimum[0].Backs3 = reps[3];
+
+            UInt32 len = lenEnd;
+            do
+            {
+                _optimum[len--].Price = kIfinityPrice;
+            }
+            while (len >= 2);
+
+            for (i = 0; i < Base.kNumRepDistances; i++)
+            {
+                UInt32 repLen = repLens[i];
+                if (repLen < 2)
+                {
+                    continue;
+                }
+
+                UInt32 price = repMatchPrice + GetPureRepPrice(i, _state, posState);
+                do
+                {
+                    UInt32 curAndLenPrice = price + _repMatchLenEncoder.GetPrice(repLen - 2, posState);
+                    Optimal optimum = _optimum[repLen];
+                    if (curAndLenPrice < optimum.Price)
+                    {
+                        optimum.Price = curAndLenPrice;
+                        optimum.PosPrev = 0;
+                        optimum.BackPrev = i;
+                        optimum.Prev1IsChar = false;
+                    }
+                }
+                while (--repLen >= 2);
+            }
+
+            UInt32 normalMatchPrice = matchPrice + _isRep[_state.Index].GetPrice0();
+
+            len = (repLens[0] >= 2) ? repLens[0] + 1 : 2;
+            if (len <= lenMain)
+            {
+                UInt32 offs = 0;
+                while (len > _matchDistances[offs])
+                {
+                    offs += 2;
+                }
+
+                for (; ; len++)
+                {
+                    UInt32 distance = _matchDistances[offs + 1];
+                    UInt32 curAndLenPrice = normalMatchPrice + GetPosLenPrice(distance, len, posState);
+                    Optimal optimum = _optimum[len];
+                    if (curAndLenPrice < optimum.Price)
+                    {
+                        optimum.Price = curAndLenPrice;
+                        optimum.PosPrev = 0;
+                        optimum.BackPrev = distance + Base.kNumRepDistances;
+                        optimum.Prev1IsChar = false;
+                    }
+                    if (len == _matchDistances[offs])
+                    {
+                        offs += 2;
+                        if (offs == numDistancePairs)
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+
+            UInt32 cur = 0;
+
+            while (true)
+            {
+                cur++;
+                if (cur == lenEnd)
+                {
+                    return Backward(out backRes, cur);
+                }
+
+                ReadMatchDistances(out uint newLen, out numDistancePairs);
+                if (newLen >= _numFastBytes)
+                {
+                    _numDistancePairs = numDistancePairs;
+                    _longestMatchLength = newLen;
+                    _longestMatchWasFound = true;
+                    return Backward(out backRes, cur);
+                }
+                position++;
+                UInt32 posPrev = _optimum[cur].PosPrev;
+                Base.State state;
+                if (_optimum[cur].Prev1IsChar)
+                {
+                    posPrev--;
+                    if (_optimum[cur].Prev2)
+                    {
+                        state = _optimum[_optimum[cur].PosPrev2].State;
+                        if (_optimum[cur].BackPrev2 < Base.kNumRepDistances)
+                        {
+                            state.UpdateRep();
+                        }
+                        else
+                        {
+                            state.UpdateMatch();
+                        }
+                    }
+                    else
+                    {
+                        state = _optimum[posPrev].State;
+                    }
+
+                    state.UpdateChar();
+                }
+                else
+                {
+                    state = _optimum[posPrev].State;
+                }
+
+                if (posPrev == cur - 1)
+                {
+                    if (_optimum[cur].IsShortRep())
+                    {
+                        state.UpdateShortRep();
+                    }
+                    else
+                    {
+                        state.UpdateChar();
+                    }
+                }
+                else
+                {
+                    UInt32 pos;
+                    if (_optimum[cur].Prev1IsChar && _optimum[cur].Prev2)
+                    {
+                        posPrev = _optimum[cur].PosPrev2;
+                        pos = _optimum[cur].BackPrev2;
+                        state.UpdateRep();
+                    }
+                    else
+                    {
+                        pos = _optimum[cur].BackPrev;
+                        if (pos < Base.kNumRepDistances)
+                        {
+                            state.UpdateRep();
+                        }
+                        else
+                        {
+                            state.UpdateMatch();
+                        }
+                    }
+                    Optimal opt = _optimum[posPrev];
+                    if (pos < Base.kNumRepDistances)
+                    {
+                        if (pos == 0)
+                        {
+                            reps[0] = opt.Backs0;
+                            reps[1] = opt.Backs1;
+                            reps[2] = opt.Backs2;
+                            reps[3] = opt.Backs3;
+                        }
+                        else if (pos == 1)
+                        {
+                            reps[0] = opt.Backs1;
+                            reps[1] = opt.Backs0;
+                            reps[2] = opt.Backs2;
+                            reps[3] = opt.Backs3;
+                        }
+                        else if (pos == 2)
+                        {
+                            reps[0] = opt.Backs2;
+                            reps[1] = opt.Backs0;
+                            reps[2] = opt.Backs1;
+                            reps[3] = opt.Backs3;
+                        }
+                        else
+                        {
+                            reps[0] = opt.Backs3;
+                            reps[1] = opt.Backs0;
+                            reps[2] = opt.Backs1;
+                            reps[3] = opt.Backs2;
+                        }
+                    }
+                    else
+                    {
+                        reps[0] = pos - Base.kNumRepDistances;
+                        reps[1] = opt.Backs0;
+                        reps[2] = opt.Backs1;
+                        reps[3] = opt.Backs2;
+                    }
+                }
+                _optimum[cur].State = state;
+                _optimum[cur].Backs0 = reps[0];
+                _optimum[cur].Backs1 = reps[1];
+                _optimum[cur].Backs2 = reps[2];
+                _optimum[cur].Backs3 = reps[3];
+                UInt32 curPrice = _optimum[cur].Price;
+
+                currentByte = _matchFinder.GetIndexByte(0 - 1);
+                matchByte = _matchFinder.GetIndexByte((Int32)(0 - reps[0] - 1 - 1));
+
+                posState = position & _posStateMask;
+
+                UInt32 curAnd1Price = curPrice +
+                    _isMatch[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice0() +
+                    _literalEncoder.GetSubCoder(position, _matchFinder.GetIndexByte(0 - 2)).
+                    GetPrice(!state.IsCharState(), matchByte, currentByte);
+
+                Optimal nextOptimum = _optimum[cur + 1];
+
+                bool nextIsChar = false;
+                if (curAnd1Price < nextOptimum.Price)
+                {
+                    nextOptimum.Price = curAnd1Price;
+                    nextOptimum.PosPrev = cur;
+                    nextOptimum.MakeAsChar();
+                    nextIsChar = true;
+                }
+
+                matchPrice = curPrice + _isMatch[(state.Index << Base.kNumPosStatesBitsMax) + posState].GetPrice1();
+                repMatchPrice = matchPrice + _isRep[state.Index].GetPrice1();
+
+                if (matchByte == currentByte &&
+                    !(nextOptimum.PosPrev < cur && nextOptimum.BackPrev == 0))
+                {
+                    UInt32 shortRepPrice = repMatchPrice + GetRepLen1Price(state, posState);
+                    if (shortRepPrice <= nextOptimum.Price)
+                    {
+                        nextOptimum.Price = shortRepPrice;
+                        nextOptimum.PosPrev = cur;
+                        nextOptimum.MakeAsShortRep();
+                        nextIsChar = true;
+                    }
+                }
+
+                UInt32 numAvailableBytesFull = _matchFinder.GetNumAvailableBytes() + 1;
+                numAvailableBytesFull = Math.Min(kNumOpts - 1 - cur, numAvailableBytesFull);
+                numAvailableBytes = numAvailableBytesFull;
+
+                if (numAvailableBytes < 2)
+                {
+                    continue;
+                }
+
+                if (numAvailableBytes > _numFastBytes)
+                {
+                    numAvailableBytes = _numFastBytes;
+                }
+
+                if (!nextIsChar && matchByte != currentByte)
+                {
+                    // try Literal + rep0
+                    UInt32 t = Math.Min(numAvailableBytesFull - 1, _numFastBytes);
+                    UInt32 lenTest2 = _matchFinder.GetMatchLen(0, reps[0], t);
+                    if (lenTest2 >= 2)
+                    {
+                        Base.State state2 = state;
+                        state2.UpdateChar();
+                        UInt32 posStateNext = (position + 1) & _posStateMask;
+                        UInt32 nextRepMatchPrice = curAnd1Price +
+                            _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice1() +
+                            _isRep[state2.Index].GetPrice1();
+                        {
+                            UInt32 offset = cur + 1 + lenTest2;
+                            while (lenEnd < offset)
+                            {
+                                _optimum[++lenEnd].Price = kIfinityPrice;
+                            }
+
+                            UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice(
+                                0, lenTest2, state2, posStateNext);
+                            Optimal optimum = _optimum[offset];
+                            if (curAndLenPrice < optimum.Price)
+                            {
+                                optimum.Price = curAndLenPrice;
+                                optimum.PosPrev = cur + 1;
+                                optimum.BackPrev = 0;
+                                optimum.Prev1IsChar = true;
+                                optimum.Prev2 = false;
+                            }
+                        }
+                    }
+                }
+
+                UInt32 startLen = 2; // speed optimization 
+
+                for (UInt32 repIndex = 0; repIndex < Base.kNumRepDistances; repIndex++)
+                {
+                    UInt32 lenTest = _matchFinder.GetMatchLen(0 - 1, reps[repIndex], numAvailableBytes);
+                    if (lenTest < 2)
+                    {
+                        continue;
+                    }
+
+                    UInt32 lenTestTemp = lenTest;
+                    do
+                    {
+                        while (lenEnd < cur + lenTest)
+                        {
+                            _optimum[++lenEnd].Price = kIfinityPrice;
+                        }
+
+                        UInt32 curAndLenPrice = repMatchPrice + GetRepPrice(repIndex, lenTest, state, posState);
+                        Optimal optimum = _optimum[cur + lenTest];
+                        if (curAndLenPrice < optimum.Price)
+                        {
+                            optimum.Price = curAndLenPrice;
+                            optimum.PosPrev = cur;
+                            optimum.BackPrev = repIndex;
+                            optimum.Prev1IsChar = false;
+                        }
+                    }
+                    while (--lenTest >= 2);
+                    lenTest = lenTestTemp;
+
+                    if (repIndex == 0)
+                    {
+                        startLen = lenTest + 1;
+                    }
+
+                    // if (_maxMode)
+                    if (lenTest < numAvailableBytesFull)
+                    {
+                        UInt32 t = Math.Min(numAvailableBytesFull - 1 - lenTest, _numFastBytes);
+                        UInt32 lenTest2 = _matchFinder.GetMatchLen((Int32)lenTest, reps[repIndex], t);
+                        if (lenTest2 >= 2)
+                        {
+                            Base.State state2 = state;
+                            state2.UpdateRep();
+                            UInt32 posStateNext = (position + lenTest) & _posStateMask;
+                            UInt32 curAndLenCharPrice =
+                                    repMatchPrice + GetRepPrice(repIndex, lenTest, state, posState) +
+                                    _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice0() +
+                                    _literalEncoder.GetSubCoder(position + lenTest,
+                                    _matchFinder.GetIndexByte((Int32)lenTest - 1 - 1)).GetPrice(true,
+                                    _matchFinder.GetIndexByte((Int32)lenTest - 1 - (Int32)(reps[repIndex] + 1)),
+                                    _matchFinder.GetIndexByte((Int32)lenTest - 1));
+                            state2.UpdateChar();
+                            posStateNext = (position + lenTest + 1) & _posStateMask;
+                            UInt32 nextMatchPrice = curAndLenCharPrice + _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice1();
+                            UInt32 nextRepMatchPrice = nextMatchPrice + _isRep[state2.Index].GetPrice1();
+
+                            // for(; lenTest2 >= 2; lenTest2--)
+                            {
+                                UInt32 offset = lenTest + 1 + lenTest2;
+                                while (lenEnd < cur + offset)
+                                {
+                                    _optimum[++lenEnd].Price = kIfinityPrice;
+                                }
+
+                                UInt32 curAndLenPrice = nextRepMatchPrice + GetRepPrice(0, lenTest2, state2, posStateNext);
+                                Optimal optimum = _optimum[cur + offset];
+                                if (curAndLenPrice < optimum.Price)
+                                {
+                                    optimum.Price = curAndLenPrice;
+                                    optimum.PosPrev = cur + lenTest + 1;
+                                    optimum.BackPrev = 0;
+                                    optimum.Prev1IsChar = true;
+                                    optimum.Prev2 = true;
+                                    optimum.PosPrev2 = cur;
+                                    optimum.BackPrev2 = repIndex;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (newLen > numAvailableBytes)
+                {
+                    newLen = numAvailableBytes;
+                    for (numDistancePairs = 0; newLen > _matchDistances[numDistancePairs]; numDistancePairs += 2)
+                    {
+                    }
+
+                    _matchDistances[numDistancePairs] = newLen;
+                    numDistancePairs += 2;
+                }
+                if (newLen >= startLen)
+                {
+                    normalMatchPrice = matchPrice + _isRep[state.Index].GetPrice0();
+                    while (lenEnd < cur + newLen)
+                    {
+                        _optimum[++lenEnd].Price = kIfinityPrice;
+                    }
+
+                    UInt32 offs = 0;
+                    while (startLen > _matchDistances[offs])
+                    {
+                        offs += 2;
+                    }
+
+                    for (UInt32 lenTest = startLen; ; lenTest++)
+                    {
+                        UInt32 curBack = _matchDistances[offs + 1];
+                        UInt32 curAndLenPrice = normalMatchPrice + GetPosLenPrice(curBack, lenTest, posState);
+                        Optimal optimum = _optimum[cur + lenTest];
+                        if (curAndLenPrice < optimum.Price)
+                        {
+                            optimum.Price = curAndLenPrice;
+                            optimum.PosPrev = cur;
+                            optimum.BackPrev = curBack + Base.kNumRepDistances;
+                            optimum.Prev1IsChar = false;
+                        }
+
+                        if (lenTest == _matchDistances[offs])
+                        {
+                            if (lenTest < numAvailableBytesFull)
+                            {
+                                UInt32 t = Math.Min(numAvailableBytesFull - 1 - lenTest, _numFastBytes);
+                                UInt32 lenTest2 = _matchFinder.GetMatchLen((Int32)lenTest, curBack, t);
+                                if (lenTest2 >= 2)
+                                {
+                                    Base.State state2 = state;
+                                    state2.UpdateMatch();
+                                    UInt32 posStateNext = (position + lenTest) & _posStateMask;
+                                    UInt32 curAndLenCharPrice = curAndLenPrice +
+                                        _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice0() +
+                                        _literalEncoder.GetSubCoder(position + lenTest,
+                                        _matchFinder.GetIndexByte((Int32)lenTest - 1 - 1)).
+                                        GetPrice(true,
+                                        _matchFinder.GetIndexByte((Int32)lenTest - (Int32)(curBack + 1) - 1),
+                                        _matchFinder.GetIndexByte((Int32)lenTest - 1));
+                                    state2.UpdateChar();
+                                    posStateNext = (position + lenTest + 1) & _posStateMask;
+                                    UInt32 nextMatchPrice = curAndLenCharPrice + _isMatch[(state2.Index << Base.kNumPosStatesBitsMax) + posStateNext].GetPrice1();
+                                    UInt32 nextRepMatchPrice = nextMatchPrice + _isRep[state2.Index].GetPrice1();
+
+                                    UInt32 offset = lenTest + 1 + lenTest2;
+                                    while (lenEnd < cur + offset)
+                                    {
+                                        _optimum[++lenEnd].Price = kIfinityPrice;
+                                    }
+
+                                    curAndLenPrice = nextRepMatchPrice + GetRepPrice(0, lenTest2, state2, posStateNext);
+                                    optimum = _optimum[cur + offset];
+                                    if (curAndLenPrice < optimum.Price)
+                                    {
+                                        optimum.Price = curAndLenPrice;
+                                        optimum.PosPrev = cur + lenTest + 1;
+                                        optimum.BackPrev = 0;
+                                        optimum.Prev1IsChar = true;
+                                        optimum.Prev2 = true;
+                                        optimum.PosPrev2 = cur;
+                                        optimum.BackPrev2 = curBack + Base.kNumRepDistances;
+                                    }
+                                }
+                            }
+                            offs += 2;
+                            if (offs == numDistancePairs)
+                            {
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        private bool ChangePair(UInt32 smallDist, UInt32 bigDist)
+        {
+            const int kDif = 7;
+            return smallDist < ((UInt32)1 << (32 - kDif)) && bigDist >= (smallDist << kDif);
+        }
+
+        private void WriteEndMarker(UInt32 posState)
+        {
+            if (!_writeEndMark)
+            {
+                return;
+            }
+
+            _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].Encode(_rangeEncoder, 1);
+            _isRep[_state.Index].Encode(_rangeEncoder, 0);
+            _state.UpdateMatch();
+            const UInt32 len = Base.kMatchMinLen;
+            _lenEncoder.Encode(_rangeEncoder, len - Base.kMatchMinLen, posState);
+            const UInt32 posSlot = (1 << Base.kNumPosSlotBits) - 1;
+            UInt32 lenToPosState = Base.GetLenToPosState(len);
+            _posSlotEncoder[lenToPosState].Encode(_rangeEncoder, posSlot);
+            const int footerBits = 30;
+            const UInt32 posReduced = (((UInt32)1) << footerBits) - 1;
+            _rangeEncoder.EncodeDirectBits(posReduced >> Base.kNumAlignBits, footerBits - Base.kNumAlignBits);
+            _posAlignEncoder.ReverseEncode(_rangeEncoder, posReduced & Base.kAlignMask);
+        }
+
+        private void Flush(UInt32 nowPos)
+        {
+            ReleaseMFStream();
+            WriteEndMarker(nowPos & _posStateMask);
+            _rangeEncoder.FlushData();
+            _rangeEncoder.FlushStream();
+        }
+
+        public void CodeOneBlock(out Int64 inSize, out Int64 outSize, out bool finished)
+        {
+            inSize = 0;
+            outSize = 0;
+            finished = true;
+
+            if (_inStream != null)
+            {
+                _matchFinder.SetStream(_inStream);
+                _matchFinder.Init();
+                _needReleaseMFStream = true;
+                _inStream = null;
+                if (_trainSize > 0)
+                {
+                    _matchFinder.Skip(_trainSize);
+                }
+            }
+
+            if (_finished)
+            {
+                return;
+            }
+
+            _finished = true;
+
+            Int64 progressPosValuePrev = nowPos64;
+            if (nowPos64 == 0)
+            {
+                if (_matchFinder.GetNumAvailableBytes() == 0)
+                {
+                    Flush((UInt32)nowPos64);
+                    return;
+                }
+                // it's not used
+                ReadMatchDistances(out uint len, out uint numDistancePairs);
+                UInt32 posState = (UInt32)nowPos64 & _posStateMask;
+                _isMatch[(_state.Index << Base.kNumPosStatesBitsMax) + posState].Encode(_rangeEncoder, 0);
+                _state.UpdateChar();
+                Byte curByte = _matchFinder.GetIndexByte((Int32)(0 - _additionalOffset));
+                _literalEncoder.GetSubCoder((UInt32)nowPos64, _previousByte).Encode(_rangeEncoder, curByte);
+                _previousByte = curByte;
+                _additionalOffset--;
+                nowPos64++;
+            }
+            if (_matchFinder.GetNumAvailableBytes() == 0)
+            {
+                Flush((UInt32)nowPos64);
+                return;
+            }
+            while (true)
+            {
+                UInt32 len = GetOptimum((UInt32)nowPos64, out uint pos);
+
+                UInt32 posState = ((UInt32)nowPos64) & _posStateMask;
+                UInt32 complexState = (_state.Index << Base.kNumPosStatesBitsMax) + posState;
+                if (len == 1 && pos == 0xFFFFFFFF)
+                {
+                    _isMatch[complexState].Encode(_rangeEncoder, 0);
+                    Byte curByte = _matchFinder.GetIndexByte((Int32)(0 - _additionalOffset));
+                    LiteralEncoder.Encoder2 subCoder = _literalEncoder.GetSubCoder((UInt32)nowPos64, _previousByte);
+                    if (!_state.IsCharState())
+                    {
+                        Byte matchByte = _matchFinder.GetIndexByte((Int32)(0 - _repDistances[0] - 1 - _additionalOffset));
+                        subCoder.EncodeMatched(_rangeEncoder, matchByte, curByte);
+                    }
+                    else
+                    {
+                        subCoder.Encode(_rangeEncoder, curByte);
+                    }
+
+                    _previousByte = curByte;
+                    _state.UpdateChar();
+                }
+                else
+                {
+                    _isMatch[complexState].Encode(_rangeEncoder, 1);
+                    if (pos < Base.kNumRepDistances)
+                    {
+                        _isRep[_state.Index].Encode(_rangeEncoder, 1);
+                        if (pos == 0)
+                        {
+                            _isRepG0[_state.Index].Encode(_rangeEncoder, 0);
+                            if (len == 1)
+                            {
+                                _isRep0Long[complexState].Encode(_rangeEncoder, 0);
+                            }
+                            else
+                            {
+                                _isRep0Long[complexState].Encode(_rangeEncoder, 1);
+                            }
+                        }
+                        else
+                        {
+                            _isRepG0[_state.Index].Encode(_rangeEncoder, 1);
+                            if (pos == 1)
+                            {
+                                _isRepG1[_state.Index].Encode(_rangeEncoder, 0);
+                            }
+                            else
+                            {
+                                _isRepG1[_state.Index].Encode(_rangeEncoder, 1);
+                                _isRepG2[_state.Index].Encode(_rangeEncoder, pos - 2);
+                            }
+                        }
+                        if (len == 1)
+                        {
+                            _state.UpdateShortRep();
+                        }
+                        else
+                        {
+                            _repMatchLenEncoder.Encode(_rangeEncoder, len - Base.kMatchMinLen, posState);
+                            _state.UpdateRep();
+                        }
+                        UInt32 distance = _repDistances[pos];
+                        if (pos != 0)
+                        {
+                            for (UInt32 i = pos; i >= 1; i--)
+                            {
+                                _repDistances[i] = _repDistances[i - 1];
+                            }
+
+                            _repDistances[0] = distance;
+                        }
+                    }
+                    else
+                    {
+                        _isRep[_state.Index].Encode(_rangeEncoder, 0);
+                        _state.UpdateMatch();
+                        _lenEncoder.Encode(_rangeEncoder, len - Base.kMatchMinLen, posState);
+                        pos -= Base.kNumRepDistances;
+                        UInt32 posSlot = GetPosSlot(pos);
+                        UInt32 lenToPosState = Base.GetLenToPosState(len);
+                        _posSlotEncoder[lenToPosState].Encode(_rangeEncoder, posSlot);
+
+                        if (posSlot >= Base.kStartPosModelIndex)
+                        {
+                            int footerBits = (int)((posSlot >> 1) - 1);
+                            UInt32 baseVal = (2 | (posSlot & 1)) << footerBits;
+                            UInt32 posReduced = pos - baseVal;
+
+                            if (posSlot < Base.kEndPosModelIndex)
+                            {
+                                BitTreeEncoder.ReverseEncode(_posEncoders,
+                                       baseVal - posSlot - 1, _rangeEncoder, footerBits, posReduced);
+                            }
+                            else
+                            {
+                                _rangeEncoder.EncodeDirectBits(posReduced >> Base.kNumAlignBits, footerBits - Base.kNumAlignBits);
+                                _posAlignEncoder.ReverseEncode(_rangeEncoder, posReduced & Base.kAlignMask);
+                                _alignPriceCount++;
+                            }
+                        }
+                        UInt32 distance = pos;
+                        for (UInt32 i = Base.kNumRepDistances - 1; i >= 1; i--)
+                        {
+                            _repDistances[i] = _repDistances[i - 1];
+                        }
+
+                        _repDistances[0] = distance;
+                        _matchPriceCount++;
+                    }
+                    _previousByte = _matchFinder.GetIndexByte((Int32)(len - 1 - _additionalOffset));
+                }
+                _additionalOffset -= len;
+                nowPos64 += len;
+                if (_additionalOffset == 0)
+                {
+                    // if (!_fastMode)
+                    if (_matchPriceCount >= (1 << 7))
+                    {
+                        FillDistancesPrices();
+                    }
+
+                    if (_alignPriceCount >= Base.kAlignTableSize)
+                    {
+                        FillAlignPrices();
+                    }
+
+                    inSize = nowPos64;
+                    outSize = _rangeEncoder.GetProcessedSizeAdd();
+                    if (_matchFinder.GetNumAvailableBytes() == 0)
+                    {
+                        Flush((UInt32)nowPos64);
+                        return;
+                    }
+
+                    if (nowPos64 - progressPosValuePrev >= (1 << 12))
+                    {
+                        _finished = false;
+                        finished = false;
+                        return;
+                    }
+                }
+            }
+        }
+
+        private void ReleaseMFStream()
+        {
+            if (_matchFinder != null && _needReleaseMFStream)
+            {
+                _matchFinder.ReleaseStream();
+                _needReleaseMFStream = false;
+            }
+        }
+
+        private void SetOutStream(System.IO.Stream outStream) { _rangeEncoder.SetStream(outStream); }
+        private void ReleaseOutStream() { _rangeEncoder.ReleaseStream(); }
+
+        private void ReleaseStreams()
+        {
+            ReleaseMFStream();
+            ReleaseOutStream();
+        }
+
+        private void SetStreams(System.IO.Stream inStream, System.IO.Stream outStream,
+                Int64 inSize, Int64 outSize)
+        {
+            _inStream = inStream;
+            _finished = false;
+            Create();
+            SetOutStream(outStream);
+            Init();
+
+            // if (!_fastMode)
+            {
+                FillDistancesPrices();
+                FillAlignPrices();
+            }
+
+            _lenEncoder.SetTableSize(_numFastBytes + 1 - Base.kMatchMinLen);
+            _lenEncoder.UpdateTables((UInt32)1 << _posStateBits);
+            _repMatchLenEncoder.SetTableSize(_numFastBytes + 1 - Base.kMatchMinLen);
+            _repMatchLenEncoder.UpdateTables((UInt32)1 << _posStateBits);
+
+            nowPos64 = 0;
+        }
+
+        public void Code(System.IO.Stream inStream, System.IO.Stream outStream,
+            Int64 inSize, Int64 outSize, ICodeProgress progress, CancellationToken? token = null)
+        {
+            _needReleaseMFStream = false;
+            try
+            {
+                SetStreams(inStream, outStream, inSize, outSize);
+                while (true)
+                {
+                    token?.ThrowIfCancellationRequested();
+                    CodeOneBlock(out long processedInSize, out long processedOutSize, out bool finished);
+                    if (finished)
+                    {
+                        return;
+                    }
+
+                    progress?.SetProgress(processedInSize, processedOutSize);
+                }
+            }
+            finally
+            {
+                ReleaseStreams();
+            }
+        }
+
+        private const int kPropSize = 5;
+        private readonly Byte[] properties = new Byte[kPropSize];
+
+        public void WriteCoderProperties(System.IO.Stream outStream)
+        {
+            properties[0] = (Byte)((((_posStateBits * 5) + _numLiteralPosStateBits) * 9) + _numLiteralContextBits);
+            for (int i = 0; i < 4; i++)
+            {
+                properties[1 + i] = (Byte)((_dictionarySize >> (8 * i)) & 0xFF);
+            }
+
+            outStream.Write(properties, 0, kPropSize);
+        }
+
+        private readonly UInt32[] tempPrices = new UInt32[Base.kNumFullDistances];
+        private UInt32 _matchPriceCount;
+
+        private void FillDistancesPrices()
+        {
+            for (UInt32 i = Base.kStartPosModelIndex; i < Base.kNumFullDistances; i++)
+            {
+                UInt32 posSlot = GetPosSlot(i);
+                int footerBits = (int)((posSlot >> 1) - 1);
+                UInt32 baseVal = (2 | (posSlot & 1)) << footerBits;
+                tempPrices[i] = BitTreeEncoder.ReverseGetPrice(_posEncoders,
+                    baseVal - posSlot - 1, footerBits, i - baseVal);
+            }
+
+            for (UInt32 lenToPosState = 0; lenToPosState < Base.kNumLenToPosStates; lenToPosState++)
+            {
+                UInt32 posSlot;
+                BitTreeEncoder encoder = _posSlotEncoder[lenToPosState];
+
+                UInt32 st = lenToPosState << Base.kNumPosSlotBits;
+                for (posSlot = 0; posSlot < _distTableSize; posSlot++)
+                {
+                    _posSlotPrices[st + posSlot] = encoder.GetPrice(posSlot);
+                }
+
+                for (posSlot = Base.kEndPosModelIndex; posSlot < _distTableSize; posSlot++)
+                {
+                    _posSlotPrices[st + posSlot] += ((posSlot >> 1) - 1 - Base.kNumAlignBits) << BitEncoder.kNumBitPriceShiftBits;
+                }
+
+                UInt32 st2 = lenToPosState * Base.kNumFullDistances;
+                UInt32 i;
+                for (i = 0; i < Base.kStartPosModelIndex; i++)
+                {
+                    _distancesPrices[st2 + i] = _posSlotPrices[st + i];
+                }
+
+                for (; i < Base.kNumFullDistances; i++)
+                {
+                    _distancesPrices[st2 + i] = _posSlotPrices[st + GetPosSlot(i)] + tempPrices[i];
+                }
+            }
+            _matchPriceCount = 0;
+        }
+
+        private void FillAlignPrices()
+        {
+            for (UInt32 i = 0; i < Base.kAlignTableSize; i++)
+            {
+                _alignPrices[i] = _posAlignEncoder.ReverseGetPrice(i);
+            }
+
+            _alignPriceCount = 0;
+        }
+
+        private static readonly string[] kMatchFinderIDs =
+        {
+            "BT2",
+            "BT4",
+        };
+
+        private static int FindMatchFinder(string s)
+        {
+            for (int m = 0; m < kMatchFinderIDs.Length; m++)
+            {
+                if (s == kMatchFinderIDs[m])
+                {
+                    return m;
+                }
+            }
+
+            return -1;
+        }
+
+        public void SetCoderProperties(CoderPropID[] propIDs, object[] properties)
+        {
+            for (UInt32 i = 0; i < properties.Length; i++)
+            {
+                object prop = properties[i];
+                switch (propIDs[i])
+                {
+                    case CoderPropID.NumFastBytes:
+                        {
+                            if (!(prop is Int32))
+                            {
+                                throw new InvalidParamException();
+                            }
+
+                            Int32 numFastBytes = (Int32)prop;
+                            if (numFastBytes < 5 || numFastBytes > Base.kMatchMaxLen)
+                            {
+                                throw new InvalidParamException();
+                            }
+
+                            _numFastBytes = (UInt32)numFastBytes;
+                            break;
+                        }
+                    case CoderPropID.Algorithm:
+                        {
+                            /*
+                            if (!(prop is Int32))
+                                throw new InvalidParamException();
+                            Int32 maximize = (Int32)prop;
+                            _fastMode = (maximize == 0);
+                            _maxMode = (maximize >= 2);
+                            */
+                            break;
+                        }
+                    case CoderPropID.MatchFinder:
+                        {
+                            if (!(prop is String))
+                            {
+                                throw new InvalidParamException();
+                            }
+
+                            EMatchFinderType matchFinderIndexPrev = _matchFinderType;
+                            int m = FindMatchFinder(((string)prop).ToUpper());
+                            if (m < 0)
+                            {
+                                throw new InvalidParamException();
+                            }
+
+                            _matchFinderType = (EMatchFinderType)m;
+                            if (_matchFinder != null && matchFinderIndexPrev != _matchFinderType)
+                            {
+                                _dictionarySizePrev = 0xFFFFFFFF;
+                                _matchFinder = null;
+                            }
+                            break;
+                        }
+                    case CoderPropID.DictionarySize:
+                        {
+                            const int kDicLogSizeMaxCompress = 30;
+                            if (!(prop is Int32))
+                            {
+                                throw new InvalidParamException();
+                            }
+                            Int32 dictionarySize = (Int32)prop;
+                            if (dictionarySize < (UInt32)(1 << Base.kDicLogSizeMin) ||
+                                dictionarySize > (UInt32)(1 << kDicLogSizeMaxCompress))
+                            {
+                                throw new InvalidParamException();
+                            }
+
+                            _dictionarySize = (UInt32)dictionarySize;
+                            int dicLogSize;
+                            for (dicLogSize = 0; dicLogSize < (UInt32)kDicLogSizeMaxCompress; dicLogSize++)
+                            {
+                                if (dictionarySize <= ((UInt32)1 << dicLogSize))
+                                {
+                                    break;
+                                }
+                            }
+
+                            _distTableSize = (UInt32)dicLogSize * 2;
+                            break;
+                        }
+                    case CoderPropID.PosStateBits:
+                        {
+                            if (!(prop is Int32))
+                            {
+                                throw new InvalidParamException();
+                            }
+
+                            Int32 v = (Int32)prop;
+                            if (v < 0 || v > (UInt32)Base.kNumPosStatesBitsEncodingMax)
+                            {
+                                throw new InvalidParamException();
+                            }
+
+                            _posStateBits = v;
+                            _posStateMask = (((UInt32)1) << _posStateBits) - 1;
+                            break;
+                        }
+                    case CoderPropID.LitPosBits:
+                        {
+                            if (!(prop is Int32))
+                            {
+                                throw new InvalidParamException();
+                            }
+
+                            Int32 v = (Int32)prop;
+                            if (v < 0 || v > Base.kNumLitPosStatesBitsEncodingMax)
+                            {
+                                throw new InvalidParamException();
+                            }
+
+                            _numLiteralPosStateBits = v;
+                            break;
+                        }
+                    case CoderPropID.LitContextBits:
+                        {
+                            if (!(prop is Int32))
+                            {
+                                throw new InvalidParamException();
+                            }
+
+                            Int32 v = (Int32)prop;
+                            if (v < 0 || v > Base.kNumLitContextBitsMax)
+                            {
+                                throw new InvalidParamException();
+                            }
+                            _numLiteralContextBits = v;
+                            break;
+                        }
+                    case CoderPropID.EndMarker:
+                        {
+                            if (!(prop is Boolean))
+                            {
+                                throw new InvalidParamException();
+                            }
+
+                            SetWriteEndMarkerMode((Boolean)prop);
+                            break;
+                        }
+                    default:
+                        throw new InvalidParamException();
+                }
+            }
+        }
+
+        private uint _trainSize = 0;
+        public void SetTrainSize(uint trainSize)
+        {
+            _trainSize = trainSize;
+        }
+    }
+}
diff --git a/7zip/Compress/RangeCoder/RangeCoder.cs b/WPinternals/7zip/Compress/RangeCoder/RangeCoder.cs
similarity index 95%
rename from 7zip/Compress/RangeCoder/RangeCoder.cs
rename to WPinternals/7zip/Compress/RangeCoder/RangeCoder.cs
index 9b5d50d..5e57e11 100644
--- a/7zip/Compress/RangeCoder/RangeCoder.cs
+++ b/WPinternals/7zip/Compress/RangeCoder/RangeCoder.cs
@@ -1,243 +1,243 @@
-using System;
-
-namespace SevenZip.Compression.RangeCoder
-{
-    internal class Encoder
-    {
-        public const uint kTopValue = 1 << 24;
-
-        private System.IO.Stream Stream;
-
-        public UInt64 Low;
-        public uint Range;
-        private uint _cacheSize;
-        private byte _cache;
-
-        private long StartPosition;
-
-        public void SetStream(System.IO.Stream stream)
-        {
-            Stream = stream;
-        }
-
-        public void ReleaseStream()
-        {
-            Stream = null;
-        }
-
-        public void Init()
-        {
-            StartPosition = Stream.Position;
-
-            Low = 0;
-            Range = 0xFFFFFFFF;
-            _cacheSize = 1;
-            _cache = 0;
-        }
-
-        public void FlushData()
-        {
-            for (int i = 0; i < 5; i++)
-            {
-                ShiftLow();
-            }
-        }
-
-        public void FlushStream()
-        {
-            Stream.Flush();
-        }
-
-        public void CloseStream()
-        {
-            Stream.Close();
-        }
-
-        public void Encode(uint start, uint size, uint total)
-        {
-            Low += start * (Range /= total);
-            Range *= size;
-            while (Range < kTopValue)
-            {
-                Range <<= 8;
-                ShiftLow();
-            }
-        }
-
-        public void ShiftLow()
-        {
-            if ((uint)Low < 0xFF000000 || (uint)(Low >> 32) == 1)
-            {
-                byte temp = _cache;
-                do
-                {
-                    Stream.WriteByte((byte)(temp + (Low >> 32)));
-                    temp = 0xFF;
-                }
-                while (--_cacheSize != 0);
-                _cache = (byte)(((uint)Low) >> 24);
-            }
-            _cacheSize++;
-            Low = ((uint)Low) << 8;
-        }
-
-        public void EncodeDirectBits(uint v, int numTotalBits)
-        {
-            for (int i = numTotalBits - 1; i >= 0; i--)
-            {
-                Range >>= 1;
-                if (((v >> i) & 1) == 1)
-                {
-                    Low += Range;
-                }
-
-                if (Range < kTopValue)
-                {
-                    Range <<= 8;
-                    ShiftLow();
-                }
-            }
-        }
-
-        public void EncodeBit(uint size0, int numTotalBits, uint symbol)
-        {
-            uint newBound = (Range >> numTotalBits) * size0;
-            if (symbol == 0)
-            {
-                Range = newBound;
-            }
-            else
-            {
-                Low += newBound;
-                Range -= newBound;
-            }
-            while (Range < kTopValue)
-            {
-                Range <<= 8;
-                ShiftLow();
-            }
-        }
-
-        public long GetProcessedSizeAdd()
-        {
-            return _cacheSize +
-                Stream.Position - StartPosition + 4;
-            // (long)Stream.GetProcessedSize();
-        }
-    }
-
-    internal class Decoder
-    {
-        public const uint kTopValue = 1 << 24;
-        public uint Range;
-        public uint Code;
-        // public Buffer.InBuffer Stream = new Buffer.InBuffer(1 << 16);
-        public System.IO.Stream Stream;
-
-        public void Init(System.IO.Stream stream)
-        {
-            // Stream.Init(stream);
-            Stream = stream;
-
-            Code = 0;
-            Range = 0xFFFFFFFF;
-            for (int i = 0; i < 5; i++)
-            {
-                Code = (Code << 8) | (byte)Stream.ReadByte();
-            }
-        }
-
-        public void ReleaseStream()
-        {
-            // Stream.ReleaseStream();
-            Stream = null;
-        }
-
-        public void CloseStream()
-        {
-            Stream.Close();
-        }
-
-        public void Normalize()
-        {
-            while (Range < kTopValue)
-            {
-                Code = (Code << 8) | (byte)Stream.ReadByte();
-                Range <<= 8;
-            }
-        }
-
-        public void Normalize2()
-        {
-            if (Range < kTopValue)
-            {
-                Code = (Code << 8) | (byte)Stream.ReadByte();
-                Range <<= 8;
-            }
-        }
-
-        public uint GetThreshold(uint total)
-        {
-            return Code / (Range /= total);
-        }
-
-        public void Decode(uint start, uint size, uint total)
-        {
-            Code -= start * Range;
-            Range *= size;
-            Normalize();
-        }
-
-        public uint DecodeDirectBits(int numTotalBits)
-        {
-            uint range = Range;
-            uint code = Code;
-            uint result = 0;
-            for (int i = numTotalBits; i > 0; i--)
-            {
-                range >>= 1;
-                /*
-				result <<= 1;
-				if (code >= range)
-				{
-					code -= range;
-					result |= 1;
-				}
-				*/
-                uint t = (code - range) >> 31;
-                code -= range & (t - 1);
-                result = (result << 1) | (1 - t);
-
-                if (range < kTopValue)
-                {
-                    code = (code << 8) | (byte)Stream.ReadByte();
-                    range <<= 8;
-                }
-            }
-            Range = range;
-            Code = code;
-            return result;
-        }
-
-        public uint DecodeBit(uint size0, int numTotalBits)
-        {
-            uint newBound = (Range >> numTotalBits) * size0;
-            uint symbol;
-            if (Code < newBound)
-            {
-                symbol = 0;
-                Range = newBound;
-            }
-            else
-            {
-                symbol = 1;
-                Code -= newBound;
-                Range -= newBound;
-            }
-            Normalize();
-            return symbol;
-        }
-
-        // ulong GetProcessedSize() {return Stream.GetProcessedSize(); }
-    }
-}
+using System;
+
+namespace SevenZip.Compression.RangeCoder
+{
+    internal class Encoder
+    {
+        public const uint kTopValue = 1 << 24;
+
+        private System.IO.Stream Stream;
+
+        public UInt64 Low;
+        public uint Range;
+        private uint _cacheSize;
+        private byte _cache;
+
+        private long StartPosition;
+
+        public void SetStream(System.IO.Stream stream)
+        {
+            Stream = stream;
+        }
+
+        public void ReleaseStream()
+        {
+            Stream = null;
+        }
+
+        public void Init()
+        {
+            StartPosition = Stream.Position;
+
+            Low = 0;
+            Range = 0xFFFFFFFF;
+            _cacheSize = 1;
+            _cache = 0;
+        }
+
+        public void FlushData()
+        {
+            for (int i = 0; i < 5; i++)
+            {
+                ShiftLow();
+            }
+        }
+
+        public void FlushStream()
+        {
+            Stream.Flush();
+        }
+
+        public void CloseStream()
+        {
+            Stream.Close();
+        }
+
+        public void Encode(uint start, uint size, uint total)
+        {
+            Low += start * (Range /= total);
+            Range *= size;
+            while (Range < kTopValue)
+            {
+                Range <<= 8;
+                ShiftLow();
+            }
+        }
+
+        public void ShiftLow()
+        {
+            if ((uint)Low < 0xFF000000 || (uint)(Low >> 32) == 1)
+            {
+                byte temp = _cache;
+                do
+                {
+                    Stream.WriteByte((byte)(temp + (Low >> 32)));
+                    temp = 0xFF;
+                }
+                while (--_cacheSize != 0);
+                _cache = (byte)(((uint)Low) >> 24);
+            }
+            _cacheSize++;
+            Low = ((uint)Low) << 8;
+        }
+
+        public void EncodeDirectBits(uint v, int numTotalBits)
+        {
+            for (int i = numTotalBits - 1; i >= 0; i--)
+            {
+                Range >>= 1;
+                if (((v >> i) & 1) == 1)
+                {
+                    Low += Range;
+                }
+
+                if (Range < kTopValue)
+                {
+                    Range <<= 8;
+                    ShiftLow();
+                }
+            }
+        }
+
+        public void EncodeBit(uint size0, int numTotalBits, uint symbol)
+        {
+            uint newBound = (Range >> numTotalBits) * size0;
+            if (symbol == 0)
+            {
+                Range = newBound;
+            }
+            else
+            {
+                Low += newBound;
+                Range -= newBound;
+            }
+            while (Range < kTopValue)
+            {
+                Range <<= 8;
+                ShiftLow();
+            }
+        }
+
+        public long GetProcessedSizeAdd()
+        {
+            return _cacheSize +
+                Stream.Position - StartPosition + 4;
+            // (long)Stream.GetProcessedSize();
+        }
+    }
+
+    internal class Decoder
+    {
+        public const uint kTopValue = 1 << 24;
+        public uint Range;
+        public uint Code;
+        // public Buffer.InBuffer Stream = new Buffer.InBuffer(1 << 16);
+        public System.IO.Stream Stream;
+
+        public void Init(System.IO.Stream stream)
+        {
+            // Stream.Init(stream);
+            Stream = stream;
+
+            Code = 0;
+            Range = 0xFFFFFFFF;
+            for (int i = 0; i < 5; i++)
+            {
+                Code = (Code << 8) | (byte)Stream.ReadByte();
+            }
+        }
+
+        public void ReleaseStream()
+        {
+            // Stream.ReleaseStream();
+            Stream = null;
+        }
+
+        public void CloseStream()
+        {
+            Stream.Close();
+        }
+
+        public void Normalize()
+        {
+            while (Range < kTopValue)
+            {
+                Code = (Code << 8) | (byte)Stream.ReadByte();
+                Range <<= 8;
+            }
+        }
+
+        public void Normalize2()
+        {
+            if (Range < kTopValue)
+            {
+                Code = (Code << 8) | (byte)Stream.ReadByte();
+                Range <<= 8;
+            }
+        }
+
+        public uint GetThreshold(uint total)
+        {
+            return Code / (Range /= total);
+        }
+
+        public void Decode(uint start, uint size, uint total)
+        {
+            Code -= start * Range;
+            Range *= size;
+            Normalize();
+        }
+
+        public uint DecodeDirectBits(int numTotalBits)
+        {
+            uint range = Range;
+            uint code = Code;
+            uint result = 0;
+            for (int i = numTotalBits; i > 0; i--)
+            {
+                range >>= 1;
+                /*
+				result <<= 1;
+				if (code >= range)
+				{
+					code -= range;
+					result |= 1;
+				}
+				*/
+                uint t = (code - range) >> 31;
+                code -= range & (t - 1);
+                result = (result << 1) | (1 - t);
+
+                if (range < kTopValue)
+                {
+                    code = (code << 8) | (byte)Stream.ReadByte();
+                    range <<= 8;
+                }
+            }
+            Range = range;
+            Code = code;
+            return result;
+        }
+
+        public uint DecodeBit(uint size0, int numTotalBits)
+        {
+            uint newBound = (Range >> numTotalBits) * size0;
+            uint symbol;
+            if (Code < newBound)
+            {
+                symbol = 0;
+                Range = newBound;
+            }
+            else
+            {
+                symbol = 1;
+                Code -= newBound;
+                Range -= newBound;
+            }
+            Normalize();
+            return symbol;
+        }
+
+        // ulong GetProcessedSize() {return Stream.GetProcessedSize(); }
+    }
+}
diff --git a/7zip/Compress/RangeCoder/RangeCoderBit.cs b/WPinternals/7zip/Compress/RangeCoder/RangeCoderBit.cs
similarity index 97%
rename from 7zip/Compress/RangeCoder/RangeCoderBit.cs
rename to WPinternals/7zip/Compress/RangeCoder/RangeCoderBit.cs
index d7162f8..aee96b6 100644
--- a/7zip/Compress/RangeCoder/RangeCoderBit.cs
+++ b/WPinternals/7zip/Compress/RangeCoder/RangeCoderBit.cs
@@ -1,127 +1,127 @@
-using System;
-
-namespace SevenZip.Compression.RangeCoder
-{
-    internal struct BitEncoder
-    {
-        public const int kNumBitModelTotalBits = 11;
-        public const uint kBitModelTotal = 1 << kNumBitModelTotalBits;
-        private const int kNumMoveBits = 5;
-        private const int kNumMoveReducingBits = 2;
-        public const int kNumBitPriceShiftBits = 6;
-
-        private uint Prob;
-
-        public void Init() { Prob = kBitModelTotal >> 1; }
-
-        public void UpdateModel(uint symbol)
-        {
-            if (symbol == 0)
-            {
-                Prob += (kBitModelTotal - Prob) >> kNumMoveBits;
-            }
-            else
-            {
-                Prob -= Prob >> kNumMoveBits;
-            }
-        }
-
-        public void Encode(Encoder encoder, uint symbol)
-        {
-            // encoder.EncodeBit(Prob, kNumBitModelTotalBits, symbol);
-            // UpdateModel(symbol);
-            uint newBound = (encoder.Range >> kNumBitModelTotalBits) * Prob;
-            if (symbol == 0)
-            {
-                encoder.Range = newBound;
-                Prob += (kBitModelTotal - Prob) >> kNumMoveBits;
-            }
-            else
-            {
-                encoder.Low += newBound;
-                encoder.Range -= newBound;
-                Prob -= Prob >> kNumMoveBits;
-            }
-            if (encoder.Range < Encoder.kTopValue)
-            {
-                encoder.Range <<= 8;
-                encoder.ShiftLow();
-            }
-        }
-
-        private static readonly UInt32[] ProbPrices = new UInt32[kBitModelTotal >> kNumMoveReducingBits];
-
-        static BitEncoder()
-        {
-            const int kNumBits = kNumBitModelTotalBits - kNumMoveReducingBits;
-            for (int i = kNumBits - 1; i >= 0; i--)
-            {
-                UInt32 start = (UInt32)1 << (kNumBits - i - 1);
-                UInt32 end = (UInt32)1 << (kNumBits - i);
-                for (UInt32 j = start; j < end; j++)
-                {
-                    ProbPrices[j] = ((UInt32)i << kNumBitPriceShiftBits) +
-                        (((end - j) << kNumBitPriceShiftBits) >> (kNumBits - i - 1));
-                }
-            }
-        }
-
-        public uint GetPrice(uint symbol)
-        {
-            return ProbPrices[(((Prob - symbol) ^ (-(int)symbol)) & (kBitModelTotal - 1)) >> kNumMoveReducingBits];
-        }
-        public uint GetPrice0() { return ProbPrices[Prob >> kNumMoveReducingBits]; }
-        public uint GetPrice1() { return ProbPrices[(kBitModelTotal - Prob) >> kNumMoveReducingBits]; }
-    }
-
-    internal struct BitDecoder
-    {
-        public const int kNumBitModelTotalBits = 11;
-        public const uint kBitModelTotal = 1 << kNumBitModelTotalBits;
-        private const int kNumMoveBits = 5;
-
-        private uint Prob;
-
-        public void UpdateModel(int numMoveBits, uint symbol)
-        {
-            if (symbol == 0)
-            {
-                Prob += (kBitModelTotal - Prob) >> numMoveBits;
-            }
-            else
-            {
-                Prob -= Prob >> numMoveBits;
-            }
-        }
-
-        public void Init() { Prob = kBitModelTotal >> 1; }
-
-        public uint Decode(Decoder rangeDecoder)
-        {
-            uint newBound = (rangeDecoder.Range >> kNumBitModelTotalBits) * Prob;
-            if (rangeDecoder.Code < newBound)
-            {
-                rangeDecoder.Range = newBound;
-                Prob += (kBitModelTotal - Prob) >> kNumMoveBits;
-                if (rangeDecoder.Range < Decoder.kTopValue)
-                {
-                    rangeDecoder.Code = (rangeDecoder.Code << 8) | (byte)rangeDecoder.Stream.ReadByte();
-                    rangeDecoder.Range <<= 8;
-                }
-                return 0;
-            }
-            else
-            {
-                rangeDecoder.Range -= newBound;
-                rangeDecoder.Code -= newBound;
-                Prob -= Prob >> kNumMoveBits;
-                if (rangeDecoder.Range < Decoder.kTopValue)
-                {
-                    rangeDecoder.Code = (rangeDecoder.Code << 8) | (byte)rangeDecoder.Stream.ReadByte();
-                    rangeDecoder.Range <<= 8;
-                }
-                return 1;
-            }
-        }
-    }
-}
+using System;
+
+namespace SevenZip.Compression.RangeCoder
+{
+    internal struct BitEncoder
+    {
+        public const int kNumBitModelTotalBits = 11;
+        public const uint kBitModelTotal = 1 << kNumBitModelTotalBits;
+        private const int kNumMoveBits = 5;
+        private const int kNumMoveReducingBits = 2;
+        public const int kNumBitPriceShiftBits = 6;
+
+        private uint Prob;
+
+        public void Init() { Prob = kBitModelTotal >> 1; }
+
+        public void UpdateModel(uint symbol)
+        {
+            if (symbol == 0)
+            {
+                Prob += (kBitModelTotal - Prob) >> kNumMoveBits;
+            }
+            else
+            {
+                Prob -= Prob >> kNumMoveBits;
+            }
+        }
+
+        public void Encode(Encoder encoder, uint symbol)
+        {
+            // encoder.EncodeBit(Prob, kNumBitModelTotalBits, symbol);
+            // UpdateModel(symbol);
+            uint newBound = (encoder.Range >> kNumBitModelTotalBits) * Prob;
+            if (symbol == 0)
+            {
+                encoder.Range = newBound;
+                Prob += (kBitModelTotal - Prob) >> kNumMoveBits;
+            }
+            else
+            {
+                encoder.Low += newBound;
+                encoder.Range -= newBound;
+                Prob -= Prob >> kNumMoveBits;
+            }
+            if (encoder.Range < Encoder.kTopValue)
+            {
+                encoder.Range <<= 8;
+                encoder.ShiftLow();
+            }
+        }
+
+        private static readonly UInt32[] ProbPrices = new UInt32[kBitModelTotal >> kNumMoveReducingBits];
+
+        static BitEncoder()
+        {
+            const int kNumBits = kNumBitModelTotalBits - kNumMoveReducingBits;
+            for (int i = kNumBits - 1; i >= 0; i--)
+            {
+                UInt32 start = (UInt32)1 << (kNumBits - i - 1);
+                UInt32 end = (UInt32)1 << (kNumBits - i);
+                for (UInt32 j = start; j < end; j++)
+                {
+                    ProbPrices[j] = ((UInt32)i << kNumBitPriceShiftBits) +
+                        (((end - j) << kNumBitPriceShiftBits) >> (kNumBits - i - 1));
+                }
+            }
+        }
+
+        public uint GetPrice(uint symbol)
+        {
+            return ProbPrices[(((Prob - symbol) ^ (-(int)symbol)) & (kBitModelTotal - 1)) >> kNumMoveReducingBits];
+        }
+        public uint GetPrice0() { return ProbPrices[Prob >> kNumMoveReducingBits]; }
+        public uint GetPrice1() { return ProbPrices[(kBitModelTotal - Prob) >> kNumMoveReducingBits]; }
+    }
+
+    internal struct BitDecoder
+    {
+        public const int kNumBitModelTotalBits = 11;
+        public const uint kBitModelTotal = 1 << kNumBitModelTotalBits;
+        private const int kNumMoveBits = 5;
+
+        private uint Prob;
+
+        public void UpdateModel(int numMoveBits, uint symbol)
+        {
+            if (symbol == 0)
+            {
+                Prob += (kBitModelTotal - Prob) >> numMoveBits;
+            }
+            else
+            {
+                Prob -= Prob >> numMoveBits;
+            }
+        }
+
+        public void Init() { Prob = kBitModelTotal >> 1; }
+
+        public uint Decode(Decoder rangeDecoder)
+        {
+            uint newBound = (rangeDecoder.Range >> kNumBitModelTotalBits) * Prob;
+            if (rangeDecoder.Code < newBound)
+            {
+                rangeDecoder.Range = newBound;
+                Prob += (kBitModelTotal - Prob) >> kNumMoveBits;
+                if (rangeDecoder.Range < Decoder.kTopValue)
+                {
+                    rangeDecoder.Code = (rangeDecoder.Code << 8) | (byte)rangeDecoder.Stream.ReadByte();
+                    rangeDecoder.Range <<= 8;
+                }
+                return 0;
+            }
+            else
+            {
+                rangeDecoder.Range -= newBound;
+                rangeDecoder.Code -= newBound;
+                Prob -= Prob >> kNumMoveBits;
+                if (rangeDecoder.Range < Decoder.kTopValue)
+                {
+                    rangeDecoder.Code = (rangeDecoder.Code << 8) | (byte)rangeDecoder.Stream.ReadByte();
+                    rangeDecoder.Range <<= 8;
+                }
+                return 1;
+            }
+        }
+    }
+}
diff --git a/7zip/Compress/RangeCoder/RangeCoderBitTree.cs b/WPinternals/7zip/Compress/RangeCoder/RangeCoderBitTree.cs
similarity index 96%
rename from 7zip/Compress/RangeCoder/RangeCoderBitTree.cs
rename to WPinternals/7zip/Compress/RangeCoder/RangeCoderBitTree.cs
index a98084b..15b2750 100644
--- a/7zip/Compress/RangeCoder/RangeCoderBitTree.cs
+++ b/WPinternals/7zip/Compress/RangeCoder/RangeCoderBitTree.cs
@@ -1,164 +1,164 @@
-using System;
-
-namespace SevenZip.Compression.RangeCoder
-{
-    internal struct BitTreeEncoder
-    {
-        private readonly BitEncoder[] Models;
-        private readonly int NumBitLevels;
-
-        public BitTreeEncoder(int numBitLevels)
-        {
-            NumBitLevels = numBitLevels;
-            Models = new BitEncoder[1 << numBitLevels];
-        }
-
-        public void Init()
-        {
-            for (uint i = 1; i < (1 << NumBitLevels); i++)
-            {
-                Models[i].Init();
-            }
-        }
-
-        public void Encode(Encoder rangeEncoder, UInt32 symbol)
-        {
-            UInt32 m = 1;
-            for (int bitIndex = NumBitLevels; bitIndex > 0;)
-            {
-                bitIndex--;
-                UInt32 bit = (symbol >> bitIndex) & 1;
-                Models[m].Encode(rangeEncoder, bit);
-                m = (m << 1) | bit;
-            }
-        }
-
-        public void ReverseEncode(Encoder rangeEncoder, UInt32 symbol)
-        {
-            UInt32 m = 1;
-            for (UInt32 i = 0; i < NumBitLevels; i++)
-            {
-                UInt32 bit = symbol & 1;
-                Models[m].Encode(rangeEncoder, bit);
-                m = (m << 1) | bit;
-                symbol >>= 1;
-            }
-        }
-
-        public UInt32 GetPrice(UInt32 symbol)
-        {
-            UInt32 price = 0;
-            UInt32 m = 1;
-            for (int bitIndex = NumBitLevels; bitIndex > 0;)
-            {
-                bitIndex--;
-                UInt32 bit = (symbol >> bitIndex) & 1;
-                price += Models[m].GetPrice(bit);
-                m = (m << 1) + bit;
-            }
-            return price;
-        }
-
-        public UInt32 ReverseGetPrice(UInt32 symbol)
-        {
-            UInt32 price = 0;
-            UInt32 m = 1;
-            for (int i = NumBitLevels; i > 0; i--)
-            {
-                UInt32 bit = symbol & 1;
-                symbol >>= 1;
-                price += Models[m].GetPrice(bit);
-                m = (m << 1) | bit;
-            }
-            return price;
-        }
-
-        public static UInt32 ReverseGetPrice(BitEncoder[] Models, UInt32 startIndex,
-            int NumBitLevels, UInt32 symbol)
-        {
-            UInt32 price = 0;
-            UInt32 m = 1;
-            for (int i = NumBitLevels; i > 0; i--)
-            {
-                UInt32 bit = symbol & 1;
-                symbol >>= 1;
-                price += Models[startIndex + m].GetPrice(bit);
-                m = (m << 1) | bit;
-            }
-            return price;
-        }
-
-        public static void ReverseEncode(BitEncoder[] Models, UInt32 startIndex,
-            Encoder rangeEncoder, int NumBitLevels, UInt32 symbol)
-        {
-            UInt32 m = 1;
-            for (int i = 0; i < NumBitLevels; i++)
-            {
-                UInt32 bit = symbol & 1;
-                Models[startIndex + m].Encode(rangeEncoder, bit);
-                m = (m << 1) | bit;
-                symbol >>= 1;
-            }
-        }
-    }
-
-    internal struct BitTreeDecoder
-    {
-        private readonly BitDecoder[] Models;
-        private readonly int NumBitLevels;
-
-        public BitTreeDecoder(int numBitLevels)
-        {
-            NumBitLevels = numBitLevels;
-            Models = new BitDecoder[1 << numBitLevels];
-        }
-
-        public void Init()
-        {
-            for (uint i = 1; i < (1 << NumBitLevels); i++)
-            {
-                Models[i].Init();
-            }
-        }
-
-        public uint Decode(Decoder rangeDecoder)
-        {
-            uint m = 1;
-            for (int bitIndex = NumBitLevels; bitIndex > 0; bitIndex--)
-            {
-                m = (m << 1) + Models[m].Decode(rangeDecoder);
-            }
-
-            return m - ((uint)1 << NumBitLevels);
-        }
-
-        public uint ReverseDecode(Decoder rangeDecoder)
-        {
-            uint m = 1;
-            uint symbol = 0;
-            for (int bitIndex = 0; bitIndex < NumBitLevels; bitIndex++)
-            {
-                uint bit = Models[m].Decode(rangeDecoder);
-                m <<= 1;
-                m += bit;
-                symbol |= bit << bitIndex;
-            }
-            return symbol;
-        }
-
-        public static uint ReverseDecode(BitDecoder[] Models, UInt32 startIndex,
-            Decoder rangeDecoder, int NumBitLevels)
-        {
-            uint m = 1;
-            uint symbol = 0;
-            for (int bitIndex = 0; bitIndex < NumBitLevels; bitIndex++)
-            {
-                uint bit = Models[startIndex + m].Decode(rangeDecoder);
-                m <<= 1;
-                m += bit;
-                symbol |= bit << bitIndex;
-            }
-            return symbol;
-        }
-    }
-}
+using System;
+
+namespace SevenZip.Compression.RangeCoder
+{
+    internal struct BitTreeEncoder
+    {
+        private readonly BitEncoder[] Models;
+        private readonly int NumBitLevels;
+
+        public BitTreeEncoder(int numBitLevels)
+        {
+            NumBitLevels = numBitLevels;
+            Models = new BitEncoder[1 << numBitLevels];
+        }
+
+        public void Init()
+        {
+            for (uint i = 1; i < (1 << NumBitLevels); i++)
+            {
+                Models[i].Init();
+            }
+        }
+
+        public void Encode(Encoder rangeEncoder, UInt32 symbol)
+        {
+            UInt32 m = 1;
+            for (int bitIndex = NumBitLevels; bitIndex > 0;)
+            {
+                bitIndex--;
+                UInt32 bit = (symbol >> bitIndex) & 1;
+                Models[m].Encode(rangeEncoder, bit);
+                m = (m << 1) | bit;
+            }
+        }
+
+        public void ReverseEncode(Encoder rangeEncoder, UInt32 symbol)
+        {
+            UInt32 m = 1;
+            for (UInt32 i = 0; i < NumBitLevels; i++)
+            {
+                UInt32 bit = symbol & 1;
+                Models[m].Encode(rangeEncoder, bit);
+                m = (m << 1) | bit;
+                symbol >>= 1;
+            }
+        }
+
+        public UInt32 GetPrice(UInt32 symbol)
+        {
+            UInt32 price = 0;
+            UInt32 m = 1;
+            for (int bitIndex = NumBitLevels; bitIndex > 0;)
+            {
+                bitIndex--;
+                UInt32 bit = (symbol >> bitIndex) & 1;
+                price += Models[m].GetPrice(bit);
+                m = (m << 1) + bit;
+            }
+            return price;
+        }
+
+        public UInt32 ReverseGetPrice(UInt32 symbol)
+        {
+            UInt32 price = 0;
+            UInt32 m = 1;
+            for (int i = NumBitLevels; i > 0; i--)
+            {
+                UInt32 bit = symbol & 1;
+                symbol >>= 1;
+                price += Models[m].GetPrice(bit);
+                m = (m << 1) | bit;
+            }
+            return price;
+        }
+
+        public static UInt32 ReverseGetPrice(BitEncoder[] Models, UInt32 startIndex,
+            int NumBitLevels, UInt32 symbol)
+        {
+            UInt32 price = 0;
+            UInt32 m = 1;
+            for (int i = NumBitLevels; i > 0; i--)
+            {
+                UInt32 bit = symbol & 1;
+                symbol >>= 1;
+                price += Models[startIndex + m].GetPrice(bit);
+                m = (m << 1) | bit;
+            }
+            return price;
+        }
+
+        public static void ReverseEncode(BitEncoder[] Models, UInt32 startIndex,
+            Encoder rangeEncoder, int NumBitLevels, UInt32 symbol)
+        {
+            UInt32 m = 1;
+            for (int i = 0; i < NumBitLevels; i++)
+            {
+                UInt32 bit = symbol & 1;
+                Models[startIndex + m].Encode(rangeEncoder, bit);
+                m = (m << 1) | bit;
+                symbol >>= 1;
+            }
+        }
+    }
+
+    internal struct BitTreeDecoder
+    {
+        private readonly BitDecoder[] Models;
+        private readonly int NumBitLevels;
+
+        public BitTreeDecoder(int numBitLevels)
+        {
+            NumBitLevels = numBitLevels;
+            Models = new BitDecoder[1 << numBitLevels];
+        }
+
+        public void Init()
+        {
+            for (uint i = 1; i < (1 << NumBitLevels); i++)
+            {
+                Models[i].Init();
+            }
+        }
+
+        public uint Decode(Decoder rangeDecoder)
+        {
+            uint m = 1;
+            for (int bitIndex = NumBitLevels; bitIndex > 0; bitIndex--)
+            {
+                m = (m << 1) + Models[m].Decode(rangeDecoder);
+            }
+
+            return m - ((uint)1 << NumBitLevels);
+        }
+
+        public uint ReverseDecode(Decoder rangeDecoder)
+        {
+            uint m = 1;
+            uint symbol = 0;
+            for (int bitIndex = 0; bitIndex < NumBitLevels; bitIndex++)
+            {
+                uint bit = Models[m].Decode(rangeDecoder);
+                m <<= 1;
+                m += bit;
+                symbol |= bit << bitIndex;
+            }
+            return symbol;
+        }
+
+        public static uint ReverseDecode(BitDecoder[] Models, UInt32 startIndex,
+            Decoder rangeDecoder, int NumBitLevels)
+        {
+            uint m = 1;
+            uint symbol = 0;
+            for (int bitIndex = 0; bitIndex < NumBitLevels; bitIndex++)
+            {
+                uint bit = Models[startIndex + m].Decode(rangeDecoder);
+                m <<= 1;
+                m += bit;
+                symbol |= bit << bitIndex;
+            }
+            return symbol;
+        }
+    }
+}
diff --git a/7zip/ICoder.cs b/WPinternals/7zip/ICoder.cs
similarity index 96%
rename from 7zip/ICoder.cs
rename to WPinternals/7zip/ICoder.cs
index 5a09466..ac070a8 100644
--- a/7zip/ICoder.cs
+++ b/WPinternals/7zip/ICoder.cs
@@ -1,173 +1,173 @@
-// ICoder.h
-
-using System;
-using System.Threading;
-
-namespace SevenZip
-{
-    /// <summary>
-    /// The exception that is thrown when an error in input stream occurs during decoding.
-    /// </summary>
-    internal class DataErrorException : ApplicationException
-    {
-        public DataErrorException() : base("Data Error") { }
-
-        public DataErrorException(string message) : base(message)
-        {
-        }
-
-        public DataErrorException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
-    }
-
-    /// <summary>
-    /// The exception that is thrown when the value of an argument is outside the allowable range.
-    /// </summary>
-    internal class InvalidParamException : ApplicationException
-    {
-        public InvalidParamException() : base("Invalid Parameter") { }
-
-        public InvalidParamException(string message) : base(message)
-        {
-        }
-
-        public InvalidParamException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
-    }
-
-    public interface ICodeProgress
-    {
-        /// <summary>
-        /// Callback progress.
-        /// </summary>
-        /// <param name="inSize">
-        /// input size. -1 if unknown.
-        /// </param>
-        /// <param name="outSize">
-        /// output size. -1 if unknown.
-        /// </param>
-        void SetProgress(Int64 inSize, Int64 outSize);
-    };
-
-    public interface ICoder
-    {
-        /// <summary>
-        /// Codes streams.
-        /// </summary>
-        /// <param name="inStream">
-        /// input Stream.
-        /// </param>
-        /// <param name="outStream">
-        /// output Stream.
-        /// </param>
-        /// <param name="inSize">
-        /// input Size. -1 if unknown.
-        /// </param>
-        /// <param name="outSize">
-        /// output Size. -1 if unknown.
-        /// </param>
-        /// <param name="progress">
-        /// callback progress reference.
-        /// </param>
-        /// <exception cref="DataErrorException">
-        /// if input stream is not valid
-        /// </exception>
-        void Code(System.IO.Stream inStream, System.IO.Stream outStream,
-            Int64 inSize, Int64 outSize, ICodeProgress progress, CancellationToken? token = null);
-    };
-
-    /*
-	public interface ICoder2
-	{
-		 void Code(ISequentialInStream []inStreams,
-				const UInt64 []inSizes, 
-				ISequentialOutStream []outStreams, 
-				UInt64 []outSizes,
-				ICodeProgress progress);
-	};
-  */
-
-    /// <summary>
-    /// Provides the fields that represent properties idenitifiers for compressing.
-    /// </summary>
-    public enum CoderPropID
-    {
-        /// <summary>
-        /// Specifies default property.
-        /// </summary>
-        DefaultProp = 0,
-        /// <summary>
-        /// Specifies size of dictionary.
-        /// </summary>
-        DictionarySize,
-        /// <summary>
-        /// Specifies size of memory for PPM*.
-        /// </summary>
-        UsedMemorySize,
-        /// <summary>
-        /// Specifies order for PPM methods.
-        /// </summary>
-        Order,
-        /// <summary>
-        /// Specifies Block Size.
-        /// </summary>
-        BlockSize,
-        /// <summary>
-        /// Specifies number of postion state bits for LZMA (0 <= x <= 4).
-        /// </summary>
-        PosStateBits,
-        /// <summary>
-        /// Specifies number of literal context bits for LZMA (0 <= x <= 8).
-        /// </summary>
-        LitContextBits,
-        /// <summary>
-        /// Specifies number of literal position bits for LZMA (0 <= x <= 4).
-        /// </summary>
-        LitPosBits,
-        /// <summary>
-        /// Specifies number of fast bytes for LZ*.
-        /// </summary>
-        NumFastBytes,
-        /// <summary>
-        /// Specifies match finder. LZMA: "BT2", "BT4" or "BT4B".
-        /// </summary>
-        MatchFinder,
-        /// <summary>
-        /// Specifies the number of match finder cyckes.
-        /// </summary>
-        MatchFinderCycles,
-        /// <summary>
-        /// Specifies number of passes.
-        /// </summary>
-        NumPasses,
-        /// <summary>
-        /// Specifies number of algorithm.
-        /// </summary>
-        Algorithm,
-        /// <summary>
-        /// Specifies the number of threads.
-        /// </summary>
-        NumThreads,
-        /// <summary>
-        /// Specifies mode with end marker.
-        /// </summary>
-        EndMarker
-    };
-
-    public interface ISetCoderProperties
-    {
-        void SetCoderProperties(CoderPropID[] propIDs, object[] properties);
-    };
-
-    public interface IWriteCoderProperties
-    {
-        void WriteCoderProperties(System.IO.Stream outStream);
-    }
-
-    public interface ISetDecoderProperties
-    {
-        void SetDecoderProperties(byte[] properties);
-    }
-}
+// ICoder.h
+
+using System;
+using System.Threading;
+
+namespace SevenZip
+{
+    /// <summary>
+    /// The exception that is thrown when an error in input stream occurs during decoding.
+    /// </summary>
+    internal class DataErrorException : ApplicationException
+    {
+        public DataErrorException() : base("Data Error") { }
+
+        public DataErrorException(string message) : base(message)
+        {
+        }
+
+        public DataErrorException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+
+    /// <summary>
+    /// The exception that is thrown when the value of an argument is outside the allowable range.
+    /// </summary>
+    internal class InvalidParamException : ApplicationException
+    {
+        public InvalidParamException() : base("Invalid Parameter") { }
+
+        public InvalidParamException(string message) : base(message)
+        {
+        }
+
+        public InvalidParamException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+
+    public interface ICodeProgress
+    {
+        /// <summary>
+        /// Callback progress.
+        /// </summary>
+        /// <param name="inSize">
+        /// input size. -1 if unknown.
+        /// </param>
+        /// <param name="outSize">
+        /// output size. -1 if unknown.
+        /// </param>
+        void SetProgress(Int64 inSize, Int64 outSize);
+    };
+
+    public interface ICoder
+    {
+        /// <summary>
+        /// Codes streams.
+        /// </summary>
+        /// <param name="inStream">
+        /// input Stream.
+        /// </param>
+        /// <param name="outStream">
+        /// output Stream.
+        /// </param>
+        /// <param name="inSize">
+        /// input Size. -1 if unknown.
+        /// </param>
+        /// <param name="outSize">
+        /// output Size. -1 if unknown.
+        /// </param>
+        /// <param name="progress">
+        /// callback progress reference.
+        /// </param>
+        /// <exception cref="DataErrorException">
+        /// if input stream is not valid
+        /// </exception>
+        void Code(System.IO.Stream inStream, System.IO.Stream outStream,
+            Int64 inSize, Int64 outSize, ICodeProgress progress, CancellationToken? token = null);
+    };
+
+    /*
+	public interface ICoder2
+	{
+		 void Code(ISequentialInStream []inStreams,
+				const UInt64 []inSizes, 
+				ISequentialOutStream []outStreams, 
+				UInt64 []outSizes,
+				ICodeProgress progress);
+	};
+  */
+
+    /// <summary>
+    /// Provides the fields that represent properties idenitifiers for compressing.
+    /// </summary>
+    public enum CoderPropID
+    {
+        /// <summary>
+        /// Specifies default property.
+        /// </summary>
+        DefaultProp = 0,
+        /// <summary>
+        /// Specifies size of dictionary.
+        /// </summary>
+        DictionarySize,
+        /// <summary>
+        /// Specifies size of memory for PPM*.
+        /// </summary>
+        UsedMemorySize,
+        /// <summary>
+        /// Specifies order for PPM methods.
+        /// </summary>
+        Order,
+        /// <summary>
+        /// Specifies Block Size.
+        /// </summary>
+        BlockSize,
+        /// <summary>
+        /// Specifies number of postion state bits for LZMA (0 <= x <= 4).
+        /// </summary>
+        PosStateBits,
+        /// <summary>
+        /// Specifies number of literal context bits for LZMA (0 <= x <= 8).
+        /// </summary>
+        LitContextBits,
+        /// <summary>
+        /// Specifies number of literal position bits for LZMA (0 <= x <= 4).
+        /// </summary>
+        LitPosBits,
+        /// <summary>
+        /// Specifies number of fast bytes for LZ*.
+        /// </summary>
+        NumFastBytes,
+        /// <summary>
+        /// Specifies match finder. LZMA: "BT2", "BT4" or "BT4B".
+        /// </summary>
+        MatchFinder,
+        /// <summary>
+        /// Specifies the number of match finder cyckes.
+        /// </summary>
+        MatchFinderCycles,
+        /// <summary>
+        /// Specifies number of passes.
+        /// </summary>
+        NumPasses,
+        /// <summary>
+        /// Specifies number of algorithm.
+        /// </summary>
+        Algorithm,
+        /// <summary>
+        /// Specifies the number of threads.
+        /// </summary>
+        NumThreads,
+        /// <summary>
+        /// Specifies mode with end marker.
+        /// </summary>
+        EndMarker
+    };
+
+    public interface ISetCoderProperties
+    {
+        void SetCoderProperties(CoderPropID[] propIDs, object[] properties);
+    };
+
+    public interface IWriteCoderProperties
+    {
+        void WriteCoderProperties(System.IO.Stream outStream);
+    }
+
+    public interface ISetDecoderProperties
+    {
+        void SetDecoderProperties(byte[] properties);
+    }
+}
diff --git a/App.xaml b/WPinternals/App.xaml
similarity index 98%
rename from App.xaml
rename to WPinternals/App.xaml
index cedbe95..be1156e 100644
--- a/App.xaml
+++ b/WPinternals/App.xaml
@@ -1,112 +1,112 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-    
-<Application x:Class="WPinternals.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             StartupUri="Views\StartupWindow.xaml"
-             xmlns:ComponentModel="clr-namespace:System.ComponentModel;assembly=PresentationFramework"
->
-    <Application.Resources>
-        <Style TargetType="{x:Type UserControl}">
-            <Style.Triggers>
-                <Trigger Property="ComponentModel:DesignerProperties.IsInDesignMode"
-                 Value="true">
-                    <Setter Property="Background"
-                    Value="White" />
-                </Trigger>
-            </Style.Triggers>
-        </Style>
-        <ControlTemplate x:Key="TopicExpanderTemplate" TargetType="{x:Type Expander}">
-            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="3" SnapsToDevicePixels="True">
-                <DockPanel>
-                    <ToggleButton x:Name="HeaderSite" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" DockPanel.Dock="Top" Foreground="{TemplateBinding Foreground}" FontWeight="{TemplateBinding FontWeight}" FontStyle="{TemplateBinding FontStyle}" FontStretch="{TemplateBinding FontStretch}" FontSize="{TemplateBinding FontSize}" FontFamily="{TemplateBinding FontFamily}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" MinWidth="0" MinHeight="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
-                        <ToggleButton.FocusVisualStyle>
-                            <Style>
-                                <Setter Property="Control.Template">
-                                    <Setter.Value>
-                                        <ControlTemplate>
-                                            <Border>
-                                                <Rectangle Margin="0" SnapsToDevicePixels="True" Stroke="Black" StrokeThickness="1" StrokeDashArray="1 2"/>
-                                            </Border>
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </ToggleButton.FocusVisualStyle>
-                        <ToggleButton.Style>
-                            <Style TargetType="{x:Type ToggleButton}">
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <ControlTemplate TargetType="{x:Type ToggleButton}">
-                                            <Border Padding="{TemplateBinding Padding}">
-                                                <Grid Background="Transparent" SnapsToDevicePixels="False">
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="*"/>
-                                                        <ColumnDefinition Width="19"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Ellipse x:Name="circle" Fill="White" HorizontalAlignment="Center" Height="19" Stroke="#FF333333" VerticalAlignment="Center" Width="19" Grid.Column="1" />
-                                                    <Path x:Name="arrow" Data="M1,1.5L4.5,5 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="False" Stroke="#FF333333" StrokeThickness="2" VerticalAlignment="Center" Grid.Column="1" />
-                                                    <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" ContentStringFormat="{TemplateBinding ContentStringFormat}" HorizontalAlignment="Left" Margin="0,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center" TextBlock.FontSize="18" TextBlock.FontWeight="Bold" TextBlock.Foreground="#FF3753A6"/>
-                                                </Grid>
-                                            </Border>
-                                            <ControlTemplate.Triggers>
-                                                <Trigger Property="IsChecked" Value="True">
-                                                    <Setter Property="Data" TargetName="arrow" Value="M1,4.5L4.5,1 8,4.5"/>
-                                                </Trigger>
-                                                <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter Property="Stroke" TargetName="circle" Value="#FF5593FF"/>
-                                                    <Setter Property="Fill" TargetName="circle" Value="#FFF3F9FF"/>
-                                                    <Setter Property="Stroke" TargetName="arrow" Value="Black"/>
-                                                </Trigger>
-                                                <Trigger Property="IsPressed" Value="True">
-                                                    <Setter Property="Stroke" TargetName="circle" Value="#FF3C77DD"/>
-                                                    <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
-                                                    <Setter Property="Fill" TargetName="circle" Value="#FFD9ECFF"/>
-                                                    <Setter Property="Stroke" TargetName="arrow" Value="Black"/>
-                                                </Trigger>
-                                                <Trigger Property="IsEnabled" Value="False">
-                                                    <Setter Property="Stroke" TargetName="circle" Value="#FFBCBCBC"/>
-                                                    <Setter Property="Fill" TargetName="circle" Value="#FFE6E6E6"/>
-                                                    <Setter Property="Stroke" TargetName="arrow" Value="#FF707070"/>
-                                                </Trigger>
-                                            </ControlTemplate.Triggers>
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </ToggleButton.Style>
-                    </ToggleButton>
-                    <ContentPresenter x:Name="ExpandSite" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" DockPanel.Dock="Bottom" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                </DockPanel>
-            </Border>
-            <ControlTemplate.Triggers>
-                <Trigger Property="IsExpanded" Value="True">
-                    <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible"/>
-                </Trigger>
-                <Trigger Property="IsEnabled" Value="False">
-                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                </Trigger>
-            </ControlTemplate.Triggers>
-        </ControlTemplate>
-    </Application.Resources>
-</Application>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+    
+<Application x:Class="WPinternals.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="Views\StartupWindow.xaml"
+             xmlns:ComponentModel="clr-namespace:System.ComponentModel;assembly=PresentationFramework"
+>
+    <Application.Resources>
+        <Style TargetType="{x:Type UserControl}">
+            <Style.Triggers>
+                <Trigger Property="ComponentModel:DesignerProperties.IsInDesignMode"
+                 Value="true">
+                    <Setter Property="Background"
+                    Value="White" />
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+        <ControlTemplate x:Key="TopicExpanderTemplate" TargetType="{x:Type Expander}">
+            <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="3" SnapsToDevicePixels="True">
+                <DockPanel>
+                    <ToggleButton x:Name="HeaderSite" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" DockPanel.Dock="Top" Foreground="{TemplateBinding Foreground}" FontWeight="{TemplateBinding FontWeight}" FontStyle="{TemplateBinding FontStyle}" FontStretch="{TemplateBinding FontStretch}" FontSize="{TemplateBinding FontSize}" FontFamily="{TemplateBinding FontFamily}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Margin="1" MinWidth="0" MinHeight="0" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
+                        <ToggleButton.FocusVisualStyle>
+                            <Style>
+                                <Setter Property="Control.Template">
+                                    <Setter.Value>
+                                        <ControlTemplate>
+                                            <Border>
+                                                <Rectangle Margin="0" SnapsToDevicePixels="True" Stroke="Black" StrokeThickness="1" StrokeDashArray="1 2"/>
+                                            </Border>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </ToggleButton.FocusVisualStyle>
+                        <ToggleButton.Style>
+                            <Style TargetType="{x:Type ToggleButton}">
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate TargetType="{x:Type ToggleButton}">
+                                            <Border Padding="{TemplateBinding Padding}">
+                                                <Grid Background="Transparent" SnapsToDevicePixels="False">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="*"/>
+                                                        <ColumnDefinition Width="19"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <Ellipse x:Name="circle" Fill="White" HorizontalAlignment="Center" Height="19" Stroke="#FF333333" VerticalAlignment="Center" Width="19" Grid.Column="1" />
+                                                    <Path x:Name="arrow" Data="M1,1.5L4.5,5 8,1.5" HorizontalAlignment="Center" SnapsToDevicePixels="False" Stroke="#FF333333" StrokeThickness="2" VerticalAlignment="Center" Grid.Column="1" />
+                                                    <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" Grid.Column="0" ContentStringFormat="{TemplateBinding ContentStringFormat}" HorizontalAlignment="Left" Margin="0,0,0,0" RecognizesAccessKey="True" SnapsToDevicePixels="True" VerticalAlignment="Center" TextBlock.FontSize="18" TextBlock.FontWeight="Bold" TextBlock.Foreground="#FF3753A6"/>
+                                                </Grid>
+                                            </Border>
+                                            <ControlTemplate.Triggers>
+                                                <Trigger Property="IsChecked" Value="True">
+                                                    <Setter Property="Data" TargetName="arrow" Value="M1,4.5L4.5,1 8,4.5"/>
+                                                </Trigger>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                    <Setter Property="Stroke" TargetName="circle" Value="#FF5593FF"/>
+                                                    <Setter Property="Fill" TargetName="circle" Value="#FFF3F9FF"/>
+                                                    <Setter Property="Stroke" TargetName="arrow" Value="Black"/>
+                                                </Trigger>
+                                                <Trigger Property="IsPressed" Value="True">
+                                                    <Setter Property="Stroke" TargetName="circle" Value="#FF3C77DD"/>
+                                                    <Setter Property="StrokeThickness" TargetName="circle" Value="1.5"/>
+                                                    <Setter Property="Fill" TargetName="circle" Value="#FFD9ECFF"/>
+                                                    <Setter Property="Stroke" TargetName="arrow" Value="Black"/>
+                                                </Trigger>
+                                                <Trigger Property="IsEnabled" Value="False">
+                                                    <Setter Property="Stroke" TargetName="circle" Value="#FFBCBCBC"/>
+                                                    <Setter Property="Fill" TargetName="circle" Value="#FFE6E6E6"/>
+                                                    <Setter Property="Stroke" TargetName="arrow" Value="#FF707070"/>
+                                                </Trigger>
+                                            </ControlTemplate.Triggers>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </ToggleButton.Style>
+                    </ToggleButton>
+                    <ContentPresenter x:Name="ExpandSite" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" DockPanel.Dock="Bottom" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" Visibility="Collapsed" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                </DockPanel>
+            </Border>
+            <ControlTemplate.Triggers>
+                <Trigger Property="IsExpanded" Value="True">
+                    <Setter Property="Visibility" TargetName="ExpandSite" Value="Visible"/>
+                </Trigger>
+                <Trigger Property="IsEnabled" Value="False">
+                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                </Trigger>
+            </ControlTemplate.Triggers>
+        </ControlTemplate>
+    </Application.Resources>
+</Application>
diff --git a/App.xaml.cs b/WPinternals/App.xaml.cs
similarity index 97%
rename from App.xaml.cs
rename to WPinternals/App.xaml.cs
index 1542850..125bd0c 100644
--- a/App.xaml.cs
+++ b/WPinternals/App.xaml.cs
@@ -1,103 +1,103 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Windows;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
-    {
-        internal static Action NavigateToGettingStarted;
-        internal static Action NavigateToUnlockBoot;
-        internal static PatchEngine PatchEngine;
-        internal static WPinternalsConfig Config;
-        internal static Mutex mutex = new(false, "Global\\WPinternalsRunning");
-        internal static DownloadsViewModel DownloadManager;
-        internal static bool InterruptBoot = false;
-        internal static bool IsPnPEventLogMissing = true;
-
-        public App()
-            : base()
-        {
-            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
-
-#if NETCORE
-            System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
-#endif
-
-            if (Environment.GetCommandLineArgs().Length > 1)
-            {
-                CommandLine.OpenConsole();
-            }
-
-            try
-            {
-                if (!mutex.WaitOne(0, false))
-                {
-                    if (Environment.GetCommandLineArgs().Length > 1)
-                    {
-                        Console.WriteLine("Windows Phone Internals is already running");
-                        CommandLine.CloseConsole();
-                    }
-                    else
-                    {
-                        MessageBox.Show("Windows Phone Internals is already running.", "Windows Phone Internals", MessageBoxButton.OK, MessageBoxImage.Exclamation);
-                    }
-
-                    Environment.Exit(0);
-                }
-            }
-            catch (AbandonedMutexException) { }
-
-            Registration.CheckExpiration();
-
-            string PatchDefintionsXml;
-            string PatchDefintionsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PatchDefintions.xml");
-            if (File.Exists(PatchDefintionsPath))
-            {
-                PatchDefintionsXml = File.ReadAllText(PatchDefintionsPath);
-            }
-            else
-            {
-                using Stream stream = System.Reflection.Assembly.GetEntryAssembly().GetManifestResourceStream("WPinternals.PatchDefinitions.xml");
-                using StreamReader sr = new(stream);
-                PatchDefintionsXml = sr.ReadToEnd();
-            }
-            PatchEngine = new PatchEngine(PatchDefintionsXml);
-
-            Config = WPinternalsConfig.ReadConfig();
-        }
-
-        private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
-        {
-            if (e.ExceptionObject is Exception)
-            {
-                LogFile.LogException(e.ExceptionObject as Exception);
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Windows;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+        internal static Action NavigateToGettingStarted;
+        internal static Action NavigateToUnlockBoot;
+        internal static PatchEngine PatchEngine;
+        internal static WPinternalsConfig Config;
+        internal static Mutex mutex = new(false, "Global\\WPinternalsRunning");
+        internal static DownloadsViewModel DownloadManager;
+        internal static bool InterruptBoot = false;
+        internal static bool IsPnPEventLogMissing = true;
+
+        public App()
+            : base()
+        {
+            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
+
+#if NETCORE
+            System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
+#endif
+
+            if (Environment.GetCommandLineArgs().Length > 1)
+            {
+                CommandLine.OpenConsole();
+            }
+
+            try
+            {
+                if (!mutex.WaitOne(0, false))
+                {
+                    if (Environment.GetCommandLineArgs().Length > 1)
+                    {
+                        Console.WriteLine("Windows Phone Internals is already running");
+                        CommandLine.CloseConsole();
+                    }
+                    else
+                    {
+                        MessageBox.Show("Windows Phone Internals is already running.", "Windows Phone Internals", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                    }
+
+                    Environment.Exit(0);
+                }
+            }
+            catch (AbandonedMutexException) { }
+
+            Registration.CheckExpiration();
+
+            string PatchDefintionsXml;
+            string PatchDefintionsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PatchDefintions.xml");
+            if (File.Exists(PatchDefintionsPath))
+            {
+                PatchDefintionsXml = File.ReadAllText(PatchDefintionsPath);
+            }
+            else
+            {
+                using Stream stream = System.Reflection.Assembly.GetEntryAssembly().GetManifestResourceStream("WPinternals.PatchDefinitions.xml");
+                using StreamReader sr = new(stream);
+                PatchDefintionsXml = sr.ReadToEnd();
+            }
+            PatchEngine = new PatchEngine(PatchDefintionsXml);
+
+            Config = WPinternalsConfig.ReadConfig();
+        }
+
+        private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
+            if (e.ExceptionObject is Exception)
+            {
+                LogFile.LogException(e.ExceptionObject as Exception);
+            }
+        }
+    }
+}
diff --git a/CommandLine.cs b/WPinternals/CommandLine.cs
similarity index 98%
rename from CommandLine.cs
rename to WPinternals/CommandLine.cs
index d2328ee..39992ba 100644
--- a/CommandLine.cs
+++ b/WPinternals/CommandLine.cs
@@ -1,2109 +1,2109 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WPinternals
-{
-    internal static class CommandLine
-    {
-        [DllImport("kernel32.dll", SetLastError = true)]
-        private static extern bool AllocConsole();
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        private static extern bool AttachConsole(int dwProcessId);
-
-        [DllImport("kernel32.dll")]
-        private static extern IntPtr GetConsoleWindow();
-
-        [DllImport("user32.dll")]
-        private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
-
-        private const UInt32 StdOutputHandle = 0xFFFFFFF5;
-
-        [DllImport("kernel32.dll")]
-        private static extern IntPtr GetStdHandle(UInt32 nStdHandle);
-
-        [DllImport("kernel32.dll")]
-        private static extern void SetStdHandle(UInt32 nStdHandle, IntPtr handle);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        private static extern IntPtr CreateFile(string lpFileName, uint dwDesiredAccess, uint dwShareMode, uint lpSecurityAttributes, uint dwCreationDisposition, uint dwFlagsAndAttributes, uint hTemplateFile);
-
-        [DllImport("user32.dll")]
-        private static extern IntPtr GetForegroundWindow();
-
-        private const int SW_HIDE = 0;
-        private const int SW_SHOW = 5;
-
-        private const int MY_CODE_PAGE = 437;
-        private const uint GENERIC_WRITE = 0x40000000;
-        private const uint FILE_SHARE_WRITE = 0x2;
-        private const uint OPEN_EXISTING = 0x3;
-
-        internal static bool IsConsoleVisible = false;
-        internal static bool IsNewConsoleCreated = false;
-
-        private static IntPtr hConsoleWnd;
-
-        [DllImport("User32.Dll", EntryPoint = "PostMessageA")]
-        private static extern bool PostMessage(IntPtr hWnd, uint msg, int wParam, int lParam);
-
-        private const int VK_RETURN = 0x0D;
-        private const int WM_KEYDOWN = 0x100;
-
-        /// <summary>
-        /// When the main window should not be shown, this function should call ExitProcess and it should not return.
-        /// </summary>
-        internal static async Task ParseCommandLine(System.Threading.SynchronizationContext UIContext)
-        {
-            FFU FFU = null;
-            PhoneNotifierViewModel Notifier;
-            NokiaFlashModel FlashModel;
-            NokiaPhoneModel NormalModel;
-            PhoneInfo Info;
-            string ProductType;
-            string ProductCode;
-            string OperatorCode;
-            string DownloadFolder;
-            string FFUFilePath;
-            string URL;
-            string[] URLs;
-            Uri URI;
-            string FFUFileName;
-            string EmergencyFileName;
-            string EmergencyFilePath;
-            string ProgrammerPath = "";
-            string PayloadPath = "";
-            string EfiEspImagePath = null;
-            string MainOsImagePath = null;
-            DiscUtils.Fat.FatFileSystem UnlockedEFIESPFileSystem;
-            DiscUtils.Ntfs.NtfsFileSystem UnlockedMainOsFileSystem;
-            bool PatchResult;
-
-            try
-            {
-                string[] args = Environment.GetCommandLineArgs();
-
-                if (args.Length == 1)
-                {
-                    return;
-                }
-
-                switch (args[1].ToLower().TrimStart(new char[] { '-', '/' }))
-                {
-#if DEBUG
-                    case "test":
-                        LogFile.BeginAction("Test");
-                        await TestCode.Test(UIContext);
-                        LogFile.EndAction("Test");
-                        break;
-#endif
-                    case "flashpartition":
-                        if (args.Length < 4)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashPartition <Partition name> <Partition file> <Optional: FFU file>");
-                        }
-
-                        if (args.Length >= 5)
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2FlashPartition(UIContext, args[4], args[2], args[3]);
-                        }
-                        else
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2FlashPartition(UIContext, null, args[2], args[3]);
-                        }
-
-                        break;
-                    case "flashraw":
-                        if (args.Length < 4)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashRaw <Start sector> <Raw file> <Optional: FFU file>");
-                        }
-
-                        UInt64 StartSector = 0;
-                        try
-                        {
-                            StartSector = args[2].StartsWith("0x", StringComparison.OrdinalIgnoreCase)
-                                ? Convert.ToUInt64(args[2][2..], 16)
-                                : Convert.ToUInt64(args[2], 10);
-                        }
-                        catch
-                        {
-                            LogFile.Log("Bad start sector", LogType.ConsoleOnly);
-                            break;
-                        }
-                        if (args.Length >= 5)
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2FlashRaw(UIContext, StartSector, args[3], args[4]);
-                        }
-                        else
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2FlashRaw(UIContext, StartSector, args[3], null);
-                        }
-
-                        break;
-                    case "flashpartitionimmediately":
-                        if (args.Length < 5)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashPartition <Partition name> <Partition file> <FFU Path>");
-                        }
-
-                        await LumiaV2UnlockBootViewModel.LumiaV2FlashPartition(UIContext, args[4], args[2], args[3], false);
-                        break;
-                    case "readgpt":
-                        LogFile.BeginAction("ReadGPT");
-                        try
-                        {
-                            Notifier = new PhoneNotifierViewModel();
-                            UIContext.Send(s => Notifier.Start(), null);
-
-                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Bootloader); // This also works for Bootloader Spec A
-
-                            GPT GPT = FlashModel.ReadGPT(); // May throw NotSupportedException
-                            foreach (Partition Partition in GPT.Partitions)
-                            {
-                                LogFile.Log(Partition.Name.PadRight(20) + "0x" + Partition.FirstSector.ToString("X8") + " - 0x" + Partition.LastSector.ToString("X8") + "    " + Partition.Volume, LogType.ConsoleOnly);
-                            }
-
-                            if (FlashModel.ReadPhoneInfo(false).FlashAppProtocolVersionMajor >= 2)
-                            {
-                                FlashModel.SwitchToFlashAppContext();
-                            }
-                            else
-                            {
-                                await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-                            }
-
-                            Notifier.Stop();
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                        }
-                        finally
-                        {
-                            LogFile.EndAction("ReadGPT");
-                        }
-                        break;
-                    case "backupgpt":
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -BackupGPT <Path to xml-file>");
-                        }
-
-                        LogFile.BeginAction("BackupGPT");
-                        try
-                        {
-                            Notifier = new PhoneNotifierViewModel();
-                            UIContext.Send(s => Notifier.Start(), null);
-                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-                            GPT GPT = FlashModel.ReadGPT(); // May throw NotSupportedException
-                            Directory.CreateDirectory(Path.GetDirectoryName(args[2]));
-                            GPT.WritePartitions(args[2]);
-                            FlashModel.SwitchToFlashAppContext();
-                            Notifier.Stop();
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                        }
-                        finally
-                        {
-                            LogFile.EndAction("BackupGPT");
-                        }
-                        break;
-                    case "restoregpt":
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RestoreGPT <Path to xml-file>");
-                        }
-
-                        LogFile.BeginAction("RestoreGPT");
-                        try
-                        {
-                            Notifier = new PhoneNotifierViewModel();
-                            UIContext.Send(s => Notifier.Start(), null);
-                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-                            byte[] GptChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
-                            GPT GPT = new(GptChunk);
-                            string Xml = File.ReadAllText(args[2]);
-                            GPT.MergePartitions(Xml, false);
-                            GPT.Rebuild();
-                            await LumiaV2UnlockBootViewModel.LumiaV2CustomFlash(Notifier, null, false, false, 0, GptChunk, true, true);
-                            FlashModel.SwitchToFlashAppContext();
-                            Notifier.Stop();
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                        }
-                        finally
-                        {
-                            LogFile.EndAction("RestoreGPT");
-                        }
-                        break;
-                    case "mergegpt":
-                        if (args.Length < 4)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -MergeGPT <Path to input-xml-file> <Path to input-xml-file> <Optional: Path to output-xml-file> Or use: WPinternals.exe -MergeGPT <Path to input-xml-file> <Path to ZIP-file including Partitions.xml> <Optional: Path to output-xml-file>");
-                        }
-
-                        LogFile.BeginAction("MergeGPT");
-                        try
-                        {
-                            GPT GPT = GPT.ReadPartitions(args[2]);
-
-                            ZipArchive Archive = null;
-                            FileStream s = null;
-                            try
-                            {
-                                s = new FileStream(args[3], FileMode.Open, FileAccess.Read);
-                                Archive = new ZipArchive(s);
-                            }
-                            catch { }
-
-                            if (Archive == null)
-                            {
-                                s?.Close();
-
-                                // Assume Xml-file
-                                GPT.MergePartitionsFromFile(args[3], true);
-                            }
-                            else
-                            {
-                                ZipArchiveEntry PartitionEntry = Archive.GetEntry("Partitions.xml");
-                                if (PartitionEntry == null)
-                                {
-                                    GPT.MergePartitions(null, true, Archive);
-                                }
-                                else
-                                {
-                                    using Stream ZipStream = PartitionEntry.Open();
-                                    using StreamReader ZipReader = new(ZipStream);
-                                    string PartitionXml = ZipReader.ReadToEnd();
-                                    GPT.MergePartitions(PartitionXml, true, Archive);
-                                }
-                            }
-
-                            Archive?.Dispose();
-
-                            if (args.Length >= 5)
-                            {
-                                GPT.WritePartitions(args[4]);
-                            }
-
-                            foreach (Partition Partition in GPT.Partitions)
-                            {
-                                LogFile.Log(Partition.Name.PadRight(20) + "0x" + Partition.FirstSector.ToString("X8") + " - 0x" + Partition.LastSector.ToString("X8") + "    " + Partition.Volume, LogType.ConsoleOnly);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                        }
-                        finally
-                        {
-                            LogFile.EndAction("MergeGPT");
-                        }
-                        break;
-                    case "dumpffu":
-                        if (args.Length < 4)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DumpFFU <FFU Path> <Destination Path> <Optional: Partition Name>");
-                        }
-
-                        FFU = new FFU(args[2]);
-                        if (args.Length < 5)
-                        {
-                            foreach (Partition Partition in FFU.GPT.Partitions)
-                            {
-                                if (FFU.IsPartitionPresentInFFU(Partition.Name))
-                                {
-                                    FFU.WritePartition(Partition.Name, Path.Combine(args[3], Partition.Name + ".bin"));
-                                }
-                            }
-                        }
-                        else
-                        {
-                            Partition Target = FFU.GPT.GetPartition(args[4]);
-                            if ((Target == null) || (!FFU.IsPartitionPresentInFFU(Target.Name)))
-                            {
-                                throw new InvalidOperationException("Partition not found in FFU!");
-                            }
-
-                            FFU.WritePartition(Target.Name, Path.Combine(args[3], Target.Name + ".bin"));
-                        }
-                        break;
-                    case "dumpuefi":
-                        if (args.Length < 4)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DumpUEFI <UEFI binary or FFU file> <Destination Path>");
-                        }
-
-                        byte[] UefiBinary;
-                        if (FFU.IsFFU(args[2]))
-                        {
-                            FFU = new FFU(args[2]);
-                            UefiBinary = FFU.GetPartition("UEFI");
-                        }
-                        else
-                        {
-                            UefiBinary = File.ReadAllBytes(args[2]);
-                        }
-
-                        UEFI UEFI = new(UefiBinary);
-
-                        foreach (EFI Efi in UEFI.EFIs)
-                        {
-                            byte[] EfiBinary = UEFI.GetFile(Efi.Guid);
-                            string Name = Efi.Name ?? Efi.Guid.ToString();
-
-                            if (!Name.Contains('.'))
-                            {
-                                Name += Efi.Type switch
-                                {
-                                    5 or 7 => ".dll",
-                                    9 => ".exe",
-                                    _ => ".bin",
-                                };
-                            }
-                            string EfiPath = Path.Combine(args[3], Name);
-                            Directory.CreateDirectory(Path.GetDirectoryName(EfiPath));
-                            File.WriteAllBytes(EfiPath, EfiBinary);
-                        }
-                        break;
-                    case "testprogrammer":
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -TestProgrammer <Path to ede-file>");
-                        }
-
-                        await TestCode.TestProgrammer(UIContext, args[2]);
-                        break;
-                    case "findflashingprofile":
-                        Notifier = new PhoneNotifierViewModel();
-                        UIContext.Send(s => Notifier.Start(), null);
-                        if (args.Length > 2)
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, args[2]);
-                        }
-                        else
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, null);
-                        }
-
-                        Notifier.Stop();
-                        break;
-                    case "findflashingprofileexperimental":
-                        Notifier = new PhoneNotifierViewModel();
-                        UIContext.Send(s => Notifier.Start(), null);
-                        if (args.Length > 2)
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, args[2], Experimental: true);
-                        }
-                        else
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, null, Experimental: true);
-                        }
-
-                        Notifier.Stop();
-                        break;
-                    case "findflashingprofilenorestart":
-                        Notifier = new PhoneNotifierViewModel();
-                        UIContext.Send(s => Notifier.Start(), null);
-                        if (args.Length > 2)
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, args[2], false);
-                        }
-                        else
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, null, false);
-                        }
-
-                        Notifier.Stop();
-                        break;
-                    case "enabletestsigning":
-                        if (args.Length > 2)
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2EnableTestSigning(UIContext, args[2]);
-                        }
-                        else
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2EnableTestSigning(UIContext, null);
-                        }
-
-                        break;
-                    case "enabletestsigningnorestart":
-                        if (args.Length > 2)
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2EnableTestSigning(UIContext, args[2], false);
-                        }
-                        else
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2EnableTestSigning(UIContext, null, false);
-                        }
-
-                        break;
-                    case "clearnv":
-                        if (args.Length > 2)
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2ClearNV(UIContext, args[2]);
-                        }
-                        else
-                        {
-                            await LumiaV2UnlockBootViewModel.LumiaV2ClearNV(UIContext, null);
-                        }
-
-                        break;
-                    case "switchtomassstoragemode":
-                        LogFile.BeginAction("SwitchToMassStorageMode");
-                        try
-                        {
-                            Notifier = new PhoneNotifierViewModel();
-                            UIContext.Send(s => Notifier.Start(), null);
-                            LogFile.Log("Command: Switch to Mass Storage Mode", LogType.FileAndConsole);
-                            if (args.Length > 2)
-                            {
-                                await LumiaV2UnlockBootViewModel.LumiaV2SwitchToMassStorageMode(Notifier, args[2]);
-                            }
-                            else
-                            {
-                                await LumiaV2UnlockBootViewModel.LumiaV2SwitchToMassStorageMode(Notifier, null);
-                            }
-
-                            Notifier.Stop();
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                        }
-                        finally
-                        {
-                            LogFile.EndAction("SwitchToMassStorageMode");
-                        }
-                        break;
-                    case "relockphone":
-                        Notifier = new PhoneNotifierViewModel();
-                        try
-                        {
-                            UIContext.Send(s => Notifier.Start(), null);
-                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-                            Info = FlashModel.ReadPhoneInfo();
-                            Info.Log(LogType.ConsoleOnly);
-
-                            FFU ProfileFFU = null;
-                            FFU CurrentFFU;
-                            for (int i = 2; i <= 3; i++)
-                            {
-                                if (args.Length > i)
-                                {
-                                    CurrentFFU = new FFU(args[i]);
-                                    string CurrentVersion = CurrentFFU.GetOSVersion();
-                                    string PlatformID = CurrentFFU.PlatformID;
-
-                                    // Check if the current FFU matches the connected phone, so that the FFU can be used for profiling.
-                                    if (Info.PlatformID.StartsWith(PlatformID, StringComparison.OrdinalIgnoreCase))
-                                    {
-                                        ProfileFFU = CurrentFFU;
-                                    }
-                                }
-                            }
-
-                            if (ProfileFFU == null)
-                            {
-                                List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => Info.PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists()).ToList();
-                                ProfileFFU = FFUs.Count > 0
-                                    ? new FFU(FFUs[0].Path)
-                                    : throw new WPinternalsException("Profile FFU missing", "No profile FFU has been found in the repository for your device. You can add a profile FFU within the download section of the tool or by using the command line.");
-                            }
-                            LogFile.Log("Profile FFU: " + ProfileFFU.Path);
-
-                            UIContext.Send(s => Notifier.Start(), null);
-
-                            await LumiaUnlockBootloaderViewModel.LumiaRelockUEFI(Notifier, ProfileFFU.Path);
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                        }
-                        Notifier.Stop();
-                        break;
-                    case "addffu":
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -AddFFU <Path to FFU-file>");
-                        }
-
-                        App.Config.AddFfuToRepository(args[2]);
-                        break;
-                    case "removeffu":
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RemoveFFU <Path to FFU-file>");
-                        }
-
-                        App.Config.RemoveFfuFromRepository(args[2]);
-                        break;
-                    case "addemergency":
-                        if (args.Length < 5)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -AddEmergnency <Type> <Path to Programmer-file> <Path to Payload-file>");
-                        }
-
-                        App.Config.AddEmergencyToRepository(args[2], args[3], args[4]);
-                        break;
-                    case "removeemergency":
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RemoveEmergency <Path to Programmer-file>");
-                        }
-
-                        App.Config.RemoveEmergencyFromRepository(args[2]);
-                        break;
-                    case "listrepository":
-                        int Count = 0;
-                        LogFile.Log("", LogType.ConsoleOnly);
-                        LogFile.Log("FFU Repository:", LogType.ConsoleOnly);
-                        foreach (FFUEntry Entry in App.Config.FFURepository)
-                        {
-                            LogFile.Log("", LogType.ConsoleOnly);
-                            LogFile.Log("FFU " + Count.ToString() + ":", LogType.ConsoleOnly);
-                            LogFile.Log("File: " + Entry.Path + (Entry.Exists() ? "" : " (file is missing)"), LogType.ConsoleOnly);
-                            LogFile.Log("Platform ID: " + Entry.PlatformID, LogType.ConsoleOnly);
-                            if (Entry.FirmwareVersion != null)
-                            {
-                                LogFile.Log("Firmware version: " + Entry.FirmwareVersion, LogType.ConsoleOnly);
-                            }
-
-                            if (Entry.OSVersion != null)
-                            {
-                                LogFile.Log("OS version: " + Entry.OSVersion, LogType.ConsoleOnly);
-                            }
-
-                            Count++;
-                        }
-                        LogFile.Log("", LogType.ConsoleOnly);
-                        LogFile.Log("Emergency Repository:", LogType.ConsoleOnly);
-                        Count = 0;
-                        foreach (EmergencyFileEntry Entry in App.Config.EmergencyRepository)
-                        {
-                            LogFile.Log("", LogType.ConsoleOnly);
-                            LogFile.Log("Emergency " + Count.ToString() + ":", LogType.ConsoleOnly);
-                            LogFile.Log("Type: " + Entry.Type, LogType.ConsoleOnly);
-                            LogFile.Log("Programmer file: " + Entry.ProgrammerPath + (Entry.ProgrammerExists() ? "" : " (file is missing)"), LogType.ConsoleOnly);
-                            if (Entry.PayloadPath != null)
-                            {
-                                LogFile.Log("Payload file: " + Entry.PayloadPath + (Entry.PayloadExists() ? "" : " (file is missing)"), LogType.ConsoleOnly);
-                            }
-
-                            Count++;
-                        }
-                        break;
-                    case "showffu":
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -ShowFFU <Path to FFU-file>");
-                        }
-
-                        string FFUPath = args[2];
-                        LogFile.Log("FFU: " + FFUPath, LogType.ConsoleOnly);
-                        FFU = new FFU(FFUPath);
-
-                        // Show basics
-                        LogFile.Log("Platform ID: " + FFU.PlatformID, LogType.ConsoleOnly);
-                        string Firmware = FFU.GetFirmwareVersion();
-                        if (Firmware != null)
-                        {
-                            LogFile.Log("Firmware version: " + Firmware, LogType.ConsoleOnly);
-                        }
-
-                        string OSVersion = FFU.GetOSVersion();
-                        if (OSVersion != null)
-                        {
-                            LogFile.Log("OS version: " + OSVersion, LogType.ConsoleOnly);
-                        }
-
-                        // Show partitions from GPT (also show which partitions are in the FFU payload)
-                        LogFile.Log("", LogType.ConsoleOnly);
-                        LogFile.Log("Partition table:", LogType.ConsoleOnly);
-                        LogFile.Log("Name".PadRight(20) + "Start-sector".PadRight(20) + "End-sector".PadRight(20) + "Present in FFU", LogType.ConsoleOnly);
-                        foreach (Partition p in FFU.GPT.Partitions)
-                        {
-                            LogFile.Log(p.Name.PadRight(20) + ("0x" + p.FirstSector.ToString("X16")).PadRight(20) + ("0x" + p.LastSector.ToString("X16")).PadRight(20) + (FFU.IsPartitionPresentInFFU(p.Name) ? "Yes" : "No"), LogType.ConsoleOnly);
-                        }
-                        break;
-                    case "showphoneinfo":
-                        LogFile.Log("Command: Show phone info", LogType.FileAndConsole);
-                        Notifier = new PhoneNotifierViewModel();
-                        UIContext.Send(s => Notifier.Start(), null);
-                        FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-                        Info = FlashModel.ReadPhoneInfo();
-                        Info.Log(LogType.ConsoleOnly);
-                        Notifier.Stop();
-                        break;
-                    case "unlockbootloader":
-                        LogFile.BeginAction("UnlockBootloader");
-                        try
-                        {
-                            LogFile.Log("Command: Unlock Bootloader", LogType.FileAndConsole);
-                            Notifier = new PhoneNotifierViewModel();
-                            UIContext.Send(s => Notifier.Start(), null);
-                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-                            Info = FlashModel.ReadPhoneInfo();
-                            Info.Log(LogType.ConsoleOnly);
-
-                            FFU ProfileFFU = null;
-                            FFU SupportedFFU = null;
-                            FFU CurrentFFU;
-                            for (int i = 2; i <= 3; i++)
-                            {
-                                if (args.Length > i)
-                                {
-                                    CurrentFFU = new FFU(args[i]);
-                                    string CurrentVersion = CurrentFFU.GetOSVersion();
-                                    string PlatformID = CurrentFFU.PlatformID;
-
-                                    // Check if the current FFU matches the connected phone, so that the FFU can be used for profiling.
-                                    if (Info.PlatformID.StartsWith(PlatformID, StringComparison.OrdinalIgnoreCase))
-                                    {
-                                        ProfileFFU = CurrentFFU;
-                                    }
-
-                                    // Check if the current FFU is supported for unlocking.
-                                    if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == CurrentVersion))
-                                    {
-                                        SupportedFFU = CurrentFFU;
-                                    }
-                                }
-                            }
-
-                            if (ProfileFFU == null)
-                            {
-                                List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => Info.PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists()).ToList();
-                                ProfileFFU = FFUs.Count > 0
-                                    ? new FFU(FFUs[0].Path)
-                                    : throw new WPinternalsException("Profile FFU missing", "No profile FFU has been found in the repository for your device. You can add a profile FFU within the download section of the tool or by using the command line.");
-                            }
-                            LogFile.Log("Profile FFU: " + ProfileFFU.Path);
-
-                            if (SupportedFFU == null)
-                            {
-                                List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)).ToList();
-                                SupportedFFU = FFUs.Count > 0
-                                    ? new FFU(FFUs[0].Path)
-                                    : throw new WPinternalsException("No donor-FFU found with supported OS version", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
-                            }
-
-                            await LumiaUnlockBootloaderViewModel.LumiaUnlockUEFI(Notifier, ProfileFFU.Path, null, SupportedFFU.Path);
-
-                            Notifier.Stop();
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                        }
-                        finally
-                        {
-                            LogFile.EndAction("UnlockBootloader");
-                        }
-                        break;
-                    case "flashcustomrom":
-                        LogFile.BeginAction("FlashCustomROM");
-                        try
-                        {
-                            LogFile.Log("Command: Flash Custom ROM", LogType.FileAndConsole);
-                            if (args.Length < 3)
-                            {
-                                throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashCustomROM <Path to Custom ROM ZIP-file>");
-                            }
-
-                            string CustomRomPath = args[2];
-                            LogFile.Log("Custom ROM: " + CustomRomPath, LogType.FileAndConsole);
-                            Notifier = new PhoneNotifierViewModel();
-                            UIContext.Send(s => Notifier.Start(), null);
-                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-                            Info = FlashModel.ReadPhoneInfo();
-                            Info.Log(LogType.ConsoleOnly);
-                            LogFile.Log("Preparing to flash Custom ROM", LogType.FileAndConsole);
-                            await LumiaV2UnlockBootViewModel.LumiaV2FlashArchive(Notifier, CustomRomPath);
-                            LogFile.Log("Custom ROM flashed successfully", LogType.FileAndConsole);
-                            Notifier.Stop();
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                        }
-                        finally
-                        {
-                            LogFile.EndAction("FlashCustomROM");
-                        }
-                        break;
-                    case "flashffu":
-                        LogFile.BeginAction("FlashFFU");
-                        try
-                        {
-                            LogFile.Log("Command: Flash FFU", LogType.FileAndConsole);
-                            if (args.Length < 3)
-                            {
-                                throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashFFU <Path to FFU-file>");
-                            }
-
-                            FFUPath = args[2];
-                            LogFile.Log("FFU file: " + FFUPath, LogType.FileAndConsole);
-                            Notifier = new PhoneNotifierViewModel();
-                            UIContext.Send(s => Notifier.Start(), null);
-                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-                            Info = FlashModel.ReadPhoneInfo();
-                            Info.Log(LogType.ConsoleOnly);
-                            LogFile.Log("Flashing FFU...", LogType.FileAndConsole);
-                            await Task.Run(() => FlashModel.FlashFFU(new FFU(FFUPath), true, (byte)(!Info.IsBootloaderSecure ? FlashOptions.SkipSignatureCheck : 0)));
-                            LogFile.Log("FFU flashed successfully", LogType.FileAndConsole);
-                            Notifier.Stop();
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                        }
-                        finally
-                        {
-                            LogFile.EndAction("FlashFFU");
-                        }
-                        break;
-                    case "fixbootafterunlockingbootloader":
-                        LogFile.BeginAction("FixBoot");
-                        try
-                        {
-                            LogFile.Log("Command: Fix boot after unlocking bootloader", LogType.FileAndConsole);
-                            Notifier = new PhoneNotifierViewModel();
-                            UIContext.Send(s => Notifier.Start(), null);
-                            string Drive = await LumiaV2UnlockBootViewModel.LumiaV2SwitchToMassStorageMode(Notifier, null);
-                            Notifier.Stop();
-                            App.PatchEngine.TargetPath = Drive + "\\";
-                            PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
-                            if (!PatchResult)
-                            {
-                                throw new WPinternalsException("Patch failed", "An error occured while patching Operating System files on the MainOS partition of your phone. Make sure your phone runs a supported Operating System version.");
-                            }
-
-                            LogFile.Log("Fixed bootloader", LogType.FileAndConsole);
-                            LogFile.Log("The phone is left in Mass Storage mode", LogType.FileAndConsole);
-                            LogFile.Log("Press and hold the power-button of the phone for at least 10 seconds to reset the phone", LogType.FileAndConsole);
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                        }
-                        finally
-                        {
-                            LogFile.EndAction("FixBoot");
-                        }
-                        break;
-                    case "enablerootaccess":
-                        LogFile.BeginAction("EnableRootAccess");
-                        try
-                        {
-                            LogFile.Log("Command: Enable root access on the phone", LogType.FileAndConsole);
-                            Notifier = new PhoneNotifierViewModel();
-                            UIContext.Send(s => Notifier.Start(), null);
-                            string Drive = await LumiaV2UnlockBootViewModel.LumiaV2SwitchToMassStorageMode(Notifier, null);
-                            Notifier.Stop();
-                            App.PatchEngine.TargetPath = Drive + "\\EFIESP\\";
-                            PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
-                            if (!PatchResult)
-                            {
-                                throw new WPinternalsException("Patch failed", "An error occured while patching Operating System files on the EFIESP partition of your phone. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported.");
-                            }
-
-                            App.PatchEngine.TargetPath = Drive + "\\";
-                            PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
-                            if (!PatchResult)
-                            {
-                                throw new WPinternalsException("Patch failed", "An error occured while patching Operating System files on the MainOS partition of your phone. Make sure your phone runs a supported Operating System version.");
-                            }
-
-                            PatchResult = App.PatchEngine.Patch("RootAccess-MainOS");
-                            if (!PatchResult)
-                            {
-                                throw new WPinternalsException("Patch failed", "An error occured while modifying Operating System files on the MainOS partition of your phone for Root Access. Make sure your phone runs a supported Operating System version.");
-                            }
-
-                            LogFile.Log("Root Access enabled!", LogType.FileAndConsole);
-                            LogFile.Log("The phone is left in Mass Storage mode", LogType.FileAndConsole);
-                            LogFile.Log("Press and hold the power-button of the phone for at least 10 seconds to reset the phone", LogType.FileAndConsole);
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                        }
-                        finally
-                        {
-                            LogFile.EndAction("EnableRootAccess");
-                        }
-                        break;
-                    case "unlockbootloaderonimage":
-                        LogFile.Log("Command: Unlock bootloader on image", LogType.FileAndConsole);
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -UnlockBootLoaderOnImage <EFIESP image file> <Optional: MainOS image file> <Optional: donor-FFU file with supported version of bootfiles>");
-                        }
-
-                        FFUFilePath = null;
-                        EfiEspImagePath = args[2];
-                        if (args.Length > 3)
-                        {
-                            if (FFU.IsFFU(args[3]))
-                            {
-                                FFUFilePath = args[3];
-                            }
-                            else
-                            {
-                                MainOsImagePath = args[3];
-                            }
-                        }
-                        if (args.Length > 4)
-                        {
-                            FFUFilePath = args[4];
-                        }
-
-                        using (FileStream FileSystemStream = new(EfiEspImagePath, FileMode.Open, FileAccess.ReadWrite))
-                        {
-                            UnlockedEFIESPFileSystem = new DiscUtils.Fat.FatFileSystem(FileSystemStream);
-
-                            if (FFUFilePath != null)
-                            {
-                                FFU SupportedFFU = new(FFUFilePath);
-                                LogFile.Log("Donor FFU: " + SupportedFFU.Path);
-                                byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
-                                DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP));
-                                DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
-                                MemoryStream SupportedMobileStartupMemStream = new();
-                                SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
-                                byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
-                                SupportedMobileStartupMemStream.Close();
-                                SupportedMobileStartupStream.Close();
-
-                                // Save supported mobilestartup.efi
-                                LogFile.Log("Taking mobilestartup.efi from donor-FFU");
-                                Stream MobileStartupStream = UnlockedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Create, FileAccess.Write);
-                                MobileStartupStream.Write(SupportedMobileStartup, 0, SupportedMobileStartup.Length);
-                                MobileStartupStream.Close();
-                            }
-
-                            App.PatchEngine.TargetImage = UnlockedEFIESPFileSystem;
-                            PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
-                            if (!PatchResult)
-                            {
-                                throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
-                            }
-
-                            // Edit BCD
-                            LogFile.Log("Edit BCD");
-                            using Stream BCDFileStream = UnlockedEFIESPFileSystem.OpenFile(@"\efi\Microsoft\Boot\BCD", FileMode.Open, FileAccess.ReadWrite);
-                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
-                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
-                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
-                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
-                            if (NoCodeIntegrityElement != null)
-                            {
-                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                            }
-                            else
-                            {
-                                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
-                            }
-
-                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
-                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
-                            if (NoCodeIntegrityElement != null)
-                            {
-                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                            }
-                            else
-                            {
-                                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
-                            }
-                        }
-
-                        if (MainOsImagePath != null)
-                        {
-                            using FileStream FileSystemStream = new(MainOsImagePath, FileMode.Open, FileAccess.ReadWrite);
-                            UnlockedMainOsFileSystem = new DiscUtils.Ntfs.NtfsFileSystem(FileSystemStream);
-
-                            App.PatchEngine.TargetImage = UnlockedMainOsFileSystem;
-                            PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
-                            if (!PatchResult)
-                            {
-                                throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
-                            }
-                        }
-                        LogFile.Log("Bootloader unlocked on image", LogType.FileAndConsole);
-                        break;
-                    case "enablerootaccessonimage":
-                        LogFile.Log("Command: Enable root access on image", LogType.FileAndConsole);
-                        if (args.Length < 4)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -EnableRootAccessOnImage <EFIESP image file> <MainOS image file> <Optional: donor-FFU file with supported version of bootfiles>");
-                        }
-
-                        FFUFilePath = null;
-                        EfiEspImagePath = args[2];
-                        MainOsImagePath = args[3];
-                        if (args.Length > 4)
-                        {
-                            FFUFilePath = args[4];
-                        }
-
-                        using (FileStream FileSystemStream = new(EfiEspImagePath, FileMode.Open, FileAccess.ReadWrite))
-                        {
-                            UnlockedEFIESPFileSystem = new DiscUtils.Fat.FatFileSystem(FileSystemStream);
-
-                            if (FFUFilePath != null)
-                            {
-                                FFU SupportedFFU = new(FFUFilePath);
-                                LogFile.Log("Supported FFU: " + SupportedFFU.Path);
-                                byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
-                                DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP));
-                                DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
-                                MemoryStream SupportedMobileStartupMemStream = new();
-                                SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
-                                byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
-                                SupportedMobileStartupMemStream.Close();
-                                SupportedMobileStartupStream.Close();
-
-                                // Save supported mobilestartup.efi
-                                LogFile.Log("Taking mobilestartup.efi from donor-FFU");
-                                Stream MobileStartupStream = UnlockedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Create, FileAccess.Write);
-                                MobileStartupStream.Write(SupportedMobileStartup, 0, SupportedMobileStartup.Length);
-                                MobileStartupStream.Close();
-                            }
-
-                            App.PatchEngine.TargetImage = UnlockedEFIESPFileSystem;
-                            PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
-                            if (!PatchResult)
-                            {
-                                throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
-                            }
-
-                            // Edit BCD
-                            LogFile.Log("Edit BCD");
-                            using Stream BCDFileStream = UnlockedEFIESPFileSystem.OpenFile(@"\efi\Microsoft\Boot\BCD", FileMode.Open, FileAccess.ReadWrite);
-                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
-                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
-                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
-                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
-                            if (NoCodeIntegrityElement != null)
-                            {
-                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                            }
-                            else
-                            {
-                                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
-                            }
-
-                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
-                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
-                            if (NoCodeIntegrityElement != null)
-                            {
-                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                            }
-                            else
-                            {
-                                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
-                            }
-                        }
-
-                        using (FileStream FileSystemStream = new(MainOsImagePath, FileMode.Open, FileAccess.ReadWrite))
-                        {
-                            UnlockedMainOsFileSystem = new DiscUtils.Ntfs.NtfsFileSystem(FileSystemStream);
-
-                            App.PatchEngine.TargetImage = UnlockedMainOsFileSystem;
-                            PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
-                            if (!PatchResult)
-                            {
-                                throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
-                            }
-
-                            PatchResult = App.PatchEngine.Patch("RootAccess-MainOS");
-                            if (!PatchResult)
-                            {
-                                throw new WPinternalsException("Failed to patch MainOS", "An error occured while modifying Operating System files on the MainOS partition you provided for Root Access. Make sure your phone runs a supported Operating System version.");
-                            }
-                        }
-                        LogFile.Log("Root access enabled on image", LogType.FileAndConsole);
-                        break;
-                    case "unlockbootloaderonmountedimage":
-                        LogFile.Log("Command: Unlock bootloader on mounted image", LogType.FileAndConsole);
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -UnlockBootLoaderOnMountedImage <Directory of mounted EFIESP image file> <Optional: Directory of mounted MainOS image file> <Optional: donor-FFU file with supported version of bootfiles>");
-                        }
-
-                        FFUFilePath = null;
-                        EfiEspImagePath = args[2];
-                        if (args.Length > 3)
-                        {
-                            if (FFU.IsFFU(args[3]))
-                            {
-                                FFUFilePath = args[3];
-                            }
-                            else
-                            {
-                                MainOsImagePath = args[3];
-                            }
-                        }
-                        if (args.Length > 4)
-                        {
-                            FFUFilePath = args[4];
-                        }
-
-                        if (FFUFilePath != null)
-                        {
-                            FFU SupportedFFU = new(FFUFilePath);
-                            LogFile.Log("Donor-FFU: " + SupportedFFU.Path);
-                            byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
-                            DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP));
-                            DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
-                            MemoryStream SupportedMobileStartupMemStream = new();
-                            SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
-                            byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
-                            SupportedMobileStartupMemStream.Close();
-                            SupportedMobileStartupStream.Close();
-
-                            // Save supported mobilestartup.efi
-                            LogFile.Log("Taking mobilestartup.efi from donor-FFU");
-                            Stream MobileStartupStream = File.Open(Path.Combine(EfiEspImagePath, @"Windows\System32\Boot\mobilestartup.efi"), FileMode.Create, FileAccess.Write);
-                            MobileStartupStream.Write(SupportedMobileStartup, 0, SupportedMobileStartup.Length);
-                            MobileStartupStream.Close();
-                        }
-
-                        App.PatchEngine.TargetPath = EfiEspImagePath;
-                        PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
-                        if (!PatchResult)
-                        {
-                            throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
-                        }
-
-                        // Edit BCD
-                        LogFile.Log("Edit BCD");
-                        using (Stream BCDFileStream = File.Open(Path.Combine(EfiEspImagePath, @"efi\Microsoft\Boot\BCD"), FileMode.Open, FileAccess.ReadWrite))
-                        {
-                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
-                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
-                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
-                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
-                            if (NoCodeIntegrityElement != null)
-                            {
-                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                            }
-                            else
-                            {
-                                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
-                            }
-
-                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
-                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
-                            if (NoCodeIntegrityElement != null)
-                            {
-                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                            }
-                            else
-                            {
-                                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
-                            }
-                        }
-
-                        if (MainOsImagePath != null)
-                        {
-                            App.PatchEngine.TargetPath = MainOsImagePath;
-                            PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
-                            if (!PatchResult)
-                            {
-                                throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
-                            }
-                        }
-                        LogFile.Log("Bootloader unlocked on image", LogType.FileAndConsole);
-                        break;
-                    case "enablerootaccessonmountedimage":
-                        LogFile.Log("Command: Enable root access on mounted image", LogType.FileAndConsole);
-                        if (args.Length < 4)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -EnableRootAccessOnMountedImage <Directory of mounted EFIESP image file> <Directory of mounted MainOS image file> <Optional: donor-FFU file with supported version of bootfiles>");
-                        }
-
-                        FFUFilePath = null;
-                        EfiEspImagePath = args[2];
-                        MainOsImagePath = args[3];
-                        if (args.Length > 4)
-                        {
-                            FFUFilePath = args[4];
-                        }
-
-                        if (FFUFilePath != null)
-                        {
-                            FFU SupportedFFU = new(FFUFilePath);
-                            LogFile.Log("Supported FFU: " + SupportedFFU.Path);
-                            byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
-                            DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP));
-                            DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
-                            MemoryStream SupportedMobileStartupMemStream = new();
-                            SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
-                            byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
-                            SupportedMobileStartupMemStream.Close();
-                            SupportedMobileStartupStream.Close();
-
-                            // Save supported mobilestartup.efi
-                            LogFile.Log("Taking mobilestartup.efi from donor-FFU");
-                            Stream MobileStartupStream = File.Open(Path.Combine(EfiEspImagePath, @"Windows\System32\Boot\mobilestartup.efi"), FileMode.Create, FileAccess.Write);
-                            MobileStartupStream.Write(SupportedMobileStartup, 0, SupportedMobileStartup.Length);
-                            MobileStartupStream.Close();
-                        }
-
-                        App.PatchEngine.TargetPath = EfiEspImagePath;
-                        PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
-                        if (!PatchResult)
-                        {
-                            throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
-                        }
-
-                        // Edit BCD
-                        LogFile.Log("Edit BCD");
-                        using (Stream BCDFileStream = File.Open(Path.Combine(EfiEspImagePath, @"efi\Microsoft\Boot\BCD"), FileMode.Open, FileAccess.ReadWrite))
-                        {
-                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
-                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
-                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
-                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
-                            if (NoCodeIntegrityElement != null)
-                            {
-                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                            }
-                            else
-                            {
-                                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
-                            }
-
-                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
-                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
-                            if (NoCodeIntegrityElement != null)
-                            {
-                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
-                            }
-                            else
-                            {
-                                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
-                            }
-                        }
-
-                        App.PatchEngine.TargetPath = MainOsImagePath;
-                        PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
-                        if (!PatchResult)
-                        {
-                            throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
-                        }
-
-                        PatchResult = App.PatchEngine.Patch("RootAccess-MainOS");
-                        if (!PatchResult)
-                        {
-                            throw new WPinternalsException("Failed to patch MainOS", "An error occured while modifying Operating System files on the MainOS partition you provided for Root Access. Make sure your phone runs a supported Operating System version.");
-                        }
-
-                        LogFile.Log("Root access enabled on image", LogType.FileAndConsole);
-                        break;
-                    case "downloadffu":
-                        LogFile.Log("Command: Download FFU", LogType.FileAndConsole);
-                        Notifier = new PhoneNotifierViewModel();
-                        UIContext.Send(s => Notifier.Start(), null);
-                        if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Normal)
-                        {
-                            NormalModel = (NokiaPhoneModel)Notifier.CurrentModel;
-                            ProductCode = NormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode");
-                        }
-                        else if ((Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader) || (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash))
-                        {
-                            FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
-                            Info = FlashModel.ReadPhoneInfo();
-                            ProductCode = Info.ProductCode;
-                        }
-                        else
-                        {
-                            NormalModel = (NokiaPhoneModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Normal);
-                            ProductCode = NormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode");
-                        }
-                        URL = LumiaDownloadModel.SearchFFU(null, ProductCode, null, out ProductType);
-                        DownloadFolder = args.Length >= 3
-                            ? args[4]
-                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                        if (!Directory.Exists(DownloadFolder))
-                        {
-                            Directory.CreateDirectory(DownloadFolder);
-                        }
-
-                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                        URI = new Uri(URL);
-                        FFUFileName = Path.GetFileName(URI.LocalPath);
-                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
-                        LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new())
-                        {
-                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
-                        }
-                        LogFile.Log("Download finished", LogType.FileAndConsole);
-                        App.Config.AddFfuToRepository(FFUFilePath);
-                        Notifier.Stop();
-                        break;
-                    case "downloadffubyoperatorcode":
-                        LogFile.Log("Command: Download FFU by Operator Code", LogType.FileAndConsole);
-                        if (args.Length < 4)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadFFUbyOperatorCode <Product type> <Operator code> <Optional: Download folder>");
-                        }
-
-                        ProductType = args[2];
-                        LogFile.Log("Product type: " + ProductType, LogType.FileAndConsole);
-                        OperatorCode = args[3];
-                        LogFile.Log("Operator code: " + OperatorCode, LogType.FileAndConsole);
-                        DownloadFolder = args.Length >= 5
-                            ? args[4]
-                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                        if (!Directory.Exists(DownloadFolder))
-                        {
-                            Directory.CreateDirectory(DownloadFolder);
-                        }
-
-                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                        URL = LumiaDownloadModel.SearchFFU(ProductType, null, OperatorCode);
-                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                        URI = new Uri(URL);
-                        FFUFileName = Path.GetFileName(URI.LocalPath);
-                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
-                        LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new())
-                        {
-                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
-                        }
-                        LogFile.Log("Download finished", LogType.FileAndConsole);
-                        App.Config.AddFfuToRepository(FFUFilePath);
-                        break;
-                    case "downloadffubyproductcode":
-                        LogFile.Log("Command: Download FFU by Product Code", LogType.FileAndConsole);
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadFFUbyProductCode <Product code> <Optional: Download folder>");
-                        }
-
-                        ProductCode = args[2];
-                        LogFile.Log("Product code: " + ProductCode, LogType.FileAndConsole);
-                        URL = LumiaDownloadModel.SearchFFU(null, ProductCode, null, out ProductType);
-                        DownloadFolder = args.Length >= 4
-                            ? args[3]
-                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                        if (!Directory.Exists(DownloadFolder))
-                        {
-                            Directory.CreateDirectory(DownloadFolder);
-                        }
-
-                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                        URI = new Uri(URL);
-                        FFUFileName = Path.GetFileName(URI.LocalPath);
-                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
-                        LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new())
-                        {
-                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
-                        }
-                        LogFile.Log("Download finished", LogType.FileAndConsole);
-                        App.Config.AddFfuToRepository(FFUFilePath);
-                        break;
-                    case "downloadffubyproducttype":
-                        LogFile.Log("Command: Download FFU by Product Type", LogType.FileAndConsole);
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadFFUbyProductType <Product type> <Optional: Download folder>");
-                        }
-
-                        ProductType = args[2];
-                        LogFile.Log("Product type: " + ProductType, LogType.FileAndConsole);
-                        DownloadFolder = args.Length >= 4
-                            ? args[3]
-                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                        if (!Directory.Exists(DownloadFolder))
-                        {
-                            Directory.CreateDirectory(DownloadFolder);
-                        }
-
-                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                        URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
-                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                        URI = new Uri(URL);
-                        FFUFileName = Path.GetFileName(URI.LocalPath);
-                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
-                        LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new())
-                        {
-                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
-                        }
-                        LogFile.Log("Download finished", LogType.FileAndConsole);
-                        App.Config.AddFfuToRepository(FFUFilePath);
-                        break;
-                    case "searchffubyproducttype":
-                        LogFile.Log("Command: Search FFU by Product Type", LogType.FileAndConsole);
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -SearchFFUbyProductType <Lumia model>");
-                        }
-
-                        ProductType = args[2];
-                        LogFile.Log("Lumia model: " + ProductType, LogType.FileAndConsole);
-                        URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
-                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                        URI = new Uri(URL);
-                        FFUFileName = Path.GetFileName(URI.LocalPath);
-                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                        break;
-                    case "downloademergency":
-                        LogFile.Log("Command: Download Emergency files", LogType.FileAndConsole);
-                        Notifier = new PhoneNotifierViewModel();
-                        UIContext.Send(s => Notifier.Start(), null);
-                        if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Normal)
-                        {
-                            NormalModel = (NokiaPhoneModel)Notifier.CurrentModel;
-                            ProductType = NormalModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName");
-                            if (ProductType.Contains('_'))
-                            {
-                                ProductType = ProductType.Substring(0, ProductType.IndexOf('_'));
-                            }
-                        }
-                        else if ((Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader) || (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash))
-                        {
-                            FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
-                            Info = FlashModel.ReadPhoneInfo();
-                            ProductType = Info.Type;
-                        }
-                        else
-                        {
-                            NormalModel = (NokiaPhoneModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Normal);
-                            ProductType = NormalModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName");
-                            if (ProductType.Contains('_'))
-                            {
-                                ProductType = ProductType.Substring(0, ProductType.IndexOf('_'));
-                            }
-                        }
-                        URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
-                        if (URLs != null)
-                        {
-                            DownloadFolder = args.Length >= 3
-                                ? args[2]
-                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                            if (!Directory.Exists(DownloadFolder))
-                            {
-                                Directory.CreateDirectory(DownloadFolder);
-                            }
-
-                            LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                            for (int i = 0; i < URLs.Length; i++)
-                            {
-                                LogFile.Log("URL: " + URLs[i], LogType.FileAndConsole);
-                                URI = new Uri(URLs[i]);
-                                EmergencyFileName = Path.GetFileName(URI.LocalPath);
-                                LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
-                                EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
-                                if (i == 0)
-                                {
-                                    ProgrammerPath = EmergencyFilePath;
-                                }
-                                else
-                                {
-                                    PayloadPath = EmergencyFilePath;
-                                }
-
-                                LogFile.Log("Downloading...", LogType.FileAndConsole);
-                                using (System.Net.WebClient myWebClient = new())
-                                {
-                                    await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
-                                }
-                                LogFile.Log("Download finished", LogType.FileAndConsole);
-                            }
-                            App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
-                        }
-                        Notifier.Stop();
-                        break;
-                    case "downloademergencybyproducttype":
-                        LogFile.Log("Command: Download Emergency files", LogType.FileAndConsole);
-                        if (args.Length < 3)
-                        {
-                            throw new WPinternalsException("Wrong number of arguments. Usage: WPinternals.exe -DownloadEmergencyByProductType <Product type> <Optional: Download folder>");
-                        }
-
-                        ProductType = args[2];
-                        URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
-                        if (URLs != null)
-                        {
-                            DownloadFolder = args.Length >= 4
-                                ? args[3]
-                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                            if (!Directory.Exists(DownloadFolder))
-                            {
-                                Directory.CreateDirectory(DownloadFolder);
-                            }
-
-                            LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                            for (int i = 0; i < URLs.Length; i++)
-                            {
-                                LogFile.Log("URL: " + URLs[i], LogType.FileAndConsole);
-                                URI = new Uri(URLs[i]);
-                                EmergencyFileName = Path.GetFileName(URI.LocalPath);
-                                LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
-                                EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
-                                if (i == 0)
-                                {
-                                    ProgrammerPath = EmergencyFilePath;
-                                }
-                                else
-                                {
-                                    PayloadPath = EmergencyFilePath;
-                                }
-
-                                LogFile.Log("Downloading...", LogType.FileAndConsole);
-                                using (System.Net.WebClient myWebClient = new())
-                                {
-                                    await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
-                                }
-                                LogFile.Log("Download finished", LogType.FileAndConsole);
-                            }
-                            App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
-                        }
-                        break;
-                    case "downloadall":
-                        LogFile.Log("Command: Download all", LogType.FileAndConsole);
-                        Notifier = new PhoneNotifierViewModel();
-                        UIContext.Send(s => Notifier.Start(), null);
-                        if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Normal)
-                        {
-                            NormalModel = (NokiaPhoneModel)Notifier.CurrentModel;
-                            ProductCode = NormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode");
-                        }
-                        else if ((Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader) || (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash))
-                        {
-                            FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
-                            Info = FlashModel.ReadPhoneInfo();
-                            ProductCode = Info.ProductCode;
-                        }
-                        else
-                        {
-                            NormalModel = (NokiaPhoneModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Normal);
-                            ProductCode = NormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode");
-                        }
-                        URL = LumiaDownloadModel.SearchFFU(null, ProductCode, null, out ProductType);
-                        DownloadFolder = args.Length >= 3
-                            ? args[2]
-                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                        if (!Directory.Exists(DownloadFolder))
-                        {
-                            Directory.CreateDirectory(DownloadFolder);
-                        }
-
-                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                        URI = new Uri(URL);
-                        FFUFileName = Path.GetFileName(URI.LocalPath);
-                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
-                        LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new())
-                        {
-                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
-                        }
-                        LogFile.Log("Download finished", LogType.FileAndConsole);
-                        App.Config.AddFfuToRepository(FFUFilePath);
-
-                        URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
-                        if (URLs != null)
-                        {
-                            for (int i = 0; i < URLs.Length; i++)
-                            {
-                                LogFile.Log("URL: " + URLs[i], LogType.FileAndConsole);
-                                URI = new Uri(URLs[i]);
-                                EmergencyFileName = Path.GetFileName(URI.LocalPath);
-                                LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
-                                EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
-                                if (i == 0)
-                                {
-                                    ProgrammerPath = EmergencyFilePath;
-                                }
-                                else
-                                {
-                                    PayloadPath = EmergencyFilePath;
-                                }
-
-                                LogFile.Log("Downloading...", LogType.FileAndConsole);
-                                using (System.Net.WebClient myWebClient = new())
-                                {
-                                    await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
-                                }
-                                LogFile.Log("Download finished", LogType.FileAndConsole);
-                            }
-                            App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
-                        }
-
-                        if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
-                        {
-                            ProductType = "RM-1085";
-
-                            URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
-                            DownloadFolder = args.Length >= 3
-                                ? args[2]
-                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                            if (!Directory.Exists(DownloadFolder))
-                            {
-                                Directory.CreateDirectory(DownloadFolder);
-                            }
-
-                            LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                            LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                            URI = new Uri(URL);
-                            FFUFileName = Path.GetFileName(URI.LocalPath);
-                            LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                            FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
-                            LogFile.Log("Downloading...", LogType.FileAndConsole);
-                            using (System.Net.WebClient myWebClient = new())
-                            {
-                                await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
-                            }
-                            LogFile.Log("Download finished", LogType.FileAndConsole);
-                            App.Config.AddFfuToRepository(FFUFilePath);
-
-                            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
-                            {
-                                throw new WPinternalsException("Unable to find compatible FFU", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
-                            }
-                        }
-                        Notifier.Stop();
-                        break;
-                    case "downloadallbyproducttype":
-                        LogFile.Log("Command: Download all by Product Type", LogType.FileAndConsole);
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadAllByProductType <Product type> <Optional: Download folder>");
-                        }
-
-                        ProductType = args[2];
-                        LogFile.Log("Product type: " + ProductType, LogType.FileAndConsole);
-                        DownloadFolder = args.Length >= 4
-                            ? args[3]
-                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                        if (!Directory.Exists(DownloadFolder))
-                        {
-                            Directory.CreateDirectory(DownloadFolder);
-                        }
-
-                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                        URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
-                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                        URI = new Uri(URL);
-                        FFUFileName = Path.GetFileName(URI.LocalPath);
-                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
-                        LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new())
-                        {
-                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
-                        }
-                        LogFile.Log("Download finished", LogType.FileAndConsole);
-                        App.Config.AddFfuToRepository(FFUFilePath);
-
-                        URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
-                        if (URLs != null)
-                        {
-                            for (int i = 0; i < URLs.Length; i++)
-                            {
-                                LogFile.Log("URL: " + URLs[i], LogType.FileAndConsole);
-                                URI = new Uri(URLs[i]);
-                                EmergencyFileName = Path.GetFileName(URI.LocalPath);
-                                LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
-                                EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
-                                if (i == 0)
-                                {
-                                    ProgrammerPath = EmergencyFilePath;
-                                }
-                                else
-                                {
-                                    PayloadPath = EmergencyFilePath;
-                                }
-
-                                LogFile.Log("Downloading...", LogType.FileAndConsole);
-                                using (System.Net.WebClient myWebClient = new())
-                                {
-                                    await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
-                                }
-                                LogFile.Log("Download finished", LogType.FileAndConsole);
-                            }
-                            App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
-                        }
-
-                        if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
-                        {
-                            ProductType = "RM-1085";
-
-                            URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
-                            DownloadFolder = args.Length >= 4
-                                ? args[3]
-                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                            if (!Directory.Exists(DownloadFolder))
-                            {
-                                Directory.CreateDirectory(DownloadFolder);
-                            }
-
-                            LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                            LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                            URI = new Uri(URL);
-                            FFUFileName = Path.GetFileName(URI.LocalPath);
-                            LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                            FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
-                            LogFile.Log("Downloading...", LogType.FileAndConsole);
-                            using (System.Net.WebClient myWebClient = new())
-                            {
-                                await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
-                            }
-                            LogFile.Log("Download finished", LogType.FileAndConsole);
-                            App.Config.AddFfuToRepository(FFUFilePath);
-
-                            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
-                            {
-                                throw new WPinternalsException("Unable to find compatible FFU", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
-                            }
-                        }
-                        break;
-                    case "downloadallbyproductcode":
-                        LogFile.Log("Command: Download all by Product Code", LogType.FileAndConsole);
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadAllByProductCode <Product code> <Optional: Download folder>");
-                        }
-
-                        ProductCode = args[2];
-                        LogFile.Log("Product code: " + ProductCode, LogType.FileAndConsole);
-                        URL = LumiaDownloadModel.SearchFFU(null, ProductCode, null, out ProductType);
-                        DownloadFolder = args.Length >= 4
-                            ? args[3]
-                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                        if (!Directory.Exists(DownloadFolder))
-                        {
-                            Directory.CreateDirectory(DownloadFolder);
-                        }
-
-                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                        URI = new Uri(URL);
-                        FFUFileName = Path.GetFileName(URI.LocalPath);
-                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
-                        LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new())
-                        {
-                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
-                        }
-                        LogFile.Log("Download finished", LogType.FileAndConsole);
-                        App.Config.AddFfuToRepository(FFUFilePath);
-
-                        URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
-                        if (URLs != null)
-                        {
-                            for (int i = 0; i < URLs.Length; i++)
-                            {
-                                LogFile.Log("URL: " + URLs[i], LogType.FileAndConsole);
-                                URI = new Uri(URLs[i]);
-                                EmergencyFileName = Path.GetFileName(URI.LocalPath);
-                                LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
-                                EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
-                                if (i == 0)
-                                {
-                                    ProgrammerPath = EmergencyFilePath;
-                                }
-                                else
-                                {
-                                    PayloadPath = EmergencyFilePath;
-                                }
-
-                                LogFile.Log("Downloading...", LogType.FileAndConsole);
-                                using (System.Net.WebClient myWebClient = new())
-                                {
-                                    await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
-                                }
-                                LogFile.Log("Download finished", LogType.FileAndConsole);
-                            }
-                            App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
-                        }
-
-                        if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
-                        {
-                            ProductType = "RM-1085";
-
-                            URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
-                            DownloadFolder = args.Length >= 4
-                                ? args[3]
-                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                            if (!Directory.Exists(DownloadFolder))
-                            {
-                                Directory.CreateDirectory(DownloadFolder);
-                            }
-
-                            LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                            LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                            URI = new Uri(URL);
-                            FFUFileName = Path.GetFileName(URI.LocalPath);
-                            LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                            FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
-                            LogFile.Log("Downloading...", LogType.FileAndConsole);
-                            using (System.Net.WebClient myWebClient = new())
-                            {
-                                await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
-                            }
-                            LogFile.Log("Download finished", LogType.FileAndConsole);
-                            App.Config.AddFfuToRepository(FFUFilePath);
-
-                            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
-                            {
-                                throw new WPinternalsException("Unable to find compatible FFU", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
-                            }
-                        }
-                        break;
-                    case "downloadallbyoperatorcode":
-                        LogFile.Log("Command: Download FFU by Operator Code", LogType.FileAndConsole);
-                        if (args.Length < 4)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadFFUbyOperatorCode <Product type> <Operator code> <Optional: Download folder>");
-                        }
-
-                        ProductType = args[2];
-                        LogFile.Log("Product type: " + ProductType, LogType.FileAndConsole);
-                        OperatorCode = args[3];
-                        LogFile.Log("Operator code: " + OperatorCode, LogType.FileAndConsole);
-                        DownloadFolder = args.Length >= 5
-                            ? args[4]
-                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                        if (!Directory.Exists(DownloadFolder))
-                        {
-                            Directory.CreateDirectory(DownloadFolder);
-                        }
-
-                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                        URL = LumiaDownloadModel.SearchFFU(ProductType, null, OperatorCode);
-                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                        URI = new Uri(URL);
-                        FFUFileName = Path.GetFileName(URI.LocalPath);
-                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
-                        LogFile.Log("Downloading...", LogType.FileAndConsole);
-                        using (System.Net.WebClient myWebClient = new())
-                        {
-                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
-                        }
-                        LogFile.Log("Download finished", LogType.FileAndConsole);
-                        App.Config.AddFfuToRepository(FFUFilePath);
-
-                        URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
-                        if (URLs != null)
-                        {
-                            for (int i = 0; i < URLs.Length; i++)
-                            {
-                                LogFile.Log("URL: " + URLs[i], LogType.FileAndConsole);
-                                URI = new Uri(URLs[i]);
-                                EmergencyFileName = Path.GetFileName(URI.LocalPath);
-                                LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
-                                EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
-                                if (i == 0)
-                                {
-                                    ProgrammerPath = EmergencyFilePath;
-                                }
-                                else
-                                {
-                                    PayloadPath = EmergencyFilePath;
-                                }
-
-                                LogFile.Log("Downloading...", LogType.FileAndConsole);
-                                using (System.Net.WebClient myWebClient = new())
-                                {
-                                    await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
-                                }
-                                LogFile.Log("Download finished", LogType.FileAndConsole);
-                            }
-                            App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
-                        }
-
-                        if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
-                        {
-                            ProductType = "RM-1085";
-
-                            URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
-                            DownloadFolder = args.Length >= 5
-                                ? args[4]
-                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
-
-                            if (!Directory.Exists(DownloadFolder))
-                            {
-                                Directory.CreateDirectory(DownloadFolder);
-                            }
-
-                            LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
-                            LogFile.Log("URL: " + URL, LogType.FileAndConsole);
-                            URI = new Uri(URL);
-                            FFUFileName = Path.GetFileName(URI.LocalPath);
-                            LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
-                            FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
-                            LogFile.Log("Downloading...", LogType.FileAndConsole);
-                            using (System.Net.WebClient myWebClient = new())
-                            {
-                                await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
-                            }
-                            LogFile.Log("Download finished", LogType.FileAndConsole);
-                            App.Config.AddFfuToRepository(FFUFilePath);
-
-                            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
-                            {
-                                throw new WPinternalsException("Unable to find compatible FFU", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
-                            }
-                        }
-                        break;
-                    case "rewritepartitionsfrommassstorage":
-                        if (args.Length < 2)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RewritePartitionsFromMassStorage <Path to folder containing img partitions> \n The name of the imgs must be the partition names. For example, DPP.img will get written to the DPP partition.");
-                        }
-
-                        await TestCode.RewriteParts(args[2]);
-                        break;
-                    case "restoregptusingedl":
-                        if (args.Length < 3)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RestoreGPTUsingEDL <Path to GPT.bin to be flashed at sector 1 (minus the MBR at sector 0)> <Loaders path>");
-                        }
-
-                        await TestCode.RecoverBadGPT(args[2], args[3]);
-                        break;
-                    case "restoregptusingmassstorage":
-                        if (args.Length < 2)
-                        {
-                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RestoreGPTUsingMassStorage <Path to GPT.bin to be flashed at sector 1 (minus the MBR at sector 0)>");
-                        }
-
-                        await TestCode.RewriteGPT(args[2]);
-                        break;
-                    default:
-                        LogFile.Log("", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals commandline usage:", LogType.ConsoleOnly);
-                        LogFile.Log("", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -ShowPhoneInfo", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -AddFFU <FFU file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -AddEmergency <Product type> <EDE file> <EDP file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -RemoveFFU <FFU file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -RemoveEmergency <EDE file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -ListRepository", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -FindFlashingProfile <Optional: Profile FFU file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -UnlockBootloader", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: donor-FFU file with supported version of bootfiles>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -FixBootAfterUnlockingBootloader", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -EnableRootAccess", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -UnlockBootLoaderOnImage <EFIESP image file>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: MainOS image file>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: donor-FFU file with supported version of bootfiles>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -EnableRootAccessOnImage <EFIESP image file> <MainOS image file>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: donor-FFU file with supported version of bootfiles>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -UnlockBootLoaderOnMountedImage <Directory of mounted EFIESP image file>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: Directory of mounted MainOS image file>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: donor-FFU file with supported version of bootfiles>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -EnableRootAccessOnMountedImage <Directory of mounted EFIESP image file>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Directory of mounted MainOS image file>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: donor-FFU file with supported version of bootfiles>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -EnableTestSigning", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -RelockPhone", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -SwitchToMassStorageMode", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -FlashFFU <FFU file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -FlashCustomROM <ZIP file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -FlashPartition <Partition name> <Partition file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -FlashRaw <Start sector> <Raw file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -ClearNV", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -ReadGPT", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -BackupGPT <Path to xml-file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -RestoreGPT <Path to xml-file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -MergeGPT <Path to input-xml-file> <Path to input-xml-file>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: Path to output-xml-file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -MergeGPT <Path to input-xml-file>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Path to ZIP file which includes Partitions.xml>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: Path to output-xml-file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -ShowFFU <FFU file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -DumpFFU <FFU file> <Destination folder> <Optional: Partition Name>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -DownloadFFU <Optional: Destination folder>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -DownloadFFUbyProductType <Product type>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -DownloadFFUbyProductCode <Product code>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -DownloadFFUbyOperatorCode <Product type> <Operator code>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -DownloadEmergency <Optional: Destination folder>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -DownloadEmergencyByProductType <Product type>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -DownloadAll <Optional: Destination folder>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -DownloadAllByProductType <Product type>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -DownloadAllByProductCode <Product code>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -DownloadAllByOperatorCode <Product type> <Operator code>", LogType.ConsoleOnly);
-                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -DumpUEFI <UEFI binary or FFU file> <Destination folder>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -TestProgrammer <EDE file>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -RewritePartitionsFromMassStorage <Path to folder containing img partitions>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -RestoreGPTUsingEDL <Path to GPT.bin to be flashed at sector 1 (minus the MBR at sector 0)> <Loaders path>", LogType.ConsoleOnly);
-                        LogFile.Log("WPinternals -RestoreGPTUsingMassStorage <Path to GPT.bin to be flashed at sector 1 (minus the MBR at sector 0)>", LogType.ConsoleOnly);
-                        break;
-                }
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex);
-            }
-
-            if (Environment.GetCommandLineArgs().Length > 1)
-            {
-                CloseConsole();
-            }
-        }
-
-        // http://stackoverflow.com/questions/472282/show-console-in-windows-application
-        // https://stackoverflow.com/questions/807998/how-do-i-create-a-c-sharp-app-that-decides-itself-whether-to-show-as-a-console-o
-        // http://www.csharp411.com/console-output-from-winforms-application/#comment-76
-        // https://stackoverflow.com/questions/1305257/using-attachconsole-user-must-hit-enter-to-get-regular-command-line
-        internal static void OpenConsole()
-        {
-            if (IsConsoleVisible)
-            {
-                return;
-            }
-
-            if (AttachConsole(-1))
-            {
-                Console.Write("\r" + new string(' ', Console.WindowWidth) + "\r"); // Prompt was already printed. Clear that line.
-
-                /*
-                Other possibility to clear line:
-
-                System.Console.CursorLeft = 0;
-                char[] bl = System.Linq.Enumerable.ToArray<char>(System.Linq.Enumerable.Repeat<char>(' ', System.Console.WindowWidth - 1));
-                System.Console.Write(bl);
-                System.Console.CursorLeft = 0;
-                */
-
-                hConsoleWnd = GetForegroundWindow();
-            }
-            else
-            {
-                AllocConsole();
-                IsNewConsoleCreated = true;
-
-                hConsoleWnd = System.Diagnostics.Process.GetCurrentProcess().MainWindowHandle;
-
-                // Support VS 2017 debugger without VS host process:
-                try
-                {
-                    // Console.OpenStandardOutput eventually calls into GetStdHandle. As per MSDN documentation of GetStdHandle: http://msdn.microsoft.com/en-us/library/windows/desktop/ms683231(v=vs.85).aspx will return the redirected handle and not the allocated console:
-                    // "The standard handles of a process may be redirected by a call to  SetStdHandle, in which case  GetStdHandle returns the redirected handle. If the standard handles have been redirected, you can specify the CONIN$ value in a call to the CreateFile function to get a handle to a console's input buffer. Similarly, you can specify the CONOUT$ value to get a handle to a console's active screen buffer."
-                    // Get the handle to CONOUT$.    
-                    IntPtr stdHandle = CreateFile("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0);
-                    Microsoft.Win32.SafeHandles.SafeFileHandle safeFileHandle = new(stdHandle, true);
-                    FileStream fileStream = new(safeFileHandle, FileAccess.Write);
-                    Encoding encoding = Encoding.GetEncoding(MY_CODE_PAGE);
-                    StreamWriter standardOutput = new(fileStream, encoding);
-                    standardOutput.AutoFlush = true;
-                    Console.SetOut(standardOutput);
-                }
-                catch
-                {
-                }
-            }
-
-            IsConsoleVisible = true;
-
-            Console.CancelKeyPress += Console_CancelKeyPress;
-
-            LogFile.LogApplicationVersion();
-        }
-
-        private static void Console_CancelKeyPress(object sender, ConsoleCancelEventArgs e)
-        {
-            LogFile.Log("Operation canceled!", LogType.FileOnly);
-            LogFile.EndAction();
-
-#if PREVIEW
-            Uploader.WaitForUploads();
-#endif
-        }
-
-        internal static void CloseConsole(bool Exit = true)
-        {
-            if (IsConsoleVisible)
-            {
-                if (IsNewConsoleCreated)
-                {
-                    Console.WriteLine("Press any key to close...");
-                    Console.ReadKey();
-                }
-
-                PostMessage(hConsoleWnd, WM_KEYDOWN, VK_RETURN, 0);
-
-                IsConsoleVisible = false;
-
-                if (Exit)
-                {
-#if PREVIEW
-                    Uploader.WaitForUploads();
-#endif
-
-                    Environment.Exit(0);
-                }
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WPinternals
+{
+    internal static class CommandLine
+    {
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern bool AllocConsole();
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern bool AttachConsole(int dwProcessId);
+
+        [DllImport("kernel32.dll")]
+        private static extern IntPtr GetConsoleWindow();
+
+        [DllImport("user32.dll")]
+        private static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+
+        private const UInt32 StdOutputHandle = 0xFFFFFFF5;
+
+        [DllImport("kernel32.dll")]
+        private static extern IntPtr GetStdHandle(UInt32 nStdHandle);
+
+        [DllImport("kernel32.dll")]
+        private static extern void SetStdHandle(UInt32 nStdHandle, IntPtr handle);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static extern IntPtr CreateFile(string lpFileName, uint dwDesiredAccess, uint dwShareMode, uint lpSecurityAttributes, uint dwCreationDisposition, uint dwFlagsAndAttributes, uint hTemplateFile);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetForegroundWindow();
+
+        private const int SW_HIDE = 0;
+        private const int SW_SHOW = 5;
+
+        private const int MY_CODE_PAGE = 437;
+        private const uint GENERIC_WRITE = 0x40000000;
+        private const uint FILE_SHARE_WRITE = 0x2;
+        private const uint OPEN_EXISTING = 0x3;
+
+        internal static bool IsConsoleVisible = false;
+        internal static bool IsNewConsoleCreated = false;
+
+        private static IntPtr hConsoleWnd;
+
+        [DllImport("User32.Dll", EntryPoint = "PostMessageA")]
+        private static extern bool PostMessage(IntPtr hWnd, uint msg, int wParam, int lParam);
+
+        private const int VK_RETURN = 0x0D;
+        private const int WM_KEYDOWN = 0x100;
+
+        /// <summary>
+        /// When the main window should not be shown, this function should call ExitProcess and it should not return.
+        /// </summary>
+        internal static async Task ParseCommandLine(System.Threading.SynchronizationContext UIContext)
+        {
+            FFU FFU = null;
+            PhoneNotifierViewModel Notifier;
+            NokiaFlashModel FlashModel;
+            NokiaPhoneModel NormalModel;
+            PhoneInfo Info;
+            string ProductType;
+            string ProductCode;
+            string OperatorCode;
+            string DownloadFolder;
+            string FFUFilePath;
+            string URL;
+            string[] URLs;
+            Uri URI;
+            string FFUFileName;
+            string EmergencyFileName;
+            string EmergencyFilePath;
+            string ProgrammerPath = "";
+            string PayloadPath = "";
+            string EfiEspImagePath = null;
+            string MainOsImagePath = null;
+            DiscUtils.Fat.FatFileSystem UnlockedEFIESPFileSystem;
+            DiscUtils.Ntfs.NtfsFileSystem UnlockedMainOsFileSystem;
+            bool PatchResult;
+
+            try
+            {
+                string[] args = Environment.GetCommandLineArgs();
+
+                if (args.Length == 1)
+                {
+                    return;
+                }
+
+                switch (args[1].ToLower().TrimStart(new char[] { '-', '/' }))
+                {
+#if DEBUG
+                    case "test":
+                        LogFile.BeginAction("Test");
+                        await TestCode.Test(UIContext);
+                        LogFile.EndAction("Test");
+                        break;
+#endif
+                    case "flashpartition":
+                        if (args.Length < 4)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashPartition <Partition name> <Partition file> <Optional: FFU file>");
+                        }
+
+                        if (args.Length >= 5)
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2FlashPartition(UIContext, args[4], args[2], args[3]);
+                        }
+                        else
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2FlashPartition(UIContext, null, args[2], args[3]);
+                        }
+
+                        break;
+                    case "flashraw":
+                        if (args.Length < 4)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashRaw <Start sector> <Raw file> <Optional: FFU file>");
+                        }
+
+                        UInt64 StartSector = 0;
+                        try
+                        {
+                            StartSector = args[2].StartsWith("0x", StringComparison.OrdinalIgnoreCase)
+                                ? Convert.ToUInt64(args[2][2..], 16)
+                                : Convert.ToUInt64(args[2], 10);
+                        }
+                        catch
+                        {
+                            LogFile.Log("Bad start sector", LogType.ConsoleOnly);
+                            break;
+                        }
+                        if (args.Length >= 5)
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2FlashRaw(UIContext, StartSector, args[3], args[4]);
+                        }
+                        else
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2FlashRaw(UIContext, StartSector, args[3], null);
+                        }
+
+                        break;
+                    case "flashpartitionimmediately":
+                        if (args.Length < 5)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashPartition <Partition name> <Partition file> <FFU Path>");
+                        }
+
+                        await LumiaV2UnlockBootViewModel.LumiaV2FlashPartition(UIContext, args[4], args[2], args[3], false);
+                        break;
+                    case "readgpt":
+                        LogFile.BeginAction("ReadGPT");
+                        try
+                        {
+                            Notifier = new PhoneNotifierViewModel();
+                            UIContext.Send(s => Notifier.Start(), null);
+
+                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Bootloader); // This also works for Bootloader Spec A
+
+                            GPT GPT = FlashModel.ReadGPT(); // May throw NotSupportedException
+                            foreach (Partition Partition in GPT.Partitions)
+                            {
+                                LogFile.Log(Partition.Name.PadRight(20) + "0x" + Partition.FirstSector.ToString("X8") + " - 0x" + Partition.LastSector.ToString("X8") + "    " + Partition.Volume, LogType.ConsoleOnly);
+                            }
+
+                            if (FlashModel.ReadPhoneInfo(false).FlashAppProtocolVersionMajor >= 2)
+                            {
+                                FlashModel.SwitchToFlashAppContext();
+                            }
+                            else
+                            {
+                                await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+                            }
+
+                            Notifier.Stop();
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                        }
+                        finally
+                        {
+                            LogFile.EndAction("ReadGPT");
+                        }
+                        break;
+                    case "backupgpt":
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -BackupGPT <Path to xml-file>");
+                        }
+
+                        LogFile.BeginAction("BackupGPT");
+                        try
+                        {
+                            Notifier = new PhoneNotifierViewModel();
+                            UIContext.Send(s => Notifier.Start(), null);
+                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+                            GPT GPT = FlashModel.ReadGPT(); // May throw NotSupportedException
+                            Directory.CreateDirectory(Path.GetDirectoryName(args[2]));
+                            GPT.WritePartitions(args[2]);
+                            FlashModel.SwitchToFlashAppContext();
+                            Notifier.Stop();
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                        }
+                        finally
+                        {
+                            LogFile.EndAction("BackupGPT");
+                        }
+                        break;
+                    case "restoregpt":
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RestoreGPT <Path to xml-file>");
+                        }
+
+                        LogFile.BeginAction("RestoreGPT");
+                        try
+                        {
+                            Notifier = new PhoneNotifierViewModel();
+                            UIContext.Send(s => Notifier.Start(), null);
+                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+                            byte[] GptChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
+                            GPT GPT = new(GptChunk);
+                            string Xml = File.ReadAllText(args[2]);
+                            GPT.MergePartitions(Xml, false);
+                            GPT.Rebuild();
+                            await LumiaV2UnlockBootViewModel.LumiaV2CustomFlash(Notifier, null, false, false, 0, GptChunk, true, true);
+                            FlashModel.SwitchToFlashAppContext();
+                            Notifier.Stop();
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                        }
+                        finally
+                        {
+                            LogFile.EndAction("RestoreGPT");
+                        }
+                        break;
+                    case "mergegpt":
+                        if (args.Length < 4)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -MergeGPT <Path to input-xml-file> <Path to input-xml-file> <Optional: Path to output-xml-file> Or use: WPinternals.exe -MergeGPT <Path to input-xml-file> <Path to ZIP-file including Partitions.xml> <Optional: Path to output-xml-file>");
+                        }
+
+                        LogFile.BeginAction("MergeGPT");
+                        try
+                        {
+                            GPT GPT = GPT.ReadPartitions(args[2]);
+
+                            ZipArchive Archive = null;
+                            FileStream s = null;
+                            try
+                            {
+                                s = new FileStream(args[3], FileMode.Open, FileAccess.Read);
+                                Archive = new ZipArchive(s);
+                            }
+                            catch { }
+
+                            if (Archive == null)
+                            {
+                                s?.Close();
+
+                                // Assume Xml-file
+                                GPT.MergePartitionsFromFile(args[3], true);
+                            }
+                            else
+                            {
+                                ZipArchiveEntry PartitionEntry = Archive.GetEntry("Partitions.xml");
+                                if (PartitionEntry == null)
+                                {
+                                    GPT.MergePartitions(null, true, Archive);
+                                }
+                                else
+                                {
+                                    using Stream ZipStream = PartitionEntry.Open();
+                                    using StreamReader ZipReader = new(ZipStream);
+                                    string PartitionXml = ZipReader.ReadToEnd();
+                                    GPT.MergePartitions(PartitionXml, true, Archive);
+                                }
+                            }
+
+                            Archive?.Dispose();
+
+                            if (args.Length >= 5)
+                            {
+                                GPT.WritePartitions(args[4]);
+                            }
+
+                            foreach (Partition Partition in GPT.Partitions)
+                            {
+                                LogFile.Log(Partition.Name.PadRight(20) + "0x" + Partition.FirstSector.ToString("X8") + " - 0x" + Partition.LastSector.ToString("X8") + "    " + Partition.Volume, LogType.ConsoleOnly);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                        }
+                        finally
+                        {
+                            LogFile.EndAction("MergeGPT");
+                        }
+                        break;
+                    case "dumpffu":
+                        if (args.Length < 4)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DumpFFU <FFU Path> <Destination Path> <Optional: Partition Name>");
+                        }
+
+                        FFU = new FFU(args[2]);
+                        if (args.Length < 5)
+                        {
+                            foreach (Partition Partition in FFU.GPT.Partitions)
+                            {
+                                if (FFU.IsPartitionPresentInFFU(Partition.Name))
+                                {
+                                    FFU.WritePartition(Partition.Name, Path.Combine(args[3], Partition.Name + ".bin"));
+                                }
+                            }
+                        }
+                        else
+                        {
+                            Partition Target = FFU.GPT.GetPartition(args[4]);
+                            if ((Target == null) || (!FFU.IsPartitionPresentInFFU(Target.Name)))
+                            {
+                                throw new InvalidOperationException("Partition not found in FFU!");
+                            }
+
+                            FFU.WritePartition(Target.Name, Path.Combine(args[3], Target.Name + ".bin"));
+                        }
+                        break;
+                    case "dumpuefi":
+                        if (args.Length < 4)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DumpUEFI <UEFI binary or FFU file> <Destination Path>");
+                        }
+
+                        byte[] UefiBinary;
+                        if (FFU.IsFFU(args[2]))
+                        {
+                            FFU = new FFU(args[2]);
+                            UefiBinary = FFU.GetPartition("UEFI");
+                        }
+                        else
+                        {
+                            UefiBinary = File.ReadAllBytes(args[2]);
+                        }
+
+                        UEFI UEFI = new(UefiBinary);
+
+                        foreach (EFI Efi in UEFI.EFIs)
+                        {
+                            byte[] EfiBinary = UEFI.GetFile(Efi.Guid);
+                            string Name = Efi.Name ?? Efi.Guid.ToString();
+
+                            if (!Name.Contains('.'))
+                            {
+                                Name += Efi.Type switch
+                                {
+                                    5 or 7 => ".dll",
+                                    9 => ".exe",
+                                    _ => ".bin",
+                                };
+                            }
+                            string EfiPath = Path.Combine(args[3], Name);
+                            Directory.CreateDirectory(Path.GetDirectoryName(EfiPath));
+                            File.WriteAllBytes(EfiPath, EfiBinary);
+                        }
+                        break;
+                    case "testprogrammer":
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -TestProgrammer <Path to ede-file>");
+                        }
+
+                        await TestCode.TestProgrammer(UIContext, args[2]);
+                        break;
+                    case "findflashingprofile":
+                        Notifier = new PhoneNotifierViewModel();
+                        UIContext.Send(s => Notifier.Start(), null);
+                        if (args.Length > 2)
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, args[2]);
+                        }
+                        else
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, null);
+                        }
+
+                        Notifier.Stop();
+                        break;
+                    case "findflashingprofileexperimental":
+                        Notifier = new PhoneNotifierViewModel();
+                        UIContext.Send(s => Notifier.Start(), null);
+                        if (args.Length > 2)
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, args[2], Experimental: true);
+                        }
+                        else
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, null, Experimental: true);
+                        }
+
+                        Notifier.Stop();
+                        break;
+                    case "findflashingprofilenorestart":
+                        Notifier = new PhoneNotifierViewModel();
+                        UIContext.Send(s => Notifier.Start(), null);
+                        if (args.Length > 2)
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, args[2], false);
+                        }
+                        else
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2FindFlashingProfile(Notifier, null, false);
+                        }
+
+                        Notifier.Stop();
+                        break;
+                    case "enabletestsigning":
+                        if (args.Length > 2)
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2EnableTestSigning(UIContext, args[2]);
+                        }
+                        else
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2EnableTestSigning(UIContext, null);
+                        }
+
+                        break;
+                    case "enabletestsigningnorestart":
+                        if (args.Length > 2)
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2EnableTestSigning(UIContext, args[2], false);
+                        }
+                        else
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2EnableTestSigning(UIContext, null, false);
+                        }
+
+                        break;
+                    case "clearnv":
+                        if (args.Length > 2)
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2ClearNV(UIContext, args[2]);
+                        }
+                        else
+                        {
+                            await LumiaV2UnlockBootViewModel.LumiaV2ClearNV(UIContext, null);
+                        }
+
+                        break;
+                    case "switchtomassstoragemode":
+                        LogFile.BeginAction("SwitchToMassStorageMode");
+                        try
+                        {
+                            Notifier = new PhoneNotifierViewModel();
+                            UIContext.Send(s => Notifier.Start(), null);
+                            LogFile.Log("Command: Switch to Mass Storage Mode", LogType.FileAndConsole);
+                            if (args.Length > 2)
+                            {
+                                await LumiaV2UnlockBootViewModel.LumiaV2SwitchToMassStorageMode(Notifier, args[2]);
+                            }
+                            else
+                            {
+                                await LumiaV2UnlockBootViewModel.LumiaV2SwitchToMassStorageMode(Notifier, null);
+                            }
+
+                            Notifier.Stop();
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                        }
+                        finally
+                        {
+                            LogFile.EndAction("SwitchToMassStorageMode");
+                        }
+                        break;
+                    case "relockphone":
+                        Notifier = new PhoneNotifierViewModel();
+                        try
+                        {
+                            UIContext.Send(s => Notifier.Start(), null);
+                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+                            Info = FlashModel.ReadPhoneInfo();
+                            Info.Log(LogType.ConsoleOnly);
+
+                            FFU ProfileFFU = null;
+                            FFU CurrentFFU;
+                            for (int i = 2; i <= 3; i++)
+                            {
+                                if (args.Length > i)
+                                {
+                                    CurrentFFU = new FFU(args[i]);
+                                    string CurrentVersion = CurrentFFU.GetOSVersion();
+                                    string PlatformID = CurrentFFU.PlatformID;
+
+                                    // Check if the current FFU matches the connected phone, so that the FFU can be used for profiling.
+                                    if (Info.PlatformID.StartsWith(PlatformID, StringComparison.OrdinalIgnoreCase))
+                                    {
+                                        ProfileFFU = CurrentFFU;
+                                    }
+                                }
+                            }
+
+                            if (ProfileFFU == null)
+                            {
+                                List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => Info.PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists()).ToList();
+                                ProfileFFU = FFUs.Count > 0
+                                    ? new FFU(FFUs[0].Path)
+                                    : throw new WPinternalsException("Profile FFU missing", "No profile FFU has been found in the repository for your device. You can add a profile FFU within the download section of the tool or by using the command line.");
+                            }
+                            LogFile.Log("Profile FFU: " + ProfileFFU.Path);
+
+                            UIContext.Send(s => Notifier.Start(), null);
+
+                            await LumiaUnlockBootloaderViewModel.LumiaRelockUEFI(Notifier, ProfileFFU.Path);
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                        }
+                        Notifier.Stop();
+                        break;
+                    case "addffu":
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -AddFFU <Path to FFU-file>");
+                        }
+
+                        App.Config.AddFfuToRepository(args[2]);
+                        break;
+                    case "removeffu":
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RemoveFFU <Path to FFU-file>");
+                        }
+
+                        App.Config.RemoveFfuFromRepository(args[2]);
+                        break;
+                    case "addemergency":
+                        if (args.Length < 5)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -AddEmergnency <Type> <Path to Programmer-file> <Path to Payload-file>");
+                        }
+
+                        App.Config.AddEmergencyToRepository(args[2], args[3], args[4]);
+                        break;
+                    case "removeemergency":
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RemoveEmergency <Path to Programmer-file>");
+                        }
+
+                        App.Config.RemoveEmergencyFromRepository(args[2]);
+                        break;
+                    case "listrepository":
+                        int Count = 0;
+                        LogFile.Log("", LogType.ConsoleOnly);
+                        LogFile.Log("FFU Repository:", LogType.ConsoleOnly);
+                        foreach (FFUEntry Entry in App.Config.FFURepository)
+                        {
+                            LogFile.Log("", LogType.ConsoleOnly);
+                            LogFile.Log("FFU " + Count.ToString() + ":", LogType.ConsoleOnly);
+                            LogFile.Log("File: " + Entry.Path + (Entry.Exists() ? "" : " (file is missing)"), LogType.ConsoleOnly);
+                            LogFile.Log("Platform ID: " + Entry.PlatformID, LogType.ConsoleOnly);
+                            if (Entry.FirmwareVersion != null)
+                            {
+                                LogFile.Log("Firmware version: " + Entry.FirmwareVersion, LogType.ConsoleOnly);
+                            }
+
+                            if (Entry.OSVersion != null)
+                            {
+                                LogFile.Log("OS version: " + Entry.OSVersion, LogType.ConsoleOnly);
+                            }
+
+                            Count++;
+                        }
+                        LogFile.Log("", LogType.ConsoleOnly);
+                        LogFile.Log("Emergency Repository:", LogType.ConsoleOnly);
+                        Count = 0;
+                        foreach (EmergencyFileEntry Entry in App.Config.EmergencyRepository)
+                        {
+                            LogFile.Log("", LogType.ConsoleOnly);
+                            LogFile.Log("Emergency " + Count.ToString() + ":", LogType.ConsoleOnly);
+                            LogFile.Log("Type: " + Entry.Type, LogType.ConsoleOnly);
+                            LogFile.Log("Programmer file: " + Entry.ProgrammerPath + (Entry.ProgrammerExists() ? "" : " (file is missing)"), LogType.ConsoleOnly);
+                            if (Entry.PayloadPath != null)
+                            {
+                                LogFile.Log("Payload file: " + Entry.PayloadPath + (Entry.PayloadExists() ? "" : " (file is missing)"), LogType.ConsoleOnly);
+                            }
+
+                            Count++;
+                        }
+                        break;
+                    case "showffu":
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -ShowFFU <Path to FFU-file>");
+                        }
+
+                        string FFUPath = args[2];
+                        LogFile.Log("FFU: " + FFUPath, LogType.ConsoleOnly);
+                        FFU = new FFU(FFUPath);
+
+                        // Show basics
+                        LogFile.Log("Platform ID: " + FFU.PlatformID, LogType.ConsoleOnly);
+                        string Firmware = FFU.GetFirmwareVersion();
+                        if (Firmware != null)
+                        {
+                            LogFile.Log("Firmware version: " + Firmware, LogType.ConsoleOnly);
+                        }
+
+                        string OSVersion = FFU.GetOSVersion();
+                        if (OSVersion != null)
+                        {
+                            LogFile.Log("OS version: " + OSVersion, LogType.ConsoleOnly);
+                        }
+
+                        // Show partitions from GPT (also show which partitions are in the FFU payload)
+                        LogFile.Log("", LogType.ConsoleOnly);
+                        LogFile.Log("Partition table:", LogType.ConsoleOnly);
+                        LogFile.Log("Name".PadRight(20) + "Start-sector".PadRight(20) + "End-sector".PadRight(20) + "Present in FFU", LogType.ConsoleOnly);
+                        foreach (Partition p in FFU.GPT.Partitions)
+                        {
+                            LogFile.Log(p.Name.PadRight(20) + ("0x" + p.FirstSector.ToString("X16")).PadRight(20) + ("0x" + p.LastSector.ToString("X16")).PadRight(20) + (FFU.IsPartitionPresentInFFU(p.Name) ? "Yes" : "No"), LogType.ConsoleOnly);
+                        }
+                        break;
+                    case "showphoneinfo":
+                        LogFile.Log("Command: Show phone info", LogType.FileAndConsole);
+                        Notifier = new PhoneNotifierViewModel();
+                        UIContext.Send(s => Notifier.Start(), null);
+                        FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+                        Info = FlashModel.ReadPhoneInfo();
+                        Info.Log(LogType.ConsoleOnly);
+                        Notifier.Stop();
+                        break;
+                    case "unlockbootloader":
+                        LogFile.BeginAction("UnlockBootloader");
+                        try
+                        {
+                            LogFile.Log("Command: Unlock Bootloader", LogType.FileAndConsole);
+                            Notifier = new PhoneNotifierViewModel();
+                            UIContext.Send(s => Notifier.Start(), null);
+                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+                            Info = FlashModel.ReadPhoneInfo();
+                            Info.Log(LogType.ConsoleOnly);
+
+                            FFU ProfileFFU = null;
+                            FFU SupportedFFU = null;
+                            FFU CurrentFFU;
+                            for (int i = 2; i <= 3; i++)
+                            {
+                                if (args.Length > i)
+                                {
+                                    CurrentFFU = new FFU(args[i]);
+                                    string CurrentVersion = CurrentFFU.GetOSVersion();
+                                    string PlatformID = CurrentFFU.PlatformID;
+
+                                    // Check if the current FFU matches the connected phone, so that the FFU can be used for profiling.
+                                    if (Info.PlatformID.StartsWith(PlatformID, StringComparison.OrdinalIgnoreCase))
+                                    {
+                                        ProfileFFU = CurrentFFU;
+                                    }
+
+                                    // Check if the current FFU is supported for unlocking.
+                                    if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == CurrentVersion))
+                                    {
+                                        SupportedFFU = CurrentFFU;
+                                    }
+                                }
+                            }
+
+                            if (ProfileFFU == null)
+                            {
+                                List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => Info.PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists()).ToList();
+                                ProfileFFU = FFUs.Count > 0
+                                    ? new FFU(FFUs[0].Path)
+                                    : throw new WPinternalsException("Profile FFU missing", "No profile FFU has been found in the repository for your device. You can add a profile FFU within the download section of the tool or by using the command line.");
+                            }
+                            LogFile.Log("Profile FFU: " + ProfileFFU.Path);
+
+                            if (SupportedFFU == null)
+                            {
+                                List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)).ToList();
+                                SupportedFFU = FFUs.Count > 0
+                                    ? new FFU(FFUs[0].Path)
+                                    : throw new WPinternalsException("No donor-FFU found with supported OS version", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
+                            }
+
+                            await LumiaUnlockBootloaderViewModel.LumiaUnlockUEFI(Notifier, ProfileFFU.Path, null, SupportedFFU.Path);
+
+                            Notifier.Stop();
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                        }
+                        finally
+                        {
+                            LogFile.EndAction("UnlockBootloader");
+                        }
+                        break;
+                    case "flashcustomrom":
+                        LogFile.BeginAction("FlashCustomROM");
+                        try
+                        {
+                            LogFile.Log("Command: Flash Custom ROM", LogType.FileAndConsole);
+                            if (args.Length < 3)
+                            {
+                                throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashCustomROM <Path to Custom ROM ZIP-file>");
+                            }
+
+                            string CustomRomPath = args[2];
+                            LogFile.Log("Custom ROM: " + CustomRomPath, LogType.FileAndConsole);
+                            Notifier = new PhoneNotifierViewModel();
+                            UIContext.Send(s => Notifier.Start(), null);
+                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+                            Info = FlashModel.ReadPhoneInfo();
+                            Info.Log(LogType.ConsoleOnly);
+                            LogFile.Log("Preparing to flash Custom ROM", LogType.FileAndConsole);
+                            await LumiaV2UnlockBootViewModel.LumiaV2FlashArchive(Notifier, CustomRomPath);
+                            LogFile.Log("Custom ROM flashed successfully", LogType.FileAndConsole);
+                            Notifier.Stop();
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                        }
+                        finally
+                        {
+                            LogFile.EndAction("FlashCustomROM");
+                        }
+                        break;
+                    case "flashffu":
+                        LogFile.BeginAction("FlashFFU");
+                        try
+                        {
+                            LogFile.Log("Command: Flash FFU", LogType.FileAndConsole);
+                            if (args.Length < 3)
+                            {
+                                throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -FlashFFU <Path to FFU-file>");
+                            }
+
+                            FFUPath = args[2];
+                            LogFile.Log("FFU file: " + FFUPath, LogType.FileAndConsole);
+                            Notifier = new PhoneNotifierViewModel();
+                            UIContext.Send(s => Notifier.Start(), null);
+                            FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+                            Info = FlashModel.ReadPhoneInfo();
+                            Info.Log(LogType.ConsoleOnly);
+                            LogFile.Log("Flashing FFU...", LogType.FileAndConsole);
+                            await Task.Run(() => FlashModel.FlashFFU(new FFU(FFUPath), true, (byte)(!Info.IsBootloaderSecure ? FlashOptions.SkipSignatureCheck : 0)));
+                            LogFile.Log("FFU flashed successfully", LogType.FileAndConsole);
+                            Notifier.Stop();
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                        }
+                        finally
+                        {
+                            LogFile.EndAction("FlashFFU");
+                        }
+                        break;
+                    case "fixbootafterunlockingbootloader":
+                        LogFile.BeginAction("FixBoot");
+                        try
+                        {
+                            LogFile.Log("Command: Fix boot after unlocking bootloader", LogType.FileAndConsole);
+                            Notifier = new PhoneNotifierViewModel();
+                            UIContext.Send(s => Notifier.Start(), null);
+                            string Drive = await LumiaV2UnlockBootViewModel.LumiaV2SwitchToMassStorageMode(Notifier, null);
+                            Notifier.Stop();
+                            App.PatchEngine.TargetPath = Drive + "\\";
+                            PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
+                            if (!PatchResult)
+                            {
+                                throw new WPinternalsException("Patch failed", "An error occured while patching Operating System files on the MainOS partition of your phone. Make sure your phone runs a supported Operating System version.");
+                            }
+
+                            LogFile.Log("Fixed bootloader", LogType.FileAndConsole);
+                            LogFile.Log("The phone is left in Mass Storage mode", LogType.FileAndConsole);
+                            LogFile.Log("Press and hold the power-button of the phone for at least 10 seconds to reset the phone", LogType.FileAndConsole);
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                        }
+                        finally
+                        {
+                            LogFile.EndAction("FixBoot");
+                        }
+                        break;
+                    case "enablerootaccess":
+                        LogFile.BeginAction("EnableRootAccess");
+                        try
+                        {
+                            LogFile.Log("Command: Enable root access on the phone", LogType.FileAndConsole);
+                            Notifier = new PhoneNotifierViewModel();
+                            UIContext.Send(s => Notifier.Start(), null);
+                            string Drive = await LumiaV2UnlockBootViewModel.LumiaV2SwitchToMassStorageMode(Notifier, null);
+                            Notifier.Stop();
+                            App.PatchEngine.TargetPath = Drive + "\\EFIESP\\";
+                            PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
+                            if (!PatchResult)
+                            {
+                                throw new WPinternalsException("Patch failed", "An error occured while patching Operating System files on the EFIESP partition of your phone. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported.");
+                            }
+
+                            App.PatchEngine.TargetPath = Drive + "\\";
+                            PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
+                            if (!PatchResult)
+                            {
+                                throw new WPinternalsException("Patch failed", "An error occured while patching Operating System files on the MainOS partition of your phone. Make sure your phone runs a supported Operating System version.");
+                            }
+
+                            PatchResult = App.PatchEngine.Patch("RootAccess-MainOS");
+                            if (!PatchResult)
+                            {
+                                throw new WPinternalsException("Patch failed", "An error occured while modifying Operating System files on the MainOS partition of your phone for Root Access. Make sure your phone runs a supported Operating System version.");
+                            }
+
+                            LogFile.Log("Root Access enabled!", LogType.FileAndConsole);
+                            LogFile.Log("The phone is left in Mass Storage mode", LogType.FileAndConsole);
+                            LogFile.Log("Press and hold the power-button of the phone for at least 10 seconds to reset the phone", LogType.FileAndConsole);
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                        }
+                        finally
+                        {
+                            LogFile.EndAction("EnableRootAccess");
+                        }
+                        break;
+                    case "unlockbootloaderonimage":
+                        LogFile.Log("Command: Unlock bootloader on image", LogType.FileAndConsole);
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -UnlockBootLoaderOnImage <EFIESP image file> <Optional: MainOS image file> <Optional: donor-FFU file with supported version of bootfiles>");
+                        }
+
+                        FFUFilePath = null;
+                        EfiEspImagePath = args[2];
+                        if (args.Length > 3)
+                        {
+                            if (FFU.IsFFU(args[3]))
+                            {
+                                FFUFilePath = args[3];
+                            }
+                            else
+                            {
+                                MainOsImagePath = args[3];
+                            }
+                        }
+                        if (args.Length > 4)
+                        {
+                            FFUFilePath = args[4];
+                        }
+
+                        using (FileStream FileSystemStream = new(EfiEspImagePath, FileMode.Open, FileAccess.ReadWrite))
+                        {
+                            UnlockedEFIESPFileSystem = new DiscUtils.Fat.FatFileSystem(FileSystemStream);
+
+                            if (FFUFilePath != null)
+                            {
+                                FFU SupportedFFU = new(FFUFilePath);
+                                LogFile.Log("Donor FFU: " + SupportedFFU.Path);
+                                byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
+                                DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP));
+                                DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
+                                MemoryStream SupportedMobileStartupMemStream = new();
+                                SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
+                                byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
+                                SupportedMobileStartupMemStream.Close();
+                                SupportedMobileStartupStream.Close();
+
+                                // Save supported mobilestartup.efi
+                                LogFile.Log("Taking mobilestartup.efi from donor-FFU");
+                                Stream MobileStartupStream = UnlockedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Create, FileAccess.Write);
+                                MobileStartupStream.Write(SupportedMobileStartup, 0, SupportedMobileStartup.Length);
+                                MobileStartupStream.Close();
+                            }
+
+                            App.PatchEngine.TargetImage = UnlockedEFIESPFileSystem;
+                            PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
+                            if (!PatchResult)
+                            {
+                                throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
+                            }
+
+                            // Edit BCD
+                            LogFile.Log("Edit BCD");
+                            using Stream BCDFileStream = UnlockedEFIESPFileSystem.OpenFile(@"\efi\Microsoft\Boot\BCD", FileMode.Open, FileAccess.ReadWrite);
+                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
+                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
+                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
+                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            }
+
+                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
+                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            }
+                        }
+
+                        if (MainOsImagePath != null)
+                        {
+                            using FileStream FileSystemStream = new(MainOsImagePath, FileMode.Open, FileAccess.ReadWrite);
+                            UnlockedMainOsFileSystem = new DiscUtils.Ntfs.NtfsFileSystem(FileSystemStream);
+
+                            App.PatchEngine.TargetImage = UnlockedMainOsFileSystem;
+                            PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
+                            if (!PatchResult)
+                            {
+                                throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
+                            }
+                        }
+                        LogFile.Log("Bootloader unlocked on image", LogType.FileAndConsole);
+                        break;
+                    case "enablerootaccessonimage":
+                        LogFile.Log("Command: Enable root access on image", LogType.FileAndConsole);
+                        if (args.Length < 4)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -EnableRootAccessOnImage <EFIESP image file> <MainOS image file> <Optional: donor-FFU file with supported version of bootfiles>");
+                        }
+
+                        FFUFilePath = null;
+                        EfiEspImagePath = args[2];
+                        MainOsImagePath = args[3];
+                        if (args.Length > 4)
+                        {
+                            FFUFilePath = args[4];
+                        }
+
+                        using (FileStream FileSystemStream = new(EfiEspImagePath, FileMode.Open, FileAccess.ReadWrite))
+                        {
+                            UnlockedEFIESPFileSystem = new DiscUtils.Fat.FatFileSystem(FileSystemStream);
+
+                            if (FFUFilePath != null)
+                            {
+                                FFU SupportedFFU = new(FFUFilePath);
+                                LogFile.Log("Supported FFU: " + SupportedFFU.Path);
+                                byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
+                                DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP));
+                                DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
+                                MemoryStream SupportedMobileStartupMemStream = new();
+                                SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
+                                byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
+                                SupportedMobileStartupMemStream.Close();
+                                SupportedMobileStartupStream.Close();
+
+                                // Save supported mobilestartup.efi
+                                LogFile.Log("Taking mobilestartup.efi from donor-FFU");
+                                Stream MobileStartupStream = UnlockedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Create, FileAccess.Write);
+                                MobileStartupStream.Write(SupportedMobileStartup, 0, SupportedMobileStartup.Length);
+                                MobileStartupStream.Close();
+                            }
+
+                            App.PatchEngine.TargetImage = UnlockedEFIESPFileSystem;
+                            PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
+                            if (!PatchResult)
+                            {
+                                throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
+                            }
+
+                            // Edit BCD
+                            LogFile.Log("Edit BCD");
+                            using Stream BCDFileStream = UnlockedEFIESPFileSystem.OpenFile(@"\efi\Microsoft\Boot\BCD", FileMode.Open, FileAccess.ReadWrite);
+                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
+                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
+                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
+                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            }
+
+                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
+                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            }
+                        }
+
+                        using (FileStream FileSystemStream = new(MainOsImagePath, FileMode.Open, FileAccess.ReadWrite))
+                        {
+                            UnlockedMainOsFileSystem = new DiscUtils.Ntfs.NtfsFileSystem(FileSystemStream);
+
+                            App.PatchEngine.TargetImage = UnlockedMainOsFileSystem;
+                            PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
+                            if (!PatchResult)
+                            {
+                                throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
+                            }
+
+                            PatchResult = App.PatchEngine.Patch("RootAccess-MainOS");
+                            if (!PatchResult)
+                            {
+                                throw new WPinternalsException("Failed to patch MainOS", "An error occured while modifying Operating System files on the MainOS partition you provided for Root Access. Make sure your phone runs a supported Operating System version.");
+                            }
+                        }
+                        LogFile.Log("Root access enabled on image", LogType.FileAndConsole);
+                        break;
+                    case "unlockbootloaderonmountedimage":
+                        LogFile.Log("Command: Unlock bootloader on mounted image", LogType.FileAndConsole);
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -UnlockBootLoaderOnMountedImage <Directory of mounted EFIESP image file> <Optional: Directory of mounted MainOS image file> <Optional: donor-FFU file with supported version of bootfiles>");
+                        }
+
+                        FFUFilePath = null;
+                        EfiEspImagePath = args[2];
+                        if (args.Length > 3)
+                        {
+                            if (FFU.IsFFU(args[3]))
+                            {
+                                FFUFilePath = args[3];
+                            }
+                            else
+                            {
+                                MainOsImagePath = args[3];
+                            }
+                        }
+                        if (args.Length > 4)
+                        {
+                            FFUFilePath = args[4];
+                        }
+
+                        if (FFUFilePath != null)
+                        {
+                            FFU SupportedFFU = new(FFUFilePath);
+                            LogFile.Log("Donor-FFU: " + SupportedFFU.Path);
+                            byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
+                            DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP));
+                            DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
+                            MemoryStream SupportedMobileStartupMemStream = new();
+                            SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
+                            byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
+                            SupportedMobileStartupMemStream.Close();
+                            SupportedMobileStartupStream.Close();
+
+                            // Save supported mobilestartup.efi
+                            LogFile.Log("Taking mobilestartup.efi from donor-FFU");
+                            Stream MobileStartupStream = File.Open(Path.Combine(EfiEspImagePath, @"Windows\System32\Boot\mobilestartup.efi"), FileMode.Create, FileAccess.Write);
+                            MobileStartupStream.Write(SupportedMobileStartup, 0, SupportedMobileStartup.Length);
+                            MobileStartupStream.Close();
+                        }
+
+                        App.PatchEngine.TargetPath = EfiEspImagePath;
+                        PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
+                        if (!PatchResult)
+                        {
+                            throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
+                        }
+
+                        // Edit BCD
+                        LogFile.Log("Edit BCD");
+                        using (Stream BCDFileStream = File.Open(Path.Combine(EfiEspImagePath, @"efi\Microsoft\Boot\BCD"), FileMode.Open, FileAccess.ReadWrite))
+                        {
+                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
+                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
+                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
+                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            }
+
+                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
+                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            }
+                        }
+
+                        if (MainOsImagePath != null)
+                        {
+                            App.PatchEngine.TargetPath = MainOsImagePath;
+                            PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
+                            if (!PatchResult)
+                            {
+                                throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
+                            }
+                        }
+                        LogFile.Log("Bootloader unlocked on image", LogType.FileAndConsole);
+                        break;
+                    case "enablerootaccessonmountedimage":
+                        LogFile.Log("Command: Enable root access on mounted image", LogType.FileAndConsole);
+                        if (args.Length < 4)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -EnableRootAccessOnMountedImage <Directory of mounted EFIESP image file> <Directory of mounted MainOS image file> <Optional: donor-FFU file with supported version of bootfiles>");
+                        }
+
+                        FFUFilePath = null;
+                        EfiEspImagePath = args[2];
+                        MainOsImagePath = args[3];
+                        if (args.Length > 4)
+                        {
+                            FFUFilePath = args[4];
+                        }
+
+                        if (FFUFilePath != null)
+                        {
+                            FFU SupportedFFU = new(FFUFilePath);
+                            LogFile.Log("Supported FFU: " + SupportedFFU.Path);
+                            byte[] SupportedEFIESP = SupportedFFU.GetPartition("EFIESP");
+                            DiscUtils.Fat.FatFileSystem SupportedEFIESPFileSystem = new(new MemoryStream(SupportedEFIESP));
+                            DiscUtils.Streams.SparseStream SupportedMobileStartupStream = SupportedEFIESPFileSystem.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open);
+                            MemoryStream SupportedMobileStartupMemStream = new();
+                            SupportedMobileStartupStream.CopyTo(SupportedMobileStartupMemStream);
+                            byte[] SupportedMobileStartup = SupportedMobileStartupMemStream.ToArray();
+                            SupportedMobileStartupMemStream.Close();
+                            SupportedMobileStartupStream.Close();
+
+                            // Save supported mobilestartup.efi
+                            LogFile.Log("Taking mobilestartup.efi from donor-FFU");
+                            Stream MobileStartupStream = File.Open(Path.Combine(EfiEspImagePath, @"Windows\System32\Boot\mobilestartup.efi"), FileMode.Create, FileAccess.Write);
+                            MobileStartupStream.Write(SupportedMobileStartup, 0, SupportedMobileStartup.Length);
+                            MobileStartupStream.Close();
+                        }
+
+                        App.PatchEngine.TargetPath = EfiEspImagePath;
+                        PatchResult = App.PatchEngine.Patch("SecureBootHack-V2-EFIESP");
+                        if (!PatchResult)
+                        {
+                            throw new WPinternalsException("Failed to patch bootloader", "An error occured while patching Operating System files on the EFIESP partition provided. Make sure no boot files have been tampered with and you use the latest version of the tool. This error cannot be caused by an incorrect Operating System version as the tool automatically uses replacement if the version isn't supported, unless the replacement files have been tampered with or are not compatible.");
+                        }
+
+                        // Edit BCD
+                        LogFile.Log("Edit BCD");
+                        using (Stream BCDFileStream = File.Open(Path.Combine(EfiEspImagePath, @"efi\Microsoft\Boot\BCD"), FileMode.Open, FileAccess.ReadWrite))
+                        {
+                            using DiscUtils.Registry.RegistryHive BCDHive = new(BCDFileStream);
+                            DiscUtils.BootConfig.Store BCDStore = new(BCDHive.Root);
+                            DiscUtils.BootConfig.BcdObject MobileStartupObject = BCDStore.GetObject(new Guid("{01de5a27-8705-40db-bad6-96fa5187d4a6}"));
+                            DiscUtils.BootConfig.Element NoCodeIntegrityElement = MobileStartupObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                MobileStartupObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            }
+
+                            DiscUtils.BootConfig.BcdObject WinLoadObject = BCDStore.GetObject(new Guid("{7619dcc9-fafe-11d9-b411-000476eba25f}"));
+                            NoCodeIntegrityElement = WinLoadObject.GetElement(0x16000048);
+                            if (NoCodeIntegrityElement != null)
+                            {
+                                NoCodeIntegrityElement.Value = DiscUtils.BootConfig.ElementValue.ForBoolean(true);
+                            }
+                            else
+                            {
+                                WinLoadObject.AddElement(0x16000048, DiscUtils.BootConfig.ElementValue.ForBoolean(true));
+                            }
+                        }
+
+                        App.PatchEngine.TargetPath = MainOsImagePath;
+                        PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
+                        if (!PatchResult)
+                        {
+                            throw new WPinternalsException("Failed to patch MainOS", "An error occured while patching Operating System files on the MainOS partition you provided. Make sure your phone runs a supported Operating System version.");
+                        }
+
+                        PatchResult = App.PatchEngine.Patch("RootAccess-MainOS");
+                        if (!PatchResult)
+                        {
+                            throw new WPinternalsException("Failed to patch MainOS", "An error occured while modifying Operating System files on the MainOS partition you provided for Root Access. Make sure your phone runs a supported Operating System version.");
+                        }
+
+                        LogFile.Log("Root access enabled on image", LogType.FileAndConsole);
+                        break;
+                    case "downloadffu":
+                        LogFile.Log("Command: Download FFU", LogType.FileAndConsole);
+                        Notifier = new PhoneNotifierViewModel();
+                        UIContext.Send(s => Notifier.Start(), null);
+                        if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Normal)
+                        {
+                            NormalModel = (NokiaPhoneModel)Notifier.CurrentModel;
+                            ProductCode = NormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode");
+                        }
+                        else if ((Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader) || (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash))
+                        {
+                            FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
+                            Info = FlashModel.ReadPhoneInfo();
+                            ProductCode = Info.ProductCode;
+                        }
+                        else
+                        {
+                            NormalModel = (NokiaPhoneModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Normal);
+                            ProductCode = NormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode");
+                        }
+                        URL = LumiaDownloadModel.SearchFFU(null, ProductCode, null, out ProductType);
+                        DownloadFolder = args.Length >= 3
+                            ? args[4]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                        if (!Directory.Exists(DownloadFolder))
+                        {
+                            Directory.CreateDirectory(DownloadFolder);
+                        }
+
+                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                        URI = new Uri(URL);
+                        FFUFileName = Path.GetFileName(URI.LocalPath);
+                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
+                        LogFile.Log("Downloading...", LogType.FileAndConsole);
+                        using (System.Net.WebClient myWebClient = new())
+                        {
+                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
+                        }
+                        LogFile.Log("Download finished", LogType.FileAndConsole);
+                        App.Config.AddFfuToRepository(FFUFilePath);
+                        Notifier.Stop();
+                        break;
+                    case "downloadffubyoperatorcode":
+                        LogFile.Log("Command: Download FFU by Operator Code", LogType.FileAndConsole);
+                        if (args.Length < 4)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadFFUbyOperatorCode <Product type> <Operator code> <Optional: Download folder>");
+                        }
+
+                        ProductType = args[2];
+                        LogFile.Log("Product type: " + ProductType, LogType.FileAndConsole);
+                        OperatorCode = args[3];
+                        LogFile.Log("Operator code: " + OperatorCode, LogType.FileAndConsole);
+                        DownloadFolder = args.Length >= 5
+                            ? args[4]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                        if (!Directory.Exists(DownloadFolder))
+                        {
+                            Directory.CreateDirectory(DownloadFolder);
+                        }
+
+                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                        URL = LumiaDownloadModel.SearchFFU(ProductType, null, OperatorCode);
+                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                        URI = new Uri(URL);
+                        FFUFileName = Path.GetFileName(URI.LocalPath);
+                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
+                        LogFile.Log("Downloading...", LogType.FileAndConsole);
+                        using (System.Net.WebClient myWebClient = new())
+                        {
+                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
+                        }
+                        LogFile.Log("Download finished", LogType.FileAndConsole);
+                        App.Config.AddFfuToRepository(FFUFilePath);
+                        break;
+                    case "downloadffubyproductcode":
+                        LogFile.Log("Command: Download FFU by Product Code", LogType.FileAndConsole);
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadFFUbyProductCode <Product code> <Optional: Download folder>");
+                        }
+
+                        ProductCode = args[2];
+                        LogFile.Log("Product code: " + ProductCode, LogType.FileAndConsole);
+                        URL = LumiaDownloadModel.SearchFFU(null, ProductCode, null, out ProductType);
+                        DownloadFolder = args.Length >= 4
+                            ? args[3]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                        if (!Directory.Exists(DownloadFolder))
+                        {
+                            Directory.CreateDirectory(DownloadFolder);
+                        }
+
+                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                        URI = new Uri(URL);
+                        FFUFileName = Path.GetFileName(URI.LocalPath);
+                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
+                        LogFile.Log("Downloading...", LogType.FileAndConsole);
+                        using (System.Net.WebClient myWebClient = new())
+                        {
+                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
+                        }
+                        LogFile.Log("Download finished", LogType.FileAndConsole);
+                        App.Config.AddFfuToRepository(FFUFilePath);
+                        break;
+                    case "downloadffubyproducttype":
+                        LogFile.Log("Command: Download FFU by Product Type", LogType.FileAndConsole);
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadFFUbyProductType <Product type> <Optional: Download folder>");
+                        }
+
+                        ProductType = args[2];
+                        LogFile.Log("Product type: " + ProductType, LogType.FileAndConsole);
+                        DownloadFolder = args.Length >= 4
+                            ? args[3]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                        if (!Directory.Exists(DownloadFolder))
+                        {
+                            Directory.CreateDirectory(DownloadFolder);
+                        }
+
+                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                        URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
+                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                        URI = new Uri(URL);
+                        FFUFileName = Path.GetFileName(URI.LocalPath);
+                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
+                        LogFile.Log("Downloading...", LogType.FileAndConsole);
+                        using (System.Net.WebClient myWebClient = new())
+                        {
+                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
+                        }
+                        LogFile.Log("Download finished", LogType.FileAndConsole);
+                        App.Config.AddFfuToRepository(FFUFilePath);
+                        break;
+                    case "searchffubyproducttype":
+                        LogFile.Log("Command: Search FFU by Product Type", LogType.FileAndConsole);
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -SearchFFUbyProductType <Lumia model>");
+                        }
+
+                        ProductType = args[2];
+                        LogFile.Log("Lumia model: " + ProductType, LogType.FileAndConsole);
+                        URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
+                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                        URI = new Uri(URL);
+                        FFUFileName = Path.GetFileName(URI.LocalPath);
+                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                        break;
+                    case "downloademergency":
+                        LogFile.Log("Command: Download Emergency files", LogType.FileAndConsole);
+                        Notifier = new PhoneNotifierViewModel();
+                        UIContext.Send(s => Notifier.Start(), null);
+                        if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Normal)
+                        {
+                            NormalModel = (NokiaPhoneModel)Notifier.CurrentModel;
+                            ProductType = NormalModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName");
+                            if (ProductType.Contains('_'))
+                            {
+                                ProductType = ProductType.Substring(0, ProductType.IndexOf('_'));
+                            }
+                        }
+                        else if ((Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader) || (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash))
+                        {
+                            FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
+                            Info = FlashModel.ReadPhoneInfo();
+                            ProductType = Info.Type;
+                        }
+                        else
+                        {
+                            NormalModel = (NokiaPhoneModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Normal);
+                            ProductType = NormalModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName");
+                            if (ProductType.Contains('_'))
+                            {
+                                ProductType = ProductType.Substring(0, ProductType.IndexOf('_'));
+                            }
+                        }
+                        URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
+                        if (URLs != null)
+                        {
+                            DownloadFolder = args.Length >= 3
+                                ? args[2]
+                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                            if (!Directory.Exists(DownloadFolder))
+                            {
+                                Directory.CreateDirectory(DownloadFolder);
+                            }
+
+                            LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                            for (int i = 0; i < URLs.Length; i++)
+                            {
+                                LogFile.Log("URL: " + URLs[i], LogType.FileAndConsole);
+                                URI = new Uri(URLs[i]);
+                                EmergencyFileName = Path.GetFileName(URI.LocalPath);
+                                LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
+                                EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
+                                if (i == 0)
+                                {
+                                    ProgrammerPath = EmergencyFilePath;
+                                }
+                                else
+                                {
+                                    PayloadPath = EmergencyFilePath;
+                                }
+
+                                LogFile.Log("Downloading...", LogType.FileAndConsole);
+                                using (System.Net.WebClient myWebClient = new())
+                                {
+                                    await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
+                                }
+                                LogFile.Log("Download finished", LogType.FileAndConsole);
+                            }
+                            App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
+                        }
+                        Notifier.Stop();
+                        break;
+                    case "downloademergencybyproducttype":
+                        LogFile.Log("Command: Download Emergency files", LogType.FileAndConsole);
+                        if (args.Length < 3)
+                        {
+                            throw new WPinternalsException("Wrong number of arguments. Usage: WPinternals.exe -DownloadEmergencyByProductType <Product type> <Optional: Download folder>");
+                        }
+
+                        ProductType = args[2];
+                        URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
+                        if (URLs != null)
+                        {
+                            DownloadFolder = args.Length >= 4
+                                ? args[3]
+                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                            if (!Directory.Exists(DownloadFolder))
+                            {
+                                Directory.CreateDirectory(DownloadFolder);
+                            }
+
+                            LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                            for (int i = 0; i < URLs.Length; i++)
+                            {
+                                LogFile.Log("URL: " + URLs[i], LogType.FileAndConsole);
+                                URI = new Uri(URLs[i]);
+                                EmergencyFileName = Path.GetFileName(URI.LocalPath);
+                                LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
+                                EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
+                                if (i == 0)
+                                {
+                                    ProgrammerPath = EmergencyFilePath;
+                                }
+                                else
+                                {
+                                    PayloadPath = EmergencyFilePath;
+                                }
+
+                                LogFile.Log("Downloading...", LogType.FileAndConsole);
+                                using (System.Net.WebClient myWebClient = new())
+                                {
+                                    await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
+                                }
+                                LogFile.Log("Download finished", LogType.FileAndConsole);
+                            }
+                            App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
+                        }
+                        break;
+                    case "downloadall":
+                        LogFile.Log("Command: Download all", LogType.FileAndConsole);
+                        Notifier = new PhoneNotifierViewModel();
+                        UIContext.Send(s => Notifier.Start(), null);
+                        if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Normal)
+                        {
+                            NormalModel = (NokiaPhoneModel)Notifier.CurrentModel;
+                            ProductCode = NormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode");
+                        }
+                        else if ((Notifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader) || (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash))
+                        {
+                            FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
+                            Info = FlashModel.ReadPhoneInfo();
+                            ProductCode = Info.ProductCode;
+                        }
+                        else
+                        {
+                            NormalModel = (NokiaPhoneModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Normal);
+                            ProductCode = NormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode");
+                        }
+                        URL = LumiaDownloadModel.SearchFFU(null, ProductCode, null, out ProductType);
+                        DownloadFolder = args.Length >= 3
+                            ? args[2]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                        if (!Directory.Exists(DownloadFolder))
+                        {
+                            Directory.CreateDirectory(DownloadFolder);
+                        }
+
+                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                        URI = new Uri(URL);
+                        FFUFileName = Path.GetFileName(URI.LocalPath);
+                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
+                        LogFile.Log("Downloading...", LogType.FileAndConsole);
+                        using (System.Net.WebClient myWebClient = new())
+                        {
+                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
+                        }
+                        LogFile.Log("Download finished", LogType.FileAndConsole);
+                        App.Config.AddFfuToRepository(FFUFilePath);
+
+                        URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
+                        if (URLs != null)
+                        {
+                            for (int i = 0; i < URLs.Length; i++)
+                            {
+                                LogFile.Log("URL: " + URLs[i], LogType.FileAndConsole);
+                                URI = new Uri(URLs[i]);
+                                EmergencyFileName = Path.GetFileName(URI.LocalPath);
+                                LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
+                                EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
+                                if (i == 0)
+                                {
+                                    ProgrammerPath = EmergencyFilePath;
+                                }
+                                else
+                                {
+                                    PayloadPath = EmergencyFilePath;
+                                }
+
+                                LogFile.Log("Downloading...", LogType.FileAndConsole);
+                                using (System.Net.WebClient myWebClient = new())
+                                {
+                                    await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
+                                }
+                                LogFile.Log("Download finished", LogType.FileAndConsole);
+                            }
+                            App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
+                        }
+
+                        if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                        {
+                            ProductType = "RM-1085";
+
+                            URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
+                            DownloadFolder = args.Length >= 3
+                                ? args[2]
+                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                            if (!Directory.Exists(DownloadFolder))
+                            {
+                                Directory.CreateDirectory(DownloadFolder);
+                            }
+
+                            LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                            LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                            URI = new Uri(URL);
+                            FFUFileName = Path.GetFileName(URI.LocalPath);
+                            LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                            FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
+                            LogFile.Log("Downloading...", LogType.FileAndConsole);
+                            using (System.Net.WebClient myWebClient = new())
+                            {
+                                await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
+                            }
+                            LogFile.Log("Download finished", LogType.FileAndConsole);
+                            App.Config.AddFfuToRepository(FFUFilePath);
+
+                            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                            {
+                                throw new WPinternalsException("Unable to find compatible FFU", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
+                            }
+                        }
+                        Notifier.Stop();
+                        break;
+                    case "downloadallbyproducttype":
+                        LogFile.Log("Command: Download all by Product Type", LogType.FileAndConsole);
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadAllByProductType <Product type> <Optional: Download folder>");
+                        }
+
+                        ProductType = args[2];
+                        LogFile.Log("Product type: " + ProductType, LogType.FileAndConsole);
+                        DownloadFolder = args.Length >= 4
+                            ? args[3]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                        if (!Directory.Exists(DownloadFolder))
+                        {
+                            Directory.CreateDirectory(DownloadFolder);
+                        }
+
+                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                        URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
+                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                        URI = new Uri(URL);
+                        FFUFileName = Path.GetFileName(URI.LocalPath);
+                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
+                        LogFile.Log("Downloading...", LogType.FileAndConsole);
+                        using (System.Net.WebClient myWebClient = new())
+                        {
+                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
+                        }
+                        LogFile.Log("Download finished", LogType.FileAndConsole);
+                        App.Config.AddFfuToRepository(FFUFilePath);
+
+                        URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
+                        if (URLs != null)
+                        {
+                            for (int i = 0; i < URLs.Length; i++)
+                            {
+                                LogFile.Log("URL: " + URLs[i], LogType.FileAndConsole);
+                                URI = new Uri(URLs[i]);
+                                EmergencyFileName = Path.GetFileName(URI.LocalPath);
+                                LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
+                                EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
+                                if (i == 0)
+                                {
+                                    ProgrammerPath = EmergencyFilePath;
+                                }
+                                else
+                                {
+                                    PayloadPath = EmergencyFilePath;
+                                }
+
+                                LogFile.Log("Downloading...", LogType.FileAndConsole);
+                                using (System.Net.WebClient myWebClient = new())
+                                {
+                                    await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
+                                }
+                                LogFile.Log("Download finished", LogType.FileAndConsole);
+                            }
+                            App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
+                        }
+
+                        if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                        {
+                            ProductType = "RM-1085";
+
+                            URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
+                            DownloadFolder = args.Length >= 4
+                                ? args[3]
+                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                            if (!Directory.Exists(DownloadFolder))
+                            {
+                                Directory.CreateDirectory(DownloadFolder);
+                            }
+
+                            LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                            LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                            URI = new Uri(URL);
+                            FFUFileName = Path.GetFileName(URI.LocalPath);
+                            LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                            FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
+                            LogFile.Log("Downloading...", LogType.FileAndConsole);
+                            using (System.Net.WebClient myWebClient = new())
+                            {
+                                await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
+                            }
+                            LogFile.Log("Download finished", LogType.FileAndConsole);
+                            App.Config.AddFfuToRepository(FFUFilePath);
+
+                            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                            {
+                                throw new WPinternalsException("Unable to find compatible FFU", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
+                            }
+                        }
+                        break;
+                    case "downloadallbyproductcode":
+                        LogFile.Log("Command: Download all by Product Code", LogType.FileAndConsole);
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadAllByProductCode <Product code> <Optional: Download folder>");
+                        }
+
+                        ProductCode = args[2];
+                        LogFile.Log("Product code: " + ProductCode, LogType.FileAndConsole);
+                        URL = LumiaDownloadModel.SearchFFU(null, ProductCode, null, out ProductType);
+                        DownloadFolder = args.Length >= 4
+                            ? args[3]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                        if (!Directory.Exists(DownloadFolder))
+                        {
+                            Directory.CreateDirectory(DownloadFolder);
+                        }
+
+                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                        URI = new Uri(URL);
+                        FFUFileName = Path.GetFileName(URI.LocalPath);
+                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
+                        LogFile.Log("Downloading...", LogType.FileAndConsole);
+                        using (System.Net.WebClient myWebClient = new())
+                        {
+                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
+                        }
+                        LogFile.Log("Download finished", LogType.FileAndConsole);
+                        App.Config.AddFfuToRepository(FFUFilePath);
+
+                        URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
+                        if (URLs != null)
+                        {
+                            for (int i = 0; i < URLs.Length; i++)
+                            {
+                                LogFile.Log("URL: " + URLs[i], LogType.FileAndConsole);
+                                URI = new Uri(URLs[i]);
+                                EmergencyFileName = Path.GetFileName(URI.LocalPath);
+                                LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
+                                EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
+                                if (i == 0)
+                                {
+                                    ProgrammerPath = EmergencyFilePath;
+                                }
+                                else
+                                {
+                                    PayloadPath = EmergencyFilePath;
+                                }
+
+                                LogFile.Log("Downloading...", LogType.FileAndConsole);
+                                using (System.Net.WebClient myWebClient = new())
+                                {
+                                    await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
+                                }
+                                LogFile.Log("Download finished", LogType.FileAndConsole);
+                            }
+                            App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
+                        }
+
+                        if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                        {
+                            ProductType = "RM-1085";
+
+                            URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
+                            DownloadFolder = args.Length >= 4
+                                ? args[3]
+                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                            if (!Directory.Exists(DownloadFolder))
+                            {
+                                Directory.CreateDirectory(DownloadFolder);
+                            }
+
+                            LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                            LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                            URI = new Uri(URL);
+                            FFUFileName = Path.GetFileName(URI.LocalPath);
+                            LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                            FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
+                            LogFile.Log("Downloading...", LogType.FileAndConsole);
+                            using (System.Net.WebClient myWebClient = new())
+                            {
+                                await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
+                            }
+                            LogFile.Log("Download finished", LogType.FileAndConsole);
+                            App.Config.AddFfuToRepository(FFUFilePath);
+
+                            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                            {
+                                throw new WPinternalsException("Unable to find compatible FFU", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
+                            }
+                        }
+                        break;
+                    case "downloadallbyoperatorcode":
+                        LogFile.Log("Command: Download FFU by Operator Code", LogType.FileAndConsole);
+                        if (args.Length < 4)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -DownloadFFUbyOperatorCode <Product type> <Operator code> <Optional: Download folder>");
+                        }
+
+                        ProductType = args[2];
+                        LogFile.Log("Product type: " + ProductType, LogType.FileAndConsole);
+                        OperatorCode = args[3];
+                        LogFile.Log("Operator code: " + OperatorCode, LogType.FileAndConsole);
+                        DownloadFolder = args.Length >= 5
+                            ? args[4]
+                            : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                        if (!Directory.Exists(DownloadFolder))
+                        {
+                            Directory.CreateDirectory(DownloadFolder);
+                        }
+
+                        LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                        URL = LumiaDownloadModel.SearchFFU(ProductType, null, OperatorCode);
+                        LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                        URI = new Uri(URL);
+                        FFUFileName = Path.GetFileName(URI.LocalPath);
+                        LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                        FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
+                        LogFile.Log("Downloading...", LogType.FileAndConsole);
+                        using (System.Net.WebClient myWebClient = new())
+                        {
+                            await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
+                        }
+                        LogFile.Log("Download finished", LogType.FileAndConsole);
+                        App.Config.AddFfuToRepository(FFUFilePath);
+
+                        URLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
+                        if (URLs != null)
+                        {
+                            for (int i = 0; i < URLs.Length; i++)
+                            {
+                                LogFile.Log("URL: " + URLs[i], LogType.FileAndConsole);
+                                URI = new Uri(URLs[i]);
+                                EmergencyFileName = Path.GetFileName(URI.LocalPath);
+                                LogFile.Log("File: " + EmergencyFileName, LogType.FileAndConsole);
+                                EmergencyFilePath = Path.Combine(DownloadFolder, EmergencyFileName);
+                                if (i == 0)
+                                {
+                                    ProgrammerPath = EmergencyFilePath;
+                                }
+                                else
+                                {
+                                    PayloadPath = EmergencyFilePath;
+                                }
+
+                                LogFile.Log("Downloading...", LogType.FileAndConsole);
+                                using (System.Net.WebClient myWebClient = new())
+                                {
+                                    await myWebClient.DownloadFileTaskAsync(URLs[i], EmergencyFilePath);
+                                }
+                                LogFile.Log("Download finished", LogType.FileAndConsole);
+                            }
+                            App.Config.AddEmergencyToRepository(ProductType, ProgrammerPath, PayloadPath);
+                        }
+
+                        if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                        {
+                            ProductType = "RM-1085";
+
+                            URL = LumiaDownloadModel.SearchFFU(ProductType, null, null);
+                            DownloadFolder = args.Length >= 5
+                                ? args[4]
+                                : Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\Repository\\" + ProductType.ToUpper());
+
+                            if (!Directory.Exists(DownloadFolder))
+                            {
+                                Directory.CreateDirectory(DownloadFolder);
+                            }
+
+                            LogFile.Log("Download folder: " + DownloadFolder, LogType.FileAndConsole);
+                            LogFile.Log("URL: " + URL, LogType.FileAndConsole);
+                            URI = new Uri(URL);
+                            FFUFileName = Path.GetFileName(URI.LocalPath);
+                            LogFile.Log("File: " + FFUFileName, LogType.FileAndConsole);
+                            FFUFilePath = Path.Combine(DownloadFolder, FFUFileName);
+                            LogFile.Log("Downloading...", LogType.FileAndConsole);
+                            using (System.Net.WebClient myWebClient = new())
+                            {
+                                await myWebClient.DownloadFileTaskAsync(URL, FFUFilePath);
+                            }
+                            LogFile.Log("Download finished", LogType.FileAndConsole);
+                            App.Config.AddFfuToRepository(FFUFilePath);
+
+                            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                            {
+                                throw new WPinternalsException("Unable to find compatible FFU", "No donor-FFU has been found in the repository with a supported OS version. You can add a donor-FFU within the download section of the tool or by using the command line. A donor-FFU can be for a different device and a different CPU than your device. It is only used to gather Operating System specific binaries to be patched and used as part of the unlock process.");
+                            }
+                        }
+                        break;
+                    case "rewritepartitionsfrommassstorage":
+                        if (args.Length < 2)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RewritePartitionsFromMassStorage <Path to folder containing img partitions> \n The name of the imgs must be the partition names. For example, DPP.img will get written to the DPP partition.");
+                        }
+
+                        await TestCode.RewriteParts(args[2]);
+                        break;
+                    case "restoregptusingedl":
+                        if (args.Length < 3)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RestoreGPTUsingEDL <Path to GPT.bin to be flashed at sector 1 (minus the MBR at sector 0)> <Loaders path>");
+                        }
+
+                        await TestCode.RecoverBadGPT(args[2], args[3]);
+                        break;
+                    case "restoregptusingmassstorage":
+                        if (args.Length < 2)
+                        {
+                            throw new ArgumentException("Wrong number of arguments. Usage: WPinternals.exe -RestoreGPTUsingMassStorage <Path to GPT.bin to be flashed at sector 1 (minus the MBR at sector 0)>");
+                        }
+
+                        await TestCode.RewriteGPT(args[2]);
+                        break;
+                    default:
+                        LogFile.Log("", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals commandline usage:", LogType.ConsoleOnly);
+                        LogFile.Log("", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -ShowPhoneInfo", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -AddFFU <FFU file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -AddEmergency <Product type> <EDE file> <EDP file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -RemoveFFU <FFU file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -RemoveEmergency <EDE file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -ListRepository", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -FindFlashingProfile <Optional: Profile FFU file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -UnlockBootloader", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: donor-FFU file with supported version of bootfiles>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -FixBootAfterUnlockingBootloader", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -EnableRootAccess", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -UnlockBootLoaderOnImage <EFIESP image file>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: MainOS image file>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: donor-FFU file with supported version of bootfiles>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -EnableRootAccessOnImage <EFIESP image file> <MainOS image file>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: donor-FFU file with supported version of bootfiles>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -UnlockBootLoaderOnMountedImage <Directory of mounted EFIESP image file>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: Directory of mounted MainOS image file>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: donor-FFU file with supported version of bootfiles>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -EnableRootAccessOnMountedImage <Directory of mounted EFIESP image file>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Directory of mounted MainOS image file>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: donor-FFU file with supported version of bootfiles>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -EnableTestSigning", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -RelockPhone", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -SwitchToMassStorageMode", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -FlashFFU <FFU file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -FlashCustomROM <ZIP file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -FlashPartition <Partition name> <Partition file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -FlashRaw <Start sector> <Raw file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -ClearNV", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -ReadGPT", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -BackupGPT <Path to xml-file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -RestoreGPT <Path to xml-file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -MergeGPT <Path to input-xml-file> <Path to input-xml-file>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: Path to output-xml-file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -MergeGPT <Path to input-xml-file>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Path to ZIP file which includes Partitions.xml>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: Path to output-xml-file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -ShowFFU <FFU file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -DumpFFU <FFU file> <Destination folder> <Optional: Partition Name>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -DownloadFFU <Optional: Destination folder>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -DownloadFFUbyProductType <Product type>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -DownloadFFUbyProductCode <Product code>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -DownloadFFUbyOperatorCode <Product type> <Operator code>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -DownloadEmergency <Optional: Destination folder>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -DownloadEmergencyByProductType <Product type>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -DownloadAll <Optional: Destination folder>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -DownloadAllByProductType <Product type>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -DownloadAllByProductCode <Product code>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -DownloadAllByOperatorCode <Product type> <Operator code>", LogType.ConsoleOnly);
+                        LogFile.Log("                <Optional: Destination folder>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -DumpUEFI <UEFI binary or FFU file> <Destination folder>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -TestProgrammer <EDE file>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -RewritePartitionsFromMassStorage <Path to folder containing img partitions>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -RestoreGPTUsingEDL <Path to GPT.bin to be flashed at sector 1 (minus the MBR at sector 0)> <Loaders path>", LogType.ConsoleOnly);
+                        LogFile.Log("WPinternals -RestoreGPTUsingMassStorage <Path to GPT.bin to be flashed at sector 1 (minus the MBR at sector 0)>", LogType.ConsoleOnly);
+                        break;
+                }
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex);
+            }
+
+            if (Environment.GetCommandLineArgs().Length > 1)
+            {
+                CloseConsole();
+            }
+        }
+
+        // http://stackoverflow.com/questions/472282/show-console-in-windows-application
+        // https://stackoverflow.com/questions/807998/how-do-i-create-a-c-sharp-app-that-decides-itself-whether-to-show-as-a-console-o
+        // http://www.csharp411.com/console-output-from-winforms-application/#comment-76
+        // https://stackoverflow.com/questions/1305257/using-attachconsole-user-must-hit-enter-to-get-regular-command-line
+        internal static void OpenConsole()
+        {
+            if (IsConsoleVisible)
+            {
+                return;
+            }
+
+            if (AttachConsole(-1))
+            {
+                Console.Write("\r" + new string(' ', Console.WindowWidth) + "\r"); // Prompt was already printed. Clear that line.
+
+                /*
+                Other possibility to clear line:
+
+                System.Console.CursorLeft = 0;
+                char[] bl = System.Linq.Enumerable.ToArray<char>(System.Linq.Enumerable.Repeat<char>(' ', System.Console.WindowWidth - 1));
+                System.Console.Write(bl);
+                System.Console.CursorLeft = 0;
+                */
+
+                hConsoleWnd = GetForegroundWindow();
+            }
+            else
+            {
+                AllocConsole();
+                IsNewConsoleCreated = true;
+
+                hConsoleWnd = System.Diagnostics.Process.GetCurrentProcess().MainWindowHandle;
+
+                // Support VS 2017 debugger without VS host process:
+                try
+                {
+                    // Console.OpenStandardOutput eventually calls into GetStdHandle. As per MSDN documentation of GetStdHandle: http://msdn.microsoft.com/en-us/library/windows/desktop/ms683231(v=vs.85).aspx will return the redirected handle and not the allocated console:
+                    // "The standard handles of a process may be redirected by a call to  SetStdHandle, in which case  GetStdHandle returns the redirected handle. If the standard handles have been redirected, you can specify the CONIN$ value in a call to the CreateFile function to get a handle to a console's input buffer. Similarly, you can specify the CONOUT$ value to get a handle to a console's active screen buffer."
+                    // Get the handle to CONOUT$.    
+                    IntPtr stdHandle = CreateFile("CONOUT$", GENERIC_WRITE, FILE_SHARE_WRITE, 0, OPEN_EXISTING, 0, 0);
+                    Microsoft.Win32.SafeHandles.SafeFileHandle safeFileHandle = new(stdHandle, true);
+                    FileStream fileStream = new(safeFileHandle, FileAccess.Write);
+                    Encoding encoding = Encoding.GetEncoding(MY_CODE_PAGE);
+                    StreamWriter standardOutput = new(fileStream, encoding);
+                    standardOutput.AutoFlush = true;
+                    Console.SetOut(standardOutput);
+                }
+                catch
+                {
+                }
+            }
+
+            IsConsoleVisible = true;
+
+            Console.CancelKeyPress += Console_CancelKeyPress;
+
+            LogFile.LogApplicationVersion();
+        }
+
+        private static void Console_CancelKeyPress(object sender, ConsoleCancelEventArgs e)
+        {
+            LogFile.Log("Operation canceled!", LogType.FileOnly);
+            LogFile.EndAction();
+
+#if PREVIEW
+            Uploader.WaitForUploads();
+#endif
+        }
+
+        internal static void CloseConsole(bool Exit = true)
+        {
+            if (IsConsoleVisible)
+            {
+                if (IsNewConsoleCreated)
+                {
+                    Console.WriteLine("Press any key to close...");
+                    Console.ReadKey();
+                }
+
+                PostMessage(hConsoleWnd, WM_KEYDOWN, VK_RETURN, 0);
+
+                IsConsoleVisible = false;
+
+                if (Exit)
+                {
+#if PREVIEW
+                    Uploader.WaitForUploads();
+#endif
+
+                    Environment.Exit(0);
+                }
+            }
+        }
+    }
+}
diff --git a/DiscUtils/DiscUtils.Core/CoreCompat/EncodingHelper.cs b/WPinternals/DiscUtils/DiscUtils.Core/CoreCompat/EncodingHelper.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Core/CoreCompat/EncodingHelper.cs
rename to WPinternals/DiscUtils/DiscUtils.Core/CoreCompat/EncodingHelper.cs
diff --git a/DiscUtils/DiscUtils.Core/Internal/Utilities.cs b/WPinternals/DiscUtils/DiscUtils.Core/Internal/Utilities.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Core/Internal/Utilities.cs
rename to WPinternals/DiscUtils/DiscUtils.Core/Internal/Utilities.cs
diff --git a/DiscUtils/DiscUtils.Fat/ClusterReader.cs b/WPinternals/DiscUtils/DiscUtils.Fat/ClusterReader.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/ClusterReader.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/ClusterReader.cs
diff --git a/DiscUtils/DiscUtils.Fat/ClusterStream.cs b/WPinternals/DiscUtils/DiscUtils.Fat/ClusterStream.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/ClusterStream.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/ClusterStream.cs
diff --git a/DiscUtils/DiscUtils.Fat/DirectoryEntry.cs b/WPinternals/DiscUtils/DiscUtils.Fat/DirectoryEntry.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/DirectoryEntry.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/DirectoryEntry.cs
diff --git a/DiscUtils/DiscUtils.Fat/FatAttributes.cs b/WPinternals/DiscUtils/DiscUtils.Fat/FatAttributes.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/FatAttributes.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/FatAttributes.cs
diff --git a/DiscUtils/DiscUtils.Fat/FatBuffer.cs b/WPinternals/DiscUtils/DiscUtils.Fat/FatBuffer.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/FatBuffer.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/FatBuffer.cs
diff --git a/DiscUtils/DiscUtils.Fat/FatFileStream.cs b/WPinternals/DiscUtils/DiscUtils.Fat/FatFileStream.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/FatFileStream.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/FatFileStream.cs
diff --git a/DiscUtils/DiscUtils.Fat/FatFileSystemOptions.cs b/WPinternals/DiscUtils/DiscUtils.Fat/FatFileSystemOptions.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/FatFileSystemOptions.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/FatFileSystemOptions.cs
diff --git a/DiscUtils/DiscUtils.Fat/FatType.cs b/WPinternals/DiscUtils/DiscUtils.Fat/FatType.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/FatType.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/FatType.cs
diff --git a/DiscUtils/DiscUtils.Fat/FileAllocationTable.cs b/WPinternals/DiscUtils/DiscUtils.Fat/FileAllocationTable.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/FileAllocationTable.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/FileAllocationTable.cs
diff --git a/DiscUtils/DiscUtils.Fat/FileName.cs b/WPinternals/DiscUtils/DiscUtils.Fat/FileName.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/FileName.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/FileName.cs
diff --git a/DiscUtils/DiscUtils.Fat/FileSystemFactory.cs b/WPinternals/DiscUtils/DiscUtils.Fat/FileSystemFactory.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/FileSystemFactory.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/FileSystemFactory.cs
diff --git a/DiscUtils/DiscUtils.Fat/FirstClusterChangedDelegate.cs b/WPinternals/DiscUtils/DiscUtils.Fat/FirstClusterChangedDelegate.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/FirstClusterChangedDelegate.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/FirstClusterChangedDelegate.cs
diff --git a/DiscUtils/DiscUtils.Fat/Modified/Directory.cs b/WPinternals/DiscUtils/DiscUtils.Fat/Modified/Directory.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/Modified/Directory.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/Modified/Directory.cs
diff --git a/DiscUtils/DiscUtils.Fat/Modified/FatFileSystem.cs b/WPinternals/DiscUtils/DiscUtils.Fat/Modified/FatFileSystem.cs
similarity index 100%
rename from DiscUtils/DiscUtils.Fat/Modified/FatFileSystem.cs
rename to WPinternals/DiscUtils/DiscUtils.Fat/Modified/FatFileSystem.cs
diff --git a/FilePickerControl.xaml b/WPinternals/FilePickerControl.xaml
similarity index 98%
rename from FilePickerControl.xaml
rename to WPinternals/FilePickerControl.xaml
index 3a2fd33..6163421 100644
--- a/FilePickerControl.xaml
+++ b/WPinternals/FilePickerControl.xaml
@@ -1,41 +1,41 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals" x:Class="WPinternals.FilePickerBase" 
-             mc:Ignorable="d" 
-             d:DesignHeight="100" d:DesignWidth="300"
-             x:Name="FilePickerControlName"
-             SizeChanged="SizeChangedHandler" Loaded="LoadedHandler"
-    >
-    <Grid>
-        <TextBlock x:Name="CaptionTextBlock" HorizontalAlignment="Left" Text=""/>
-        <TextBlock x:Name="PathTextBlock" FontWeight="Bold" HorizontalAlignment="Left" Text="Path here"/>
-        <TextBlock x:Name="SelectLink" Margin="150,0,0,0" HorizontalAlignment="Left"><Hyperlink NavigateUri="Select" Click="SelectLink_Click"><TextBlock Text="{Binding Path=SelectionText, ElementName=FilePickerControlName}"/></Hyperlink></TextBlock>
-        <TextBlock x:Name="ChangeLink" Margin="210,0,0,0" HorizontalAlignment="Left"><Hyperlink NavigateUri="Change" Click="ChangeLink_Click">Change</Hyperlink></TextBlock>
-        <TextBlock x:Name="ClearLink" Margin="260,0,0,0" HorizontalAlignment="Left"><Hyperlink NavigateUri="Clear" Click="ClearLink_Click">Clear</Hyperlink></TextBlock>
-    </Grid>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals" x:Class="WPinternals.FilePickerBase" 
+             mc:Ignorable="d" 
+             d:DesignHeight="100" d:DesignWidth="300"
+             x:Name="FilePickerControlName"
+             SizeChanged="SizeChangedHandler" Loaded="LoadedHandler"
+    >
+    <Grid>
+        <TextBlock x:Name="CaptionTextBlock" HorizontalAlignment="Left" Text=""/>
+        <TextBlock x:Name="PathTextBlock" FontWeight="Bold" HorizontalAlignment="Left" Text="Path here"/>
+        <TextBlock x:Name="SelectLink" Margin="150,0,0,0" HorizontalAlignment="Left"><Hyperlink NavigateUri="Select" Click="SelectLink_Click"><TextBlock Text="{Binding Path=SelectionText, ElementName=FilePickerControlName}"/></Hyperlink></TextBlock>
+        <TextBlock x:Name="ChangeLink" Margin="210,0,0,0" HorizontalAlignment="Left"><Hyperlink NavigateUri="Change" Click="ChangeLink_Click">Change</Hyperlink></TextBlock>
+        <TextBlock x:Name="ClearLink" Margin="260,0,0,0" HorizontalAlignment="Left"><Hyperlink NavigateUri="Clear" Click="ClearLink_Click">Clear</Hyperlink></TextBlock>
+    </Grid>
+</UserControl>
diff --git a/FilePickerControl.xaml.cs b/WPinternals/FilePickerControl.xaml.cs
similarity index 96%
rename from FilePickerControl.xaml.cs
rename to WPinternals/FilePickerControl.xaml.cs
index e7d8716..bf532c4 100644
--- a/FilePickerControl.xaml.cs
+++ b/WPinternals/FilePickerControl.xaml.cs
@@ -1,525 +1,525 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.ComponentModel;
-using System.Globalization;
-using System.Threading;
-using System.Windows;
-using System.Windows.Media;
-
-namespace WPinternals
-{
-    public class PathChangedEventArgs : EventArgs
-    {
-        public PathChangedEventArgs(string NewPath)
-            : base()
-        {
-            this.NewPath = NewPath;
-        }
-
-        public string NewPath;
-    }
-
-    public delegate void PathChangedEventHandler(
-        Object sender,
-        PathChangedEventArgs e
-    );
-
-    /// <summary>
-    /// Interaction logic for FilePickerControl.xaml
-    /// </summary>
-    public partial class FilePickerBase : System.Windows.Controls.UserControl, INotifyPropertyChanged
-    {
-        private readonly SynchronizationContext UIContext;
-
-        public event PropertyChangedEventHandler PropertyChanged = delegate { };
-        public event EventHandler<PathChangedEventArgs> PathChanged = delegate { };
-
-        protected void OnPropertyChanged(string propertyName)
-        {
-            if (this.PropertyChanged != null)
-            {
-                if (SynchronizationContext.Current == UIContext)
-                {
-                    PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-                }
-                else
-                {
-                    UIContext.Post((s) => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
-                }
-            }
-        }
-
-        public FilePickerBase()
-        {
-            UIContext = SynchronizationContext.Current;
-            InitializeComponent();
-        }
-
-        public bool AllowNull
-        {
-            get
-            {
-                return (bool)GetValue(AllowNullProperty);
-            }
-            set
-            {
-                SetValue(AllowNullProperty, value);
-                Resize();
-            }
-        }
-
-        public static readonly DependencyProperty AllowNullProperty =
-            DependencyProperty.Register("AllowNull", typeof(bool), typeof(FilePickerBase), new UIPropertyMetadata(false));
-
-        public string Caption
-        {
-            get
-            {
-                return (string)GetValue(CaptionProperty);
-            }
-            set
-            {
-                SetValue(CaptionProperty, value);
-                Resize();
-            }
-        }
-
-        public static readonly DependencyProperty CaptionProperty =
-            DependencyProperty.Register("Caption", typeof(string), typeof(FilePickerBase), new UIPropertyMetadata(null));
-
-        public string Path
-        {
-            get
-            {
-                return (string)GetValue(PathProperty);
-            }
-            set
-            {
-                if ((string)GetValue(PathProperty) != value)
-                {
-                    SetValue(PathProperty, value);
-                    Resize();
-                    PathChanged(this, new PathChangedEventArgs(value));
-                }
-            }
-        }
-
-        public static readonly DependencyProperty PathProperty =
-            DependencyProperty.Register("Path", typeof(string), typeof(FilePickerBase), new UIPropertyMetadata(null));
-
-        public string SelectionText
-        {
-            get
-            {
-                return (string)GetValue(SelectionTextProperty);
-            }
-            set
-            {
-                SetValue(SelectionTextProperty, value);
-                Resize();
-            }
-        }
-
-        public static readonly DependencyProperty SelectionTextProperty =
-            DependencyProperty.Register("SelectionText", typeof(string), typeof(FilePickerBase), new UIPropertyMetadata(""));
-
-        private void SizeChangedHandler(object sender, SizeChangedEventArgs e)
-        {
-            Resize();
-        }
-
-        protected override Size MeasureOverride(Size availableSize)
-        {
-            var resultSize = new Size(availableSize.Width, 0);
-
-#if NETCORE
-            FormattedText formatted = new FormattedText(
-                "TEST",
-                CultureInfo.CurrentCulture,
-                FlowDirection.LeftToRight,
-                new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
-                FontSize,
-                Foreground,
-                100 / 96
-            );
-#else
-            FormattedText formatted = new(
-                "TEST",
-                CultureInfo.CurrentCulture,
-                FlowDirection.LeftToRight,
-                new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
-                FontSize,
-                Foreground,
-                VisualTreeHelper.GetDpi(this).PixelsPerDip
-            );
-#endif
-
-            resultSize.Height = formatted.Height;
-
-            return resultSize;
-        }
-
-        private void Resize()
-        {
-            if (!IsLoaded)
-            {
-                return;
-            }
-
-            CaptionTextBlock.Text = Caption;
-#if NETCORE
-            FormattedText formatted = new FormattedText(
-                CaptionTextBlock.Text,
-                CultureInfo.CurrentCulture,
-                FlowDirection.LeftToRight,
-                new Typeface(CaptionTextBlock.FontFamily, CaptionTextBlock.FontStyle, CaptionTextBlock.FontWeight, CaptionTextBlock.FontStretch),
-                FontSize,
-                Foreground,
-                100 / 96
-                );
-#else
-            FormattedText formatted = new(
-                CaptionTextBlock.Text,
-                CultureInfo.CurrentCulture,
-                FlowDirection.LeftToRight,
-                new Typeface(CaptionTextBlock.FontFamily, CaptionTextBlock.FontStyle, CaptionTextBlock.FontWeight, CaptionTextBlock.FontStretch),
-                FontSize,
-                Foreground,
-                VisualTreeHelper.GetDpi(this).PixelsPerDip
-                );
-#endif
-            double CaptionWidth = formatted.Width;
-            if (CaptionWidth > 0)
-            {
-                CaptionWidth += 10;
-            }
-
-            bool SelectVisible = Path == null;
-            bool ChangeVisible = Path != null;
-            bool ClearVisible = (Path != null) && AllowNull;
-
-            double NewWidth = ActualWidth - CaptionWidth;
-            if (SelectVisible)
-            {
-                NewWidth -= SelectLink.ActualWidth;
-            }
-
-            if (ChangeVisible)
-            {
-                NewWidth -= ChangeLink.ActualWidth + 10;
-            }
-
-            if (ClearVisible)
-            {
-                NewWidth -= ClearLink.ActualWidth + 10;
-            }
-
-            SetText(NewWidth);
-
-            // Calculate the new ActualWidth
-            // We can't use PathTextBlock.ActualWidth yet, because LayoutUpdated event has not yet been triggered
-#if NETCORE
-            formatted = new FormattedText(
-                        PathTextBlock.Text,
-                        CultureInfo.CurrentCulture,
-                        FlowDirection.LeftToRight,
-                        new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
-                        FontSize,
-                        Foreground,
-                        100 / 96
-                        );
-#else
-            formatted = new FormattedText(
-                        PathTextBlock.Text,
-                        CultureInfo.CurrentCulture,
-                        FlowDirection.LeftToRight,
-                        new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
-                        FontSize,
-                        Foreground,
-                        VisualTreeHelper.GetDpi(this).PixelsPerDip
-                        );
-#endif
-            if (NewWidth < 0)
-            {
-                PathTextBlock.Width = 0;
-            }
-            else
-            {
-                PathTextBlock.Width = formatted.Width > NewWidth ? NewWidth : formatted.Width;
-            }
-
-            PathTextBlock.Margin = new Thickness(CaptionWidth, 0, 0, 0);
-            double Pos = PathTextBlock.Width + CaptionWidth;
-
-            if (SelectVisible)
-            {
-                SelectLink.Visibility = Visibility.Visible;
-                SelectLink.Margin = new Thickness(Pos, 0, 0, 0);
-                Pos += SelectLink.ActualWidth;
-            }
-            else
-            {
-                SelectLink.Visibility = Visibility.Collapsed;
-            }
-
-            if (ChangeVisible)
-            {
-                ChangeLink.Visibility = Visibility.Visible;
-                ChangeLink.Margin = new Thickness(Pos + 10, 0, 0, 0);
-                Pos += ChangeLink.ActualWidth + 10;
-            }
-            else
-            {
-                ChangeLink.Visibility = Visibility.Collapsed;
-            }
-
-            if (ClearVisible)
-            {
-                ClearLink.Visibility = Visibility.Visible;
-                ClearLink.Margin = new Thickness(Pos + 10, 0, 0, 0);
-                Pos += ClearLink.ActualWidth + 10;
-            }
-            else
-            {
-                ClearLink.Visibility = Visibility.Collapsed;
-            }
-        }
-
-        private void SetText(double MaxWidth)
-        {
-            string Text = Path;
-
-            if (System.IO.Path.IsPathRooted(Text))
-            {
-                // It is a valid path
-                string filename = "";
-                try
-                {
-                    filename = System.IO.Path.GetFileName(Text);
-                }
-                catch { }
-                string directory = "";
-                try
-                {
-                    directory = System.IO.Path.GetDirectoryName(Text);
-                }
-                catch { }
-                FormattedText formatted;
-                bool widthOK = false;
-                bool changedWidth = false;
-
-                do
-                {
-#if NETCORE
-                    formatted = new FormattedText(
-                        "{0}...\\{1}".FormatWith(directory, filename),
-                        CultureInfo.CurrentCulture,
-                        FlowDirection.LeftToRight,
-                        new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
-                        FontSize,
-                        Foreground,
-                        100 / 96
-                        );
-#else
-                    formatted = new FormattedText(
-                        "{0}...\\{1}".FormatWith(directory, filename),
-                        CultureInfo.CurrentCulture,
-                        FlowDirection.LeftToRight,
-                        new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
-                        FontSize,
-                        Foreground,
-                        VisualTreeHelper.GetDpi(this).PixelsPerDip
-                        );
-#endif
-
-                    widthOK = formatted.Width < MaxWidth;
-
-                    if (!widthOK)
-                    {
-                        changedWidth = true;
-
-                        if (directory.Length > 0)
-                        {
-                            directory = directory[0..^1];
-                        }
-
-                        if (directory.Length == 0)
-                        {
-                            Text = "...\\" + filename;
-                            break;
-                        }
-                    }
-
-                } while (!widthOK);
-
-                if (changedWidth && (directory.Length > 0))
-                {
-                    Text = "{0}...\\{1}".FormatWith(directory, filename);
-                }
-            }
-
-            PathTextBlock.Text = Text;
-        }
-
-        private void LoadedHandler(object sender, RoutedEventArgs e)
-        {
-            Resize();
-        }
-
-        private void SelectLink_Click(object sender, RoutedEventArgs e)
-        {
-            Select();
-            Resize();
-        }
-
-        private void ChangeLink_Click(object sender, RoutedEventArgs e)
-        {
-            Select();
-            Resize();
-        }
-
-        private void ClearLink_Click(object sender, RoutedEventArgs e)
-        {
-            Path = null;
-            Resize();
-        }
-
-        protected virtual void Select() { }
-    }
-
-    public class FilePicker : FilePickerBase
-    {
-        public FilePicker()
-            : base()
-        {
-            if (SelectionText?.Length == 0)
-            {
-                SelectionText = "Select file...";
-            }
-        }
-
-        protected override void Select()
-        {
-            bool? result;
-
-            if (SaveDialog)
-            {
-                Microsoft.Win32.SaveFileDialog savedlg = new();
-
-                savedlg.FileName = Path ?? DefaultFileName;
-
-                // Show open file dialog box
-                result = savedlg.ShowDialog();
-
-                // Process open file dialog box results 
-                if (result == true)
-                {
-                    // Open document 
-                    Path = savedlg.FileName;
-                }
-            }
-            else
-            {
-                // Select file
-                Microsoft.Win32.OpenFileDialog dlg = new();
-
-                dlg.FileName = Path ?? DefaultFileName;
-
-                // Show open file dialog box
-                result = dlg.ShowDialog();
-
-                // Process open file dialog box results 
-                if (result == true)
-                {
-                    // Open document 
-                    Path = dlg.FileName;
-                }
-            }
-        }
-
-        public bool SaveDialog
-        {
-            get
-            {
-                return (bool)GetValue(SaveDialogProperty);
-            }
-            set
-            {
-                SetValue(SaveDialogProperty, value);
-            }
-        }
-
-        public static readonly DependencyProperty SaveDialogProperty =
-            DependencyProperty.Register("SaveDialog", typeof(bool), typeof(FilePicker), new UIPropertyMetadata(false));
-
-        public string DefaultFileName
-        {
-            get
-            {
-                return (string)GetValue(DefaultFileNameProperty);
-            }
-            set
-            {
-                SetValue(DefaultFileNameProperty, value);
-            }
-        }
-
-        public static readonly DependencyProperty DefaultFileNameProperty =
-            DependencyProperty.Register("DefaultFileName", typeof(string), typeof(FilePicker), new UIPropertyMetadata(""));
-    }
-
-    public class FolderPicker : FilePickerBase
-    {
-        public FolderPicker()
-            : base()
-        {
-            if (SelectionText?.Length == 0)
-            {
-                SelectionText = "Select folder...";
-            }
-        }
-
-        protected override void Select()
-        {
-            // Select folder
-
-            FolderSelectDialog dlg = new();
-            if (Path != null)
-            {
-                dlg.InitialDirectory = Path;
-            }
-
-            if (dlg.ShowDialog())
-            {
-                Path = dlg.FileName;
-            }
-        }
-    }
-
-    internal static class Extensions
-    {
-        public static string FormatWith(this string s, params object[] args)
-        {
-            return string.Format(s, args);
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using System.Threading;
+using System.Windows;
+using System.Windows.Media;
+
+namespace WPinternals
+{
+    public class PathChangedEventArgs : EventArgs
+    {
+        public PathChangedEventArgs(string NewPath)
+            : base()
+        {
+            this.NewPath = NewPath;
+        }
+
+        public string NewPath;
+    }
+
+    public delegate void PathChangedEventHandler(
+        Object sender,
+        PathChangedEventArgs e
+    );
+
+    /// <summary>
+    /// Interaction logic for FilePickerControl.xaml
+    /// </summary>
+    public partial class FilePickerBase : System.Windows.Controls.UserControl, INotifyPropertyChanged
+    {
+        private readonly SynchronizationContext UIContext;
+
+        public event PropertyChangedEventHandler PropertyChanged = delegate { };
+        public event EventHandler<PathChangedEventArgs> PathChanged = delegate { };
+
+        protected void OnPropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+            {
+                if (SynchronizationContext.Current == UIContext)
+                {
+                    PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
+                else
+                {
+                    UIContext.Post((s) => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
+                }
+            }
+        }
+
+        public FilePickerBase()
+        {
+            UIContext = SynchronizationContext.Current;
+            InitializeComponent();
+        }
+
+        public bool AllowNull
+        {
+            get
+            {
+                return (bool)GetValue(AllowNullProperty);
+            }
+            set
+            {
+                SetValue(AllowNullProperty, value);
+                Resize();
+            }
+        }
+
+        public static readonly DependencyProperty AllowNullProperty =
+            DependencyProperty.Register("AllowNull", typeof(bool), typeof(FilePickerBase), new UIPropertyMetadata(false));
+
+        public string Caption
+        {
+            get
+            {
+                return (string)GetValue(CaptionProperty);
+            }
+            set
+            {
+                SetValue(CaptionProperty, value);
+                Resize();
+            }
+        }
+
+        public static readonly DependencyProperty CaptionProperty =
+            DependencyProperty.Register("Caption", typeof(string), typeof(FilePickerBase), new UIPropertyMetadata(null));
+
+        public string Path
+        {
+            get
+            {
+                return (string)GetValue(PathProperty);
+            }
+            set
+            {
+                if ((string)GetValue(PathProperty) != value)
+                {
+                    SetValue(PathProperty, value);
+                    Resize();
+                    PathChanged(this, new PathChangedEventArgs(value));
+                }
+            }
+        }
+
+        public static readonly DependencyProperty PathProperty =
+            DependencyProperty.Register("Path", typeof(string), typeof(FilePickerBase), new UIPropertyMetadata(null));
+
+        public string SelectionText
+        {
+            get
+            {
+                return (string)GetValue(SelectionTextProperty);
+            }
+            set
+            {
+                SetValue(SelectionTextProperty, value);
+                Resize();
+            }
+        }
+
+        public static readonly DependencyProperty SelectionTextProperty =
+            DependencyProperty.Register("SelectionText", typeof(string), typeof(FilePickerBase), new UIPropertyMetadata(""));
+
+        private void SizeChangedHandler(object sender, SizeChangedEventArgs e)
+        {
+            Resize();
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            var resultSize = new Size(availableSize.Width, 0);
+
+#if NETCORE
+            FormattedText formatted = new FormattedText(
+                "TEST",
+                CultureInfo.CurrentCulture,
+                FlowDirection.LeftToRight,
+                new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
+                FontSize,
+                Foreground,
+                100 / 96
+            );
+#else
+            FormattedText formatted = new(
+                "TEST",
+                CultureInfo.CurrentCulture,
+                FlowDirection.LeftToRight,
+                new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
+                FontSize,
+                Foreground,
+                VisualTreeHelper.GetDpi(this).PixelsPerDip
+            );
+#endif
+
+            resultSize.Height = formatted.Height;
+
+            return resultSize;
+        }
+
+        private void Resize()
+        {
+            if (!IsLoaded)
+            {
+                return;
+            }
+
+            CaptionTextBlock.Text = Caption;
+#if NETCORE
+            FormattedText formatted = new FormattedText(
+                CaptionTextBlock.Text,
+                CultureInfo.CurrentCulture,
+                FlowDirection.LeftToRight,
+                new Typeface(CaptionTextBlock.FontFamily, CaptionTextBlock.FontStyle, CaptionTextBlock.FontWeight, CaptionTextBlock.FontStretch),
+                FontSize,
+                Foreground,
+                100 / 96
+                );
+#else
+            FormattedText formatted = new(
+                CaptionTextBlock.Text,
+                CultureInfo.CurrentCulture,
+                FlowDirection.LeftToRight,
+                new Typeface(CaptionTextBlock.FontFamily, CaptionTextBlock.FontStyle, CaptionTextBlock.FontWeight, CaptionTextBlock.FontStretch),
+                FontSize,
+                Foreground,
+                VisualTreeHelper.GetDpi(this).PixelsPerDip
+                );
+#endif
+            double CaptionWidth = formatted.Width;
+            if (CaptionWidth > 0)
+            {
+                CaptionWidth += 10;
+            }
+
+            bool SelectVisible = Path == null;
+            bool ChangeVisible = Path != null;
+            bool ClearVisible = (Path != null) && AllowNull;
+
+            double NewWidth = ActualWidth - CaptionWidth;
+            if (SelectVisible)
+            {
+                NewWidth -= SelectLink.ActualWidth;
+            }
+
+            if (ChangeVisible)
+            {
+                NewWidth -= ChangeLink.ActualWidth + 10;
+            }
+
+            if (ClearVisible)
+            {
+                NewWidth -= ClearLink.ActualWidth + 10;
+            }
+
+            SetText(NewWidth);
+
+            // Calculate the new ActualWidth
+            // We can't use PathTextBlock.ActualWidth yet, because LayoutUpdated event has not yet been triggered
+#if NETCORE
+            formatted = new FormattedText(
+                        PathTextBlock.Text,
+                        CultureInfo.CurrentCulture,
+                        FlowDirection.LeftToRight,
+                        new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
+                        FontSize,
+                        Foreground,
+                        100 / 96
+                        );
+#else
+            formatted = new FormattedText(
+                        PathTextBlock.Text,
+                        CultureInfo.CurrentCulture,
+                        FlowDirection.LeftToRight,
+                        new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
+                        FontSize,
+                        Foreground,
+                        VisualTreeHelper.GetDpi(this).PixelsPerDip
+                        );
+#endif
+            if (NewWidth < 0)
+            {
+                PathTextBlock.Width = 0;
+            }
+            else
+            {
+                PathTextBlock.Width = formatted.Width > NewWidth ? NewWidth : formatted.Width;
+            }
+
+            PathTextBlock.Margin = new Thickness(CaptionWidth, 0, 0, 0);
+            double Pos = PathTextBlock.Width + CaptionWidth;
+
+            if (SelectVisible)
+            {
+                SelectLink.Visibility = Visibility.Visible;
+                SelectLink.Margin = new Thickness(Pos, 0, 0, 0);
+                Pos += SelectLink.ActualWidth;
+            }
+            else
+            {
+                SelectLink.Visibility = Visibility.Collapsed;
+            }
+
+            if (ChangeVisible)
+            {
+                ChangeLink.Visibility = Visibility.Visible;
+                ChangeLink.Margin = new Thickness(Pos + 10, 0, 0, 0);
+                Pos += ChangeLink.ActualWidth + 10;
+            }
+            else
+            {
+                ChangeLink.Visibility = Visibility.Collapsed;
+            }
+
+            if (ClearVisible)
+            {
+                ClearLink.Visibility = Visibility.Visible;
+                ClearLink.Margin = new Thickness(Pos + 10, 0, 0, 0);
+                Pos += ClearLink.ActualWidth + 10;
+            }
+            else
+            {
+                ClearLink.Visibility = Visibility.Collapsed;
+            }
+        }
+
+        private void SetText(double MaxWidth)
+        {
+            string Text = Path;
+
+            if (System.IO.Path.IsPathRooted(Text))
+            {
+                // It is a valid path
+                string filename = "";
+                try
+                {
+                    filename = System.IO.Path.GetFileName(Text);
+                }
+                catch { }
+                string directory = "";
+                try
+                {
+                    directory = System.IO.Path.GetDirectoryName(Text);
+                }
+                catch { }
+                FormattedText formatted;
+                bool widthOK = false;
+                bool changedWidth = false;
+
+                do
+                {
+#if NETCORE
+                    formatted = new FormattedText(
+                        "{0}...\\{1}".FormatWith(directory, filename),
+                        CultureInfo.CurrentCulture,
+                        FlowDirection.LeftToRight,
+                        new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
+                        FontSize,
+                        Foreground,
+                        100 / 96
+                        );
+#else
+                    formatted = new FormattedText(
+                        "{0}...\\{1}".FormatWith(directory, filename),
+                        CultureInfo.CurrentCulture,
+                        FlowDirection.LeftToRight,
+                        new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
+                        FontSize,
+                        Foreground,
+                        VisualTreeHelper.GetDpi(this).PixelsPerDip
+                        );
+#endif
+
+                    widthOK = formatted.Width < MaxWidth;
+
+                    if (!widthOK)
+                    {
+                        changedWidth = true;
+
+                        if (directory.Length > 0)
+                        {
+                            directory = directory[0..^1];
+                        }
+
+                        if (directory.Length == 0)
+                        {
+                            Text = "...\\" + filename;
+                            break;
+                        }
+                    }
+
+                } while (!widthOK);
+
+                if (changedWidth && (directory.Length > 0))
+                {
+                    Text = "{0}...\\{1}".FormatWith(directory, filename);
+                }
+            }
+
+            PathTextBlock.Text = Text;
+        }
+
+        private void LoadedHandler(object sender, RoutedEventArgs e)
+        {
+            Resize();
+        }
+
+        private void SelectLink_Click(object sender, RoutedEventArgs e)
+        {
+            Select();
+            Resize();
+        }
+
+        private void ChangeLink_Click(object sender, RoutedEventArgs e)
+        {
+            Select();
+            Resize();
+        }
+
+        private void ClearLink_Click(object sender, RoutedEventArgs e)
+        {
+            Path = null;
+            Resize();
+        }
+
+        protected virtual void Select() { }
+    }
+
+    public class FilePicker : FilePickerBase
+    {
+        public FilePicker()
+            : base()
+        {
+            if (SelectionText?.Length == 0)
+            {
+                SelectionText = "Select file...";
+            }
+        }
+
+        protected override void Select()
+        {
+            bool? result;
+
+            if (SaveDialog)
+            {
+                Microsoft.Win32.SaveFileDialog savedlg = new();
+
+                savedlg.FileName = Path ?? DefaultFileName;
+
+                // Show open file dialog box
+                result = savedlg.ShowDialog();
+
+                // Process open file dialog box results 
+                if (result == true)
+                {
+                    // Open document 
+                    Path = savedlg.FileName;
+                }
+            }
+            else
+            {
+                // Select file
+                Microsoft.Win32.OpenFileDialog dlg = new();
+
+                dlg.FileName = Path ?? DefaultFileName;
+
+                // Show open file dialog box
+                result = dlg.ShowDialog();
+
+                // Process open file dialog box results 
+                if (result == true)
+                {
+                    // Open document 
+                    Path = dlg.FileName;
+                }
+            }
+        }
+
+        public bool SaveDialog
+        {
+            get
+            {
+                return (bool)GetValue(SaveDialogProperty);
+            }
+            set
+            {
+                SetValue(SaveDialogProperty, value);
+            }
+        }
+
+        public static readonly DependencyProperty SaveDialogProperty =
+            DependencyProperty.Register("SaveDialog", typeof(bool), typeof(FilePicker), new UIPropertyMetadata(false));
+
+        public string DefaultFileName
+        {
+            get
+            {
+                return (string)GetValue(DefaultFileNameProperty);
+            }
+            set
+            {
+                SetValue(DefaultFileNameProperty, value);
+            }
+        }
+
+        public static readonly DependencyProperty DefaultFileNameProperty =
+            DependencyProperty.Register("DefaultFileName", typeof(string), typeof(FilePicker), new UIPropertyMetadata(""));
+    }
+
+    public class FolderPicker : FilePickerBase
+    {
+        public FolderPicker()
+            : base()
+        {
+            if (SelectionText?.Length == 0)
+            {
+                SelectionText = "Select folder...";
+            }
+        }
+
+        protected override void Select()
+        {
+            // Select folder
+
+            FolderSelectDialog dlg = new();
+            if (Path != null)
+            {
+                dlg.InitialDirectory = Path;
+            }
+
+            if (dlg.ShowDialog())
+            {
+                Path = dlg.FileName;
+            }
+        }
+    }
+
+    internal static class Extensions
+    {
+        public static string FormatWith(this string s, params object[] args)
+        {
+            return string.Format(s, args);
+        }
+    }
+}
diff --git a/FolderSelectDialog.cs b/WPinternals/FolderSelectDialog.cs
similarity index 96%
rename from FolderSelectDialog.cs
rename to WPinternals/FolderSelectDialog.cs
index 0d0369e..01aeb3e 100644
--- a/FolderSelectDialog.cs
+++ b/WPinternals/FolderSelectDialog.cs
@@ -1,120 +1,120 @@
-// This class was found online.
-// Original author is probably: Swizzy
-// https://github.com/ttgxdinger/Random/blob/master/CPUKey%20Checker/CPUKey%20Checker/FolderSelectDialog.cs
-
-using System;
-using System.Windows.Forms;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Wraps System.Windows.Forms.OpenFileDialog to make it present
-    /// a vista-style dialog.
-    /// </summary>
-    public class FolderSelectDialog
-    {
-        // Wrapped dialog
-        private readonly OpenFileDialog ofd = null;
-
-        /// <summary>
-        /// Default constructor
-        /// </summary>
-        public FolderSelectDialog()
-        {
-            ofd = new OpenFileDialog
-            {
-                Filter = "Folders|\n",
-                AddExtension = false,
-                CheckFileExists = false,
-                DereferenceLinks = true,
-                Multiselect = false
-            };
-        }
-
-        #region Properties
-
-        /// <summary>
-        /// Gets/Sets the initial folder to be selected. A null value selects the current directory.
-        /// </summary>
-        public string InitialDirectory
-        {
-            get { return ofd.InitialDirectory; }
-            set { ofd.InitialDirectory = string.IsNullOrEmpty(value) ? Environment.CurrentDirectory : value; }
-        }
-
-        /// <summary>
-        /// Gets/Sets the title to show in the dialog
-        /// </summary>
-        public string Title
-        {
-            get { return ofd.Title; }
-            set { ofd.Title = value ?? "Select a folder"; }
-        }
-
-        /// <summary>
-        /// Gets the selected folder
-        /// </summary>
-        public string FileName
-        {
-            get { return ofd.FileName; }
-        }
-
-        #endregion
-
-        #region Methods
-
-        /// <summary>
-        /// Shows the dialog
-        /// </summary>
-        /// <returns>True if the user presses OK else false</returns>
-        public bool ShowDialog()
-        {
-            return ShowDialog(IntPtr.Zero);
-        }
-
-        /// <summary>
-        /// Shows the dialog
-        /// </summary>
-        /// <param name="hWndOwner">Handle of the control to be parent</param>
-        /// <returns>True if the user presses OK else false</returns>
-        public bool ShowDialog(IntPtr hWndOwner)
-        {
-            var fbd = new FolderBrowserDialog
-            {
-                Description = this.Title,
-                SelectedPath = this.InitialDirectory,
-                ShowNewFolderButton = false
-            };
-            if (fbd.ShowDialog(new WindowWrapper(hWndOwner)) != DialogResult.OK)
-            {
-                return false;
-            }
-
-            ofd.FileName = fbd.SelectedPath;
-
-            return true;
-        }
-
-        #endregion
-    }
-
-    /// <summary>
-    /// Creates IWin32Window around an IntPtr
-    /// </summary>
-    public class WindowWrapper : IWin32Window
-    {
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="handle">Handle to wrap</param>
-        public WindowWrapper(IntPtr handle)
-        {
-            Handle = handle;
-        }
-
-        /// <summary>
-        /// Original ptr
-        /// </summary>
-        public IntPtr Handle { get; }
-    }
-}
+// This class was found online.
+// Original author is probably: Swizzy
+// https://github.com/ttgxdinger/Random/blob/master/CPUKey%20Checker/CPUKey%20Checker/FolderSelectDialog.cs
+
+using System;
+using System.Windows.Forms;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Wraps System.Windows.Forms.OpenFileDialog to make it present
+    /// a vista-style dialog.
+    /// </summary>
+    public class FolderSelectDialog
+    {
+        // Wrapped dialog
+        private readonly OpenFileDialog ofd = null;
+
+        /// <summary>
+        /// Default constructor
+        /// </summary>
+        public FolderSelectDialog()
+        {
+            ofd = new OpenFileDialog
+            {
+                Filter = "Folders|\n",
+                AddExtension = false,
+                CheckFileExists = false,
+                DereferenceLinks = true,
+                Multiselect = false
+            };
+        }
+
+        #region Properties
+
+        /// <summary>
+        /// Gets/Sets the initial folder to be selected. A null value selects the current directory.
+        /// </summary>
+        public string InitialDirectory
+        {
+            get { return ofd.InitialDirectory; }
+            set { ofd.InitialDirectory = string.IsNullOrEmpty(value) ? Environment.CurrentDirectory : value; }
+        }
+
+        /// <summary>
+        /// Gets/Sets the title to show in the dialog
+        /// </summary>
+        public string Title
+        {
+            get { return ofd.Title; }
+            set { ofd.Title = value ?? "Select a folder"; }
+        }
+
+        /// <summary>
+        /// Gets the selected folder
+        /// </summary>
+        public string FileName
+        {
+            get { return ofd.FileName; }
+        }
+
+        #endregion
+
+        #region Methods
+
+        /// <summary>
+        /// Shows the dialog
+        /// </summary>
+        /// <returns>True if the user presses OK else false</returns>
+        public bool ShowDialog()
+        {
+            return ShowDialog(IntPtr.Zero);
+        }
+
+        /// <summary>
+        /// Shows the dialog
+        /// </summary>
+        /// <param name="hWndOwner">Handle of the control to be parent</param>
+        /// <returns>True if the user presses OK else false</returns>
+        public bool ShowDialog(IntPtr hWndOwner)
+        {
+            var fbd = new FolderBrowserDialog
+            {
+                Description = this.Title,
+                SelectedPath = this.InitialDirectory,
+                ShowNewFolderButton = false
+            };
+            if (fbd.ShowDialog(new WindowWrapper(hWndOwner)) != DialogResult.OK)
+            {
+                return false;
+            }
+
+            ofd.FileName = fbd.SelectedPath;
+
+            return true;
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Creates IWin32Window around an IntPtr
+    /// </summary>
+    public class WindowWrapper : IWin32Window
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="handle">Handle to wrap</param>
+        public WindowWrapper(IntPtr handle)
+        {
+            Handle = handle;
+        }
+
+        /// <summary>
+        /// Original ptr
+        /// </summary>
+        public IntPtr Handle { get; }
+    }
+}
diff --git a/HelperClasses.cs b/WPinternals/HelperClasses.cs
similarity index 97%
rename from HelperClasses.cs
rename to WPinternals/HelperClasses.cs
index 0b680d3..fcb6cdc 100644
--- a/HelperClasses.cs
+++ b/WPinternals/HelperClasses.cs
@@ -1,2352 +1,2352 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-//
-// Some of the classes and functions in this file were found online.
-// Where possible the original authors are referenced.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media.Animation;
-using System.Windows.Media.Imaging;
-using System.Windows.Threading;
-
-namespace WPinternals
-{
-    internal delegate void SetWorkingStatus(string Message, string SubMessage = null, ulong? MaxProgressValue = null, bool ShowAnimation = true, WPinternalsStatus Status = WPinternalsStatus.Undefined);
-    internal delegate void UpdateWorkingStatus(string Message, string SubMessage = null, ulong? CurrentProgressValue = null, WPinternalsStatus Status = WPinternalsStatus.Undefined);
-    internal delegate void ExitSuccess(string Message, string SubMessage = null);
-    internal delegate void ExitFailure(string Message, string SubMessage = null);
-
-    internal enum WPinternalsStatus
-    {
-        Undefined,
-        Scanning,
-        Flashing,
-        Patching,
-        WaitingForManualReset,
-        SwitchingMode,
-        Initializing
-    };
-
-    public class BooleanConverter : DependencyObject, IValueConverter
-    {
-        public static readonly DependencyProperty OnTrueProperty =
-            DependencyProperty.Register("OnTrue", typeof(object), typeof(BooleanConverter),
-                new PropertyMetadata(default(object)));
-
-        public static readonly DependencyProperty OnFalseProperty =
-            DependencyProperty.Register("OnFalse", typeof(object), typeof(BooleanConverter),
-                new PropertyMetadata(default(object)));
-
-        public static readonly DependencyProperty OnNullProperty =
-            DependencyProperty.Register("OnNull", typeof(object), typeof(BooleanConverter),
-                new PropertyMetadata(default(object)));
-
-        public object OnTrue
-        {
-            get { return GetValue(OnTrueProperty); }
-            set { SetValue(OnTrueProperty, value); }
-        }
-
-        public object OnFalse
-        {
-            get { return GetValue(OnFalseProperty); }
-            set { SetValue(OnFalseProperty, value); }
-        }
-
-        public object OnNull
-        {
-            get { return GetValue(OnNullProperty); }
-            set { SetValue(OnNullProperty, value); }
-        }
-
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value == null
-                ? OnNull ?? Default(targetType)
-                : (string.Equals(value.ToString(), false.ToString(), StringComparison.CurrentCultureIgnoreCase)
-                    ? OnFalse
-                    : OnTrue);
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value == OnNull)
-            {
-                return Default(targetType);
-            }
-
-            if (value == OnFalse)
-            {
-                return false;
-            }
-
-            if (value == OnTrue)
-            {
-                return true;
-            }
-
-            if (value == null)
-            {
-                return null;
-            }
-
-            if (OnNull != null &&
-                string.Equals(value.ToString(), OnNull.ToString(), StringComparison.CurrentCultureIgnoreCase))
-            {
-                return Default(targetType);
-            }
-
-            if (OnFalse != null &&
-                string.Equals(value.ToString(), OnFalse.ToString(), StringComparison.CurrentCultureIgnoreCase))
-            {
-                return false;
-            }
-
-            if (OnTrue != null &&
-                string.Equals(value.ToString(), OnTrue.ToString(), StringComparison.CurrentCultureIgnoreCase))
-            {
-                return true;
-            }
-
-            return null;
-        }
-
-        public static object Default(Type type)
-        {
-            return type.IsValueType ? Activator.CreateInstance(type) : null;
-        }
-    }
-
-    public class HexConverter : DependencyObject, IValueConverter
-    {
-        public static readonly DependencyProperty SeparatorProperty =
-            DependencyProperty.Register("OnTrue", typeof(object), typeof(HexConverter),
-                new PropertyMetadata(" "));
-
-        public object Separator
-        {
-            get { return GetValue(SeparatorProperty); }
-            set { SetValue(SeparatorProperty, value); }
-        }
-
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is byte[] bytes)
-            {
-                StringBuilder s = new(1000);
-                for (int i = bytes.GetLowerBound(0); i <= bytes.GetUpperBound(0); i++)
-                {
-                    if (i != bytes.GetLowerBound(0))
-                    {
-                        s.Append(Separator);
-                    }
-
-                    s.Append(bytes[i].ToString("X2"));
-                }
-                return s.ToString();
-            }
-            else
-            {
-                return "";
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-
-        public static object Default(Type type)
-        {
-            return type.IsValueType ? Activator.CreateInstance(type) : null;
-        }
-    }
-
-    public class ObjectToVisibilityConverter : DependencyObject, IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value == null)
-            {
-                return "Collapsed";
-            }
-            else
-            {
-                return "Visible";
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-
-        public static object Default(Type type)
-        {
-            return type.IsValueType ? Activator.CreateInstance(type) : null;
-        }
-    }
-
-    public class InverseObjectToVisibilityConverter : DependencyObject, IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value == null)
-            {
-                return "Visible";
-            }
-            else
-            {
-                return "Collapsed";
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-
-        public static object Default(Type type)
-        {
-            return type.IsValueType ? Activator.CreateInstance(type) : null;
-        }
-    }
-
-    internal class CollapsibleRun : Run
-    {
-        private string CollapsibleText;
-
-        protected override void OnInitialized(EventArgs e)
-        {
-            base.OnInitialized(e);
-
-            CollapsibleText = Text;
-        }
-
-        public Boolean IsVisible
-        {
-            get
-            {
-                return (Boolean)this.GetValue(IsVisibleProperty);
-            }
-            set
-            {
-                this.SetValue(IsVisibleProperty, value);
-            }
-        }
-        public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
-          "IsVisible", typeof(Boolean), typeof(CollapsibleRun), new PropertyMetadata(true, IsVisibleChanged));
-        public static void IsVisibleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ((CollapsibleRun)d).Text = (bool)e.NewValue ? ((CollapsibleRun)d).CollapsibleText : String.Empty;
-        }
-    }
-
-    internal class CollapsibleSection : Section
-    {
-        public CollapsibleSection()
-        {
-            CollapsibleBlocks = new List<Block>();
-        }
-
-        protected override void OnInitialized(EventArgs e)
-        {
-            base.OnInitialized(e);
-
-            foreach (Block Block in Blocks)
-            {
-                CollapsibleBlocks.Add(Block);
-            }
-
-            Blocks.Clear();
-        }
-
-        public List<Block> CollapsibleBlocks { get; }
-
-        public Boolean IsCollapsed
-        {
-            get
-            {
-                return (Boolean)this.GetValue(IsCollapsedProperty);
-            }
-            set
-            {
-                this.SetValue(IsCollapsedProperty, value);
-
-                Blocks.Clear();
-
-                if (IsInitialized && !value)
-                {
-                    foreach (Block Block in CollapsibleBlocks)
-                    {
-                        Blocks.Add(Block);
-                    }
-                }
-            }
-        }
-        public static readonly DependencyProperty IsCollapsedProperty = DependencyProperty.Register(
-          "IsCollapsed", typeof(Boolean), typeof(CollapsibleSection), new PropertyMetadata(false));
-    }
-
-    // Overloaded Paragraph class to remove empty Run-elements, caused by auto-formatting new-lines in the XAML
-    // Use local:Paragraph in a FlowDocument
-    // This correction only works at run-time
-    public class Paragraph : System.Windows.Documents.Paragraph
-    {
-        protected override void OnInitialized(EventArgs e)
-        {
-            base.OnInitialized(e);
-            int inlinesCount = this.Inlines.Count;
-            for (int i = 0; i < inlinesCount; i++)
-            {
-                Inline inline = this.Inlines.ElementAt(i);
-                if (inline is Run run)
-                {
-                    if (run.Text == Convert.ToChar(32).ToString()) //ACSII 32 is the white space
-                    {
-                        run.Text = string.Empty;
-                    }
-                }
-            }
-        }
-    }
-
-    internal class ArrivalEventArgs : EventArgs
-    {
-        public PhoneInterfaces NewInterface;
-        public IDisposable NewModel;
-
-        public ArrivalEventArgs(PhoneInterfaces NewInterface, IDisposable NewModel)
-            : base()
-        {
-            this.NewInterface = NewInterface;
-            this.NewModel = NewModel;
-        }
-    }
-
-    internal static class BigEndian
-    {
-        public static byte[] GetBytes(object Value)
-        {
-            byte[] Bytes;
-            if (Value is short)
-            {
-                Bytes = BitConverter.GetBytes((short)Value);
-            }
-            else if (Value is ushort)
-            {
-                Bytes = BitConverter.GetBytes((ushort)Value);
-            }
-            else if (Value is int)
-            {
-                Bytes = BitConverter.GetBytes((int)Value);
-            }
-            else
-            {
-                Bytes = Value is uint ? BitConverter.GetBytes((uint)Value) : throw new NotSupportedException();
-            }
-
-            byte[] Result = new byte[Bytes.Length];
-            for (int i = 0; i < Bytes.Length; i++)
-            {
-                Result[i] = Bytes[Bytes.Length - 1 - i];
-            }
-
-            return Result;
-        }
-
-        public static byte[] GetBytes(object Value, int Width)
-        {
-            byte[] Result;
-            byte[] BigEndianBytes = GetBytes(Value);
-            if (BigEndianBytes.Length == Width)
-            {
-                return BigEndianBytes;
-            }
-            else if (BigEndianBytes.Length > Width)
-            {
-                Result = new byte[Width];
-                Buffer.BlockCopy(BigEndianBytes, BigEndianBytes.Length - Width, Result, 0, Width);
-                return Result;
-            }
-            else
-            {
-                Result = new byte[Width];
-                Buffer.BlockCopy(BigEndianBytes, 0, Result, Width - BigEndianBytes.Length, BigEndianBytes.Length);
-                return Result;
-            }
-        }
-
-        public static UInt16 ToUInt16(byte[] Buffer, int Offset)
-        {
-            byte[] Bytes = new byte[2];
-            for (int i = 0; i < 2; i++)
-            {
-                Bytes[i] = Buffer[Offset + 1 - i];
-            }
-
-            return BitConverter.ToUInt16(Bytes, 0);
-        }
-
-        public static Int16 ToInt16(byte[] Buffer, int Offset)
-        {
-            byte[] Bytes = new byte[2];
-            for (int i = 0; i < 2; i++)
-            {
-                Bytes[i] = Buffer[Offset + 1 - i];
-            }
-
-            return BitConverter.ToInt16(Bytes, 0);
-        }
-
-        public static UInt32 ToUInt32(byte[] Buffer, int Offset)
-        {
-            byte[] Bytes = new byte[4];
-            for (int i = 0; i < 4; i++)
-            {
-                Bytes[i] = Buffer[Offset + 3 - i];
-            }
-
-            return BitConverter.ToUInt32(Bytes, 0);
-        }
-
-        public static Int32 ToInt32(byte[] Buffer, int Offset)
-        {
-            byte[] Bytes = new byte[4];
-            for (int i = 0; i < 4; i++)
-            {
-                Bytes[i] = Buffer[Offset + 3 - i];
-            }
-
-            return BitConverter.ToInt32(Bytes, 0);
-        }
-    }
-
-    // This class was found online.
-    // Original author is probably: mdm20
-    // https://stackoverflow.com/questions/5566330/get-gif-to-play-in-wpf-with-gifimage-class/5568703#5568703
-    internal class GifImage : Image
-    {
-        private bool _isInitialized;
-        private GifBitmapDecoder _gifDecoder;
-        private Int32Animation _animation;
-
-        public int FrameIndex
-        {
-            get { return (int)GetValue(FrameIndexProperty); }
-            set { SetValue(FrameIndexProperty, value); }
-        }
-
-        private void Initialize()
-        {
-            _gifDecoder = new GifBitmapDecoder(new Uri("pack://application:,,," + this.GifSource), BitmapCreateOptions.PreservePixelFormat, BitmapCacheOption.Default);
-            _animation = new Int32Animation(0, _gifDecoder.Frames.Count - 1, new Duration(new TimeSpan(0, 0, 0, _gifDecoder.Frames.Count / 10, (int)(((_gifDecoder.Frames.Count / 10.0) - (_gifDecoder.Frames.Count / 10)) * 1000))))
-            {
-                RepeatBehavior = RepeatBehavior.Forever
-            };
-            this.Source = _gifDecoder.Frames[0];
-
-            _isInitialized = true;
-        }
-
-        static GifImage()
-        {
-            VisibilityProperty.OverrideMetadata(typeof(GifImage),
-                new FrameworkPropertyMetadata(VisibilityPropertyChanged));
-        }
-
-        private static void VisibilityPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
-        {
-            if ((Visibility)e.NewValue == Visibility.Visible)
-            {
-                ((GifImage)sender).StartAnimation();
-            }
-            else
-            {
-                ((GifImage)sender).StopAnimation();
-            }
-        }
-
-        public static readonly DependencyProperty FrameIndexProperty =
-            DependencyProperty.Register("FrameIndex", typeof(int), typeof(GifImage), new UIPropertyMetadata(0, new PropertyChangedCallback(ChangingFrameIndex)));
-
-        private static void ChangingFrameIndex(DependencyObject obj, DependencyPropertyChangedEventArgs ev)
-        {
-            var gifImage = obj as GifImage;
-            gifImage.Source = gifImage._gifDecoder.Frames[(int)ev.NewValue];
-        }
-
-        public bool AutoStart
-        {
-            get { return (bool)GetValue(AutoStartProperty); }
-            set { SetValue(AutoStartProperty, value); }
-        }
-
-        public static readonly DependencyProperty AutoStartProperty =
-            DependencyProperty.Register("AutoStart", typeof(bool), typeof(GifImage), new UIPropertyMetadata(false, AutoStartPropertyChanged));
-
-        private static void AutoStartPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
-        {
-            if ((bool)e.NewValue)
-            {
-                (sender as GifImage)?.StartAnimation();
-            }
-        }
-
-        public string GifSource
-        {
-            get { return (string)GetValue(GifSourceProperty); }
-            set { SetValue(GifSourceProperty, value); }
-        }
-
-        public static readonly DependencyProperty GifSourceProperty =
-            DependencyProperty.Register("GifSource", typeof(string), typeof(GifImage), new UIPropertyMetadata(string.Empty, GifSourcePropertyChanged));
-
-        private static void GifSourcePropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
-        {
-            (sender as GifImage)?.Initialize();
-        }
-
-        public void StartAnimation()
-        {
-            if (!_isInitialized)
-            {
-                this.Initialize();
-            }
-
-            BeginAnimation(FrameIndexProperty, _animation);
-        }
-
-        public void StopAnimation()
-        {
-            BeginAnimation(FrameIndexProperty, null);
-        }
-    }
-
-    internal enum LogType
-    {
-        FileOnly,
-        FileAndConsole,
-        ConsoleOnly
-    };
-
-    internal static class LogFile
-    {
-        private static readonly StreamWriter w = null;
-        private static readonly object lockobject = new();
-#if PREVIEW
-        private static string LogAction = null;
-        private static StringBuilder LogBuilder;
-#endif
-
-        static LogFile()
-        {
-            try
-            {
-                if (!Directory.Exists(Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals")))
-                {
-                    Directory.CreateDirectory(Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals"));
-                }
-
-                w = File.AppendText(Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\WPInternals.log"));
-            }
-            catch { }
-        }
-
-        public static void Log(string logMessage, LogType Type = LogType.FileOnly)
-        {
-            if (w == null)
-            {
-                return;
-            }
-
-            lock (lockobject)
-            {
-                if ((Type == LogType.FileOnly) || (Type == LogType.FileAndConsole))
-                {
-                    DateTime Now = DateTime.Now;
-                    string Text = Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ": " + logMessage;
-                    w.WriteLine(Text);
-                    w.Flush();
-
-#if PREVIEW
-                    if (LogAction != null)
-                        LogBuilder.AppendLine(Text);
-#endif
-                }
-
-                if (CommandLine.IsConsoleVisible && ((Type == LogType.ConsoleOnly) || (Type == LogType.FileAndConsole)))
-                {
-                    Console.WriteLine(logMessage);
-                }
-            }
-        }
-
-        public static void LogException(Exception Ex, LogType Type = LogType.FileAndConsole, string AdditionalInfo = null)
-        {
-            string Indent = "";
-            Exception CurrentEx = Ex;
-            while (CurrentEx != null)
-            {
-                Log(Indent + "Error: " + RemoveBadChars(CurrentEx.Message).Replace("of type '.' ", "") + (AdditionalInfo == null ? "" : " - " + AdditionalInfo), Type);
-                AdditionalInfo = null;
-                if (CurrentEx is WPinternalsException)
-                {
-                    Log(Indent + ((WPinternalsException)CurrentEx).SubMessage, Type);
-                }
-#if DEBUG
-                if (CurrentEx.StackTrace != null)
-                {
-                    Log(Indent + CurrentEx.StackTrace, LogType.FileOnly);
-                }
-#endif
-                Indent += "    ";
-                CurrentEx = CurrentEx.InnerException;
-            }
-        }
-
-        private static string RemoveBadChars(string Text)
-        {
-            return System.Text.RegularExpressions.Regex.Replace(Text, @"[^\u0020-\u007E]+", string.Empty);
-        }
-
-        public static void DumpLog(StreamReader r)
-        {
-            string line;
-            while ((line = r.ReadLine()) != null)
-            {
-                Console.WriteLine(line);
-            }
-        }
-
-        public static void LogApplicationVersion()
-        {
-            Log("Windows Phone Internals version " +
-                Assembly.GetExecutingAssembly().GetName().Version.Major.ToString() + "." +
-                Assembly.GetExecutingAssembly().GetName().Version.Minor.ToString() + "." +
-                Assembly.GetExecutingAssembly().GetName().Version.Build.ToString() + "." +
-                Assembly.GetExecutingAssembly().GetName().Version.Revision.ToString(), LogType.FileAndConsole);
-            Log("Copyright Heathcliff74", LogType.FileAndConsole);
-        }
-
-        internal static void BeginAction(string Action)
-        {
-#if PREVIEW
-            if (LogAction == null)
-            {
-                LogAction = Action;
-                LogBuilder = new StringBuilder();
-                LogBuilder.AppendLine("Windows Phone Internals version " +
-                Assembly.GetExecutingAssembly().GetName().Version.Major.ToString() + "." +
-                Assembly.GetExecutingAssembly().GetName().Version.Minor.ToString() + "." +
-                Assembly.GetExecutingAssembly().GetName().Version.Build.ToString() + "." +
-                Assembly.GetExecutingAssembly().GetName().Version.Revision.ToString());
-                LogBuilder.AppendLine("Copyright Heathcliff74");
-                LogBuilder.AppendLine("Action: " + Action);
-                if (App.Config.RegistrationName != null)
-                    LogBuilder.AppendLine("Name: " + App.Config.RegistrationName);
-                if (App.Config.RegistrationEmail != null)
-                    LogBuilder.AppendLine("Mail: " + App.Config.RegistrationEmail);
-                if (App.Config.RegistrationSkypeID != null)
-                    LogBuilder.AppendLine("Skype: " + App.Config.RegistrationSkypeID);
-                if (App.Config.RegistrationTelegramID != null)
-                    LogBuilder.AppendLine("Telegram: " + App.Config.RegistrationTelegramID);
-                if (Environment.MachineName != null)
-                    LogBuilder.AppendLine("Machine: " + Environment.MachineName);
-            }
-#endif
-        }
-
-        internal static void EndAction()
-        {
-            EndAction(null);
-        }
-
-        internal static void EndAction(string Action)
-        {
-#if PREVIEW
-            if ((LogAction != null) && ((Action == null) || (LogAction == Action)))
-            {
-                Action = LogAction;
-                LogAction = null;
-                string FileName = "";
-                if (App.Config.RegistrationName != null)
-                    FileName += App.Config.RegistrationName + " - ";
-                FileName += DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss.fff", CultureInfo.InvariantCulture) + " - " + Action + " - " +
-                    Assembly.GetExecutingAssembly().GetName().Version.Major.ToString() + "." + 
-                    Assembly.GetExecutingAssembly().GetName().Version.Minor.ToString() + "." +
-                    Assembly.GetExecutingAssembly().GetName().Version.Build.ToString() + "." +
-                    Assembly.GetExecutingAssembly().GetName().Version.Revision.ToString() + ".log";
-
-                // Normalize filename
-                try
-                {
-                    FileName = System.Text.Encoding.ASCII.GetString(System.Text.Encoding.GetEncoding("ISO-8859-8").GetBytes(FileName));
-                }
-                catch { }
-                FileName = FileName.Replace("?", "");
-
-                if (Action.ToLower() == "registration")
-                    Uploader.Upload(FileName, LogBuilder.ToString());
-                else
-                {
-                    try
-                    {
-                        Uploader.Upload(FileName, LogBuilder.ToString());
-                    }
-                    catch { }
-                }
-            }
-#endif
-        }
-    }
-
-    public static class Converter
-    {
-        public static string ConvertHexToString(byte[] Bytes, string Separator)
-        {
-            StringBuilder s = new(1000);
-            for (int i = Bytes.GetLowerBound(0); i <= Bytes.GetUpperBound(0); i++)
-            {
-                if (i != Bytes.GetLowerBound(0))
-                {
-                    s.Append(Separator);
-                }
-
-                s.Append(Bytes[i].ToString("X2"));
-            }
-            return s.ToString();
-        }
-
-        public static byte[] ConvertStringToHex(string HexString)
-        {
-            if (HexString.Length % 2 == 1)
-            {
-                throw new Exception("The binary key cannot have an odd number of digits");
-            }
-
-            byte[] arr = new byte[HexString.Length >> 1];
-
-            for (int i = 0; i < (HexString.Length >> 1); ++i)
-            {
-                arr[i] = (byte)((GetHexVal(HexString[i << 1]) << 4) + GetHexVal(HexString[(i << 1) + 1]));
-            }
-
-            return arr;
-        }
-
-        public static int GetHexVal(char hex)
-        {
-            int val = hex;
-            //For uppercase A-F letters:
-            //return val - (val < 58 ? 48 : 55);
-            //For lowercase a-f letters:
-            //return val - (val < 58 ? 48 : 87);
-            //Or the two combined, but a bit slower:
-            return val - (val < 58 ? 48 : (val < 97 ? 55 : 87));
-        }
-    }
-
-    // This class was found online.
-    // Original author is probably: John Melville
-    // https://social.msdn.microsoft.com/Forums/en-US/163ef755-ff7b-4ea5-b226-bbe8ef5f4796/is-there-a-pattern-for-calling-an-async-method-synchronously?forum=async
-    public static class AsyncHelpers
-    {
-        /// <summary>
-        /// Execute's an async Task<T> method which has a void return value synchronously
-        /// </summary>
-        /// <param name="task">Task<T> method to execute</param>
-        public static void RunSync(Func<Task> task)
-        {
-            var oldContext = SynchronizationContext.Current;
-            var synch = new ExclusiveSynchronizationContext();
-            SynchronizationContext.SetSynchronizationContext(synch);
-            synch.Post(async _ =>
-            {
-                try
-                {
-                    await task();
-                }
-                catch (Exception e)
-                {
-                    synch.InnerException = e;
-                    throw;
-                }
-                finally
-                {
-                    synch.EndMessageLoop();
-                }
-            }, null);
-            synch.BeginMessageLoop();
-
-            SynchronizationContext.SetSynchronizationContext(oldContext);
-        }
-
-        /// <summary>
-        /// Execute's an async Task<T> method which has a T return type synchronously
-        /// </summary>
-        /// <typeparam name="T">Return Type</typeparam>
-        /// <param name="task">Task<T> method to execute</param>
-        /// <returns></returns>
-        public static T RunSync<T>(Func<Task<T>> task)
-        {
-            var oldContext = SynchronizationContext.Current;
-            var synch = new ExclusiveSynchronizationContext();
-            SynchronizationContext.SetSynchronizationContext(synch);
-            T ret = default;
-            synch.Post(async _ =>
-            {
-                try
-                {
-                    ret = await task();
-                }
-                catch (Exception e)
-                {
-                    synch.InnerException = e;
-                    throw;
-                }
-                finally
-                {
-                    synch.EndMessageLoop();
-                }
-            }, null);
-            synch.BeginMessageLoop();
-            SynchronizationContext.SetSynchronizationContext(oldContext);
-            return ret;
-        }
-
-        private class ExclusiveSynchronizationContext : SynchronizationContext
-        {
-            private bool done;
-            public Exception InnerException { get; set; }
-            private readonly AutoResetEvent workItemsWaiting = new(false);
-            private readonly Queue<Tuple<SendOrPostCallback, object>> items =
-                new();
-
-            public override void Send(SendOrPostCallback d, object state)
-            {
-                throw new NotSupportedException("We cannot send to our same thread");
-            }
-
-            public override void Post(SendOrPostCallback d, object state)
-            {
-                lock (items)
-                {
-                    items.Enqueue(Tuple.Create(d, state));
-                }
-                workItemsWaiting.Set();
-            }
-
-            public void EndMessageLoop()
-            {
-                Post(_ => done = true, null);
-            }
-
-            public void BeginMessageLoop()
-            {
-                while (!done)
-                {
-                    Tuple<SendOrPostCallback, object> task = null;
-                    lock (items)
-                    {
-                        if (items.Count > 0)
-                        {
-                            task = items.Dequeue();
-                        }
-                    }
-                    if (task != null)
-                    {
-                        task.Item1(task.Item2);
-                        if (InnerException != null) // the method threw an exeption
-                        {
-                            throw new AggregateException("AsyncHelpers.Run method threw an exception.", InnerException);
-                        }
-                    }
-                    else
-                    {
-                        workItemsWaiting.WaitOne();
-                    }
-                }
-            }
-
-            public override SynchronizationContext CreateCopy()
-            {
-                return this;
-            }
-        }
-    }
-
-    // This class is taken from the Prism library by Microsoft Patterns & Practices
-    // License: http://compositewpf.codeplex.com/license
-    internal static class WeakEventHandlerManager
-    {
-        public static void AddWeakReferenceHandler(ref List<WeakReference> handlers, EventHandler handler, int defaultListSize)
-        {
-            (handlers ??= (defaultListSize > 0) ? new List<WeakReference>(defaultListSize) : new List<WeakReference>()).Add(new WeakReference(handler));
-        }
-
-        private static void CallHandler(object sender, EventHandler eventHandler)
-        {
-            DispatcherProxy proxy = DispatcherProxy.CreateDispatcher();
-            if (eventHandler != null)
-            {
-                if (proxy?.CheckAccess() == false)
-                {
-                    proxy.BeginInvoke(new Action<object, EventHandler>(CallHandler), new object[] { sender, eventHandler });
-                }
-                else
-                {
-                    eventHandler(sender, EventArgs.Empty);
-                }
-            }
-        }
-
-        public static void CallWeakReferenceHandlers(object sender, List<WeakReference> handlers)
-        {
-            if (handlers != null)
-            {
-                EventHandler[] callees = new EventHandler[handlers.Count];
-                int count = 0;
-                count = CleanupOldHandlers(handlers, callees, count);
-                for (int i = 0; i < count; i++)
-                {
-                    CallHandler(sender, callees[i]);
-                }
-            }
-        }
-
-        private static int CleanupOldHandlers(List<WeakReference> handlers, EventHandler[] callees, int count)
-        {
-            for (int i = handlers.Count - 1; i >= 0; i--)
-            {
-                WeakReference reference = handlers[i];
-                if (reference.Target is not EventHandler target)
-                {
-                    handlers.RemoveAt(i);
-                }
-                else
-                {
-                    callees[count] = target;
-                    count++;
-                }
-            }
-            return count;
-        }
-
-        public static void RemoveWeakReferenceHandler(List<WeakReference> handlers, EventHandler handler)
-        {
-            if (handlers != null)
-            {
-                for (int i = handlers.Count - 1; i >= 0; i--)
-                {
-                    WeakReference reference = handlers[i];
-                    if ((reference.Target is not EventHandler target) || (target == handler))
-                    {
-                        handlers.RemoveAt(i);
-                    }
-                }
-            }
-        }
-
-        private class DispatcherProxy
-        {
-            private readonly Dispatcher innerDispatcher;
-
-            private DispatcherProxy(Dispatcher dispatcher)
-            {
-                this.innerDispatcher = dispatcher;
-            }
-
-            public DispatcherOperation BeginInvoke(Delegate method, params object[] args)
-            {
-                return this.innerDispatcher.BeginInvoke(method, DispatcherPriority.Normal, args);
-            }
-
-            public bool CheckAccess()
-            {
-                return this.innerDispatcher.CheckAccess();
-            }
-
-            public static DispatcherProxy CreateDispatcher()
-            {
-                if (Application.Current == null)
-                {
-                    return null;
-                }
-                return new DispatcherProxy(Application.Current.Dispatcher);
-            }
-        }
-    }
-
-    // This interface is taken from the Prism library by Microsoft Patterns & Practices
-    // License: http://compositewpf.codeplex.com/license
-    public interface IActiveAware
-    {
-        /// <summary>
-        /// Gets or sets a value indicating whether the object is active.
-        /// </summary>
-        /// <value><see langword="true" /> if the object is active; otherwise <see langword="false" />.</value>
-        bool IsActive { get; set; }
-
-        /// <summary>
-        /// Notifies that the value for <see cref="IsActive"/> property has changed.
-        /// </summary>
-        event EventHandler IsActiveChanged;
-    }
-
-    // This class is taken from the Prism library by Microsoft Patterns & Practices
-    // License: http://compositewpf.codeplex.com/license
-    public abstract class DelegateCommandBase : ICommand, IActiveAware
-    {
-        private List<WeakReference> _canExecuteChangedHandlers;
-        private bool _isActive;
-        private readonly Func<object, bool> canExecuteMethod;
-        private readonly Action<object> executeMethod;
-
-        public event EventHandler CanExecuteChanged
-        {
-            add
-            {
-                WeakEventHandlerManager.AddWeakReferenceHandler(ref this._canExecuteChangedHandlers, value, 2);
-            }
-            remove
-            {
-                WeakEventHandlerManager.RemoveWeakReferenceHandler(this._canExecuteChangedHandlers, value);
-            }
-        }
-
-        public event EventHandler IsActiveChanged;
-
-        protected DelegateCommandBase(Action<object> executeMethod, Func<object, bool> canExecuteMethod)
-        {
-            if ((executeMethod == null) || (canExecuteMethod == null))
-            {
-                throw new ArgumentNullException(nameof(executeMethod), "Delegate Command Delegates Cannot Be Null");
-            }
-            this.executeMethod = executeMethod;
-            this.canExecuteMethod = canExecuteMethod;
-        }
-
-        protected bool CanExecute(object parameter)
-        {
-            if (this.canExecuteMethod != null)
-            {
-                return this.canExecuteMethod(parameter);
-            }
-            return true;
-        }
-
-        protected void Execute(object parameter)
-        {
-            this.executeMethod(parameter);
-        }
-
-        protected virtual void OnCanExecuteChanged()
-        {
-            WeakEventHandlerManager.CallWeakReferenceHandlers(this, this._canExecuteChangedHandlers);
-        }
-
-        protected virtual void OnIsActiveChanged()
-        {
-            this.IsActiveChanged?.Invoke(this, EventArgs.Empty);
-        }
-
-        public void RaiseCanExecuteChanged()
-        {
-            this.OnCanExecuteChanged();
-        }
-
-        bool ICommand.CanExecute(object parameter)
-        {
-            return this.CanExecute(parameter);
-        }
-
-        void ICommand.Execute(object parameter)
-        {
-            this.Execute(parameter);
-        }
-
-        public bool IsActive
-        {
-            get
-            {
-                return this._isActive;
-            }
-            set
-            {
-                if (this._isActive != value)
-                {
-                    this._isActive = value;
-                    this.OnIsActiveChanged();
-                }
-            }
-        }
-    }
-
-    // This class is taken from the Prism library by Microsoft Patterns & Practices
-    // License: http://compositewpf.codeplex.com/license
-    public class DelegateCommand : DelegateCommandBase
-    {
-        public DelegateCommand(Action executeMethod)
-            : this(executeMethod, () => true)
-        {
-        }
-
-        public DelegateCommand(Action executeMethod, Func<bool> canExecuteMethod) : base(o => executeMethod(), f => canExecuteMethod())
-        {
-        }
-
-        public bool CanExecute()
-        {
-            return CanExecute(null);
-        }
-
-        public void Execute()
-        {
-            Execute(null);
-        }
-    }
-
-    internal class FlowDocumentScrollViewerNoMouseWheel : FlowDocumentScrollViewer
-    {
-        protected override void OnMouseWheel(MouseWheelEventArgs e)
-        {
-        }
-    }
-
-    internal class ProgressUpdater
-    {
-        private readonly DateTime InitTime;
-        private DateTime LastUpdateTime;
-        private readonly UInt64 MaxValue;
-        private readonly Action<int, TimeSpan?> ProgressUpdateCallback;
-        internal int ProgressPercentage;
-
-        internal ProgressUpdater(UInt64 MaxValue, Action<int, TimeSpan?> ProgressUpdateCallback)
-        {
-            InitTime = DateTime.Now;
-            LastUpdateTime = DateTime.Now;
-            this.MaxValue = MaxValue;
-            this.ProgressUpdateCallback = ProgressUpdateCallback;
-            SetProgress(0);
-        }
-
-        private UInt64 _Progress;
-        internal UInt64 Progress
-        {
-            get
-            {
-                return _Progress;
-            }
-        }
-
-        internal void SetProgress(UInt64 NewValue)
-        {
-            if (_Progress != NewValue)
-            {
-                int PreviousProgressPercentage = (int)((double)_Progress / MaxValue * 100);
-                ProgressPercentage = (int)((double)NewValue / MaxValue * 100);
-
-                _Progress = NewValue;
-
-                if (((DateTime.Now - LastUpdateTime) > TimeSpan.FromSeconds(0.5)) || (ProgressPercentage == 100))
-                {
-#if DEBUG
-                    Console.WriteLine("Init time: " + InitTime.ToShortTimeString() + " / Now: " + DateTime.Now.ToString() + " / NewValue: " + NewValue.ToString() + " / MaxValue: " + MaxValue.ToString() + " ->> Percentage: " + ProgressPercentage.ToString() + " / Remaining: " + TimeSpan.FromTicks((long)((DateTime.Now - InitTime).Ticks / ((double)NewValue / MaxValue) * (1 - ((double)NewValue / MaxValue)))).ToString());
-#endif
-
-                    if (((DateTime.Now - InitTime) < TimeSpan.FromSeconds(30)) && (ProgressPercentage < 15))
-                    {
-                        ProgressUpdateCallback(ProgressPercentage, null);
-                    }
-                    else
-                    {
-                        ProgressUpdateCallback(ProgressPercentage, TimeSpan.FromTicks((long)((DateTime.Now - InitTime).Ticks / ((double)NewValue / MaxValue) * (1 - ((double)NewValue / MaxValue)))));
-                    }
-
-                    LastUpdateTime = DateTime.Now;
-                }
-            }
-        }
-
-        internal void IncreaseProgress(UInt64 Progress)
-        {
-            SetProgress(_Progress + Progress);
-        }
-    }
-
-    internal static class Compression
-    {
-        internal static Stream GetDecompressedStreamWithSeek(Stream InputStream)
-        {
-            long P = InputStream.Position;
-            byte[] GZipHeader = new byte[3];
-            InputStream.Read(GZipHeader, 0, 3);
-            InputStream.Position = P;
-            if (StructuralComparisons.StructuralEqualityComparer.Equals(GZipHeader, new byte[] { 0x1F, 0x8B, 0x08 }))
-            {
-                return new GZipStream(InputStream, CompressionMode.Decompress, false);
-            }
-            else
-            {
-                return InputStream;
-            }
-        }
-
-        internal static bool IsCompressedStream(Stream InputStream)
-        {
-            byte[] GZipHeader = new byte[3];
-            InputStream.Read(GZipHeader, 0, 3);
-            return StructuralComparisons.StructuralEqualityComparer.Equals(GZipHeader, new byte[] { 0x1F, 0x8B, 0x08 });
-        }
-
-        internal static GZipStream GetDecompressedStream(Stream InputStream)
-        {
-            return new GZipStream(InputStream, CompressionMode.Decompress, false);
-        }
-    }
-
-    internal class WPinternalsException : Exception
-    {
-        // Message and SubMessaage are always printable
-        internal string SubMessage = null;
-
-        internal WPinternalsException() : base() { }
-
-        internal WPinternalsException(string Message) : base(Message) { }
-
-        internal WPinternalsException(string Message, Exception InnerException) : base(Message, InnerException) { }
-
-        internal WPinternalsException(string Message, string SubMessage) : base(Message) { this.SubMessage = SubMessage; }
-
-        internal WPinternalsException(string Message, string SubMessage, Exception InnerException) : base(Message, InnerException) { this.SubMessage = SubMessage; }
-    }
-
-    // This class is written by: Eugene Beresovsky
-    // https://stackoverflow.com/questions/13035925/stream-wrapper-to-make-stream-seekable/28036366#28036366
-    internal class ReadSeekableStream : Stream
-    {
-        private long _underlyingPosition;
-        private readonly byte[] _seekBackBuffer;
-        private int _seekBackBufferCount;
-        private int _seekBackBufferIndex;
-        private readonly Stream _underlyingStream;
-
-        public ReadSeekableStream(Stream underlyingStream, int seekBackBufferSize)
-        {
-            if (!underlyingStream.CanRead)
-            {
-                throw new Exception("Provided stream " + underlyingStream + " is not readable");
-            }
-
-            _underlyingStream = underlyingStream;
-            _seekBackBuffer = new byte[seekBackBufferSize];
-        }
-
-        public override bool CanRead { get { return true; } }
-        public override bool CanSeek { get { return true; } }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            int copiedFromBackBufferCount = 0;
-            if (_seekBackBufferIndex < _seekBackBufferCount)
-            {
-                copiedFromBackBufferCount = Math.Min(count, _seekBackBufferCount - _seekBackBufferIndex);
-                Buffer.BlockCopy(_seekBackBuffer, _seekBackBufferIndex, buffer, offset, copiedFromBackBufferCount);
-                offset += copiedFromBackBufferCount;
-                count -= copiedFromBackBufferCount;
-                _seekBackBufferIndex += copiedFromBackBufferCount;
-            }
-            int bytesReadFromUnderlying = 0;
-            if (count > 0)
-            {
-                bytesReadFromUnderlying = _underlyingStream.Read(buffer, offset, count);
-                if (bytesReadFromUnderlying > 0)
-                {
-                    _underlyingPosition += bytesReadFromUnderlying;
-
-                    var copyToBufferCount = Math.Min(bytesReadFromUnderlying, _seekBackBuffer.Length);
-                    var copyToBufferOffset = Math.Min(_seekBackBufferCount, _seekBackBuffer.Length - copyToBufferCount);
-                    var bufferBytesToMove = Math.Min(_seekBackBufferCount - 1, copyToBufferOffset);
-
-                    if (bufferBytesToMove > 0)
-                    {
-                        Buffer.BlockCopy(_seekBackBuffer, _seekBackBufferCount - bufferBytesToMove, _seekBackBuffer, 0, bufferBytesToMove);
-                    }
-
-                    Buffer.BlockCopy(buffer, offset, _seekBackBuffer, copyToBufferOffset, copyToBufferCount);
-                    _seekBackBufferCount = Math.Min(_seekBackBuffer.Length, _seekBackBufferCount + copyToBufferCount);
-                    _seekBackBufferIndex = _seekBackBufferCount;
-                }
-            }
-            return copiedFromBackBufferCount + bytesReadFromUnderlying;
-        }
-
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            if (origin == SeekOrigin.End)
-            {
-                return SeekFromEnd((int)Math.Max(0, -offset));
-            }
-
-            var relativeOffset = origin == SeekOrigin.Current
-                ? offset
-                : offset - Position;
-
-            if (relativeOffset == 0)
-            {
-                return Position;
-            }
-            else if (relativeOffset > 0)
-            {
-                return SeekForward(relativeOffset);
-            }
-            else
-            {
-                return SeekBackwards(-relativeOffset);
-            }
-        }
-
-        private long SeekForward(long origOffset)
-        {
-            long offset = origOffset;
-            var seekBackBufferLength = _seekBackBuffer.Length;
-
-            int backwardSoughtBytes = _seekBackBufferCount - _seekBackBufferIndex;
-            int seekForwardInBackBuffer = (int)Math.Min(offset, backwardSoughtBytes);
-            offset -= seekForwardInBackBuffer;
-            _seekBackBufferIndex += seekForwardInBackBuffer;
-
-            if (offset > 0)
-            {
-                // first completely fill seekBackBuffer to remove special cases from while loop below
-                if (_seekBackBufferCount < seekBackBufferLength)
-                {
-                    var maxRead = seekBackBufferLength - _seekBackBufferCount;
-                    if (offset < maxRead)
-                    {
-                        maxRead = (int)offset;
-                    }
-
-                    var bytesRead = _underlyingStream.Read(_seekBackBuffer, _seekBackBufferCount, maxRead);
-                    _underlyingPosition += bytesRead;
-                    _seekBackBufferCount += bytesRead;
-                    _seekBackBufferIndex = _seekBackBufferCount;
-                    if (bytesRead < maxRead)
-                    {
-                        if (_seekBackBufferCount < offset)
-                        {
-                            throw new NotSupportedException("Reached end of stream seeking forward " + origOffset + " bytes");
-                        }
-
-                        return Position;
-                    }
-                    offset -= bytesRead;
-                }
-
-                // now alternate between filling tempBuffer and seekBackBuffer
-                bool fillTempBuffer = true;
-                var tempBuffer = new byte[seekBackBufferLength];
-                while (offset > 0)
-                {
-                    var maxRead = offset < seekBackBufferLength ? (int)offset : seekBackBufferLength;
-                    var bytesRead = _underlyingStream.Read(fillTempBuffer ? tempBuffer : _seekBackBuffer, 0, maxRead);
-                    _underlyingPosition += bytesRead;
-                    var bytesReadDiff = maxRead - bytesRead;
-                    offset -= bytesRead;
-                    if (bytesReadDiff > 0 /* reached end-of-stream */ || offset == 0)
-                    {
-                        if (fillTempBuffer)
-                        {
-                            if (bytesRead > 0)
-                            {
-                                Buffer.BlockCopy(_seekBackBuffer, bytesRead, _seekBackBuffer, 0, bytesReadDiff);
-                                Buffer.BlockCopy(tempBuffer, 0, _seekBackBuffer, bytesReadDiff, bytesRead);
-                            }
-                        }
-                        else
-                        {
-                            if (bytesRead > 0)
-                            {
-                                Buffer.BlockCopy(_seekBackBuffer, 0, _seekBackBuffer, bytesReadDiff, bytesRead);
-                            }
-
-                            Buffer.BlockCopy(tempBuffer, bytesRead, _seekBackBuffer, 0, bytesReadDiff);
-                        }
-                        if (offset > 0)
-                        {
-                            throw new NotSupportedException("Reached end of stream seeking forward " + origOffset + " bytes");
-                        }
-                    }
-                    fillTempBuffer = !fillTempBuffer;
-                }
-            }
-            return Position;
-        }
-
-        private long SeekBackwards(long offset)
-        {
-            var intOffset = (int)offset;
-            if (offset > int.MaxValue || intOffset > _seekBackBufferIndex)
-            {
-                throw new NotSupportedException("Cannot currently seek backwards more than " + _seekBackBufferIndex + " bytes");
-            }
-
-            _seekBackBufferIndex -= intOffset;
-            return Position;
-        }
-
-        private long SeekFromEnd(long offset)
-        {
-            var intOffset = (int)offset;
-            var seekBackBufferLength = _seekBackBuffer.Length;
-            if (offset > int.MaxValue || intOffset > seekBackBufferLength)
-            {
-                throw new NotSupportedException("Cannot seek backwards from end more than " + seekBackBufferLength + " bytes");
-            }
-
-            // first completely fill seekBackBuffer to remove special cases from while loop below
-            if (_seekBackBufferCount < seekBackBufferLength)
-            {
-                var maxRead = seekBackBufferLength - _seekBackBufferCount;
-                var bytesRead = _underlyingStream.Read(_seekBackBuffer, _seekBackBufferCount, maxRead);
-                _underlyingPosition += bytesRead;
-                _seekBackBufferCount += bytesRead;
-                _seekBackBufferIndex = Math.Max(0, _seekBackBufferCount - intOffset);
-                if (bytesRead < maxRead)
-                {
-                    if (_seekBackBufferCount < intOffset)
-                    {
-                        throw new NotSupportedException("Could not seek backwards from end " + intOffset + " bytes");
-                    }
-
-                    return Position;
-                }
-            }
-            else
-            {
-                _seekBackBufferIndex = _seekBackBufferCount;
-            }
-
-            // now alternate between filling tempBuffer and seekBackBuffer
-            bool fillTempBuffer = true;
-            var tempBuffer = new byte[seekBackBufferLength];
-            while (true)
-            {
-                var bytesRead = _underlyingStream.Read(fillTempBuffer ? tempBuffer : _seekBackBuffer, 0, seekBackBufferLength);
-                _underlyingPosition += bytesRead;
-                var bytesReadDiff = seekBackBufferLength - bytesRead;
-                if (bytesReadDiff > 0) // reached end-of-stream
-                {
-                    if (fillTempBuffer)
-                    {
-                        if (bytesRead > 0)
-                        {
-                            Buffer.BlockCopy(_seekBackBuffer, bytesRead, _seekBackBuffer, 0, bytesReadDiff);
-                            Buffer.BlockCopy(tempBuffer, 0, _seekBackBuffer, bytesReadDiff, bytesRead);
-                        }
-                    }
-                    else
-                    {
-                        if (bytesRead > 0)
-                        {
-                            Buffer.BlockCopy(_seekBackBuffer, 0, _seekBackBuffer, bytesReadDiff, bytesRead);
-                        }
-
-                        Buffer.BlockCopy(tempBuffer, bytesRead, _seekBackBuffer, 0, bytesReadDiff);
-                    }
-                    _seekBackBufferIndex -= intOffset;
-                    return Position;
-                }
-                fillTempBuffer = !fillTempBuffer;
-            }
-        }
-
-        public override long Position
-        {
-            get { return _underlyingPosition - (_seekBackBufferCount - _seekBackBufferIndex); }
-            set { Seek(value, SeekOrigin.Begin); }
-        }
-
-        public override bool CanTimeout { get { return _underlyingStream.CanTimeout; } }
-        public override bool CanWrite { get { return _underlyingStream.CanWrite; } }
-        public override long Length { get { return _underlyingStream.Length; } }
-        public override void SetLength(long value) { _underlyingStream.SetLength(value); }
-        public override void Write(byte[] buffer, int offset, int count) { _underlyingStream.Write(buffer, offset, count); }
-        public override void Flush() { _underlyingStream.Flush(); }
-        public override void Close() { _underlyingStream.Close(); }
-        public new void Dispose() { _underlyingStream.Dispose(); }
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                _underlyingStream.Dispose();
-            }
-        }
-    }
-
-    // For reading a compressed stream or normal stream
-    internal class DecompressedStream : Stream
-    {
-        private readonly Stream UnderlyingStream;
-        private readonly bool IsSourceCompressed;
-        private readonly UInt64 DecompressedLength;
-        private Int64 ReadPosition = 0;
-
-        // For reading a compressed stream
-        internal DecompressedStream(Stream InputStream)
-        {
-            UnderlyingStream = new ReadSeekableStream(InputStream, 0x100);
-
-            byte[] Signature = new byte["CompressedPartition".Length + 2];
-            Signature[0x00] = 0xFF;
-            Buffer.BlockCopy(Encoding.ASCII.GetBytes("CompressedPartition"), 0, Signature, 0x01, "CompressedPartition".Length);
-            Signature["CompressedPartition".Length + 1] = 0x00;
-
-            int PrimaryHeaderSize = 0x0A + "CompressedPartition".Length;
-            byte[] SignatureRead = new byte[Signature.Length];
-            UnderlyingStream.Read(SignatureRead, 0, Signature.Length);
-
-            IsSourceCompressed = StructuralComparisons.StructuralEqualityComparer.Equals(Signature, SignatureRead);
-            if (IsSourceCompressed)
-            {
-                byte[] FormatVersionBytes = new byte[4];
-                UnderlyingStream.Read(FormatVersionBytes, 0, 4);
-                if (BitConverter.ToUInt32(FormatVersionBytes, 0) > 1) // Max supported format version = 1
-                {
-                    throw new InvalidDataException();
-                }
-
-                byte[] HeaderSizeBytes = new byte[4];
-                UnderlyingStream.Read(HeaderSizeBytes, 0, 4);
-                UInt32 HeaderSize = BitConverter.ToUInt32(HeaderSizeBytes, 0);
-
-                if (HeaderSize >= (Signature.Length + 0x10))
-                {
-                    byte[] DecompressedLengthBytes = new byte[8];
-                    UnderlyingStream.Read(DecompressedLengthBytes, 0, 8);
-                    DecompressedLength = BitConverter.ToUInt64(DecompressedLengthBytes, 0);
-                }
-                else
-                {
-                    throw new InvalidDataException();
-                }
-
-                UInt32 HeaderBytesRemaining = (UInt32)(HeaderSize - Signature.Length - 0x10);
-                if (HeaderBytesRemaining > 0)
-                {
-                    byte[] HeaderBytes = new byte[HeaderBytesRemaining];
-                    UnderlyingStream.Read(HeaderBytes, 0, (int)HeaderBytesRemaining);
-                }
-
-                UnderlyingStream = new GZipStream(UnderlyingStream, CompressionMode.Decompress, false);
-            }
-            else
-            {
-                UnderlyingStream.Position = 0;
-            }
-        }
-
-        public override bool CanRead { get { return true; } }
-        public override bool CanSeek { get { return false; } }
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            int RealCount = UnderlyingStream.Read(buffer, offset, count);
-            ReadPosition += RealCount;
-            return RealCount;
-        }
-        public override long Seek(long offset, SeekOrigin origin) { throw new NotSupportedException(); }
-        public override long Position
-        {
-            get { return ReadPosition; }
-            set { throw new NotSupportedException(); }
-        }
-        public override bool CanTimeout { get { return UnderlyingStream.CanTimeout; } }
-        public override bool CanWrite { get { return true; } }
-        public override long Length
-        {
-            get
-            {
-                if (IsSourceCompressed)
-                {
-                    return (long)DecompressedLength;
-                }
-                else
-                {
-                    return UnderlyingStream.Length;
-                }
-            }
-        }
-        public override void SetLength(long value) { throw new NotSupportedException(); }
-        public override void Write(byte[] buffer, int offset, int count) { throw new NotSupportedException(); }
-        public override void Flush() { UnderlyingStream.Flush(); }
-        public override void Close() { UnderlyingStream.Close(); }
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                this.UnderlyingStream.Dispose();
-            }
-        }
-    }
-
-    // For writing a compressed stream
-    internal class CompressedStream : Stream
-    {
-        private readonly UInt32 HeaderSize;
-        private UInt64 WritePosition;
-        private readonly GZipStream UnderlyingStream;
-
-        internal CompressedStream(Stream OutputStream, UInt64 TotalDecompressedStreamLength)
-        {
-            // Write header
-            HeaderSize = (UInt32)(0x12 + "CompressedPartition".Length);
-            OutputStream.WriteByte(0xFF);
-            OutputStream.Write(Encoding.ASCII.GetBytes("CompressedPartition"), 0, "CompressedPartition".Length);
-            OutputStream.WriteByte(0x00);
-            OutputStream.Write(BitConverter.GetBytes((UInt32)1), 0, 4); // Format version = 1
-            OutputStream.Write(BitConverter.GetBytes(HeaderSize), 0, 4); // Headersize
-            OutputStream.Write(BitConverter.GetBytes(TotalDecompressedStreamLength), 0, 8);
-
-            this.UnderlyingStream = new GZipStream(OutputStream, CompressionLevel.Optimal, false);
-            WritePosition = 0;
-        }
-
-        public override bool CanRead { get { return false; } }
-        public override bool CanSeek { get { return false; } }
-        public override int Read(byte[] buffer, int offset, int count) { throw new NotSupportedException(); }
-        public override long Seek(long offset, SeekOrigin origin) { throw new NotSupportedException(); }
-        public override long Position
-        {
-            get { return (long)WritePosition; }
-            set { throw new NotSupportedException(); }
-        }
-        public override bool CanTimeout { get { return UnderlyingStream.CanTimeout; } }
-        public override bool CanWrite { get { return true; } }
-        public override long Length { get { return (long)WritePosition; } }
-        public override void SetLength(long value) { throw new NotSupportedException(); }
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            WritePosition += (UInt64)count;
-            UnderlyingStream.Write(buffer, offset, count);
-        }
-        public override void Flush() { UnderlyingStream.Flush(); }
-        public override void Close() { UnderlyingStream.Close(); }
-        public new void Dispose() { UnderlyingStream.Dispose(); }
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                this.UnderlyingStream.Dispose();
-            }
-        }
-    }
-
-    internal class SeekableStream : Stream
-    {
-        private Stream UnderlyingStream;
-        private Int64 ReadPosition = 0;
-        private readonly Func<Stream> StreamInitializer;
-        private readonly Int64 UnderlyingStreamLength;
-
-        // For reading a compressed stream
-        internal SeekableStream(Func<Stream> StreamInitializer, Int64? Length = null)
-        {
-            this.StreamInitializer = StreamInitializer;
-            UnderlyingStream = StreamInitializer();
-            if (Length != null)
-            {
-                UnderlyingStreamLength = (Int64)Length;
-            }
-            else
-            {
-                try
-                {
-                    UnderlyingStreamLength = UnderlyingStream.Length;
-                }
-                catch
-                {
-                    throw new ArgumentException("Unknown stream length");
-                }
-            }
-        }
-
-        public override bool CanRead { get { return true; } }
-        public override bool CanSeek { get { return true; } }
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            int RealCount = UnderlyingStream.Read(buffer, offset, count);
-            ReadPosition += RealCount;
-            return RealCount;
-        }
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            if (UnderlyingStream.CanSeek)
-            {
-                ReadPosition = UnderlyingStream.Seek(offset, origin);
-                return ReadPosition;
-            }
-            else
-            {
-                Int64 NewPosition = 0;
-                switch (origin)
-                {
-                    case SeekOrigin.Begin:
-                        NewPosition = offset;
-                        break;
-                    case SeekOrigin.Current:
-                        NewPosition = ReadPosition + offset;
-                        break;
-                    case SeekOrigin.End:
-                        NewPosition = UnderlyingStreamLength - offset;
-                        break;
-                }
-                if ((NewPosition < 0) || (NewPosition > UnderlyingStreamLength))
-                {
-                    throw new ArgumentOutOfRangeException();
-                }
-
-                if (NewPosition < ReadPosition)
-                {
-                    UnderlyingStream.Close();
-                    UnderlyingStream = StreamInitializer();
-                    ReadPosition = 0;
-                }
-                UInt64 Remaining;
-                byte[] Buffer = new byte[16384];
-                while (ReadPosition < NewPosition)
-                {
-                    Remaining = (UInt64)(NewPosition - ReadPosition);
-                    if (Remaining > (UInt64)Buffer.Length)
-                    {
-                        Remaining = (UInt64)Buffer.Length;
-                    }
-
-                    UnderlyingStream.Read(Buffer, 0, (int)Remaining);
-                    ReadPosition += (long)Remaining;
-                }
-                return ReadPosition;
-            }
-        }
-        public override long Position
-        {
-            get
-            {
-                return ReadPosition;
-            }
-            set
-            {
-                Seek(value, SeekOrigin.Begin);
-            }
-        }
-        public override bool CanTimeout { get { return UnderlyingStream.CanTimeout; } }
-        public override bool CanWrite { get { return false; } }
-        public override long Length
-        {
-            get
-            {
-                return UnderlyingStreamLength;
-            }
-        }
-        public override void SetLength(long value) { throw new NotSupportedException(); }
-        public override void Write(byte[] buffer, int offset, int count) { throw new NotSupportedException(); }
-        public override void Flush() { throw new NotSupportedException(); }
-        public override void Close() { UnderlyingStream.Close(); }
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                this.UnderlyingStream.Dispose();
-            }
-        }
-    }
-
-    internal enum ResourceType
-    {
-        RT_CURSOR = 1,
-        RT_BITMAP = 2,
-        RT_ICON = 3,
-        RT_MENU = 4,
-        RT_DIALOG = 5,
-        RT_STRING = 6,
-        RT_FONTDIR = 7,
-        RT_FONT = 8,
-        RT_ACCELERATOR = 9,
-        RT_RCDATA = 10,
-        RT_MESSAGETABLE = 11,
-        RT_GROUP_CURSOR = RT_CURSOR + 11,
-        RT_GROUP_ICON = RT_ICON + 11,
-        RT_VERSION = 16,
-        RT_DLGINCLUDE = 17,
-        RT_PLUGPLAY = 19,
-        RT_VXD = 20,
-        RT_ANICURSOR = 21,
-        RT_ANIICON = 22,
-        RT_HTML = 23,
-        RT_MANIFEST = 24,
-        RT_DLGINIT = 240,
-        RT_TOOLBAR = 241
-    };
-
-    internal static class PE
-    {
-        internal static byte[] GetResource(byte[] PEfile, int[] Index)
-        {
-            // Explanation of PE header here:
-            // https://msdn.microsoft.com/en-us/library/ms809762.aspx?f=255&MSPPError=-2147217396
-
-            UInt32 PEPointer = ByteOperations.ReadUInt32(PEfile, 0x3C);
-            UInt16 OptionalHeaderSize = ByteOperations.ReadUInt16(PEfile, PEPointer + 0x14);
-            UInt32 SectionTablePointer = PEPointer + 0x18 + OptionalHeaderSize;
-            UInt16 SectionCount = ByteOperations.ReadUInt16(PEfile, PEPointer + 0x06);
-            UInt32? ResourceSectionEntryPointer = null;
-            for (int i = 0; i < SectionCount; i++)
-            {
-                string SectionName = ByteOperations.ReadAsciiString(PEfile, (UInt32)(SectionTablePointer + (i * 0x28)), 8);
-                int e = SectionName.IndexOf('\0');
-                if (e >= 0)
-                {
-                    SectionName = SectionName.Substring(0, e);
-                }
-
-                if (SectionName == ".rsrc")
-                {
-                    ResourceSectionEntryPointer = (UInt32)(SectionTablePointer + (i * 0x28));
-                    break;
-                }
-            }
-            if (ResourceSectionEntryPointer == null)
-            {
-                throw new WPinternalsException("Resource-section not found");
-            }
-
-            UInt32 ResourceRawSize = ByteOperations.ReadUInt32(PEfile, (UInt32)ResourceSectionEntryPointer + 0x10);
-            UInt32 ResourceRawPointer = ByteOperations.ReadUInt32(PEfile, (UInt32)ResourceSectionEntryPointer + 0x14);
-            UInt32 ResourceVirtualPointer = ByteOperations.ReadUInt32(PEfile, (UInt32)ResourceSectionEntryPointer + 0x0C);
-
-            UInt32 p = ResourceRawPointer;
-            for (int i = 0; i < Index.Length; i++)
-            {
-                UInt16 ResourceNamedEntryCount = ByteOperations.ReadUInt16(PEfile, p + 0x0c);
-                UInt16 ResourceIdEntryCount = ByteOperations.ReadUInt16(PEfile, p + 0x0e);
-                for (int j = ResourceNamedEntryCount; j < ResourceNamedEntryCount + ResourceIdEntryCount; j++)
-                {
-                    UInt32 ResourceID = ByteOperations.ReadUInt32(PEfile, (UInt32)(p + 0x10 + (j * 8)));
-                    UInt32 NextPointer = ByteOperations.ReadUInt32(PEfile, (UInt32)(p + 0x10 + (j * 8) + 4));
-                    if (ResourceID == (UInt32)Index[i])
-                    {
-                        // Check high bit
-                        if ((NextPointer & 0x80000000) == 0 != (i == (Index.Length - 1)))
-                        {
-                            throw new WPinternalsException("Bad resource path");
-                        }
-
-                        p = ResourceRawPointer + (NextPointer & 0x7fffffff);
-                        break;
-                    }
-                }
-            }
-
-            UInt32 ResourceValuePointer = ByteOperations.ReadUInt32(PEfile, p) - ResourceVirtualPointer + ResourceRawPointer;
-            UInt32 ResourceValueSize = ByteOperations.ReadUInt32(PEfile, p + 4);
-
-            byte[] ResourceValue = new byte[ResourceValueSize];
-            Array.Copy(PEfile, ResourceValuePointer, ResourceValue, 0, ResourceValueSize);
-
-            return ResourceValue;
-        }
-
-        internal static Version GetFileVersion(byte[] PEfile)
-        {
-            byte[] version = GetResource(PEfile, new int[] { (int)ResourceType.RT_VERSION, 1, 1033 });
-
-            // RT_VERSION format:
-            // https://msdn.microsoft.com/en-us/library/windows/desktop/ms647001(v=vs.85).aspx
-            // https://msdn.microsoft.com/en-us/library/windows/desktop/ms646997(v=vs.85).aspx
-            const UInt32 FixedFileInfoPointer = 0x28;
-            UInt16 Major = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x0A);
-            UInt16 Minor = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x08);
-            UInt16 Build = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x0E);
-            UInt16 Revision = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x0C);
-
-            return new Version(Major, Minor, Build, Revision);
-        }
-
-        internal static Version GetProductVersion(byte[] PEfile)
-        {
-            byte[] version = GetResource(PEfile, new int[] { (int)ResourceType.RT_VERSION, 1, 1033 });
-
-            // RT_VERSION format:
-            // https://msdn.microsoft.com/en-us/library/windows/desktop/ms647001(v=vs.85).aspx
-            // https://msdn.microsoft.com/en-us/library/windows/desktop/ms646997(v=vs.85).aspx
-            const UInt32 FixedFileInfoPointer = 0x28;
-            UInt16 Major = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x12);
-            UInt16 Minor = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x10);
-            UInt16 Build = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x16);
-            UInt16 Revision = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x14);
-
-            return new Version(Major, Minor, Build, Revision);
-        }
-    }
-
-#if PREVIEW
-    internal static class Uploader
-    {
-        internal static List<Task> Uploads = new List<Task>();
-
-        internal static void Upload(string FileName, string Text)
-        {
-            byte[] byteArray = Encoding.UTF8.GetBytes(Text);
-            MemoryStream FileStream = new MemoryStream(byteArray);
-            Upload(FileName, FileStream);
-        }
-
-        internal static void Upload(string FileName, byte[] Data)
-        {
-            Upload(FileName, new MemoryStream(Data));
-        }
-
-        internal static void Upload(string FileName, Stream FileStream)
-        {
-            Upload(new Uri(@"https://www.wpinternals.net/upload.php", UriKind.Absolute), "uploadedfile", FileName, FileStream);
-        }
-
-        private static void Upload(Uri Address, string InputName, string FileName, Stream FileStream)
-        {
-            System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
-            System.Net.Http.HttpClient httpClient = new System.Net.Http.HttpClient();
-            System.Net.Http.MultipartFormDataContent form = new System.Net.Http.MultipartFormDataContent();
-            System.Net.Http.StreamContent Content = new System.Net.Http.StreamContent(FileStream);
-            Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("text/plain");
-            form.Add(Content, InputName, FileName);
-            Task<System.Net.Http.HttpResponseMessage> UploadTask = httpClient.PostAsync(Address, form);
-
-            Uploads.Add(
-                UploadTask.ContinueWith((t) =>
-                {
-                    Uploads.Remove(t);
-                    httpClient.Dispose();
-                })
-            );
-        }
-
-        internal static void WaitForUploads()
-        {
-            Task.WaitAll(Uploads.ToArray());
-        }
-    }
-#endif
-
-    internal class AsyncAutoResetEvent
-    {
-        private readonly LinkedList<TaskCompletionSource<bool>> waiters =
-            new();
-
-        private bool isSignaled;
-
-        public AsyncAutoResetEvent(bool signaled)
-        {
-            this.isSignaled = signaled;
-        }
-
-        public Task<bool> WaitAsync(TimeSpan timeout)
-        {
-            return this.WaitAsync(timeout, CancellationToken.None);
-        }
-
-        public async Task<bool> WaitAsync(TimeSpan timeout, CancellationToken cancellationToken)
-        {
-            TaskCompletionSource<bool> tcs;
-
-            lock (this.waiters)
-            {
-                if (this.isSignaled)
-                {
-                    this.isSignaled = false;
-                    return true;
-                }
-                else if (timeout == TimeSpan.Zero)
-                {
-                    return this.isSignaled;
-                }
-                else
-                {
-                    tcs = new TaskCompletionSource<bool>();
-                    this.waiters.AddLast(tcs);
-                }
-            }
-
-            Task winner = await Task.WhenAny(tcs.Task, Task.Delay(timeout, cancellationToken));
-            if (winner == tcs.Task)
-            {
-                // The task was signaled.
-                return true;
-            }
-            else
-            {
-                // We timed-out; remove our reference to the task.
-                // This is an O(n) operation since waiters is a LinkedList<T>.
-                lock (this.waiters)
-                {
-                    bool removed = this.waiters.Remove(tcs);
-                    System.Diagnostics.Debug.Assert(removed);
-                    return false;
-                }
-            }
-        }
-
-        public void Set()
-        {
-            TaskCompletionSource<bool> toRelease = null;
-
-            lock (this.waiters)
-            {
-                if (this.waiters.Count > 0)
-                {
-                    // Signal the first task in the waiters list.
-                    toRelease = this.waiters.First.Value;
-                    this.waiters.RemoveFirst();
-                }
-                else if (!this.isSignaled)
-                {
-                    // No tasks are pending
-                    this.isSignaled = true;
-                }
-            }
-
-            toRelease?.SetResult(true);
-        }
-    }
-
-    // This class was written by: Rolf Wessels
-    // https://github.com/rolfwessels/lazycowprojects/tree/master/Wpf
-
-    /// <summary>
-    /// Static class used to attach to wpf control
-    /// </summary>
-    public static class GridViewColumnResize
-    {
-        #region DependencyProperties
-
-        public static readonly DependencyProperty WidthProperty =
-            DependencyProperty.RegisterAttached("Width", typeof(string), typeof(GridViewColumnResize),
-                                                new PropertyMetadata(OnSetWidthCallback));
-
-        public static readonly DependencyProperty GridViewColumnResizeBehaviorProperty =
-            DependencyProperty.RegisterAttached("GridViewColumnResizeBehavior",
-                                                typeof(GridViewColumnResizeBehavior), typeof(GridViewColumnResize),
-                                                null);
-
-        public static readonly DependencyProperty EnabledProperty =
-            DependencyProperty.RegisterAttached("Enabled", typeof(bool), typeof(GridViewColumnResize),
-                                                new PropertyMetadata(OnSetEnabledCallback));
-
-        public static readonly DependencyProperty ListViewResizeBehaviorProperty =
-            DependencyProperty.RegisterAttached("ListViewResizeBehaviorProperty",
-                                                typeof(ListViewResizeBehavior), typeof(GridViewColumnResize), null);
-
-        #endregion
-
-        public static string GetWidth(DependencyObject obj)
-        {
-            return (string)obj.GetValue(WidthProperty);
-        }
-
-        public static void SetWidth(DependencyObject obj, string value)
-        {
-            obj.SetValue(WidthProperty, value);
-        }
-
-        public static bool GetEnabled(DependencyObject obj)
-        {
-            return (bool)obj.GetValue(EnabledProperty);
-        }
-
-        public static void SetEnabled(DependencyObject obj, bool value)
-        {
-            obj.SetValue(EnabledProperty, value);
-        }
-
-        #region CallBack
-
-        private static void OnSetWidthCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
-        {
-            if (dependencyObject is GridViewColumn element)
-            {
-                GridViewColumnResizeBehavior behavior = GetOrCreateBehavior(element);
-                behavior.Width = e.NewValue as string;
-            }
-            else
-            {
-                Console.Error.WriteLine("Error: Expected type GridViewColumn but found " +
-                                        dependencyObject.GetType().Name);
-            }
-        }
-
-        private static void OnSetEnabledCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
-        {
-            if (dependencyObject is ListView element)
-            {
-                ListViewResizeBehavior behavior = GetOrCreateBehavior(element);
-                behavior.Enabled = (bool)e.NewValue;
-            }
-            else
-            {
-                Console.Error.WriteLine("Error: Expected type ListView but found " + dependencyObject.GetType().Name);
-            }
-        }
-
-        private static ListViewResizeBehavior GetOrCreateBehavior(ListView element)
-        {
-            if (element.GetValue(GridViewColumnResizeBehaviorProperty) is not ListViewResizeBehavior behavior)
-            {
-                behavior = new ListViewResizeBehavior(element);
-                element.SetValue(ListViewResizeBehaviorProperty, behavior);
-            }
-
-            return behavior;
-        }
-
-        private static GridViewColumnResizeBehavior GetOrCreateBehavior(GridViewColumn element)
-        {
-            if (element.GetValue(GridViewColumnResizeBehaviorProperty) is not GridViewColumnResizeBehavior behavior)
-            {
-                behavior = new GridViewColumnResizeBehavior(element);
-                element.SetValue(GridViewColumnResizeBehaviorProperty, behavior);
-            }
-
-            return behavior;
-        }
-
-        #endregion
-
-        #region Nested type: GridViewColumnResizeBehavior
-
-        // This class was written by: Rolf Wessels
-        // https://github.com/rolfwessels/lazycowprojects/tree/master/Wpf
-
-        /// <summary>
-        /// GridViewColumn class that gets attached to the GridViewColumn control
-        /// </summary>
-        public class GridViewColumnResizeBehavior
-        {
-            private readonly GridViewColumn _element;
-
-            public GridViewColumnResizeBehavior(GridViewColumn element)
-            {
-                _element = element;
-            }
-
-            public string Width { get; set; }
-
-            public bool IsStatic
-            {
-                get { return StaticWidth >= 0; }
-            }
-
-            public double StaticWidth
-            {
-                get
-                {
-                    return double.TryParse(Width, out double result) ? result : -1;
-                }
-            }
-
-            public double Percentage
-            {
-                get
-                {
-                    if (!IsStatic)
-                    {
-                        return Mulitplier * 100;
-                    }
-                    return 0;
-                }
-            }
-
-            public double Mulitplier
-            {
-                get
-                {
-                    if (Width == "*" || Width == "1*")
-                    {
-                        return 1;
-                    }
-
-                    if (Width.EndsWith("*") && double.TryParse(Width[0..^1], out double perc))
-                    {
-                        return perc;
-                    }
-                    return 1;
-                }
-            }
-
-            public void SetWidth(double allowedSpace, double totalPercentage)
-            {
-                if (IsStatic)
-                {
-                    _element.Width = StaticWidth;
-                }
-                else
-                {
-                    _element.Width = (double)Math.Max(allowedSpace * (Percentage / totalPercentage), 0);
-                }
-            }
-        }
-
-        #endregion
-
-        #region Nested type: ListViewResizeBehavior
-
-        // This class was written by: Rolf Wessels
-        // https://github.com/rolfwessels/lazycowprojects/tree/master/Wpf
-
-        /// <summary>
-        /// ListViewResizeBehavior class that gets attached to the ListView control
-        /// </summary>
-        public class ListViewResizeBehavior
-        {
-            private const int Margin = 25;
-            private const long RefreshTime = Timeout.Infinite;
-            private const long Delay = 500;
-
-            private readonly ListView _element;
-            private readonly Timer _timer;
-
-            public ListViewResizeBehavior(ListView element)
-            {
-                _element = element ?? throw new ArgumentNullException(nameof(element));
-                element.Loaded += OnLoaded;
-
-                // Action for resizing and re-enable the size lookup
-                // This stops the columns from constantly resizing to improve performance
-                Action resizeAndEnableSize = () =>
-                {
-                    Resize();
-                    _element.SizeChanged += OnSizeChanged;
-                };
-                _timer = new Timer(x => Application.Current.Dispatcher.BeginInvoke(resizeAndEnableSize), null, Delay,
-                                   RefreshTime);
-            }
-
-            public bool Enabled { get; set; }
-
-            private void OnLoaded(object sender, RoutedEventArgs e)
-            {
-                _element.SizeChanged += OnSizeChanged;
-            }
-
-            private void OnSizeChanged(object sender, SizeChangedEventArgs e)
-            {
-                if (e.WidthChanged)
-                {
-                    _element.SizeChanged -= OnSizeChanged;
-                    _timer.Change(Delay, RefreshTime);
-                }
-            }
-
-            private void Resize()
-            {
-                if (Enabled)
-                {
-                    double totalWidth = _element.ActualWidth;
-                    if (_element.View is GridView gv)
-                    {
-                        double allowedSpace = totalWidth - GetAllocatedSpace(gv);
-                        allowedSpace -= Margin;
-                        double totalPercentage = GridViewColumnResizeBehaviors(gv).Sum(x => x.Percentage);
-                        foreach (GridViewColumnResizeBehavior behavior in GridViewColumnResizeBehaviors(gv))
-                        {
-                            behavior.SetWidth(allowedSpace, totalPercentage);
-                        }
-                    }
-                }
-            }
-
-            private static IEnumerable<GridViewColumnResizeBehavior> GridViewColumnResizeBehaviors(GridView gv)
-            {
-                foreach (GridViewColumn t in gv.Columns)
-                {
-                    if (t.GetValue(GridViewColumnResizeBehaviorProperty) is GridViewColumnResizeBehavior gridViewColumnResizeBehavior)
-                    {
-                        yield return gridViewColumnResizeBehavior;
-                    }
-                }
-            }
-
-            private static double GetAllocatedSpace(GridView gv)
-            {
-                double totalWidth = 0;
-                foreach (GridViewColumn t in gv.Columns)
-                {
-                    if (t.GetValue(GridViewColumnResizeBehaviorProperty) is GridViewColumnResizeBehavior gridViewColumnResizeBehavior)
-                    {
-                        if (gridViewColumnResizeBehavior.IsStatic)
-                        {
-                            totalWidth += gridViewColumnResizeBehavior.StaticWidth;
-                        }
-                    }
-                    else
-                    {
-                        totalWidth += t.ActualWidth;
-                    }
-                }
-                return totalWidth;
-            }
-        }
-
-        #endregion
-    }
-
-    internal static class ExtensionMethods
-    {
-        // This method was written by: Lawrence Johnston
-        // https://stackoverflow.com/a/22078975
-        public static async Task<TResult> TimeoutAfter<TResult>(this Task<TResult> task, TimeSpan timeout)
-        {
-            using var timeoutCancellationTokenSource = new CancellationTokenSource();
-            var completedTask = await Task.WhenAny(task, Task.Delay(timeout, timeoutCancellationTokenSource.Token));
-            if (completedTask == task)
-            {
-                timeoutCancellationTokenSource.Cancel();
-                return await task;  // Very important in order to propagate exceptions
-            }
-            else
-            {
-                throw new TimeoutException("The operation has timed out.");
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+//
+// Some of the classes and functions in this file were found online.
+// Where possible the original authors are referenced.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Imaging;
+using System.Windows.Threading;
+
+namespace WPinternals
+{
+    internal delegate void SetWorkingStatus(string Message, string SubMessage = null, ulong? MaxProgressValue = null, bool ShowAnimation = true, WPinternalsStatus Status = WPinternalsStatus.Undefined);
+    internal delegate void UpdateWorkingStatus(string Message, string SubMessage = null, ulong? CurrentProgressValue = null, WPinternalsStatus Status = WPinternalsStatus.Undefined);
+    internal delegate void ExitSuccess(string Message, string SubMessage = null);
+    internal delegate void ExitFailure(string Message, string SubMessage = null);
+
+    internal enum WPinternalsStatus
+    {
+        Undefined,
+        Scanning,
+        Flashing,
+        Patching,
+        WaitingForManualReset,
+        SwitchingMode,
+        Initializing
+    };
+
+    public class BooleanConverter : DependencyObject, IValueConverter
+    {
+        public static readonly DependencyProperty OnTrueProperty =
+            DependencyProperty.Register("OnTrue", typeof(object), typeof(BooleanConverter),
+                new PropertyMetadata(default(object)));
+
+        public static readonly DependencyProperty OnFalseProperty =
+            DependencyProperty.Register("OnFalse", typeof(object), typeof(BooleanConverter),
+                new PropertyMetadata(default(object)));
+
+        public static readonly DependencyProperty OnNullProperty =
+            DependencyProperty.Register("OnNull", typeof(object), typeof(BooleanConverter),
+                new PropertyMetadata(default(object)));
+
+        public object OnTrue
+        {
+            get { return GetValue(OnTrueProperty); }
+            set { SetValue(OnTrueProperty, value); }
+        }
+
+        public object OnFalse
+        {
+            get { return GetValue(OnFalseProperty); }
+            set { SetValue(OnFalseProperty, value); }
+        }
+
+        public object OnNull
+        {
+            get { return GetValue(OnNullProperty); }
+            set { SetValue(OnNullProperty, value); }
+        }
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value == null
+                ? OnNull ?? Default(targetType)
+                : (string.Equals(value.ToString(), false.ToString(), StringComparison.CurrentCultureIgnoreCase)
+                    ? OnFalse
+                    : OnTrue);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == OnNull)
+            {
+                return Default(targetType);
+            }
+
+            if (value == OnFalse)
+            {
+                return false;
+            }
+
+            if (value == OnTrue)
+            {
+                return true;
+            }
+
+            if (value == null)
+            {
+                return null;
+            }
+
+            if (OnNull != null &&
+                string.Equals(value.ToString(), OnNull.ToString(), StringComparison.CurrentCultureIgnoreCase))
+            {
+                return Default(targetType);
+            }
+
+            if (OnFalse != null &&
+                string.Equals(value.ToString(), OnFalse.ToString(), StringComparison.CurrentCultureIgnoreCase))
+            {
+                return false;
+            }
+
+            if (OnTrue != null &&
+                string.Equals(value.ToString(), OnTrue.ToString(), StringComparison.CurrentCultureIgnoreCase))
+            {
+                return true;
+            }
+
+            return null;
+        }
+
+        public static object Default(Type type)
+        {
+            return type.IsValueType ? Activator.CreateInstance(type) : null;
+        }
+    }
+
+    public class HexConverter : DependencyObject, IValueConverter
+    {
+        public static readonly DependencyProperty SeparatorProperty =
+            DependencyProperty.Register("OnTrue", typeof(object), typeof(HexConverter),
+                new PropertyMetadata(" "));
+
+        public object Separator
+        {
+            get { return GetValue(SeparatorProperty); }
+            set { SetValue(SeparatorProperty, value); }
+        }
+
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is byte[] bytes)
+            {
+                StringBuilder s = new(1000);
+                for (int i = bytes.GetLowerBound(0); i <= bytes.GetUpperBound(0); i++)
+                {
+                    if (i != bytes.GetLowerBound(0))
+                    {
+                        s.Append(Separator);
+                    }
+
+                    s.Append(bytes[i].ToString("X2"));
+                }
+                return s.ToString();
+            }
+            else
+            {
+                return "";
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        public static object Default(Type type)
+        {
+            return type.IsValueType ? Activator.CreateInstance(type) : null;
+        }
+    }
+
+    public class ObjectToVisibilityConverter : DependencyObject, IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return "Collapsed";
+            }
+            else
+            {
+                return "Visible";
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        public static object Default(Type type)
+        {
+            return type.IsValueType ? Activator.CreateInstance(type) : null;
+        }
+    }
+
+    public class InverseObjectToVisibilityConverter : DependencyObject, IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return "Visible";
+            }
+            else
+            {
+                return "Collapsed";
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        public static object Default(Type type)
+        {
+            return type.IsValueType ? Activator.CreateInstance(type) : null;
+        }
+    }
+
+    internal class CollapsibleRun : Run
+    {
+        private string CollapsibleText;
+
+        protected override void OnInitialized(EventArgs e)
+        {
+            base.OnInitialized(e);
+
+            CollapsibleText = Text;
+        }
+
+        public Boolean IsVisible
+        {
+            get
+            {
+                return (Boolean)this.GetValue(IsVisibleProperty);
+            }
+            set
+            {
+                this.SetValue(IsVisibleProperty, value);
+            }
+        }
+        public static readonly DependencyProperty IsVisibleProperty = DependencyProperty.Register(
+          "IsVisible", typeof(Boolean), typeof(CollapsibleRun), new PropertyMetadata(true, IsVisibleChanged));
+        public static void IsVisibleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((CollapsibleRun)d).Text = (bool)e.NewValue ? ((CollapsibleRun)d).CollapsibleText : String.Empty;
+        }
+    }
+
+    internal class CollapsibleSection : Section
+    {
+        public CollapsibleSection()
+        {
+            CollapsibleBlocks = new List<Block>();
+        }
+
+        protected override void OnInitialized(EventArgs e)
+        {
+            base.OnInitialized(e);
+
+            foreach (Block Block in Blocks)
+            {
+                CollapsibleBlocks.Add(Block);
+            }
+
+            Blocks.Clear();
+        }
+
+        public List<Block> CollapsibleBlocks { get; }
+
+        public Boolean IsCollapsed
+        {
+            get
+            {
+                return (Boolean)this.GetValue(IsCollapsedProperty);
+            }
+            set
+            {
+                this.SetValue(IsCollapsedProperty, value);
+
+                Blocks.Clear();
+
+                if (IsInitialized && !value)
+                {
+                    foreach (Block Block in CollapsibleBlocks)
+                    {
+                        Blocks.Add(Block);
+                    }
+                }
+            }
+        }
+        public static readonly DependencyProperty IsCollapsedProperty = DependencyProperty.Register(
+          "IsCollapsed", typeof(Boolean), typeof(CollapsibleSection), new PropertyMetadata(false));
+    }
+
+    // Overloaded Paragraph class to remove empty Run-elements, caused by auto-formatting new-lines in the XAML
+    // Use local:Paragraph in a FlowDocument
+    // This correction only works at run-time
+    public class Paragraph : System.Windows.Documents.Paragraph
+    {
+        protected override void OnInitialized(EventArgs e)
+        {
+            base.OnInitialized(e);
+            int inlinesCount = this.Inlines.Count;
+            for (int i = 0; i < inlinesCount; i++)
+            {
+                Inline inline = this.Inlines.ElementAt(i);
+                if (inline is Run run)
+                {
+                    if (run.Text == Convert.ToChar(32).ToString()) //ACSII 32 is the white space
+                    {
+                        run.Text = string.Empty;
+                    }
+                }
+            }
+        }
+    }
+
+    internal class ArrivalEventArgs : EventArgs
+    {
+        public PhoneInterfaces NewInterface;
+        public IDisposable NewModel;
+
+        public ArrivalEventArgs(PhoneInterfaces NewInterface, IDisposable NewModel)
+            : base()
+        {
+            this.NewInterface = NewInterface;
+            this.NewModel = NewModel;
+        }
+    }
+
+    internal static class BigEndian
+    {
+        public static byte[] GetBytes(object Value)
+        {
+            byte[] Bytes;
+            if (Value is short)
+            {
+                Bytes = BitConverter.GetBytes((short)Value);
+            }
+            else if (Value is ushort)
+            {
+                Bytes = BitConverter.GetBytes((ushort)Value);
+            }
+            else if (Value is int)
+            {
+                Bytes = BitConverter.GetBytes((int)Value);
+            }
+            else
+            {
+                Bytes = Value is uint ? BitConverter.GetBytes((uint)Value) : throw new NotSupportedException();
+            }
+
+            byte[] Result = new byte[Bytes.Length];
+            for (int i = 0; i < Bytes.Length; i++)
+            {
+                Result[i] = Bytes[Bytes.Length - 1 - i];
+            }
+
+            return Result;
+        }
+
+        public static byte[] GetBytes(object Value, int Width)
+        {
+            byte[] Result;
+            byte[] BigEndianBytes = GetBytes(Value);
+            if (BigEndianBytes.Length == Width)
+            {
+                return BigEndianBytes;
+            }
+            else if (BigEndianBytes.Length > Width)
+            {
+                Result = new byte[Width];
+                Buffer.BlockCopy(BigEndianBytes, BigEndianBytes.Length - Width, Result, 0, Width);
+                return Result;
+            }
+            else
+            {
+                Result = new byte[Width];
+                Buffer.BlockCopy(BigEndianBytes, 0, Result, Width - BigEndianBytes.Length, BigEndianBytes.Length);
+                return Result;
+            }
+        }
+
+        public static UInt16 ToUInt16(byte[] Buffer, int Offset)
+        {
+            byte[] Bytes = new byte[2];
+            for (int i = 0; i < 2; i++)
+            {
+                Bytes[i] = Buffer[Offset + 1 - i];
+            }
+
+            return BitConverter.ToUInt16(Bytes, 0);
+        }
+
+        public static Int16 ToInt16(byte[] Buffer, int Offset)
+        {
+            byte[] Bytes = new byte[2];
+            for (int i = 0; i < 2; i++)
+            {
+                Bytes[i] = Buffer[Offset + 1 - i];
+            }
+
+            return BitConverter.ToInt16(Bytes, 0);
+        }
+
+        public static UInt32 ToUInt32(byte[] Buffer, int Offset)
+        {
+            byte[] Bytes = new byte[4];
+            for (int i = 0; i < 4; i++)
+            {
+                Bytes[i] = Buffer[Offset + 3 - i];
+            }
+
+            return BitConverter.ToUInt32(Bytes, 0);
+        }
+
+        public static Int32 ToInt32(byte[] Buffer, int Offset)
+        {
+            byte[] Bytes = new byte[4];
+            for (int i = 0; i < 4; i++)
+            {
+                Bytes[i] = Buffer[Offset + 3 - i];
+            }
+
+            return BitConverter.ToInt32(Bytes, 0);
+        }
+    }
+
+    // This class was found online.
+    // Original author is probably: mdm20
+    // https://stackoverflow.com/questions/5566330/get-gif-to-play-in-wpf-with-gifimage-class/5568703#5568703
+    internal class GifImage : Image
+    {
+        private bool _isInitialized;
+        private GifBitmapDecoder _gifDecoder;
+        private Int32Animation _animation;
+
+        public int FrameIndex
+        {
+            get { return (int)GetValue(FrameIndexProperty); }
+            set { SetValue(FrameIndexProperty, value); }
+        }
+
+        private void Initialize()
+        {
+            _gifDecoder = new GifBitmapDecoder(new Uri("pack://application:,,," + this.GifSource), BitmapCreateOptions.PreservePixelFormat, BitmapCacheOption.Default);
+            _animation = new Int32Animation(0, _gifDecoder.Frames.Count - 1, new Duration(new TimeSpan(0, 0, 0, _gifDecoder.Frames.Count / 10, (int)(((_gifDecoder.Frames.Count / 10.0) - (_gifDecoder.Frames.Count / 10)) * 1000))))
+            {
+                RepeatBehavior = RepeatBehavior.Forever
+            };
+            this.Source = _gifDecoder.Frames[0];
+
+            _isInitialized = true;
+        }
+
+        static GifImage()
+        {
+            VisibilityProperty.OverrideMetadata(typeof(GifImage),
+                new FrameworkPropertyMetadata(VisibilityPropertyChanged));
+        }
+
+        private static void VisibilityPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+        {
+            if ((Visibility)e.NewValue == Visibility.Visible)
+            {
+                ((GifImage)sender).StartAnimation();
+            }
+            else
+            {
+                ((GifImage)sender).StopAnimation();
+            }
+        }
+
+        public static readonly DependencyProperty FrameIndexProperty =
+            DependencyProperty.Register("FrameIndex", typeof(int), typeof(GifImage), new UIPropertyMetadata(0, new PropertyChangedCallback(ChangingFrameIndex)));
+
+        private static void ChangingFrameIndex(DependencyObject obj, DependencyPropertyChangedEventArgs ev)
+        {
+            var gifImage = obj as GifImage;
+            gifImage.Source = gifImage._gifDecoder.Frames[(int)ev.NewValue];
+        }
+
+        public bool AutoStart
+        {
+            get { return (bool)GetValue(AutoStartProperty); }
+            set { SetValue(AutoStartProperty, value); }
+        }
+
+        public static readonly DependencyProperty AutoStartProperty =
+            DependencyProperty.Register("AutoStart", typeof(bool), typeof(GifImage), new UIPropertyMetadata(false, AutoStartPropertyChanged));
+
+        private static void AutoStartPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+        {
+            if ((bool)e.NewValue)
+            {
+                (sender as GifImage)?.StartAnimation();
+            }
+        }
+
+        public string GifSource
+        {
+            get { return (string)GetValue(GifSourceProperty); }
+            set { SetValue(GifSourceProperty, value); }
+        }
+
+        public static readonly DependencyProperty GifSourceProperty =
+            DependencyProperty.Register("GifSource", typeof(string), typeof(GifImage), new UIPropertyMetadata(string.Empty, GifSourcePropertyChanged));
+
+        private static void GifSourcePropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+        {
+            (sender as GifImage)?.Initialize();
+        }
+
+        public void StartAnimation()
+        {
+            if (!_isInitialized)
+            {
+                this.Initialize();
+            }
+
+            BeginAnimation(FrameIndexProperty, _animation);
+        }
+
+        public void StopAnimation()
+        {
+            BeginAnimation(FrameIndexProperty, null);
+        }
+    }
+
+    internal enum LogType
+    {
+        FileOnly,
+        FileAndConsole,
+        ConsoleOnly
+    };
+
+    internal static class LogFile
+    {
+        private static readonly StreamWriter w = null;
+        private static readonly object lockobject = new();
+#if PREVIEW
+        private static string LogAction = null;
+        private static StringBuilder LogBuilder;
+#endif
+
+        static LogFile()
+        {
+            try
+            {
+                if (!Directory.Exists(Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals")))
+                {
+                    Directory.CreateDirectory(Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals"));
+                }
+
+                w = File.AppendText(Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\WPInternals.log"));
+            }
+            catch { }
+        }
+
+        public static void Log(string logMessage, LogType Type = LogType.FileOnly)
+        {
+            if (w == null)
+            {
+                return;
+            }
+
+            lock (lockobject)
+            {
+                if ((Type == LogType.FileOnly) || (Type == LogType.FileAndConsole))
+                {
+                    DateTime Now = DateTime.Now;
+                    string Text = Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + ": " + logMessage;
+                    w.WriteLine(Text);
+                    w.Flush();
+
+#if PREVIEW
+                    if (LogAction != null)
+                        LogBuilder.AppendLine(Text);
+#endif
+                }
+
+                if (CommandLine.IsConsoleVisible && ((Type == LogType.ConsoleOnly) || (Type == LogType.FileAndConsole)))
+                {
+                    Console.WriteLine(logMessage);
+                }
+            }
+        }
+
+        public static void LogException(Exception Ex, LogType Type = LogType.FileAndConsole, string AdditionalInfo = null)
+        {
+            string Indent = "";
+            Exception CurrentEx = Ex;
+            while (CurrentEx != null)
+            {
+                Log(Indent + "Error: " + RemoveBadChars(CurrentEx.Message).Replace("of type '.' ", "") + (AdditionalInfo == null ? "" : " - " + AdditionalInfo), Type);
+                AdditionalInfo = null;
+                if (CurrentEx is WPinternalsException)
+                {
+                    Log(Indent + ((WPinternalsException)CurrentEx).SubMessage, Type);
+                }
+#if DEBUG
+                if (CurrentEx.StackTrace != null)
+                {
+                    Log(Indent + CurrentEx.StackTrace, LogType.FileOnly);
+                }
+#endif
+                Indent += "    ";
+                CurrentEx = CurrentEx.InnerException;
+            }
+        }
+
+        private static string RemoveBadChars(string Text)
+        {
+            return System.Text.RegularExpressions.Regex.Replace(Text, @"[^\u0020-\u007E]+", string.Empty);
+        }
+
+        public static void DumpLog(StreamReader r)
+        {
+            string line;
+            while ((line = r.ReadLine()) != null)
+            {
+                Console.WriteLine(line);
+            }
+        }
+
+        public static void LogApplicationVersion()
+        {
+            Log("Windows Phone Internals version " +
+                Assembly.GetExecutingAssembly().GetName().Version.Major.ToString() + "." +
+                Assembly.GetExecutingAssembly().GetName().Version.Minor.ToString() + "." +
+                Assembly.GetExecutingAssembly().GetName().Version.Build.ToString() + "." +
+                Assembly.GetExecutingAssembly().GetName().Version.Revision.ToString(), LogType.FileAndConsole);
+            Log("Copyright Heathcliff74", LogType.FileAndConsole);
+        }
+
+        internal static void BeginAction(string Action)
+        {
+#if PREVIEW
+            if (LogAction == null)
+            {
+                LogAction = Action;
+                LogBuilder = new StringBuilder();
+                LogBuilder.AppendLine("Windows Phone Internals version " +
+                Assembly.GetExecutingAssembly().GetName().Version.Major.ToString() + "." +
+                Assembly.GetExecutingAssembly().GetName().Version.Minor.ToString() + "." +
+                Assembly.GetExecutingAssembly().GetName().Version.Build.ToString() + "." +
+                Assembly.GetExecutingAssembly().GetName().Version.Revision.ToString());
+                LogBuilder.AppendLine("Copyright Heathcliff74");
+                LogBuilder.AppendLine("Action: " + Action);
+                if (App.Config.RegistrationName != null)
+                    LogBuilder.AppendLine("Name: " + App.Config.RegistrationName);
+                if (App.Config.RegistrationEmail != null)
+                    LogBuilder.AppendLine("Mail: " + App.Config.RegistrationEmail);
+                if (App.Config.RegistrationSkypeID != null)
+                    LogBuilder.AppendLine("Skype: " + App.Config.RegistrationSkypeID);
+                if (App.Config.RegistrationTelegramID != null)
+                    LogBuilder.AppendLine("Telegram: " + App.Config.RegistrationTelegramID);
+                if (Environment.MachineName != null)
+                    LogBuilder.AppendLine("Machine: " + Environment.MachineName);
+            }
+#endif
+        }
+
+        internal static void EndAction()
+        {
+            EndAction(null);
+        }
+
+        internal static void EndAction(string Action)
+        {
+#if PREVIEW
+            if ((LogAction != null) && ((Action == null) || (LogAction == Action)))
+            {
+                Action = LogAction;
+                LogAction = null;
+                string FileName = "";
+                if (App.Config.RegistrationName != null)
+                    FileName += App.Config.RegistrationName + " - ";
+                FileName += DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss.fff", CultureInfo.InvariantCulture) + " - " + Action + " - " +
+                    Assembly.GetExecutingAssembly().GetName().Version.Major.ToString() + "." + 
+                    Assembly.GetExecutingAssembly().GetName().Version.Minor.ToString() + "." +
+                    Assembly.GetExecutingAssembly().GetName().Version.Build.ToString() + "." +
+                    Assembly.GetExecutingAssembly().GetName().Version.Revision.ToString() + ".log";
+
+                // Normalize filename
+                try
+                {
+                    FileName = System.Text.Encoding.ASCII.GetString(System.Text.Encoding.GetEncoding("ISO-8859-8").GetBytes(FileName));
+                }
+                catch { }
+                FileName = FileName.Replace("?", "");
+
+                if (Action.ToLower() == "registration")
+                    Uploader.Upload(FileName, LogBuilder.ToString());
+                else
+                {
+                    try
+                    {
+                        Uploader.Upload(FileName, LogBuilder.ToString());
+                    }
+                    catch { }
+                }
+            }
+#endif
+        }
+    }
+
+    public static class Converter
+    {
+        public static string ConvertHexToString(byte[] Bytes, string Separator)
+        {
+            StringBuilder s = new(1000);
+            for (int i = Bytes.GetLowerBound(0); i <= Bytes.GetUpperBound(0); i++)
+            {
+                if (i != Bytes.GetLowerBound(0))
+                {
+                    s.Append(Separator);
+                }
+
+                s.Append(Bytes[i].ToString("X2"));
+            }
+            return s.ToString();
+        }
+
+        public static byte[] ConvertStringToHex(string HexString)
+        {
+            if (HexString.Length % 2 == 1)
+            {
+                throw new Exception("The binary key cannot have an odd number of digits");
+            }
+
+            byte[] arr = new byte[HexString.Length >> 1];
+
+            for (int i = 0; i < (HexString.Length >> 1); ++i)
+            {
+                arr[i] = (byte)((GetHexVal(HexString[i << 1]) << 4) + GetHexVal(HexString[(i << 1) + 1]));
+            }
+
+            return arr;
+        }
+
+        public static int GetHexVal(char hex)
+        {
+            int val = hex;
+            //For uppercase A-F letters:
+            //return val - (val < 58 ? 48 : 55);
+            //For lowercase a-f letters:
+            //return val - (val < 58 ? 48 : 87);
+            //Or the two combined, but a bit slower:
+            return val - (val < 58 ? 48 : (val < 97 ? 55 : 87));
+        }
+    }
+
+    // This class was found online.
+    // Original author is probably: John Melville
+    // https://social.msdn.microsoft.com/Forums/en-US/163ef755-ff7b-4ea5-b226-bbe8ef5f4796/is-there-a-pattern-for-calling-an-async-method-synchronously?forum=async
+    public static class AsyncHelpers
+    {
+        /// <summary>
+        /// Execute's an async Task<T> method which has a void return value synchronously
+        /// </summary>
+        /// <param name="task">Task<T> method to execute</param>
+        public static void RunSync(Func<Task> task)
+        {
+            var oldContext = SynchronizationContext.Current;
+            var synch = new ExclusiveSynchronizationContext();
+            SynchronizationContext.SetSynchronizationContext(synch);
+            synch.Post(async _ =>
+            {
+                try
+                {
+                    await task();
+                }
+                catch (Exception e)
+                {
+                    synch.InnerException = e;
+                    throw;
+                }
+                finally
+                {
+                    synch.EndMessageLoop();
+                }
+            }, null);
+            synch.BeginMessageLoop();
+
+            SynchronizationContext.SetSynchronizationContext(oldContext);
+        }
+
+        /// <summary>
+        /// Execute's an async Task<T> method which has a T return type synchronously
+        /// </summary>
+        /// <typeparam name="T">Return Type</typeparam>
+        /// <param name="task">Task<T> method to execute</param>
+        /// <returns></returns>
+        public static T RunSync<T>(Func<Task<T>> task)
+        {
+            var oldContext = SynchronizationContext.Current;
+            var synch = new ExclusiveSynchronizationContext();
+            SynchronizationContext.SetSynchronizationContext(synch);
+            T ret = default;
+            synch.Post(async _ =>
+            {
+                try
+                {
+                    ret = await task();
+                }
+                catch (Exception e)
+                {
+                    synch.InnerException = e;
+                    throw;
+                }
+                finally
+                {
+                    synch.EndMessageLoop();
+                }
+            }, null);
+            synch.BeginMessageLoop();
+            SynchronizationContext.SetSynchronizationContext(oldContext);
+            return ret;
+        }
+
+        private class ExclusiveSynchronizationContext : SynchronizationContext
+        {
+            private bool done;
+            public Exception InnerException { get; set; }
+            private readonly AutoResetEvent workItemsWaiting = new(false);
+            private readonly Queue<Tuple<SendOrPostCallback, object>> items =
+                new();
+
+            public override void Send(SendOrPostCallback d, object state)
+            {
+                throw new NotSupportedException("We cannot send to our same thread");
+            }
+
+            public override void Post(SendOrPostCallback d, object state)
+            {
+                lock (items)
+                {
+                    items.Enqueue(Tuple.Create(d, state));
+                }
+                workItemsWaiting.Set();
+            }
+
+            public void EndMessageLoop()
+            {
+                Post(_ => done = true, null);
+            }
+
+            public void BeginMessageLoop()
+            {
+                while (!done)
+                {
+                    Tuple<SendOrPostCallback, object> task = null;
+                    lock (items)
+                    {
+                        if (items.Count > 0)
+                        {
+                            task = items.Dequeue();
+                        }
+                    }
+                    if (task != null)
+                    {
+                        task.Item1(task.Item2);
+                        if (InnerException != null) // the method threw an exeption
+                        {
+                            throw new AggregateException("AsyncHelpers.Run method threw an exception.", InnerException);
+                        }
+                    }
+                    else
+                    {
+                        workItemsWaiting.WaitOne();
+                    }
+                }
+            }
+
+            public override SynchronizationContext CreateCopy()
+            {
+                return this;
+            }
+        }
+    }
+
+    // This class is taken from the Prism library by Microsoft Patterns & Practices
+    // License: http://compositewpf.codeplex.com/license
+    internal static class WeakEventHandlerManager
+    {
+        public static void AddWeakReferenceHandler(ref List<WeakReference> handlers, EventHandler handler, int defaultListSize)
+        {
+            (handlers ??= (defaultListSize > 0) ? new List<WeakReference>(defaultListSize) : new List<WeakReference>()).Add(new WeakReference(handler));
+        }
+
+        private static void CallHandler(object sender, EventHandler eventHandler)
+        {
+            DispatcherProxy proxy = DispatcherProxy.CreateDispatcher();
+            if (eventHandler != null)
+            {
+                if (proxy?.CheckAccess() == false)
+                {
+                    proxy.BeginInvoke(new Action<object, EventHandler>(CallHandler), new object[] { sender, eventHandler });
+                }
+                else
+                {
+                    eventHandler(sender, EventArgs.Empty);
+                }
+            }
+        }
+
+        public static void CallWeakReferenceHandlers(object sender, List<WeakReference> handlers)
+        {
+            if (handlers != null)
+            {
+                EventHandler[] callees = new EventHandler[handlers.Count];
+                int count = 0;
+                count = CleanupOldHandlers(handlers, callees, count);
+                for (int i = 0; i < count; i++)
+                {
+                    CallHandler(sender, callees[i]);
+                }
+            }
+        }
+
+        private static int CleanupOldHandlers(List<WeakReference> handlers, EventHandler[] callees, int count)
+        {
+            for (int i = handlers.Count - 1; i >= 0; i--)
+            {
+                WeakReference reference = handlers[i];
+                if (reference.Target is not EventHandler target)
+                {
+                    handlers.RemoveAt(i);
+                }
+                else
+                {
+                    callees[count] = target;
+                    count++;
+                }
+            }
+            return count;
+        }
+
+        public static void RemoveWeakReferenceHandler(List<WeakReference> handlers, EventHandler handler)
+        {
+            if (handlers != null)
+            {
+                for (int i = handlers.Count - 1; i >= 0; i--)
+                {
+                    WeakReference reference = handlers[i];
+                    if ((reference.Target is not EventHandler target) || (target == handler))
+                    {
+                        handlers.RemoveAt(i);
+                    }
+                }
+            }
+        }
+
+        private class DispatcherProxy
+        {
+            private readonly Dispatcher innerDispatcher;
+
+            private DispatcherProxy(Dispatcher dispatcher)
+            {
+                this.innerDispatcher = dispatcher;
+            }
+
+            public DispatcherOperation BeginInvoke(Delegate method, params object[] args)
+            {
+                return this.innerDispatcher.BeginInvoke(method, DispatcherPriority.Normal, args);
+            }
+
+            public bool CheckAccess()
+            {
+                return this.innerDispatcher.CheckAccess();
+            }
+
+            public static DispatcherProxy CreateDispatcher()
+            {
+                if (Application.Current == null)
+                {
+                    return null;
+                }
+                return new DispatcherProxy(Application.Current.Dispatcher);
+            }
+        }
+    }
+
+    // This interface is taken from the Prism library by Microsoft Patterns & Practices
+    // License: http://compositewpf.codeplex.com/license
+    public interface IActiveAware
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether the object is active.
+        /// </summary>
+        /// <value><see langword="true" /> if the object is active; otherwise <see langword="false" />.</value>
+        bool IsActive { get; set; }
+
+        /// <summary>
+        /// Notifies that the value for <see cref="IsActive"/> property has changed.
+        /// </summary>
+        event EventHandler IsActiveChanged;
+    }
+
+    // This class is taken from the Prism library by Microsoft Patterns & Practices
+    // License: http://compositewpf.codeplex.com/license
+    public abstract class DelegateCommandBase : ICommand, IActiveAware
+    {
+        private List<WeakReference> _canExecuteChangedHandlers;
+        private bool _isActive;
+        private readonly Func<object, bool> canExecuteMethod;
+        private readonly Action<object> executeMethod;
+
+        public event EventHandler CanExecuteChanged
+        {
+            add
+            {
+                WeakEventHandlerManager.AddWeakReferenceHandler(ref this._canExecuteChangedHandlers, value, 2);
+            }
+            remove
+            {
+                WeakEventHandlerManager.RemoveWeakReferenceHandler(this._canExecuteChangedHandlers, value);
+            }
+        }
+
+        public event EventHandler IsActiveChanged;
+
+        protected DelegateCommandBase(Action<object> executeMethod, Func<object, bool> canExecuteMethod)
+        {
+            if ((executeMethod == null) || (canExecuteMethod == null))
+            {
+                throw new ArgumentNullException(nameof(executeMethod), "Delegate Command Delegates Cannot Be Null");
+            }
+            this.executeMethod = executeMethod;
+            this.canExecuteMethod = canExecuteMethod;
+        }
+
+        protected bool CanExecute(object parameter)
+        {
+            if (this.canExecuteMethod != null)
+            {
+                return this.canExecuteMethod(parameter);
+            }
+            return true;
+        }
+
+        protected void Execute(object parameter)
+        {
+            this.executeMethod(parameter);
+        }
+
+        protected virtual void OnCanExecuteChanged()
+        {
+            WeakEventHandlerManager.CallWeakReferenceHandlers(this, this._canExecuteChangedHandlers);
+        }
+
+        protected virtual void OnIsActiveChanged()
+        {
+            this.IsActiveChanged?.Invoke(this, EventArgs.Empty);
+        }
+
+        public void RaiseCanExecuteChanged()
+        {
+            this.OnCanExecuteChanged();
+        }
+
+        bool ICommand.CanExecute(object parameter)
+        {
+            return this.CanExecute(parameter);
+        }
+
+        void ICommand.Execute(object parameter)
+        {
+            this.Execute(parameter);
+        }
+
+        public bool IsActive
+        {
+            get
+            {
+                return this._isActive;
+            }
+            set
+            {
+                if (this._isActive != value)
+                {
+                    this._isActive = value;
+                    this.OnIsActiveChanged();
+                }
+            }
+        }
+    }
+
+    // This class is taken from the Prism library by Microsoft Patterns & Practices
+    // License: http://compositewpf.codeplex.com/license
+    public class DelegateCommand : DelegateCommandBase
+    {
+        public DelegateCommand(Action executeMethod)
+            : this(executeMethod, () => true)
+        {
+        }
+
+        public DelegateCommand(Action executeMethod, Func<bool> canExecuteMethod) : base(o => executeMethod(), f => canExecuteMethod())
+        {
+        }
+
+        public bool CanExecute()
+        {
+            return CanExecute(null);
+        }
+
+        public void Execute()
+        {
+            Execute(null);
+        }
+    }
+
+    internal class FlowDocumentScrollViewerNoMouseWheel : FlowDocumentScrollViewer
+    {
+        protected override void OnMouseWheel(MouseWheelEventArgs e)
+        {
+        }
+    }
+
+    internal class ProgressUpdater
+    {
+        private readonly DateTime InitTime;
+        private DateTime LastUpdateTime;
+        private readonly UInt64 MaxValue;
+        private readonly Action<int, TimeSpan?> ProgressUpdateCallback;
+        internal int ProgressPercentage;
+
+        internal ProgressUpdater(UInt64 MaxValue, Action<int, TimeSpan?> ProgressUpdateCallback)
+        {
+            InitTime = DateTime.Now;
+            LastUpdateTime = DateTime.Now;
+            this.MaxValue = MaxValue;
+            this.ProgressUpdateCallback = ProgressUpdateCallback;
+            SetProgress(0);
+        }
+
+        private UInt64 _Progress;
+        internal UInt64 Progress
+        {
+            get
+            {
+                return _Progress;
+            }
+        }
+
+        internal void SetProgress(UInt64 NewValue)
+        {
+            if (_Progress != NewValue)
+            {
+                int PreviousProgressPercentage = (int)((double)_Progress / MaxValue * 100);
+                ProgressPercentage = (int)((double)NewValue / MaxValue * 100);
+
+                _Progress = NewValue;
+
+                if (((DateTime.Now - LastUpdateTime) > TimeSpan.FromSeconds(0.5)) || (ProgressPercentage == 100))
+                {
+#if DEBUG
+                    Console.WriteLine("Init time: " + InitTime.ToShortTimeString() + " / Now: " + DateTime.Now.ToString() + " / NewValue: " + NewValue.ToString() + " / MaxValue: " + MaxValue.ToString() + " ->> Percentage: " + ProgressPercentage.ToString() + " / Remaining: " + TimeSpan.FromTicks((long)((DateTime.Now - InitTime).Ticks / ((double)NewValue / MaxValue) * (1 - ((double)NewValue / MaxValue)))).ToString());
+#endif
+
+                    if (((DateTime.Now - InitTime) < TimeSpan.FromSeconds(30)) && (ProgressPercentage < 15))
+                    {
+                        ProgressUpdateCallback(ProgressPercentage, null);
+                    }
+                    else
+                    {
+                        ProgressUpdateCallback(ProgressPercentage, TimeSpan.FromTicks((long)((DateTime.Now - InitTime).Ticks / ((double)NewValue / MaxValue) * (1 - ((double)NewValue / MaxValue)))));
+                    }
+
+                    LastUpdateTime = DateTime.Now;
+                }
+            }
+        }
+
+        internal void IncreaseProgress(UInt64 Progress)
+        {
+            SetProgress(_Progress + Progress);
+        }
+    }
+
+    internal static class Compression
+    {
+        internal static Stream GetDecompressedStreamWithSeek(Stream InputStream)
+        {
+            long P = InputStream.Position;
+            byte[] GZipHeader = new byte[3];
+            InputStream.Read(GZipHeader, 0, 3);
+            InputStream.Position = P;
+            if (StructuralComparisons.StructuralEqualityComparer.Equals(GZipHeader, new byte[] { 0x1F, 0x8B, 0x08 }))
+            {
+                return new GZipStream(InputStream, CompressionMode.Decompress, false);
+            }
+            else
+            {
+                return InputStream;
+            }
+        }
+
+        internal static bool IsCompressedStream(Stream InputStream)
+        {
+            byte[] GZipHeader = new byte[3];
+            InputStream.Read(GZipHeader, 0, 3);
+            return StructuralComparisons.StructuralEqualityComparer.Equals(GZipHeader, new byte[] { 0x1F, 0x8B, 0x08 });
+        }
+
+        internal static GZipStream GetDecompressedStream(Stream InputStream)
+        {
+            return new GZipStream(InputStream, CompressionMode.Decompress, false);
+        }
+    }
+
+    internal class WPinternalsException : Exception
+    {
+        // Message and SubMessaage are always printable
+        internal string SubMessage = null;
+
+        internal WPinternalsException() : base() { }
+
+        internal WPinternalsException(string Message) : base(Message) { }
+
+        internal WPinternalsException(string Message, Exception InnerException) : base(Message, InnerException) { }
+
+        internal WPinternalsException(string Message, string SubMessage) : base(Message) { this.SubMessage = SubMessage; }
+
+        internal WPinternalsException(string Message, string SubMessage, Exception InnerException) : base(Message, InnerException) { this.SubMessage = SubMessage; }
+    }
+
+    // This class is written by: Eugene Beresovsky
+    // https://stackoverflow.com/questions/13035925/stream-wrapper-to-make-stream-seekable/28036366#28036366
+    internal class ReadSeekableStream : Stream
+    {
+        private long _underlyingPosition;
+        private readonly byte[] _seekBackBuffer;
+        private int _seekBackBufferCount;
+        private int _seekBackBufferIndex;
+        private readonly Stream _underlyingStream;
+
+        public ReadSeekableStream(Stream underlyingStream, int seekBackBufferSize)
+        {
+            if (!underlyingStream.CanRead)
+            {
+                throw new Exception("Provided stream " + underlyingStream + " is not readable");
+            }
+
+            _underlyingStream = underlyingStream;
+            _seekBackBuffer = new byte[seekBackBufferSize];
+        }
+
+        public override bool CanRead { get { return true; } }
+        public override bool CanSeek { get { return true; } }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            int copiedFromBackBufferCount = 0;
+            if (_seekBackBufferIndex < _seekBackBufferCount)
+            {
+                copiedFromBackBufferCount = Math.Min(count, _seekBackBufferCount - _seekBackBufferIndex);
+                Buffer.BlockCopy(_seekBackBuffer, _seekBackBufferIndex, buffer, offset, copiedFromBackBufferCount);
+                offset += copiedFromBackBufferCount;
+                count -= copiedFromBackBufferCount;
+                _seekBackBufferIndex += copiedFromBackBufferCount;
+            }
+            int bytesReadFromUnderlying = 0;
+            if (count > 0)
+            {
+                bytesReadFromUnderlying = _underlyingStream.Read(buffer, offset, count);
+                if (bytesReadFromUnderlying > 0)
+                {
+                    _underlyingPosition += bytesReadFromUnderlying;
+
+                    var copyToBufferCount = Math.Min(bytesReadFromUnderlying, _seekBackBuffer.Length);
+                    var copyToBufferOffset = Math.Min(_seekBackBufferCount, _seekBackBuffer.Length - copyToBufferCount);
+                    var bufferBytesToMove = Math.Min(_seekBackBufferCount - 1, copyToBufferOffset);
+
+                    if (bufferBytesToMove > 0)
+                    {
+                        Buffer.BlockCopy(_seekBackBuffer, _seekBackBufferCount - bufferBytesToMove, _seekBackBuffer, 0, bufferBytesToMove);
+                    }
+
+                    Buffer.BlockCopy(buffer, offset, _seekBackBuffer, copyToBufferOffset, copyToBufferCount);
+                    _seekBackBufferCount = Math.Min(_seekBackBuffer.Length, _seekBackBufferCount + copyToBufferCount);
+                    _seekBackBufferIndex = _seekBackBufferCount;
+                }
+            }
+            return copiedFromBackBufferCount + bytesReadFromUnderlying;
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            if (origin == SeekOrigin.End)
+            {
+                return SeekFromEnd((int)Math.Max(0, -offset));
+            }
+
+            var relativeOffset = origin == SeekOrigin.Current
+                ? offset
+                : offset - Position;
+
+            if (relativeOffset == 0)
+            {
+                return Position;
+            }
+            else if (relativeOffset > 0)
+            {
+                return SeekForward(relativeOffset);
+            }
+            else
+            {
+                return SeekBackwards(-relativeOffset);
+            }
+        }
+
+        private long SeekForward(long origOffset)
+        {
+            long offset = origOffset;
+            var seekBackBufferLength = _seekBackBuffer.Length;
+
+            int backwardSoughtBytes = _seekBackBufferCount - _seekBackBufferIndex;
+            int seekForwardInBackBuffer = (int)Math.Min(offset, backwardSoughtBytes);
+            offset -= seekForwardInBackBuffer;
+            _seekBackBufferIndex += seekForwardInBackBuffer;
+
+            if (offset > 0)
+            {
+                // first completely fill seekBackBuffer to remove special cases from while loop below
+                if (_seekBackBufferCount < seekBackBufferLength)
+                {
+                    var maxRead = seekBackBufferLength - _seekBackBufferCount;
+                    if (offset < maxRead)
+                    {
+                        maxRead = (int)offset;
+                    }
+
+                    var bytesRead = _underlyingStream.Read(_seekBackBuffer, _seekBackBufferCount, maxRead);
+                    _underlyingPosition += bytesRead;
+                    _seekBackBufferCount += bytesRead;
+                    _seekBackBufferIndex = _seekBackBufferCount;
+                    if (bytesRead < maxRead)
+                    {
+                        if (_seekBackBufferCount < offset)
+                        {
+                            throw new NotSupportedException("Reached end of stream seeking forward " + origOffset + " bytes");
+                        }
+
+                        return Position;
+                    }
+                    offset -= bytesRead;
+                }
+
+                // now alternate between filling tempBuffer and seekBackBuffer
+                bool fillTempBuffer = true;
+                var tempBuffer = new byte[seekBackBufferLength];
+                while (offset > 0)
+                {
+                    var maxRead = offset < seekBackBufferLength ? (int)offset : seekBackBufferLength;
+                    var bytesRead = _underlyingStream.Read(fillTempBuffer ? tempBuffer : _seekBackBuffer, 0, maxRead);
+                    _underlyingPosition += bytesRead;
+                    var bytesReadDiff = maxRead - bytesRead;
+                    offset -= bytesRead;
+                    if (bytesReadDiff > 0 /* reached end-of-stream */ || offset == 0)
+                    {
+                        if (fillTempBuffer)
+                        {
+                            if (bytesRead > 0)
+                            {
+                                Buffer.BlockCopy(_seekBackBuffer, bytesRead, _seekBackBuffer, 0, bytesReadDiff);
+                                Buffer.BlockCopy(tempBuffer, 0, _seekBackBuffer, bytesReadDiff, bytesRead);
+                            }
+                        }
+                        else
+                        {
+                            if (bytesRead > 0)
+                            {
+                                Buffer.BlockCopy(_seekBackBuffer, 0, _seekBackBuffer, bytesReadDiff, bytesRead);
+                            }
+
+                            Buffer.BlockCopy(tempBuffer, bytesRead, _seekBackBuffer, 0, bytesReadDiff);
+                        }
+                        if (offset > 0)
+                        {
+                            throw new NotSupportedException("Reached end of stream seeking forward " + origOffset + " bytes");
+                        }
+                    }
+                    fillTempBuffer = !fillTempBuffer;
+                }
+            }
+            return Position;
+        }
+
+        private long SeekBackwards(long offset)
+        {
+            var intOffset = (int)offset;
+            if (offset > int.MaxValue || intOffset > _seekBackBufferIndex)
+            {
+                throw new NotSupportedException("Cannot currently seek backwards more than " + _seekBackBufferIndex + " bytes");
+            }
+
+            _seekBackBufferIndex -= intOffset;
+            return Position;
+        }
+
+        private long SeekFromEnd(long offset)
+        {
+            var intOffset = (int)offset;
+            var seekBackBufferLength = _seekBackBuffer.Length;
+            if (offset > int.MaxValue || intOffset > seekBackBufferLength)
+            {
+                throw new NotSupportedException("Cannot seek backwards from end more than " + seekBackBufferLength + " bytes");
+            }
+
+            // first completely fill seekBackBuffer to remove special cases from while loop below
+            if (_seekBackBufferCount < seekBackBufferLength)
+            {
+                var maxRead = seekBackBufferLength - _seekBackBufferCount;
+                var bytesRead = _underlyingStream.Read(_seekBackBuffer, _seekBackBufferCount, maxRead);
+                _underlyingPosition += bytesRead;
+                _seekBackBufferCount += bytesRead;
+                _seekBackBufferIndex = Math.Max(0, _seekBackBufferCount - intOffset);
+                if (bytesRead < maxRead)
+                {
+                    if (_seekBackBufferCount < intOffset)
+                    {
+                        throw new NotSupportedException("Could not seek backwards from end " + intOffset + " bytes");
+                    }
+
+                    return Position;
+                }
+            }
+            else
+            {
+                _seekBackBufferIndex = _seekBackBufferCount;
+            }
+
+            // now alternate between filling tempBuffer and seekBackBuffer
+            bool fillTempBuffer = true;
+            var tempBuffer = new byte[seekBackBufferLength];
+            while (true)
+            {
+                var bytesRead = _underlyingStream.Read(fillTempBuffer ? tempBuffer : _seekBackBuffer, 0, seekBackBufferLength);
+                _underlyingPosition += bytesRead;
+                var bytesReadDiff = seekBackBufferLength - bytesRead;
+                if (bytesReadDiff > 0) // reached end-of-stream
+                {
+                    if (fillTempBuffer)
+                    {
+                        if (bytesRead > 0)
+                        {
+                            Buffer.BlockCopy(_seekBackBuffer, bytesRead, _seekBackBuffer, 0, bytesReadDiff);
+                            Buffer.BlockCopy(tempBuffer, 0, _seekBackBuffer, bytesReadDiff, bytesRead);
+                        }
+                    }
+                    else
+                    {
+                        if (bytesRead > 0)
+                        {
+                            Buffer.BlockCopy(_seekBackBuffer, 0, _seekBackBuffer, bytesReadDiff, bytesRead);
+                        }
+
+                        Buffer.BlockCopy(tempBuffer, bytesRead, _seekBackBuffer, 0, bytesReadDiff);
+                    }
+                    _seekBackBufferIndex -= intOffset;
+                    return Position;
+                }
+                fillTempBuffer = !fillTempBuffer;
+            }
+        }
+
+        public override long Position
+        {
+            get { return _underlyingPosition - (_seekBackBufferCount - _seekBackBufferIndex); }
+            set { Seek(value, SeekOrigin.Begin); }
+        }
+
+        public override bool CanTimeout { get { return _underlyingStream.CanTimeout; } }
+        public override bool CanWrite { get { return _underlyingStream.CanWrite; } }
+        public override long Length { get { return _underlyingStream.Length; } }
+        public override void SetLength(long value) { _underlyingStream.SetLength(value); }
+        public override void Write(byte[] buffer, int offset, int count) { _underlyingStream.Write(buffer, offset, count); }
+        public override void Flush() { _underlyingStream.Flush(); }
+        public override void Close() { _underlyingStream.Close(); }
+        public new void Dispose() { _underlyingStream.Dispose(); }
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _underlyingStream.Dispose();
+            }
+        }
+    }
+
+    // For reading a compressed stream or normal stream
+    internal class DecompressedStream : Stream
+    {
+        private readonly Stream UnderlyingStream;
+        private readonly bool IsSourceCompressed;
+        private readonly UInt64 DecompressedLength;
+        private Int64 ReadPosition = 0;
+
+        // For reading a compressed stream
+        internal DecompressedStream(Stream InputStream)
+        {
+            UnderlyingStream = new ReadSeekableStream(InputStream, 0x100);
+
+            byte[] Signature = new byte["CompressedPartition".Length + 2];
+            Signature[0x00] = 0xFF;
+            Buffer.BlockCopy(Encoding.ASCII.GetBytes("CompressedPartition"), 0, Signature, 0x01, "CompressedPartition".Length);
+            Signature["CompressedPartition".Length + 1] = 0x00;
+
+            int PrimaryHeaderSize = 0x0A + "CompressedPartition".Length;
+            byte[] SignatureRead = new byte[Signature.Length];
+            UnderlyingStream.Read(SignatureRead, 0, Signature.Length);
+
+            IsSourceCompressed = StructuralComparisons.StructuralEqualityComparer.Equals(Signature, SignatureRead);
+            if (IsSourceCompressed)
+            {
+                byte[] FormatVersionBytes = new byte[4];
+                UnderlyingStream.Read(FormatVersionBytes, 0, 4);
+                if (BitConverter.ToUInt32(FormatVersionBytes, 0) > 1) // Max supported format version = 1
+                {
+                    throw new InvalidDataException();
+                }
+
+                byte[] HeaderSizeBytes = new byte[4];
+                UnderlyingStream.Read(HeaderSizeBytes, 0, 4);
+                UInt32 HeaderSize = BitConverter.ToUInt32(HeaderSizeBytes, 0);
+
+                if (HeaderSize >= (Signature.Length + 0x10))
+                {
+                    byte[] DecompressedLengthBytes = new byte[8];
+                    UnderlyingStream.Read(DecompressedLengthBytes, 0, 8);
+                    DecompressedLength = BitConverter.ToUInt64(DecompressedLengthBytes, 0);
+                }
+                else
+                {
+                    throw new InvalidDataException();
+                }
+
+                UInt32 HeaderBytesRemaining = (UInt32)(HeaderSize - Signature.Length - 0x10);
+                if (HeaderBytesRemaining > 0)
+                {
+                    byte[] HeaderBytes = new byte[HeaderBytesRemaining];
+                    UnderlyingStream.Read(HeaderBytes, 0, (int)HeaderBytesRemaining);
+                }
+
+                UnderlyingStream = new GZipStream(UnderlyingStream, CompressionMode.Decompress, false);
+            }
+            else
+            {
+                UnderlyingStream.Position = 0;
+            }
+        }
+
+        public override bool CanRead { get { return true; } }
+        public override bool CanSeek { get { return false; } }
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            int RealCount = UnderlyingStream.Read(buffer, offset, count);
+            ReadPosition += RealCount;
+            return RealCount;
+        }
+        public override long Seek(long offset, SeekOrigin origin) { throw new NotSupportedException(); }
+        public override long Position
+        {
+            get { return ReadPosition; }
+            set { throw new NotSupportedException(); }
+        }
+        public override bool CanTimeout { get { return UnderlyingStream.CanTimeout; } }
+        public override bool CanWrite { get { return true; } }
+        public override long Length
+        {
+            get
+            {
+                if (IsSourceCompressed)
+                {
+                    return (long)DecompressedLength;
+                }
+                else
+                {
+                    return UnderlyingStream.Length;
+                }
+            }
+        }
+        public override void SetLength(long value) { throw new NotSupportedException(); }
+        public override void Write(byte[] buffer, int offset, int count) { throw new NotSupportedException(); }
+        public override void Flush() { UnderlyingStream.Flush(); }
+        public override void Close() { UnderlyingStream.Close(); }
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                this.UnderlyingStream.Dispose();
+            }
+        }
+    }
+
+    // For writing a compressed stream
+    internal class CompressedStream : Stream
+    {
+        private readonly UInt32 HeaderSize;
+        private UInt64 WritePosition;
+        private readonly GZipStream UnderlyingStream;
+
+        internal CompressedStream(Stream OutputStream, UInt64 TotalDecompressedStreamLength)
+        {
+            // Write header
+            HeaderSize = (UInt32)(0x12 + "CompressedPartition".Length);
+            OutputStream.WriteByte(0xFF);
+            OutputStream.Write(Encoding.ASCII.GetBytes("CompressedPartition"), 0, "CompressedPartition".Length);
+            OutputStream.WriteByte(0x00);
+            OutputStream.Write(BitConverter.GetBytes((UInt32)1), 0, 4); // Format version = 1
+            OutputStream.Write(BitConverter.GetBytes(HeaderSize), 0, 4); // Headersize
+            OutputStream.Write(BitConverter.GetBytes(TotalDecompressedStreamLength), 0, 8);
+
+            this.UnderlyingStream = new GZipStream(OutputStream, CompressionLevel.Optimal, false);
+            WritePosition = 0;
+        }
+
+        public override bool CanRead { get { return false; } }
+        public override bool CanSeek { get { return false; } }
+        public override int Read(byte[] buffer, int offset, int count) { throw new NotSupportedException(); }
+        public override long Seek(long offset, SeekOrigin origin) { throw new NotSupportedException(); }
+        public override long Position
+        {
+            get { return (long)WritePosition; }
+            set { throw new NotSupportedException(); }
+        }
+        public override bool CanTimeout { get { return UnderlyingStream.CanTimeout; } }
+        public override bool CanWrite { get { return true; } }
+        public override long Length { get { return (long)WritePosition; } }
+        public override void SetLength(long value) { throw new NotSupportedException(); }
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            WritePosition += (UInt64)count;
+            UnderlyingStream.Write(buffer, offset, count);
+        }
+        public override void Flush() { UnderlyingStream.Flush(); }
+        public override void Close() { UnderlyingStream.Close(); }
+        public new void Dispose() { UnderlyingStream.Dispose(); }
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                this.UnderlyingStream.Dispose();
+            }
+        }
+    }
+
+    internal class SeekableStream : Stream
+    {
+        private Stream UnderlyingStream;
+        private Int64 ReadPosition = 0;
+        private readonly Func<Stream> StreamInitializer;
+        private readonly Int64 UnderlyingStreamLength;
+
+        // For reading a compressed stream
+        internal SeekableStream(Func<Stream> StreamInitializer, Int64? Length = null)
+        {
+            this.StreamInitializer = StreamInitializer;
+            UnderlyingStream = StreamInitializer();
+            if (Length != null)
+            {
+                UnderlyingStreamLength = (Int64)Length;
+            }
+            else
+            {
+                try
+                {
+                    UnderlyingStreamLength = UnderlyingStream.Length;
+                }
+                catch
+                {
+                    throw new ArgumentException("Unknown stream length");
+                }
+            }
+        }
+
+        public override bool CanRead { get { return true; } }
+        public override bool CanSeek { get { return true; } }
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            int RealCount = UnderlyingStream.Read(buffer, offset, count);
+            ReadPosition += RealCount;
+            return RealCount;
+        }
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            if (UnderlyingStream.CanSeek)
+            {
+                ReadPosition = UnderlyingStream.Seek(offset, origin);
+                return ReadPosition;
+            }
+            else
+            {
+                Int64 NewPosition = 0;
+                switch (origin)
+                {
+                    case SeekOrigin.Begin:
+                        NewPosition = offset;
+                        break;
+                    case SeekOrigin.Current:
+                        NewPosition = ReadPosition + offset;
+                        break;
+                    case SeekOrigin.End:
+                        NewPosition = UnderlyingStreamLength - offset;
+                        break;
+                }
+                if ((NewPosition < 0) || (NewPosition > UnderlyingStreamLength))
+                {
+                    throw new ArgumentOutOfRangeException();
+                }
+
+                if (NewPosition < ReadPosition)
+                {
+                    UnderlyingStream.Close();
+                    UnderlyingStream = StreamInitializer();
+                    ReadPosition = 0;
+                }
+                UInt64 Remaining;
+                byte[] Buffer = new byte[16384];
+                while (ReadPosition < NewPosition)
+                {
+                    Remaining = (UInt64)(NewPosition - ReadPosition);
+                    if (Remaining > (UInt64)Buffer.Length)
+                    {
+                        Remaining = (UInt64)Buffer.Length;
+                    }
+
+                    UnderlyingStream.Read(Buffer, 0, (int)Remaining);
+                    ReadPosition += (long)Remaining;
+                }
+                return ReadPosition;
+            }
+        }
+        public override long Position
+        {
+            get
+            {
+                return ReadPosition;
+            }
+            set
+            {
+                Seek(value, SeekOrigin.Begin);
+            }
+        }
+        public override bool CanTimeout { get { return UnderlyingStream.CanTimeout; } }
+        public override bool CanWrite { get { return false; } }
+        public override long Length
+        {
+            get
+            {
+                return UnderlyingStreamLength;
+            }
+        }
+        public override void SetLength(long value) { throw new NotSupportedException(); }
+        public override void Write(byte[] buffer, int offset, int count) { throw new NotSupportedException(); }
+        public override void Flush() { throw new NotSupportedException(); }
+        public override void Close() { UnderlyingStream.Close(); }
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                this.UnderlyingStream.Dispose();
+            }
+        }
+    }
+
+    internal enum ResourceType
+    {
+        RT_CURSOR = 1,
+        RT_BITMAP = 2,
+        RT_ICON = 3,
+        RT_MENU = 4,
+        RT_DIALOG = 5,
+        RT_STRING = 6,
+        RT_FONTDIR = 7,
+        RT_FONT = 8,
+        RT_ACCELERATOR = 9,
+        RT_RCDATA = 10,
+        RT_MESSAGETABLE = 11,
+        RT_GROUP_CURSOR = RT_CURSOR + 11,
+        RT_GROUP_ICON = RT_ICON + 11,
+        RT_VERSION = 16,
+        RT_DLGINCLUDE = 17,
+        RT_PLUGPLAY = 19,
+        RT_VXD = 20,
+        RT_ANICURSOR = 21,
+        RT_ANIICON = 22,
+        RT_HTML = 23,
+        RT_MANIFEST = 24,
+        RT_DLGINIT = 240,
+        RT_TOOLBAR = 241
+    };
+
+    internal static class PE
+    {
+        internal static byte[] GetResource(byte[] PEfile, int[] Index)
+        {
+            // Explanation of PE header here:
+            // https://msdn.microsoft.com/en-us/library/ms809762.aspx?f=255&MSPPError=-2147217396
+
+            UInt32 PEPointer = ByteOperations.ReadUInt32(PEfile, 0x3C);
+            UInt16 OptionalHeaderSize = ByteOperations.ReadUInt16(PEfile, PEPointer + 0x14);
+            UInt32 SectionTablePointer = PEPointer + 0x18 + OptionalHeaderSize;
+            UInt16 SectionCount = ByteOperations.ReadUInt16(PEfile, PEPointer + 0x06);
+            UInt32? ResourceSectionEntryPointer = null;
+            for (int i = 0; i < SectionCount; i++)
+            {
+                string SectionName = ByteOperations.ReadAsciiString(PEfile, (UInt32)(SectionTablePointer + (i * 0x28)), 8);
+                int e = SectionName.IndexOf('\0');
+                if (e >= 0)
+                {
+                    SectionName = SectionName.Substring(0, e);
+                }
+
+                if (SectionName == ".rsrc")
+                {
+                    ResourceSectionEntryPointer = (UInt32)(SectionTablePointer + (i * 0x28));
+                    break;
+                }
+            }
+            if (ResourceSectionEntryPointer == null)
+            {
+                throw new WPinternalsException("Resource-section not found");
+            }
+
+            UInt32 ResourceRawSize = ByteOperations.ReadUInt32(PEfile, (UInt32)ResourceSectionEntryPointer + 0x10);
+            UInt32 ResourceRawPointer = ByteOperations.ReadUInt32(PEfile, (UInt32)ResourceSectionEntryPointer + 0x14);
+            UInt32 ResourceVirtualPointer = ByteOperations.ReadUInt32(PEfile, (UInt32)ResourceSectionEntryPointer + 0x0C);
+
+            UInt32 p = ResourceRawPointer;
+            for (int i = 0; i < Index.Length; i++)
+            {
+                UInt16 ResourceNamedEntryCount = ByteOperations.ReadUInt16(PEfile, p + 0x0c);
+                UInt16 ResourceIdEntryCount = ByteOperations.ReadUInt16(PEfile, p + 0x0e);
+                for (int j = ResourceNamedEntryCount; j < ResourceNamedEntryCount + ResourceIdEntryCount; j++)
+                {
+                    UInt32 ResourceID = ByteOperations.ReadUInt32(PEfile, (UInt32)(p + 0x10 + (j * 8)));
+                    UInt32 NextPointer = ByteOperations.ReadUInt32(PEfile, (UInt32)(p + 0x10 + (j * 8) + 4));
+                    if (ResourceID == (UInt32)Index[i])
+                    {
+                        // Check high bit
+                        if ((NextPointer & 0x80000000) == 0 != (i == (Index.Length - 1)))
+                        {
+                            throw new WPinternalsException("Bad resource path");
+                        }
+
+                        p = ResourceRawPointer + (NextPointer & 0x7fffffff);
+                        break;
+                    }
+                }
+            }
+
+            UInt32 ResourceValuePointer = ByteOperations.ReadUInt32(PEfile, p) - ResourceVirtualPointer + ResourceRawPointer;
+            UInt32 ResourceValueSize = ByteOperations.ReadUInt32(PEfile, p + 4);
+
+            byte[] ResourceValue = new byte[ResourceValueSize];
+            Array.Copy(PEfile, ResourceValuePointer, ResourceValue, 0, ResourceValueSize);
+
+            return ResourceValue;
+        }
+
+        internal static Version GetFileVersion(byte[] PEfile)
+        {
+            byte[] version = GetResource(PEfile, new int[] { (int)ResourceType.RT_VERSION, 1, 1033 });
+
+            // RT_VERSION format:
+            // https://msdn.microsoft.com/en-us/library/windows/desktop/ms647001(v=vs.85).aspx
+            // https://msdn.microsoft.com/en-us/library/windows/desktop/ms646997(v=vs.85).aspx
+            const UInt32 FixedFileInfoPointer = 0x28;
+            UInt16 Major = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x0A);
+            UInt16 Minor = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x08);
+            UInt16 Build = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x0E);
+            UInt16 Revision = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x0C);
+
+            return new Version(Major, Minor, Build, Revision);
+        }
+
+        internal static Version GetProductVersion(byte[] PEfile)
+        {
+            byte[] version = GetResource(PEfile, new int[] { (int)ResourceType.RT_VERSION, 1, 1033 });
+
+            // RT_VERSION format:
+            // https://msdn.microsoft.com/en-us/library/windows/desktop/ms647001(v=vs.85).aspx
+            // https://msdn.microsoft.com/en-us/library/windows/desktop/ms646997(v=vs.85).aspx
+            const UInt32 FixedFileInfoPointer = 0x28;
+            UInt16 Major = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x12);
+            UInt16 Minor = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x10);
+            UInt16 Build = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x16);
+            UInt16 Revision = ByteOperations.ReadUInt16(version, FixedFileInfoPointer + 0x14);
+
+            return new Version(Major, Minor, Build, Revision);
+        }
+    }
+
+#if PREVIEW
+    internal static class Uploader
+    {
+        internal static List<Task> Uploads = new List<Task>();
+
+        internal static void Upload(string FileName, string Text)
+        {
+            byte[] byteArray = Encoding.UTF8.GetBytes(Text);
+            MemoryStream FileStream = new MemoryStream(byteArray);
+            Upload(FileName, FileStream);
+        }
+
+        internal static void Upload(string FileName, byte[] Data)
+        {
+            Upload(FileName, new MemoryStream(Data));
+        }
+
+        internal static void Upload(string FileName, Stream FileStream)
+        {
+            Upload(new Uri(@"https://www.wpinternals.net/upload.php", UriKind.Absolute), "uploadedfile", FileName, FileStream);
+        }
+
+        private static void Upload(Uri Address, string InputName, string FileName, Stream FileStream)
+        {
+            System.Net.ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+            System.Net.Http.HttpClient httpClient = new System.Net.Http.HttpClient();
+            System.Net.Http.MultipartFormDataContent form = new System.Net.Http.MultipartFormDataContent();
+            System.Net.Http.StreamContent Content = new System.Net.Http.StreamContent(FileStream);
+            Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("text/plain");
+            form.Add(Content, InputName, FileName);
+            Task<System.Net.Http.HttpResponseMessage> UploadTask = httpClient.PostAsync(Address, form);
+
+            Uploads.Add(
+                UploadTask.ContinueWith((t) =>
+                {
+                    Uploads.Remove(t);
+                    httpClient.Dispose();
+                })
+            );
+        }
+
+        internal static void WaitForUploads()
+        {
+            Task.WaitAll(Uploads.ToArray());
+        }
+    }
+#endif
+
+    internal class AsyncAutoResetEvent
+    {
+        private readonly LinkedList<TaskCompletionSource<bool>> waiters =
+            new();
+
+        private bool isSignaled;
+
+        public AsyncAutoResetEvent(bool signaled)
+        {
+            this.isSignaled = signaled;
+        }
+
+        public Task<bool> WaitAsync(TimeSpan timeout)
+        {
+            return this.WaitAsync(timeout, CancellationToken.None);
+        }
+
+        public async Task<bool> WaitAsync(TimeSpan timeout, CancellationToken cancellationToken)
+        {
+            TaskCompletionSource<bool> tcs;
+
+            lock (this.waiters)
+            {
+                if (this.isSignaled)
+                {
+                    this.isSignaled = false;
+                    return true;
+                }
+                else if (timeout == TimeSpan.Zero)
+                {
+                    return this.isSignaled;
+                }
+                else
+                {
+                    tcs = new TaskCompletionSource<bool>();
+                    this.waiters.AddLast(tcs);
+                }
+            }
+
+            Task winner = await Task.WhenAny(tcs.Task, Task.Delay(timeout, cancellationToken));
+            if (winner == tcs.Task)
+            {
+                // The task was signaled.
+                return true;
+            }
+            else
+            {
+                // We timed-out; remove our reference to the task.
+                // This is an O(n) operation since waiters is a LinkedList<T>.
+                lock (this.waiters)
+                {
+                    bool removed = this.waiters.Remove(tcs);
+                    System.Diagnostics.Debug.Assert(removed);
+                    return false;
+                }
+            }
+        }
+
+        public void Set()
+        {
+            TaskCompletionSource<bool> toRelease = null;
+
+            lock (this.waiters)
+            {
+                if (this.waiters.Count > 0)
+                {
+                    // Signal the first task in the waiters list.
+                    toRelease = this.waiters.First.Value;
+                    this.waiters.RemoveFirst();
+                }
+                else if (!this.isSignaled)
+                {
+                    // No tasks are pending
+                    this.isSignaled = true;
+                }
+            }
+
+            toRelease?.SetResult(true);
+        }
+    }
+
+    // This class was written by: Rolf Wessels
+    // https://github.com/rolfwessels/lazycowprojects/tree/master/Wpf
+
+    /// <summary>
+    /// Static class used to attach to wpf control
+    /// </summary>
+    public static class GridViewColumnResize
+    {
+        #region DependencyProperties
+
+        public static readonly DependencyProperty WidthProperty =
+            DependencyProperty.RegisterAttached("Width", typeof(string), typeof(GridViewColumnResize),
+                                                new PropertyMetadata(OnSetWidthCallback));
+
+        public static readonly DependencyProperty GridViewColumnResizeBehaviorProperty =
+            DependencyProperty.RegisterAttached("GridViewColumnResizeBehavior",
+                                                typeof(GridViewColumnResizeBehavior), typeof(GridViewColumnResize),
+                                                null);
+
+        public static readonly DependencyProperty EnabledProperty =
+            DependencyProperty.RegisterAttached("Enabled", typeof(bool), typeof(GridViewColumnResize),
+                                                new PropertyMetadata(OnSetEnabledCallback));
+
+        public static readonly DependencyProperty ListViewResizeBehaviorProperty =
+            DependencyProperty.RegisterAttached("ListViewResizeBehaviorProperty",
+                                                typeof(ListViewResizeBehavior), typeof(GridViewColumnResize), null);
+
+        #endregion
+
+        public static string GetWidth(DependencyObject obj)
+        {
+            return (string)obj.GetValue(WidthProperty);
+        }
+
+        public static void SetWidth(DependencyObject obj, string value)
+        {
+            obj.SetValue(WidthProperty, value);
+        }
+
+        public static bool GetEnabled(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(EnabledProperty);
+        }
+
+        public static void SetEnabled(DependencyObject obj, bool value)
+        {
+            obj.SetValue(EnabledProperty, value);
+        }
+
+        #region CallBack
+
+        private static void OnSetWidthCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
+        {
+            if (dependencyObject is GridViewColumn element)
+            {
+                GridViewColumnResizeBehavior behavior = GetOrCreateBehavior(element);
+                behavior.Width = e.NewValue as string;
+            }
+            else
+            {
+                Console.Error.WriteLine("Error: Expected type GridViewColumn but found " +
+                                        dependencyObject.GetType().Name);
+            }
+        }
+
+        private static void OnSetEnabledCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
+        {
+            if (dependencyObject is ListView element)
+            {
+                ListViewResizeBehavior behavior = GetOrCreateBehavior(element);
+                behavior.Enabled = (bool)e.NewValue;
+            }
+            else
+            {
+                Console.Error.WriteLine("Error: Expected type ListView but found " + dependencyObject.GetType().Name);
+            }
+        }
+
+        private static ListViewResizeBehavior GetOrCreateBehavior(ListView element)
+        {
+            if (element.GetValue(GridViewColumnResizeBehaviorProperty) is not ListViewResizeBehavior behavior)
+            {
+                behavior = new ListViewResizeBehavior(element);
+                element.SetValue(ListViewResizeBehaviorProperty, behavior);
+            }
+
+            return behavior;
+        }
+
+        private static GridViewColumnResizeBehavior GetOrCreateBehavior(GridViewColumn element)
+        {
+            if (element.GetValue(GridViewColumnResizeBehaviorProperty) is not GridViewColumnResizeBehavior behavior)
+            {
+                behavior = new GridViewColumnResizeBehavior(element);
+                element.SetValue(GridViewColumnResizeBehaviorProperty, behavior);
+            }
+
+            return behavior;
+        }
+
+        #endregion
+
+        #region Nested type: GridViewColumnResizeBehavior
+
+        // This class was written by: Rolf Wessels
+        // https://github.com/rolfwessels/lazycowprojects/tree/master/Wpf
+
+        /// <summary>
+        /// GridViewColumn class that gets attached to the GridViewColumn control
+        /// </summary>
+        public class GridViewColumnResizeBehavior
+        {
+            private readonly GridViewColumn _element;
+
+            public GridViewColumnResizeBehavior(GridViewColumn element)
+            {
+                _element = element;
+            }
+
+            public string Width { get; set; }
+
+            public bool IsStatic
+            {
+                get { return StaticWidth >= 0; }
+            }
+
+            public double StaticWidth
+            {
+                get
+                {
+                    return double.TryParse(Width, out double result) ? result : -1;
+                }
+            }
+
+            public double Percentage
+            {
+                get
+                {
+                    if (!IsStatic)
+                    {
+                        return Mulitplier * 100;
+                    }
+                    return 0;
+                }
+            }
+
+            public double Mulitplier
+            {
+                get
+                {
+                    if (Width == "*" || Width == "1*")
+                    {
+                        return 1;
+                    }
+
+                    if (Width.EndsWith("*") && double.TryParse(Width[0..^1], out double perc))
+                    {
+                        return perc;
+                    }
+                    return 1;
+                }
+            }
+
+            public void SetWidth(double allowedSpace, double totalPercentage)
+            {
+                if (IsStatic)
+                {
+                    _element.Width = StaticWidth;
+                }
+                else
+                {
+                    _element.Width = (double)Math.Max(allowedSpace * (Percentage / totalPercentage), 0);
+                }
+            }
+        }
+
+        #endregion
+
+        #region Nested type: ListViewResizeBehavior
+
+        // This class was written by: Rolf Wessels
+        // https://github.com/rolfwessels/lazycowprojects/tree/master/Wpf
+
+        /// <summary>
+        /// ListViewResizeBehavior class that gets attached to the ListView control
+        /// </summary>
+        public class ListViewResizeBehavior
+        {
+            private const int Margin = 25;
+            private const long RefreshTime = Timeout.Infinite;
+            private const long Delay = 500;
+
+            private readonly ListView _element;
+            private readonly Timer _timer;
+
+            public ListViewResizeBehavior(ListView element)
+            {
+                _element = element ?? throw new ArgumentNullException(nameof(element));
+                element.Loaded += OnLoaded;
+
+                // Action for resizing and re-enable the size lookup
+                // This stops the columns from constantly resizing to improve performance
+                Action resizeAndEnableSize = () =>
+                {
+                    Resize();
+                    _element.SizeChanged += OnSizeChanged;
+                };
+                _timer = new Timer(x => Application.Current.Dispatcher.BeginInvoke(resizeAndEnableSize), null, Delay,
+                                   RefreshTime);
+            }
+
+            public bool Enabled { get; set; }
+
+            private void OnLoaded(object sender, RoutedEventArgs e)
+            {
+                _element.SizeChanged += OnSizeChanged;
+            }
+
+            private void OnSizeChanged(object sender, SizeChangedEventArgs e)
+            {
+                if (e.WidthChanged)
+                {
+                    _element.SizeChanged -= OnSizeChanged;
+                    _timer.Change(Delay, RefreshTime);
+                }
+            }
+
+            private void Resize()
+            {
+                if (Enabled)
+                {
+                    double totalWidth = _element.ActualWidth;
+                    if (_element.View is GridView gv)
+                    {
+                        double allowedSpace = totalWidth - GetAllocatedSpace(gv);
+                        allowedSpace -= Margin;
+                        double totalPercentage = GridViewColumnResizeBehaviors(gv).Sum(x => x.Percentage);
+                        foreach (GridViewColumnResizeBehavior behavior in GridViewColumnResizeBehaviors(gv))
+                        {
+                            behavior.SetWidth(allowedSpace, totalPercentage);
+                        }
+                    }
+                }
+            }
+
+            private static IEnumerable<GridViewColumnResizeBehavior> GridViewColumnResizeBehaviors(GridView gv)
+            {
+                foreach (GridViewColumn t in gv.Columns)
+                {
+                    if (t.GetValue(GridViewColumnResizeBehaviorProperty) is GridViewColumnResizeBehavior gridViewColumnResizeBehavior)
+                    {
+                        yield return gridViewColumnResizeBehavior;
+                    }
+                }
+            }
+
+            private static double GetAllocatedSpace(GridView gv)
+            {
+                double totalWidth = 0;
+                foreach (GridViewColumn t in gv.Columns)
+                {
+                    if (t.GetValue(GridViewColumnResizeBehaviorProperty) is GridViewColumnResizeBehavior gridViewColumnResizeBehavior)
+                    {
+                        if (gridViewColumnResizeBehavior.IsStatic)
+                        {
+                            totalWidth += gridViewColumnResizeBehavior.StaticWidth;
+                        }
+                    }
+                    else
+                    {
+                        totalWidth += t.ActualWidth;
+                    }
+                }
+                return totalWidth;
+            }
+        }
+
+        #endregion
+    }
+
+    internal static class ExtensionMethods
+    {
+        // This method was written by: Lawrence Johnston
+        // https://stackoverflow.com/a/22078975
+        public static async Task<TResult> TimeoutAfter<TResult>(this Task<TResult> task, TimeSpan timeout)
+        {
+            using var timeoutCancellationTokenSource = new CancellationTokenSource();
+            var completedTask = await Task.WhenAny(task, Task.Delay(timeout, timeoutCancellationTokenSource.Token));
+            if (completedTask == task)
+            {
+                timeoutCancellationTokenSource.Cancel();
+                return await task;  // Very important in order to propagate exceptions
+            }
+            else
+            {
+                throw new TimeoutException("The operation has timed out.");
+            }
+        }
+    }
+}
diff --git a/Logo-Small.png b/WPinternals/Logo-Small.png
similarity index 100%
rename from Logo-Small.png
rename to WPinternals/Logo-Small.png
diff --git a/Logo.png b/WPinternals/Logo.png
similarity index 100%
rename from Logo.png
rename to WPinternals/Logo.png
diff --git a/Models/ByteOperations.cs b/WPinternals/Models/ByteOperations.cs
similarity index 97%
rename from Models/ByteOperations.cs
rename to WPinternals/Models/ByteOperations.cs
index 738fb67..a59a295 100644
--- a/Models/ByteOperations.cs
+++ b/WPinternals/Models/ByteOperations.cs
@@ -1,401 +1,401 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-// These functions assume same endianness for the CPU architecture and the raw data it reads from or writes to.
-
-using System;
-using System.IO;
-
-namespace WPinternals
-{
-    internal static class ByteOperations
-    {
-        internal static string ReadAsciiString(byte[] ByteArray, UInt32 Offset, UInt32 Length)
-        {
-            byte[] Bytes = new byte[Length];
-            Buffer.BlockCopy(ByteArray, (int)Offset, Bytes, 0, (int)Length);
-            return System.Text.Encoding.ASCII.GetString(Bytes);
-        }
-
-        internal static string ReadUnicodeString(byte[] ByteArray, UInt32 Offset, UInt32 Length)
-        {
-            byte[] Bytes = new byte[Length];
-            Buffer.BlockCopy(ByteArray, (int)Offset, Bytes, 0, (int)Length);
-            return System.Text.Encoding.Unicode.GetString(Bytes);
-        }
-
-        internal static void WriteAsciiString(byte[] ByteArray, UInt32 Offset, string Text, UInt32? MaxBufferLength = null)
-        {
-            if (MaxBufferLength != null)
-            {
-                Array.Clear(ByteArray, (int)Offset, (int)MaxBufferLength);
-            }
-
-            byte[] TextBytes = System.Text.Encoding.ASCII.GetBytes(Text);
-            int WriteLength = TextBytes.Length;
-            if (WriteLength > MaxBufferLength)
-            {
-                WriteLength = (int)MaxBufferLength;
-            }
-
-            Buffer.BlockCopy(TextBytes, 0, ByteArray, (int)Offset, WriteLength);
-        }
-
-        internal static void WriteUnicodeString(byte[] ByteArray, UInt32 Offset, string Text, UInt32? MaxBufferLength = null)
-        {
-            if (MaxBufferLength != null)
-            {
-                Array.Clear(ByteArray, (int)Offset, (int)MaxBufferLength);
-            }
-
-            byte[] TextBytes = System.Text.Encoding.Unicode.GetBytes(Text);
-            int WriteLength = TextBytes.Length;
-            if (WriteLength > MaxBufferLength)
-            {
-                WriteLength = (int)MaxBufferLength;
-            }
-
-            Buffer.BlockCopy(TextBytes, 0, ByteArray, (int)Offset, WriteLength);
-        }
-
-        internal static UInt32 ReadUInt32(byte[] ByteArray, UInt32 Offset)
-        {
-            return BitConverter.ToUInt32(ByteArray, (int)Offset);
-        }
-
-        internal static void WriteUInt32(byte[] ByteArray, UInt32 Offset, UInt32 Value)
-        {
-            Buffer.BlockCopy(BitConverter.GetBytes(Value), 0, ByteArray, (int)Offset, 4);
-        }
-
-        internal static Int32 ReadInt32(byte[] ByteArray, UInt32 Offset)
-        {
-            return BitConverter.ToInt32(ByteArray, (int)Offset);
-        }
-
-        internal static void WriteInt32(byte[] ByteArray, UInt32 Offset, Int32 Value)
-        {
-            Buffer.BlockCopy(BitConverter.GetBytes(Value), 0, ByteArray, (int)Offset, 4);
-        }
-
-        internal static UInt16 ReadUInt16(byte[] ByteArray, UInt32 Offset)
-        {
-            return BitConverter.ToUInt16(ByteArray, (int)Offset);
-        }
-
-        internal static void WriteUInt16(byte[] ByteArray, UInt32 Offset, UInt16 Value)
-        {
-            Buffer.BlockCopy(BitConverter.GetBytes(Value), 0, ByteArray, (int)Offset, 2);
-        }
-
-        internal static Int16 ReadInt16(byte[] ByteArray, UInt32 Offset)
-        {
-            return BitConverter.ToInt16(ByteArray, (int)Offset);
-        }
-
-        internal static void WriteInt16(byte[] ByteArray, UInt32 Offset, Int16 Value)
-        {
-            Buffer.BlockCopy(BitConverter.GetBytes(Value), 0, ByteArray, (int)Offset, 2);
-        }
-
-        internal static byte ReadUInt8(byte[] ByteArray, UInt32 Offset)
-        {
-            return ByteArray[Offset];
-        }
-
-        internal static void WriteUInt8(byte[] ByteArray, UInt32 Offset, byte Value)
-        {
-            ByteArray[Offset] = Value;
-        }
-
-        internal static UInt32 ReadUInt24(byte[] ByteArray, UInt32 Offset)
-        {
-            return (UInt32)(ByteArray[Offset] + (ByteArray[Offset + 1] << 8) + (ByteArray[Offset + 2] << 16));
-        }
-
-        internal static void WriteUInt24(byte[] ByteArray, UInt32 Offset, UInt32 Value)
-        {
-            Buffer.BlockCopy(BitConverter.GetBytes(Value), 0, ByteArray, (int)Offset, 3);
-        }
-
-        internal static UInt64 ReadUInt64(byte[] ByteArray, UInt32 Offset)
-        {
-            return BitConverter.ToUInt64(ByteArray, (int)Offset);
-        }
-
-        internal static void WriteUInt64(byte[] ByteArray, UInt32 Offset, UInt64 Value)
-        {
-            Buffer.BlockCopy(BitConverter.GetBytes(Value), 0, ByteArray, (int)Offset, 8);
-        }
-
-        internal static Guid ReadGuid(byte[] ByteArray, UInt32 Offset)
-        {
-            byte[] GuidBuffer = new byte[0x10];
-            Buffer.BlockCopy(ByteArray, (int)Offset, GuidBuffer, 0, 0x10);
-            return new Guid(GuidBuffer);
-        }
-
-        internal static void WriteGuid(byte[] ByteArray, UInt32 Offset, Guid Value)
-        {
-            Buffer.BlockCopy(Value.ToByteArray(), 0, ByteArray, (int)Offset, 0x10);
-        }
-
-        internal static UInt32 Align(UInt32 Base, UInt32 Offset, UInt32 Alignment)
-        {
-            if (((Offset - Base) % Alignment) == 0)
-            {
-                return Offset;
-            }
-            else
-            {
-                return ((((Offset - Base) / Alignment) + 1) * Alignment) + Base;
-            }
-        }
-
-        internal static UInt32? FindPatternInFile(string FileName, byte[] Pattern, byte[] Mask, out byte[] OutPattern)
-        {
-            // The mask is optional.
-            // In the mask 0x00 means the value must match, and 0xFF means that this position is a wildcard.
-
-            UInt32? Result = null;
-
-            FileStream Stream = new(FileName, FileMode.Open, FileAccess.Read);
-
-            byte[] Buffer = new byte[0x10000 + Pattern.Length - 1];
-            UInt32 BufferReadPosition = 0; // Position in buffer where file-chunk is being read.
-            UInt32 BytesInBuffer = 0;
-            UInt32 BytesRead;
-            UInt32 SearchPositionFile = 0;
-            UInt32 SearchPositionBuffer = 0;
-            UInt32 BufferFileOffset = 0; // Offset in file where data from buffer is located.
-            bool Match = false;
-            int i;
-
-            OutPattern = null;
-
-            while (SearchPositionFile <= (Stream.Length - Pattern.Length))
-            {
-                if ((SearchPositionBuffer + Pattern.Length) > BytesInBuffer)
-                {
-                    // Need to read next chunk
-                    if ((BytesInBuffer - SearchPositionBuffer) > 0)
-                    {
-                        System.Buffer.BlockCopy(Buffer, (int)SearchPositionBuffer, Buffer, 0, (int)(BytesInBuffer - SearchPositionBuffer));
-                    }
-                    BufferReadPosition = BytesInBuffer - SearchPositionBuffer;
-                    BytesInBuffer -= SearchPositionBuffer;
-                    BufferFileOffset += SearchPositionBuffer;
-                    SearchPositionBuffer = 0;
-
-                    BytesRead = (UInt32)Stream.Read(Buffer, (int)BufferReadPosition, Buffer.Length - (int)BufferReadPosition);
-                    BytesInBuffer += BytesRead;
-                }
-
-                Match = true;
-                for (i = 0; i < Pattern.Length; i++)
-                {
-                    if (Buffer[SearchPositionBuffer + i] != Pattern[i])
-                    {
-                        if ((Mask == null) || (Mask[i] == 0))
-                        {
-                            Match = false;
-                            break;
-                        }
-                    }
-                }
-
-                if (Match)
-                {
-                    Result = SearchPositionFile;
-
-                    OutPattern = new byte[Pattern.Length];
-                    System.Buffer.BlockCopy(Buffer, (int)SearchPositionBuffer, OutPattern, 0, Pattern.Length);
-                    break;
-                }
-
-                SearchPositionBuffer++;
-                SearchPositionFile++;
-            }
-
-            Stream.Close();
-
-            return Result;
-        }
-
-        internal static UInt32? FindAscii(byte[] SourceBuffer, string Pattern)
-        {
-            return FindPattern(SourceBuffer, System.Text.Encoding.ASCII.GetBytes(Pattern), null, null);
-        }
-
-        internal static UInt32? FindUnicode(byte[] SourceBuffer, string Pattern)
-        {
-            return FindPattern(SourceBuffer, System.Text.Encoding.Unicode.GetBytes(Pattern), null, null);
-        }
-
-        internal static UInt32? FindUint(byte[] SourceBuffer, UInt32 Pattern)
-        {
-            return FindPattern(SourceBuffer, BitConverter.GetBytes(Pattern), null, null);
-        }
-
-        internal static UInt32? FindPattern(byte[] SourceBuffer, byte[] Pattern, byte[] Mask, byte[] OutPattern)
-        {
-            return FindPattern(SourceBuffer, 0, null, Pattern, Mask, OutPattern);
-        }
-
-        internal static bool Compare(byte[] Array1, byte[] Array2)
-        {
-            return System.Collections.StructuralComparisons.StructuralEqualityComparer.Equals(Array1, Array2);
-        }
-
-        internal static UInt32? FindPattern(byte[] SourceBuffer, uint SourceOffset, uint? SourceSize, byte[] Pattern, byte[] Mask, byte[] OutPattern)
-        {
-            // The mask is optional.
-            // In the mask 0x00 means the value must match, and 0xFF means that this position is a wildcard.
-
-            UInt32? Result = null;
-
-            UInt32 SearchPosition = SourceOffset;
-            bool Match = false;
-            int i;
-
-            while ((SearchPosition <= (SourceBuffer.Length - Pattern.Length)) && ((SourceSize == null) || (SearchPosition <= (SourceOffset + SourceSize - Pattern.Length))))
-            {
-                Match = true;
-                for (i = 0; i < Pattern.Length; i++)
-                {
-                    if (SourceBuffer[SearchPosition + i] != Pattern[i])
-                    {
-                        if ((Mask == null) || (Mask[i] == 0))
-                        {
-                            Match = false;
-                            break;
-                        }
-                    }
-                }
-
-                if (Match)
-                {
-                    Result = SearchPosition;
-
-                    if (OutPattern != null)
-                    {
-                        Buffer.BlockCopy(SourceBuffer, (int)SearchPosition, OutPattern, 0, Pattern.Length);
-                    }
-
-                    break;
-                }
-
-                SearchPosition++;
-            }
-
-            return Result;
-        }
-
-        internal static byte CalculateChecksum8(byte[] Buffer, UInt32 Offset, UInt32 Size)
-        {
-            byte Checksum = 0;
-
-            for (UInt32 i = Offset; i < (Offset + Size); i++)
-            {
-                Checksum += Buffer[i];
-            }
-
-            return (byte)(0x100 - Checksum);
-        }
-
-        internal static UInt16 CalculateChecksum16(byte[] Buffer, UInt32 Offset, UInt32 Size)
-        {
-            UInt16 Checksum = 0;
-
-            for (UInt32 i = Offset; i < (Offset + Size - 1); i += 2)
-            {
-                Checksum += BitConverter.ToUInt16(Buffer, (int)i);
-            }
-
-            return (UInt16)(0x10000 - Checksum);
-        }
-
-        private static readonly UInt32[] CRC32Table = new UInt32[] {
-            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
-            0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
-            0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
-            0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
-            0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
-            0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-            0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
-            0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
-            0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
-            0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
-            0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106,
-            0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-            0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
-            0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
-            0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
-            0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
-            0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7,
-            0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-            0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA,
-            0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
-            0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
-            0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
-            0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84,
-            0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-            0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
-            0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
-            0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
-            0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
-            0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55,
-            0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-            0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28,
-            0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
-            0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
-            0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
-            0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
-            0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-            0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69,
-            0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
-            0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
-            0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
-            0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
-            0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-            0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-        };
-
-        internal static UInt32 CRC32(byte[] Input, UInt32 Offset, UInt32 Length)
-        {
-            if ((Input == null) || ((Offset + Length) > Input.Length))
-            {
-                throw new ArgumentException();
-            }
-
-            unchecked
-            {
-                uint crc = (uint)(((uint)0) ^ (-1));
-                for (var i = Offset; i < (Offset + Length); i++)
-                {
-                    crc = (crc >> 8) ^ CRC32Table[(crc ^ Input[i]) & 0xFF];
-                }
-                crc = (uint)(crc ^ (-1));
-
-                return crc;
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+// These functions assume same endianness for the CPU architecture and the raw data it reads from or writes to.
+
+using System;
+using System.IO;
+
+namespace WPinternals
+{
+    internal static class ByteOperations
+    {
+        internal static string ReadAsciiString(byte[] ByteArray, UInt32 Offset, UInt32 Length)
+        {
+            byte[] Bytes = new byte[Length];
+            Buffer.BlockCopy(ByteArray, (int)Offset, Bytes, 0, (int)Length);
+            return System.Text.Encoding.ASCII.GetString(Bytes);
+        }
+
+        internal static string ReadUnicodeString(byte[] ByteArray, UInt32 Offset, UInt32 Length)
+        {
+            byte[] Bytes = new byte[Length];
+            Buffer.BlockCopy(ByteArray, (int)Offset, Bytes, 0, (int)Length);
+            return System.Text.Encoding.Unicode.GetString(Bytes);
+        }
+
+        internal static void WriteAsciiString(byte[] ByteArray, UInt32 Offset, string Text, UInt32? MaxBufferLength = null)
+        {
+            if (MaxBufferLength != null)
+            {
+                Array.Clear(ByteArray, (int)Offset, (int)MaxBufferLength);
+            }
+
+            byte[] TextBytes = System.Text.Encoding.ASCII.GetBytes(Text);
+            int WriteLength = TextBytes.Length;
+            if (WriteLength > MaxBufferLength)
+            {
+                WriteLength = (int)MaxBufferLength;
+            }
+
+            Buffer.BlockCopy(TextBytes, 0, ByteArray, (int)Offset, WriteLength);
+        }
+
+        internal static void WriteUnicodeString(byte[] ByteArray, UInt32 Offset, string Text, UInt32? MaxBufferLength = null)
+        {
+            if (MaxBufferLength != null)
+            {
+                Array.Clear(ByteArray, (int)Offset, (int)MaxBufferLength);
+            }
+
+            byte[] TextBytes = System.Text.Encoding.Unicode.GetBytes(Text);
+            int WriteLength = TextBytes.Length;
+            if (WriteLength > MaxBufferLength)
+            {
+                WriteLength = (int)MaxBufferLength;
+            }
+
+            Buffer.BlockCopy(TextBytes, 0, ByteArray, (int)Offset, WriteLength);
+        }
+
+        internal static UInt32 ReadUInt32(byte[] ByteArray, UInt32 Offset)
+        {
+            return BitConverter.ToUInt32(ByteArray, (int)Offset);
+        }
+
+        internal static void WriteUInt32(byte[] ByteArray, UInt32 Offset, UInt32 Value)
+        {
+            Buffer.BlockCopy(BitConverter.GetBytes(Value), 0, ByteArray, (int)Offset, 4);
+        }
+
+        internal static Int32 ReadInt32(byte[] ByteArray, UInt32 Offset)
+        {
+            return BitConverter.ToInt32(ByteArray, (int)Offset);
+        }
+
+        internal static void WriteInt32(byte[] ByteArray, UInt32 Offset, Int32 Value)
+        {
+            Buffer.BlockCopy(BitConverter.GetBytes(Value), 0, ByteArray, (int)Offset, 4);
+        }
+
+        internal static UInt16 ReadUInt16(byte[] ByteArray, UInt32 Offset)
+        {
+            return BitConverter.ToUInt16(ByteArray, (int)Offset);
+        }
+
+        internal static void WriteUInt16(byte[] ByteArray, UInt32 Offset, UInt16 Value)
+        {
+            Buffer.BlockCopy(BitConverter.GetBytes(Value), 0, ByteArray, (int)Offset, 2);
+        }
+
+        internal static Int16 ReadInt16(byte[] ByteArray, UInt32 Offset)
+        {
+            return BitConverter.ToInt16(ByteArray, (int)Offset);
+        }
+
+        internal static void WriteInt16(byte[] ByteArray, UInt32 Offset, Int16 Value)
+        {
+            Buffer.BlockCopy(BitConverter.GetBytes(Value), 0, ByteArray, (int)Offset, 2);
+        }
+
+        internal static byte ReadUInt8(byte[] ByteArray, UInt32 Offset)
+        {
+            return ByteArray[Offset];
+        }
+
+        internal static void WriteUInt8(byte[] ByteArray, UInt32 Offset, byte Value)
+        {
+            ByteArray[Offset] = Value;
+        }
+
+        internal static UInt32 ReadUInt24(byte[] ByteArray, UInt32 Offset)
+        {
+            return (UInt32)(ByteArray[Offset] + (ByteArray[Offset + 1] << 8) + (ByteArray[Offset + 2] << 16));
+        }
+
+        internal static void WriteUInt24(byte[] ByteArray, UInt32 Offset, UInt32 Value)
+        {
+            Buffer.BlockCopy(BitConverter.GetBytes(Value), 0, ByteArray, (int)Offset, 3);
+        }
+
+        internal static UInt64 ReadUInt64(byte[] ByteArray, UInt32 Offset)
+        {
+            return BitConverter.ToUInt64(ByteArray, (int)Offset);
+        }
+
+        internal static void WriteUInt64(byte[] ByteArray, UInt32 Offset, UInt64 Value)
+        {
+            Buffer.BlockCopy(BitConverter.GetBytes(Value), 0, ByteArray, (int)Offset, 8);
+        }
+
+        internal static Guid ReadGuid(byte[] ByteArray, UInt32 Offset)
+        {
+            byte[] GuidBuffer = new byte[0x10];
+            Buffer.BlockCopy(ByteArray, (int)Offset, GuidBuffer, 0, 0x10);
+            return new Guid(GuidBuffer);
+        }
+
+        internal static void WriteGuid(byte[] ByteArray, UInt32 Offset, Guid Value)
+        {
+            Buffer.BlockCopy(Value.ToByteArray(), 0, ByteArray, (int)Offset, 0x10);
+        }
+
+        internal static UInt32 Align(UInt32 Base, UInt32 Offset, UInt32 Alignment)
+        {
+            if (((Offset - Base) % Alignment) == 0)
+            {
+                return Offset;
+            }
+            else
+            {
+                return ((((Offset - Base) / Alignment) + 1) * Alignment) + Base;
+            }
+        }
+
+        internal static UInt32? FindPatternInFile(string FileName, byte[] Pattern, byte[] Mask, out byte[] OutPattern)
+        {
+            // The mask is optional.
+            // In the mask 0x00 means the value must match, and 0xFF means that this position is a wildcard.
+
+            UInt32? Result = null;
+
+            FileStream Stream = new(FileName, FileMode.Open, FileAccess.Read);
+
+            byte[] Buffer = new byte[0x10000 + Pattern.Length - 1];
+            UInt32 BufferReadPosition = 0; // Position in buffer where file-chunk is being read.
+            UInt32 BytesInBuffer = 0;
+            UInt32 BytesRead;
+            UInt32 SearchPositionFile = 0;
+            UInt32 SearchPositionBuffer = 0;
+            UInt32 BufferFileOffset = 0; // Offset in file where data from buffer is located.
+            bool Match = false;
+            int i;
+
+            OutPattern = null;
+
+            while (SearchPositionFile <= (Stream.Length - Pattern.Length))
+            {
+                if ((SearchPositionBuffer + Pattern.Length) > BytesInBuffer)
+                {
+                    // Need to read next chunk
+                    if ((BytesInBuffer - SearchPositionBuffer) > 0)
+                    {
+                        System.Buffer.BlockCopy(Buffer, (int)SearchPositionBuffer, Buffer, 0, (int)(BytesInBuffer - SearchPositionBuffer));
+                    }
+                    BufferReadPosition = BytesInBuffer - SearchPositionBuffer;
+                    BytesInBuffer -= SearchPositionBuffer;
+                    BufferFileOffset += SearchPositionBuffer;
+                    SearchPositionBuffer = 0;
+
+                    BytesRead = (UInt32)Stream.Read(Buffer, (int)BufferReadPosition, Buffer.Length - (int)BufferReadPosition);
+                    BytesInBuffer += BytesRead;
+                }
+
+                Match = true;
+                for (i = 0; i < Pattern.Length; i++)
+                {
+                    if (Buffer[SearchPositionBuffer + i] != Pattern[i])
+                    {
+                        if ((Mask == null) || (Mask[i] == 0))
+                        {
+                            Match = false;
+                            break;
+                        }
+                    }
+                }
+
+                if (Match)
+                {
+                    Result = SearchPositionFile;
+
+                    OutPattern = new byte[Pattern.Length];
+                    System.Buffer.BlockCopy(Buffer, (int)SearchPositionBuffer, OutPattern, 0, Pattern.Length);
+                    break;
+                }
+
+                SearchPositionBuffer++;
+                SearchPositionFile++;
+            }
+
+            Stream.Close();
+
+            return Result;
+        }
+
+        internal static UInt32? FindAscii(byte[] SourceBuffer, string Pattern)
+        {
+            return FindPattern(SourceBuffer, System.Text.Encoding.ASCII.GetBytes(Pattern), null, null);
+        }
+
+        internal static UInt32? FindUnicode(byte[] SourceBuffer, string Pattern)
+        {
+            return FindPattern(SourceBuffer, System.Text.Encoding.Unicode.GetBytes(Pattern), null, null);
+        }
+
+        internal static UInt32? FindUint(byte[] SourceBuffer, UInt32 Pattern)
+        {
+            return FindPattern(SourceBuffer, BitConverter.GetBytes(Pattern), null, null);
+        }
+
+        internal static UInt32? FindPattern(byte[] SourceBuffer, byte[] Pattern, byte[] Mask, byte[] OutPattern)
+        {
+            return FindPattern(SourceBuffer, 0, null, Pattern, Mask, OutPattern);
+        }
+
+        internal static bool Compare(byte[] Array1, byte[] Array2)
+        {
+            return System.Collections.StructuralComparisons.StructuralEqualityComparer.Equals(Array1, Array2);
+        }
+
+        internal static UInt32? FindPattern(byte[] SourceBuffer, uint SourceOffset, uint? SourceSize, byte[] Pattern, byte[] Mask, byte[] OutPattern)
+        {
+            // The mask is optional.
+            // In the mask 0x00 means the value must match, and 0xFF means that this position is a wildcard.
+
+            UInt32? Result = null;
+
+            UInt32 SearchPosition = SourceOffset;
+            bool Match = false;
+            int i;
+
+            while ((SearchPosition <= (SourceBuffer.Length - Pattern.Length)) && ((SourceSize == null) || (SearchPosition <= (SourceOffset + SourceSize - Pattern.Length))))
+            {
+                Match = true;
+                for (i = 0; i < Pattern.Length; i++)
+                {
+                    if (SourceBuffer[SearchPosition + i] != Pattern[i])
+                    {
+                        if ((Mask == null) || (Mask[i] == 0))
+                        {
+                            Match = false;
+                            break;
+                        }
+                    }
+                }
+
+                if (Match)
+                {
+                    Result = SearchPosition;
+
+                    if (OutPattern != null)
+                    {
+                        Buffer.BlockCopy(SourceBuffer, (int)SearchPosition, OutPattern, 0, Pattern.Length);
+                    }
+
+                    break;
+                }
+
+                SearchPosition++;
+            }
+
+            return Result;
+        }
+
+        internal static byte CalculateChecksum8(byte[] Buffer, UInt32 Offset, UInt32 Size)
+        {
+            byte Checksum = 0;
+
+            for (UInt32 i = Offset; i < (Offset + Size); i++)
+            {
+                Checksum += Buffer[i];
+            }
+
+            return (byte)(0x100 - Checksum);
+        }
+
+        internal static UInt16 CalculateChecksum16(byte[] Buffer, UInt32 Offset, UInt32 Size)
+        {
+            UInt16 Checksum = 0;
+
+            for (UInt32 i = Offset; i < (Offset + Size - 1); i += 2)
+            {
+                Checksum += BitConverter.ToUInt16(Buffer, (int)i);
+            }
+
+            return (UInt16)(0x10000 - Checksum);
+        }
+
+        private static readonly UInt32[] CRC32Table = new UInt32[] {
+            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
+            0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+            0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
+            0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+            0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
+            0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+            0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
+            0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+            0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
+            0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+            0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106,
+            0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+            0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
+            0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+            0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
+            0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+            0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7,
+            0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+            0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA,
+            0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+            0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
+            0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+            0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84,
+            0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+            0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
+            0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+            0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
+            0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+            0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55,
+            0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+            0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28,
+            0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+            0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
+            0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+            0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
+            0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+            0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69,
+            0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+            0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
+            0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+            0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
+            0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+            0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+        };
+
+        internal static UInt32 CRC32(byte[] Input, UInt32 Offset, UInt32 Length)
+        {
+            if ((Input == null) || ((Offset + Length) > Input.Length))
+            {
+                throw new ArgumentException();
+            }
+
+            unchecked
+            {
+                uint crc = (uint)(((uint)0) ^ (-1));
+                for (var i = Offset; i < (Offset + Length); i++)
+                {
+                    crc = (crc >> 8) ^ CRC32Table[(crc ^ Input[i]) & 0xFF];
+                }
+                crc = (uint)(crc ^ (-1));
+
+                return crc;
+            }
+        }
+    }
+}
diff --git a/Models/FFU.cs b/WPinternals/Models/FFU.cs
similarity index 97%
rename from Models/FFU.cs
rename to WPinternals/Models/FFU.cs
index 70f5fcd..a8103f9 100644
--- a/Models/FFU.cs
+++ b/WPinternals/Models/FFU.cs
@@ -1,487 +1,487 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.Linq;
-
-namespace WPinternals
-{
-    internal class FFU
-    {
-        internal int ChunkSize;
-        internal string Path;
-        internal byte[] SecurityHeader;
-        internal byte[] ImageHeader;
-        internal byte[] StoreHeader;
-        private readonly int?[] ChunkIndexes;
-        private FileStream FFUFile = null;
-        private int FileOpenCount = 0;
-
-        internal string PlatformID;
-        internal GPT GPT;
-
-        internal UInt64 TotalSize;
-        internal UInt64 HeaderSize;
-        internal UInt64 PayloadSize;
-        internal UInt64 TotalChunkCount;
-
-        internal FFU(string Path)
-        {
-            this.Path = Path;
-
-            try
-            {
-                OpenFile();
-
-                // Read Security Header
-                byte[] ShortSecurityHeader = new byte[0x20];
-                FFUFile.Read(ShortSecurityHeader, 0, 0x20);
-                if (ByteOperations.ReadAsciiString(ShortSecurityHeader, 0x04, 0x0C) != "SignedImage ")
-                {
-                    throw new BadImageFormatException();
-                }
-
-                ChunkSize = ByteOperations.ReadInt32(ShortSecurityHeader, 0x10) * 1024;
-                UInt32 SecurityHeaderSize = ByteOperations.ReadUInt32(ShortSecurityHeader, 0x00);
-                UInt32 CatalogSize = ByteOperations.ReadUInt32(ShortSecurityHeader, 0x18);
-                UInt32 HashTableSize = ByteOperations.ReadUInt32(ShortSecurityHeader, 0x1C);
-                SecurityHeader = new byte[RoundUpToChunks(SecurityHeaderSize + CatalogSize + HashTableSize)];
-                FFUFile.Seek(0, SeekOrigin.Begin);
-                FFUFile.Read(SecurityHeader, 0, SecurityHeader.Length);
-
-                // Read Image Header
-                byte[] ShortImageHeader = new byte[0x1C];
-                FFUFile.Read(ShortImageHeader, 0, 0x1C);
-                if (ByteOperations.ReadAsciiString(ShortImageHeader, 0x04, 0x0C) != "ImageFlash  ")
-                {
-                    throw new BadImageFormatException();
-                }
-
-                UInt32 ImageHeaderSize = ByteOperations.ReadUInt32(ShortImageHeader, 0x00);
-                UInt32 ManifestSize = ByteOperations.ReadUInt32(ShortImageHeader, 0x10);
-                ImageHeader = new byte[RoundUpToChunks(ImageHeaderSize + ManifestSize)];
-                FFUFile.Seek(SecurityHeader.Length, SeekOrigin.Begin);
-                FFUFile.Read(ImageHeader, 0, ImageHeader.Length);
-
-                // Read Store Header
-                byte[] ShortStoreHeader = new byte[248];
-                FFUFile.Read(ShortStoreHeader, 0, 248);
-                PlatformID = ByteOperations.ReadAsciiString(ShortStoreHeader, 0x0C, 192).TrimEnd(new char[] { (char)0, ' ' });
-                int WriteDescriptorCount = ByteOperations.ReadInt32(ShortStoreHeader, 208);
-                UInt32 WriteDescriptorLength = ByteOperations.ReadUInt32(ShortStoreHeader, 212);
-                UInt32 ValidateDescriptorLength = ByteOperations.ReadUInt32(ShortStoreHeader, 220);
-                StoreHeader = new byte[RoundUpToChunks(248 + WriteDescriptorLength + ValidateDescriptorLength)];
-                FFUFile.Seek(SecurityHeader.Length + ImageHeader.Length, SeekOrigin.Begin);
-                FFUFile.Read(StoreHeader, 0, StoreHeader.Length);
-
-                // Parse Chunk Indexes
-                int HighestChunkIndex = 0;
-                UInt32 LocationCount;
-                int ChunkIndex;
-                int ChunkCount;
-                int DiskAccessMethod;
-                UInt32 WriteDescriptorEntryOffset = 248 + ValidateDescriptorLength;
-                int FFUChunkIndex = 0;
-                for (int i = 0; i < WriteDescriptorCount; i++)
-                {
-                    LocationCount = ByteOperations.ReadUInt32(StoreHeader, WriteDescriptorEntryOffset + 0x00);
-                    ChunkCount = ByteOperations.ReadInt32(StoreHeader, WriteDescriptorEntryOffset + 0x04);
-
-                    for (int j = 0; j < LocationCount; j++)
-                    {
-                        DiskAccessMethod = ByteOperations.ReadInt32(StoreHeader, (UInt32)(WriteDescriptorEntryOffset + 0x08 + (j * 0x08)));
-                        ChunkIndex = ByteOperations.ReadInt32(StoreHeader, (UInt32)(WriteDescriptorEntryOffset + 0x0C + (j * 0x08)));
-
-                        if (DiskAccessMethod == 0 && (ChunkIndex + ChunkCount - 1) > HighestChunkIndex) // 0 = From begin, 2 = From end. We ignore chunks at end of disk. These contain secondairy GPT.
-                        {
-                            HighestChunkIndex = ChunkIndex + ChunkCount - 1;
-                        }
-                    }
-                    WriteDescriptorEntryOffset += 8 + (LocationCount * 0x08);
-                    FFUChunkIndex += ChunkCount;
-                }
-                ChunkIndexes = new int?[HighestChunkIndex + 1];
-                WriteDescriptorEntryOffset = 248 + ValidateDescriptorLength;
-                FFUChunkIndex = 0;
-                for (int i = 0; i < WriteDescriptorCount; i++)
-                {
-                    LocationCount = ByteOperations.ReadUInt32(StoreHeader, WriteDescriptorEntryOffset + 0x00);
-                    ChunkCount = ByteOperations.ReadInt32(StoreHeader, WriteDescriptorEntryOffset + 0x04);
-
-                    for (int j = 0; j < LocationCount; j++)
-                    {
-                        DiskAccessMethod = ByteOperations.ReadInt32(StoreHeader, (UInt32)(WriteDescriptorEntryOffset + 0x08 + (j * 0x08)));
-                        ChunkIndex = ByteOperations.ReadInt32(StoreHeader, (UInt32)(WriteDescriptorEntryOffset + 0x0C + (j * 0x08)));
-
-                        if (DiskAccessMethod == 0) // 0 = From begin, 2 = From end. We ignore chunks at end of disk. These contain secondairy GPT.
-                        {
-                            for (int k = 0; k < ChunkCount; k++)
-                            {
-                                ChunkIndexes[ChunkIndex + k] = FFUChunkIndex + k;
-                            }
-                        }
-                    }
-                    WriteDescriptorEntryOffset += 8 + (LocationCount * 0x08);
-                    FFUChunkIndex += ChunkCount;
-                }
-
-                byte[] GPTBuffer = GetSectors(0x01, 0x21);
-                GPT = new GPT(GPTBuffer);
-
-                HeaderSize = (UInt64)(SecurityHeader.Length + ImageHeader.Length + StoreHeader.Length);
-
-                TotalChunkCount = (UInt64)FFUChunkIndex;
-                PayloadSize = TotalChunkCount * (UInt64)ChunkSize;
-                TotalSize = HeaderSize + PayloadSize;
-
-                if (TotalSize != (UInt64)FFUFile.Length)
-                {
-                    throw new WPinternalsException("Bad FFU file", "Bad FFU file: " + Path + "." + Environment.NewLine + "Expected size: " + TotalSize.ToString() + ". Actual size: " + FFUFile.Length + ".");
-                }
-            }
-            catch (WPinternalsException)
-            {
-                throw;
-            }
-            catch (Exception Ex)
-            {
-                throw new WPinternalsException("Bad FFU file", "Bad FFU file: " + Path + "." + Environment.NewLine + Ex.Message, Ex);
-            }
-            finally
-            {
-                CloseFile();
-            }
-        }
-
-        internal static bool IsFFU(string FileName)
-        {
-            bool Result = false;
-
-            FileStream FFUFile = new(FileName, FileMode.Open, FileAccess.Read);
-
-            byte[] Signature = new byte[0x10];
-            FFUFile.Read(Signature, 0, 0x10);
-
-            Result = ByteOperations.ReadAsciiString(Signature, 0x04, 0x0C) == "SignedImage ";
-
-            FFUFile.Close();
-
-            return Result;
-        }
-
-        private void OpenFile()
-        {
-            if (FFUFile == null)
-            {
-                FFUFile = new FileStream(Path, FileMode.Open, FileAccess.Read);
-                FileOpenCount = 0;
-            }
-            FileOpenCount++;
-        }
-
-        private void CloseFile()
-        {
-            FileOpenCount--;
-            if (FileOpenCount == 0)
-            {
-                FFUFile.Close();
-                FFUFile = null;
-            }
-        }
-
-        private void FileSeek(long Position)
-        {
-            // https://social.msdn.microsoft.com/Forums/vstudio/en-US/2e67ca57-3556-4275-accd-58b7df30d424/unnecessary-filestreamseek-and-setting-filestreamposition-has-huge-effect-on-performance?forum=csharpgeneral
-
-            if (FFUFile != null && FFUFile.Position != Position)
-            {
-                FFUFile.Seek(Position, SeekOrigin.Begin);
-            }
-        }
-
-        internal UInt32 RoundUpToChunks(UInt32 Size)
-        {
-            if ((Size % ChunkSize) > 0)
-            {
-                return (UInt32)(((Size / ChunkSize) + 1) * ChunkSize);
-            }
-            else
-            {
-                return Size;
-            }
-        }
-
-        internal UInt32 RoundDownToChunks(UInt32 Size)
-        {
-            if ((Size % ChunkSize) > 0)
-            {
-                return (UInt32)(Size / ChunkSize * ChunkSize);
-            }
-            else
-            {
-                return Size;
-            }
-        }
-
-        internal byte[] GetSectors(int StartSector, int SectorCount)
-        {
-            int FirstChunk = GetChunkIndexFromSectorIndex(StartSector);
-            int LastChunk = GetChunkIndexFromSectorIndex(StartSector + SectorCount - 1);
-
-            byte[] Buffer = new byte[ChunkSize];
-
-            OpenFile();
-
-            byte[] Result = new byte[SectorCount * 0x200];
-
-            int ResultOffset = 0;
-
-            for (int j = FirstChunk; j <= LastChunk; j++)
-            {
-                GetChunk(Buffer, j);
-
-                int FirstSector = 0;
-                int LastSector = (ChunkSize / 0x200) - 1;
-
-                if (j == FirstChunk)
-                {
-                    FirstSector = GetSectorNumberInChunkFromSectorIndex(StartSector);
-                }
-
-                if (j == LastChunk)
-                {
-                    LastSector = GetSectorNumberInChunkFromSectorIndex(StartSector + SectorCount - 1);
-                }
-
-                int Offset = FirstSector * 0x200;
-                int Size = (LastSector - FirstSector + 1) * 0x200;
-
-                System.Buffer.BlockCopy(Buffer, Offset, Result, ResultOffset, Size);
-
-                ResultOffset += Size;
-            }
-
-            CloseFile();
-
-            return Result;
-        }
-
-        internal byte[] GetPartition(string Name)
-        {
-            Partition Target = GPT.Partitions.Find(p => string.Equals(p.Name, Name, StringComparison.CurrentCultureIgnoreCase));
-            if (Target == null)
-            {
-                throw new ArgumentOutOfRangeException();
-            }
-
-            return GetSectors((int)Target.FirstSector, (int)(Target.LastSector - Target.FirstSector + 1));
-        }
-
-        internal void WritePartition(string Name, string FilePath, bool Compress = false)
-        {
-            WritePartition(Name, FilePath, null, null, Compress);
-        }
-
-        internal void WritePartition(string Name, string FilePath, Action<int, TimeSpan?> ProgressUpdateCallback, bool Compress = false)
-        {
-            WritePartition(Name, FilePath, ProgressUpdateCallback, null, Compress);
-        }
-
-        internal void WritePartition(string Name, string FilePath, ProgressUpdater UpdaterPerSector, bool Compress = false)
-        {
-            WritePartition(Name, FilePath, null, UpdaterPerSector, Compress);
-        }
-
-        private void WritePartition(string Name, string FilePath, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector, bool Compress = false)
-        {
-            Partition Target = GPT.Partitions.Find(p => string.Equals(p.Name, Name, StringComparison.CurrentCultureIgnoreCase));
-            if (Target == null)
-            {
-                throw new ArgumentOutOfRangeException();
-            }
-
-            int FirstChunk = GetChunkIndexFromSectorIndex((int)Target.FirstSector);
-            int LastChunk = GetChunkIndexFromSectorIndex((int)Target.LastSector);
-
-            ProgressUpdater Updater = UpdaterPerSector;
-            if ((Updater == null) && (ProgressUpdateCallback != null))
-            {
-                Updater = new ProgressUpdater(Target.LastSector - Target.FirstSector + 1, ProgressUpdateCallback);
-            }
-
-            byte[] Buffer = new byte[ChunkSize];
-
-            OpenFile();
-
-            FileStream OutputFile = new(FilePath, FileMode.Create, FileAccess.Write);
-            Stream OutStream = OutputFile;
-
-            // We use gzip compression
-            //
-            // LZMA is about 60 times slower (compression is twice as good, but compressed size is already really small, so it doesnt matter much)
-            // OutStream = new LZMACompressionStream(OutputFile, System.IO.Compression.CompressionMode.Compress, false);
-            //
-            // DeflateStream is a raw compression stream without recognizable header
-            // Deflate has almost no performance penalty
-            // OutStream = new DeflateStream(OutputFile, CompressionLevel.Optimal, false);
-            //
-            // GZip can be recognized. It always starts with 1F 8B 08 (1F 8B is the magic value, 08 is the Deflate compression method)
-            // With GZip compression, dump time goes from 1m to 1m37s. So that doesnt matter much.
-            if (Compress)
-            {
-                OutStream = new CompressedStream(OutputFile, (Target.LastSector - Target.FirstSector + 1) * 0x200);
-            }
-
-            for (int j = FirstChunk; j <= LastChunk; j++)
-            {
-                GetChunk(Buffer, j);
-
-                int FirstSector = 0;
-                int LastSector = (ChunkSize / 0x200) - 1;
-
-                if (j == FirstChunk)
-                {
-                    FirstSector = GetSectorNumberInChunkFromSectorIndex((int)Target.FirstSector);
-                }
-
-                if (j == LastChunk)
-                {
-                    LastSector = GetSectorNumberInChunkFromSectorIndex((int)Target.LastSector);
-                }
-
-                int Offset = FirstSector * 0x200;
-                int Size = (LastSector - FirstSector + 1) * 0x200;
-
-                OutStream.Write(Buffer, Offset, Size);
-
-                Updater?.IncreaseProgress((UInt64)(ChunkSize / 0x200));
-            }
-
-            OutStream.Close();
-
-            CloseFile();
-        }
-
-        private byte[] GetChunk(int ChunkIndex)
-        {
-            long BaseOffset = (long)SecurityHeader.Length + ImageHeader.Length + StoreHeader.Length;
-            if (ChunkIndexes[ChunkIndex] == null)
-            {
-                return new byte[ChunkSize];
-            }
-            else
-            {
-                OpenFile();
-                FileSeek(BaseOffset + ((long)ChunkIndexes[ChunkIndex] * ChunkSize));
-                byte[] Chunk = new byte[ChunkSize];
-                FFUFile.Read(Chunk, 0, ChunkSize);
-                CloseFile();
-                return Chunk;
-            }
-        }
-
-        private void GetChunk(byte[] Chunk, int ChunkIndex)
-        {
-            long BaseOffset = SecurityHeader.Length + ImageHeader.Length + StoreHeader.Length;
-            if (ChunkIndexes[ChunkIndex] == null)
-            {
-                Array.Clear(Chunk, 0, ChunkSize);
-            }
-            else
-            {
-                OpenFile();
-                FileSeek(BaseOffset + ((long)ChunkIndexes[ChunkIndex] * ChunkSize));
-                FFUFile.Read(Chunk, 0, ChunkSize);
-                CloseFile();
-            }
-        }
-
-        private int GetChunkIndexFromSectorIndex(int SectorIndex)
-        {
-            int SectorsPerChunk = ChunkSize / 0x200;
-            return SectorIndex / SectorsPerChunk;
-        }
-
-        private int GetSectorNumberInChunkFromSectorIndex(int SectorIndex)
-        {
-            int SectorsPerChunk = ChunkSize / 0x200;
-            return SectorIndex % SectorsPerChunk;
-        }
-
-        internal bool IsPartitionPresentInFFU(string PartitionName)
-        {
-            Partition Target = GPT.GetPartition(PartitionName);
-            if (Target == null)
-            {
-                throw new InvalidOperationException("Partitionname is not found!");
-            }
-
-            int ChunkIndex = GetChunkIndexFromSectorIndex((int)Target.FirstSector);
-            return ChunkIndexes[ChunkIndex] != null;
-        }
-
-        private int GetChunkIndexFromSectorIndex(ulong p)
-        {
-            throw new NotImplementedException();
-        }
-
-        internal string GetFirmwareVersion()
-        {
-            string Result = null;
-
-            Partition Plat = GPT.GetPartition("PLAT");
-            if (Plat != null)
-            {
-                byte[] Data = GetPartition("PLAT");
-                uint? Offset = ByteOperations.FindAscii(Data, "SWVERSION=");
-                if (Offset != null)
-                {
-                    uint Start = (uint)Offset + 10;
-                    uint Length = (uint)ByteOperations.FindPattern(Data, Start, 0x100, new byte[] { 0x00 }, null, null) - Start;
-                    uint? Offset0D = ByteOperations.FindPattern(Data, Start, 0x100, new byte[] { 0x0D }, null, null);
-                    if ((Offset0D != null) && (Offset0D < (Start + Length)))
-                    {
-                        Length = (uint)Offset0D - Start;
-                    }
-
-                    Result = ByteOperations.ReadAsciiString(Data, Start, Length);
-                }
-            }
-
-            return Result;
-        }
-
-        internal string GetOSVersion()
-        {
-            byte[] efiesp = GetPartition("EFIESP");
-            MemoryStream s = new(efiesp);
-            DiscUtils.Fat.FatFileSystem fs = new(s);
-            Stream mss = fs.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open, FileAccess.Read);
-            MemoryStream msms = new();
-            mss.CopyTo(msms);
-            byte[] mobilestartup = msms.ToArray();
-            Version OSVersion = PE.GetProductVersion(mobilestartup);
-            s.Close();
-
-            return OSVersion.ToString();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.IO;
+using System.Linq;
+
+namespace WPinternals
+{
+    internal class FFU
+    {
+        internal int ChunkSize;
+        internal string Path;
+        internal byte[] SecurityHeader;
+        internal byte[] ImageHeader;
+        internal byte[] StoreHeader;
+        private readonly int?[] ChunkIndexes;
+        private FileStream FFUFile = null;
+        private int FileOpenCount = 0;
+
+        internal string PlatformID;
+        internal GPT GPT;
+
+        internal UInt64 TotalSize;
+        internal UInt64 HeaderSize;
+        internal UInt64 PayloadSize;
+        internal UInt64 TotalChunkCount;
+
+        internal FFU(string Path)
+        {
+            this.Path = Path;
+
+            try
+            {
+                OpenFile();
+
+                // Read Security Header
+                byte[] ShortSecurityHeader = new byte[0x20];
+                FFUFile.Read(ShortSecurityHeader, 0, 0x20);
+                if (ByteOperations.ReadAsciiString(ShortSecurityHeader, 0x04, 0x0C) != "SignedImage ")
+                {
+                    throw new BadImageFormatException();
+                }
+
+                ChunkSize = ByteOperations.ReadInt32(ShortSecurityHeader, 0x10) * 1024;
+                UInt32 SecurityHeaderSize = ByteOperations.ReadUInt32(ShortSecurityHeader, 0x00);
+                UInt32 CatalogSize = ByteOperations.ReadUInt32(ShortSecurityHeader, 0x18);
+                UInt32 HashTableSize = ByteOperations.ReadUInt32(ShortSecurityHeader, 0x1C);
+                SecurityHeader = new byte[RoundUpToChunks(SecurityHeaderSize + CatalogSize + HashTableSize)];
+                FFUFile.Seek(0, SeekOrigin.Begin);
+                FFUFile.Read(SecurityHeader, 0, SecurityHeader.Length);
+
+                // Read Image Header
+                byte[] ShortImageHeader = new byte[0x1C];
+                FFUFile.Read(ShortImageHeader, 0, 0x1C);
+                if (ByteOperations.ReadAsciiString(ShortImageHeader, 0x04, 0x0C) != "ImageFlash  ")
+                {
+                    throw new BadImageFormatException();
+                }
+
+                UInt32 ImageHeaderSize = ByteOperations.ReadUInt32(ShortImageHeader, 0x00);
+                UInt32 ManifestSize = ByteOperations.ReadUInt32(ShortImageHeader, 0x10);
+                ImageHeader = new byte[RoundUpToChunks(ImageHeaderSize + ManifestSize)];
+                FFUFile.Seek(SecurityHeader.Length, SeekOrigin.Begin);
+                FFUFile.Read(ImageHeader, 0, ImageHeader.Length);
+
+                // Read Store Header
+                byte[] ShortStoreHeader = new byte[248];
+                FFUFile.Read(ShortStoreHeader, 0, 248);
+                PlatformID = ByteOperations.ReadAsciiString(ShortStoreHeader, 0x0C, 192).TrimEnd(new char[] { (char)0, ' ' });
+                int WriteDescriptorCount = ByteOperations.ReadInt32(ShortStoreHeader, 208);
+                UInt32 WriteDescriptorLength = ByteOperations.ReadUInt32(ShortStoreHeader, 212);
+                UInt32 ValidateDescriptorLength = ByteOperations.ReadUInt32(ShortStoreHeader, 220);
+                StoreHeader = new byte[RoundUpToChunks(248 + WriteDescriptorLength + ValidateDescriptorLength)];
+                FFUFile.Seek(SecurityHeader.Length + ImageHeader.Length, SeekOrigin.Begin);
+                FFUFile.Read(StoreHeader, 0, StoreHeader.Length);
+
+                // Parse Chunk Indexes
+                int HighestChunkIndex = 0;
+                UInt32 LocationCount;
+                int ChunkIndex;
+                int ChunkCount;
+                int DiskAccessMethod;
+                UInt32 WriteDescriptorEntryOffset = 248 + ValidateDescriptorLength;
+                int FFUChunkIndex = 0;
+                for (int i = 0; i < WriteDescriptorCount; i++)
+                {
+                    LocationCount = ByteOperations.ReadUInt32(StoreHeader, WriteDescriptorEntryOffset + 0x00);
+                    ChunkCount = ByteOperations.ReadInt32(StoreHeader, WriteDescriptorEntryOffset + 0x04);
+
+                    for (int j = 0; j < LocationCount; j++)
+                    {
+                        DiskAccessMethod = ByteOperations.ReadInt32(StoreHeader, (UInt32)(WriteDescriptorEntryOffset + 0x08 + (j * 0x08)));
+                        ChunkIndex = ByteOperations.ReadInt32(StoreHeader, (UInt32)(WriteDescriptorEntryOffset + 0x0C + (j * 0x08)));
+
+                        if (DiskAccessMethod == 0 && (ChunkIndex + ChunkCount - 1) > HighestChunkIndex) // 0 = From begin, 2 = From end. We ignore chunks at end of disk. These contain secondairy GPT.
+                        {
+                            HighestChunkIndex = ChunkIndex + ChunkCount - 1;
+                        }
+                    }
+                    WriteDescriptorEntryOffset += 8 + (LocationCount * 0x08);
+                    FFUChunkIndex += ChunkCount;
+                }
+                ChunkIndexes = new int?[HighestChunkIndex + 1];
+                WriteDescriptorEntryOffset = 248 + ValidateDescriptorLength;
+                FFUChunkIndex = 0;
+                for (int i = 0; i < WriteDescriptorCount; i++)
+                {
+                    LocationCount = ByteOperations.ReadUInt32(StoreHeader, WriteDescriptorEntryOffset + 0x00);
+                    ChunkCount = ByteOperations.ReadInt32(StoreHeader, WriteDescriptorEntryOffset + 0x04);
+
+                    for (int j = 0; j < LocationCount; j++)
+                    {
+                        DiskAccessMethod = ByteOperations.ReadInt32(StoreHeader, (UInt32)(WriteDescriptorEntryOffset + 0x08 + (j * 0x08)));
+                        ChunkIndex = ByteOperations.ReadInt32(StoreHeader, (UInt32)(WriteDescriptorEntryOffset + 0x0C + (j * 0x08)));
+
+                        if (DiskAccessMethod == 0) // 0 = From begin, 2 = From end. We ignore chunks at end of disk. These contain secondairy GPT.
+                        {
+                            for (int k = 0; k < ChunkCount; k++)
+                            {
+                                ChunkIndexes[ChunkIndex + k] = FFUChunkIndex + k;
+                            }
+                        }
+                    }
+                    WriteDescriptorEntryOffset += 8 + (LocationCount * 0x08);
+                    FFUChunkIndex += ChunkCount;
+                }
+
+                byte[] GPTBuffer = GetSectors(0x01, 0x21);
+                GPT = new GPT(GPTBuffer);
+
+                HeaderSize = (UInt64)(SecurityHeader.Length + ImageHeader.Length + StoreHeader.Length);
+
+                TotalChunkCount = (UInt64)FFUChunkIndex;
+                PayloadSize = TotalChunkCount * (UInt64)ChunkSize;
+                TotalSize = HeaderSize + PayloadSize;
+
+                if (TotalSize != (UInt64)FFUFile.Length)
+                {
+                    throw new WPinternalsException("Bad FFU file", "Bad FFU file: " + Path + "." + Environment.NewLine + "Expected size: " + TotalSize.ToString() + ". Actual size: " + FFUFile.Length + ".");
+                }
+            }
+            catch (WPinternalsException)
+            {
+                throw;
+            }
+            catch (Exception Ex)
+            {
+                throw new WPinternalsException("Bad FFU file", "Bad FFU file: " + Path + "." + Environment.NewLine + Ex.Message, Ex);
+            }
+            finally
+            {
+                CloseFile();
+            }
+        }
+
+        internal static bool IsFFU(string FileName)
+        {
+            bool Result = false;
+
+            FileStream FFUFile = new(FileName, FileMode.Open, FileAccess.Read);
+
+            byte[] Signature = new byte[0x10];
+            FFUFile.Read(Signature, 0, 0x10);
+
+            Result = ByteOperations.ReadAsciiString(Signature, 0x04, 0x0C) == "SignedImage ";
+
+            FFUFile.Close();
+
+            return Result;
+        }
+
+        private void OpenFile()
+        {
+            if (FFUFile == null)
+            {
+                FFUFile = new FileStream(Path, FileMode.Open, FileAccess.Read);
+                FileOpenCount = 0;
+            }
+            FileOpenCount++;
+        }
+
+        private void CloseFile()
+        {
+            FileOpenCount--;
+            if (FileOpenCount == 0)
+            {
+                FFUFile.Close();
+                FFUFile = null;
+            }
+        }
+
+        private void FileSeek(long Position)
+        {
+            // https://social.msdn.microsoft.com/Forums/vstudio/en-US/2e67ca57-3556-4275-accd-58b7df30d424/unnecessary-filestreamseek-and-setting-filestreamposition-has-huge-effect-on-performance?forum=csharpgeneral
+
+            if (FFUFile != null && FFUFile.Position != Position)
+            {
+                FFUFile.Seek(Position, SeekOrigin.Begin);
+            }
+        }
+
+        internal UInt32 RoundUpToChunks(UInt32 Size)
+        {
+            if ((Size % ChunkSize) > 0)
+            {
+                return (UInt32)(((Size / ChunkSize) + 1) * ChunkSize);
+            }
+            else
+            {
+                return Size;
+            }
+        }
+
+        internal UInt32 RoundDownToChunks(UInt32 Size)
+        {
+            if ((Size % ChunkSize) > 0)
+            {
+                return (UInt32)(Size / ChunkSize * ChunkSize);
+            }
+            else
+            {
+                return Size;
+            }
+        }
+
+        internal byte[] GetSectors(int StartSector, int SectorCount)
+        {
+            int FirstChunk = GetChunkIndexFromSectorIndex(StartSector);
+            int LastChunk = GetChunkIndexFromSectorIndex(StartSector + SectorCount - 1);
+
+            byte[] Buffer = new byte[ChunkSize];
+
+            OpenFile();
+
+            byte[] Result = new byte[SectorCount * 0x200];
+
+            int ResultOffset = 0;
+
+            for (int j = FirstChunk; j <= LastChunk; j++)
+            {
+                GetChunk(Buffer, j);
+
+                int FirstSector = 0;
+                int LastSector = (ChunkSize / 0x200) - 1;
+
+                if (j == FirstChunk)
+                {
+                    FirstSector = GetSectorNumberInChunkFromSectorIndex(StartSector);
+                }
+
+                if (j == LastChunk)
+                {
+                    LastSector = GetSectorNumberInChunkFromSectorIndex(StartSector + SectorCount - 1);
+                }
+
+                int Offset = FirstSector * 0x200;
+                int Size = (LastSector - FirstSector + 1) * 0x200;
+
+                System.Buffer.BlockCopy(Buffer, Offset, Result, ResultOffset, Size);
+
+                ResultOffset += Size;
+            }
+
+            CloseFile();
+
+            return Result;
+        }
+
+        internal byte[] GetPartition(string Name)
+        {
+            Partition Target = GPT.Partitions.Find(p => string.Equals(p.Name, Name, StringComparison.CurrentCultureIgnoreCase));
+            if (Target == null)
+            {
+                throw new ArgumentOutOfRangeException();
+            }
+
+            return GetSectors((int)Target.FirstSector, (int)(Target.LastSector - Target.FirstSector + 1));
+        }
+
+        internal void WritePartition(string Name, string FilePath, bool Compress = false)
+        {
+            WritePartition(Name, FilePath, null, null, Compress);
+        }
+
+        internal void WritePartition(string Name, string FilePath, Action<int, TimeSpan?> ProgressUpdateCallback, bool Compress = false)
+        {
+            WritePartition(Name, FilePath, ProgressUpdateCallback, null, Compress);
+        }
+
+        internal void WritePartition(string Name, string FilePath, ProgressUpdater UpdaterPerSector, bool Compress = false)
+        {
+            WritePartition(Name, FilePath, null, UpdaterPerSector, Compress);
+        }
+
+        private void WritePartition(string Name, string FilePath, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector, bool Compress = false)
+        {
+            Partition Target = GPT.Partitions.Find(p => string.Equals(p.Name, Name, StringComparison.CurrentCultureIgnoreCase));
+            if (Target == null)
+            {
+                throw new ArgumentOutOfRangeException();
+            }
+
+            int FirstChunk = GetChunkIndexFromSectorIndex((int)Target.FirstSector);
+            int LastChunk = GetChunkIndexFromSectorIndex((int)Target.LastSector);
+
+            ProgressUpdater Updater = UpdaterPerSector;
+            if ((Updater == null) && (ProgressUpdateCallback != null))
+            {
+                Updater = new ProgressUpdater(Target.LastSector - Target.FirstSector + 1, ProgressUpdateCallback);
+            }
+
+            byte[] Buffer = new byte[ChunkSize];
+
+            OpenFile();
+
+            FileStream OutputFile = new(FilePath, FileMode.Create, FileAccess.Write);
+            Stream OutStream = OutputFile;
+
+            // We use gzip compression
+            //
+            // LZMA is about 60 times slower (compression is twice as good, but compressed size is already really small, so it doesnt matter much)
+            // OutStream = new LZMACompressionStream(OutputFile, System.IO.Compression.CompressionMode.Compress, false);
+            //
+            // DeflateStream is a raw compression stream without recognizable header
+            // Deflate has almost no performance penalty
+            // OutStream = new DeflateStream(OutputFile, CompressionLevel.Optimal, false);
+            //
+            // GZip can be recognized. It always starts with 1F 8B 08 (1F 8B is the magic value, 08 is the Deflate compression method)
+            // With GZip compression, dump time goes from 1m to 1m37s. So that doesnt matter much.
+            if (Compress)
+            {
+                OutStream = new CompressedStream(OutputFile, (Target.LastSector - Target.FirstSector + 1) * 0x200);
+            }
+
+            for (int j = FirstChunk; j <= LastChunk; j++)
+            {
+                GetChunk(Buffer, j);
+
+                int FirstSector = 0;
+                int LastSector = (ChunkSize / 0x200) - 1;
+
+                if (j == FirstChunk)
+                {
+                    FirstSector = GetSectorNumberInChunkFromSectorIndex((int)Target.FirstSector);
+                }
+
+                if (j == LastChunk)
+                {
+                    LastSector = GetSectorNumberInChunkFromSectorIndex((int)Target.LastSector);
+                }
+
+                int Offset = FirstSector * 0x200;
+                int Size = (LastSector - FirstSector + 1) * 0x200;
+
+                OutStream.Write(Buffer, Offset, Size);
+
+                Updater?.IncreaseProgress((UInt64)(ChunkSize / 0x200));
+            }
+
+            OutStream.Close();
+
+            CloseFile();
+        }
+
+        private byte[] GetChunk(int ChunkIndex)
+        {
+            long BaseOffset = (long)SecurityHeader.Length + ImageHeader.Length + StoreHeader.Length;
+            if (ChunkIndexes[ChunkIndex] == null)
+            {
+                return new byte[ChunkSize];
+            }
+            else
+            {
+                OpenFile();
+                FileSeek(BaseOffset + ((long)ChunkIndexes[ChunkIndex] * ChunkSize));
+                byte[] Chunk = new byte[ChunkSize];
+                FFUFile.Read(Chunk, 0, ChunkSize);
+                CloseFile();
+                return Chunk;
+            }
+        }
+
+        private void GetChunk(byte[] Chunk, int ChunkIndex)
+        {
+            long BaseOffset = SecurityHeader.Length + ImageHeader.Length + StoreHeader.Length;
+            if (ChunkIndexes[ChunkIndex] == null)
+            {
+                Array.Clear(Chunk, 0, ChunkSize);
+            }
+            else
+            {
+                OpenFile();
+                FileSeek(BaseOffset + ((long)ChunkIndexes[ChunkIndex] * ChunkSize));
+                FFUFile.Read(Chunk, 0, ChunkSize);
+                CloseFile();
+            }
+        }
+
+        private int GetChunkIndexFromSectorIndex(int SectorIndex)
+        {
+            int SectorsPerChunk = ChunkSize / 0x200;
+            return SectorIndex / SectorsPerChunk;
+        }
+
+        private int GetSectorNumberInChunkFromSectorIndex(int SectorIndex)
+        {
+            int SectorsPerChunk = ChunkSize / 0x200;
+            return SectorIndex % SectorsPerChunk;
+        }
+
+        internal bool IsPartitionPresentInFFU(string PartitionName)
+        {
+            Partition Target = GPT.GetPartition(PartitionName);
+            if (Target == null)
+            {
+                throw new InvalidOperationException("Partitionname is not found!");
+            }
+
+            int ChunkIndex = GetChunkIndexFromSectorIndex((int)Target.FirstSector);
+            return ChunkIndexes[ChunkIndex] != null;
+        }
+
+        private int GetChunkIndexFromSectorIndex(ulong p)
+        {
+            throw new NotImplementedException();
+        }
+
+        internal string GetFirmwareVersion()
+        {
+            string Result = null;
+
+            Partition Plat = GPT.GetPartition("PLAT");
+            if (Plat != null)
+            {
+                byte[] Data = GetPartition("PLAT");
+                uint? Offset = ByteOperations.FindAscii(Data, "SWVERSION=");
+                if (Offset != null)
+                {
+                    uint Start = (uint)Offset + 10;
+                    uint Length = (uint)ByteOperations.FindPattern(Data, Start, 0x100, new byte[] { 0x00 }, null, null) - Start;
+                    uint? Offset0D = ByteOperations.FindPattern(Data, Start, 0x100, new byte[] { 0x0D }, null, null);
+                    if ((Offset0D != null) && (Offset0D < (Start + Length)))
+                    {
+                        Length = (uint)Offset0D - Start;
+                    }
+
+                    Result = ByteOperations.ReadAsciiString(Data, Start, Length);
+                }
+            }
+
+            return Result;
+        }
+
+        internal string GetOSVersion()
+        {
+            byte[] efiesp = GetPartition("EFIESP");
+            MemoryStream s = new(efiesp);
+            DiscUtils.Fat.FatFileSystem fs = new(s);
+            Stream mss = fs.OpenFile(@"\Windows\System32\Boot\mobilestartup.efi", FileMode.Open, FileAccess.Read);
+            MemoryStream msms = new();
+            mss.CopyTo(msms);
+            byte[] mobilestartup = msms.ToArray();
+            Version OSVersion = PE.GetProductVersion(mobilestartup);
+            s.Close();
+
+            return OSVersion.ToString();
+        }
+    }
+}
diff --git a/Models/GPT.cs b/WPinternals/Models/GPT.cs
similarity index 97%
rename from Models/GPT.cs
rename to WPinternals/Models/GPT.cs
index 7229851..2a2e622 100644
--- a/Models/GPT.cs
+++ b/WPinternals/Models/GPT.cs
@@ -1,712 +1,712 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Xml.Serialization;
-
-namespace WPinternals
-{
-    [XmlType("Partitions")]
-    public class GPT
-    {
-        private byte[] GPTBuffer;
-        private readonly UInt32 HeaderOffset;
-        private readonly UInt32 HeaderSize;
-        private UInt32 TableOffset;
-        private UInt32 TableSize;
-        private readonly UInt32 PartitionEntrySize;
-        private readonly UInt32 MaxPartitions;
-        internal UInt64 FirstUsableSector;
-        internal UInt64 LastUsableSector;
-        internal bool HasChanged = false;
-
-        [XmlElement("Partition")]
-        public List<Partition> Partitions = new();
-
-        public GPT() // Only for serialization
-        {
-        }
-
-        internal GPT(byte[] GPTBuffer)
-        {
-            this.GPTBuffer = GPTBuffer;
-            UInt32? TempHeaderOffset = ByteOperations.FindAscii(GPTBuffer, "EFI PART");
-            if (TempHeaderOffset == null)
-            {
-                throw new WPinternalsException("Bad GPT", "The GPT read isn't valid. Couldn't find the text \"EFI PART\".");
-            }
-
-            HeaderOffset = (UInt32)TempHeaderOffset;
-            HeaderSize = ByteOperations.ReadUInt32(GPTBuffer, HeaderOffset + 0x0C);
-            TableOffset = HeaderOffset + 0x200;
-            FirstUsableSector = ByteOperations.ReadUInt64(GPTBuffer, HeaderOffset + 0x28);
-            LastUsableSector = ByteOperations.ReadUInt64(GPTBuffer, HeaderOffset + 0x30);
-            MaxPartitions = ByteOperations.ReadUInt32(GPTBuffer, HeaderOffset + 0x50);
-            PartitionEntrySize = ByteOperations.ReadUInt32(GPTBuffer, HeaderOffset + 0x54);
-            TableSize = MaxPartitions * PartitionEntrySize;
-            if ((TableOffset + TableSize) > GPTBuffer.Length)
-            {
-                throw new WPinternalsException("Bad GPT", "The GPT read isn't valid. The sizes defined in the GPT header exceed the provided GPT size.");
-            }
-
-            UInt32 PartitionOffset = TableOffset;
-
-            while (PartitionOffset < (TableOffset + TableSize))
-            {
-                string Name = ByteOperations.ReadUnicodeString(GPTBuffer, PartitionOffset + 0x38, 0x48).TrimEnd(new char[] { (char)0, ' ' });
-                if (Name.Length == 0)
-                {
-                    break;
-                }
-
-                Partition CurrentPartition = new();
-                CurrentPartition.Name = Name;
-                CurrentPartition.FirstSector = ByteOperations.ReadUInt64(GPTBuffer, PartitionOffset + 0x20);
-                CurrentPartition.LastSector = ByteOperations.ReadUInt64(GPTBuffer, PartitionOffset + 0x28);
-                CurrentPartition.PartitionTypeGuid = ByteOperations.ReadGuid(GPTBuffer, PartitionOffset + 0x00);
-                CurrentPartition.PartitionGuid = ByteOperations.ReadGuid(GPTBuffer, PartitionOffset + 0x10);
-                CurrentPartition.Attributes = ByteOperations.ReadUInt64(GPTBuffer, PartitionOffset + 0x30);
-                Partitions.Add(CurrentPartition);
-                PartitionOffset += PartitionEntrySize;
-            }
-
-            HasChanged = false;
-        }
-
-        internal Partition GetPartition(string Name)
-        {
-            return Partitions.Find(p => string.Equals(p.Name, Name, StringComparison.CurrentCultureIgnoreCase));
-        }
-
-        // Magic!
-        // SecureBoot hack for Bootloader Spec A starts here
-        internal byte[] InsertHack()
-        {
-            Partition HackPartition = Partitions.Find(p => p.Name == "HACK");
-            Partition SBL1 = Partitions.Find(p => p.Name == "SBL1");
-            Partition SBL2 = Partitions.Find(p => p.Name == "SBL2");
-
-            if ((SBL1 == null) || (SBL2 == null))
-            {
-                throw new WPinternalsException("Bad GPT", "Can't patch GPT for the Secure Boot hack for Spec A devices. The provided GPT does not include a SBL1 and/or SBL2 partition.");
-            }
-
-            if (HackPartition == null)
-            {
-                HackPartition = new Partition
-                {
-                    Name = "HACK",
-                    Attributes = SBL2.Attributes,
-                    FirstSector = SBL1.LastSector,
-                    LastSector = SBL1.LastSector,
-
-                    PartitionTypeGuid = SBL2.PartitionTypeGuid,
-                    PartitionGuid = SBL2.PartitionGuid
-                };
-
-                Partitions.Add(HackPartition);
-
-                SBL1.LastSector--;
-
-                SBL2.PartitionTypeGuid = new Guid(new byte[] { 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74 });
-                SBL2.PartitionGuid = new Guid(new byte[] { 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74 });
-            }
-
-            HasChanged = true;
-
-            return Rebuild();
-        }
-
-        internal byte[] RemoveHack()
-        {
-            Partition HackPartition = Partitions.Find(p => p.Name == "HACK");
-            Partition SBL1 = Partitions.Find(p => p.Name == "SBL1");
-            Partition SBL2 = Partitions.Find(p => p.Name == "SBL2");
-
-            if ((SBL1 == null) || (SBL2 == null))
-            {
-                throw new WPinternalsException("Bad GPT", "Can't un-patch GPT for the Secure Boot hack for Spec A devices. The provided GPT does not include a SBL1 and/or SBL2 partition.");
-            }
-
-            if (HackPartition != null)
-            {
-                SBL2.PartitionTypeGuid = HackPartition.PartitionTypeGuid;
-                SBL2.PartitionGuid = HackPartition.PartitionGuid;
-
-                Partitions.Remove(HackPartition);
-
-                SBL1.LastSector++;
-            }
-
-            HasChanged = true;
-
-            return Rebuild();
-        }
-
-        internal byte[] Rebuild()
-        {
-            if (GPTBuffer == null)
-            {
-                TableSize = 0x4200;
-                TableOffset = 0;
-                GPTBuffer = new byte[TableSize];
-            }
-            else
-            {
-                Array.Clear(GPTBuffer, (int)TableOffset, (int)TableSize);
-            }
-
-            UInt32 PartitionOffset = TableOffset;
-            foreach (Partition CurrentPartition in Partitions)
-            {
-                ByteOperations.WriteGuid(GPTBuffer, PartitionOffset + 0x00, CurrentPartition.PartitionTypeGuid);
-                ByteOperations.WriteGuid(GPTBuffer, PartitionOffset + 0x10, CurrentPartition.PartitionGuid);
-                ByteOperations.WriteUInt64(GPTBuffer, PartitionOffset + 0x20, CurrentPartition.FirstSector);
-                ByteOperations.WriteUInt64(GPTBuffer, PartitionOffset + 0x28, CurrentPartition.LastSector);
-                ByteOperations.WriteUInt64(GPTBuffer, PartitionOffset + 0x30, CurrentPartition.Attributes);
-                ByteOperations.WriteUnicodeString(GPTBuffer, PartitionOffset + 0x38, CurrentPartition.Name, 0x48);
-
-                PartitionOffset += PartitionEntrySize;
-            }
-
-            ByteOperations.WriteUInt32(GPTBuffer, HeaderOffset + 0x58, ByteOperations.CRC32(GPTBuffer, TableOffset, TableSize));
-            ByteOperations.WriteUInt32(GPTBuffer, HeaderOffset + 0x10, 0);
-            ByteOperations.WriteUInt32(GPTBuffer, HeaderOffset + 0x10, ByteOperations.CRC32(GPTBuffer, HeaderOffset, HeaderSize));
-
-            return GPTBuffer;
-        }
-
-        internal void MergePartitionsFromFile(string Path, bool RoundToChunks)
-        {
-            MergePartitions(File.ReadAllText(Path), RoundToChunks);
-        }
-
-        internal void MergePartitionsFromStream(Stream Partitions, bool RoundToChunks)
-        {
-            using TextReader tr = new StreamReader(Partitions);
-            MergePartitions(tr.ReadToEnd(), RoundToChunks);
-        }
-
-        internal void MergePartitions(string Xml, bool RoundToChunks, ZipArchive Archive = null)
-        {
-            GPT GptToMerge;
-            if (Xml == null)
-            {
-                GptToMerge = new GPT();
-            }
-            else
-            {
-                XmlSerializer x = new(typeof(GPT), "");
-                MemoryStream s = new(System.Text.Encoding.ASCII.GetBytes(Xml));
-                GptToMerge = (GPT)x.Deserialize(s);
-                s.Dispose();
-            }
-
-            if (Archive != null)
-            {
-                foreach (Partition NewPartition in GptToMerge.Partitions)
-                {
-                    ZipArchiveEntry Entry = Archive.Entries.FirstOrDefault(e => string.Equals(e.Name, NewPartition.Name, StringComparison.CurrentCultureIgnoreCase) || e.Name.StartsWith(NewPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US")));
-                    if (Entry == null)
-                    {
-                        // There is a partition entry in the xml, but this partition is not present in the archive.
-
-                        Partition OldPartition = GetPartition(NewPartition.Name);
-                        if (OldPartition == null)
-                        {
-                            // The partition entry in the xml is also not present in the current partition table.
-                            // It must have a know position and length.
-
-                            if (NewPartition.LastSector == 0)
-                            {
-                                throw new WPinternalsException("Unknown length for partition \"" + NewPartition.Name + "\". The last sector property is set to 0 and the partition doesn't exist on the device currently.");
-                            }
-                        }
-                        else
-                        {
-                            // The partition entry in the xml is also present in the current partition table.
-                            // But since the partition is not present in the archive, the partition cannot be relocated.
-                            // If the location of the new partition is specified, it must be the same as the current partition.
-
-                            if ((NewPartition.FirstSector != 0) && (NewPartition.FirstSector != OldPartition.FirstSector))
-                            {
-                                throw new WPinternalsException("Incorrect location for partition \"" + NewPartition.Name + "\". A partition defined in the xml file got its boundaries updated, but as the partition isn't provided in the archive, it is not possible to relocate it.");
-                            }
-
-                            if ((NewPartition.LastSector != 0) && (NewPartition.LastSector != OldPartition.LastSector))
-                            {
-                                throw new WPinternalsException("Incorrect length for partition \"" + NewPartition.Name + "\". A partition defined in the xml file got its boundaries updated, but as the partition isn't provided in the archive, it is not possible to relocate it.");
-                            }
-
-                            NewPartition.FirstSector = OldPartition.FirstSector;
-                            NewPartition.LastSector = OldPartition.LastSector;
-                        }
-                    }
-                    else
-                    {
-                        // The partition in the xml is also present in the archive.
-                        // If the length is specified in the xml, it must match the file in the archive.
-
-                        ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
-                        using (DecompressedStream DecompressedStream = new(Entry.Open()))
-                        {
-                            try
-                            {
-                                StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
-                            }
-                            catch { }
-                        }
-
-                        if (NewPartition.LastSector == 0)
-                        {
-                            NewPartition.SizeInSectors = StreamLengthInSectors;
-                        }
-                        else
-                        {
-                            if (NewPartition.SizeInSectors != StreamLengthInSectors)
-                            {
-                                throw new WPinternalsException("Inconsistent length specified for partition \"" + NewPartition.Name + "\". The provided partition in the archive does not match the length specified in the xml file.");
-                            }
-                        }
-                    }
-                }
-            }
-            else
-            {
-                foreach (Partition NewPartition in GptToMerge.Partitions)
-                {
-                    // This is a partition entry in the xml, and there is no archive.
-
-                    Partition OldPartition = GetPartition(NewPartition.Name);
-                    if (OldPartition == null)
-                    {
-                        // The partition entry in the xml is also not present in the current partition table.
-                        // It must have a known position and length.
-
-                        if (NewPartition.LastSector == 0)
-                        {
-                            throw new WPinternalsException("Unknown length for partition \"" + NewPartition.Name + "\". The last sector property is set to 0 and the partition doesn't exist on the device currently.");
-                        }
-                    }
-                    else
-                    {
-                        // The partition entry in the xml is also present in the current partition table.
-                        // But since the partition is not present in the archive, the partition cannot be relocated.
-                        // If the location of the new partition is specified, it must be the same as the current partition.
-
-                        if ((NewPartition.FirstSector != 0) && (NewPartition.FirstSector != OldPartition.FirstSector))
-                        {
-                            throw new WPinternalsException("Incorrect location for partition \"" + NewPartition.Name + "\". A partition defined in the xml file got its boundaries updated, but as the partition isn't provided in the archive, it is not possible to relocate it.");
-                        }
-
-                        if ((NewPartition.LastSector != 0) && (NewPartition.LastSector != OldPartition.LastSector))
-                        {
-                            throw new WPinternalsException("Incorrect length for partition \"" + NewPartition.Name + "\". A partition defined in the xml file got its boundaries updated, but as the partition isn't provided in the archive, it is not possible to relocate it.");
-                        }
-
-                        NewPartition.FirstSector = OldPartition.FirstSector;
-                        NewPartition.LastSector = OldPartition.LastSector;
-                    }
-                }
-            }
-
-            List<Partition> DynamicPartitions = new();
-            if (Archive != null)
-            {
-                // Partitions which are present in the archive, and which have no start-sector in the new GPT data (dynamic relocation),
-                // and which can be clustered to the end of emmc, are first removed from the existing GPT.
-                IEnumerable<Partition> SortedPartitions = Partitions.OrderBy(p => p.FirstSector);
-                for (int i = SortedPartitions.Count() - 1; i >= 0; i--)
-                {
-                    Partition OldPartition = SortedPartitions.ElementAt(i);
-
-                    // Present in archive?
-                    ZipArchiveEntry Entry = Archive.Entries.FirstOrDefault(e => string.Equals(e.Name, OldPartition.Name, StringComparison.CurrentCultureIgnoreCase) || e.Name.StartsWith(OldPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US")));
-                    if (Entry != null)
-                    {
-                        // Not present in new GPT or present in GPT without FirstSector?
-                        Partition NewPartition = GptToMerge.GetPartition(OldPartition.Name);
-                        if ((NewPartition == null) || (NewPartition.FirstSector == 0))
-                        {
-                            DynamicPartitions.Insert(0, OldPartition);
-                            this.Partitions.Remove(OldPartition);
-                        }
-                        else
-                        {
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        break;
-                    }
-                }
-            }
-
-            // All partitions in the new GPT data should have a start-sector and end-sector by now.
-            // The partitions in the new GPT data will be applied to the current partition-table.
-            // Existing partitions, which are overwritten by the new partitions will be removed from the existing GPT.
-            // Existing partition with the same name in the existing GPT is reused (guids and attribs remain, if not specified).
-            UInt64 LowestSector = 0;
-            Partition DPP = this.GetPartition("DPP");
-            if (DPP != null)
-            {
-                LowestSector = DPP.LastSector + 1;
-            }
-
-            foreach (Partition NewPartition in GptToMerge.Partitions)
-            {
-                // If the new partition is a dynamic partition, then skip it here. It will be added later.
-                if (DynamicPartitions.Select(p => p.Name).Any(n => string.Equals(n, NewPartition.Name, StringComparison.CurrentCultureIgnoreCase)))
-                {
-                    continue;
-                }
-
-                // Sanity check
-                if (NewPartition.FirstSector < LowestSector)
-                {
-                    throw new WPinternalsException("Bad sector alignment for partition: " + NewPartition.Name + ". The partition is located before DPP.");
-                }
-
-                Partition CurrentPartition = this.GetPartition(NewPartition.Name);
-                if (CurrentPartition == null)
-                {
-                    CurrentPartition = new Partition
-                    {
-                        Name = NewPartition.Name
-                    };
-                    this.Partitions.Add(CurrentPartition);
-                    HasChanged = true;
-                }
-
-                if ((NewPartition.FirstSector != 0) && (NewPartition.FirstSector != CurrentPartition.FirstSector))
-                {
-                    CurrentPartition.FirstSector = NewPartition.FirstSector;
-                    HasChanged = true;
-                }
-                if ((NewPartition.LastSector != 0) && (NewPartition.LastSector != CurrentPartition.LastSector))
-                {
-                    CurrentPartition.LastSector = NewPartition.LastSector;
-                    HasChanged = true;
-                }
-                if ((NewPartition.Attributes != 0) && (CurrentPartition.Attributes != NewPartition.Attributes))
-                {
-                    CurrentPartition.Attributes = NewPartition.Attributes;
-                    HasChanged = true;
-                }
-
-                if ((NewPartition.PartitionGuid != Guid.Empty) || (NewPartition.PartitionGuid != CurrentPartition.PartitionGuid))
-                {
-                    HasChanged = true;
-                }
-
-                if (NewPartition.PartitionGuid != Guid.Empty)
-                {
-                    CurrentPartition.PartitionGuid = NewPartition.PartitionGuid;
-                }
-
-                if (CurrentPartition.PartitionGuid != Guid.Empty)
-                {
-                    CurrentPartition.PartitionGuid = Guid.NewGuid();
-                }
-
-                if ((NewPartition.PartitionTypeGuid != Guid.Empty) || (NewPartition.PartitionTypeGuid != CurrentPartition.PartitionTypeGuid))
-                {
-                    HasChanged = true;
-                }
-
-                if (NewPartition.PartitionTypeGuid != Guid.Empty)
-                {
-                    CurrentPartition.PartitionTypeGuid = NewPartition.PartitionTypeGuid;
-                }
-
-                if (CurrentPartition.PartitionTypeGuid != Guid.Empty)
-                {
-                    CurrentPartition.PartitionTypeGuid = Guid.NewGuid();
-                }
-
-                for (int i = this.Partitions.Count - 1; i >= 0; i--)
-                {
-                    if (this.Partitions[i] != CurrentPartition && (CurrentPartition.FirstSector <= this.Partitions[i].LastSector) && (CurrentPartition.LastSector >= this.Partitions[i].FirstSector))
-                    {
-                        this.Partitions.RemoveAt(i);
-                        HasChanged = true;
-                    }
-                }
-            }
-
-            if (Archive != null)
-            {
-                // All partitions listed in the archive, which are present in the existing GPT, should overwrite the existing partition.
-                // Check if the sizes of the partitions in the archive do not exceed the size of the partition, as listed in the GPT.
-                foreach (Partition OldPartition in this.Partitions)
-                {
-                    ZipArchiveEntry Entry = Archive.Entries.FirstOrDefault(e => string.Equals(e.Name, OldPartition.Name, StringComparison.CurrentCultureIgnoreCase) || e.Name.StartsWith(OldPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US")));
-                    if (Entry != null)
-                    {
-                        DecompressedStream DecompressedStream = new(Entry.Open());
-                        ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
-                        try
-                        {
-                            StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
-                        }
-                        catch { }
-                        DecompressedStream.Close();
-
-                        UInt64 MaxPartitionSizeInSectors = OldPartition.SizeInSectors;
-                        Partition NextPartition = this.Partitions.Where(p => p.FirstSector > OldPartition.FirstSector).OrderBy(p => p.FirstSector).FirstOrDefault();
-                        if (NextPartition != null)
-                        {
-                            MaxPartitionSizeInSectors = NextPartition.FirstSector - OldPartition.FirstSector;
-                        }
-
-                        if (StreamLengthInSectors > MaxPartitionSizeInSectors)
-                        {
-                            throw new WPinternalsException("Incorrect length for partition \"" + OldPartition.Name + "\". The provided partition in the archive does not match the length specified in the xml file.");
-                        }
-
-                        if (OldPartition.SizeInSectors != StreamLengthInSectors)
-                        {
-                            OldPartition.SizeInSectors = StreamLengthInSectors;
-                            HasChanged = true;
-                        }
-                    }
-                }
-
-                // All remaining partitions in the archive, which were listed in the original GPT, 
-                // should be added at the end of the partition-table.
-                UInt64 FirstFreeSector = 0x5000;
-                if (this.Partitions.Count > 0)
-                {
-                    FirstFreeSector = this.Partitions.Max(p => p.LastSector) + 1;
-
-                    // Always start a new partition on a new chunk (0x100 sector boundary), to be more flexible during custom flash
-                    if (RoundToChunks && (((double)FirstFreeSector % 0x100) != 0))
-                    {
-                        FirstFreeSector = (UInt64)(Math.Ceiling((double)FirstFreeSector / 0x100) * 0x100);
-                    }
-                }
-                foreach (Partition NewPartition in DynamicPartitions)
-                {
-                    if (NewPartition.FirstSector != FirstFreeSector)
-                    {
-                        NewPartition.FirstSector = FirstFreeSector;
-                        HasChanged = true;
-                    }
-                    ZipArchiveEntry Entry = Archive.Entries.FirstOrDefault(e => string.Equals(e.Name, NewPartition.Name, StringComparison.CurrentCultureIgnoreCase) || e.Name.StartsWith(NewPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US")));
-                    DecompressedStream DecompressedStream = new(Entry.Open());
-                    ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
-                    try
-                    {
-                        StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
-                    }
-                    catch { }
-                    DecompressedStream.Close();
-                    if (NewPartition.SizeInSectors != StreamLengthInSectors)
-                    {
-                        NewPartition.SizeInSectors = StreamLengthInSectors;
-                        HasChanged = true;
-                    }
-                    this.Partitions.Add(NewPartition);
-                    FirstFreeSector += StreamLengthInSectors;
-
-                    // Always start a new partition on a new chunk (0x100 sector boundary), to be more flexible during custom flash
-                    if (RoundToChunks && (((double)FirstFreeSector % 0x100) != 0))
-                    {
-                        FirstFreeSector = (UInt64)(Math.Ceiling((double)FirstFreeSector / 0x100) * 0x100);
-                    }
-                }
-            }
-
-            Rebuild();
-        }
-
-        internal void WritePartitions(string Path)
-        {
-            string DirPath = System.IO.Path.GetDirectoryName(Path);
-            if (!Directory.Exists(DirPath))
-            {
-                Directory.CreateDirectory(DirPath);
-            }
-
-            XmlSerializer x = new(typeof(GPT), "");
-
-            XmlSerializerNamespaces ns = new();
-            ns.Add("", "");
-            StreamWriter FileWriter = new(Path);
-            x.Serialize(FileWriter, this, ns);
-            FileWriter.Close();
-        }
-
-        internal static GPT ReadPartitions(string Path)
-        {
-            XmlSerializer x = new(typeof(GPT), "");
-            using FileStream s = new(Path, FileMode.Open);
-            return (GPT)x.Deserialize(s);
-        }
-
-        internal void RestoreBackupPartitions()
-        {
-            // This is necessary, because the partitions and backup-partitions can exchange.
-            // This may cause the startsector to be higher than the maximum allowed sector for flashing with a Lumia V1 programmer (hardcoded in programmer)
-            foreach (string RevisePartitionName in (List<string>)(new(new string[] { "SBL1", "SBL2", "SBL3", "UEFI", "TZ", "RPM", "WINSECAPP" })))
-            {
-                Partition RevisePartition = GetPartition(RevisePartitionName);
-                Partition ReviseBackupPartition = GetPartition("BACKUP_" + RevisePartitionName);
-                if ((RevisePartition != null) && (ReviseBackupPartition != null) && (RevisePartition.FirstSector > ReviseBackupPartition.FirstSector))
-                {
-                    ulong OriginalFirstSector = RevisePartition.FirstSector;
-                    ulong OriginalLastSector = RevisePartition.LastSector;
-                    RevisePartition.FirstSector = ReviseBackupPartition.FirstSector;
-                    RevisePartition.LastSector = ReviseBackupPartition.LastSector;
-                    ReviseBackupPartition.FirstSector = OriginalFirstSector;
-                    ReviseBackupPartition.LastSector = OriginalLastSector;
-
-                    HasChanged = true;
-                }
-
-                if (RevisePartition.LastSector >= 0xF400)
-                {
-                    throw new WPinternalsException("Unsupported partition layout!", "The last sector of one of the BACKUP partitions defined in GPT exceeds the maximum threshold expected in order to restore BACKUP partitions to the device.");
-                }
-            }
-        }
-    }
-
-    public class Partition
-    {
-        private UInt64 _SizeInSectors;
-        private UInt64 _FirstSector;
-        private UInt64 _LastSector;
-
-        public string Name;            // 0x48
-        public Guid PartitionTypeGuid; // 0x10
-        public Guid PartitionGuid;     // 0x10
-        [XmlIgnore]
-        internal UInt64 Attributes;      // 0x08
-
-        [XmlIgnore]
-        internal UInt64 SizeInSectors
-        {
-            get
-            {
-                if (_SizeInSectors != 0)
-                {
-                    return _SizeInSectors;
-                }
-                else
-                {
-                    return LastSector - FirstSector + 1;
-                }
-            }
-            set
-            {
-                _SizeInSectors = value;
-                if (FirstSector != 0)
-                {
-                    LastSector = FirstSector + _SizeInSectors - 1;
-                }
-            }
-        }
-
-        [XmlIgnore]
-        internal UInt64 FirstSector // 0x08
-        {
-            get
-            {
-                return _FirstSector;
-            }
-            set
-            {
-                _FirstSector = value;
-                if (_SizeInSectors != 0)
-                {
-                    _LastSector = FirstSector + _SizeInSectors - 1;
-                }
-            }
-        }
-
-        [XmlIgnore]
-        internal UInt64 LastSector // 0x08
-        {
-            get
-            {
-                return _LastSector;
-            }
-            set
-            {
-                _LastSector = value;
-                _SizeInSectors = 0;
-            }
-        }
-
-        [XmlIgnore]
-        public string Volume
-        {
-            get
-            {
-                return @"\\?\Volume" + PartitionGuid.ToString("b") + @"\";
-            }
-        }
-
-        [XmlElement(ElementName = "FirstSector")]
-        public string FirstSectorAsString
-        {
-            get
-            {
-                return "0x" + FirstSector.ToString("X16");
-            }
-            set
-            {
-                FirstSector = Convert.ToUInt64(value, 16);
-            }
-        }
-
-        [XmlElement(ElementName = "LastSector")]
-        public string LastSectorAsString
-        {
-            get
-            {
-                return "0x" + LastSector.ToString("X16");
-            }
-            set
-            {
-                LastSector = Convert.ToUInt64(value, 16);
-            }
-        }
-
-        [XmlElement(ElementName = "Attributes")]
-        public string AttributesAsString
-        {
-            get
-            {
-                return "0x" + Attributes.ToString("X16");
-            }
-            set
-            {
-                Attributes = Convert.ToUInt64(value, 16);
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Xml.Serialization;
+
+namespace WPinternals
+{
+    [XmlType("Partitions")]
+    public class GPT
+    {
+        private byte[] GPTBuffer;
+        private readonly UInt32 HeaderOffset;
+        private readonly UInt32 HeaderSize;
+        private UInt32 TableOffset;
+        private UInt32 TableSize;
+        private readonly UInt32 PartitionEntrySize;
+        private readonly UInt32 MaxPartitions;
+        internal UInt64 FirstUsableSector;
+        internal UInt64 LastUsableSector;
+        internal bool HasChanged = false;
+
+        [XmlElement("Partition")]
+        public List<Partition> Partitions = new();
+
+        public GPT() // Only for serialization
+        {
+        }
+
+        internal GPT(byte[] GPTBuffer)
+        {
+            this.GPTBuffer = GPTBuffer;
+            UInt32? TempHeaderOffset = ByteOperations.FindAscii(GPTBuffer, "EFI PART");
+            if (TempHeaderOffset == null)
+            {
+                throw new WPinternalsException("Bad GPT", "The GPT read isn't valid. Couldn't find the text \"EFI PART\".");
+            }
+
+            HeaderOffset = (UInt32)TempHeaderOffset;
+            HeaderSize = ByteOperations.ReadUInt32(GPTBuffer, HeaderOffset + 0x0C);
+            TableOffset = HeaderOffset + 0x200;
+            FirstUsableSector = ByteOperations.ReadUInt64(GPTBuffer, HeaderOffset + 0x28);
+            LastUsableSector = ByteOperations.ReadUInt64(GPTBuffer, HeaderOffset + 0x30);
+            MaxPartitions = ByteOperations.ReadUInt32(GPTBuffer, HeaderOffset + 0x50);
+            PartitionEntrySize = ByteOperations.ReadUInt32(GPTBuffer, HeaderOffset + 0x54);
+            TableSize = MaxPartitions * PartitionEntrySize;
+            if ((TableOffset + TableSize) > GPTBuffer.Length)
+            {
+                throw new WPinternalsException("Bad GPT", "The GPT read isn't valid. The sizes defined in the GPT header exceed the provided GPT size.");
+            }
+
+            UInt32 PartitionOffset = TableOffset;
+
+            while (PartitionOffset < (TableOffset + TableSize))
+            {
+                string Name = ByteOperations.ReadUnicodeString(GPTBuffer, PartitionOffset + 0x38, 0x48).TrimEnd(new char[] { (char)0, ' ' });
+                if (Name.Length == 0)
+                {
+                    break;
+                }
+
+                Partition CurrentPartition = new();
+                CurrentPartition.Name = Name;
+                CurrentPartition.FirstSector = ByteOperations.ReadUInt64(GPTBuffer, PartitionOffset + 0x20);
+                CurrentPartition.LastSector = ByteOperations.ReadUInt64(GPTBuffer, PartitionOffset + 0x28);
+                CurrentPartition.PartitionTypeGuid = ByteOperations.ReadGuid(GPTBuffer, PartitionOffset + 0x00);
+                CurrentPartition.PartitionGuid = ByteOperations.ReadGuid(GPTBuffer, PartitionOffset + 0x10);
+                CurrentPartition.Attributes = ByteOperations.ReadUInt64(GPTBuffer, PartitionOffset + 0x30);
+                Partitions.Add(CurrentPartition);
+                PartitionOffset += PartitionEntrySize;
+            }
+
+            HasChanged = false;
+        }
+
+        internal Partition GetPartition(string Name)
+        {
+            return Partitions.Find(p => string.Equals(p.Name, Name, StringComparison.CurrentCultureIgnoreCase));
+        }
+
+        // Magic!
+        // SecureBoot hack for Bootloader Spec A starts here
+        internal byte[] InsertHack()
+        {
+            Partition HackPartition = Partitions.Find(p => p.Name == "HACK");
+            Partition SBL1 = Partitions.Find(p => p.Name == "SBL1");
+            Partition SBL2 = Partitions.Find(p => p.Name == "SBL2");
+
+            if ((SBL1 == null) || (SBL2 == null))
+            {
+                throw new WPinternalsException("Bad GPT", "Can't patch GPT for the Secure Boot hack for Spec A devices. The provided GPT does not include a SBL1 and/or SBL2 partition.");
+            }
+
+            if (HackPartition == null)
+            {
+                HackPartition = new Partition
+                {
+                    Name = "HACK",
+                    Attributes = SBL2.Attributes,
+                    FirstSector = SBL1.LastSector,
+                    LastSector = SBL1.LastSector,
+
+                    PartitionTypeGuid = SBL2.PartitionTypeGuid,
+                    PartitionGuid = SBL2.PartitionGuid
+                };
+
+                Partitions.Add(HackPartition);
+
+                SBL1.LastSector--;
+
+                SBL2.PartitionTypeGuid = new Guid(new byte[] { 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74 });
+                SBL2.PartitionGuid = new Guid(new byte[] { 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74 });
+            }
+
+            HasChanged = true;
+
+            return Rebuild();
+        }
+
+        internal byte[] RemoveHack()
+        {
+            Partition HackPartition = Partitions.Find(p => p.Name == "HACK");
+            Partition SBL1 = Partitions.Find(p => p.Name == "SBL1");
+            Partition SBL2 = Partitions.Find(p => p.Name == "SBL2");
+
+            if ((SBL1 == null) || (SBL2 == null))
+            {
+                throw new WPinternalsException("Bad GPT", "Can't un-patch GPT for the Secure Boot hack for Spec A devices. The provided GPT does not include a SBL1 and/or SBL2 partition.");
+            }
+
+            if (HackPartition != null)
+            {
+                SBL2.PartitionTypeGuid = HackPartition.PartitionTypeGuid;
+                SBL2.PartitionGuid = HackPartition.PartitionGuid;
+
+                Partitions.Remove(HackPartition);
+
+                SBL1.LastSector++;
+            }
+
+            HasChanged = true;
+
+            return Rebuild();
+        }
+
+        internal byte[] Rebuild()
+        {
+            if (GPTBuffer == null)
+            {
+                TableSize = 0x4200;
+                TableOffset = 0;
+                GPTBuffer = new byte[TableSize];
+            }
+            else
+            {
+                Array.Clear(GPTBuffer, (int)TableOffset, (int)TableSize);
+            }
+
+            UInt32 PartitionOffset = TableOffset;
+            foreach (Partition CurrentPartition in Partitions)
+            {
+                ByteOperations.WriteGuid(GPTBuffer, PartitionOffset + 0x00, CurrentPartition.PartitionTypeGuid);
+                ByteOperations.WriteGuid(GPTBuffer, PartitionOffset + 0x10, CurrentPartition.PartitionGuid);
+                ByteOperations.WriteUInt64(GPTBuffer, PartitionOffset + 0x20, CurrentPartition.FirstSector);
+                ByteOperations.WriteUInt64(GPTBuffer, PartitionOffset + 0x28, CurrentPartition.LastSector);
+                ByteOperations.WriteUInt64(GPTBuffer, PartitionOffset + 0x30, CurrentPartition.Attributes);
+                ByteOperations.WriteUnicodeString(GPTBuffer, PartitionOffset + 0x38, CurrentPartition.Name, 0x48);
+
+                PartitionOffset += PartitionEntrySize;
+            }
+
+            ByteOperations.WriteUInt32(GPTBuffer, HeaderOffset + 0x58, ByteOperations.CRC32(GPTBuffer, TableOffset, TableSize));
+            ByteOperations.WriteUInt32(GPTBuffer, HeaderOffset + 0x10, 0);
+            ByteOperations.WriteUInt32(GPTBuffer, HeaderOffset + 0x10, ByteOperations.CRC32(GPTBuffer, HeaderOffset, HeaderSize));
+
+            return GPTBuffer;
+        }
+
+        internal void MergePartitionsFromFile(string Path, bool RoundToChunks)
+        {
+            MergePartitions(File.ReadAllText(Path), RoundToChunks);
+        }
+
+        internal void MergePartitionsFromStream(Stream Partitions, bool RoundToChunks)
+        {
+            using TextReader tr = new StreamReader(Partitions);
+            MergePartitions(tr.ReadToEnd(), RoundToChunks);
+        }
+
+        internal void MergePartitions(string Xml, bool RoundToChunks, ZipArchive Archive = null)
+        {
+            GPT GptToMerge;
+            if (Xml == null)
+            {
+                GptToMerge = new GPT();
+            }
+            else
+            {
+                XmlSerializer x = new(typeof(GPT), "");
+                MemoryStream s = new(System.Text.Encoding.ASCII.GetBytes(Xml));
+                GptToMerge = (GPT)x.Deserialize(s);
+                s.Dispose();
+            }
+
+            if (Archive != null)
+            {
+                foreach (Partition NewPartition in GptToMerge.Partitions)
+                {
+                    ZipArchiveEntry Entry = Archive.Entries.FirstOrDefault(e => string.Equals(e.Name, NewPartition.Name, StringComparison.CurrentCultureIgnoreCase) || e.Name.StartsWith(NewPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US")));
+                    if (Entry == null)
+                    {
+                        // There is a partition entry in the xml, but this partition is not present in the archive.
+
+                        Partition OldPartition = GetPartition(NewPartition.Name);
+                        if (OldPartition == null)
+                        {
+                            // The partition entry in the xml is also not present in the current partition table.
+                            // It must have a know position and length.
+
+                            if (NewPartition.LastSector == 0)
+                            {
+                                throw new WPinternalsException("Unknown length for partition \"" + NewPartition.Name + "\". The last sector property is set to 0 and the partition doesn't exist on the device currently.");
+                            }
+                        }
+                        else
+                        {
+                            // The partition entry in the xml is also present in the current partition table.
+                            // But since the partition is not present in the archive, the partition cannot be relocated.
+                            // If the location of the new partition is specified, it must be the same as the current partition.
+
+                            if ((NewPartition.FirstSector != 0) && (NewPartition.FirstSector != OldPartition.FirstSector))
+                            {
+                                throw new WPinternalsException("Incorrect location for partition \"" + NewPartition.Name + "\". A partition defined in the xml file got its boundaries updated, but as the partition isn't provided in the archive, it is not possible to relocate it.");
+                            }
+
+                            if ((NewPartition.LastSector != 0) && (NewPartition.LastSector != OldPartition.LastSector))
+                            {
+                                throw new WPinternalsException("Incorrect length for partition \"" + NewPartition.Name + "\". A partition defined in the xml file got its boundaries updated, but as the partition isn't provided in the archive, it is not possible to relocate it.");
+                            }
+
+                            NewPartition.FirstSector = OldPartition.FirstSector;
+                            NewPartition.LastSector = OldPartition.LastSector;
+                        }
+                    }
+                    else
+                    {
+                        // The partition in the xml is also present in the archive.
+                        // If the length is specified in the xml, it must match the file in the archive.
+
+                        ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
+                        using (DecompressedStream DecompressedStream = new(Entry.Open()))
+                        {
+                            try
+                            {
+                                StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
+                            }
+                            catch { }
+                        }
+
+                        if (NewPartition.LastSector == 0)
+                        {
+                            NewPartition.SizeInSectors = StreamLengthInSectors;
+                        }
+                        else
+                        {
+                            if (NewPartition.SizeInSectors != StreamLengthInSectors)
+                            {
+                                throw new WPinternalsException("Inconsistent length specified for partition \"" + NewPartition.Name + "\". The provided partition in the archive does not match the length specified in the xml file.");
+                            }
+                        }
+                    }
+                }
+            }
+            else
+            {
+                foreach (Partition NewPartition in GptToMerge.Partitions)
+                {
+                    // This is a partition entry in the xml, and there is no archive.
+
+                    Partition OldPartition = GetPartition(NewPartition.Name);
+                    if (OldPartition == null)
+                    {
+                        // The partition entry in the xml is also not present in the current partition table.
+                        // It must have a known position and length.
+
+                        if (NewPartition.LastSector == 0)
+                        {
+                            throw new WPinternalsException("Unknown length for partition \"" + NewPartition.Name + "\". The last sector property is set to 0 and the partition doesn't exist on the device currently.");
+                        }
+                    }
+                    else
+                    {
+                        // The partition entry in the xml is also present in the current partition table.
+                        // But since the partition is not present in the archive, the partition cannot be relocated.
+                        // If the location of the new partition is specified, it must be the same as the current partition.
+
+                        if ((NewPartition.FirstSector != 0) && (NewPartition.FirstSector != OldPartition.FirstSector))
+                        {
+                            throw new WPinternalsException("Incorrect location for partition \"" + NewPartition.Name + "\". A partition defined in the xml file got its boundaries updated, but as the partition isn't provided in the archive, it is not possible to relocate it.");
+                        }
+
+                        if ((NewPartition.LastSector != 0) && (NewPartition.LastSector != OldPartition.LastSector))
+                        {
+                            throw new WPinternalsException("Incorrect length for partition \"" + NewPartition.Name + "\". A partition defined in the xml file got its boundaries updated, but as the partition isn't provided in the archive, it is not possible to relocate it.");
+                        }
+
+                        NewPartition.FirstSector = OldPartition.FirstSector;
+                        NewPartition.LastSector = OldPartition.LastSector;
+                    }
+                }
+            }
+
+            List<Partition> DynamicPartitions = new();
+            if (Archive != null)
+            {
+                // Partitions which are present in the archive, and which have no start-sector in the new GPT data (dynamic relocation),
+                // and which can be clustered to the end of emmc, are first removed from the existing GPT.
+                IEnumerable<Partition> SortedPartitions = Partitions.OrderBy(p => p.FirstSector);
+                for (int i = SortedPartitions.Count() - 1; i >= 0; i--)
+                {
+                    Partition OldPartition = SortedPartitions.ElementAt(i);
+
+                    // Present in archive?
+                    ZipArchiveEntry Entry = Archive.Entries.FirstOrDefault(e => string.Equals(e.Name, OldPartition.Name, StringComparison.CurrentCultureIgnoreCase) || e.Name.StartsWith(OldPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US")));
+                    if (Entry != null)
+                    {
+                        // Not present in new GPT or present in GPT without FirstSector?
+                        Partition NewPartition = GptToMerge.GetPartition(OldPartition.Name);
+                        if ((NewPartition == null) || (NewPartition.FirstSector == 0))
+                        {
+                            DynamicPartitions.Insert(0, OldPartition);
+                            this.Partitions.Remove(OldPartition);
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+            }
+
+            // All partitions in the new GPT data should have a start-sector and end-sector by now.
+            // The partitions in the new GPT data will be applied to the current partition-table.
+            // Existing partitions, which are overwritten by the new partitions will be removed from the existing GPT.
+            // Existing partition with the same name in the existing GPT is reused (guids and attribs remain, if not specified).
+            UInt64 LowestSector = 0;
+            Partition DPP = this.GetPartition("DPP");
+            if (DPP != null)
+            {
+                LowestSector = DPP.LastSector + 1;
+            }
+
+            foreach (Partition NewPartition in GptToMerge.Partitions)
+            {
+                // If the new partition is a dynamic partition, then skip it here. It will be added later.
+                if (DynamicPartitions.Select(p => p.Name).Any(n => string.Equals(n, NewPartition.Name, StringComparison.CurrentCultureIgnoreCase)))
+                {
+                    continue;
+                }
+
+                // Sanity check
+                if (NewPartition.FirstSector < LowestSector)
+                {
+                    throw new WPinternalsException("Bad sector alignment for partition: " + NewPartition.Name + ". The partition is located before DPP.");
+                }
+
+                Partition CurrentPartition = this.GetPartition(NewPartition.Name);
+                if (CurrentPartition == null)
+                {
+                    CurrentPartition = new Partition
+                    {
+                        Name = NewPartition.Name
+                    };
+                    this.Partitions.Add(CurrentPartition);
+                    HasChanged = true;
+                }
+
+                if ((NewPartition.FirstSector != 0) && (NewPartition.FirstSector != CurrentPartition.FirstSector))
+                {
+                    CurrentPartition.FirstSector = NewPartition.FirstSector;
+                    HasChanged = true;
+                }
+                if ((NewPartition.LastSector != 0) && (NewPartition.LastSector != CurrentPartition.LastSector))
+                {
+                    CurrentPartition.LastSector = NewPartition.LastSector;
+                    HasChanged = true;
+                }
+                if ((NewPartition.Attributes != 0) && (CurrentPartition.Attributes != NewPartition.Attributes))
+                {
+                    CurrentPartition.Attributes = NewPartition.Attributes;
+                    HasChanged = true;
+                }
+
+                if ((NewPartition.PartitionGuid != Guid.Empty) || (NewPartition.PartitionGuid != CurrentPartition.PartitionGuid))
+                {
+                    HasChanged = true;
+                }
+
+                if (NewPartition.PartitionGuid != Guid.Empty)
+                {
+                    CurrentPartition.PartitionGuid = NewPartition.PartitionGuid;
+                }
+
+                if (CurrentPartition.PartitionGuid != Guid.Empty)
+                {
+                    CurrentPartition.PartitionGuid = Guid.NewGuid();
+                }
+
+                if ((NewPartition.PartitionTypeGuid != Guid.Empty) || (NewPartition.PartitionTypeGuid != CurrentPartition.PartitionTypeGuid))
+                {
+                    HasChanged = true;
+                }
+
+                if (NewPartition.PartitionTypeGuid != Guid.Empty)
+                {
+                    CurrentPartition.PartitionTypeGuid = NewPartition.PartitionTypeGuid;
+                }
+
+                if (CurrentPartition.PartitionTypeGuid != Guid.Empty)
+                {
+                    CurrentPartition.PartitionTypeGuid = Guid.NewGuid();
+                }
+
+                for (int i = this.Partitions.Count - 1; i >= 0; i--)
+                {
+                    if (this.Partitions[i] != CurrentPartition && (CurrentPartition.FirstSector <= this.Partitions[i].LastSector) && (CurrentPartition.LastSector >= this.Partitions[i].FirstSector))
+                    {
+                        this.Partitions.RemoveAt(i);
+                        HasChanged = true;
+                    }
+                }
+            }
+
+            if (Archive != null)
+            {
+                // All partitions listed in the archive, which are present in the existing GPT, should overwrite the existing partition.
+                // Check if the sizes of the partitions in the archive do not exceed the size of the partition, as listed in the GPT.
+                foreach (Partition OldPartition in this.Partitions)
+                {
+                    ZipArchiveEntry Entry = Archive.Entries.FirstOrDefault(e => string.Equals(e.Name, OldPartition.Name, StringComparison.CurrentCultureIgnoreCase) || e.Name.StartsWith(OldPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US")));
+                    if (Entry != null)
+                    {
+                        DecompressedStream DecompressedStream = new(Entry.Open());
+                        ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
+                        try
+                        {
+                            StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
+                        }
+                        catch { }
+                        DecompressedStream.Close();
+
+                        UInt64 MaxPartitionSizeInSectors = OldPartition.SizeInSectors;
+                        Partition NextPartition = this.Partitions.Where(p => p.FirstSector > OldPartition.FirstSector).OrderBy(p => p.FirstSector).FirstOrDefault();
+                        if (NextPartition != null)
+                        {
+                            MaxPartitionSizeInSectors = NextPartition.FirstSector - OldPartition.FirstSector;
+                        }
+
+                        if (StreamLengthInSectors > MaxPartitionSizeInSectors)
+                        {
+                            throw new WPinternalsException("Incorrect length for partition \"" + OldPartition.Name + "\". The provided partition in the archive does not match the length specified in the xml file.");
+                        }
+
+                        if (OldPartition.SizeInSectors != StreamLengthInSectors)
+                        {
+                            OldPartition.SizeInSectors = StreamLengthInSectors;
+                            HasChanged = true;
+                        }
+                    }
+                }
+
+                // All remaining partitions in the archive, which were listed in the original GPT, 
+                // should be added at the end of the partition-table.
+                UInt64 FirstFreeSector = 0x5000;
+                if (this.Partitions.Count > 0)
+                {
+                    FirstFreeSector = this.Partitions.Max(p => p.LastSector) + 1;
+
+                    // Always start a new partition on a new chunk (0x100 sector boundary), to be more flexible during custom flash
+                    if (RoundToChunks && (((double)FirstFreeSector % 0x100) != 0))
+                    {
+                        FirstFreeSector = (UInt64)(Math.Ceiling((double)FirstFreeSector / 0x100) * 0x100);
+                    }
+                }
+                foreach (Partition NewPartition in DynamicPartitions)
+                {
+                    if (NewPartition.FirstSector != FirstFreeSector)
+                    {
+                        NewPartition.FirstSector = FirstFreeSector;
+                        HasChanged = true;
+                    }
+                    ZipArchiveEntry Entry = Archive.Entries.FirstOrDefault(e => string.Equals(e.Name, NewPartition.Name, StringComparison.CurrentCultureIgnoreCase) || e.Name.StartsWith(NewPartition.Name + ".", true, System.Globalization.CultureInfo.GetCultureInfo("en-US")));
+                    DecompressedStream DecompressedStream = new(Entry.Open());
+                    ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
+                    try
+                    {
+                        StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
+                    }
+                    catch { }
+                    DecompressedStream.Close();
+                    if (NewPartition.SizeInSectors != StreamLengthInSectors)
+                    {
+                        NewPartition.SizeInSectors = StreamLengthInSectors;
+                        HasChanged = true;
+                    }
+                    this.Partitions.Add(NewPartition);
+                    FirstFreeSector += StreamLengthInSectors;
+
+                    // Always start a new partition on a new chunk (0x100 sector boundary), to be more flexible during custom flash
+                    if (RoundToChunks && (((double)FirstFreeSector % 0x100) != 0))
+                    {
+                        FirstFreeSector = (UInt64)(Math.Ceiling((double)FirstFreeSector / 0x100) * 0x100);
+                    }
+                }
+            }
+
+            Rebuild();
+        }
+
+        internal void WritePartitions(string Path)
+        {
+            string DirPath = System.IO.Path.GetDirectoryName(Path);
+            if (!Directory.Exists(DirPath))
+            {
+                Directory.CreateDirectory(DirPath);
+            }
+
+            XmlSerializer x = new(typeof(GPT), "");
+
+            XmlSerializerNamespaces ns = new();
+            ns.Add("", "");
+            StreamWriter FileWriter = new(Path);
+            x.Serialize(FileWriter, this, ns);
+            FileWriter.Close();
+        }
+
+        internal static GPT ReadPartitions(string Path)
+        {
+            XmlSerializer x = new(typeof(GPT), "");
+            using FileStream s = new(Path, FileMode.Open);
+            return (GPT)x.Deserialize(s);
+        }
+
+        internal void RestoreBackupPartitions()
+        {
+            // This is necessary, because the partitions and backup-partitions can exchange.
+            // This may cause the startsector to be higher than the maximum allowed sector for flashing with a Lumia V1 programmer (hardcoded in programmer)
+            foreach (string RevisePartitionName in (List<string>)(new(new string[] { "SBL1", "SBL2", "SBL3", "UEFI", "TZ", "RPM", "WINSECAPP" })))
+            {
+                Partition RevisePartition = GetPartition(RevisePartitionName);
+                Partition ReviseBackupPartition = GetPartition("BACKUP_" + RevisePartitionName);
+                if ((RevisePartition != null) && (ReviseBackupPartition != null) && (RevisePartition.FirstSector > ReviseBackupPartition.FirstSector))
+                {
+                    ulong OriginalFirstSector = RevisePartition.FirstSector;
+                    ulong OriginalLastSector = RevisePartition.LastSector;
+                    RevisePartition.FirstSector = ReviseBackupPartition.FirstSector;
+                    RevisePartition.LastSector = ReviseBackupPartition.LastSector;
+                    ReviseBackupPartition.FirstSector = OriginalFirstSector;
+                    ReviseBackupPartition.LastSector = OriginalLastSector;
+
+                    HasChanged = true;
+                }
+
+                if (RevisePartition.LastSector >= 0xF400)
+                {
+                    throw new WPinternalsException("Unsupported partition layout!", "The last sector of one of the BACKUP partitions defined in GPT exceeds the maximum threshold expected in order to restore BACKUP partitions to the device.");
+                }
+            }
+        }
+    }
+
+    public class Partition
+    {
+        private UInt64 _SizeInSectors;
+        private UInt64 _FirstSector;
+        private UInt64 _LastSector;
+
+        public string Name;            // 0x48
+        public Guid PartitionTypeGuid; // 0x10
+        public Guid PartitionGuid;     // 0x10
+        [XmlIgnore]
+        internal UInt64 Attributes;      // 0x08
+
+        [XmlIgnore]
+        internal UInt64 SizeInSectors
+        {
+            get
+            {
+                if (_SizeInSectors != 0)
+                {
+                    return _SizeInSectors;
+                }
+                else
+                {
+                    return LastSector - FirstSector + 1;
+                }
+            }
+            set
+            {
+                _SizeInSectors = value;
+                if (FirstSector != 0)
+                {
+                    LastSector = FirstSector + _SizeInSectors - 1;
+                }
+            }
+        }
+
+        [XmlIgnore]
+        internal UInt64 FirstSector // 0x08
+        {
+            get
+            {
+                return _FirstSector;
+            }
+            set
+            {
+                _FirstSector = value;
+                if (_SizeInSectors != 0)
+                {
+                    _LastSector = FirstSector + _SizeInSectors - 1;
+                }
+            }
+        }
+
+        [XmlIgnore]
+        internal UInt64 LastSector // 0x08
+        {
+            get
+            {
+                return _LastSector;
+            }
+            set
+            {
+                _LastSector = value;
+                _SizeInSectors = 0;
+            }
+        }
+
+        [XmlIgnore]
+        public string Volume
+        {
+            get
+            {
+                return @"\\?\Volume" + PartitionGuid.ToString("b") + @"\";
+            }
+        }
+
+        [XmlElement(ElementName = "FirstSector")]
+        public string FirstSectorAsString
+        {
+            get
+            {
+                return "0x" + FirstSector.ToString("X16");
+            }
+            set
+            {
+                FirstSector = Convert.ToUInt64(value, 16);
+            }
+        }
+
+        [XmlElement(ElementName = "LastSector")]
+        public string LastSectorAsString
+        {
+            get
+            {
+                return "0x" + LastSector.ToString("X16");
+            }
+            set
+            {
+                LastSector = Convert.ToUInt64(value, 16);
+            }
+        }
+
+        [XmlElement(ElementName = "Attributes")]
+        public string AttributesAsString
+        {
+            get
+            {
+                return "0x" + Attributes.ToString("X16");
+            }
+            set
+            {
+                Attributes = Convert.ToUInt64(value, 16);
+            }
+        }
+    }
+}
diff --git a/Models/LZMA.cs b/WPinternals/Models/LZMA.cs
similarity index 97%
rename from Models/LZMA.cs
rename to WPinternals/Models/LZMA.cs
index 8c8c7d4..3c79335 100644
--- a/Models/LZMA.cs
+++ b/WPinternals/Models/LZMA.cs
@@ -1,312 +1,312 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-// SevenZip LZMA SDK: http://www.7-zip.org/download.html
-// Usage: http://stackoverflow.com/questions/7646328/how-to-use-the-7z-sdk-to-compress-and-decompress-a-file
-
-using SevenZip;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Text;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal static class LZMA
-    {
-        internal static byte[] Decompress(byte[] Input, UInt32 Offset, UInt32 InputSize)
-        {
-            byte[] Properties = new byte[5];
-            Buffer.BlockCopy(Input, (int)Offset, Properties, 0, 5);
-
-            UInt64 OutputSize = ByteOperations.ReadUInt64(Input, Offset + 5);
-
-            SevenZip.Compression.LZMA.Decoder Coder = new();
-            Coder.SetDecoderProperties(Properties);
-
-            MemoryStream InStream = new(Input, (int)Offset + 0x0D, (int)InputSize - 0x0D);
-
-            byte[] Output = new byte[OutputSize];
-            MemoryStream OutStream = new(Output, true);
-
-            Coder.Code(InStream, OutStream, (Int64)InputSize - 0x0D, (Int64)OutputSize, null);
-
-            OutStream.Flush();
-            OutStream.Close();
-            InStream.Close();
-
-            return Output;
-        }
-
-        internal static byte[] Compress(byte[] Input, UInt32 Offset, UInt32 InputSize)
-        {
-            SevenZip.Compression.LZMA.Encoder Coder = new();
-
-            MemoryStream InStream = new(Input, (int)Offset, (int)InputSize);
-            MemoryStream OutStream = new();
-
-            // Write the encoder properties
-            Coder.WriteCoderProperties(OutStream);
-
-            // Write the decompressed file size
-            OutStream.Write(BitConverter.GetBytes(InStream.Length), 0, 8);
-
-            // Encode the file
-            Coder.Code(InStream, OutStream, InputSize, -1, null);
-
-            byte[] Output = new byte[OutStream.Length];
-            Buffer.BlockCopy(OutStream.GetBuffer(), 0, Output, 0, (int)OutStream.Length);
-
-            OutStream.Flush();
-            OutStream.Close();
-            InStream.Close();
-
-            return Output;
-        }
-    }
-
-    public class LZMACompressionStream : Stream
-    {
-        private readonly SevenZip.Compression.LZMA.Encoder Encoder = null;
-        private readonly SevenZip.Compression.LZMA.Decoder Decoder = null;
-        private readonly PumpStream BufferStream;
-        private readonly Stream stream;
-        private readonly bool LeaveOpen;
-        private readonly Thread WorkThread;
-        private readonly CancellationTokenSource source;
-        private readonly CancellationToken token;
-
-        public LZMACompressionStream(Stream stream, CompressionMode mode, bool LeaveOpen, int DictionarySize, int PosStateBits,
-           int LitContextBits, int LitPosBits, int Algorithm, int NumFastBytes, string MatchFinder, bool EndMarker)
-        {
-            this.stream = stream;
-            this.LeaveOpen = LeaveOpen;
-            BufferStream = new PumpStream();
-            source = new CancellationTokenSource();
-            token = source.Token;
-
-            if (mode == CompressionMode.Compress)
-            {
-                Encoder = new SevenZip.Compression.LZMA.Encoder();
-                if (DictionarySize != 0)
-                {
-                    Encoder.SetCoderProperties(
-                      new CoderPropID[8] {CoderPropID.DictionarySize, CoderPropID.PosStateBits, CoderPropID.LitContextBits,
-                        CoderPropID.LitPosBits, CoderPropID.Algorithm, CoderPropID.NumFastBytes, CoderPropID.MatchFinder, CoderPropID.EndMarker},
-                      new object[8] { DictionarySize, PosStateBits, LitContextBits, LitPosBits, Algorithm, NumFastBytes, MatchFinder, EndMarker });
-                }
-
-                Encoder.WriteCoderProperties(stream);
-                WorkThread = new Thread(new ThreadStart(Encode));
-            }
-            else
-            {
-                byte[] DecoderProperties = new byte[5];
-                stream.Read(DecoderProperties, 0, 5);
-                Decoder = new SevenZip.Compression.LZMA.Decoder();
-                Decoder.SetDecoderProperties(DecoderProperties);
-                WorkThread = new Thread(new ThreadStart(Decode));
-            }
-
-            WorkThread.Start();
-        }
-
-        public LZMACompressionStream(Stream stream, CompressionMode mode, bool LeaveOpen)
-            : this(stream, mode, LeaveOpen, 0, 0, 0, 0, 0, 0, null, false)
-        {
-        }
-
-        private void Encode()
-        {
-            Encoder.Code(BufferStream, stream, -1, -1, null, token);
-            if (!LeaveOpen)
-            {
-                stream.Close();
-            }
-        }
-
-        private void Decode()
-        {
-            Decoder.Code(stream, BufferStream, -1, -1, null, token);
-            BufferStream.Close();
-            if (!LeaveOpen)
-            {
-                stream.Close();
-            }
-        }
-
-        public override void Close()
-        {
-            if (Encoder != null)
-            {
-                BufferStream.Close();
-            }
-            else if (WorkThread.IsAlive)
-            {
-                source?.Cancel();
-                WorkThread.Join();
-            }
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            return BufferStream.Read(buffer, offset, count);
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            BufferStream.Write(buffer, offset, count);
-        }
-
-        public override bool CanRead { get { return Decoder != null; } }
-        public override bool CanSeek { get { return false; } }
-        public override bool CanWrite { get { return Encoder != null; } }
-        public override void Flush() { }
-        public override long Length { get { return 0; } }
-        public override long Position { get { return 0; } set { } }
-        public override long Seek(long offset, SeekOrigin origin) { return 0; }
-        public override void SetLength(long value) { }
-    }
-
-    public class PumpStream : Stream
-    {
-        private readonly Queue<byte[]> BufferQueue;
-        private int BufferOffset;
-        private readonly long MaxBufferSize;
-        private long BufferSize;
-        private bool Closed;
-        private bool EOF;
-
-        public PumpStream(long MaxBufferSize, int ReadTimeout, int WriteTimeout)
-        {
-            this.MaxBufferSize = MaxBufferSize;
-            this.ReadTimeout = ReadTimeout;
-            this.WriteTimeout = WriteTimeout;
-            BufferQueue = new Queue<byte[]>();
-            BufferOffset = 0;
-            BufferSize = 0;
-            Closed = false;
-            EOF = false;
-        }
-
-        public PumpStream()
-            : this(16777216, Timeout.Infinite, Timeout.Infinite)
-        {
-        }
-
-        public new void Dispose()
-        {
-            BufferQueue.Clear();
-        }
-
-        public override void Close()
-        {
-            Closed = true;
-            lock (BufferQueue)
-            {
-                Monitor.Pulse(BufferQueue);
-            }
-        }
-
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            int BytesRead = 0;
-            lock (BufferQueue)
-            {
-                while (BytesRead < count && !EOF)
-                {
-                    if (BufferQueue.Count > 0)
-                    {
-                        byte[] b = BufferQueue.Peek();
-
-                        if ((b.Length - BufferOffset) <= (count - BytesRead))
-                        {
-                            Array.Copy(b, BufferOffset, buffer, offset + BytesRead, b.Length - BufferOffset);
-
-                            BufferQueue.Dequeue();
-                            BufferSize -= b.Length;
-                            Monitor.Pulse(BufferQueue);
-
-                            BytesRead += b.Length - BufferOffset;
-                            BufferOffset = 0;
-                        }
-                        else
-                        {
-                            Array.Copy(b, BufferOffset, buffer, offset + BytesRead, count - BytesRead);
-
-                            BufferOffset += count - BytesRead;
-                            BytesRead += count - BytesRead;
-                        }
-                    }
-                    else
-                    {
-                        if (!Closed)
-                        {
-                            if (!Monitor.Wait(BufferQueue, ReadTimeout))
-                            {
-                                throw new IOException("Could not read from stream: Timeout expired waiting for data to be written.");
-                            }
-                        }
-                        else
-                        {
-                            EOF = true;
-                        }
-                    }
-                }
-            }
-
-            return BytesRead;
-        }
-
-        public override void Write(byte[] buffer, int offset, int count)
-        {
-            lock (BufferQueue)
-            {
-                while (BufferSize >= MaxBufferSize)
-                {
-                    if (!Monitor.Wait(BufferQueue, WriteTimeout))
-                    {
-                        throw new IOException("Could not write to stream: Timeout expired waiting for data to be read.");
-                    }
-                }
-
-                byte[] b = new byte[count];
-                Array.Copy(buffer, offset, b, 0, count);
-                BufferQueue.Enqueue(b);
-                BufferSize += b.Length;
-
-                Monitor.Pulse(BufferQueue);
-            }
-        }
-
-        public override int ReadTimeout { get; set; }
-        public override int WriteTimeout { get; set; }
-        public override bool CanRead { get { return true; } }
-        public override bool CanSeek { get { return false; } }
-        public override bool CanWrite { get { return true; } }
-        public override void Flush() { }
-        public override long Length { get { return 0; } }
-        public override long Position { get { return 0; } set { } }
-        public override long Seek(long offset, SeekOrigin origin) { return 0; }
-        public override void SetLength(long value) { }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+// SevenZip LZMA SDK: http://www.7-zip.org/download.html
+// Usage: http://stackoverflow.com/questions/7646328/how-to-use-the-7z-sdk-to-compress-and-decompress-a-file
+
+using SevenZip;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Text;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal static class LZMA
+    {
+        internal static byte[] Decompress(byte[] Input, UInt32 Offset, UInt32 InputSize)
+        {
+            byte[] Properties = new byte[5];
+            Buffer.BlockCopy(Input, (int)Offset, Properties, 0, 5);
+
+            UInt64 OutputSize = ByteOperations.ReadUInt64(Input, Offset + 5);
+
+            SevenZip.Compression.LZMA.Decoder Coder = new();
+            Coder.SetDecoderProperties(Properties);
+
+            MemoryStream InStream = new(Input, (int)Offset + 0x0D, (int)InputSize - 0x0D);
+
+            byte[] Output = new byte[OutputSize];
+            MemoryStream OutStream = new(Output, true);
+
+            Coder.Code(InStream, OutStream, (Int64)InputSize - 0x0D, (Int64)OutputSize, null);
+
+            OutStream.Flush();
+            OutStream.Close();
+            InStream.Close();
+
+            return Output;
+        }
+
+        internal static byte[] Compress(byte[] Input, UInt32 Offset, UInt32 InputSize)
+        {
+            SevenZip.Compression.LZMA.Encoder Coder = new();
+
+            MemoryStream InStream = new(Input, (int)Offset, (int)InputSize);
+            MemoryStream OutStream = new();
+
+            // Write the encoder properties
+            Coder.WriteCoderProperties(OutStream);
+
+            // Write the decompressed file size
+            OutStream.Write(BitConverter.GetBytes(InStream.Length), 0, 8);
+
+            // Encode the file
+            Coder.Code(InStream, OutStream, InputSize, -1, null);
+
+            byte[] Output = new byte[OutStream.Length];
+            Buffer.BlockCopy(OutStream.GetBuffer(), 0, Output, 0, (int)OutStream.Length);
+
+            OutStream.Flush();
+            OutStream.Close();
+            InStream.Close();
+
+            return Output;
+        }
+    }
+
+    public class LZMACompressionStream : Stream
+    {
+        private readonly SevenZip.Compression.LZMA.Encoder Encoder = null;
+        private readonly SevenZip.Compression.LZMA.Decoder Decoder = null;
+        private readonly PumpStream BufferStream;
+        private readonly Stream stream;
+        private readonly bool LeaveOpen;
+        private readonly Thread WorkThread;
+        private readonly CancellationTokenSource source;
+        private readonly CancellationToken token;
+
+        public LZMACompressionStream(Stream stream, CompressionMode mode, bool LeaveOpen, int DictionarySize, int PosStateBits,
+           int LitContextBits, int LitPosBits, int Algorithm, int NumFastBytes, string MatchFinder, bool EndMarker)
+        {
+            this.stream = stream;
+            this.LeaveOpen = LeaveOpen;
+            BufferStream = new PumpStream();
+            source = new CancellationTokenSource();
+            token = source.Token;
+
+            if (mode == CompressionMode.Compress)
+            {
+                Encoder = new SevenZip.Compression.LZMA.Encoder();
+                if (DictionarySize != 0)
+                {
+                    Encoder.SetCoderProperties(
+                      new CoderPropID[8] {CoderPropID.DictionarySize, CoderPropID.PosStateBits, CoderPropID.LitContextBits,
+                        CoderPropID.LitPosBits, CoderPropID.Algorithm, CoderPropID.NumFastBytes, CoderPropID.MatchFinder, CoderPropID.EndMarker},
+                      new object[8] { DictionarySize, PosStateBits, LitContextBits, LitPosBits, Algorithm, NumFastBytes, MatchFinder, EndMarker });
+                }
+
+                Encoder.WriteCoderProperties(stream);
+                WorkThread = new Thread(new ThreadStart(Encode));
+            }
+            else
+            {
+                byte[] DecoderProperties = new byte[5];
+                stream.Read(DecoderProperties, 0, 5);
+                Decoder = new SevenZip.Compression.LZMA.Decoder();
+                Decoder.SetDecoderProperties(DecoderProperties);
+                WorkThread = new Thread(new ThreadStart(Decode));
+            }
+
+            WorkThread.Start();
+        }
+
+        public LZMACompressionStream(Stream stream, CompressionMode mode, bool LeaveOpen)
+            : this(stream, mode, LeaveOpen, 0, 0, 0, 0, 0, 0, null, false)
+        {
+        }
+
+        private void Encode()
+        {
+            Encoder.Code(BufferStream, stream, -1, -1, null, token);
+            if (!LeaveOpen)
+            {
+                stream.Close();
+            }
+        }
+
+        private void Decode()
+        {
+            Decoder.Code(stream, BufferStream, -1, -1, null, token);
+            BufferStream.Close();
+            if (!LeaveOpen)
+            {
+                stream.Close();
+            }
+        }
+
+        public override void Close()
+        {
+            if (Encoder != null)
+            {
+                BufferStream.Close();
+            }
+            else if (WorkThread.IsAlive)
+            {
+                source?.Cancel();
+                WorkThread.Join();
+            }
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            return BufferStream.Read(buffer, offset, count);
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            BufferStream.Write(buffer, offset, count);
+        }
+
+        public override bool CanRead { get { return Decoder != null; } }
+        public override bool CanSeek { get { return false; } }
+        public override bool CanWrite { get { return Encoder != null; } }
+        public override void Flush() { }
+        public override long Length { get { return 0; } }
+        public override long Position { get { return 0; } set { } }
+        public override long Seek(long offset, SeekOrigin origin) { return 0; }
+        public override void SetLength(long value) { }
+    }
+
+    public class PumpStream : Stream
+    {
+        private readonly Queue<byte[]> BufferQueue;
+        private int BufferOffset;
+        private readonly long MaxBufferSize;
+        private long BufferSize;
+        private bool Closed;
+        private bool EOF;
+
+        public PumpStream(long MaxBufferSize, int ReadTimeout, int WriteTimeout)
+        {
+            this.MaxBufferSize = MaxBufferSize;
+            this.ReadTimeout = ReadTimeout;
+            this.WriteTimeout = WriteTimeout;
+            BufferQueue = new Queue<byte[]>();
+            BufferOffset = 0;
+            BufferSize = 0;
+            Closed = false;
+            EOF = false;
+        }
+
+        public PumpStream()
+            : this(16777216, Timeout.Infinite, Timeout.Infinite)
+        {
+        }
+
+        public new void Dispose()
+        {
+            BufferQueue.Clear();
+        }
+
+        public override void Close()
+        {
+            Closed = true;
+            lock (BufferQueue)
+            {
+                Monitor.Pulse(BufferQueue);
+            }
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            int BytesRead = 0;
+            lock (BufferQueue)
+            {
+                while (BytesRead < count && !EOF)
+                {
+                    if (BufferQueue.Count > 0)
+                    {
+                        byte[] b = BufferQueue.Peek();
+
+                        if ((b.Length - BufferOffset) <= (count - BytesRead))
+                        {
+                            Array.Copy(b, BufferOffset, buffer, offset + BytesRead, b.Length - BufferOffset);
+
+                            BufferQueue.Dequeue();
+                            BufferSize -= b.Length;
+                            Monitor.Pulse(BufferQueue);
+
+                            BytesRead += b.Length - BufferOffset;
+                            BufferOffset = 0;
+                        }
+                        else
+                        {
+                            Array.Copy(b, BufferOffset, buffer, offset + BytesRead, count - BytesRead);
+
+                            BufferOffset += count - BytesRead;
+                            BytesRead += count - BytesRead;
+                        }
+                    }
+                    else
+                    {
+                        if (!Closed)
+                        {
+                            if (!Monitor.Wait(BufferQueue, ReadTimeout))
+                            {
+                                throw new IOException("Could not read from stream: Timeout expired waiting for data to be written.");
+                            }
+                        }
+                        else
+                        {
+                            EOF = true;
+                        }
+                    }
+                }
+            }
+
+            return BytesRead;
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            lock (BufferQueue)
+            {
+                while (BufferSize >= MaxBufferSize)
+                {
+                    if (!Monitor.Wait(BufferQueue, WriteTimeout))
+                    {
+                        throw new IOException("Could not write to stream: Timeout expired waiting for data to be read.");
+                    }
+                }
+
+                byte[] b = new byte[count];
+                Array.Copy(buffer, offset, b, 0, count);
+                BufferQueue.Enqueue(b);
+                BufferSize += b.Length;
+
+                Monitor.Pulse(BufferQueue);
+            }
+        }
+
+        public override int ReadTimeout { get; set; }
+        public override int WriteTimeout { get; set; }
+        public override bool CanRead { get { return true; } }
+        public override bool CanSeek { get { return false; } }
+        public override bool CanWrite { get { return true; } }
+        public override void Flush() { }
+        public override long Length { get { return 0; } }
+        public override long Position { get { return 0; } set { } }
+        public override long Seek(long offset, SeekOrigin origin) { return 0; }
+        public override void SetLength(long value) { }
+    }
+}
diff --git a/Models/LumiaDownloadModel.cs b/WPinternals/Models/LumiaDownloadModel.cs
similarity index 97%
rename from Models/LumiaDownloadModel.cs
rename to WPinternals/Models/LumiaDownloadModel.cs
index a726574..1995acf 100644
--- a/Models/LumiaDownloadModel.cs
+++ b/WPinternals/Models/LumiaDownloadModel.cs
@@ -1,860 +1,860 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Json;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
-using System.Xml.Serialization;
-
-namespace WPinternals
-{
-    internal static class LumiaDownloadModel
-    {
-        internal static string SearchFFU(string ProductType, string ProductCode, string OperatorCode)
-        {
-            return SearchFFU(ProductType, ProductCode, OperatorCode, out string FoundProductType);
-        }
-
-        internal static string SearchFFU(string ProductType, string ProductCode, string OperatorCode, out string FoundProductType)
-        {
-            if (ProductType?.Length == 0)
-            {
-                ProductType = null;
-            }
-
-            if (ProductCode?.Length == 0)
-            {
-                ProductCode = null;
-            }
-
-            if (OperatorCode?.Length == 0)
-            {
-                OperatorCode = null;
-            }
-
-            if (ProductCode != null)
-            {
-                ProductCode = ProductCode.ToUpper();
-                ProductType = null;
-                OperatorCode = null;
-            }
-            if (ProductType != null)
-            {
-                ProductType = ProductType.ToUpper();
-                if (ProductType.StartsWith("RM") && !ProductType.StartsWith("RM-"))
-                {
-                    ProductType = "RM-" + ProductType[2..];
-                }
-            }
-            if (OperatorCode != null)
-            {
-                OperatorCode = OperatorCode.ToUpper();
-            }
-
-            DiscoveryQueryParameters DiscoveryQueryParams = new()
-            {
-                manufacturerName = "Microsoft",
-                manufacturerProductLine = "Lumia",
-                packageType = "Firmware",
-                packageClass = "Public",
-                manufacturerHardwareModel = ProductType,
-                manufacturerHardwareVariant = ProductCode,
-                operatorName = OperatorCode
-            };
-            DiscoveryParameters DiscoveryParams = new()
-            {
-                query = DiscoveryQueryParams
-            };
-
-            DataContractJsonSerializer Serializer1 = new(typeof(DiscoveryParameters));
-            MemoryStream JsonStream1 = new();
-            Serializer1.WriteObject(JsonStream1, DiscoveryParams);
-            JsonStream1.Seek(0L, SeekOrigin.Begin);
-            string JsonContent = new StreamReader(JsonStream1).ReadToEnd();
-
-            Uri RequestUri = new("https://api.swrepository.com/rest-api/discovery/1/package");
-
-            HttpClient HttpClient = new();
-            HttpClient.DefaultRequestHeaders.UserAgent.TryParseAdd("SoftwareRepository");
-            HttpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            Task<HttpResponseMessage> HttpPostTask = HttpClient.PostAsync(RequestUri, new StringContent(JsonContent, Encoding.UTF8, "application/json"));
-            HttpPostTask.Wait();
-            HttpResponseMessage Response = HttpPostTask.Result;
-
-            string JsonResultString = "";
-            if (Response.StatusCode == HttpStatusCode.OK)
-            {
-                Task<string> ReadResponseTask = Response.Content.ReadAsStringAsync();
-                ReadResponseTask.Wait();
-                JsonResultString = ReadResponseTask.Result;
-            }
-
-            SoftwarePackage Package = null;
-            using (MemoryStream JsonStream2 = new(Encoding.UTF8.GetBytes(JsonResultString)))
-            {
-                DataContractJsonSerializer Serializer2 = new(typeof(SoftwarePackages));
-                SoftwarePackages SoftwarePackages = (SoftwarePackages)Serializer2.ReadObject(JsonStream2);
-                if (SoftwarePackages != null)
-                {
-                    Package = SoftwarePackages.softwarePackages.FirstOrDefault();
-                }
-            }
-
-            if (Package == null)
-            {
-                throw new WPinternalsException("FFU not found", "No FFU has been found in the remote software repository for the requested model.");
-            }
-
-            FoundProductType = Package.manufacturerHardwareModel[0];
-
-            SoftwareFile FileInfo = Package.files.First(f => f.fileName.EndsWith(".ffu", StringComparison.OrdinalIgnoreCase));
-
-            Uri FileInfoUri = new("https://api.swrepository.com/rest-api/discovery/fileurl/1/" + Package.id + "/" + FileInfo.fileName);
-            Task<string> GetFileInfoTask = HttpClient.GetStringAsync(FileInfoUri);
-            GetFileInfoTask.Wait();
-            string FileInfoString = GetFileInfoTask.Result;
-
-            string FfuUrl = "";
-            FileUrlResult FileUrl = null;
-            using (MemoryStream JsonStream3 = new(Encoding.UTF8.GetBytes(FileInfoString)))
-            {
-                DataContractJsonSerializer Serializer3 = new(typeof(FileUrlResult));
-                FileUrl = (FileUrlResult)Serializer3.ReadObject(JsonStream3);
-                if (FileUrl != null)
-                {
-                    FfuUrl = FileUrl.url.Replace("sr.azureedge.net", "softwarerepo.blob.core.windows.net");
-                }
-            }
-
-            HttpClient.Dispose();
-
-            return FfuUrl;
-        }
-
-        internal static string SearchENOSW(string ProductType, string PhoneFirmwareRevision)
-        {
-            if (ProductType?.Length == 0)
-            {
-                ProductType = null;
-            }
-
-            if (ProductType != null)
-            {
-                ProductType = ProductType.ToUpper();
-                if (ProductType.StartsWith("RM") && !ProductType.StartsWith("RM-"))
-                {
-                    ProductType = "RM-" + ProductType[2..];
-                }
-            }
-
-            DiscoveryQueryParameters DiscoveryQueryParams = new()
-            {
-                manufacturerName = "Microsoft",
-                manufacturerProductLine = "Lumia",
-                packageType = "Test Mode",
-                packageClass = "Public",
-                manufacturerHardwareModel = ProductType
-            };
-            DiscoveryParameters DiscoveryParams = new()
-            {
-                query = DiscoveryQueryParams
-            };
-
-            DataContractJsonSerializer Serializer1 = new(typeof(DiscoveryParameters));
-            MemoryStream JsonStream1 = new();
-            Serializer1.WriteObject(JsonStream1, DiscoveryParams);
-            JsonStream1.Seek(0L, SeekOrigin.Begin);
-            string JsonContent = new StreamReader(JsonStream1).ReadToEnd();
-
-            Uri RequestUri = new("https://api.swrepository.com/rest-api/discovery/1/package");
-
-            HttpClient HttpClient = new();
-            HttpClient.DefaultRequestHeaders.UserAgent.TryParseAdd("SoftwareRepository");
-            HttpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-
-            Task<HttpResponseMessage> HttpPostTask = HttpClient.PostAsync(RequestUri, new StringContent(JsonContent, Encoding.UTF8, "application/json"));
-            HttpPostTask.Wait();
-            HttpResponseMessage Response = HttpPostTask.Result;
-
-            string JsonResultString = "";
-            if (Response.StatusCode == HttpStatusCode.OK)
-            {
-                Task<string> ReadResponseTask = Response.Content.ReadAsStringAsync();
-                ReadResponseTask.Wait();
-                JsonResultString = ReadResponseTask.Result;
-            }
-
-            SoftwarePackage Package = null;
-            using (MemoryStream JsonStream2 = new(Encoding.UTF8.GetBytes(JsonResultString)))
-            {
-                DataContractJsonSerializer Serializer2 = new(typeof(SoftwarePackages));
-                SoftwarePackages SoftwarePackages = (SoftwarePackages)Serializer2.ReadObject(JsonStream2);
-                if (SoftwarePackages != null)
-                {
-                    foreach (SoftwarePackage pkg in SoftwarePackages.softwarePackages)
-                    {
-                        Package = SoftwarePackages.softwarePackages.FirstOrDefault();
-                    }
-                }
-            }
-
-            if (Package == null)
-            {
-                throw new WPinternalsException("ENOSW package not found", "No ENOSW package has been found in the remote software repository for the requested model.");
-            }
-
-            SoftwareFile FileInfo = Package.files.First(f => f.fileName.EndsWith(".secwim", StringComparison.OrdinalIgnoreCase));
-
-            SoftwareFile DPLF = Package.files.First(f => f.fileName.EndsWith(".dpl", StringComparison.OrdinalIgnoreCase));
-            Uri DPLUri = new("https://api.swrepository.com/rest-api/discovery/fileurl/1/" + Package.id + "/" + DPLF.fileName);
-            Task<string> GetDPLTask = HttpClient.GetStringAsync(DPLUri);
-            GetDPLTask.Wait();
-            string DPLString = GetDPLTask.Result;
-
-            string DPLUrl = "";
-            FileUrlResult FileUrlDPL = null;
-            using (MemoryStream JsonStream3 = new(Encoding.UTF8.GetBytes(DPLString)))
-            {
-                DataContractJsonSerializer Serializer3 = new(typeof(FileUrlResult));
-                FileUrlDPL = (FileUrlResult)Serializer3.ReadObject(JsonStream3);
-                if (FileUrlDPL != null)
-                {
-                    DPLUrl = FileUrlDPL.url.Replace("sr.azureedge.net", "softwarerepo.blob.core.windows.net");
-                }
-            }
-
-            if (DPLUrl?.Length == 0)
-            {
-                throw new WPinternalsException("DPL not found", "No DPL has been found in the remote software repository for the requested model.");
-            }
-
-            Task<string> GetDPLStrTask = HttpClient.GetStringAsync(DPLUrl);
-            GetDPLStrTask.Wait();
-            string DPLStrString = GetDPLStrTask.Result;
-
-            DPL.Package dpl;
-            XmlSerializer serializer = new(typeof(DPL.Package));
-            using (StringReader reader = new(DPLStrString.Replace("ft:", "").Replace("dpl:", "").Replace("typedes:", "")))
-            {
-                dpl = (DPL.Package)serializer.Deserialize(reader);
-            }
-
-            foreach (DPL.File file in dpl.Content.Files.File)
-            {
-                string name = file.Name;
-
-                DPL.Range range = file.Extensions.MmosWimFile.UseCaseCompatibilities.Compatibility.FirstOrDefault().Range;
-
-                if (IsFirmwareBetween(PhoneFirmwareRevision, range.From, range.To))
-                {
-                    FileInfo = Package.files.First(f => f.fileName.EndsWith(name, StringComparison.OrdinalIgnoreCase));
-                }
-            }
-
-            Uri FileInfoUri = new("https://api.swrepository.com/rest-api/discovery/fileurl/1/" + Package.id + "/" + FileInfo.fileName);
-            Task<string> GetFileInfoTask = HttpClient.GetStringAsync(FileInfoUri);
-            GetFileInfoTask.Wait();
-            string FileInfoString = GetFileInfoTask.Result;
-
-            string ENOSWUrl = "";
-            FileUrlResult FileUrl = null;
-            using (MemoryStream JsonStream3 = new(Encoding.UTF8.GetBytes(FileInfoString)))
-            {
-                DataContractJsonSerializer Serializer3 = new(typeof(FileUrlResult));
-                FileUrl = (FileUrlResult)Serializer3.ReadObject(JsonStream3);
-                if (FileUrl != null)
-                {
-                    ENOSWUrl = FileUrl.url.Replace("sr.azureedge.net", "softwarerepo.blob.core.windows.net");
-                }
-            }
-
-            HttpClient.Dispose();
-
-            return ENOSWUrl;
-        }
-
-        private static bool IsFirmwareBetween(string PhoneFirmwareRevision, string Limit1, string Limit2)
-        {
-            var version = new Version(PhoneFirmwareRevision);
-            var version1 = new Version(Limit1);
-            var version2 = new Version(Limit2);
-
-            var result = version.CompareTo(version1);
-            var result2 = version.CompareTo(version2);
-
-            return result >= 0 && result2 <= 0;
-        }
-
-        internal static string[] SearchEmergencyFiles(string ProductType)
-        {
-            ProductType = ProductType.ToUpper();
-            if (ProductType.StartsWith("RM") && !ProductType.StartsWith("RM-"))
-            {
-                ProductType = "RM-" + ProductType[2..];
-            }
-
-            LogFile.Log("Getting Emergency files for: " + ProductType, LogType.FileAndConsole);
-
-            if ((ProductType == "RM-1072") || (ProductType == "RM-1073"))
-            {
-                LogFile.Log("Due to mix-up in online-repository, redirecting to emergency files of RM-1113", LogType.FileAndConsole);
-                ProductType = "RM-1113";
-            }
-
-            List<string> Result = new();
-
-            WebClient Client = new();
-            string Src;
-            string FileName;
-            string Config = null;
-            try
-            {
-                Config = Client.DownloadString("https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/emergency_flash_config.xml");
-            }
-            catch
-            {
-                LogFile.Log("Emergency files for " + ProductType + " not found", LogType.FileAndConsole);
-                return null;
-            }
-            Client.Dispose();
-
-            XmlDocument Doc = new();
-            Doc.LoadXml(Config);
-
-            // Hex
-            XmlNode Node = Doc.SelectSingleNode("//emergency_flash_config/hex_flasher");
-            if (Node != null)
-            {
-                FileName = Node.Attributes["image_path"].InnerText;
-                Src = "https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
-                LogFile.Log("Hex-file: " + Src);
-                Result.Add(Src);
-            }
-
-            // Mbn
-            Node = Doc.SelectSingleNode("//emergency_flash_config/mbn_image");
-            if (Node != null)
-            {
-                FileName = Node.Attributes["image_path"].InnerText;
-                Src = "https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
-                LogFile.Log("Mbn-file: " + Src);
-                Result.Add(Src);
-            }
-
-            // Ede
-            foreach (XmlNode SubNode in Doc.SelectNodes("//emergency_flash_config/first_boot_images/first_boot_image"))
-            {
-                FileName = SubNode.Attributes["image_path"].InnerText;
-                Src = "https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
-                LogFile.Log("Firehose-programmer-file: " + Src);
-                Result.Add(Src);
-            }
-
-            // Edp
-            foreach (XmlNode SubNode in Doc.SelectNodes("//emergency_flash_config/second_boot_firehose_single_image/firehose_image"))
-            {
-                FileName = SubNode.Attributes["image_path"].InnerText;
-                Src = "https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
-                LogFile.Log("Firehose-payload-file: " + Src);
-                Result.Add(Src);
-            }
-
-            return Result.ToArray();
-        }
-    }
-
-#pragma warning disable 0649
-    [DataContract]
-    internal class FileUrlResult
-    {
-        [DataMember]
-        internal string url;
-
-        [DataMember]
-        internal List<string> alternateUrl;
-
-        [DataMember]
-        internal long fileSize;
-
-        [DataMember]
-        internal List<SoftwareFileChecksum> checksum;
-    }
-#pragma warning restore 0649
-
-    [DataContract]
-    public class DiscoveryQueryParameters
-    {
-        [DataMember(EmitDefaultValue = false)]
-        public string customerName;
-
-        [DataMember(EmitDefaultValue = false)]
-        public ExtendedAttributes extendedAttributes;
-
-        [DataMember(EmitDefaultValue = false)]
-        public string manufacturerHardwareModel;
-
-        [DataMember(EmitDefaultValue = false)]
-        public string manufacturerHardwareVariant;
-
-        [DataMember(EmitDefaultValue = false)]
-        public string manufacturerModelName;
-
-        [DataMember]
-        public string manufacturerName;
-
-        [DataMember(EmitDefaultValue = false)]
-        public string manufacturerPackageId;
-
-        [DataMember(EmitDefaultValue = false)]
-        public string manufacturerPlatformId;
-
-        [DataMember]
-        public string manufacturerProductLine;
-
-        [DataMember(EmitDefaultValue = false)]
-        public string manufacturerVariantName;
-
-        [DataMember(EmitDefaultValue = false)]
-        public string operatorName;
-
-        [DataMember]
-        public string packageClass;
-
-        [DataMember(EmitDefaultValue = false)]
-        public string packageRevision;
-
-        [DataMember(EmitDefaultValue = false)]
-        public string packageState;
-
-        [DataMember(EmitDefaultValue = false)]
-        public string packageSubRevision;
-
-        [DataMember(EmitDefaultValue = false)]
-        public string packageSubtitle;
-
-        [DataMember(EmitDefaultValue = false)]
-        public string packageTitle;
-
-        [DataMember]
-        public string packageType;
-    }
-
-    [DataContract]
-    public class DiscoveryParameters
-    {
-        [DataMember(Name = "api-version")]
-        public string apiVersion;
-
-        [DataMember]
-        public DiscoveryQueryParameters query;
-
-        [DataMember]
-        public List<string> condition;
-
-        [DataMember]
-        public List<string> response;
-
-        public DiscoveryParameters() : this(DiscoveryCondition.Default)
-        {
-        }
-
-        public DiscoveryParameters(DiscoveryCondition Condition)
-        {
-            this.apiVersion = "1";
-            this.query = new DiscoveryQueryParameters();
-            this.condition = new List<string>();
-            if (Condition == DiscoveryCondition.All)
-            {
-                this.condition.Add("all");
-                return;
-            }
-            if (Condition == DiscoveryCondition.Latest)
-            {
-                this.condition.Add("latest");
-                return;
-            }
-            this.condition.Add("default");
-        }
-    }
-
-    public enum DiscoveryCondition
-    {
-        Default,
-        All,
-        Latest
-    }
-
-    [Serializable]
-    public class ExtendedAttributes : ISerializable
-    {
-        public Dictionary<string, string> Dictionary;
-
-        public ExtendedAttributes()
-        {
-            this.Dictionary = new Dictionary<string, string>();
-        }
-
-        protected ExtendedAttributes(SerializationInfo info, StreamingContext context)
-        {
-            if (info != null)
-            {
-                this.Dictionary = new Dictionary<string, string>();
-                SerializationInfoEnumerator Enumerator = info.GetEnumerator();
-                while (Enumerator.MoveNext())
-                {
-                    this.Dictionary.Add(Enumerator.Current.Name, (string)Enumerator.Current.Value);
-                }
-            }
-        }
-
-        public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
-        {
-            if (info != null)
-            {
-                foreach (string Current in this.Dictionary.Keys)
-                {
-                    info.AddValue(Current, this.Dictionary[Current]);
-                }
-            }
-        }
-    }
-
-    [DataContract]
-    public class SoftwareFileChecksum
-    {
-        [DataMember]
-        public string type;
-
-        [DataMember]
-        public string value;
-    }
-
-    [DataContract]
-    public class SoftwarePackages
-    {
-        [DataMember]
-        public List<SoftwarePackage> softwarePackages;
-    }
-
-    [DataContract]
-    public class SoftwarePackage
-    {
-        [DataMember]
-        public List<string> customerName;
-
-        [DataMember]
-        public ExtendedAttributes extendedAttributes;
-
-        [DataMember]
-        public List<SoftwareFile> files;
-
-        [DataMember]
-        public string id;
-
-        [DataMember]
-        public List<string> manufacturerHardwareModel;
-
-        [DataMember]
-        public List<string> manufacturerHardwareVariant;
-
-        [DataMember]
-        public List<string> manufacturerModelName;
-
-        [DataMember]
-        public string manufacturerName;
-
-        [DataMember]
-        public string manufacturerPackageId;
-
-        [DataMember]
-        public List<string> manufacturerPlatformId;
-
-        [DataMember]
-        public string manufacturerProductLine;
-
-        [DataMember]
-        public List<string> manufacturerVariantName;
-
-        [DataMember]
-        public List<string> operatorName;
-
-        [DataMember]
-        public List<string> packageClass;
-
-        [DataMember]
-        public string packageDescription;
-
-        [DataMember]
-        public string packageRevision;
-
-        [DataMember]
-        public string packageState;
-
-        [DataMember]
-        public string packageSubRevision;
-
-        [DataMember]
-        public string packageSubtitle;
-
-        [DataMember]
-        public string packageTitle;
-
-        [DataMember]
-        public string packageType;
-    }
-
-    [DataContract]
-    public class SoftwareFile
-    {
-        [DataMember]
-        public List<SoftwareFileChecksum> checksum;
-
-        [DataMember]
-        public string fileName;
-
-        [DataMember]
-        public long fileSize;
-
-        [DataMember]
-        public string fileType;
-    }
-
-    public static class DPL
-    {
-        [XmlRoot(ElementName = "BasicProductCodes")]
-        public class BasicProductCodes
-        {
-            [XmlElement(ElementName = "BasicProductCode")]
-            public List<string> BasicProductCode { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Identification")]
-        public class Identification
-        {
-            [XmlElement(ElementName = "TypeDesignator")]
-            public string TypeDesignator { get; set; }
-            [XmlElement(ElementName = "BasicProductCodes")]
-            public BasicProductCodes BasicProductCodes { get; set; }
-            [XmlElement(ElementName = "Purpose")]
-            public string Purpose { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Extensions")]
-        public class Extensions
-        {
-            [XmlElement(ElementName = "PackageType")]
-            public string PackageType { get; set; }
-            [XmlElement(ElementName = "Identification")]
-            public Identification Identification { get; set; }
-            [XmlElement(ElementName = "FileType")]
-            public string FileType { get; set; }
-            [XmlElement(ElementName = "MmosWimFile")]
-            public MmosWimFile MmosWimFile { get; set; }
-        }
-
-        [XmlRoot(ElementName = "PackageDescription")]
-        public class PackageDescription
-        {
-            [XmlElement(ElementName = "Identifier")]
-            public string Identifier { get; set; }
-            [XmlElement(ElementName = "Revision")]
-            public string Revision { get; set; }
-            [XmlElement(ElementName = "Extensions")]
-            public Extensions Extensions { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Digest")]
-        public class Digest
-        {
-            [XmlAttribute(AttributeName = "method")]
-            public string Method { get; set; }
-            [XmlAttribute(AttributeName = "encoding")]
-            public string Encoding { get; set; }
-            [XmlText]
-            public string Text { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Digests")]
-        public class Digests
-        {
-            [XmlElement(ElementName = "Digest")]
-            public List<Digest> Digest { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Range")]
-        public class Range
-        {
-            [XmlAttribute(AttributeName = "from")]
-            public string From { get; set; }
-            [XmlAttribute(AttributeName = "to")]
-            public string To { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Compatibility")]
-        public class Compatibility
-        {
-            [XmlElement(ElementName = "Range")]
-            public Range Range { get; set; }
-            [XmlAttribute(AttributeName = "useCase")]
-            public string UseCase { get; set; }
-        }
-
-        [XmlRoot(ElementName = "UseCaseCompatibilities")]
-        public class UseCaseCompatibilities
-        {
-            [XmlElement(ElementName = "Compatibility")]
-            public List<Compatibility> Compatibility { get; set; }
-        }
-
-        [XmlRoot(ElementName = "MmosWimFile")]
-        public class MmosWimFile
-        {
-            [XmlElement(ElementName = "UseCaseCompatibilities")]
-            public UseCaseCompatibilities UseCaseCompatibilities { get; set; }
-        }
-
-        [XmlRoot(ElementName = "File")]
-        public class File
-        {
-            [XmlElement(ElementName = "Name")]
-            public string Name { get; set; }
-            [XmlElement(ElementName = "Digests")]
-            public Digests Digests { get; set; }
-            [XmlElement(ElementName = "Revision")]
-            public string Revision { get; set; }
-            [XmlElement(ElementName = "Extensions")]
-            public Extensions Extensions { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Files")]
-        public class Files
-        {
-            [XmlElement(ElementName = "File")]
-            public List<File> File { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Content")]
-        public class Content
-        {
-            [XmlElement(ElementName = "PackageDescription")]
-            public PackageDescription PackageDescription { get; set; }
-            [XmlElement(ElementName = "Files")]
-            public Files Files { get; set; }
-        }
-
-        [XmlRoot(ElementName = "CanonicalizationMethod", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-        public class CanonicalizationMethod
-        {
-            [XmlAttribute(AttributeName = "Algorithm")]
-            public string Algorithm { get; set; }
-        }
-
-        [XmlRoot(ElementName = "SignatureMethod", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-        public class SignatureMethod
-        {
-            [XmlAttribute(AttributeName = "Algorithm")]
-            public string Algorithm { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Transform", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-        public class Transform
-        {
-            [XmlAttribute(AttributeName = "Algorithm")]
-            public string Algorithm { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Transforms", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-        public class Transforms
-        {
-            [XmlElement(ElementName = "Transform", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-            public Transform Transform { get; set; }
-        }
-
-        [XmlRoot(ElementName = "DigestMethod", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-        public class DigestMethod
-        {
-            [XmlAttribute(AttributeName = "Algorithm")]
-            public string Algorithm { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Reference", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-        public class Reference
-        {
-            [XmlElement(ElementName = "Transforms", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-            public Transforms Transforms { get; set; }
-            [XmlElement(ElementName = "DigestMethod", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-            public DigestMethod DigestMethod { get; set; }
-            [XmlElement(ElementName = "DigestValue", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-            public string DigestValue { get; set; }
-            [XmlAttribute(AttributeName = "URI")]
-            public string URI { get; set; }
-        }
-
-        [XmlRoot(ElementName = "SignedInfo", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-        public class SignedInfo
-        {
-            [XmlElement(ElementName = "CanonicalizationMethod", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-            public CanonicalizationMethod CanonicalizationMethod { get; set; }
-            [XmlElement(ElementName = "SignatureMethod", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-            public SignatureMethod SignatureMethod { get; set; }
-            [XmlElement(ElementName = "Reference", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-            public Reference Reference { get; set; }
-        }
-
-        [XmlRoot(ElementName = "KeyInfo", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-        public class KeyInfo
-        {
-            [XmlElement(ElementName = "KeyName", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-            public string KeyName { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Signature", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-        public class Signature
-        {
-            [XmlElement(ElementName = "SignedInfo", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-            public SignedInfo SignedInfo { get; set; }
-            [XmlElement(ElementName = "SignatureValue", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-            public string SignatureValue { get; set; }
-            [XmlElement(ElementName = "KeyInfo", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-            public KeyInfo KeyInfo { get; set; }
-            [XmlAttribute(AttributeName = "xmlns")]
-            public string Xmlns { get; set; }
-        }
-
-        [XmlRoot(ElementName = "Package")]
-        public class Package
-        {
-            [XmlElement(ElementName = "Content")]
-            public Content Content { get; set; }
-            [XmlElement(ElementName = "Signature", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
-            public Signature Signature { get; set; }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Json;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Serialization;
+
+namespace WPinternals
+{
+    internal static class LumiaDownloadModel
+    {
+        internal static string SearchFFU(string ProductType, string ProductCode, string OperatorCode)
+        {
+            return SearchFFU(ProductType, ProductCode, OperatorCode, out string FoundProductType);
+        }
+
+        internal static string SearchFFU(string ProductType, string ProductCode, string OperatorCode, out string FoundProductType)
+        {
+            if (ProductType?.Length == 0)
+            {
+                ProductType = null;
+            }
+
+            if (ProductCode?.Length == 0)
+            {
+                ProductCode = null;
+            }
+
+            if (OperatorCode?.Length == 0)
+            {
+                OperatorCode = null;
+            }
+
+            if (ProductCode != null)
+            {
+                ProductCode = ProductCode.ToUpper();
+                ProductType = null;
+                OperatorCode = null;
+            }
+            if (ProductType != null)
+            {
+                ProductType = ProductType.ToUpper();
+                if (ProductType.StartsWith("RM") && !ProductType.StartsWith("RM-"))
+                {
+                    ProductType = "RM-" + ProductType[2..];
+                }
+            }
+            if (OperatorCode != null)
+            {
+                OperatorCode = OperatorCode.ToUpper();
+            }
+
+            DiscoveryQueryParameters DiscoveryQueryParams = new()
+            {
+                manufacturerName = "Microsoft",
+                manufacturerProductLine = "Lumia",
+                packageType = "Firmware",
+                packageClass = "Public",
+                manufacturerHardwareModel = ProductType,
+                manufacturerHardwareVariant = ProductCode,
+                operatorName = OperatorCode
+            };
+            DiscoveryParameters DiscoveryParams = new()
+            {
+                query = DiscoveryQueryParams
+            };
+
+            DataContractJsonSerializer Serializer1 = new(typeof(DiscoveryParameters));
+            MemoryStream JsonStream1 = new();
+            Serializer1.WriteObject(JsonStream1, DiscoveryParams);
+            JsonStream1.Seek(0L, SeekOrigin.Begin);
+            string JsonContent = new StreamReader(JsonStream1).ReadToEnd();
+
+            Uri RequestUri = new("https://api.swrepository.com/rest-api/discovery/1/package");
+
+            HttpClient HttpClient = new();
+            HttpClient.DefaultRequestHeaders.UserAgent.TryParseAdd("SoftwareRepository");
+            HttpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+            Task<HttpResponseMessage> HttpPostTask = HttpClient.PostAsync(RequestUri, new StringContent(JsonContent, Encoding.UTF8, "application/json"));
+            HttpPostTask.Wait();
+            HttpResponseMessage Response = HttpPostTask.Result;
+
+            string JsonResultString = "";
+            if (Response.StatusCode == HttpStatusCode.OK)
+            {
+                Task<string> ReadResponseTask = Response.Content.ReadAsStringAsync();
+                ReadResponseTask.Wait();
+                JsonResultString = ReadResponseTask.Result;
+            }
+
+            SoftwarePackage Package = null;
+            using (MemoryStream JsonStream2 = new(Encoding.UTF8.GetBytes(JsonResultString)))
+            {
+                DataContractJsonSerializer Serializer2 = new(typeof(SoftwarePackages));
+                SoftwarePackages SoftwarePackages = (SoftwarePackages)Serializer2.ReadObject(JsonStream2);
+                if (SoftwarePackages != null)
+                {
+                    Package = SoftwarePackages.softwarePackages.FirstOrDefault();
+                }
+            }
+
+            if (Package == null)
+            {
+                throw new WPinternalsException("FFU not found", "No FFU has been found in the remote software repository for the requested model.");
+            }
+
+            FoundProductType = Package.manufacturerHardwareModel[0];
+
+            SoftwareFile FileInfo = Package.files.First(f => f.fileName.EndsWith(".ffu", StringComparison.OrdinalIgnoreCase));
+
+            Uri FileInfoUri = new("https://api.swrepository.com/rest-api/discovery/fileurl/1/" + Package.id + "/" + FileInfo.fileName);
+            Task<string> GetFileInfoTask = HttpClient.GetStringAsync(FileInfoUri);
+            GetFileInfoTask.Wait();
+            string FileInfoString = GetFileInfoTask.Result;
+
+            string FfuUrl = "";
+            FileUrlResult FileUrl = null;
+            using (MemoryStream JsonStream3 = new(Encoding.UTF8.GetBytes(FileInfoString)))
+            {
+                DataContractJsonSerializer Serializer3 = new(typeof(FileUrlResult));
+                FileUrl = (FileUrlResult)Serializer3.ReadObject(JsonStream3);
+                if (FileUrl != null)
+                {
+                    FfuUrl = FileUrl.url.Replace("sr.azureedge.net", "softwarerepo.blob.core.windows.net");
+                }
+            }
+
+            HttpClient.Dispose();
+
+            return FfuUrl;
+        }
+
+        internal static string SearchENOSW(string ProductType, string PhoneFirmwareRevision)
+        {
+            if (ProductType?.Length == 0)
+            {
+                ProductType = null;
+            }
+
+            if (ProductType != null)
+            {
+                ProductType = ProductType.ToUpper();
+                if (ProductType.StartsWith("RM") && !ProductType.StartsWith("RM-"))
+                {
+                    ProductType = "RM-" + ProductType[2..];
+                }
+            }
+
+            DiscoveryQueryParameters DiscoveryQueryParams = new()
+            {
+                manufacturerName = "Microsoft",
+                manufacturerProductLine = "Lumia",
+                packageType = "Test Mode",
+                packageClass = "Public",
+                manufacturerHardwareModel = ProductType
+            };
+            DiscoveryParameters DiscoveryParams = new()
+            {
+                query = DiscoveryQueryParams
+            };
+
+            DataContractJsonSerializer Serializer1 = new(typeof(DiscoveryParameters));
+            MemoryStream JsonStream1 = new();
+            Serializer1.WriteObject(JsonStream1, DiscoveryParams);
+            JsonStream1.Seek(0L, SeekOrigin.Begin);
+            string JsonContent = new StreamReader(JsonStream1).ReadToEnd();
+
+            Uri RequestUri = new("https://api.swrepository.com/rest-api/discovery/1/package");
+
+            HttpClient HttpClient = new();
+            HttpClient.DefaultRequestHeaders.UserAgent.TryParseAdd("SoftwareRepository");
+            HttpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
+
+            Task<HttpResponseMessage> HttpPostTask = HttpClient.PostAsync(RequestUri, new StringContent(JsonContent, Encoding.UTF8, "application/json"));
+            HttpPostTask.Wait();
+            HttpResponseMessage Response = HttpPostTask.Result;
+
+            string JsonResultString = "";
+            if (Response.StatusCode == HttpStatusCode.OK)
+            {
+                Task<string> ReadResponseTask = Response.Content.ReadAsStringAsync();
+                ReadResponseTask.Wait();
+                JsonResultString = ReadResponseTask.Result;
+            }
+
+            SoftwarePackage Package = null;
+            using (MemoryStream JsonStream2 = new(Encoding.UTF8.GetBytes(JsonResultString)))
+            {
+                DataContractJsonSerializer Serializer2 = new(typeof(SoftwarePackages));
+                SoftwarePackages SoftwarePackages = (SoftwarePackages)Serializer2.ReadObject(JsonStream2);
+                if (SoftwarePackages != null)
+                {
+                    foreach (SoftwarePackage pkg in SoftwarePackages.softwarePackages)
+                    {
+                        Package = SoftwarePackages.softwarePackages.FirstOrDefault();
+                    }
+                }
+            }
+
+            if (Package == null)
+            {
+                throw new WPinternalsException("ENOSW package not found", "No ENOSW package has been found in the remote software repository for the requested model.");
+            }
+
+            SoftwareFile FileInfo = Package.files.First(f => f.fileName.EndsWith(".secwim", StringComparison.OrdinalIgnoreCase));
+
+            SoftwareFile DPLF = Package.files.First(f => f.fileName.EndsWith(".dpl", StringComparison.OrdinalIgnoreCase));
+            Uri DPLUri = new("https://api.swrepository.com/rest-api/discovery/fileurl/1/" + Package.id + "/" + DPLF.fileName);
+            Task<string> GetDPLTask = HttpClient.GetStringAsync(DPLUri);
+            GetDPLTask.Wait();
+            string DPLString = GetDPLTask.Result;
+
+            string DPLUrl = "";
+            FileUrlResult FileUrlDPL = null;
+            using (MemoryStream JsonStream3 = new(Encoding.UTF8.GetBytes(DPLString)))
+            {
+                DataContractJsonSerializer Serializer3 = new(typeof(FileUrlResult));
+                FileUrlDPL = (FileUrlResult)Serializer3.ReadObject(JsonStream3);
+                if (FileUrlDPL != null)
+                {
+                    DPLUrl = FileUrlDPL.url.Replace("sr.azureedge.net", "softwarerepo.blob.core.windows.net");
+                }
+            }
+
+            if (DPLUrl?.Length == 0)
+            {
+                throw new WPinternalsException("DPL not found", "No DPL has been found in the remote software repository for the requested model.");
+            }
+
+            Task<string> GetDPLStrTask = HttpClient.GetStringAsync(DPLUrl);
+            GetDPLStrTask.Wait();
+            string DPLStrString = GetDPLStrTask.Result;
+
+            DPL.Package dpl;
+            XmlSerializer serializer = new(typeof(DPL.Package));
+            using (StringReader reader = new(DPLStrString.Replace("ft:", "").Replace("dpl:", "").Replace("typedes:", "")))
+            {
+                dpl = (DPL.Package)serializer.Deserialize(reader);
+            }
+
+            foreach (DPL.File file in dpl.Content.Files.File)
+            {
+                string name = file.Name;
+
+                DPL.Range range = file.Extensions.MmosWimFile.UseCaseCompatibilities.Compatibility.FirstOrDefault().Range;
+
+                if (IsFirmwareBetween(PhoneFirmwareRevision, range.From, range.To))
+                {
+                    FileInfo = Package.files.First(f => f.fileName.EndsWith(name, StringComparison.OrdinalIgnoreCase));
+                }
+            }
+
+            Uri FileInfoUri = new("https://api.swrepository.com/rest-api/discovery/fileurl/1/" + Package.id + "/" + FileInfo.fileName);
+            Task<string> GetFileInfoTask = HttpClient.GetStringAsync(FileInfoUri);
+            GetFileInfoTask.Wait();
+            string FileInfoString = GetFileInfoTask.Result;
+
+            string ENOSWUrl = "";
+            FileUrlResult FileUrl = null;
+            using (MemoryStream JsonStream3 = new(Encoding.UTF8.GetBytes(FileInfoString)))
+            {
+                DataContractJsonSerializer Serializer3 = new(typeof(FileUrlResult));
+                FileUrl = (FileUrlResult)Serializer3.ReadObject(JsonStream3);
+                if (FileUrl != null)
+                {
+                    ENOSWUrl = FileUrl.url.Replace("sr.azureedge.net", "softwarerepo.blob.core.windows.net");
+                }
+            }
+
+            HttpClient.Dispose();
+
+            return ENOSWUrl;
+        }
+
+        private static bool IsFirmwareBetween(string PhoneFirmwareRevision, string Limit1, string Limit2)
+        {
+            var version = new Version(PhoneFirmwareRevision);
+            var version1 = new Version(Limit1);
+            var version2 = new Version(Limit2);
+
+            var result = version.CompareTo(version1);
+            var result2 = version.CompareTo(version2);
+
+            return result >= 0 && result2 <= 0;
+        }
+
+        internal static string[] SearchEmergencyFiles(string ProductType)
+        {
+            ProductType = ProductType.ToUpper();
+            if (ProductType.StartsWith("RM") && !ProductType.StartsWith("RM-"))
+            {
+                ProductType = "RM-" + ProductType[2..];
+            }
+
+            LogFile.Log("Getting Emergency files for: " + ProductType, LogType.FileAndConsole);
+
+            if ((ProductType == "RM-1072") || (ProductType == "RM-1073"))
+            {
+                LogFile.Log("Due to mix-up in online-repository, redirecting to emergency files of RM-1113", LogType.FileAndConsole);
+                ProductType = "RM-1113";
+            }
+
+            List<string> Result = new();
+
+            WebClient Client = new();
+            string Src;
+            string FileName;
+            string Config = null;
+            try
+            {
+                Config = Client.DownloadString("https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/emergency_flash_config.xml");
+            }
+            catch
+            {
+                LogFile.Log("Emergency files for " + ProductType + " not found", LogType.FileAndConsole);
+                return null;
+            }
+            Client.Dispose();
+
+            XmlDocument Doc = new();
+            Doc.LoadXml(Config);
+
+            // Hex
+            XmlNode Node = Doc.SelectSingleNode("//emergency_flash_config/hex_flasher");
+            if (Node != null)
+            {
+                FileName = Node.Attributes["image_path"].InnerText;
+                Src = "https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
+                LogFile.Log("Hex-file: " + Src);
+                Result.Add(Src);
+            }
+
+            // Mbn
+            Node = Doc.SelectSingleNode("//emergency_flash_config/mbn_image");
+            if (Node != null)
+            {
+                FileName = Node.Attributes["image_path"].InnerText;
+                Src = "https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
+                LogFile.Log("Mbn-file: " + Src);
+                Result.Add(Src);
+            }
+
+            // Ede
+            foreach (XmlNode SubNode in Doc.SelectNodes("//emergency_flash_config/first_boot_images/first_boot_image"))
+            {
+                FileName = SubNode.Attributes["image_path"].InnerText;
+                Src = "https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
+                LogFile.Log("Firehose-programmer-file: " + Src);
+                Result.Add(Src);
+            }
+
+            // Edp
+            foreach (XmlNode SubNode in Doc.SelectNodes("//emergency_flash_config/second_boot_firehose_single_image/firehose_image"))
+            {
+                FileName = SubNode.Attributes["image_path"].InnerText;
+                Src = "https://repairavoidance.blob.core.windows.net/packages/EmergencyFlash/" + ProductType + "/" + FileName;
+                LogFile.Log("Firehose-payload-file: " + Src);
+                Result.Add(Src);
+            }
+
+            return Result.ToArray();
+        }
+    }
+
+#pragma warning disable 0649
+    [DataContract]
+    internal class FileUrlResult
+    {
+        [DataMember]
+        internal string url;
+
+        [DataMember]
+        internal List<string> alternateUrl;
+
+        [DataMember]
+        internal long fileSize;
+
+        [DataMember]
+        internal List<SoftwareFileChecksum> checksum;
+    }
+#pragma warning restore 0649
+
+    [DataContract]
+    public class DiscoveryQueryParameters
+    {
+        [DataMember(EmitDefaultValue = false)]
+        public string customerName;
+
+        [DataMember(EmitDefaultValue = false)]
+        public ExtendedAttributes extendedAttributes;
+
+        [DataMember(EmitDefaultValue = false)]
+        public string manufacturerHardwareModel;
+
+        [DataMember(EmitDefaultValue = false)]
+        public string manufacturerHardwareVariant;
+
+        [DataMember(EmitDefaultValue = false)]
+        public string manufacturerModelName;
+
+        [DataMember]
+        public string manufacturerName;
+
+        [DataMember(EmitDefaultValue = false)]
+        public string manufacturerPackageId;
+
+        [DataMember(EmitDefaultValue = false)]
+        public string manufacturerPlatformId;
+
+        [DataMember]
+        public string manufacturerProductLine;
+
+        [DataMember(EmitDefaultValue = false)]
+        public string manufacturerVariantName;
+
+        [DataMember(EmitDefaultValue = false)]
+        public string operatorName;
+
+        [DataMember]
+        public string packageClass;
+
+        [DataMember(EmitDefaultValue = false)]
+        public string packageRevision;
+
+        [DataMember(EmitDefaultValue = false)]
+        public string packageState;
+
+        [DataMember(EmitDefaultValue = false)]
+        public string packageSubRevision;
+
+        [DataMember(EmitDefaultValue = false)]
+        public string packageSubtitle;
+
+        [DataMember(EmitDefaultValue = false)]
+        public string packageTitle;
+
+        [DataMember]
+        public string packageType;
+    }
+
+    [DataContract]
+    public class DiscoveryParameters
+    {
+        [DataMember(Name = "api-version")]
+        public string apiVersion;
+
+        [DataMember]
+        public DiscoveryQueryParameters query;
+
+        [DataMember]
+        public List<string> condition;
+
+        [DataMember]
+        public List<string> response;
+
+        public DiscoveryParameters() : this(DiscoveryCondition.Default)
+        {
+        }
+
+        public DiscoveryParameters(DiscoveryCondition Condition)
+        {
+            this.apiVersion = "1";
+            this.query = new DiscoveryQueryParameters();
+            this.condition = new List<string>();
+            if (Condition == DiscoveryCondition.All)
+            {
+                this.condition.Add("all");
+                return;
+            }
+            if (Condition == DiscoveryCondition.Latest)
+            {
+                this.condition.Add("latest");
+                return;
+            }
+            this.condition.Add("default");
+        }
+    }
+
+    public enum DiscoveryCondition
+    {
+        Default,
+        All,
+        Latest
+    }
+
+    [Serializable]
+    public class ExtendedAttributes : ISerializable
+    {
+        public Dictionary<string, string> Dictionary;
+
+        public ExtendedAttributes()
+        {
+            this.Dictionary = new Dictionary<string, string>();
+        }
+
+        protected ExtendedAttributes(SerializationInfo info, StreamingContext context)
+        {
+            if (info != null)
+            {
+                this.Dictionary = new Dictionary<string, string>();
+                SerializationInfoEnumerator Enumerator = info.GetEnumerator();
+                while (Enumerator.MoveNext())
+                {
+                    this.Dictionary.Add(Enumerator.Current.Name, (string)Enumerator.Current.Value);
+                }
+            }
+        }
+
+        public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            if (info != null)
+            {
+                foreach (string Current in this.Dictionary.Keys)
+                {
+                    info.AddValue(Current, this.Dictionary[Current]);
+                }
+            }
+        }
+    }
+
+    [DataContract]
+    public class SoftwareFileChecksum
+    {
+        [DataMember]
+        public string type;
+
+        [DataMember]
+        public string value;
+    }
+
+    [DataContract]
+    public class SoftwarePackages
+    {
+        [DataMember]
+        public List<SoftwarePackage> softwarePackages;
+    }
+
+    [DataContract]
+    public class SoftwarePackage
+    {
+        [DataMember]
+        public List<string> customerName;
+
+        [DataMember]
+        public ExtendedAttributes extendedAttributes;
+
+        [DataMember]
+        public List<SoftwareFile> files;
+
+        [DataMember]
+        public string id;
+
+        [DataMember]
+        public List<string> manufacturerHardwareModel;
+
+        [DataMember]
+        public List<string> manufacturerHardwareVariant;
+
+        [DataMember]
+        public List<string> manufacturerModelName;
+
+        [DataMember]
+        public string manufacturerName;
+
+        [DataMember]
+        public string manufacturerPackageId;
+
+        [DataMember]
+        public List<string> manufacturerPlatformId;
+
+        [DataMember]
+        public string manufacturerProductLine;
+
+        [DataMember]
+        public List<string> manufacturerVariantName;
+
+        [DataMember]
+        public List<string> operatorName;
+
+        [DataMember]
+        public List<string> packageClass;
+
+        [DataMember]
+        public string packageDescription;
+
+        [DataMember]
+        public string packageRevision;
+
+        [DataMember]
+        public string packageState;
+
+        [DataMember]
+        public string packageSubRevision;
+
+        [DataMember]
+        public string packageSubtitle;
+
+        [DataMember]
+        public string packageTitle;
+
+        [DataMember]
+        public string packageType;
+    }
+
+    [DataContract]
+    public class SoftwareFile
+    {
+        [DataMember]
+        public List<SoftwareFileChecksum> checksum;
+
+        [DataMember]
+        public string fileName;
+
+        [DataMember]
+        public long fileSize;
+
+        [DataMember]
+        public string fileType;
+    }
+
+    public static class DPL
+    {
+        [XmlRoot(ElementName = "BasicProductCodes")]
+        public class BasicProductCodes
+        {
+            [XmlElement(ElementName = "BasicProductCode")]
+            public List<string> BasicProductCode { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Identification")]
+        public class Identification
+        {
+            [XmlElement(ElementName = "TypeDesignator")]
+            public string TypeDesignator { get; set; }
+            [XmlElement(ElementName = "BasicProductCodes")]
+            public BasicProductCodes BasicProductCodes { get; set; }
+            [XmlElement(ElementName = "Purpose")]
+            public string Purpose { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Extensions")]
+        public class Extensions
+        {
+            [XmlElement(ElementName = "PackageType")]
+            public string PackageType { get; set; }
+            [XmlElement(ElementName = "Identification")]
+            public Identification Identification { get; set; }
+            [XmlElement(ElementName = "FileType")]
+            public string FileType { get; set; }
+            [XmlElement(ElementName = "MmosWimFile")]
+            public MmosWimFile MmosWimFile { get; set; }
+        }
+
+        [XmlRoot(ElementName = "PackageDescription")]
+        public class PackageDescription
+        {
+            [XmlElement(ElementName = "Identifier")]
+            public string Identifier { get; set; }
+            [XmlElement(ElementName = "Revision")]
+            public string Revision { get; set; }
+            [XmlElement(ElementName = "Extensions")]
+            public Extensions Extensions { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Digest")]
+        public class Digest
+        {
+            [XmlAttribute(AttributeName = "method")]
+            public string Method { get; set; }
+            [XmlAttribute(AttributeName = "encoding")]
+            public string Encoding { get; set; }
+            [XmlText]
+            public string Text { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Digests")]
+        public class Digests
+        {
+            [XmlElement(ElementName = "Digest")]
+            public List<Digest> Digest { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Range")]
+        public class Range
+        {
+            [XmlAttribute(AttributeName = "from")]
+            public string From { get; set; }
+            [XmlAttribute(AttributeName = "to")]
+            public string To { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Compatibility")]
+        public class Compatibility
+        {
+            [XmlElement(ElementName = "Range")]
+            public Range Range { get; set; }
+            [XmlAttribute(AttributeName = "useCase")]
+            public string UseCase { get; set; }
+        }
+
+        [XmlRoot(ElementName = "UseCaseCompatibilities")]
+        public class UseCaseCompatibilities
+        {
+            [XmlElement(ElementName = "Compatibility")]
+            public List<Compatibility> Compatibility { get; set; }
+        }
+
+        [XmlRoot(ElementName = "MmosWimFile")]
+        public class MmosWimFile
+        {
+            [XmlElement(ElementName = "UseCaseCompatibilities")]
+            public UseCaseCompatibilities UseCaseCompatibilities { get; set; }
+        }
+
+        [XmlRoot(ElementName = "File")]
+        public class File
+        {
+            [XmlElement(ElementName = "Name")]
+            public string Name { get; set; }
+            [XmlElement(ElementName = "Digests")]
+            public Digests Digests { get; set; }
+            [XmlElement(ElementName = "Revision")]
+            public string Revision { get; set; }
+            [XmlElement(ElementName = "Extensions")]
+            public Extensions Extensions { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Files")]
+        public class Files
+        {
+            [XmlElement(ElementName = "File")]
+            public List<File> File { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Content")]
+        public class Content
+        {
+            [XmlElement(ElementName = "PackageDescription")]
+            public PackageDescription PackageDescription { get; set; }
+            [XmlElement(ElementName = "Files")]
+            public Files Files { get; set; }
+        }
+
+        [XmlRoot(ElementName = "CanonicalizationMethod", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+        public class CanonicalizationMethod
+        {
+            [XmlAttribute(AttributeName = "Algorithm")]
+            public string Algorithm { get; set; }
+        }
+
+        [XmlRoot(ElementName = "SignatureMethod", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+        public class SignatureMethod
+        {
+            [XmlAttribute(AttributeName = "Algorithm")]
+            public string Algorithm { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Transform", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+        public class Transform
+        {
+            [XmlAttribute(AttributeName = "Algorithm")]
+            public string Algorithm { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Transforms", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+        public class Transforms
+        {
+            [XmlElement(ElementName = "Transform", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+            public Transform Transform { get; set; }
+        }
+
+        [XmlRoot(ElementName = "DigestMethod", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+        public class DigestMethod
+        {
+            [XmlAttribute(AttributeName = "Algorithm")]
+            public string Algorithm { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Reference", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+        public class Reference
+        {
+            [XmlElement(ElementName = "Transforms", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+            public Transforms Transforms { get; set; }
+            [XmlElement(ElementName = "DigestMethod", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+            public DigestMethod DigestMethod { get; set; }
+            [XmlElement(ElementName = "DigestValue", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+            public string DigestValue { get; set; }
+            [XmlAttribute(AttributeName = "URI")]
+            public string URI { get; set; }
+        }
+
+        [XmlRoot(ElementName = "SignedInfo", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+        public class SignedInfo
+        {
+            [XmlElement(ElementName = "CanonicalizationMethod", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+            public CanonicalizationMethod CanonicalizationMethod { get; set; }
+            [XmlElement(ElementName = "SignatureMethod", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+            public SignatureMethod SignatureMethod { get; set; }
+            [XmlElement(ElementName = "Reference", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+            public Reference Reference { get; set; }
+        }
+
+        [XmlRoot(ElementName = "KeyInfo", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+        public class KeyInfo
+        {
+            [XmlElement(ElementName = "KeyName", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+            public string KeyName { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Signature", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+        public class Signature
+        {
+            [XmlElement(ElementName = "SignedInfo", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+            public SignedInfo SignedInfo { get; set; }
+            [XmlElement(ElementName = "SignatureValue", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+            public string SignatureValue { get; set; }
+            [XmlElement(ElementName = "KeyInfo", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+            public KeyInfo KeyInfo { get; set; }
+            [XmlAttribute(AttributeName = "xmlns")]
+            public string Xmlns { get; set; }
+        }
+
+        [XmlRoot(ElementName = "Package")]
+        public class Package
+        {
+            [XmlElement(ElementName = "Content")]
+            public Content Content { get; set; }
+            [XmlElement(ElementName = "Signature", Namespace = "http://www.w3.org/2000/09/xmldsig#")]
+            public Signature Signature { get; set; }
+        }
+    }
+}
diff --git a/Models/MassStorage.cs b/WPinternals/Models/MassStorage.cs
similarity index 97%
rename from Models/MassStorage.cs
rename to WPinternals/Models/MassStorage.cs
index c08d88e..f49c51c 100644
--- a/Models/MassStorage.cs
+++ b/WPinternals/Models/MassStorage.cs
@@ -1,551 +1,551 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.Linq;
-using System.Management;
-using System.Runtime.InteropServices;
-
-namespace WPinternals
-{
-    internal class MassStorage : NokiaPhoneModel
-    {
-        internal string Drive = null;
-        internal string PhysicalDrive = null;
-        internal string VolumeLabel = null;
-        internal IntPtr hVolume = (IntPtr)(-1);
-        internal IntPtr hDrive = (IntPtr)(-1);
-        private bool OpenWithWriteAccess;
-
-        private string Serial;
-
-        internal MassStorage(string DevicePath) : base(DevicePath)
-        {
-            try
-            {
-                foreach (ManagementObject logical in new ManagementObjectSearcher("select * from Win32_LogicalDisk").Get())
-                {
-                    System.Diagnostics.Debug.Print(logical["Name"].ToString());
-
-                    string Label = "";
-                    foreach (ManagementObject partition in logical.GetRelated("Win32_DiskPartition"))
-                    {
-                        foreach (ManagementObject drive in partition.GetRelated("Win32_DiskDrive"))
-                        {
-                            if (drive["PNPDeviceID"].ToString().Contains("VEN_QUALCOMM&PROD_MMC_STORAGE", StringComparison.CurrentCulture) ||
-                                drive["PNPDeviceID"].ToString().Contains("VEN_MSFT&PROD_PHONE_MMC_STOR", StringComparison.CurrentCulture))
-                            {
-                                Label = logical["VolumeName"] == null ? "" : logical["VolumeName"].ToString();
-                                if ((Drive == null) || string.Equals(Label, "MainOS", StringComparison.CurrentCultureIgnoreCase)) // Always prefer the MainOS drive-mapping
-                                {
-                                    Drive = logical["Name"].ToString();
-                                    PhysicalDrive = drive["DeviceID"].ToString();
-                                    VolumeLabel = Label;
-                                }
-                                if (string.Equals(Label, "MainOS", StringComparison.CurrentCultureIgnoreCase))
-                                {
-                                    break;
-                                }
-                            }
-                        }
-                        if (string.Equals(Label, "MainOS", StringComparison.CurrentCultureIgnoreCase))
-                        {
-                            break;
-                        }
-                    }
-                }
-            }
-            catch { }
-        }
-
-        internal void AttachQualcommSerial(string DevicePath)
-        {
-            try
-            {
-                QualcommSerial SerialDevice = new(DevicePath);
-                SerialDevice.Close();
-                SerialDevice.Dispose();
-
-                Serial = DevicePath;
-            }
-            catch (Exception ex)
-            {
-                LogFile.Log(ex.Message);
-            }
-        }
-
-        internal bool DoesDeviceSupportReboot()
-        {
-            return Serial != null;
-        }
-
-        internal void Reboot()
-        {
-            if (Serial == null)
-            {
-                return;
-            }
-
-            try
-            {
-                QualcommSerial SerialDevice = new(Serial);
-
-                SerialDevice.EncodeCommands = false;
-
-                // This will succeed on new models
-                SerialDevice.SendData(new byte[] { 0x7, 0x0, 0x0, 0x0, 0x8, 0x0, 0x0, 0x0 });
-
-                // This will succeed on old models
-                SerialDevice.SendData(new byte[] { 0x7E, 0xA, 0x0, 0x0, 0xB6, 0xB5, 0x7E });
-
-                SerialDevice.Close();
-                SerialDevice.Dispose();
-            }
-            catch { }
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (Disposed)
-            {
-                return;
-            }
-
-            if (disposing)
-            {
-                CloseVolume();
-
-                base.Dispose(disposing);
-            }
-        }
-
-        internal void OpenVolume(bool WriteAccess)
-        {
-            OpenWithWriteAccess = false;
-
-            if (IsVolumeOpen())
-            {
-                throw new Exception("Volume already opened");
-            }
-
-            if (WriteAccess)
-            {
-                // Unmounting the volume does not have the desired effect.
-                // It does not unmount the mountpoints on the phone.
-                // So the sectors of the filesystems of EFIESP, Data, etc cannot be written.
-                // Unmounting the mounting points would alter the NTFS structure, which is also an undesired effect.
-                // Restoring partitions with file-systems can better be done using Flash mode!
-
-                // Open volume
-                hVolume = NativeMethods.CreateFile(
-                    PhysicalDrive,
-                    NativeMethods.GENERIC_READ | NativeMethods.GENERIC_WRITE,
-                    NativeMethods.FILE_SHARE_READ | NativeMethods.FILE_SHARE_WRITE,
-                    IntPtr.Zero,
-                    NativeMethods.OPEN_EXISTING,
-                    NativeMethods.FILE_FLAG_WRITE_THROUGH | NativeMethods.FILE_FLAG_NO_BUFFERING, // !!!
-                    IntPtr.Zero);
-            }
-            else
-            {
-                hVolume = NativeMethods.CreateFile(
-                    // @"\\.\" + Drive,
-                    PhysicalDrive,
-                    NativeMethods.GENERIC_READ,
-                    NativeMethods.FILE_SHARE_READ | NativeMethods.FILE_SHARE_WRITE,
-                    IntPtr.Zero,
-                    NativeMethods.OPEN_EXISTING,
-                    0,
-                    IntPtr.Zero);
-            }
-
-            if ((int)hVolume == -1)
-            {
-                throw new Exception(Marshal.GetLastWin32Error().ToString());
-            }
-
-            OpenWithWriteAccess = WriteAccess;
-        }
-
-        internal bool IsVolumeOpen()
-        {
-            return (int)hVolume != -1;
-        }
-
-        internal void CloseVolume()
-        {
-            if ((int)hDrive != -1)
-            {
-                NativeMethods.CloseHandle(hDrive); // This reloads the logical drive!!
-                hDrive = new IntPtr(-1);
-            }
-
-            if ((int)hVolume != -1)
-            {
-                NativeMethods.CloseHandle(hVolume);
-                hVolume = new IntPtr(-1);
-            }
-        }
-
-        internal void SetSectorPosition(UInt64 Sector)
-        {
-            if (!IsVolumeOpen())
-            {
-                throw new Exception("Volume is not opened");
-            }
-
-            int High = (int)(Sector >> (32 - 9));
-            NativeMethods.SetFilePointer(hVolume, (int)(Sector << 9), ref High, EMoveMethod.Begin);
-        }
-
-        internal void WriteSector(byte[] buffer)
-        {
-            if (!IsVolumeOpen())
-            {
-                throw new Exception("Volume is not opened");
-            }
-
-            if (!OpenWithWriteAccess)
-            {
-                throw new Exception("Volume is not opened with Write Acces");
-            }
-
-            bool result = NativeMethods.WriteFile(hVolume, buffer, 512, out uint count, IntPtr.Zero);
-            if (!result)
-            {
-                throw new Exception("Exception: 0x" + Marshal.GetLastWin32Error().ToString("X8"));
-            }
-        }
-
-        internal void ReadSector(byte[] buffer)
-        {
-            if (!IsVolumeOpen())
-            {
-                throw new Exception("Volume is not opened");
-            }
-
-            bool result = NativeMethods.ReadFile(hVolume, buffer, 512, out uint count, IntPtr.Zero);
-            if (!result)
-            {
-                throw new Exception("Exception: 0x" + Marshal.GetLastWin32Error().ToString("X8"));
-            }
-        }
-
-        internal void ReadSectors(byte[] buffer, out uint ActualSectorsRead, uint SizeInSectors = uint.MaxValue)
-        {
-            if (!IsVolumeOpen())
-            {
-                throw new Exception("Volume is not opened");
-            }
-
-            bool Result = NativeMethods.ReadFile(hVolume, buffer, (SizeInSectors * 0x200) < buffer.Length ? (SizeInSectors * 0x200) : (uint)buffer.Length, out uint count, IntPtr.Zero);
-            ActualSectorsRead = count / 0x200;
-            if (!Result)
-            {
-                throw new Exception("Failed to read sectors. Exception: 0x" + Marshal.GetLastWin32Error().ToString("X8"));
-            }
-        }
-
-        internal byte[] ReadSectors(UInt64 StartSector, UInt64 SectorCount)
-        {
-            byte[] Result = new byte[SectorCount * 0x200];
-
-            bool VolumeWasOpen = IsVolumeOpen();
-            if (!VolumeWasOpen)
-            {
-                OpenVolume(false);
-            }
-
-            SetSectorPosition(StartSector);
-            ReadSectors(Result, out uint SectorsRead);
-
-            if (!VolumeWasOpen)
-            {
-                CloseVolume();
-            }
-
-            if (Result == null)
-            {
-                throw new Exception("Failed to read from phone");
-            }
-
-            return Result;
-        }
-
-        internal void DumpSectors(UInt64 StartSector, UInt64 SectorCount, string Path)
-        {
-            DumpSectors(StartSector, SectorCount, Path, null, null, null);
-        }
-
-        internal void DumpSectors(UInt64 StartSector, UInt64 SectorCount, string Path, Action<int, TimeSpan?> ProgressUpdateCallback)
-        {
-            DumpSectors(StartSector, SectorCount, Path, null, ProgressUpdateCallback, null);
-        }
-
-        internal void DumpSectors(UInt64 StartSector, UInt64 SectorCount, string Path, ProgressUpdater UpdaterPerSector)
-        {
-            DumpSectors(StartSector, SectorCount, Path, null, null, UpdaterPerSector);
-        }
-
-        internal void DumpSectors(UInt64 StartSector, UInt64 SectorCount, Stream OutputStream)
-        {
-            DumpSectors(StartSector, SectorCount, null, OutputStream, null, null);
-        }
-
-        internal void DumpSectors(UInt64 StartSector, UInt64 SectorCount, Stream OutputStream, Action<int, TimeSpan?> ProgressUpdateCallback)
-        {
-            DumpSectors(StartSector, SectorCount, null, OutputStream, ProgressUpdateCallback, null);
-        }
-
-        internal void DumpSectors(UInt64 StartSector, UInt64 SectorCount, Stream OutputStream, ProgressUpdater UpdaterPerSector)
-        {
-            DumpSectors(StartSector, SectorCount, null, OutputStream, null, UpdaterPerSector);
-        }
-
-        private void DumpSectors(UInt64 StartSector, UInt64 SectorCount, string Path, Stream OutputStream, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector)
-        {
-            bool VolumeWasOpen = IsVolumeOpen();
-            if (!VolumeWasOpen)
-            {
-                OpenVolume(false);
-            }
-
-            SetSectorPosition(StartSector);
-            ProgressUpdater Progress = UpdaterPerSector;
-            if ((Progress == null) && (ProgressUpdateCallback != null))
-            {
-                Progress = new ProgressUpdater(SectorCount, ProgressUpdateCallback);
-            }
-
-            byte[] Buffer = SectorCount >= 0x80 ? (new byte[0x10000]) : (new byte[SectorCount * 0x200]);
-
-            Stream Stream = Path == null ? OutputStream : File.Open(Path, FileMode.Create);
-            using (BinaryWriter Writer = new(Stream))
-            {
-                for (UInt64 i = 0; i < SectorCount; i += 0x80)
-                {
-                    // TODO: Reading sectors and writing to compressed stream should be on different threads.
-                    // Backup of 3 partitions without compression takes about 40 minutes.
-                    // Backup of same partitions with compression takes about 70 minutes.
-                    // Separation reading and compression could potentially speed up a lot.
-                    // BinaryWriter doesnt support async.
-                    // Calling async directly on the EntryStream of a Ziparchive blocks.
-
-                    ReadSectors(Buffer, out uint ActualSectorsRead, (SectorCount - i) >= 0x80 ? 0x80 : (uint)(SectorCount - i));
-                    Writer.Write(Buffer, 0, (int)ActualSectorsRead * 0x200);
-                    Progress?.IncreaseProgress(ActualSectorsRead);
-                }
-                Stream.Flush();
-            }
-
-            if (!VolumeWasOpen)
-            {
-                CloseVolume();
-            }
-        }
-
-        internal void BackupPartition(string PartitionName, string Path)
-        {
-            BackupPartition(PartitionName, Path, null, null, null);
-        }
-
-        internal void BackupPartition(string PartitionName, string Path, Action<int, TimeSpan?> ProgressUpdateCallback)
-        {
-            BackupPartition(PartitionName, Path, null, ProgressUpdateCallback, null);
-        }
-
-        internal void BackupPartition(string PartitionName, string Path, ProgressUpdater UpdaterPerSector)
-        {
-            BackupPartition(PartitionName, Path, null, null, UpdaterPerSector);
-        }
-
-        internal void BackupPartition(string PartitionName, Stream OutputStream)
-        {
-            BackupPartition(PartitionName, null, OutputStream, null, null);
-        }
-
-        internal void BackupPartition(string PartitionName, Stream OutputStream, Action<int, TimeSpan?> ProgressUpdateCallback)
-        {
-            BackupPartition(PartitionName, null, OutputStream, ProgressUpdateCallback, null);
-        }
-
-        internal void BackupPartition(string PartitionName, Stream OutputStream, ProgressUpdater UpdaterPerSector)
-        {
-            BackupPartition(PartitionName, null, OutputStream, null, UpdaterPerSector);
-        }
-
-        private void BackupPartition(string PartitionName, string Path, Stream OutputStream, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector)
-        {
-            bool VolumeWasOpen = IsVolumeOpen();
-            if (!VolumeWasOpen)
-            {
-                OpenVolume(false);
-            }
-
-            SetSectorPosition(1);
-            byte[] GPTBuffer = ReadSectors(1, 33);
-            GPT GPT = new(GPTBuffer);
-            Partition Partition = GPT.Partitions.First((p) => p.Name == PartitionName);
-
-            DumpSectors(Partition.FirstSector, Partition.LastSector - Partition.FirstSector + 1, Path, OutputStream, ProgressUpdateCallback, UpdaterPerSector);
-
-            if (!VolumeWasOpen)
-            {
-                CloseVolume();
-            }
-        }
-
-        internal void WriteSectors(UInt64 StartSector, byte[] Buffer)
-        {
-            bool Result = true;
-
-            bool VolumeWasOpen = IsVolumeOpen();
-            if (!VolumeWasOpen)
-            {
-                OpenVolume(true);
-            }
-
-            SetSectorPosition(StartSector);
-
-            Result = NativeMethods.WriteFile(hVolume, Buffer, (uint)Buffer.Length, out uint count, IntPtr.Zero);
-
-            if (!VolumeWasOpen)
-            {
-                CloseVolume();
-            }
-
-            if (!Result)
-            {
-                throw new Exception("Failed to write sectors.");
-            }
-        }
-
-        internal void WriteSectors(byte[] Buffer, uint Length = uint.MaxValue)
-        {
-            if (!IsVolumeOpen())
-            {
-                throw new Exception("Volume is not opened");
-            }
-
-            bool Result = NativeMethods.WriteFile(hVolume, Buffer, Length < Buffer.Length ? Length : (uint)Buffer.Length, out uint count, IntPtr.Zero);
-            if (!Result)
-            {
-                throw new Exception("Failed to write sectors. Exception: 0x" + Marshal.GetLastWin32Error().ToString("X8"));
-            }
-        }
-
-        internal void WriteSectors(UInt64 StartSector, string Path)
-        {
-            WriteSectors(StartSector, Path, null, null);
-        }
-
-        internal void WriteSectors(UInt64 StartSector, string Path, Action<int, TimeSpan?> ProgressUpdateCallback)
-        {
-            WriteSectors(StartSector, Path, ProgressUpdateCallback, null);
-        }
-
-        internal void WriteSectors(UInt64 StartSector, string Path, ProgressUpdater UpdaterPerSector)
-        {
-            WriteSectors(StartSector, Path, null, UpdaterPerSector);
-        }
-
-        private void WriteSectors(UInt64 StartSector, string Path, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector)
-        {
-            bool VolumeWasOpen = IsVolumeOpen();
-            if (!VolumeWasOpen)
-            {
-                OpenVolume(true);
-            }
-
-            SetSectorPosition(StartSector);
-
-            byte[] Buffer;
-
-            using (BinaryReader Reader = new(File.Open(Path, FileMode.Open)))
-            {
-                ProgressUpdater Progress = UpdaterPerSector;
-                if ((Progress == null) && (ProgressUpdateCallback != null))
-                {
-                    Progress = new ProgressUpdater((UInt64)(Reader.BaseStream.Length / 0x200), ProgressUpdateCallback);
-                }
-
-                Buffer = Reader.BaseStream.Length >= 0x10000 ? (new byte[0x10000]) : (new byte[Reader.BaseStream.Length]);
-
-                int Count;
-                for (UInt64 i = 0; i < (UInt64)(Reader.BaseStream.Length / 0x200); i += 0x80)
-                {
-                    Count = Reader.Read(Buffer, 0, Buffer.Length);
-
-                    WriteSectors(Buffer, (uint)Count);
-
-                    Progress?.IncreaseProgress((ulong)Count / 0x200);
-                }
-            }
-
-            if (!VolumeWasOpen)
-            {
-                CloseVolume();
-            }
-        }
-
-        internal void RestorePartition(string Path, string PartitionName)
-        {
-            RestorePartition(Path, PartitionName, null, null);
-        }
-
-        internal void RestorePartition(string Path, string PartitionName, Action<int, TimeSpan?> ProgressUpdateCallback)
-        {
-            RestorePartition(Path, PartitionName, ProgressUpdateCallback, null);
-        }
-
-        internal void RestorePartition(string Path, string PartitionName, ProgressUpdater UpdaterPerSector)
-        {
-            RestorePartition(Path, PartitionName, null, UpdaterPerSector);
-        }
-
-        private void RestorePartition(string Path, string PartitionName, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector)
-        {
-            bool VolumeWasOpen = IsVolumeOpen();
-            if (!VolumeWasOpen)
-            {
-                OpenVolume(true);
-            }
-
-            SetSectorPosition(1);
-            byte[] GPTBuffer = ReadSectors(1, 33);
-            GPT GPT = new(GPTBuffer);
-            Partition Partition = GPT.Partitions.First((p) => p.Name == PartitionName);
-            ulong PartitionSize = (Partition.LastSector - Partition.FirstSector + 1) * 0x200;
-            ulong FileSize = (ulong)new FileInfo(Path).Length;
-            if (FileSize > PartitionSize)
-            {
-                throw new InvalidOperationException("Partition can not be restored, because its size is too big!");
-            }
-
-            WriteSectors(Partition.FirstSector, Path, ProgressUpdateCallback);
-
-            if (!VolumeWasOpen)
-            {
-                CloseVolume();
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Management;
+using System.Runtime.InteropServices;
+
+namespace WPinternals
+{
+    internal class MassStorage : NokiaPhoneModel
+    {
+        internal string Drive = null;
+        internal string PhysicalDrive = null;
+        internal string VolumeLabel = null;
+        internal IntPtr hVolume = (IntPtr)(-1);
+        internal IntPtr hDrive = (IntPtr)(-1);
+        private bool OpenWithWriteAccess;
+
+        private string Serial;
+
+        internal MassStorage(string DevicePath) : base(DevicePath)
+        {
+            try
+            {
+                foreach (ManagementObject logical in new ManagementObjectSearcher("select * from Win32_LogicalDisk").Get())
+                {
+                    System.Diagnostics.Debug.Print(logical["Name"].ToString());
+
+                    string Label = "";
+                    foreach (ManagementObject partition in logical.GetRelated("Win32_DiskPartition"))
+                    {
+                        foreach (ManagementObject drive in partition.GetRelated("Win32_DiskDrive"))
+                        {
+                            if (drive["PNPDeviceID"].ToString().Contains("VEN_QUALCOMM&PROD_MMC_STORAGE", StringComparison.CurrentCulture) ||
+                                drive["PNPDeviceID"].ToString().Contains("VEN_MSFT&PROD_PHONE_MMC_STOR", StringComparison.CurrentCulture))
+                            {
+                                Label = logical["VolumeName"] == null ? "" : logical["VolumeName"].ToString();
+                                if ((Drive == null) || string.Equals(Label, "MainOS", StringComparison.CurrentCultureIgnoreCase)) // Always prefer the MainOS drive-mapping
+                                {
+                                    Drive = logical["Name"].ToString();
+                                    PhysicalDrive = drive["DeviceID"].ToString();
+                                    VolumeLabel = Label;
+                                }
+                                if (string.Equals(Label, "MainOS", StringComparison.CurrentCultureIgnoreCase))
+                                {
+                                    break;
+                                }
+                            }
+                        }
+                        if (string.Equals(Label, "MainOS", StringComparison.CurrentCultureIgnoreCase))
+                        {
+                            break;
+                        }
+                    }
+                }
+            }
+            catch { }
+        }
+
+        internal void AttachQualcommSerial(string DevicePath)
+        {
+            try
+            {
+                QualcommSerial SerialDevice = new(DevicePath);
+                SerialDevice.Close();
+                SerialDevice.Dispose();
+
+                Serial = DevicePath;
+            }
+            catch (Exception ex)
+            {
+                LogFile.Log(ex.Message);
+            }
+        }
+
+        internal bool DoesDeviceSupportReboot()
+        {
+            return Serial != null;
+        }
+
+        internal void Reboot()
+        {
+            if (Serial == null)
+            {
+                return;
+            }
+
+            try
+            {
+                QualcommSerial SerialDevice = new(Serial);
+
+                SerialDevice.EncodeCommands = false;
+
+                // This will succeed on new models
+                SerialDevice.SendData(new byte[] { 0x7, 0x0, 0x0, 0x0, 0x8, 0x0, 0x0, 0x0 });
+
+                // This will succeed on old models
+                SerialDevice.SendData(new byte[] { 0x7E, 0xA, 0x0, 0x0, 0xB6, 0xB5, 0x7E });
+
+                SerialDevice.Close();
+                SerialDevice.Dispose();
+            }
+            catch { }
+        }
+
+        protected override void Dispose(bool disposing)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                CloseVolume();
+
+                base.Dispose(disposing);
+            }
+        }
+
+        internal void OpenVolume(bool WriteAccess)
+        {
+            OpenWithWriteAccess = false;
+
+            if (IsVolumeOpen())
+            {
+                throw new Exception("Volume already opened");
+            }
+
+            if (WriteAccess)
+            {
+                // Unmounting the volume does not have the desired effect.
+                // It does not unmount the mountpoints on the phone.
+                // So the sectors of the filesystems of EFIESP, Data, etc cannot be written.
+                // Unmounting the mounting points would alter the NTFS structure, which is also an undesired effect.
+                // Restoring partitions with file-systems can better be done using Flash mode!
+
+                // Open volume
+                hVolume = NativeMethods.CreateFile(
+                    PhysicalDrive,
+                    NativeMethods.GENERIC_READ | NativeMethods.GENERIC_WRITE,
+                    NativeMethods.FILE_SHARE_READ | NativeMethods.FILE_SHARE_WRITE,
+                    IntPtr.Zero,
+                    NativeMethods.OPEN_EXISTING,
+                    NativeMethods.FILE_FLAG_WRITE_THROUGH | NativeMethods.FILE_FLAG_NO_BUFFERING, // !!!
+                    IntPtr.Zero);
+            }
+            else
+            {
+                hVolume = NativeMethods.CreateFile(
+                    // @"\\.\" + Drive,
+                    PhysicalDrive,
+                    NativeMethods.GENERIC_READ,
+                    NativeMethods.FILE_SHARE_READ | NativeMethods.FILE_SHARE_WRITE,
+                    IntPtr.Zero,
+                    NativeMethods.OPEN_EXISTING,
+                    0,
+                    IntPtr.Zero);
+            }
+
+            if ((int)hVolume == -1)
+            {
+                throw new Exception(Marshal.GetLastWin32Error().ToString());
+            }
+
+            OpenWithWriteAccess = WriteAccess;
+        }
+
+        internal bool IsVolumeOpen()
+        {
+            return (int)hVolume != -1;
+        }
+
+        internal void CloseVolume()
+        {
+            if ((int)hDrive != -1)
+            {
+                NativeMethods.CloseHandle(hDrive); // This reloads the logical drive!!
+                hDrive = new IntPtr(-1);
+            }
+
+            if ((int)hVolume != -1)
+            {
+                NativeMethods.CloseHandle(hVolume);
+                hVolume = new IntPtr(-1);
+            }
+        }
+
+        internal void SetSectorPosition(UInt64 Sector)
+        {
+            if (!IsVolumeOpen())
+            {
+                throw new Exception("Volume is not opened");
+            }
+
+            int High = (int)(Sector >> (32 - 9));
+            NativeMethods.SetFilePointer(hVolume, (int)(Sector << 9), ref High, EMoveMethod.Begin);
+        }
+
+        internal void WriteSector(byte[] buffer)
+        {
+            if (!IsVolumeOpen())
+            {
+                throw new Exception("Volume is not opened");
+            }
+
+            if (!OpenWithWriteAccess)
+            {
+                throw new Exception("Volume is not opened with Write Acces");
+            }
+
+            bool result = NativeMethods.WriteFile(hVolume, buffer, 512, out uint count, IntPtr.Zero);
+            if (!result)
+            {
+                throw new Exception("Exception: 0x" + Marshal.GetLastWin32Error().ToString("X8"));
+            }
+        }
+
+        internal void ReadSector(byte[] buffer)
+        {
+            if (!IsVolumeOpen())
+            {
+                throw new Exception("Volume is not opened");
+            }
+
+            bool result = NativeMethods.ReadFile(hVolume, buffer, 512, out uint count, IntPtr.Zero);
+            if (!result)
+            {
+                throw new Exception("Exception: 0x" + Marshal.GetLastWin32Error().ToString("X8"));
+            }
+        }
+
+        internal void ReadSectors(byte[] buffer, out uint ActualSectorsRead, uint SizeInSectors = uint.MaxValue)
+        {
+            if (!IsVolumeOpen())
+            {
+                throw new Exception("Volume is not opened");
+            }
+
+            bool Result = NativeMethods.ReadFile(hVolume, buffer, (SizeInSectors * 0x200) < buffer.Length ? (SizeInSectors * 0x200) : (uint)buffer.Length, out uint count, IntPtr.Zero);
+            ActualSectorsRead = count / 0x200;
+            if (!Result)
+            {
+                throw new Exception("Failed to read sectors. Exception: 0x" + Marshal.GetLastWin32Error().ToString("X8"));
+            }
+        }
+
+        internal byte[] ReadSectors(UInt64 StartSector, UInt64 SectorCount)
+        {
+            byte[] Result = new byte[SectorCount * 0x200];
+
+            bool VolumeWasOpen = IsVolumeOpen();
+            if (!VolumeWasOpen)
+            {
+                OpenVolume(false);
+            }
+
+            SetSectorPosition(StartSector);
+            ReadSectors(Result, out uint SectorsRead);
+
+            if (!VolumeWasOpen)
+            {
+                CloseVolume();
+            }
+
+            if (Result == null)
+            {
+                throw new Exception("Failed to read from phone");
+            }
+
+            return Result;
+        }
+
+        internal void DumpSectors(UInt64 StartSector, UInt64 SectorCount, string Path)
+        {
+            DumpSectors(StartSector, SectorCount, Path, null, null, null);
+        }
+
+        internal void DumpSectors(UInt64 StartSector, UInt64 SectorCount, string Path, Action<int, TimeSpan?> ProgressUpdateCallback)
+        {
+            DumpSectors(StartSector, SectorCount, Path, null, ProgressUpdateCallback, null);
+        }
+
+        internal void DumpSectors(UInt64 StartSector, UInt64 SectorCount, string Path, ProgressUpdater UpdaterPerSector)
+        {
+            DumpSectors(StartSector, SectorCount, Path, null, null, UpdaterPerSector);
+        }
+
+        internal void DumpSectors(UInt64 StartSector, UInt64 SectorCount, Stream OutputStream)
+        {
+            DumpSectors(StartSector, SectorCount, null, OutputStream, null, null);
+        }
+
+        internal void DumpSectors(UInt64 StartSector, UInt64 SectorCount, Stream OutputStream, Action<int, TimeSpan?> ProgressUpdateCallback)
+        {
+            DumpSectors(StartSector, SectorCount, null, OutputStream, ProgressUpdateCallback, null);
+        }
+
+        internal void DumpSectors(UInt64 StartSector, UInt64 SectorCount, Stream OutputStream, ProgressUpdater UpdaterPerSector)
+        {
+            DumpSectors(StartSector, SectorCount, null, OutputStream, null, UpdaterPerSector);
+        }
+
+        private void DumpSectors(UInt64 StartSector, UInt64 SectorCount, string Path, Stream OutputStream, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector)
+        {
+            bool VolumeWasOpen = IsVolumeOpen();
+            if (!VolumeWasOpen)
+            {
+                OpenVolume(false);
+            }
+
+            SetSectorPosition(StartSector);
+            ProgressUpdater Progress = UpdaterPerSector;
+            if ((Progress == null) && (ProgressUpdateCallback != null))
+            {
+                Progress = new ProgressUpdater(SectorCount, ProgressUpdateCallback);
+            }
+
+            byte[] Buffer = SectorCount >= 0x80 ? (new byte[0x10000]) : (new byte[SectorCount * 0x200]);
+
+            Stream Stream = Path == null ? OutputStream : File.Open(Path, FileMode.Create);
+            using (BinaryWriter Writer = new(Stream))
+            {
+                for (UInt64 i = 0; i < SectorCount; i += 0x80)
+                {
+                    // TODO: Reading sectors and writing to compressed stream should be on different threads.
+                    // Backup of 3 partitions without compression takes about 40 minutes.
+                    // Backup of same partitions with compression takes about 70 minutes.
+                    // Separation reading and compression could potentially speed up a lot.
+                    // BinaryWriter doesnt support async.
+                    // Calling async directly on the EntryStream of a Ziparchive blocks.
+
+                    ReadSectors(Buffer, out uint ActualSectorsRead, (SectorCount - i) >= 0x80 ? 0x80 : (uint)(SectorCount - i));
+                    Writer.Write(Buffer, 0, (int)ActualSectorsRead * 0x200);
+                    Progress?.IncreaseProgress(ActualSectorsRead);
+                }
+                Stream.Flush();
+            }
+
+            if (!VolumeWasOpen)
+            {
+                CloseVolume();
+            }
+        }
+
+        internal void BackupPartition(string PartitionName, string Path)
+        {
+            BackupPartition(PartitionName, Path, null, null, null);
+        }
+
+        internal void BackupPartition(string PartitionName, string Path, Action<int, TimeSpan?> ProgressUpdateCallback)
+        {
+            BackupPartition(PartitionName, Path, null, ProgressUpdateCallback, null);
+        }
+
+        internal void BackupPartition(string PartitionName, string Path, ProgressUpdater UpdaterPerSector)
+        {
+            BackupPartition(PartitionName, Path, null, null, UpdaterPerSector);
+        }
+
+        internal void BackupPartition(string PartitionName, Stream OutputStream)
+        {
+            BackupPartition(PartitionName, null, OutputStream, null, null);
+        }
+
+        internal void BackupPartition(string PartitionName, Stream OutputStream, Action<int, TimeSpan?> ProgressUpdateCallback)
+        {
+            BackupPartition(PartitionName, null, OutputStream, ProgressUpdateCallback, null);
+        }
+
+        internal void BackupPartition(string PartitionName, Stream OutputStream, ProgressUpdater UpdaterPerSector)
+        {
+            BackupPartition(PartitionName, null, OutputStream, null, UpdaterPerSector);
+        }
+
+        private void BackupPartition(string PartitionName, string Path, Stream OutputStream, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector)
+        {
+            bool VolumeWasOpen = IsVolumeOpen();
+            if (!VolumeWasOpen)
+            {
+                OpenVolume(false);
+            }
+
+            SetSectorPosition(1);
+            byte[] GPTBuffer = ReadSectors(1, 33);
+            GPT GPT = new(GPTBuffer);
+            Partition Partition = GPT.Partitions.First((p) => p.Name == PartitionName);
+
+            DumpSectors(Partition.FirstSector, Partition.LastSector - Partition.FirstSector + 1, Path, OutputStream, ProgressUpdateCallback, UpdaterPerSector);
+
+            if (!VolumeWasOpen)
+            {
+                CloseVolume();
+            }
+        }
+
+        internal void WriteSectors(UInt64 StartSector, byte[] Buffer)
+        {
+            bool Result = true;
+
+            bool VolumeWasOpen = IsVolumeOpen();
+            if (!VolumeWasOpen)
+            {
+                OpenVolume(true);
+            }
+
+            SetSectorPosition(StartSector);
+
+            Result = NativeMethods.WriteFile(hVolume, Buffer, (uint)Buffer.Length, out uint count, IntPtr.Zero);
+
+            if (!VolumeWasOpen)
+            {
+                CloseVolume();
+            }
+
+            if (!Result)
+            {
+                throw new Exception("Failed to write sectors.");
+            }
+        }
+
+        internal void WriteSectors(byte[] Buffer, uint Length = uint.MaxValue)
+        {
+            if (!IsVolumeOpen())
+            {
+                throw new Exception("Volume is not opened");
+            }
+
+            bool Result = NativeMethods.WriteFile(hVolume, Buffer, Length < Buffer.Length ? Length : (uint)Buffer.Length, out uint count, IntPtr.Zero);
+            if (!Result)
+            {
+                throw new Exception("Failed to write sectors. Exception: 0x" + Marshal.GetLastWin32Error().ToString("X8"));
+            }
+        }
+
+        internal void WriteSectors(UInt64 StartSector, string Path)
+        {
+            WriteSectors(StartSector, Path, null, null);
+        }
+
+        internal void WriteSectors(UInt64 StartSector, string Path, Action<int, TimeSpan?> ProgressUpdateCallback)
+        {
+            WriteSectors(StartSector, Path, ProgressUpdateCallback, null);
+        }
+
+        internal void WriteSectors(UInt64 StartSector, string Path, ProgressUpdater UpdaterPerSector)
+        {
+            WriteSectors(StartSector, Path, null, UpdaterPerSector);
+        }
+
+        private void WriteSectors(UInt64 StartSector, string Path, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector)
+        {
+            bool VolumeWasOpen = IsVolumeOpen();
+            if (!VolumeWasOpen)
+            {
+                OpenVolume(true);
+            }
+
+            SetSectorPosition(StartSector);
+
+            byte[] Buffer;
+
+            using (BinaryReader Reader = new(File.Open(Path, FileMode.Open)))
+            {
+                ProgressUpdater Progress = UpdaterPerSector;
+                if ((Progress == null) && (ProgressUpdateCallback != null))
+                {
+                    Progress = new ProgressUpdater((UInt64)(Reader.BaseStream.Length / 0x200), ProgressUpdateCallback);
+                }
+
+                Buffer = Reader.BaseStream.Length >= 0x10000 ? (new byte[0x10000]) : (new byte[Reader.BaseStream.Length]);
+
+                int Count;
+                for (UInt64 i = 0; i < (UInt64)(Reader.BaseStream.Length / 0x200); i += 0x80)
+                {
+                    Count = Reader.Read(Buffer, 0, Buffer.Length);
+
+                    WriteSectors(Buffer, (uint)Count);
+
+                    Progress?.IncreaseProgress((ulong)Count / 0x200);
+                }
+            }
+
+            if (!VolumeWasOpen)
+            {
+                CloseVolume();
+            }
+        }
+
+        internal void RestorePartition(string Path, string PartitionName)
+        {
+            RestorePartition(Path, PartitionName, null, null);
+        }
+
+        internal void RestorePartition(string Path, string PartitionName, Action<int, TimeSpan?> ProgressUpdateCallback)
+        {
+            RestorePartition(Path, PartitionName, ProgressUpdateCallback, null);
+        }
+
+        internal void RestorePartition(string Path, string PartitionName, ProgressUpdater UpdaterPerSector)
+        {
+            RestorePartition(Path, PartitionName, null, UpdaterPerSector);
+        }
+
+        private void RestorePartition(string Path, string PartitionName, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector)
+        {
+            bool VolumeWasOpen = IsVolumeOpen();
+            if (!VolumeWasOpen)
+            {
+                OpenVolume(true);
+            }
+
+            SetSectorPosition(1);
+            byte[] GPTBuffer = ReadSectors(1, 33);
+            GPT GPT = new(GPTBuffer);
+            Partition Partition = GPT.Partitions.First((p) => p.Name == PartitionName);
+            ulong PartitionSize = (Partition.LastSector - Partition.FirstSector + 1) * 0x200;
+            ulong FileSize = (ulong)new FileInfo(Path).Length;
+            if (FileSize > PartitionSize)
+            {
+                throw new InvalidOperationException("Partition can not be restored, because its size is too big!");
+            }
+
+            WriteSectors(Partition.FirstSector, Path, ProgressUpdateCallback);
+
+            if (!VolumeWasOpen)
+            {
+                CloseVolume();
+            }
+        }
+    }
+}
diff --git a/Models/NativeMethods.cs b/WPinternals/Models/NativeMethods.cs
similarity index 97%
rename from Models/NativeMethods.cs
rename to WPinternals/Models/NativeMethods.cs
index 4250d75..79f1d6c 100644
--- a/Models/NativeMethods.cs
+++ b/WPinternals/Models/NativeMethods.cs
@@ -1,302 +1,302 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using Microsoft.Win32.SafeHandles;
-using System;
-using System.Runtime.ConstrainedExecution;
-using System.Runtime.InteropServices;
-using System.Security;
-
-namespace WPinternals
-{
-    [Flags]
-    internal enum TokenAccessLevels
-    {
-        AssignPrimary = 0x00000001,
-        Duplicate = 0x00000002,
-        Impersonate = 0x00000004,
-        Query = 0x00000008,
-        QuerySource = 0x00000010,
-        AdjustPrivileges = 0x00000020,
-        AdjustGroups = 0x00000040,
-        AdjustDefault = 0x00000080,
-        AdjustSessionId = 0x00000100,
-
-        Read = 0x00020000 | Query,
-
-        Write = 0x00020000 | AdjustPrivileges | AdjustGroups | AdjustDefault,
-
-        AllAccess = 0x000F0000 |
-            AssignPrimary |
-            Duplicate |
-            Impersonate |
-            Query |
-            QuerySource |
-            AdjustPrivileges |
-            AdjustGroups |
-            AdjustDefault |
-            AdjustSessionId,
-
-        MaximumAllowed = 0x02000000
-    }
-
-    internal enum SecurityImpersonationLevel
-    {
-        Anonymous = 0,
-        Identification = 1,
-        Impersonation = 2,
-        Delegation = 3,
-    }
-
-    internal enum TokenType
-    {
-        Primary = 1,
-        Impersonation = 2,
-    }
-
-    internal enum EMoveMethod : uint
-    {
-        Begin = 0,
-        Current = 1,
-        End = 2
-    }
-
-    internal sealed class NativeMethods
-    {
-        internal const uint SE_PRIVILEGE_DISABLED = 0x00000000;
-        internal const uint SE_PRIVILEGE_ENABLED = 0x00000002;
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        internal struct LUID
-        {
-            internal uint LowPart;
-            internal uint HighPart;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        internal struct LUID_AND_ATTRIBUTES
-        {
-            internal LUID Luid;
-            internal uint Attributes;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        internal struct TOKEN_PRIVILEGE
-        {
-            internal uint PrivilegeCount;
-            internal LUID_AND_ATTRIBUTES Privilege;
-        }
-
-        internal const string ADVAPI32 = "advapi32.dll";
-        internal const string KERNEL32 = "kernel32.dll";
-
-        internal const int ERROR_SUCCESS = 0x0;
-        internal const int ERROR_ACCESS_DENIED = 0x5;
-        internal const int ERROR_NOT_ENOUGH_MEMORY = 0x8;
-        internal const int ERROR_NO_TOKEN = 0x3f0;
-        internal const int ERROR_NOT_ALL_ASSIGNED = 0x514;
-        internal const int ERROR_NO_SUCH_PRIVILEGE = 0x521;
-        internal const int ERROR_CANT_OPEN_ANONYMOUS = 0x543;
-
-        [DllImport(
-             KERNEL32,
-             SetLastError = true)]
-        internal static extern bool CloseHandle(IntPtr handle);
-
-        [DllImport(
-             ADVAPI32,
-             CharSet = CharSet.Unicode,
-             SetLastError = true)]
-        internal static extern bool AdjustTokenPrivileges(
-            [In]     SafeTokenHandle TokenHandle,
-            [In]     bool DisableAllPrivileges,
-            [In]     ref TOKEN_PRIVILEGE NewState,
-            [In]     uint BufferLength,
-            [In, Out] ref TOKEN_PRIVILEGE PreviousState,
-            [In, Out] ref uint ReturnLength);
-
-        [DllImport(
-             ADVAPI32,
-             CharSet = CharSet.Auto,
-             SetLastError = true)]
-        internal static extern
-        bool RevertToSelf();
-
-        [DllImport(
-             ADVAPI32,
-             EntryPoint = "LookupPrivilegeValueW",
-             CharSet = CharSet.Auto,
-             SetLastError = true)]
-        internal static extern
-        bool LookupPrivilegeValue(
-            [In]     string lpSystemName,
-            [In]     string lpName,
-            [In, Out] ref LUID Luid);
-
-        [DllImport(
-             KERNEL32,
-             CharSet = CharSet.Auto,
-             SetLastError = true)]
-        internal static extern
-        IntPtr GetCurrentProcess();
-
-        [DllImport(
-             KERNEL32,
-             CharSet = CharSet.Auto,
-             SetLastError = true)]
-        internal static extern
-            IntPtr GetCurrentThread();
-
-        [DllImport(
-             ADVAPI32,
-             CharSet = CharSet.Unicode,
-             SetLastError = true)]
-        internal static extern
-        bool OpenProcessToken(
-            [In]     IntPtr ProcessToken,
-            [In]     TokenAccessLevels DesiredAccess,
-            [In, Out] ref SafeTokenHandle TokenHandle);
-
-        [DllImport
-             (ADVAPI32,
-             CharSet = CharSet.Unicode,
-             SetLastError = true)]
-        internal static extern
-        bool OpenThreadToken(
-            [In]     IntPtr ThreadToken,
-            [In]     TokenAccessLevels DesiredAccess,
-            [In]     bool OpenAsSelf,
-            [In, Out] ref SafeTokenHandle TokenHandle);
-
-        [DllImport
-            (ADVAPI32,
-             CharSet = CharSet.Unicode,
-             SetLastError = true)]
-        internal static extern
-        bool DuplicateTokenEx(
-            [In]    SafeTokenHandle ExistingToken,
-            [In]    TokenAccessLevels DesiredAccess,
-            [In]    IntPtr TokenAttributes,
-            [In]    SecurityImpersonationLevel ImpersonationLevel,
-            [In]    TokenType TokenType,
-            [In, Out] ref SafeTokenHandle NewToken);
-
-        [DllImport
-             (ADVAPI32,
-             CharSet = CharSet.Unicode,
-             SetLastError = true)]
-        internal static extern
-        bool SetThreadToken(
-            [In]    IntPtr Thread,
-            [In]    SafeTokenHandle Token);
-
-        internal const uint FILE_SHARE_READ = 0x00000001;
-        internal const uint FILE_SHARE_WRITE = 0x00000002;
-        internal const uint FILE_SHARE_DELETE = 0x00000004;
-        internal const uint OPEN_EXISTING = 3;
-
-        internal const uint GENERIC_READ = 0x80000000;
-        internal const uint GENERIC_WRITE = 0x40000000;
-
-        internal const uint FILE_FLAG_WRITE_THROUGH = 0x80000000;
-        internal const uint FILE_FLAG_NO_BUFFERING = 0x20000000;
-        internal const uint FILE_READ_ATTRIBUTES = 0x0080;
-        internal const uint FILE_WRITE_ATTRIBUTES = 0x0100;
-        internal const uint ERROR_INSUFFICIENT_BUFFER = 122;
-        internal const uint FILE_BEGIN = 0;
-        internal const uint FSCTL_LOCK_VOLUME = 0x00090018;
-        internal const uint FSCTL_DISMOUNT_VOLUME = 0x00090020;
-        internal const uint FSCTL_UNLOCK_VOLUME = 0x00090022;
-        internal const uint IOCTL_STORAGE_EJECT_MEDIA = 0x2D4808;
-        internal const uint IOCTL_STORAGE_LOAD_MEDIA = 0x2D480C;
-
-        internal const Int32 INVALID_HANDLE_VALUE = -1;
-        internal const Int32 FILE_ATTRIBUTE_NORMAL = 1;
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        internal static extern bool WriteFile(IntPtr hFile, byte[] lpBuffer, uint nNumberOfBytesToWrite, out uint lpNumberOfBytesWritten, IntPtr lpOverlapped);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        internal static extern bool ReadFile(IntPtr hFile, [Out] byte[] lpBuffer, uint nNumberOfBytesToRead, out uint lpNumberOfBytesRead, IntPtr lpOverlapped);
-
-        [DllImport("Kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern uint SetFilePointer(
-              [In] IntPtr hFile,
-              [In] int lDistanceToMove,
-              [In, Out] ref int lpDistanceToMoveHigh,
-              [In] EMoveMethod dwMoveMethod);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        internal static extern IntPtr CreateFile(
-        string lpFileName,
-        uint dwDesiredAccess,
-        uint dwShareMode,
-        IntPtr lpSecurityAttributes,
-        uint dwCreationDisposition,
-        uint dwFlagsAndAttributes,
-        IntPtr hTemplateFile);
-
-        [DllImport("Kernel32.dll", SetLastError = false, CharSet = CharSet.Auto)]
-        public static extern bool DeviceIoControl(
-            IntPtr hDevice,
-            uint IoControlCode,
-            [In] object InBuffer,
-            uint nInBufferSize,
-            [Out] object OutBuffer,
-            uint nOutBufferSize,
-            ref uint pBytesReturned,
-            IntPtr Overlapped
-        );
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool FlushFileBuffers(IntPtr hFile);
-
-        static NativeMethods()
-        {
-        }
-    }
-
-    internal sealed class SafeTokenHandle : SafeHandleZeroOrMinusOneIsInvalid
-    {
-        private SafeTokenHandle() : base(true) { }
-
-        // 0 is an Invalid Handle
-        internal SafeTokenHandle(IntPtr handle)
-            : base(true)
-        {
-            SetHandle(handle);
-        }
-
-        internal static SafeTokenHandle InvalidHandle
-        {
-            get { return new SafeTokenHandle(IntPtr.Zero); }
-        }
-
-        [DllImport(NativeMethods.KERNEL32, SetLastError = true),
-         SuppressUnmanagedCodeSecurity]
-        private static extern bool CloseHandle(IntPtr handle);
-
-        override protected bool ReleaseHandle()
-        {
-            return CloseHandle(handle);
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using Microsoft.Win32.SafeHandles;
+using System;
+using System.Runtime.ConstrainedExecution;
+using System.Runtime.InteropServices;
+using System.Security;
+
+namespace WPinternals
+{
+    [Flags]
+    internal enum TokenAccessLevels
+    {
+        AssignPrimary = 0x00000001,
+        Duplicate = 0x00000002,
+        Impersonate = 0x00000004,
+        Query = 0x00000008,
+        QuerySource = 0x00000010,
+        AdjustPrivileges = 0x00000020,
+        AdjustGroups = 0x00000040,
+        AdjustDefault = 0x00000080,
+        AdjustSessionId = 0x00000100,
+
+        Read = 0x00020000 | Query,
+
+        Write = 0x00020000 | AdjustPrivileges | AdjustGroups | AdjustDefault,
+
+        AllAccess = 0x000F0000 |
+            AssignPrimary |
+            Duplicate |
+            Impersonate |
+            Query |
+            QuerySource |
+            AdjustPrivileges |
+            AdjustGroups |
+            AdjustDefault |
+            AdjustSessionId,
+
+        MaximumAllowed = 0x02000000
+    }
+
+    internal enum SecurityImpersonationLevel
+    {
+        Anonymous = 0,
+        Identification = 1,
+        Impersonation = 2,
+        Delegation = 3,
+    }
+
+    internal enum TokenType
+    {
+        Primary = 1,
+        Impersonation = 2,
+    }
+
+    internal enum EMoveMethod : uint
+    {
+        Begin = 0,
+        Current = 1,
+        End = 2
+    }
+
+    internal sealed class NativeMethods
+    {
+        internal const uint SE_PRIVILEGE_DISABLED = 0x00000000;
+        internal const uint SE_PRIVILEGE_ENABLED = 0x00000002;
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        internal struct LUID
+        {
+            internal uint LowPart;
+            internal uint HighPart;
+        }
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        internal struct LUID_AND_ATTRIBUTES
+        {
+            internal LUID Luid;
+            internal uint Attributes;
+        }
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        internal struct TOKEN_PRIVILEGE
+        {
+            internal uint PrivilegeCount;
+            internal LUID_AND_ATTRIBUTES Privilege;
+        }
+
+        internal const string ADVAPI32 = "advapi32.dll";
+        internal const string KERNEL32 = "kernel32.dll";
+
+        internal const int ERROR_SUCCESS = 0x0;
+        internal const int ERROR_ACCESS_DENIED = 0x5;
+        internal const int ERROR_NOT_ENOUGH_MEMORY = 0x8;
+        internal const int ERROR_NO_TOKEN = 0x3f0;
+        internal const int ERROR_NOT_ALL_ASSIGNED = 0x514;
+        internal const int ERROR_NO_SUCH_PRIVILEGE = 0x521;
+        internal const int ERROR_CANT_OPEN_ANONYMOUS = 0x543;
+
+        [DllImport(
+             KERNEL32,
+             SetLastError = true)]
+        internal static extern bool CloseHandle(IntPtr handle);
+
+        [DllImport(
+             ADVAPI32,
+             CharSet = CharSet.Unicode,
+             SetLastError = true)]
+        internal static extern bool AdjustTokenPrivileges(
+            [In]     SafeTokenHandle TokenHandle,
+            [In]     bool DisableAllPrivileges,
+            [In]     ref TOKEN_PRIVILEGE NewState,
+            [In]     uint BufferLength,
+            [In, Out] ref TOKEN_PRIVILEGE PreviousState,
+            [In, Out] ref uint ReturnLength);
+
+        [DllImport(
+             ADVAPI32,
+             CharSet = CharSet.Auto,
+             SetLastError = true)]
+        internal static extern
+        bool RevertToSelf();
+
+        [DllImport(
+             ADVAPI32,
+             EntryPoint = "LookupPrivilegeValueW",
+             CharSet = CharSet.Auto,
+             SetLastError = true)]
+        internal static extern
+        bool LookupPrivilegeValue(
+            [In]     string lpSystemName,
+            [In]     string lpName,
+            [In, Out] ref LUID Luid);
+
+        [DllImport(
+             KERNEL32,
+             CharSet = CharSet.Auto,
+             SetLastError = true)]
+        internal static extern
+        IntPtr GetCurrentProcess();
+
+        [DllImport(
+             KERNEL32,
+             CharSet = CharSet.Auto,
+             SetLastError = true)]
+        internal static extern
+            IntPtr GetCurrentThread();
+
+        [DllImport(
+             ADVAPI32,
+             CharSet = CharSet.Unicode,
+             SetLastError = true)]
+        internal static extern
+        bool OpenProcessToken(
+            [In]     IntPtr ProcessToken,
+            [In]     TokenAccessLevels DesiredAccess,
+            [In, Out] ref SafeTokenHandle TokenHandle);
+
+        [DllImport
+             (ADVAPI32,
+             CharSet = CharSet.Unicode,
+             SetLastError = true)]
+        internal static extern
+        bool OpenThreadToken(
+            [In]     IntPtr ThreadToken,
+            [In]     TokenAccessLevels DesiredAccess,
+            [In]     bool OpenAsSelf,
+            [In, Out] ref SafeTokenHandle TokenHandle);
+
+        [DllImport
+            (ADVAPI32,
+             CharSet = CharSet.Unicode,
+             SetLastError = true)]
+        internal static extern
+        bool DuplicateTokenEx(
+            [In]    SafeTokenHandle ExistingToken,
+            [In]    TokenAccessLevels DesiredAccess,
+            [In]    IntPtr TokenAttributes,
+            [In]    SecurityImpersonationLevel ImpersonationLevel,
+            [In]    TokenType TokenType,
+            [In, Out] ref SafeTokenHandle NewToken);
+
+        [DllImport
+             (ADVAPI32,
+             CharSet = CharSet.Unicode,
+             SetLastError = true)]
+        internal static extern
+        bool SetThreadToken(
+            [In]    IntPtr Thread,
+            [In]    SafeTokenHandle Token);
+
+        internal const uint FILE_SHARE_READ = 0x00000001;
+        internal const uint FILE_SHARE_WRITE = 0x00000002;
+        internal const uint FILE_SHARE_DELETE = 0x00000004;
+        internal const uint OPEN_EXISTING = 3;
+
+        internal const uint GENERIC_READ = 0x80000000;
+        internal const uint GENERIC_WRITE = 0x40000000;
+
+        internal const uint FILE_FLAG_WRITE_THROUGH = 0x80000000;
+        internal const uint FILE_FLAG_NO_BUFFERING = 0x20000000;
+        internal const uint FILE_READ_ATTRIBUTES = 0x0080;
+        internal const uint FILE_WRITE_ATTRIBUTES = 0x0100;
+        internal const uint ERROR_INSUFFICIENT_BUFFER = 122;
+        internal const uint FILE_BEGIN = 0;
+        internal const uint FSCTL_LOCK_VOLUME = 0x00090018;
+        internal const uint FSCTL_DISMOUNT_VOLUME = 0x00090020;
+        internal const uint FSCTL_UNLOCK_VOLUME = 0x00090022;
+        internal const uint IOCTL_STORAGE_EJECT_MEDIA = 0x2D4808;
+        internal const uint IOCTL_STORAGE_LOAD_MEDIA = 0x2D480C;
+
+        internal const Int32 INVALID_HANDLE_VALUE = -1;
+        internal const Int32 FILE_ATTRIBUTE_NORMAL = 1;
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        internal static extern bool WriteFile(IntPtr hFile, byte[] lpBuffer, uint nNumberOfBytesToWrite, out uint lpNumberOfBytesWritten, IntPtr lpOverlapped);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        internal static extern bool ReadFile(IntPtr hFile, [Out] byte[] lpBuffer, uint nNumberOfBytesToRead, out uint lpNumberOfBytesRead, IntPtr lpOverlapped);
+
+        [DllImport("Kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+        internal static extern uint SetFilePointer(
+              [In] IntPtr hFile,
+              [In] int lDistanceToMove,
+              [In, Out] ref int lpDistanceToMoveHigh,
+              [In] EMoveMethod dwMoveMethod);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        internal static extern IntPtr CreateFile(
+        string lpFileName,
+        uint dwDesiredAccess,
+        uint dwShareMode,
+        IntPtr lpSecurityAttributes,
+        uint dwCreationDisposition,
+        uint dwFlagsAndAttributes,
+        IntPtr hTemplateFile);
+
+        [DllImport("Kernel32.dll", SetLastError = false, CharSet = CharSet.Auto)]
+        public static extern bool DeviceIoControl(
+            IntPtr hDevice,
+            uint IoControlCode,
+            [In] object InBuffer,
+            uint nInBufferSize,
+            [Out] object OutBuffer,
+            uint nOutBufferSize,
+            ref uint pBytesReturned,
+            IntPtr Overlapped
+        );
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool FlushFileBuffers(IntPtr hFile);
+
+        static NativeMethods()
+        {
+        }
+    }
+
+    internal sealed class SafeTokenHandle : SafeHandleZeroOrMinusOneIsInvalid
+    {
+        private SafeTokenHandle() : base(true) { }
+
+        // 0 is an Invalid Handle
+        internal SafeTokenHandle(IntPtr handle)
+            : base(true)
+        {
+            SetHandle(handle);
+        }
+
+        internal static SafeTokenHandle InvalidHandle
+        {
+            get { return new SafeTokenHandle(IntPtr.Zero); }
+        }
+
+        [DllImport(NativeMethods.KERNEL32, SetLastError = true),
+         SuppressUnmanagedCodeSecurity]
+        private static extern bool CloseHandle(IntPtr handle);
+
+        override protected bool ReleaseHandle()
+        {
+            return CloseHandle(handle);
+        }
+    }
+}
diff --git a/Models/NokiaFlashModel.cs b/WPinternals/Models/NokiaFlashModel.cs
similarity index 97%
rename from Models/NokiaFlashModel.cs
rename to WPinternals/Models/NokiaFlashModel.cs
index 6fd324e..7f14ed0 100644
--- a/Models/NokiaFlashModel.cs
+++ b/WPinternals/Models/NokiaFlashModel.cs
@@ -1,1409 +1,1409 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.Linq;
-
-namespace WPinternals
-{
-    internal enum FfuProtocol
-    {
-        ProtocolSyncV1 = 1,
-        ProtocolAsyncV1 = 2,
-        ProtocolSyncV2 = 4,
-        ProtocolAsyncV2 = 8,
-        ProtocolAsyncV3 = 16
-    }
-
-    [Flags]
-    internal enum FlashOptions : byte
-    {
-        SkipWrite = 1,
-        SkipHashCheck = 2,
-        SkipIdCheck = 4,
-        SkipSignatureCheck = 8
-    }
-
-    internal delegate void InterfaceChangedHandler(PhoneInterfaces NewInterface);
-
-    internal class NokiaFlashModel : NokiaPhoneModel
-    {
-        private UefiSecurityStatusResponse _SecurityStatus = null;
-        private readonly PhoneInfo Info = new();
-
-        internal event InterfaceChangedHandler InterfaceChanged = delegate { };
-
-        public NokiaFlashModel(string DevicePath) : base(DevicePath) { }
-
-        public byte[] ReadParam(string Param)
-        {
-            byte[] Request = new byte[0x0B];
-            const string Header = "NOKXFR";
-
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Param), 0, Request, 7, Param.Length);
-
-            byte[] Response = ExecuteRawMethod(Request);
-            if ((Response == null) || (Response.Length < 0x10))
-            {
-                return null;
-            }
-
-            byte[] Result = new byte[Response[0x10]];
-            Buffer.BlockCopy(Response, 0x11, Result, 0, Response[0x10]);
-            return Result;
-        }
-
-        public string ReadStringParam(string Param)
-        {
-            byte[] Bytes = ReadParam(Param);
-            if (Bytes == null)
-            {
-                return null;
-            }
-
-            return System.Text.Encoding.ASCII.GetString(Bytes).Trim(new char[] { '\0' });
-        }
-
-        [Flags]
-        internal enum Fuse
-        {
-            SecureBoot = 1,
-            FfuVerify = 2,
-            Jtag = 4,
-            Shk = 8,
-            Simlock = 16,
-            ProductionDone = 32,
-            Rkh = 64,
-            PublicId = 128,
-            Dak = 256,
-            SecGen = 512,
-            OemId = 1024,
-            FastBoot = 2048,
-            SpdmSecMode = 4096,
-            RpmWdog = 8192,
-            Ssm = 16384
-        }
-
-        public bool? ReadFuseStatus(Fuse fuse)
-        {
-            uint? flags = ReadSecurityFlags();
-            if (!flags.HasValue)
-            {
-                return null;
-            }
-
-            var finalconfig = (Fuse)flags.Value;
-            return finalconfig.HasFlag(fuse);
-        }
-
-        public uint? ReadSecurityFlags()
-        {
-            byte[] Response = ReadParam("FCS");
-            if ((Response == null) || (Response.Length != 4))
-            {
-                return null;
-            }
-
-            // This value is in big endian
-            return (UInt32)((Response[0] << 24) | (Response[1] << 16) | (Response[2] << 8) | Response[3]);
-        }
-
-        public uint? ReadCurrentChargeLevel()
-        {
-            byte[] Response = ReadParam("CS");
-            if ((Response == null) || (Response.Length != 8))
-            {
-                return null;
-            }
-
-            // This value is in big endian
-            return (UInt32)((Response[0] << 24) | (Response[1] << 16) | (Response[2] << 8) | Response[3]) + 1;
-        }
-
-        public int? ReadCurrentChargeCurrent()
-        {
-            byte[] Response = ReadParam("CS");
-            if ((Response == null) || (Response.Length != 8))
-            {
-                return null;
-            }
-
-            // This value is in big endian and needs to be XOR'd with 0xFFFFFFFF
-            return (Int32)(((Response[4] << 24) | (Response[5] << 16) | (Response[6] << 8) | Response[7]) ^ 0xFFFFFFFF) + 1;
-        }
-
-        public UefiSecurityStatusResponse ReadSecurityStatus()
-        {
-            if (_SecurityStatus != null)
-            {
-                return _SecurityStatus;
-            }
-
-            byte[] Response = ReadParam("SS");
-            if (Response == null)
-            {
-                return null;
-            }
-
-            UefiSecurityStatusResponse Result = new();
-
-            Result.IsTestDevice = Response[0];
-            Result.PlatformSecureBootStatus = Convert.ToBoolean(Response[1]);
-            Result.SecureFfuEfuseStatus = Convert.ToBoolean(Response[2]);
-            Result.DebugStatus = Convert.ToBoolean(Response[3]);
-            Result.RdcStatus = Convert.ToBoolean(Response[4]);
-            Result.AuthenticationStatus = Convert.ToBoolean(Response[5]);
-            Result.UefiSecureBootStatus = Convert.ToBoolean(Response[6]);
-            Result.CryptoHardwareKey = Convert.ToBoolean(Response[7]);
-
-            _SecurityStatus = Result;
-
-            return Result;
-        }
-
-        internal bool? IsBootLoaderUnlocked()
-        {
-            UefiSecurityStatusResponse SecurityStatus = ReadSecurityStatus();
-            if (SecurityStatus != null)
-            {
-                return SecurityStatus.AuthenticationStatus || SecurityStatus.RdcStatus || !SecurityStatus.SecureFfuEfuseStatus;
-            }
-
-            return null;
-        }
-
-        public TerminalResponse GetTerminalResponse()
-        {
-            byte[] AsskMask = new byte[0x10] { 1, 0, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64 };
-            byte[] Request = new byte[0xAC];
-            const string Header = "NOKXFT";
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-            Request[7] = 1;
-            Buffer.BlockCopy(BigEndian.GetBytes(0x18, 4), 0, Request, 0x08, 4); // Subblocktype = 0x18
-            Buffer.BlockCopy(BigEndian.GetBytes(0x9C, 4), 0, Request, 0x0C, 4); // Subblocklength = 0x9C
-            Buffer.BlockCopy(BigEndian.GetBytes(0x00, 4), 0, Request, 0x10, 4); // AsicIndex = 0x00
-            Buffer.BlockCopy(AsskMask, 0, Request, 0x14, 0x10);
-            byte[] TerminalResponse = ExecuteRawMethod(Request);
-            if ((TerminalResponse?.Length > 0x20) && (BigEndian.ToUInt32(TerminalResponse, 0x14) == (TerminalResponse.Length - 0x18)) && (BitConverter.ToUInt32(TerminalResponse, 0x1C) == (TerminalResponse.Length - 0x20)))
-            {
-                // Parse Terminal Response from offset 0x18
-                return Terminal.Parse(TerminalResponse, 0x18);
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        public void SendFfuHeaderV1(byte[] FfuHeader, byte Options = 0)
-        {
-            byte[] Request = new byte[FfuHeader.Length + 0x20];
-
-            const string Header = "NOKXFS";
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-            Buffer.BlockCopy(BigEndian.GetBytes(0x0001, 2), 0, Request, 0x06, 2); // Protocol version = 0x0001
-            Request[0x08] = 0; // Progress = 0%
-            Request[0x0B] = 1; // Subblock count = 1
-            Buffer.BlockCopy(BigEndian.GetBytes(0x0000000B, 4), 0, Request, 0x0C, 4); // Subblock type for header = 0x0B
-            Buffer.BlockCopy(BigEndian.GetBytes(FfuHeader.Length + 0x0C, 4), 0, Request, 0x10, 4); // Subblock length = length of header + 0x0C
-            Buffer.BlockCopy(BigEndian.GetBytes(0x00000000, 4), 0, Request, 0x14, 4); // Header type = 0
-            Buffer.BlockCopy(BigEndian.GetBytes(FfuHeader.Length, 4), 0, Request, 0x18, 4); // Payload length = length of header
-            Request[0x1C] = Options; // Header options = 0
-
-            Buffer.BlockCopy(FfuHeader, 0, Request, 0x20, FfuHeader.Length);
-
-            byte[] Response = ExecuteRawMethod(Request);
-            if (Response == null)
-            {
-                throw new BadConnectionException();
-            }
-
-            int ResultCode = (Response[6] << 8) + Response[7];
-            if (ResultCode != 0)
-            {
-                ThrowFlashError(ResultCode);
-            }
-        }
-
-        public void SendFfuHeaderV2(UInt32 TotalHeaderLength, UInt32 OffsetForThisPart, byte[] FfuHeader, byte Options = 0)
-        {
-            byte[] Request = new byte[FfuHeader.Length + 0x3C];
-
-            const string Header = "NOKXFS";
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-            Buffer.BlockCopy(BigEndian.GetBytes((int)FfuProtocol.ProtocolSyncV2, 2), 0, Request, 0x06, 2); // Protocol version = 0x0001
-            Request[0x08] = 0; // Progress = 0%
-            Request[0x0B] = 1; // Subblock count = 1
-
-            Buffer.BlockCopy(BigEndian.GetBytes(0x00000021, 4), 0, Request, 0x0C, 4); // Subblock type for header v2 = 0x21
-            Buffer.BlockCopy(BigEndian.GetBytes(FfuHeader.Length + 0x28, 4), 0, Request, 0x10, 4); // Subblock starts at 0x14, payload starts at 0x3C.
-
-            Buffer.BlockCopy(BigEndian.GetBytes(0x00000000, 4), 0, Request, 0x14, 4); // Header type = 0
-            Buffer.BlockCopy(BigEndian.GetBytes(TotalHeaderLength, 4), 0, Request, 0x18, 4); // Payload length = length of header
-            Request[0x1C] = Options; // Header options = 0
-
-            Buffer.BlockCopy(BigEndian.GetBytes(OffsetForThisPart, 4), 0, Request, 0x1D, 4);
-            Buffer.BlockCopy(BigEndian.GetBytes(FfuHeader.Length, 4), 0, Request, 0x21, 4);
-            Request[0x25] = 0; // No Erase
-
-            Buffer.BlockCopy(FfuHeader, 0, Request, 0x3C, FfuHeader.Length);
-
-            byte[] Response = ExecuteRawMethod(Request);
-            if (Response == null)
-            {
-                throw new BadConnectionException();
-            }
-
-            if (Response.Length == 4)
-            {
-                throw new WPinternalsException("Flash protocol v2 not supported", "The device reported that the Flash protocol v2 was not supported while sending the FFU header.");
-            }
-
-            int ResultCode = (Response[6] << 8) + Response[7];
-            if (ResultCode != 0)
-            {
-                ThrowFlashError(ResultCode);
-            }
-        }
-
-        public void SendFfuPayloadV1(byte[] FfuChunk, int Progress = 0, byte Options = 0)
-        {
-            byte[] Request = new byte[FfuChunk.Length + 0x1C];
-
-            const string Header = "NOKXFS";
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-            Buffer.BlockCopy(BigEndian.GetBytes((int)FfuProtocol.ProtocolSyncV1, 2), 0, Request, 0x06, 2); // Protocol version = 0x0001
-            Request[0x08] = (byte)Progress; // Progress = 0% (0 - 100)
-            Request[0x0B] = 1; // Subblock count = 1
-
-            Buffer.BlockCopy(BigEndian.GetBytes(0x0000000C, 4), 0, Request, 0x0C, 4); // Subblock type for ChunkData = 0x0C
-            Buffer.BlockCopy(BigEndian.GetBytes(FfuChunk.Length + 0x08, 4), 0, Request, 0x10, 4); // Subblock length = length of chunk + 0x08
-
-            Buffer.BlockCopy(BigEndian.GetBytes(FfuChunk.Length, 4), 0, Request, 0x14, 4); // Payload length = length of chunk
-            Request[0x18] = Options; // Data options = 0 (1 = verify)
-
-            Buffer.BlockCopy(FfuChunk, 0, Request, 0x1C, FfuChunk.Length);
-
-            byte[] Response = ExecuteRawMethod(Request);
-            if (Response == null)
-            {
-                throw new BadConnectionException();
-            }
-
-            int ResultCode = (Response[6] << 8) + Response[7];
-            if (ResultCode != 0)
-            {
-                ThrowFlashError(ResultCode);
-            }
-        }
-
-        public void SendFfuPayloadV2(byte[] FfuChunk, int Progress = 0, byte Options = 0)
-        {
-            byte[] Request = new byte[FfuChunk.Length + 0x20];
-
-            const string Header = "NOKXFS";
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-            Buffer.BlockCopy(BigEndian.GetBytes((int)FfuProtocol.ProtocolSyncV2, 2), 0, Request, 0x06, 2); // Protocol
-            Request[0x08] = (byte)Progress; // Progress = 0% (0 - 100)
-            Request[0x0B] = 1; // Subblock count = 1
-
-            Buffer.BlockCopy(BigEndian.GetBytes(0x0000001B, 4), 0, Request, 0x0C, 4); // Subblock type for Payload v2 = 0x1B
-            Buffer.BlockCopy(BigEndian.GetBytes(FfuChunk.Length + 0x0C, 4), 0, Request, 0x10, 4); // Subblock length = length of chunk + 0x08
-
-            Buffer.BlockCopy(BigEndian.GetBytes(FfuChunk.Length, 4), 0, Request, 0x14, 4); // Payload length = length of chunk
-            Request[0x18] = Options; // Data options = 0 (1 = verify)
-
-            Buffer.BlockCopy(FfuChunk, 0, Request, 0x20, FfuChunk.Length);
-
-            byte[] Response = ExecuteRawMethod(Request);
-            if (Response == null)
-            {
-                throw new BadConnectionException();
-            }
-
-            int ResultCode = (Response[6] << 8) + Response[7];
-            if (ResultCode != 0)
-            {
-                ThrowFlashError(ResultCode);
-            }
-        }
-
-        public void SendFfuPayloadV3(byte[] FfuChunk, UInt32 WriteDescriptorIndex, UInt32 CRC, int Progress = 0, byte Options = 0)
-        {
-            byte[] Request = new byte[FfuChunk.Length + 0x20];
-
-            const string Header = "NOKXFS";
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-            Buffer.BlockCopy(BigEndian.GetBytes((int)FfuProtocol.ProtocolAsyncV3, 2), 0, Request, 0x06, 2); // Protocol
-            Request[0x08] = (byte)Progress; // Progress = 0% (0 - 100)
-            Request[0x0B] = 1; // Subblock count = 1
-
-            Buffer.BlockCopy(BigEndian.GetBytes(0x0000001D, 4), 0, Request, 0x0C, 4); // Subblock type for Payload v2 = 0x1B
-            Buffer.BlockCopy(BigEndian.GetBytes(FfuChunk.Length + 0x2C, 4), 0, Request, 0x10, 4); // Subblock length = length of chunk + 0x08
-
-            Buffer.BlockCopy(BigEndian.GetBytes(FfuChunk.Length, 4), 0, Request, 0x14, 4); // Payload length = length of chunk
-            Request[0x18] = Options; // Data options = 0 (1 = verify)
-            Buffer.BlockCopy(BigEndian.GetBytes(WriteDescriptorIndex, 4), 0, Request, 0x19, 4); // Payload length = length of chunk
-            Buffer.BlockCopy(BigEndian.GetBytes(CRC, 4), 0, Request, 0x1D, 4); // Payload length = length of chunk
-
-            Buffer.BlockCopy(FfuChunk, 0, Request, 0x40, FfuChunk.Length);
-
-            byte[] Response = ExecuteRawMethod(Request);
-            if (Response == null)
-            {
-                throw new BadConnectionException();
-            }
-
-            int ResultCode = (Response[6] << 8) + Response[7];
-            if (ResultCode != 0)
-            {
-                ThrowFlashError(ResultCode);
-            }
-        }
-
-        public void BackupPartitionToRam(string PartitionName)
-        {
-            PartitionName = PartitionName.ToUpper();
-            if (new string[] { "MODEM_FSG", "MODEM_FS1", "MODEM_FS2", "SSD", "DPP" }.Any(s => s == PartitionName))
-            {
-                byte[] Request = new byte[84];
-                const string Header = "NOKXFB";
-                Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-                Request[0x07] = 1; // Subblock count = 1
-                Request[0x08] = 6; // Subblock ID = 6 = Create Partition Backup to RAM
-                Buffer.BlockCopy(BigEndian.GetBytes(73, 2), 0, Request, 0x09, 2); // Subblock length = Length of data in subblock including fillers (subblock-ID-field and subblock-length-field are not counted for the subblock-length)
-                System.Text.Encoding.Unicode.GetBytes(PartitionName);
-
-                byte[] PartitionBytes = System.Text.Encoding.Unicode.GetBytes(PartitionName);
-                Buffer.BlockCopy(PartitionBytes, 0, Request, 0x0C, PartitionBytes.Length);
-                Request[0x0C + PartitionBytes.Length + 0x00] = 0; // Trailing zero
-                Request[0x0C + PartitionBytes.Length + 0x01] = 0;
-
-                byte[] Response = ExecuteRawMethod(Request);
-                int ResultCode = (Response[6] << 8) + Response[7];
-                if (ResultCode != 0)
-                {
-                    ThrowFlashError(ResultCode);
-                }
-            }
-            else
-            {
-                throw new WPinternalsException("Specified partition cannot be backupped to RAM", "Partition name: \"" + PartitionName + "\".");
-            }
-        }
-
-        public void LoadMmosBinary(UInt32 TotalLength, UInt32 Offset, bool SkipMmosSupportCheck, byte[] MmosPart)
-        {
-            byte[] Request = new byte[MmosPart.Length + 0x20];
-            const string Header = "NOKXFL";
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-            Request[0x07] = 1; // Subblock count = 1
-            Buffer.BlockCopy(BigEndian.GetBytes(0x0000001E, 4), 0, Request, 0x08, 4); // Subblock ID = Load MMOS Binary = 0x1E
-            Buffer.BlockCopy(BigEndian.GetBytes(MmosPart.Length + 0x10, 4), 0, Request, 0x0C, 4); // Subblock length = Payload-length + 0x10
-            Buffer.BlockCopy(BigEndian.GetBytes(TotalLength, 4), 0, Request, 0x10, 4);
-            Buffer.BlockCopy(BigEndian.GetBytes(Offset, 4), 0, Request, 0x14, 4);
-            if (SkipMmosSupportCheck)
-            {
-                Request[0x18] = 1;
-            }
-
-            Buffer.BlockCopy(BigEndian.GetBytes(MmosPart.Length, 4), 0, Request, 0x1C, 4);
-            Buffer.BlockCopy(MmosPart, 0, Request, 0x20, MmosPart.Length);
-
-            byte[] Response = ExecuteRawMethod(Request);
-            int ResultCode = (Response[6] << 8) + Response[7];
-            if (ResultCode != 0)
-            {
-                ThrowFlashError(ResultCode);
-            }
-        }
-
-        internal void SwitchToMmosContext()
-        {
-            byte[] Request = new byte[7];
-            ByteOperations.WriteAsciiString(Request, 0, "NOKXCBA");
-            ExecuteRawVoidMethod(Request);
-
-            ResetDevice();
-
-            Dispose(true);
-        }
-
-        private void ThrowFlashError(int ErrorCode)
-        {
-            string SubMessage = ErrorCode switch
-            {
-                0x0008 => "Unsupported protocol / Invalid options",
-                0x000F => "Invalid sub block count",
-                0x0010 => "Invalid sub block length",
-                0x0012 => "Authentication required",
-                0x000E => "Invalid sub block type",
-                0x0013 => "Failed async message",
-                0x1000 => "Invalid header type",
-                0x1001 => "FFU header contain unknown extra data",
-                0x0001 => "Couldn't allocate memory",
-                0x1106 => "Security header validation failed",
-                0x1105 => "Invalid hash table size",
-                0x1104 => "Invalid catalog size",
-                0x1103 => "Invalid chunk size",
-                0x1102 => "Unsupported algorithm",
-                0x1101 => "Invalid struct size",
-                0x1100 => "Invalid signature",
-                0x1202 => "Invalid struct size",
-                0x1203 => "Unsupported algorithm",
-                0x1204 => "Invalid chunk size",
-                0x1005 => "Data not aligned correctly",
-                0x0009 => "Locate protocol failed",
-                0x1003 => "Hash mismatch",
-                0x1006 => "Couldn't find hash from security header for index",
-                0x1004 => "Security header import missing / All FFU headers have not been imported",
-                0x1304 => "Invalid platform ID",
-                0x1307 => "Invalid write descriptor info",
-                0x1306 => "Invalid write descriptor info",
-                0x1305 => "Invalid block size",
-                0x1303 => "Unsupported FFU version",
-                0x1302 => "Unsupported struct version",
-                0x1301 => "Invalid update type",
-                0x100B => "Too much payload data, all data has already been written",
-                0x1008 => "Internal error",
-                0x1007 => "Payload data does not contain all data",
-                0x0004 => "Flash write failed",
-                0x000D => "Flash verify failed",
-                0x0002 => "Flash read failed",
-                _ => "Unknown error",
-            };
-            WPinternalsException Ex = new("Flash failed!");
-            Ex.SubMessage = "Error 0x" + ErrorCode.ToString("X4") + ": " + SubMessage;
-
-            throw Ex;
-        }
-
-        public void FlashFFU(string FFUPath, bool ResetAfterwards = true, byte Options = 0)
-        {
-            FlashFFU(new FFU(FFUPath), ResetAfterwards, Options);
-        }
-
-        public void FlashFFU(FFU FFU, bool ResetAfterwards = true, byte Options = 0)
-        {
-            FlashFFU(FFU, null, ResetAfterwards, Options);
-        }
-
-        public void FlashFFU(FFU FFU, ProgressUpdater UpdaterPerChunk, bool ResetAfterwards = true, byte Options = 0)
-        {
-            LogFile.BeginAction("FlashFFU");
-
-            ProgressUpdater Progress = UpdaterPerChunk;
-
-            PhoneInfo Info = ReadPhoneInfo();
-            if ((Info.SecureFfuSupportedProtocolMask & ((ushort)FfuProtocol.ProtocolSyncV1 | (ushort)FfuProtocol.ProtocolSyncV2)) == 0)
-            {
-                throw new WPinternalsException("Flash failed!", "Protocols not supported. The device reports that both Protocol Sync v1 and Protocol Sync v2 are not supported for FFU flashing. Is this an old device?");
-            }
-
-            UInt64 CombinedFFUHeaderSize = FFU.HeaderSize;
-            byte[] FfuHeader = new byte[CombinedFFUHeaderSize];
-            using (FileStream FfuFile = new(FFU.Path, FileMode.Open, FileAccess.Read))
-            {
-                FfuFile.Read(FfuHeader, 0, (int)CombinedFFUHeaderSize);
-                SendFfuHeaderV1(FfuHeader, Options);
-
-                UInt64 Position = CombinedFFUHeaderSize;
-                byte[] Payload;
-                int ChunkCount = 0;
-
-                if ((Info.SecureFfuSupportedProtocolMask & (ushort)FfuProtocol.ProtocolSyncV2) == 0)
-                {
-                    // Protocol v1
-                    Payload = new byte[FFU.ChunkSize];
-
-                    while (Position < (UInt64)FfuFile.Length)
-                    {
-                        FfuFile.Read(Payload, 0, Payload.Length);
-                        ChunkCount++;
-                        SendFfuPayloadV1(Payload, (int)((double)ChunkCount * 100 / FFU.TotalChunkCount), 0);
-                        Position += (ulong)Payload.Length;
-
-                        Progress?.IncreaseProgress(1);
-                    }
-                }
-                else
-                {
-                    // Protocol v2
-                    Payload = new byte[Info.WriteBufferSize];
-
-                    while (Position < (UInt64)FfuFile.Length)
-                    {
-                        UInt32 PayloadSize = Info.WriteBufferSize;
-                        if (((UInt64)FfuFile.Length - Position) < PayloadSize)
-                        {
-                            PayloadSize = (UInt32)((UInt64)FfuFile.Length - Position);
-                            Payload = new byte[PayloadSize];
-                        }
-
-                        FfuFile.Read(Payload, 0, (int)PayloadSize);
-                        ChunkCount += (int)(PayloadSize / FFU.ChunkSize);
-                        SendFfuPayloadV2(Payload, (int)((double)ChunkCount * 100 / FFU.TotalChunkCount), 0);
-                        Position += PayloadSize;
-
-                        Progress?.IncreaseProgress((ulong)(PayloadSize / FFU.ChunkSize));
-                    }
-                }
-            }
-
-            if (ResetAfterwards)
-            {
-                ResetPhone();
-            }
-
-            LogFile.EndAction("FlashFFU");
-        }
-
-        public void FlashMMOS(string MMOSPath, ProgressUpdater UpdaterPerChunk)
-        {
-            LogFile.BeginAction("FlashMMOS");
-
-            ProgressUpdater Progress = UpdaterPerChunk;
-
-            PhoneInfo Info = ReadPhoneInfo();
-            if (!Info.MmosOverUsbSupported)
-            {
-                throw new WPinternalsException("Flash failed!", "Protocols not supported. The device reports that loading Microsoft Manufacturing Operating System over USB is not supported.");
-            }
-
-            FileInfo info = new(MMOSPath);
-            uint length = uint.Parse(info.Length.ToString());
-
-            int offset = 0;
-            const int maximumbuffersize = 0x00240000;
-
-            uint totalcounts = (uint)Math.Truncate((decimal)length / maximumbuffersize);
-
-            using (FileStream MMOSFile = new(MMOSPath, FileMode.Open, FileAccess.Read))
-            {
-                for (int i = 1; i <= (uint)Math.Truncate((decimal)length / maximumbuffersize); i++)
-                {
-                    Progress.IncreaseProgress(1);
-                    byte[] data = new byte[maximumbuffersize];
-                    MMOSFile.Read(data, 0, maximumbuffersize);
-
-                    LoadMmosBinary(length, (uint)offset, false, data);
-
-                    offset += maximumbuffersize;
-                }
-
-                if (length - offset != 0)
-                {
-                    Progress.IncreaseProgress(1);
-
-                    byte[] data = new byte[length - offset];
-                    MMOSFile.Read(data, 0, (int)(length - offset));
-                    LoadMmosBinary(length, (uint)offset, false, data);
-                }
-
-                SwitchToMmosContext();
-                ResetPhone();
-            }
-
-            LogFile.EndAction("FlashMMOS");
-        }
-
-        public void FlashSectors(UInt32 StartSector, byte[] Data, int Progress = 0)
-        {
-            // Start sector is in UInt32, so max size of eMMC is 2 TB.
-
-            byte[] Request = new byte[Data.Length + 0x40];
-
-            const string Header = "NOKF";
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-            Request[0x05] = 0; // Device type = 0
-            Buffer.BlockCopy(BigEndian.GetBytes(StartSector, 4), 0, Request, 0x0B, 4); // Start sector
-            Buffer.BlockCopy(BigEndian.GetBytes(Data.Length / 0x200, 4), 0, Request, 0x0F, 4); // Sector count
-            Request[0x13] = (byte)Progress; // Progress (0 - 100)
-            Request[0x18] = 0; // Do Verify
-            Request[0x19] = 0; // Is Test
-
-            Buffer.BlockCopy(Data, 0, Request, 0x40, Data.Length);
-
-            ExecuteRawMethod(Request);
-        }
-
-        public void DisableRebootTimeOut()
-        {
-            byte[] Request = new byte[4];
-            const string Header = "NOKD";
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-            ExecuteRawMethod(Request);
-        }
-
-        public void Shutdown()
-        {
-            byte[] Request = new byte[4];
-            const string Header = "NOKZ";
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-            ExecuteRawMethod(Request);
-        }
-
-        public FlashVersion GetFlashVersion()
-        {
-            byte[] Response = ReadParam("FAI");
-            if ((Response == null) || (Response.Length < 6))
-            {
-                return null;
-            }
-
-            FlashVersion Result = new();
-
-            Result.ProtocolMajor = Response[1];
-            Result.ProtocolMinor = Response[2];
-            Result.ApplicationMajor = Response[3];
-            Result.ApplicationMinor = Response[4];
-
-            return Result;
-        }
-
-        internal GPT ReadGPT()
-        {
-            // If this function is used with a locked BootMgr v1, 
-            // then the mode-switching should be done outside this function, 
-            // because the context-switches that are used here are not supported on BootMgr v1.
-
-            // Only works in BootLoader-mode or on unlocked bootloaders in Flash-mode!!
-
-            PhoneInfo Info = ReadPhoneInfo(ExtendedInfo: false);
-            FlashAppType OriginalAppType = Info.App;
-            bool Switch = (Info.App != FlashAppType.BootManager) && Info.IsBootloaderSecure;
-            if (Switch)
-            {
-                SwitchToBootManagerContext();
-            }
-
-            byte[] Request = new byte[0x04];
-            const string Header = "NOKT";
-
-            System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-
-            byte[] Buffer = ExecuteRawMethod(Request);
-            if ((Buffer == null) || (Buffer.Length < 0x4408))
-            {
-                throw new InvalidOperationException("Unable to read GPT!");
-            }
-
-            UInt16 Error = (UInt16)((Buffer[6] << 8) + Buffer[7]);
-            if (Error > 0)
-            {
-                throw new NotSupportedException("ReadGPT: Error 0x" + Error.ToString("X4"));
-            }
-
-            byte[] GPTBuffer = new byte[Buffer.Length - 0x208];
-            System.Buffer.BlockCopy(Buffer, 0x208, GPTBuffer, 0, 0x4200);
-
-            if (Switch)
-            {
-                if (OriginalAppType == FlashAppType.FlashApp)
-                {
-                    SwitchToFlashAppContext();
-                }
-                else
-                {
-                    SwitchToPhoneInfoAppContext();
-                }
-            }
-
-            return new GPT(GPTBuffer);  // NOKT message header and MBR are ignored
-        }
-
-        internal void WriteGPT(GPT NewGPT)
-        {
-            bool? unlocked = IsBootLoaderUnlocked();
-            if (unlocked == false)
-            {
-                throw new InvalidOperationException("Bootloader is not unlocked!");
-            }
-
-            byte[] Buffer = NewGPT.Rebuild();
-
-            UInt32? HeaderOffset = ByteOperations.FindAscii(Buffer, "EFI PART");
-            if (HeaderOffset != 0)
-            {
-                throw new BadImageFormatException();
-            }
-
-            FlashSectors(1, Buffer);
-        }
-
-        internal void FlashRawPartition(string Path, string PartitionName)
-        {
-            FlashRawPartition(Path, null, PartitionName, null, null);
-        }
-
-        internal void FlashRawPartition(string Path, string PartitionName, Action<int, TimeSpan?> ProgressUpdateCallback)
-        {
-            FlashRawPartition(Path, null, PartitionName, ProgressUpdateCallback, null);
-        }
-
-        internal void FlashRawPartition(string Path, string PartitionName, ProgressUpdater UpdaterPerSector)
-        {
-            FlashRawPartition(Path, null, PartitionName, null, UpdaterPerSector);
-        }
-
-        internal void FlashRawPartition(Stream Stream, string PartitionName, ProgressUpdater UpdaterPerSector)
-        {
-            FlashRawPartition(null, Stream, PartitionName, null, UpdaterPerSector);
-        }
-
-        internal void FlashRawPartition(byte[] Buffer, string PartitionName, ProgressUpdater UpdaterPerSector)
-        {
-            FlashRawPartition(null, new MemoryStream(Buffer, false), PartitionName, null, UpdaterPerSector);
-        }
-
-        private void FlashRawPartition(string Path, Stream Stream, string PartitionName, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector)
-        {
-            bool? unlocked = IsBootLoaderUnlocked();
-            if (unlocked == false)
-            {
-                throw new InvalidOperationException("Bootloader is not unlocked!");
-            }
-
-            GPT GPT = ReadGPT();
-
-            Partition Partition = GPT.Partitions.First((p) => p.Name == PartitionName);
-            ulong PartitionSize = (Partition.LastSector - Partition.FirstSector + 1) * 0x200;
-
-            Stream InputStream = null;
-
-            if (Path != null)
-            {
-                InputStream = new DecompressedStream(File.Open(Path, FileMode.Open));
-            }
-            else if (Stream != null)
-            {
-                InputStream = Stream is DecompressedStream ? Stream : new DecompressedStream(Stream);
-            }
-
-            if (InputStream != null)
-            {
-                using (InputStream)
-                {
-                    UInt64? InputStreamLength = null;
-                    try
-                    {
-                        InputStreamLength = (UInt64)InputStream.Length;
-                    }
-                    catch { }
-
-                    if ((InputStreamLength != null) && ((UInt64)InputStream.Length > PartitionSize))
-                    {
-                        throw new InvalidOperationException("Partition can not be flashed, because its size is too big!");
-                    }
-
-                    ProgressUpdater Progress = UpdaterPerSector;
-                    if ((Progress == null) && (ProgressUpdateCallback != null) && (InputStreamLength != null))
-                    {
-                        Progress = new ProgressUpdater((UInt64)(InputStreamLength / 0x200), ProgressUpdateCallback);
-                    }
-
-                    int ProgressPercentage = 0;
-
-                    const int FlashBufferSize = 0x200000; // Flash 8 GB phone -> buffersize 0x200000 = 11:45 min, buffersize 0x20000 = 12:30 min
-                    byte[] FlashBuffer = new byte[FlashBufferSize];
-                    int BytesRead;
-                    UInt64 i = 0;
-                    do
-                    {
-                        BytesRead = InputStream.Read(FlashBuffer, 0, FlashBufferSize);
-
-                        byte[] FlashBufferFinalSize;
-                        if (BytesRead > 0)
-                        {
-                            if (BytesRead == FlashBufferSize)
-                            {
-                                FlashBufferFinalSize = FlashBuffer;
-                            }
-                            else
-                            {
-                                FlashBufferFinalSize = new byte[BytesRead];
-                                Buffer.BlockCopy(FlashBuffer, 0, FlashBufferFinalSize, 0, BytesRead);
-                            }
-
-                            FlashSectors((UInt32)(Partition.FirstSector + (i / 0x200)), FlashBufferFinalSize, ProgressPercentage);
-                        }
-
-                        if (Progress != null)
-                        {
-                            Progress.IncreaseProgress((UInt64)FlashBuffer.Length / 0x200);
-                            ProgressPercentage = Progress.ProgressPercentage;
-                        }
-
-                        i += FlashBufferSize;
-                    }
-                    while (BytesRead == FlashBufferSize);
-                }
-            }
-        }
-
-        internal void ErasePartition(string PartitionName)
-        {
-            // Partition "Data" can always be erased.
-            // Other partitions can only be erased when a valid RDC certificate is present or full SX authentication was performed.
-            if (PartitionName.Length > 0x23)
-            {
-                throw new ArgumentException("PartitionName cannot exceed 0x23 chars!");
-            }
-
-            byte[] Request = new byte[0x50];
-            const string Header = "NOKXFP";
-            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
-            Request[0x06] = 1; // Protocol version must be 1
-            Request[0x07] = 0; // Device type = 0
-
-            byte[] PartitionBytes = System.Text.Encoding.Unicode.GetBytes(PartitionName);
-            Buffer.BlockCopy(PartitionBytes, 0, Request, 8, PartitionBytes.Length);
-            Request[0x08 + PartitionBytes.Length + 0x00] = 0; // Trailing zero
-            Request[0x08 + PartitionBytes.Length + 0x01] = 0;
-
-            ExecuteRawMethod(Request);
-        }
-
-        internal FlashAppType GetFlashAppType()
-        {
-            byte[] Request = new byte[4];
-            ByteOperations.WriteAsciiString(Request, 0, "NOKV");
-            byte[] Response = ExecuteRawMethod(Request);
-            if ((Response == null) || (ByteOperations.ReadAsciiString(Response, 0, 4) == "NOKU"))
-            {
-                throw new NotSupportedException();
-            }
-
-            return (FlashAppType)Response[5];
-        }
-
-        internal PhoneInfo ReadPhoneInfo(bool ExtendedInfo = true)
-        {
-            // NOKH = Get Phone Info (IMEI and info from Product.dat) - Not available on some phones, like Lumia 640.
-            // NOKV = Info Query
-
-            bool PhoneInfoLogged = Info.State != PhoneInfoState.Empty;
-            PhoneInfo Result = Info;
-
-            if (Result.State == PhoneInfoState.Empty)
-            {
-                byte[] Request = new byte[4];
-                ByteOperations.WriteAsciiString(Request, 0, "NOKV");
-                byte[] Response = ExecuteRawMethod(Request);
-                if ((Response != null) && (ByteOperations.ReadAsciiString(Response, 0, 4) != "NOKU"))
-                {
-                    Result.App = (FlashAppType)Response[5];
-
-                    switch (Result.App)
-                    {
-                        case FlashAppType.BootManager:
-                            Result.BootManagerProtocolVersionMajor = Response[6];
-                            Result.BootManagerProtocolVersionMinor = Response[7];
-                            Result.BootManagerVersionMajor = Response[8];
-                            Result.BootManagerVersionMinor = Response[9];
-                            break;
-                        case FlashAppType.FlashApp:
-                            Result.FlashAppProtocolVersionMajor = Response[6];
-                            Result.FlashAppProtocolVersionMinor = Response[7];
-                            Result.FlashAppVersionMajor = Response[8];
-                            Result.FlashAppVersionMinor = Response[9];
-                            break;
-                        case FlashAppType.PhoneInfoApp:
-                            Result.PhoneInfoAppProtocolVersionMajor = Response[6];
-                            Result.PhoneInfoAppProtocolVersionMinor = Response[7];
-                            Result.PhoneInfoAppVersionMajor = Response[8];
-                            Result.PhoneInfoAppVersionMinor = Response[9];
-                            break;
-                    }
-
-                    byte SubblockCount = Response[10];
-                    int SubblockOffset = 11;
-
-                    for (int i = 0; i < SubblockCount; i++)
-                    {
-                        byte SubblockID = Response[SubblockOffset + 0x00];
-                        UInt16 SubblockLength = BigEndian.ToUInt16(Response, SubblockOffset + 0x01);
-                        int SubblockPayloadOffset = SubblockOffset + 3;
-                        byte SubblockVersion;
-                        switch (SubblockID)
-                        {
-                            case 0x01:
-                                Result.TransferSize = BigEndian.ToUInt32(Response, SubblockPayloadOffset);
-                                break;
-                            case 0x1F:
-                                Result.MmosOverUsbSupported = Response[SubblockPayloadOffset] == 1;
-                                break;
-                            case 0x04:
-                                if (Result.App == FlashAppType.BootManager)
-                                {
-                                    Result.FlashAppProtocolVersionMajor = Response[SubblockPayloadOffset + 0x00];
-                                    Result.FlashAppProtocolVersionMinor = Response[SubblockPayloadOffset + 0x01];
-                                    Result.FlashAppVersionMajor = Response[SubblockPayloadOffset + 0x02];
-                                    Result.FlashAppVersionMinor = Response[SubblockPayloadOffset + 0x03];
-                                }
-                                else if (Result.App == FlashAppType.FlashApp)
-                                {
-                                    Result.SdCardSizeInSectors = BigEndian.ToUInt32(Response, SubblockPayloadOffset);
-                                }
-                                break;
-                            case 0x02:
-                                Result.WriteBufferSize = BigEndian.ToUInt32(Response, SubblockPayloadOffset);
-                                break;
-                            case 0x03:
-                                Result.EmmcSizeInSectors = BigEndian.ToUInt32(Response, SubblockPayloadOffset);
-                                break;
-                            case 0x05:
-                                Result.PlatformID = ByteOperations.ReadAsciiString(Response, (uint)SubblockPayloadOffset, SubblockLength).Trim(new char[] { ' ', '\0' });
-                                break;
-                            case 0x0D:
-                                Result.AsyncSupport = Response[SubblockPayloadOffset + 1] == 1;
-                                break;
-                            case 0x0F:
-                                SubblockVersion = Response[SubblockPayloadOffset]; // 0x03
-                                Result.PlatformSecureBootEnabled = Response[SubblockPayloadOffset + 0x01] == 0x01;
-                                Result.SecureFfuEnabled = Response[SubblockPayloadOffset + 0x02] == 0x01;
-                                Result.JtagDisabled = Response[SubblockPayloadOffset + 0x03] == 0x01;
-                                Result.RdcPresent = Response[SubblockPayloadOffset + 0x04] == 0x01;
-                                Result.Authenticated = (Response[SubblockPayloadOffset + 0x05] == 0x01) || (Response[SubblockPayloadOffset + 0x05] == 0x02);
-                                Result.UefiSecureBootEnabled = Response[SubblockPayloadOffset + 0x06] == 0x01;
-                                Result.SecondaryHardwareKeyPresent = Response[SubblockPayloadOffset + 0x07] == 0x01;
-                                break;
-                            case 0x10:
-                                SubblockVersion = Response[SubblockPayloadOffset]; // 0x01
-                                Result.SecureFfuSupportedProtocolMask = BigEndian.ToUInt16(Response, SubblockPayloadOffset + 0x01);
-                                break;
-                            case 0x20:
-                                // CRC header info
-                                break;
-                        }
-                        SubblockOffset += SubblockLength + 3;
-                    }
-                }
-
-                Result.State = PhoneInfoState.Basic;
-            }
-
-            if (ExtendedInfo && (Result.State == PhoneInfoState.Basic))
-            {
-                FlashAppType OriginalType = Result.App;
-
-                try
-                {
-                    SwitchToPhoneInfoAppContext(); // May throw NotSupportedException
-
-                    Result.Type = ReadPhoneInfoVariable("TYPE");
-                    Result.ProductCode = ReadPhoneInfoVariable("CTR");
-                    Result.Imei = ReadPhoneInfoVariable("IMEI");
-
-                    SwitchToFlashAppContext();
-                    DisableRebootTimeOut();
-                }
-                catch { }
-
-                if (Result.App == FlashAppType.FlashApp)
-                {
-                    Result.Firmware = ReadStringParam("FVER");
-                    Result.RKH = ReadParam("RRKH");
-                }
-
-                try
-                {
-                    if (OriginalType == FlashAppType.BootManager)
-                    {
-                        SwitchToBootManagerContext();
-                    }
-                }
-                catch { }
-
-                Result.State = PhoneInfoState.Extended;
-            }
-
-            Result.IsBootloaderSecure = !(Info.Authenticated || Info.RdcPresent || !Info.SecureFfuEnabled);
-
-            if (!PhoneInfoLogged)
-            {
-                Result.Log(LogType.FileOnly);
-            }
-
-            return Result;
-        }
-
-        internal void ResetPhone()
-        {
-            LogFile.Log("Rebooting phone", LogType.FileAndConsole);
-            try
-            {
-                byte[] Request = new byte[4];
-                ByteOperations.WriteAsciiString(Request, 0, "NOKR");
-                ExecuteRawVoidMethod(Request);
-            }
-            catch
-            {
-                LogFile.Log("Sending reset-request failed", LogType.FileOnly);
-                LogFile.Log("Assuming automatic reset already in progress", LogType.FileOnly);
-            }
-        }
-
-        internal void ContinueBoot()
-        {
-            LogFile.Log("Continue boot...");
-            byte[] Request = new byte[4];
-            ByteOperations.WriteAsciiString(Request, 0, "NOKA");
-            ExecuteRawVoidMethod(Request);
-        }
-
-        internal void ResetPhoneToFlashMode()
-        {
-            // This only works when the phone is in BootMgr mode. If it is already in FlashApp, it will not reboot. It only makes the phone unresponsive.
-            LogFile.Log("Rebooting phone to Flash mode...");
-            byte[] Request = new byte[4];
-            ByteOperations.WriteAsciiString(Request, 0, "NOKS");
-            ExecuteRawVoidMethod(Request);
-        }
-
-        internal void Hello()
-        {
-            byte[] Request = new byte[4];
-            ByteOperations.WriteAsciiString(Request, 0, "NOKI");
-            byte[] Response = ExecuteRawMethod(Request);
-            if (Response == null)
-            {
-                throw new BadConnectionException();
-            }
-
-            if (ByteOperations.ReadAsciiString(Response, 0, 4) != "NOKI")
-            {
-                throw new WPinternalsException("Bad response from phone!", "The phone did not answer properly to the Hello message sent.");
-            }
-        }
-
-        internal UInt16 ReadSecureFfuSupportedProtocolMask()
-        {
-            return BigEndian.ToUInt16(ReadParam("SFPI"), 0);
-        }
-
-        internal void SwitchToPhoneInfoAppContext()
-        {
-            byte[] Request = new byte[7];
-            ByteOperations.WriteAsciiString(Request, 0, "NOKXCBP");
-            byte[] Response = ExecuteRawMethod(Request);
-            if (ByteOperations.ReadAsciiString(Response, 0, 4) == "NOKU")
-            {
-                throw new NotSupportedException();
-            }
-
-            UInt16 Error = (UInt16)((Response[6] << 8) + Response[7]);
-            if (Error > 0)
-            {
-                throw new NotSupportedException("SwitchToPhoneInfoAppContext: Error 0x" + Error.ToString("X4"));
-            }
-
-            DisableRebootTimeOut();
-            Info.App = FlashAppType.PhoneInfoApp;
-            InterfaceChanged(PhoneInterfaces.Lumia_Flash);
-        }
-
-        internal void SwitchToFlashAppContext()
-        {
-            // SwitchToFlashAppContext() should only be used with BootMgr v2
-            // For switching from BootMgr to FlashApp, it will use NOKS
-            // That will switch to a charging state, whereas a normal context switch will not start charging
-            // The implementation of NOKS in BootMgr mode has changed in BootMgr v2
-            // It does not disconnect / reconnect anymore and the apptype is changed immediately
-            // NOKS still doesnt return a status
-
-            byte[] Request;
-
-            if (Info.State == PhoneInfoState.Empty)
-            {
-                ReadPhoneInfo(ExtendedInfo: false);
-            }
-
-            if (Info.App == FlashAppType.BootManager)
-            {
-                if (Info.FlashAppProtocolVersionMajor < 2)
-                {
-                    // A phone with Bootloader Spec A cannot be switched from BootMgr to FlashApp.
-                    // NOKS will make the phone unresponsive and let you wait for a new arrival, but that would require a PhoneNotifier and that is not available in this context.
-                    // And NOKXCBF is not supported at all.
-                    return;
-                }
-
-                Request = new byte[4];
-                ByteOperations.WriteAsciiString(Request, 0, "NOKS"); // This will let the phone charge
-                ExecuteRawVoidMethod(Request); // On phone with bootloader Spec A this triggers a reboot, so DisableRebootTimeOut() cannot be called immediately.
-            }
-            else if (Info.App == FlashAppType.PhoneInfoApp)
-            {
-                Request = new byte[7];
-                ByteOperations.WriteAsciiString(Request, 0, "NOKXCBF"); // This will stop charging the phone
-                byte[] Response = ExecuteRawMethod(Request);
-                if (ByteOperations.ReadAsciiString(Response, 0, 4) == "NOKU")
-                {
-                    throw new NotSupportedException();
-                }
-
-                UInt16 Error = (UInt16)((Response[6] << 8) + Response[7]);
-                if (Error > 0)
-                {
-                    throw new NotSupportedException("SwitchToFlashAppContext: Error 0x" + Error.ToString("X4"));
-                }
-            }
-
-            DisableRebootTimeOut();
-
-            Info.App = FlashAppType.FlashApp;
-
-            // If current Info class was retrieved while in BootMgr mode, then we need to invalidate this data, because it is incomplete. 
-            if (Info.PlatformID == null)
-            {
-                Info.State = PhoneInfoState.Empty;
-            }
-
-            InterfaceChanged(PhoneInterfaces.Lumia_Flash);
-        }
-
-        internal void SwitchToBootManagerContext(bool DisableTimeOut = true)
-        {
-            byte[] Request = new byte[7];
-            ByteOperations.WriteAsciiString(Request, 0, "NOKXCBB");
-            byte[] Response = ExecuteRawMethod(Request);
-            if (ByteOperations.ReadAsciiString(Response, 0, 4) == "NOKU")
-            {
-                throw new NotSupportedException();
-            }
-
-            UInt16 Error = (UInt16)((Response[6] << 8) + Response[7]);
-            if (Error > 0)
-            {
-                throw new NotSupportedException("SwitchToBootManagerContext: Error 0x" + Error.ToString("X4"));
-            }
-
-            if (DisableTimeOut)
-            {
-                DisableRebootTimeOut();
-            }
-
-            Info.App = FlashAppType.BootManager;
-            InterfaceChanged(PhoneInterfaces.Lumia_Bootloader);
-        }
-
-        internal string ReadPhoneInfoVariable(string VariableName)
-        {
-            // This function assumes the phone is in Phone Info App context
-
-            byte[] Request = new byte[16];
-            ByteOperations.WriteAsciiString(Request, 0, "NOKXPH" + VariableName + "\0"); // BTR or CTR, CTR is public ProductCode
-            byte[] Response = ExecuteRawMethod(Request);
-            UInt16 Length = BigEndian.ToUInt16(Response, 6);
-            return ByteOperations.ReadAsciiString(Response, 8, Length).Trim(new char[] { ' ', '\0' });
-        }
-
-        internal string ReadProductCode()
-        {
-            SwitchToPhoneInfoAppContext();
-            string Result = ReadPhoneInfoVariable("CTR");
-            SwitchToFlashAppContext();
-            return Result;
-        }
-
-        internal void StartAsyncFlash()
-        {
-            byte[] Request = new byte[14];
-            ByteOperations.WriteAsciiString(Request, 0, "NOKXFFS");
-            Request[8] = 1; // Protocol version must be 1
-            Request[9] = 0; // Protocol type must be 0
-            ExecuteRawMethod(Request);
-        }
-
-        internal void EndAsyncFlash()
-        {
-            byte[] Request = new byte[7];
-            ByteOperations.WriteAsciiString(Request, 0, "NOKXFFE");
-            ExecuteRawMethod(Request);
-        }
-
-        internal enum SecureBootKeyType : byte
-        {
-            Retail = 0,
-            Engineering = 1
-        }
-
-        internal void ProvisionSecureBootKeys(SecureBootKeyType KeyType) // Only for Flashmode, not BootManager mode.
-        {
-            byte[] Request = new byte[8];
-            ByteOperations.WriteAsciiString(Request, 0, "NOKXFK");
-            Request[6] = 0; // Options
-            Request[7] = (byte)KeyType;
-            byte[] Response = ExecuteRawMethod(Request);
-            UInt32 Status = ByteOperations.ReadUInt32(Response, 6);
-            if (Status != 0)
-            {
-                ThrowFlashError((int)Status);
-            }
-        }
-    }
-
-    internal enum FlashAppType
-    {
-        BootManager = 1,
-        FlashApp = 2,
-        PhoneInfoApp = 3
-    };
-
-    internal enum PhoneInfoState
-    {
-        Empty,
-        Basic,
-        Extended
-    };
-
-    internal class PhoneInfo
-    {
-        public PhoneInfoState State = PhoneInfoState.Empty;
-
-        public string Type;        // Extended info
-        public string ProductCode; // Extended info
-        public string Imei;        // Extended info
-        public string Firmware;    // Extended info
-        public byte[] RKH;         // Extended info
-
-        public FlashAppType App;
-
-        public byte FlashAppVersionMajor;
-        public byte FlashAppVersionMinor;
-        public byte FlashAppProtocolVersionMajor;
-        public byte FlashAppProtocolVersionMinor;
-
-        public byte BootManagerVersionMajor;
-        public byte BootManagerVersionMinor;
-        public byte BootManagerProtocolVersionMajor;
-        public byte BootManagerProtocolVersionMinor;
-
-        public byte PhoneInfoAppVersionMajor;
-        public byte PhoneInfoAppVersionMinor;
-        public byte PhoneInfoAppProtocolVersionMajor;
-        public byte PhoneInfoAppProtocolVersionMinor;
-
-        public UInt32 TransferSize;
-        public bool MmosOverUsbSupported;
-        public UInt32 SdCardSizeInSectors;
-        public UInt32 WriteBufferSize;
-        public UInt32 EmmcSizeInSectors;
-        public string PlatformID;
-        public UInt16 SecureFfuSupportedProtocolMask;
-        public bool AsyncSupport;
-
-        public bool PlatformSecureBootEnabled;
-        public bool SecureFfuEnabled;
-        public bool JtagDisabled;
-        public bool RdcPresent;
-        public bool Authenticated;
-        public bool UefiSecureBootEnabled;
-        public bool SecondaryHardwareKeyPresent;
-
-        public bool IsBootloaderSecure;
-
-        internal void Log(LogType Type)
-        {
-            if (State == PhoneInfoState.Extended)
-            {
-                if (this.Type != null)
-                {
-                    LogFile.Log("Phone type: " + this.Type, Type);
-                }
-
-                if (ProductCode != null)
-                {
-                    LogFile.Log("Product code: " + ProductCode, Type);
-                }
-
-                if (RKH != null)
-                {
-                    LogFile.Log("Root key hash: " + Converter.ConvertHexToString(RKH, ""), Type);
-                }
-
-                if (Firmware?.Length > 0)
-                {
-                    LogFile.Log("Firmware version: " + Firmware, Type);
-                }
-
-                if (Type != LogType.ConsoleOnly && (Imei != null))
-                {
-                    LogFile.Log("IMEI: " + Imei, LogType.FileOnly);
-                }
-            }
-
-            switch (App)
-            {
-                case FlashAppType.BootManager:
-                    LogFile.Log("Bootmanager: " + BootManagerVersionMajor + "." + BootManagerVersionMinor, Type);
-                    LogFile.Log("Bootmanager protocol: " + BootManagerProtocolVersionMajor + "." + BootManagerProtocolVersionMinor, Type);
-                    LogFile.Log("Flash app: " + FlashAppVersionMajor + "." + FlashAppVersionMinor, Type);
-                    LogFile.Log("Flash protocol: " + FlashAppProtocolVersionMajor + "." + FlashAppProtocolVersionMinor, Type);
-                    break;
-                case FlashAppType.FlashApp:
-                    LogFile.Log("Flash app: " + FlashAppVersionMajor + "." + FlashAppVersionMinor, Type);
-                    LogFile.Log("Flash protocol: " + FlashAppProtocolVersionMajor + "." + FlashAppProtocolVersionMinor, Type);
-                    break;
-                case FlashAppType.PhoneInfoApp:
-                    LogFile.Log("Phone info app: " + PhoneInfoAppVersionMajor + "." + PhoneInfoAppVersionMinor, Type);
-                    LogFile.Log("Phone info protocol: " + PhoneInfoAppProtocolVersionMajor + "." + PhoneInfoAppProtocolVersionMinor, Type);
-                    break;
-            }
-
-            LogFile.Log("SecureBoot: " + ((!PlatformSecureBootEnabled || !UefiSecureBootEnabled) ? "Disabled" : "Enabled") + " (Platform Secure Boot: " + (PlatformSecureBootEnabled ? "Enabled" : "Disabled") + ", UEFI Secure Boot: " + (UefiSecureBootEnabled ? "Enabled" : "Disabled") + ")", Type);
-
-            if ((Type == LogType.ConsoleOnly) || (Type == LogType.FileAndConsole))
-            {
-                LogFile.Log("Flash app security: " + (!IsBootloaderSecure ? "Disabled" : "Enabled"), LogType.ConsoleOnly);
-            }
-
-            if ((Type == LogType.FileOnly) || (Type == LogType.FileAndConsole))
-            {
-                LogFile.Log("Flash app security: " + (!IsBootloaderSecure ? "Disabled" : "Enabled") + " (FFU security: " + (SecureFfuEnabled ? "Enabled" : "Disabled") + ", RDC: " + (RdcPresent ? "Present" : "Not found") + ", Authenticated: " + (Authenticated ? "True" : "False") + ")", LogType.FileOnly);
-            }
-
-            LogFile.Log("JTAG: " + (JtagDisabled ? "Disabled" : "Enabled"), Type);
-        }
-    }
-
-    internal class UefiSecurityStatusResponse
-    {
-        public byte IsTestDevice;
-        public bool PlatformSecureBootStatus;
-        public bool SecureFfuEfuseStatus;
-        public bool DebugStatus;
-        public bool RdcStatus;
-        public bool AuthenticationStatus;
-        public bool UefiSecureBootStatus;
-        public bool CryptoHardwareKey;
-    }
-
-    internal class FlashVersion
-    {
-        public int ApplicationMajor;
-        public int ApplicationMinor;
-        public int ProtocolMajor;
-        public int ProtocolMinor;
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.IO;
+using System.Linq;
+
+namespace WPinternals
+{
+    internal enum FfuProtocol
+    {
+        ProtocolSyncV1 = 1,
+        ProtocolAsyncV1 = 2,
+        ProtocolSyncV2 = 4,
+        ProtocolAsyncV2 = 8,
+        ProtocolAsyncV3 = 16
+    }
+
+    [Flags]
+    internal enum FlashOptions : byte
+    {
+        SkipWrite = 1,
+        SkipHashCheck = 2,
+        SkipIdCheck = 4,
+        SkipSignatureCheck = 8
+    }
+
+    internal delegate void InterfaceChangedHandler(PhoneInterfaces NewInterface);
+
+    internal class NokiaFlashModel : NokiaPhoneModel
+    {
+        private UefiSecurityStatusResponse _SecurityStatus = null;
+        private readonly PhoneInfo Info = new();
+
+        internal event InterfaceChangedHandler InterfaceChanged = delegate { };
+
+        public NokiaFlashModel(string DevicePath) : base(DevicePath) { }
+
+        public byte[] ReadParam(string Param)
+        {
+            byte[] Request = new byte[0x0B];
+            const string Header = "NOKXFR";
+
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Param), 0, Request, 7, Param.Length);
+
+            byte[] Response = ExecuteRawMethod(Request);
+            if ((Response == null) || (Response.Length < 0x10))
+            {
+                return null;
+            }
+
+            byte[] Result = new byte[Response[0x10]];
+            Buffer.BlockCopy(Response, 0x11, Result, 0, Response[0x10]);
+            return Result;
+        }
+
+        public string ReadStringParam(string Param)
+        {
+            byte[] Bytes = ReadParam(Param);
+            if (Bytes == null)
+            {
+                return null;
+            }
+
+            return System.Text.Encoding.ASCII.GetString(Bytes).Trim(new char[] { '\0' });
+        }
+
+        [Flags]
+        internal enum Fuse
+        {
+            SecureBoot = 1,
+            FfuVerify = 2,
+            Jtag = 4,
+            Shk = 8,
+            Simlock = 16,
+            ProductionDone = 32,
+            Rkh = 64,
+            PublicId = 128,
+            Dak = 256,
+            SecGen = 512,
+            OemId = 1024,
+            FastBoot = 2048,
+            SpdmSecMode = 4096,
+            RpmWdog = 8192,
+            Ssm = 16384
+        }
+
+        public bool? ReadFuseStatus(Fuse fuse)
+        {
+            uint? flags = ReadSecurityFlags();
+            if (!flags.HasValue)
+            {
+                return null;
+            }
+
+            var finalconfig = (Fuse)flags.Value;
+            return finalconfig.HasFlag(fuse);
+        }
+
+        public uint? ReadSecurityFlags()
+        {
+            byte[] Response = ReadParam("FCS");
+            if ((Response == null) || (Response.Length != 4))
+            {
+                return null;
+            }
+
+            // This value is in big endian
+            return (UInt32)((Response[0] << 24) | (Response[1] << 16) | (Response[2] << 8) | Response[3]);
+        }
+
+        public uint? ReadCurrentChargeLevel()
+        {
+            byte[] Response = ReadParam("CS");
+            if ((Response == null) || (Response.Length != 8))
+            {
+                return null;
+            }
+
+            // This value is in big endian
+            return (UInt32)((Response[0] << 24) | (Response[1] << 16) | (Response[2] << 8) | Response[3]) + 1;
+        }
+
+        public int? ReadCurrentChargeCurrent()
+        {
+            byte[] Response = ReadParam("CS");
+            if ((Response == null) || (Response.Length != 8))
+            {
+                return null;
+            }
+
+            // This value is in big endian and needs to be XOR'd with 0xFFFFFFFF
+            return (Int32)(((Response[4] << 24) | (Response[5] << 16) | (Response[6] << 8) | Response[7]) ^ 0xFFFFFFFF) + 1;
+        }
+
+        public UefiSecurityStatusResponse ReadSecurityStatus()
+        {
+            if (_SecurityStatus != null)
+            {
+                return _SecurityStatus;
+            }
+
+            byte[] Response = ReadParam("SS");
+            if (Response == null)
+            {
+                return null;
+            }
+
+            UefiSecurityStatusResponse Result = new();
+
+            Result.IsTestDevice = Response[0];
+            Result.PlatformSecureBootStatus = Convert.ToBoolean(Response[1]);
+            Result.SecureFfuEfuseStatus = Convert.ToBoolean(Response[2]);
+            Result.DebugStatus = Convert.ToBoolean(Response[3]);
+            Result.RdcStatus = Convert.ToBoolean(Response[4]);
+            Result.AuthenticationStatus = Convert.ToBoolean(Response[5]);
+            Result.UefiSecureBootStatus = Convert.ToBoolean(Response[6]);
+            Result.CryptoHardwareKey = Convert.ToBoolean(Response[7]);
+
+            _SecurityStatus = Result;
+
+            return Result;
+        }
+
+        internal bool? IsBootLoaderUnlocked()
+        {
+            UefiSecurityStatusResponse SecurityStatus = ReadSecurityStatus();
+            if (SecurityStatus != null)
+            {
+                return SecurityStatus.AuthenticationStatus || SecurityStatus.RdcStatus || !SecurityStatus.SecureFfuEfuseStatus;
+            }
+
+            return null;
+        }
+
+        public TerminalResponse GetTerminalResponse()
+        {
+            byte[] AsskMask = new byte[0x10] { 1, 0, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64 };
+            byte[] Request = new byte[0xAC];
+            const string Header = "NOKXFT";
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+            Request[7] = 1;
+            Buffer.BlockCopy(BigEndian.GetBytes(0x18, 4), 0, Request, 0x08, 4); // Subblocktype = 0x18
+            Buffer.BlockCopy(BigEndian.GetBytes(0x9C, 4), 0, Request, 0x0C, 4); // Subblocklength = 0x9C
+            Buffer.BlockCopy(BigEndian.GetBytes(0x00, 4), 0, Request, 0x10, 4); // AsicIndex = 0x00
+            Buffer.BlockCopy(AsskMask, 0, Request, 0x14, 0x10);
+            byte[] TerminalResponse = ExecuteRawMethod(Request);
+            if ((TerminalResponse?.Length > 0x20) && (BigEndian.ToUInt32(TerminalResponse, 0x14) == (TerminalResponse.Length - 0x18)) && (BitConverter.ToUInt32(TerminalResponse, 0x1C) == (TerminalResponse.Length - 0x20)))
+            {
+                // Parse Terminal Response from offset 0x18
+                return Terminal.Parse(TerminalResponse, 0x18);
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        public void SendFfuHeaderV1(byte[] FfuHeader, byte Options = 0)
+        {
+            byte[] Request = new byte[FfuHeader.Length + 0x20];
+
+            const string Header = "NOKXFS";
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+            Buffer.BlockCopy(BigEndian.GetBytes(0x0001, 2), 0, Request, 0x06, 2); // Protocol version = 0x0001
+            Request[0x08] = 0; // Progress = 0%
+            Request[0x0B] = 1; // Subblock count = 1
+            Buffer.BlockCopy(BigEndian.GetBytes(0x0000000B, 4), 0, Request, 0x0C, 4); // Subblock type for header = 0x0B
+            Buffer.BlockCopy(BigEndian.GetBytes(FfuHeader.Length + 0x0C, 4), 0, Request, 0x10, 4); // Subblock length = length of header + 0x0C
+            Buffer.BlockCopy(BigEndian.GetBytes(0x00000000, 4), 0, Request, 0x14, 4); // Header type = 0
+            Buffer.BlockCopy(BigEndian.GetBytes(FfuHeader.Length, 4), 0, Request, 0x18, 4); // Payload length = length of header
+            Request[0x1C] = Options; // Header options = 0
+
+            Buffer.BlockCopy(FfuHeader, 0, Request, 0x20, FfuHeader.Length);
+
+            byte[] Response = ExecuteRawMethod(Request);
+            if (Response == null)
+            {
+                throw new BadConnectionException();
+            }
+
+            int ResultCode = (Response[6] << 8) + Response[7];
+            if (ResultCode != 0)
+            {
+                ThrowFlashError(ResultCode);
+            }
+        }
+
+        public void SendFfuHeaderV2(UInt32 TotalHeaderLength, UInt32 OffsetForThisPart, byte[] FfuHeader, byte Options = 0)
+        {
+            byte[] Request = new byte[FfuHeader.Length + 0x3C];
+
+            const string Header = "NOKXFS";
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+            Buffer.BlockCopy(BigEndian.GetBytes((int)FfuProtocol.ProtocolSyncV2, 2), 0, Request, 0x06, 2); // Protocol version = 0x0001
+            Request[0x08] = 0; // Progress = 0%
+            Request[0x0B] = 1; // Subblock count = 1
+
+            Buffer.BlockCopy(BigEndian.GetBytes(0x00000021, 4), 0, Request, 0x0C, 4); // Subblock type for header v2 = 0x21
+            Buffer.BlockCopy(BigEndian.GetBytes(FfuHeader.Length + 0x28, 4), 0, Request, 0x10, 4); // Subblock starts at 0x14, payload starts at 0x3C.
+
+            Buffer.BlockCopy(BigEndian.GetBytes(0x00000000, 4), 0, Request, 0x14, 4); // Header type = 0
+            Buffer.BlockCopy(BigEndian.GetBytes(TotalHeaderLength, 4), 0, Request, 0x18, 4); // Payload length = length of header
+            Request[0x1C] = Options; // Header options = 0
+
+            Buffer.BlockCopy(BigEndian.GetBytes(OffsetForThisPart, 4), 0, Request, 0x1D, 4);
+            Buffer.BlockCopy(BigEndian.GetBytes(FfuHeader.Length, 4), 0, Request, 0x21, 4);
+            Request[0x25] = 0; // No Erase
+
+            Buffer.BlockCopy(FfuHeader, 0, Request, 0x3C, FfuHeader.Length);
+
+            byte[] Response = ExecuteRawMethod(Request);
+            if (Response == null)
+            {
+                throw new BadConnectionException();
+            }
+
+            if (Response.Length == 4)
+            {
+                throw new WPinternalsException("Flash protocol v2 not supported", "The device reported that the Flash protocol v2 was not supported while sending the FFU header.");
+            }
+
+            int ResultCode = (Response[6] << 8) + Response[7];
+            if (ResultCode != 0)
+            {
+                ThrowFlashError(ResultCode);
+            }
+        }
+
+        public void SendFfuPayloadV1(byte[] FfuChunk, int Progress = 0, byte Options = 0)
+        {
+            byte[] Request = new byte[FfuChunk.Length + 0x1C];
+
+            const string Header = "NOKXFS";
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+            Buffer.BlockCopy(BigEndian.GetBytes((int)FfuProtocol.ProtocolSyncV1, 2), 0, Request, 0x06, 2); // Protocol version = 0x0001
+            Request[0x08] = (byte)Progress; // Progress = 0% (0 - 100)
+            Request[0x0B] = 1; // Subblock count = 1
+
+            Buffer.BlockCopy(BigEndian.GetBytes(0x0000000C, 4), 0, Request, 0x0C, 4); // Subblock type for ChunkData = 0x0C
+            Buffer.BlockCopy(BigEndian.GetBytes(FfuChunk.Length + 0x08, 4), 0, Request, 0x10, 4); // Subblock length = length of chunk + 0x08
+
+            Buffer.BlockCopy(BigEndian.GetBytes(FfuChunk.Length, 4), 0, Request, 0x14, 4); // Payload length = length of chunk
+            Request[0x18] = Options; // Data options = 0 (1 = verify)
+
+            Buffer.BlockCopy(FfuChunk, 0, Request, 0x1C, FfuChunk.Length);
+
+            byte[] Response = ExecuteRawMethod(Request);
+            if (Response == null)
+            {
+                throw new BadConnectionException();
+            }
+
+            int ResultCode = (Response[6] << 8) + Response[7];
+            if (ResultCode != 0)
+            {
+                ThrowFlashError(ResultCode);
+            }
+        }
+
+        public void SendFfuPayloadV2(byte[] FfuChunk, int Progress = 0, byte Options = 0)
+        {
+            byte[] Request = new byte[FfuChunk.Length + 0x20];
+
+            const string Header = "NOKXFS";
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+            Buffer.BlockCopy(BigEndian.GetBytes((int)FfuProtocol.ProtocolSyncV2, 2), 0, Request, 0x06, 2); // Protocol
+            Request[0x08] = (byte)Progress; // Progress = 0% (0 - 100)
+            Request[0x0B] = 1; // Subblock count = 1
+
+            Buffer.BlockCopy(BigEndian.GetBytes(0x0000001B, 4), 0, Request, 0x0C, 4); // Subblock type for Payload v2 = 0x1B
+            Buffer.BlockCopy(BigEndian.GetBytes(FfuChunk.Length + 0x0C, 4), 0, Request, 0x10, 4); // Subblock length = length of chunk + 0x08
+
+            Buffer.BlockCopy(BigEndian.GetBytes(FfuChunk.Length, 4), 0, Request, 0x14, 4); // Payload length = length of chunk
+            Request[0x18] = Options; // Data options = 0 (1 = verify)
+
+            Buffer.BlockCopy(FfuChunk, 0, Request, 0x20, FfuChunk.Length);
+
+            byte[] Response = ExecuteRawMethod(Request);
+            if (Response == null)
+            {
+                throw new BadConnectionException();
+            }
+
+            int ResultCode = (Response[6] << 8) + Response[7];
+            if (ResultCode != 0)
+            {
+                ThrowFlashError(ResultCode);
+            }
+        }
+
+        public void SendFfuPayloadV3(byte[] FfuChunk, UInt32 WriteDescriptorIndex, UInt32 CRC, int Progress = 0, byte Options = 0)
+        {
+            byte[] Request = new byte[FfuChunk.Length + 0x20];
+
+            const string Header = "NOKXFS";
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+            Buffer.BlockCopy(BigEndian.GetBytes((int)FfuProtocol.ProtocolAsyncV3, 2), 0, Request, 0x06, 2); // Protocol
+            Request[0x08] = (byte)Progress; // Progress = 0% (0 - 100)
+            Request[0x0B] = 1; // Subblock count = 1
+
+            Buffer.BlockCopy(BigEndian.GetBytes(0x0000001D, 4), 0, Request, 0x0C, 4); // Subblock type for Payload v2 = 0x1B
+            Buffer.BlockCopy(BigEndian.GetBytes(FfuChunk.Length + 0x2C, 4), 0, Request, 0x10, 4); // Subblock length = length of chunk + 0x08
+
+            Buffer.BlockCopy(BigEndian.GetBytes(FfuChunk.Length, 4), 0, Request, 0x14, 4); // Payload length = length of chunk
+            Request[0x18] = Options; // Data options = 0 (1 = verify)
+            Buffer.BlockCopy(BigEndian.GetBytes(WriteDescriptorIndex, 4), 0, Request, 0x19, 4); // Payload length = length of chunk
+            Buffer.BlockCopy(BigEndian.GetBytes(CRC, 4), 0, Request, 0x1D, 4); // Payload length = length of chunk
+
+            Buffer.BlockCopy(FfuChunk, 0, Request, 0x40, FfuChunk.Length);
+
+            byte[] Response = ExecuteRawMethod(Request);
+            if (Response == null)
+            {
+                throw new BadConnectionException();
+            }
+
+            int ResultCode = (Response[6] << 8) + Response[7];
+            if (ResultCode != 0)
+            {
+                ThrowFlashError(ResultCode);
+            }
+        }
+
+        public void BackupPartitionToRam(string PartitionName)
+        {
+            PartitionName = PartitionName.ToUpper();
+            if (new string[] { "MODEM_FSG", "MODEM_FS1", "MODEM_FS2", "SSD", "DPP" }.Any(s => s == PartitionName))
+            {
+                byte[] Request = new byte[84];
+                const string Header = "NOKXFB";
+                Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+                Request[0x07] = 1; // Subblock count = 1
+                Request[0x08] = 6; // Subblock ID = 6 = Create Partition Backup to RAM
+                Buffer.BlockCopy(BigEndian.GetBytes(73, 2), 0, Request, 0x09, 2); // Subblock length = Length of data in subblock including fillers (subblock-ID-field and subblock-length-field are not counted for the subblock-length)
+                System.Text.Encoding.Unicode.GetBytes(PartitionName);
+
+                byte[] PartitionBytes = System.Text.Encoding.Unicode.GetBytes(PartitionName);
+                Buffer.BlockCopy(PartitionBytes, 0, Request, 0x0C, PartitionBytes.Length);
+                Request[0x0C + PartitionBytes.Length + 0x00] = 0; // Trailing zero
+                Request[0x0C + PartitionBytes.Length + 0x01] = 0;
+
+                byte[] Response = ExecuteRawMethod(Request);
+                int ResultCode = (Response[6] << 8) + Response[7];
+                if (ResultCode != 0)
+                {
+                    ThrowFlashError(ResultCode);
+                }
+            }
+            else
+            {
+                throw new WPinternalsException("Specified partition cannot be backupped to RAM", "Partition name: \"" + PartitionName + "\".");
+            }
+        }
+
+        public void LoadMmosBinary(UInt32 TotalLength, UInt32 Offset, bool SkipMmosSupportCheck, byte[] MmosPart)
+        {
+            byte[] Request = new byte[MmosPart.Length + 0x20];
+            const string Header = "NOKXFL";
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+            Request[0x07] = 1; // Subblock count = 1
+            Buffer.BlockCopy(BigEndian.GetBytes(0x0000001E, 4), 0, Request, 0x08, 4); // Subblock ID = Load MMOS Binary = 0x1E
+            Buffer.BlockCopy(BigEndian.GetBytes(MmosPart.Length + 0x10, 4), 0, Request, 0x0C, 4); // Subblock length = Payload-length + 0x10
+            Buffer.BlockCopy(BigEndian.GetBytes(TotalLength, 4), 0, Request, 0x10, 4);
+            Buffer.BlockCopy(BigEndian.GetBytes(Offset, 4), 0, Request, 0x14, 4);
+            if (SkipMmosSupportCheck)
+            {
+                Request[0x18] = 1;
+            }
+
+            Buffer.BlockCopy(BigEndian.GetBytes(MmosPart.Length, 4), 0, Request, 0x1C, 4);
+            Buffer.BlockCopy(MmosPart, 0, Request, 0x20, MmosPart.Length);
+
+            byte[] Response = ExecuteRawMethod(Request);
+            int ResultCode = (Response[6] << 8) + Response[7];
+            if (ResultCode != 0)
+            {
+                ThrowFlashError(ResultCode);
+            }
+        }
+
+        internal void SwitchToMmosContext()
+        {
+            byte[] Request = new byte[7];
+            ByteOperations.WriteAsciiString(Request, 0, "NOKXCBA");
+            ExecuteRawVoidMethod(Request);
+
+            ResetDevice();
+
+            Dispose(true);
+        }
+
+        private void ThrowFlashError(int ErrorCode)
+        {
+            string SubMessage = ErrorCode switch
+            {
+                0x0008 => "Unsupported protocol / Invalid options",
+                0x000F => "Invalid sub block count",
+                0x0010 => "Invalid sub block length",
+                0x0012 => "Authentication required",
+                0x000E => "Invalid sub block type",
+                0x0013 => "Failed async message",
+                0x1000 => "Invalid header type",
+                0x1001 => "FFU header contain unknown extra data",
+                0x0001 => "Couldn't allocate memory",
+                0x1106 => "Security header validation failed",
+                0x1105 => "Invalid hash table size",
+                0x1104 => "Invalid catalog size",
+                0x1103 => "Invalid chunk size",
+                0x1102 => "Unsupported algorithm",
+                0x1101 => "Invalid struct size",
+                0x1100 => "Invalid signature",
+                0x1202 => "Invalid struct size",
+                0x1203 => "Unsupported algorithm",
+                0x1204 => "Invalid chunk size",
+                0x1005 => "Data not aligned correctly",
+                0x0009 => "Locate protocol failed",
+                0x1003 => "Hash mismatch",
+                0x1006 => "Couldn't find hash from security header for index",
+                0x1004 => "Security header import missing / All FFU headers have not been imported",
+                0x1304 => "Invalid platform ID",
+                0x1307 => "Invalid write descriptor info",
+                0x1306 => "Invalid write descriptor info",
+                0x1305 => "Invalid block size",
+                0x1303 => "Unsupported FFU version",
+                0x1302 => "Unsupported struct version",
+                0x1301 => "Invalid update type",
+                0x100B => "Too much payload data, all data has already been written",
+                0x1008 => "Internal error",
+                0x1007 => "Payload data does not contain all data",
+                0x0004 => "Flash write failed",
+                0x000D => "Flash verify failed",
+                0x0002 => "Flash read failed",
+                _ => "Unknown error",
+            };
+            WPinternalsException Ex = new("Flash failed!");
+            Ex.SubMessage = "Error 0x" + ErrorCode.ToString("X4") + ": " + SubMessage;
+
+            throw Ex;
+        }
+
+        public void FlashFFU(string FFUPath, bool ResetAfterwards = true, byte Options = 0)
+        {
+            FlashFFU(new FFU(FFUPath), ResetAfterwards, Options);
+        }
+
+        public void FlashFFU(FFU FFU, bool ResetAfterwards = true, byte Options = 0)
+        {
+            FlashFFU(FFU, null, ResetAfterwards, Options);
+        }
+
+        public void FlashFFU(FFU FFU, ProgressUpdater UpdaterPerChunk, bool ResetAfterwards = true, byte Options = 0)
+        {
+            LogFile.BeginAction("FlashFFU");
+
+            ProgressUpdater Progress = UpdaterPerChunk;
+
+            PhoneInfo Info = ReadPhoneInfo();
+            if ((Info.SecureFfuSupportedProtocolMask & ((ushort)FfuProtocol.ProtocolSyncV1 | (ushort)FfuProtocol.ProtocolSyncV2)) == 0)
+            {
+                throw new WPinternalsException("Flash failed!", "Protocols not supported. The device reports that both Protocol Sync v1 and Protocol Sync v2 are not supported for FFU flashing. Is this an old device?");
+            }
+
+            UInt64 CombinedFFUHeaderSize = FFU.HeaderSize;
+            byte[] FfuHeader = new byte[CombinedFFUHeaderSize];
+            using (FileStream FfuFile = new(FFU.Path, FileMode.Open, FileAccess.Read))
+            {
+                FfuFile.Read(FfuHeader, 0, (int)CombinedFFUHeaderSize);
+                SendFfuHeaderV1(FfuHeader, Options);
+
+                UInt64 Position = CombinedFFUHeaderSize;
+                byte[] Payload;
+                int ChunkCount = 0;
+
+                if ((Info.SecureFfuSupportedProtocolMask & (ushort)FfuProtocol.ProtocolSyncV2) == 0)
+                {
+                    // Protocol v1
+                    Payload = new byte[FFU.ChunkSize];
+
+                    while (Position < (UInt64)FfuFile.Length)
+                    {
+                        FfuFile.Read(Payload, 0, Payload.Length);
+                        ChunkCount++;
+                        SendFfuPayloadV1(Payload, (int)((double)ChunkCount * 100 / FFU.TotalChunkCount), 0);
+                        Position += (ulong)Payload.Length;
+
+                        Progress?.IncreaseProgress(1);
+                    }
+                }
+                else
+                {
+                    // Protocol v2
+                    Payload = new byte[Info.WriteBufferSize];
+
+                    while (Position < (UInt64)FfuFile.Length)
+                    {
+                        UInt32 PayloadSize = Info.WriteBufferSize;
+                        if (((UInt64)FfuFile.Length - Position) < PayloadSize)
+                        {
+                            PayloadSize = (UInt32)((UInt64)FfuFile.Length - Position);
+                            Payload = new byte[PayloadSize];
+                        }
+
+                        FfuFile.Read(Payload, 0, (int)PayloadSize);
+                        ChunkCount += (int)(PayloadSize / FFU.ChunkSize);
+                        SendFfuPayloadV2(Payload, (int)((double)ChunkCount * 100 / FFU.TotalChunkCount), 0);
+                        Position += PayloadSize;
+
+                        Progress?.IncreaseProgress((ulong)(PayloadSize / FFU.ChunkSize));
+                    }
+                }
+            }
+
+            if (ResetAfterwards)
+            {
+                ResetPhone();
+            }
+
+            LogFile.EndAction("FlashFFU");
+        }
+
+        public void FlashMMOS(string MMOSPath, ProgressUpdater UpdaterPerChunk)
+        {
+            LogFile.BeginAction("FlashMMOS");
+
+            ProgressUpdater Progress = UpdaterPerChunk;
+
+            PhoneInfo Info = ReadPhoneInfo();
+            if (!Info.MmosOverUsbSupported)
+            {
+                throw new WPinternalsException("Flash failed!", "Protocols not supported. The device reports that loading Microsoft Manufacturing Operating System over USB is not supported.");
+            }
+
+            FileInfo info = new(MMOSPath);
+            uint length = uint.Parse(info.Length.ToString());
+
+            int offset = 0;
+            const int maximumbuffersize = 0x00240000;
+
+            uint totalcounts = (uint)Math.Truncate((decimal)length / maximumbuffersize);
+
+            using (FileStream MMOSFile = new(MMOSPath, FileMode.Open, FileAccess.Read))
+            {
+                for (int i = 1; i <= (uint)Math.Truncate((decimal)length / maximumbuffersize); i++)
+                {
+                    Progress.IncreaseProgress(1);
+                    byte[] data = new byte[maximumbuffersize];
+                    MMOSFile.Read(data, 0, maximumbuffersize);
+
+                    LoadMmosBinary(length, (uint)offset, false, data);
+
+                    offset += maximumbuffersize;
+                }
+
+                if (length - offset != 0)
+                {
+                    Progress.IncreaseProgress(1);
+
+                    byte[] data = new byte[length - offset];
+                    MMOSFile.Read(data, 0, (int)(length - offset));
+                    LoadMmosBinary(length, (uint)offset, false, data);
+                }
+
+                SwitchToMmosContext();
+                ResetPhone();
+            }
+
+            LogFile.EndAction("FlashMMOS");
+        }
+
+        public void FlashSectors(UInt32 StartSector, byte[] Data, int Progress = 0)
+        {
+            // Start sector is in UInt32, so max size of eMMC is 2 TB.
+
+            byte[] Request = new byte[Data.Length + 0x40];
+
+            const string Header = "NOKF";
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+            Request[0x05] = 0; // Device type = 0
+            Buffer.BlockCopy(BigEndian.GetBytes(StartSector, 4), 0, Request, 0x0B, 4); // Start sector
+            Buffer.BlockCopy(BigEndian.GetBytes(Data.Length / 0x200, 4), 0, Request, 0x0F, 4); // Sector count
+            Request[0x13] = (byte)Progress; // Progress (0 - 100)
+            Request[0x18] = 0; // Do Verify
+            Request[0x19] = 0; // Is Test
+
+            Buffer.BlockCopy(Data, 0, Request, 0x40, Data.Length);
+
+            ExecuteRawMethod(Request);
+        }
+
+        public void DisableRebootTimeOut()
+        {
+            byte[] Request = new byte[4];
+            const string Header = "NOKD";
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+            ExecuteRawMethod(Request);
+        }
+
+        public void Shutdown()
+        {
+            byte[] Request = new byte[4];
+            const string Header = "NOKZ";
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+            ExecuteRawMethod(Request);
+        }
+
+        public FlashVersion GetFlashVersion()
+        {
+            byte[] Response = ReadParam("FAI");
+            if ((Response == null) || (Response.Length < 6))
+            {
+                return null;
+            }
+
+            FlashVersion Result = new();
+
+            Result.ProtocolMajor = Response[1];
+            Result.ProtocolMinor = Response[2];
+            Result.ApplicationMajor = Response[3];
+            Result.ApplicationMinor = Response[4];
+
+            return Result;
+        }
+
+        internal GPT ReadGPT()
+        {
+            // If this function is used with a locked BootMgr v1, 
+            // then the mode-switching should be done outside this function, 
+            // because the context-switches that are used here are not supported on BootMgr v1.
+
+            // Only works in BootLoader-mode or on unlocked bootloaders in Flash-mode!!
+
+            PhoneInfo Info = ReadPhoneInfo(ExtendedInfo: false);
+            FlashAppType OriginalAppType = Info.App;
+            bool Switch = (Info.App != FlashAppType.BootManager) && Info.IsBootloaderSecure;
+            if (Switch)
+            {
+                SwitchToBootManagerContext();
+            }
+
+            byte[] Request = new byte[0x04];
+            const string Header = "NOKT";
+
+            System.Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+
+            byte[] Buffer = ExecuteRawMethod(Request);
+            if ((Buffer == null) || (Buffer.Length < 0x4408))
+            {
+                throw new InvalidOperationException("Unable to read GPT!");
+            }
+
+            UInt16 Error = (UInt16)((Buffer[6] << 8) + Buffer[7]);
+            if (Error > 0)
+            {
+                throw new NotSupportedException("ReadGPT: Error 0x" + Error.ToString("X4"));
+            }
+
+            byte[] GPTBuffer = new byte[Buffer.Length - 0x208];
+            System.Buffer.BlockCopy(Buffer, 0x208, GPTBuffer, 0, 0x4200);
+
+            if (Switch)
+            {
+                if (OriginalAppType == FlashAppType.FlashApp)
+                {
+                    SwitchToFlashAppContext();
+                }
+                else
+                {
+                    SwitchToPhoneInfoAppContext();
+                }
+            }
+
+            return new GPT(GPTBuffer);  // NOKT message header and MBR are ignored
+        }
+
+        internal void WriteGPT(GPT NewGPT)
+        {
+            bool? unlocked = IsBootLoaderUnlocked();
+            if (unlocked == false)
+            {
+                throw new InvalidOperationException("Bootloader is not unlocked!");
+            }
+
+            byte[] Buffer = NewGPT.Rebuild();
+
+            UInt32? HeaderOffset = ByteOperations.FindAscii(Buffer, "EFI PART");
+            if (HeaderOffset != 0)
+            {
+                throw new BadImageFormatException();
+            }
+
+            FlashSectors(1, Buffer);
+        }
+
+        internal void FlashRawPartition(string Path, string PartitionName)
+        {
+            FlashRawPartition(Path, null, PartitionName, null, null);
+        }
+
+        internal void FlashRawPartition(string Path, string PartitionName, Action<int, TimeSpan?> ProgressUpdateCallback)
+        {
+            FlashRawPartition(Path, null, PartitionName, ProgressUpdateCallback, null);
+        }
+
+        internal void FlashRawPartition(string Path, string PartitionName, ProgressUpdater UpdaterPerSector)
+        {
+            FlashRawPartition(Path, null, PartitionName, null, UpdaterPerSector);
+        }
+
+        internal void FlashRawPartition(Stream Stream, string PartitionName, ProgressUpdater UpdaterPerSector)
+        {
+            FlashRawPartition(null, Stream, PartitionName, null, UpdaterPerSector);
+        }
+
+        internal void FlashRawPartition(byte[] Buffer, string PartitionName, ProgressUpdater UpdaterPerSector)
+        {
+            FlashRawPartition(null, new MemoryStream(Buffer, false), PartitionName, null, UpdaterPerSector);
+        }
+
+        private void FlashRawPartition(string Path, Stream Stream, string PartitionName, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector)
+        {
+            bool? unlocked = IsBootLoaderUnlocked();
+            if (unlocked == false)
+            {
+                throw new InvalidOperationException("Bootloader is not unlocked!");
+            }
+
+            GPT GPT = ReadGPT();
+
+            Partition Partition = GPT.Partitions.First((p) => p.Name == PartitionName);
+            ulong PartitionSize = (Partition.LastSector - Partition.FirstSector + 1) * 0x200;
+
+            Stream InputStream = null;
+
+            if (Path != null)
+            {
+                InputStream = new DecompressedStream(File.Open(Path, FileMode.Open));
+            }
+            else if (Stream != null)
+            {
+                InputStream = Stream is DecompressedStream ? Stream : new DecompressedStream(Stream);
+            }
+
+            if (InputStream != null)
+            {
+                using (InputStream)
+                {
+                    UInt64? InputStreamLength = null;
+                    try
+                    {
+                        InputStreamLength = (UInt64)InputStream.Length;
+                    }
+                    catch { }
+
+                    if ((InputStreamLength != null) && ((UInt64)InputStream.Length > PartitionSize))
+                    {
+                        throw new InvalidOperationException("Partition can not be flashed, because its size is too big!");
+                    }
+
+                    ProgressUpdater Progress = UpdaterPerSector;
+                    if ((Progress == null) && (ProgressUpdateCallback != null) && (InputStreamLength != null))
+                    {
+                        Progress = new ProgressUpdater((UInt64)(InputStreamLength / 0x200), ProgressUpdateCallback);
+                    }
+
+                    int ProgressPercentage = 0;
+
+                    const int FlashBufferSize = 0x200000; // Flash 8 GB phone -> buffersize 0x200000 = 11:45 min, buffersize 0x20000 = 12:30 min
+                    byte[] FlashBuffer = new byte[FlashBufferSize];
+                    int BytesRead;
+                    UInt64 i = 0;
+                    do
+                    {
+                        BytesRead = InputStream.Read(FlashBuffer, 0, FlashBufferSize);
+
+                        byte[] FlashBufferFinalSize;
+                        if (BytesRead > 0)
+                        {
+                            if (BytesRead == FlashBufferSize)
+                            {
+                                FlashBufferFinalSize = FlashBuffer;
+                            }
+                            else
+                            {
+                                FlashBufferFinalSize = new byte[BytesRead];
+                                Buffer.BlockCopy(FlashBuffer, 0, FlashBufferFinalSize, 0, BytesRead);
+                            }
+
+                            FlashSectors((UInt32)(Partition.FirstSector + (i / 0x200)), FlashBufferFinalSize, ProgressPercentage);
+                        }
+
+                        if (Progress != null)
+                        {
+                            Progress.IncreaseProgress((UInt64)FlashBuffer.Length / 0x200);
+                            ProgressPercentage = Progress.ProgressPercentage;
+                        }
+
+                        i += FlashBufferSize;
+                    }
+                    while (BytesRead == FlashBufferSize);
+                }
+            }
+        }
+
+        internal void ErasePartition(string PartitionName)
+        {
+            // Partition "Data" can always be erased.
+            // Other partitions can only be erased when a valid RDC certificate is present or full SX authentication was performed.
+            if (PartitionName.Length > 0x23)
+            {
+                throw new ArgumentException("PartitionName cannot exceed 0x23 chars!");
+            }
+
+            byte[] Request = new byte[0x50];
+            const string Header = "NOKXFP";
+            Buffer.BlockCopy(System.Text.Encoding.ASCII.GetBytes(Header), 0, Request, 0, Header.Length);
+            Request[0x06] = 1; // Protocol version must be 1
+            Request[0x07] = 0; // Device type = 0
+
+            byte[] PartitionBytes = System.Text.Encoding.Unicode.GetBytes(PartitionName);
+            Buffer.BlockCopy(PartitionBytes, 0, Request, 8, PartitionBytes.Length);
+            Request[0x08 + PartitionBytes.Length + 0x00] = 0; // Trailing zero
+            Request[0x08 + PartitionBytes.Length + 0x01] = 0;
+
+            ExecuteRawMethod(Request);
+        }
+
+        internal FlashAppType GetFlashAppType()
+        {
+            byte[] Request = new byte[4];
+            ByteOperations.WriteAsciiString(Request, 0, "NOKV");
+            byte[] Response = ExecuteRawMethod(Request);
+            if ((Response == null) || (ByteOperations.ReadAsciiString(Response, 0, 4) == "NOKU"))
+            {
+                throw new NotSupportedException();
+            }
+
+            return (FlashAppType)Response[5];
+        }
+
+        internal PhoneInfo ReadPhoneInfo(bool ExtendedInfo = true)
+        {
+            // NOKH = Get Phone Info (IMEI and info from Product.dat) - Not available on some phones, like Lumia 640.
+            // NOKV = Info Query
+
+            bool PhoneInfoLogged = Info.State != PhoneInfoState.Empty;
+            PhoneInfo Result = Info;
+
+            if (Result.State == PhoneInfoState.Empty)
+            {
+                byte[] Request = new byte[4];
+                ByteOperations.WriteAsciiString(Request, 0, "NOKV");
+                byte[] Response = ExecuteRawMethod(Request);
+                if ((Response != null) && (ByteOperations.ReadAsciiString(Response, 0, 4) != "NOKU"))
+                {
+                    Result.App = (FlashAppType)Response[5];
+
+                    switch (Result.App)
+                    {
+                        case FlashAppType.BootManager:
+                            Result.BootManagerProtocolVersionMajor = Response[6];
+                            Result.BootManagerProtocolVersionMinor = Response[7];
+                            Result.BootManagerVersionMajor = Response[8];
+                            Result.BootManagerVersionMinor = Response[9];
+                            break;
+                        case FlashAppType.FlashApp:
+                            Result.FlashAppProtocolVersionMajor = Response[6];
+                            Result.FlashAppProtocolVersionMinor = Response[7];
+                            Result.FlashAppVersionMajor = Response[8];
+                            Result.FlashAppVersionMinor = Response[9];
+                            break;
+                        case FlashAppType.PhoneInfoApp:
+                            Result.PhoneInfoAppProtocolVersionMajor = Response[6];
+                            Result.PhoneInfoAppProtocolVersionMinor = Response[7];
+                            Result.PhoneInfoAppVersionMajor = Response[8];
+                            Result.PhoneInfoAppVersionMinor = Response[9];
+                            break;
+                    }
+
+                    byte SubblockCount = Response[10];
+                    int SubblockOffset = 11;
+
+                    for (int i = 0; i < SubblockCount; i++)
+                    {
+                        byte SubblockID = Response[SubblockOffset + 0x00];
+                        UInt16 SubblockLength = BigEndian.ToUInt16(Response, SubblockOffset + 0x01);
+                        int SubblockPayloadOffset = SubblockOffset + 3;
+                        byte SubblockVersion;
+                        switch (SubblockID)
+                        {
+                            case 0x01:
+                                Result.TransferSize = BigEndian.ToUInt32(Response, SubblockPayloadOffset);
+                                break;
+                            case 0x1F:
+                                Result.MmosOverUsbSupported = Response[SubblockPayloadOffset] == 1;
+                                break;
+                            case 0x04:
+                                if (Result.App == FlashAppType.BootManager)
+                                {
+                                    Result.FlashAppProtocolVersionMajor = Response[SubblockPayloadOffset + 0x00];
+                                    Result.FlashAppProtocolVersionMinor = Response[SubblockPayloadOffset + 0x01];
+                                    Result.FlashAppVersionMajor = Response[SubblockPayloadOffset + 0x02];
+                                    Result.FlashAppVersionMinor = Response[SubblockPayloadOffset + 0x03];
+                                }
+                                else if (Result.App == FlashAppType.FlashApp)
+                                {
+                                    Result.SdCardSizeInSectors = BigEndian.ToUInt32(Response, SubblockPayloadOffset);
+                                }
+                                break;
+                            case 0x02:
+                                Result.WriteBufferSize = BigEndian.ToUInt32(Response, SubblockPayloadOffset);
+                                break;
+                            case 0x03:
+                                Result.EmmcSizeInSectors = BigEndian.ToUInt32(Response, SubblockPayloadOffset);
+                                break;
+                            case 0x05:
+                                Result.PlatformID = ByteOperations.ReadAsciiString(Response, (uint)SubblockPayloadOffset, SubblockLength).Trim(new char[] { ' ', '\0' });
+                                break;
+                            case 0x0D:
+                                Result.AsyncSupport = Response[SubblockPayloadOffset + 1] == 1;
+                                break;
+                            case 0x0F:
+                                SubblockVersion = Response[SubblockPayloadOffset]; // 0x03
+                                Result.PlatformSecureBootEnabled = Response[SubblockPayloadOffset + 0x01] == 0x01;
+                                Result.SecureFfuEnabled = Response[SubblockPayloadOffset + 0x02] == 0x01;
+                                Result.JtagDisabled = Response[SubblockPayloadOffset + 0x03] == 0x01;
+                                Result.RdcPresent = Response[SubblockPayloadOffset + 0x04] == 0x01;
+                                Result.Authenticated = (Response[SubblockPayloadOffset + 0x05] == 0x01) || (Response[SubblockPayloadOffset + 0x05] == 0x02);
+                                Result.UefiSecureBootEnabled = Response[SubblockPayloadOffset + 0x06] == 0x01;
+                                Result.SecondaryHardwareKeyPresent = Response[SubblockPayloadOffset + 0x07] == 0x01;
+                                break;
+                            case 0x10:
+                                SubblockVersion = Response[SubblockPayloadOffset]; // 0x01
+                                Result.SecureFfuSupportedProtocolMask = BigEndian.ToUInt16(Response, SubblockPayloadOffset + 0x01);
+                                break;
+                            case 0x20:
+                                // CRC header info
+                                break;
+                        }
+                        SubblockOffset += SubblockLength + 3;
+                    }
+                }
+
+                Result.State = PhoneInfoState.Basic;
+            }
+
+            if (ExtendedInfo && (Result.State == PhoneInfoState.Basic))
+            {
+                FlashAppType OriginalType = Result.App;
+
+                try
+                {
+                    SwitchToPhoneInfoAppContext(); // May throw NotSupportedException
+
+                    Result.Type = ReadPhoneInfoVariable("TYPE");
+                    Result.ProductCode = ReadPhoneInfoVariable("CTR");
+                    Result.Imei = ReadPhoneInfoVariable("IMEI");
+
+                    SwitchToFlashAppContext();
+                    DisableRebootTimeOut();
+                }
+                catch { }
+
+                if (Result.App == FlashAppType.FlashApp)
+                {
+                    Result.Firmware = ReadStringParam("FVER");
+                    Result.RKH = ReadParam("RRKH");
+                }
+
+                try
+                {
+                    if (OriginalType == FlashAppType.BootManager)
+                    {
+                        SwitchToBootManagerContext();
+                    }
+                }
+                catch { }
+
+                Result.State = PhoneInfoState.Extended;
+            }
+
+            Result.IsBootloaderSecure = !(Info.Authenticated || Info.RdcPresent || !Info.SecureFfuEnabled);
+
+            if (!PhoneInfoLogged)
+            {
+                Result.Log(LogType.FileOnly);
+            }
+
+            return Result;
+        }
+
+        internal void ResetPhone()
+        {
+            LogFile.Log("Rebooting phone", LogType.FileAndConsole);
+            try
+            {
+                byte[] Request = new byte[4];
+                ByteOperations.WriteAsciiString(Request, 0, "NOKR");
+                ExecuteRawVoidMethod(Request);
+            }
+            catch
+            {
+                LogFile.Log("Sending reset-request failed", LogType.FileOnly);
+                LogFile.Log("Assuming automatic reset already in progress", LogType.FileOnly);
+            }
+        }
+
+        internal void ContinueBoot()
+        {
+            LogFile.Log("Continue boot...");
+            byte[] Request = new byte[4];
+            ByteOperations.WriteAsciiString(Request, 0, "NOKA");
+            ExecuteRawVoidMethod(Request);
+        }
+
+        internal void ResetPhoneToFlashMode()
+        {
+            // This only works when the phone is in BootMgr mode. If it is already in FlashApp, it will not reboot. It only makes the phone unresponsive.
+            LogFile.Log("Rebooting phone to Flash mode...");
+            byte[] Request = new byte[4];
+            ByteOperations.WriteAsciiString(Request, 0, "NOKS");
+            ExecuteRawVoidMethod(Request);
+        }
+
+        internal void Hello()
+        {
+            byte[] Request = new byte[4];
+            ByteOperations.WriteAsciiString(Request, 0, "NOKI");
+            byte[] Response = ExecuteRawMethod(Request);
+            if (Response == null)
+            {
+                throw new BadConnectionException();
+            }
+
+            if (ByteOperations.ReadAsciiString(Response, 0, 4) != "NOKI")
+            {
+                throw new WPinternalsException("Bad response from phone!", "The phone did not answer properly to the Hello message sent.");
+            }
+        }
+
+        internal UInt16 ReadSecureFfuSupportedProtocolMask()
+        {
+            return BigEndian.ToUInt16(ReadParam("SFPI"), 0);
+        }
+
+        internal void SwitchToPhoneInfoAppContext()
+        {
+            byte[] Request = new byte[7];
+            ByteOperations.WriteAsciiString(Request, 0, "NOKXCBP");
+            byte[] Response = ExecuteRawMethod(Request);
+            if (ByteOperations.ReadAsciiString(Response, 0, 4) == "NOKU")
+            {
+                throw new NotSupportedException();
+            }
+
+            UInt16 Error = (UInt16)((Response[6] << 8) + Response[7]);
+            if (Error > 0)
+            {
+                throw new NotSupportedException("SwitchToPhoneInfoAppContext: Error 0x" + Error.ToString("X4"));
+            }
+
+            DisableRebootTimeOut();
+            Info.App = FlashAppType.PhoneInfoApp;
+            InterfaceChanged(PhoneInterfaces.Lumia_Flash);
+        }
+
+        internal void SwitchToFlashAppContext()
+        {
+            // SwitchToFlashAppContext() should only be used with BootMgr v2
+            // For switching from BootMgr to FlashApp, it will use NOKS
+            // That will switch to a charging state, whereas a normal context switch will not start charging
+            // The implementation of NOKS in BootMgr mode has changed in BootMgr v2
+            // It does not disconnect / reconnect anymore and the apptype is changed immediately
+            // NOKS still doesnt return a status
+
+            byte[] Request;
+
+            if (Info.State == PhoneInfoState.Empty)
+            {
+                ReadPhoneInfo(ExtendedInfo: false);
+            }
+
+            if (Info.App == FlashAppType.BootManager)
+            {
+                if (Info.FlashAppProtocolVersionMajor < 2)
+                {
+                    // A phone with Bootloader Spec A cannot be switched from BootMgr to FlashApp.
+                    // NOKS will make the phone unresponsive and let you wait for a new arrival, but that would require a PhoneNotifier and that is not available in this context.
+                    // And NOKXCBF is not supported at all.
+                    return;
+                }
+
+                Request = new byte[4];
+                ByteOperations.WriteAsciiString(Request, 0, "NOKS"); // This will let the phone charge
+                ExecuteRawVoidMethod(Request); // On phone with bootloader Spec A this triggers a reboot, so DisableRebootTimeOut() cannot be called immediately.
+            }
+            else if (Info.App == FlashAppType.PhoneInfoApp)
+            {
+                Request = new byte[7];
+                ByteOperations.WriteAsciiString(Request, 0, "NOKXCBF"); // This will stop charging the phone
+                byte[] Response = ExecuteRawMethod(Request);
+                if (ByteOperations.ReadAsciiString(Response, 0, 4) == "NOKU")
+                {
+                    throw new NotSupportedException();
+                }
+
+                UInt16 Error = (UInt16)((Response[6] << 8) + Response[7]);
+                if (Error > 0)
+                {
+                    throw new NotSupportedException("SwitchToFlashAppContext: Error 0x" + Error.ToString("X4"));
+                }
+            }
+
+            DisableRebootTimeOut();
+
+            Info.App = FlashAppType.FlashApp;
+
+            // If current Info class was retrieved while in BootMgr mode, then we need to invalidate this data, because it is incomplete. 
+            if (Info.PlatformID == null)
+            {
+                Info.State = PhoneInfoState.Empty;
+            }
+
+            InterfaceChanged(PhoneInterfaces.Lumia_Flash);
+        }
+
+        internal void SwitchToBootManagerContext(bool DisableTimeOut = true)
+        {
+            byte[] Request = new byte[7];
+            ByteOperations.WriteAsciiString(Request, 0, "NOKXCBB");
+            byte[] Response = ExecuteRawMethod(Request);
+            if (ByteOperations.ReadAsciiString(Response, 0, 4) == "NOKU")
+            {
+                throw new NotSupportedException();
+            }
+
+            UInt16 Error = (UInt16)((Response[6] << 8) + Response[7]);
+            if (Error > 0)
+            {
+                throw new NotSupportedException("SwitchToBootManagerContext: Error 0x" + Error.ToString("X4"));
+            }
+
+            if (DisableTimeOut)
+            {
+                DisableRebootTimeOut();
+            }
+
+            Info.App = FlashAppType.BootManager;
+            InterfaceChanged(PhoneInterfaces.Lumia_Bootloader);
+        }
+
+        internal string ReadPhoneInfoVariable(string VariableName)
+        {
+            // This function assumes the phone is in Phone Info App context
+
+            byte[] Request = new byte[16];
+            ByteOperations.WriteAsciiString(Request, 0, "NOKXPH" + VariableName + "\0"); // BTR or CTR, CTR is public ProductCode
+            byte[] Response = ExecuteRawMethod(Request);
+            UInt16 Length = BigEndian.ToUInt16(Response, 6);
+            return ByteOperations.ReadAsciiString(Response, 8, Length).Trim(new char[] { ' ', '\0' });
+        }
+
+        internal string ReadProductCode()
+        {
+            SwitchToPhoneInfoAppContext();
+            string Result = ReadPhoneInfoVariable("CTR");
+            SwitchToFlashAppContext();
+            return Result;
+        }
+
+        internal void StartAsyncFlash()
+        {
+            byte[] Request = new byte[14];
+            ByteOperations.WriteAsciiString(Request, 0, "NOKXFFS");
+            Request[8] = 1; // Protocol version must be 1
+            Request[9] = 0; // Protocol type must be 0
+            ExecuteRawMethod(Request);
+        }
+
+        internal void EndAsyncFlash()
+        {
+            byte[] Request = new byte[7];
+            ByteOperations.WriteAsciiString(Request, 0, "NOKXFFE");
+            ExecuteRawMethod(Request);
+        }
+
+        internal enum SecureBootKeyType : byte
+        {
+            Retail = 0,
+            Engineering = 1
+        }
+
+        internal void ProvisionSecureBootKeys(SecureBootKeyType KeyType) // Only for Flashmode, not BootManager mode.
+        {
+            byte[] Request = new byte[8];
+            ByteOperations.WriteAsciiString(Request, 0, "NOKXFK");
+            Request[6] = 0; // Options
+            Request[7] = (byte)KeyType;
+            byte[] Response = ExecuteRawMethod(Request);
+            UInt32 Status = ByteOperations.ReadUInt32(Response, 6);
+            if (Status != 0)
+            {
+                ThrowFlashError((int)Status);
+            }
+        }
+    }
+
+    internal enum FlashAppType
+    {
+        BootManager = 1,
+        FlashApp = 2,
+        PhoneInfoApp = 3
+    };
+
+    internal enum PhoneInfoState
+    {
+        Empty,
+        Basic,
+        Extended
+    };
+
+    internal class PhoneInfo
+    {
+        public PhoneInfoState State = PhoneInfoState.Empty;
+
+        public string Type;        // Extended info
+        public string ProductCode; // Extended info
+        public string Imei;        // Extended info
+        public string Firmware;    // Extended info
+        public byte[] RKH;         // Extended info
+
+        public FlashAppType App;
+
+        public byte FlashAppVersionMajor;
+        public byte FlashAppVersionMinor;
+        public byte FlashAppProtocolVersionMajor;
+        public byte FlashAppProtocolVersionMinor;
+
+        public byte BootManagerVersionMajor;
+        public byte BootManagerVersionMinor;
+        public byte BootManagerProtocolVersionMajor;
+        public byte BootManagerProtocolVersionMinor;
+
+        public byte PhoneInfoAppVersionMajor;
+        public byte PhoneInfoAppVersionMinor;
+        public byte PhoneInfoAppProtocolVersionMajor;
+        public byte PhoneInfoAppProtocolVersionMinor;
+
+        public UInt32 TransferSize;
+        public bool MmosOverUsbSupported;
+        public UInt32 SdCardSizeInSectors;
+        public UInt32 WriteBufferSize;
+        public UInt32 EmmcSizeInSectors;
+        public string PlatformID;
+        public UInt16 SecureFfuSupportedProtocolMask;
+        public bool AsyncSupport;
+
+        public bool PlatformSecureBootEnabled;
+        public bool SecureFfuEnabled;
+        public bool JtagDisabled;
+        public bool RdcPresent;
+        public bool Authenticated;
+        public bool UefiSecureBootEnabled;
+        public bool SecondaryHardwareKeyPresent;
+
+        public bool IsBootloaderSecure;
+
+        internal void Log(LogType Type)
+        {
+            if (State == PhoneInfoState.Extended)
+            {
+                if (this.Type != null)
+                {
+                    LogFile.Log("Phone type: " + this.Type, Type);
+                }
+
+                if (ProductCode != null)
+                {
+                    LogFile.Log("Product code: " + ProductCode, Type);
+                }
+
+                if (RKH != null)
+                {
+                    LogFile.Log("Root key hash: " + Converter.ConvertHexToString(RKH, ""), Type);
+                }
+
+                if (Firmware?.Length > 0)
+                {
+                    LogFile.Log("Firmware version: " + Firmware, Type);
+                }
+
+                if (Type != LogType.ConsoleOnly && (Imei != null))
+                {
+                    LogFile.Log("IMEI: " + Imei, LogType.FileOnly);
+                }
+            }
+
+            switch (App)
+            {
+                case FlashAppType.BootManager:
+                    LogFile.Log("Bootmanager: " + BootManagerVersionMajor + "." + BootManagerVersionMinor, Type);
+                    LogFile.Log("Bootmanager protocol: " + BootManagerProtocolVersionMajor + "." + BootManagerProtocolVersionMinor, Type);
+                    LogFile.Log("Flash app: " + FlashAppVersionMajor + "." + FlashAppVersionMinor, Type);
+                    LogFile.Log("Flash protocol: " + FlashAppProtocolVersionMajor + "." + FlashAppProtocolVersionMinor, Type);
+                    break;
+                case FlashAppType.FlashApp:
+                    LogFile.Log("Flash app: " + FlashAppVersionMajor + "." + FlashAppVersionMinor, Type);
+                    LogFile.Log("Flash protocol: " + FlashAppProtocolVersionMajor + "." + FlashAppProtocolVersionMinor, Type);
+                    break;
+                case FlashAppType.PhoneInfoApp:
+                    LogFile.Log("Phone info app: " + PhoneInfoAppVersionMajor + "." + PhoneInfoAppVersionMinor, Type);
+                    LogFile.Log("Phone info protocol: " + PhoneInfoAppProtocolVersionMajor + "." + PhoneInfoAppProtocolVersionMinor, Type);
+                    break;
+            }
+
+            LogFile.Log("SecureBoot: " + ((!PlatformSecureBootEnabled || !UefiSecureBootEnabled) ? "Disabled" : "Enabled") + " (Platform Secure Boot: " + (PlatformSecureBootEnabled ? "Enabled" : "Disabled") + ", UEFI Secure Boot: " + (UefiSecureBootEnabled ? "Enabled" : "Disabled") + ")", Type);
+
+            if ((Type == LogType.ConsoleOnly) || (Type == LogType.FileAndConsole))
+            {
+                LogFile.Log("Flash app security: " + (!IsBootloaderSecure ? "Disabled" : "Enabled"), LogType.ConsoleOnly);
+            }
+
+            if ((Type == LogType.FileOnly) || (Type == LogType.FileAndConsole))
+            {
+                LogFile.Log("Flash app security: " + (!IsBootloaderSecure ? "Disabled" : "Enabled") + " (FFU security: " + (SecureFfuEnabled ? "Enabled" : "Disabled") + ", RDC: " + (RdcPresent ? "Present" : "Not found") + ", Authenticated: " + (Authenticated ? "True" : "False") + ")", LogType.FileOnly);
+            }
+
+            LogFile.Log("JTAG: " + (JtagDisabled ? "Disabled" : "Enabled"), Type);
+        }
+    }
+
+    internal class UefiSecurityStatusResponse
+    {
+        public byte IsTestDevice;
+        public bool PlatformSecureBootStatus;
+        public bool SecureFfuEfuseStatus;
+        public bool DebugStatus;
+        public bool RdcStatus;
+        public bool AuthenticationStatus;
+        public bool UefiSecureBootStatus;
+        public bool CryptoHardwareKey;
+    }
+
+    internal class FlashVersion
+    {
+        public int ApplicationMajor;
+        public int ApplicationMinor;
+        public int ProtocolMajor;
+        public int ProtocolMinor;
+    }
+}
diff --git a/Models/NokiaPhoneModel.cs b/WPinternals/Models/NokiaPhoneModel.cs
similarity index 97%
rename from Models/NokiaPhoneModel.cs
rename to WPinternals/Models/NokiaPhoneModel.cs
index bea83eb..be2851d 100644
--- a/Models/NokiaPhoneModel.cs
+++ b/WPinternals/Models/NokiaPhoneModel.cs
@@ -1,412 +1,412 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using MadWizard.WinUSBNet;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-
-namespace WPinternals
-{
-    internal class NokiaPhoneModel : IDisposable
-    {
-        protected bool Disposed = false;
-        private readonly USBDevice Device = null;
-        private int MessageId = 0;
-        private readonly object UsbLock = new();
-
-        public NokiaPhoneModel(string DevicePath)
-        {
-            // Mass Storage device is not WinUSB
-            try
-            {
-                Device = new USBDevice(DevicePath);
-            }
-            catch { }
-        }
-
-        private JsonElement? ExecuteJsonMethodAsJsonToken(string JsonMethod, Dictionary<string, object> Params, string ResultElement)
-        {
-            byte[] Buffer;
-            int Length;
-
-            lock (UsbLock)
-            {
-                const string jsonrpc = "2.0";
-                int id = MessageId++;
-                string method = JsonMethod;
-                Dictionary<string, object> @params = new();
-                if (Params != null)
-                {
-                    foreach (KeyValuePair<string, object> Param in Params)
-                    {
-                        if (Param.Value is byte[] v)
-                        {
-                            @params.Add(Param.Key, v.Select(b => (int)b).ToArray()); // convert to int-array
-                        }
-                        else
-                        {
-                            @params.Add(Param.Key, Param.Value);
-                        }
-                    }
-                }
-                @params.Add("MessageVersion", 0);
-                string Request = JsonSerializer.Serialize(new { jsonrpc, id, method, @params });
-                Device.OutputPipe.Write(System.Text.Encoding.ASCII.GetBytes(Request));
-
-                Buffer = new byte[0x10000];
-                Length = Device.InputPipe.Read(Buffer);
-            }
-
-            JsonDocument ResultMessage = JsonDocument.Parse(System.Text.Encoding.ASCII.GetString(Buffer, 0, Length));
-
-            try
-            {
-                JsonElement? ResultToken = ResultMessage.RootElement.GetProperty("result");
-                if ((ResultToken == null) || (ResultElement == null))
-                {
-                    return null;
-                }
-
-                return ResultToken.Value.GetProperty(ResultElement);
-            }
-            catch
-            {
-                return null;
-            }
-        }
-
-        public void ExecuteJsonMethod(string JsonMethod, Dictionary<string, object> Params)
-        {
-            _ = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, null);
-        }
-
-        public string ExecuteJsonMethodAsString(string JsonMethod, Dictionary<string, object> Params, string ResultElement)
-        {
-            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, ResultElement);
-            if (Token == null)
-            {
-                return null;
-            }
-
-            return Token.Value.GetString();
-        }
-
-        public string ExecuteJsonMethodAsString(string JsonMethod, string ResultElement)
-        {
-            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, null, ResultElement);
-            if (Token == null)
-            {
-                return null;
-            }
-
-            return Token.Value.GetString();
-        }
-
-        public int ExecuteJsonMethodAsInteger(string JsonMethod, Dictionary<string, object> Params, string ResultElement)
-        {
-            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, ResultElement);
-            if (Token == null)
-            {
-                return 0;
-            }
-
-            return Token.Value.GetInt32();
-        }
-
-        public int ExecuteJsonMethodAsInteger(string JsonMethod, string ResultElement)
-        {
-            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, null, ResultElement);
-            if (Token == null)
-            {
-                return 0;
-            }
-
-            return Token.Value.GetInt32();
-        }
-
-        public byte[] ExecuteJsonMethodAsBytes(string JsonMethod, Dictionary<string, object> Params, string ResultElement)
-        {
-            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, ResultElement);
-            if (Token == null)
-            {
-                return null;
-            }
-
-            return Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray();
-        }
-
-        public byte[] ExecuteJsonMethodAsBytes(string JsonMethod, string ResultElement)
-        {
-            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, null, ResultElement);
-            if (Token == null)
-            {
-                return null;
-            }
-
-            return Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray();
-        }
-
-        public bool? ExecuteJsonMethodAsBoolean(string JsonMethod, string ResultElement)
-        {
-            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, null, ResultElement);
-            if (Token == null)
-            {
-                return null;
-            }
-
-            return Token.Value.GetBoolean();
-        }
-
-        public void ExecuteJsonMethodAsync(string JsonMethod, Dictionary<string, object> Params)
-        {
-            lock (UsbLock)
-            {
-                const string jsonrpc = "2.0";
-                int id = MessageId++;
-                string method = JsonMethod;
-                Dictionary<string, object> @params = new();
-                if (Params != null)
-                {
-                    foreach (KeyValuePair<string, object> Param in Params)
-                    {
-                        if (Param.Value is byte[] v)
-                        {
-                            @params.Add(Param.Key, v.Select(b => (int)b).ToArray()); // convert to int-array
-                        }
-                        else
-                        {
-                            @params.Add(Param.Key, Param.Value);
-                        }
-                    }
-                }
-                @params.Add("MessageVersion", 0);
-                string Request = JsonSerializer.Serialize(new { jsonrpc, id, method, @params });
-
-                byte[] OutBuffer = System.Text.Encoding.ASCII.GetBytes(Request);
-                Device.OutputPipe.BeginWrite(OutBuffer, 0, OutBuffer.Length, (AsyncResultWrite) => Device.OutputPipe.EndWrite(AsyncResultWrite), null);
-            }
-        }
-
-        public void ExecuteJsonMethodAsync(string JsonMethod)
-        {
-            ExecuteJsonMethod(JsonMethod, null);
-        }
-
-        public delegate void JsonMethodCallbackString(object State, string Result);
-
-        public void ExecuteJsonMethodAsStringAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackString Callback)
-        {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetRawText()));
-        }
-
-        public void ExecuteJsonMethodAsStringAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackString Callback)
-        {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetRawText()));
-        }
-
-        public delegate void JsonMethodCallbackBoolean(object State, bool Result);
-
-        public void ExecuteJsonMethodAsBooleanAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackBoolean Callback)
-        {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetBoolean()));
-        }
-
-        public void ExecuteJsonMethodAsBooleanAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackBoolean Callback)
-        {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetBoolean()));
-        }
-
-        public delegate void JsonMethodCallbackBytes(object State, byte[] Result);
-
-        public void ExecuteJsonMethodAsBytesAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackBytes Callback)
-        {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray()));
-        }
-
-        public void ExecuteJsonMethodAsBytesAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackBytes Callback)
-        {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray()));
-        }
-
-        public delegate void JsonMethodCallbackInteger(object State, int Result);
-
-        public void ExecuteJsonMethodAsIntegerAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackInteger Callback)
-        {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetInt32()));
-        }
-
-        public void ExecuteJsonMethodAsIntegerAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackInteger Callback)
-        {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetInt32()));
-        }
-
-        public delegate void JsonMethodCallbackToken(object State, JsonElement? Result);
-
-        public void ExecuteJsonMethodAsTokenAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackToken Callback)
-        {
-            byte[] Buffer;
-            int Length;
-
-            lock (UsbLock)
-            {
-                const string jsonrpc = "2.0";
-                int id = MessageId++;
-                string method = JsonMethod;
-                Dictionary<string, object> @params = new();
-                if (Params != null)
-                {
-                    foreach (KeyValuePair<string, object> Param in Params)
-                    {
-                        if (Param.Value is byte[] v)
-                        {
-                            @params.Add(Param.Key, v.Select(b => (int)b).ToArray()); // convert to int-array
-                        }
-                        else
-                        {
-                            @params.Add(Param.Key, Param.Value);
-                        }
-                    }
-                }
-                @params.Add("MessageVersion", 0);
-                string Request = JsonSerializer.Serialize(new { jsonrpc, id, method, @params });
-
-                byte[] OutBuffer = System.Text.Encoding.ASCII.GetBytes(Request);
-                Device.OutputPipe.BeginWrite(OutBuffer, 0, OutBuffer.Length, (AsyncResultWrite) =>
-                    {
-                        Device.OutputPipe.EndWrite(AsyncResultWrite);
-                        Buffer = new byte[0x10000];
-                        Device.InputPipe.BeginRead(Buffer, 0, 0x10000, (AsyncResultRead) =>
-                            {
-                                Length = Device.InputPipe.EndRead(AsyncResultRead);
-
-                                JsonDocument ResultMessage = JsonDocument.Parse(System.Text.Encoding.ASCII.GetString(Buffer, 0, Length));
-
-                                JsonElement? ResultToken = ResultMessage.RootElement.GetProperty("result");
-                                if ((ResultToken == null) || (ResultElement == null))
-                                {
-                                    Callback(AsyncResultRead.AsyncState, null);
-                                }
-
-                                Callback(AsyncResultRead.AsyncState, ResultToken.Value.GetProperty(ResultElement));
-                            }, AsyncResultWrite.AsyncState);
-                    }, State);
-            }
-        }
-
-        public void ExecuteJsonMethodAsTokenAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackToken Callback)
-        {
-            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, Callback);
-        }
-
-        public byte[] ExecuteRawMethod(byte[] RawMethod)
-        {
-            return ExecuteRawMethod(RawMethod, RawMethod.Length);
-        }
-
-        public byte[] ExecuteRawMethod(byte[] RawMethod, int Length)
-        {
-            byte[] Buffer = new byte[0x8000]; // Should be at least 0x4408 for receiving the GPT packet.
-            byte[] Result = null;
-            lock (UsbLock)
-            {
-                Device.OutputPipe.Write(RawMethod, 0, Length);
-                try
-                {
-                    int OutputLength = Device.InputPipe.Read(Buffer);
-                    Result = new byte[OutputLength];
-                    System.Buffer.BlockCopy(Buffer, 0, Result, 0, OutputLength);
-                }
-                catch { } // Reboot command looses connection
-            }
-            return Result;
-        }
-
-        public void ExecuteRawVoidMethod(byte[] RawMethod)
-        {
-            ExecuteRawVoidMethod(RawMethod, RawMethod.Length);
-        }
-
-        public void ExecuteRawVoidMethod(byte[] RawMethod, int Length)
-        {
-            lock (UsbLock)
-            {
-                Device.OutputPipe.Write(RawMethod, 0, Length);
-            }
-        }
-
-        public void ResetDevice()
-        {
-            try
-            {
-                foreach (var pipe in Device.Pipes)
-                {
-                    pipe.Abort();
-                    pipe.Reset();
-                }
-            }
-            catch { }
-        }
-
-        /// <summary>
-        /// Disposes the UsbDevice including all unmanaged WinUSB handles. This function
-        /// should be called when the UsbDevice object is no longer in use, otherwise
-        /// unmanaged handles will remain open until the garbage collector finalizes the
-        /// object.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Finalizer for the UsbDevice. Disposes all unmanaged handles.
-        /// </summary>
-        ~NokiaPhoneModel()
-        {
-            Dispose(false);
-        }
-
-        /// <summary>
-        /// Disposes the object
-        /// </summary>
-        /// <param name="disposing">Indicates wether Dispose was called manually (true) or by
-        /// the garbage collector (false) via the destructor.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (Disposed)
-            {
-                return;
-            }
-
-            if (disposing)
-            {
-                Device?.Dispose();
-            }
-
-            // Clean unmanaged resources here.
-            // (none currently)
-
-            Disposed = true;
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using MadWizard.WinUSBNet;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.Json;
+
+namespace WPinternals
+{
+    internal class NokiaPhoneModel : IDisposable
+    {
+        protected bool Disposed = false;
+        private readonly USBDevice Device = null;
+        private int MessageId = 0;
+        private readonly object UsbLock = new();
+
+        public NokiaPhoneModel(string DevicePath)
+        {
+            // Mass Storage device is not WinUSB
+            try
+            {
+                Device = new USBDevice(DevicePath);
+            }
+            catch { }
+        }
+
+        private JsonElement? ExecuteJsonMethodAsJsonToken(string JsonMethod, Dictionary<string, object> Params, string ResultElement)
+        {
+            byte[] Buffer;
+            int Length;
+
+            lock (UsbLock)
+            {
+                const string jsonrpc = "2.0";
+                int id = MessageId++;
+                string method = JsonMethod;
+                Dictionary<string, object> @params = new();
+                if (Params != null)
+                {
+                    foreach (KeyValuePair<string, object> Param in Params)
+                    {
+                        if (Param.Value is byte[] v)
+                        {
+                            @params.Add(Param.Key, v.Select(b => (int)b).ToArray()); // convert to int-array
+                        }
+                        else
+                        {
+                            @params.Add(Param.Key, Param.Value);
+                        }
+                    }
+                }
+                @params.Add("MessageVersion", 0);
+                string Request = JsonSerializer.Serialize(new { jsonrpc, id, method, @params });
+                Device.OutputPipe.Write(System.Text.Encoding.ASCII.GetBytes(Request));
+
+                Buffer = new byte[0x10000];
+                Length = Device.InputPipe.Read(Buffer);
+            }
+
+            JsonDocument ResultMessage = JsonDocument.Parse(System.Text.Encoding.ASCII.GetString(Buffer, 0, Length));
+
+            try
+            {
+                JsonElement? ResultToken = ResultMessage.RootElement.GetProperty("result");
+                if ((ResultToken == null) || (ResultElement == null))
+                {
+                    return null;
+                }
+
+                return ResultToken.Value.GetProperty(ResultElement);
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public void ExecuteJsonMethod(string JsonMethod, Dictionary<string, object> Params)
+        {
+            _ = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, null);
+        }
+
+        public string ExecuteJsonMethodAsString(string JsonMethod, Dictionary<string, object> Params, string ResultElement)
+        {
+            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, ResultElement);
+            if (Token == null)
+            {
+                return null;
+            }
+
+            return Token.Value.GetString();
+        }
+
+        public string ExecuteJsonMethodAsString(string JsonMethod, string ResultElement)
+        {
+            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, null, ResultElement);
+            if (Token == null)
+            {
+                return null;
+            }
+
+            return Token.Value.GetString();
+        }
+
+        public int ExecuteJsonMethodAsInteger(string JsonMethod, Dictionary<string, object> Params, string ResultElement)
+        {
+            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, ResultElement);
+            if (Token == null)
+            {
+                return 0;
+            }
+
+            return Token.Value.GetInt32();
+        }
+
+        public int ExecuteJsonMethodAsInteger(string JsonMethod, string ResultElement)
+        {
+            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, null, ResultElement);
+            if (Token == null)
+            {
+                return 0;
+            }
+
+            return Token.Value.GetInt32();
+        }
+
+        public byte[] ExecuteJsonMethodAsBytes(string JsonMethod, Dictionary<string, object> Params, string ResultElement)
+        {
+            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, Params, ResultElement);
+            if (Token == null)
+            {
+                return null;
+            }
+
+            return Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray();
+        }
+
+        public byte[] ExecuteJsonMethodAsBytes(string JsonMethod, string ResultElement)
+        {
+            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, null, ResultElement);
+            if (Token == null)
+            {
+                return null;
+            }
+
+            return Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray();
+        }
+
+        public bool? ExecuteJsonMethodAsBoolean(string JsonMethod, string ResultElement)
+        {
+            JsonElement? Token = ExecuteJsonMethodAsJsonToken(JsonMethod, null, ResultElement);
+            if (Token == null)
+            {
+                return null;
+            }
+
+            return Token.Value.GetBoolean();
+        }
+
+        public void ExecuteJsonMethodAsync(string JsonMethod, Dictionary<string, object> Params)
+        {
+            lock (UsbLock)
+            {
+                const string jsonrpc = "2.0";
+                int id = MessageId++;
+                string method = JsonMethod;
+                Dictionary<string, object> @params = new();
+                if (Params != null)
+                {
+                    foreach (KeyValuePair<string, object> Param in Params)
+                    {
+                        if (Param.Value is byte[] v)
+                        {
+                            @params.Add(Param.Key, v.Select(b => (int)b).ToArray()); // convert to int-array
+                        }
+                        else
+                        {
+                            @params.Add(Param.Key, Param.Value);
+                        }
+                    }
+                }
+                @params.Add("MessageVersion", 0);
+                string Request = JsonSerializer.Serialize(new { jsonrpc, id, method, @params });
+
+                byte[] OutBuffer = System.Text.Encoding.ASCII.GetBytes(Request);
+                Device.OutputPipe.BeginWrite(OutBuffer, 0, OutBuffer.Length, (AsyncResultWrite) => Device.OutputPipe.EndWrite(AsyncResultWrite), null);
+            }
+        }
+
+        public void ExecuteJsonMethodAsync(string JsonMethod)
+        {
+            ExecuteJsonMethod(JsonMethod, null);
+        }
+
+        public delegate void JsonMethodCallbackString(object State, string Result);
+
+        public void ExecuteJsonMethodAsStringAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackString Callback)
+        {
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetRawText()));
+        }
+
+        public void ExecuteJsonMethodAsStringAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackString Callback)
+        {
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetRawText()));
+        }
+
+        public delegate void JsonMethodCallbackBoolean(object State, bool Result);
+
+        public void ExecuteJsonMethodAsBooleanAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackBoolean Callback)
+        {
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetBoolean()));
+        }
+
+        public void ExecuteJsonMethodAsBooleanAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackBoolean Callback)
+        {
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetBoolean()));
+        }
+
+        public delegate void JsonMethodCallbackBytes(object State, byte[] Result);
+
+        public void ExecuteJsonMethodAsBytesAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackBytes Callback)
+        {
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray()));
+        }
+
+        public void ExecuteJsonMethodAsBytesAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackBytes Callback)
+        {
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.EnumerateArray().Select(x => x.GetByte()).ToArray()));
+        }
+
+        public delegate void JsonMethodCallbackInteger(object State, int Result);
+
+        public void ExecuteJsonMethodAsIntegerAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackInteger Callback)
+        {
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, Params, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetInt32()));
+        }
+
+        public void ExecuteJsonMethodAsIntegerAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackInteger Callback)
+        {
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, (ReturnState, Token) => Callback(ReturnState, Token.Value.GetInt32()));
+        }
+
+        public delegate void JsonMethodCallbackToken(object State, JsonElement? Result);
+
+        public void ExecuteJsonMethodAsTokenAsync(string JsonMethod, Dictionary<string, object> Params, string ResultElement, object State, JsonMethodCallbackToken Callback)
+        {
+            byte[] Buffer;
+            int Length;
+
+            lock (UsbLock)
+            {
+                const string jsonrpc = "2.0";
+                int id = MessageId++;
+                string method = JsonMethod;
+                Dictionary<string, object> @params = new();
+                if (Params != null)
+                {
+                    foreach (KeyValuePair<string, object> Param in Params)
+                    {
+                        if (Param.Value is byte[] v)
+                        {
+                            @params.Add(Param.Key, v.Select(b => (int)b).ToArray()); // convert to int-array
+                        }
+                        else
+                        {
+                            @params.Add(Param.Key, Param.Value);
+                        }
+                    }
+                }
+                @params.Add("MessageVersion", 0);
+                string Request = JsonSerializer.Serialize(new { jsonrpc, id, method, @params });
+
+                byte[] OutBuffer = System.Text.Encoding.ASCII.GetBytes(Request);
+                Device.OutputPipe.BeginWrite(OutBuffer, 0, OutBuffer.Length, (AsyncResultWrite) =>
+                    {
+                        Device.OutputPipe.EndWrite(AsyncResultWrite);
+                        Buffer = new byte[0x10000];
+                        Device.InputPipe.BeginRead(Buffer, 0, 0x10000, (AsyncResultRead) =>
+                            {
+                                Length = Device.InputPipe.EndRead(AsyncResultRead);
+
+                                JsonDocument ResultMessage = JsonDocument.Parse(System.Text.Encoding.ASCII.GetString(Buffer, 0, Length));
+
+                                JsonElement? ResultToken = ResultMessage.RootElement.GetProperty("result");
+                                if ((ResultToken == null) || (ResultElement == null))
+                                {
+                                    Callback(AsyncResultRead.AsyncState, null);
+                                }
+
+                                Callback(AsyncResultRead.AsyncState, ResultToken.Value.GetProperty(ResultElement));
+                            }, AsyncResultWrite.AsyncState);
+                    }, State);
+            }
+        }
+
+        public void ExecuteJsonMethodAsTokenAsync(string JsonMethod, string ResultElement, object State, JsonMethodCallbackToken Callback)
+        {
+            ExecuteJsonMethodAsTokenAsync(JsonMethod, null, ResultElement, State, Callback);
+        }
+
+        public byte[] ExecuteRawMethod(byte[] RawMethod)
+        {
+            return ExecuteRawMethod(RawMethod, RawMethod.Length);
+        }
+
+        public byte[] ExecuteRawMethod(byte[] RawMethod, int Length)
+        {
+            byte[] Buffer = new byte[0x8000]; // Should be at least 0x4408 for receiving the GPT packet.
+            byte[] Result = null;
+            lock (UsbLock)
+            {
+                Device.OutputPipe.Write(RawMethod, 0, Length);
+                try
+                {
+                    int OutputLength = Device.InputPipe.Read(Buffer);
+                    Result = new byte[OutputLength];
+                    System.Buffer.BlockCopy(Buffer, 0, Result, 0, OutputLength);
+                }
+                catch { } // Reboot command looses connection
+            }
+            return Result;
+        }
+
+        public void ExecuteRawVoidMethod(byte[] RawMethod)
+        {
+            ExecuteRawVoidMethod(RawMethod, RawMethod.Length);
+        }
+
+        public void ExecuteRawVoidMethod(byte[] RawMethod, int Length)
+        {
+            lock (UsbLock)
+            {
+                Device.OutputPipe.Write(RawMethod, 0, Length);
+            }
+        }
+
+        public void ResetDevice()
+        {
+            try
+            {
+                foreach (var pipe in Device.Pipes)
+                {
+                    pipe.Abort();
+                    pipe.Reset();
+                }
+            }
+            catch { }
+        }
+
+        /// <summary>
+        /// Disposes the UsbDevice including all unmanaged WinUSB handles. This function
+        /// should be called when the UsbDevice object is no longer in use, otherwise
+        /// unmanaged handles will remain open until the garbage collector finalizes the
+        /// object.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Finalizer for the UsbDevice. Disposes all unmanaged handles.
+        /// </summary>
+        ~NokiaPhoneModel()
+        {
+            Dispose(false);
+        }
+
+        /// <summary>
+        /// Disposes the object
+        /// </summary>
+        /// <param name="disposing">Indicates wether Dispose was called manually (true) or by
+        /// the garbage collector (false) via the destructor.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                Device?.Dispose();
+            }
+
+            // Clean unmanaged resources here.
+            // (none currently)
+
+            Disposed = true;
+        }
+    }
+}
diff --git a/Models/PatchEngine.cs b/WPinternals/Models/PatchEngine.cs
similarity index 97%
rename from Models/PatchEngine.cs
rename to WPinternals/Models/PatchEngine.cs
index a8e7f44..3fe56a0 100644
--- a/Models/PatchEngine.cs
+++ b/WPinternals/Models/PatchEngine.cs
@@ -1,609 +1,609 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.AccessControl;
-using System.Security.Cryptography;
-using System.Security.Principal;
-using System.Xml;
-using System.Xml.Serialization;
-
-namespace WPinternals
-{
-    internal class PatchEngine
-    {
-        internal List<PatchDefinition> PatchDefinitions = new();
-        internal readonly List<TargetRedirection> TargetRedirections = new();
-
-        internal PatchEngine() { }
-
-        internal PatchEngine(string PatchDefinitionsXmlString)
-        {
-            XmlSerializer x = new(PatchDefinitions.GetType(), null, Array.Empty<Type>(), new XmlRootAttribute("PatchDefinitions"), "");
-            MemoryStream s = new(System.Text.Encoding.ASCII.GetBytes(PatchDefinitionsXmlString));
-            PatchDefinitions = (List<PatchDefinition>)x.Deserialize(s);
-        }
-
-        internal void WriteDefinitions(string FilePath)
-        {
-            XmlSerializer x = new(PatchDefinitions.GetType(), null, Array.Empty<Type>(), new XmlRootAttribute("PatchDefinitions"), "");
-
-            XmlSerializerNamespaces ns = new();
-            ns.Add("", "");
-
-            StreamWriter FileWriter = new(FilePath);
-            XmlWriter XmlWriter = XmlWriter.Create(FileWriter, new XmlWriterSettings() { OmitXmlDeclaration = true, Indent = true, NewLineHandling = NewLineHandling.Entitize });
-
-            FileWriter.WriteLine("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
-            FileWriter.WriteLine("");
-            FileWriter.WriteLine("<!--");
-            FileWriter.WriteLine("Copyright(c) 2018, Rene Lergner - @Heathcliff74xda");
-            FileWriter.WriteLine("");
-            FileWriter.WriteLine("Permission is hereby granted, free of charge, to any person obtaining a");
-            FileWriter.WriteLine("copy of this software and associated documentation files(the \"Software\"),");
-            FileWriter.WriteLine("to deal in the Software without restriction, including without limitation");
-            FileWriter.WriteLine("the rights to use, copy, modify, merge, publish, distribute, sublicense,");
-            FileWriter.WriteLine("and / or sell copies of the Software, and to permit persons to whom the");
-            FileWriter.WriteLine("Software is furnished to do so, subject to the following conditions:");
-            FileWriter.WriteLine("");
-            FileWriter.WriteLine("The above copyright notice and this permission notice shall be included in");
-            FileWriter.WriteLine("all copies or substantial portions of the Software.");
-            FileWriter.WriteLine("");
-            FileWriter.WriteLine("THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR");
-            FileWriter.WriteLine("IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,");
-            FileWriter.WriteLine("FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE");
-            FileWriter.WriteLine("AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER");
-            FileWriter.WriteLine("LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING");
-            FileWriter.WriteLine("FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER");
-            FileWriter.WriteLine("DEALINGS IN THE SOFTWARE.");
-            FileWriter.WriteLine("-->");
-            FileWriter.WriteLine("");
-
-            x.Serialize(XmlWriter, PatchDefinitions, ns);
-
-            FileWriter.Close();
-        }
-
-        private string _TargetPath = null;
-        internal string TargetPath
-        {
-            get
-            {
-                return _TargetPath;
-            }
-            set
-            {
-                _TargetPath = value.TrimEnd(new char[] { '\\' });
-            }
-        }
-
-        private DiscUtils.DiscFileSystem _TargetImage = null;
-        internal DiscUtils.DiscFileSystem TargetImage
-        {
-            get
-            {
-                return _TargetImage;
-            }
-            set
-            {
-                _TargetImage = value;
-                _TargetPath = "";
-            }
-        }
-
-        internal bool Patch(string PatchDefinition)
-        {
-            bool Result = false;
-            List<FilePatcher> LoadedFiles = new();
-
-            LogFile.Log("Attempt patch: " + PatchDefinition);
-
-            // Find a matching TargetVersion
-            PatchDefinition Definition = PatchDefinitions.Single(d => string.Equals(d.Name, PatchDefinition, StringComparison.CurrentCultureIgnoreCase));
-            TargetVersion MatchedVersion = null;
-            int VersionIndex = 0;
-            foreach (TargetVersion CurrentVersion in Definition.TargetVersions)
-            {
-                bool Match = true;
-                int FileIndex = 0;
-
-                foreach (TargetFile CurrentTargetFile in CurrentVersion.TargetFiles)
-                {
-                    // Determine target path
-                    string TargetPath = null;
-                    foreach (TargetRedirection CurrentRedirection in TargetRedirections)
-                    {
-                        if (CurrentTargetFile.Path.StartsWith(CurrentRedirection.RelativePath, StringComparison.OrdinalIgnoreCase))
-                        {
-                            TargetPath = Path.Combine(CurrentRedirection.TargetPath + "\\", CurrentTargetFile.Path);
-                            break;
-                        }
-                    }
-                    if (TargetPath == null)
-                    {
-                        TargetPath = Path.Combine(this.TargetPath + "\\", CurrentTargetFile.Path);
-                    }
-
-                    // Lookup file
-                    FilePatcher CurrentFile = LoadedFiles.SingleOrDefault(f => string.Equals(f.FilePath, TargetPath, StringComparison.CurrentCultureIgnoreCase));
-                    if (CurrentFile == null)
-                    {
-                        CurrentFile = (TargetImage != null) && (!TargetPath.Contains(':'))
-                            ? new FilePatcher(TargetPath, TargetImage.OpenFile(TargetPath, FileMode.Open, FileAccess.ReadWrite))
-                            : new FilePatcher(TargetPath);
-
-                        LoadedFiles.Add(CurrentFile);
-                    }
-
-                    // Compare hash
-                    if (!StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashOriginal) &&
-                        !StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashPatched))
-                    {
-                        Match = false;
-
-                        foreach (TargetFile CurrentObsoleteFile in CurrentTargetFile.Obsolete)
-                        {
-                            if (StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentObsoleteFile.HashPatched))
-                            {
-                                Match = true; // Found match after all. File is patched with an obsolete version of this patch.
-                                break;
-                            }
-                        }
-
-                        if (!Match)
-                        {
-                            LogFile.Log("Pattern: " + VersionIndex.ToString() + ", " + FileIndex.ToString());
-                            break;
-                        }
-                    }
-
-                    FileIndex++;
-                }
-
-                if (Match)
-                {
-                    MatchedVersion = CurrentVersion;
-                    break;
-                }
-
-                VersionIndex++;
-            }
-
-            if (MatchedVersion != null)
-            {
-                LogFile.Log("Apply: " + MatchedVersion.Description);
-
-                foreach (TargetFile CurrentTargetFile in MatchedVersion.TargetFiles)
-                {
-                    FilePatcher CurrentFile = LoadedFiles.SingleOrDefault(f => string.Equals(f.FilePath, Path.Combine(TargetPath + "\\", CurrentTargetFile.Path), StringComparison.CurrentCultureIgnoreCase));
-
-                    if (!StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashPatched))
-                    {
-                        CurrentFile.StartPatching();
-
-                        if (!StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashOriginal))
-                        {
-                            // File is already patched, but with an older version of this patch.
-                            // First unpatch back to original.
-
-                            foreach (TargetFile CurrentObsoleteFile in CurrentTargetFile.Obsolete)
-                            {
-                                if (StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentObsoleteFile.HashPatched))
-                                {
-                                    foreach (Patch CurrentPatch in CurrentObsoleteFile.Patches)
-                                    {
-                                        CurrentFile.ApplyPatch(CurrentPatch.Address, CurrentPatch.OriginalBytes);
-                                    }
-                                    break;
-                                }
-                            }
-                        }
-
-                        foreach (Patch CurrentPatch in CurrentTargetFile.Patches)
-                        {
-                            CurrentFile.ApplyPatch(CurrentPatch.Address, CurrentPatch.PatchedBytes);
-                        }
-
-                        CurrentFile.FinishPatching();
-                    }
-                }
-
-                Result = true;
-            }
-
-            return Result;
-        }
-
-        internal void Restore(string PatchDefinition)
-        {
-            List<FilePatcher> LoadedFiles = new();
-
-            try
-            {
-                // Find a matching TargetVersion
-                PatchDefinition Definition = PatchDefinitions.Single(d => string.Equals(d.Name, PatchDefinition, StringComparison.CurrentCultureIgnoreCase));
-                TargetVersion MatchedVersion = null;
-                foreach (TargetVersion CurrentVersion in Definition.TargetVersions)
-                {
-                    bool Match = true;
-
-                    foreach (TargetFile CurrentTargetFile in CurrentVersion.TargetFiles)
-                    {
-                        // Determine target path
-                        string TargetPath = null;
-                        foreach (TargetRedirection CurrentRedirection in TargetRedirections)
-                        {
-                            if (CurrentTargetFile.Path.StartsWith(CurrentRedirection.RelativePath, StringComparison.OrdinalIgnoreCase))
-                            {
-                                TargetPath = Path.Combine(CurrentRedirection.TargetPath, CurrentTargetFile.Path);
-                                break;
-                            }
-                        }
-                        if (TargetPath == null)
-                        {
-                            TargetPath = Path.Combine(this.TargetPath, CurrentTargetFile.Path);
-                        }
-
-                        // Lookup file
-                        FilePatcher CurrentFile = LoadedFiles.SingleOrDefault(f => string.Equals(f.FilePath, TargetPath, StringComparison.CurrentCultureIgnoreCase));
-                        if (CurrentFile == null)
-                        {
-                            CurrentFile = new FilePatcher(TargetPath);
-                            LoadedFiles.Add(CurrentFile);
-                        }
-
-                        // Compare hash
-                        if (!StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashOriginal) &&
-                            !StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashPatched))
-                        {
-                            Match = false;
-
-                            foreach (TargetFile CurrentObsoleteFile in CurrentTargetFile.Obsolete)
-                            {
-                                if (StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentObsoleteFile.HashPatched))
-                                {
-                                    Match = true; // Found match after all. File is patched with an obsolete version of this patch.
-                                    break;
-                                }
-                            }
-
-                            if (!Match)
-                            {
-                                break;
-                            }
-                        }
-                    }
-
-                    if (Match)
-                    {
-                        MatchedVersion = CurrentVersion;
-                        break;
-                    }
-                }
-
-                if (MatchedVersion != null)
-                {
-                    foreach (TargetFile CurrentTargetFile in MatchedVersion.TargetFiles)
-                    {
-                        FilePatcher CurrentFile = LoadedFiles.SingleOrDefault(f => string.Equals(f.FilePath, Path.Combine(TargetPath, CurrentTargetFile.Path), StringComparison.CurrentCultureIgnoreCase));
-
-                        if (!StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashOriginal))
-                        {
-                            CurrentFile.StartPatching();
-
-                            if (StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashPatched))
-                            {
-                                foreach (Patch CurrentPatch in CurrentTargetFile.Patches)
-                                {
-                                    CurrentFile.ApplyPatch(CurrentPatch.Address, CurrentPatch.OriginalBytes);
-                                }
-                            }
-                            else
-                            {
-                                foreach (TargetFile CurrentObsoleteFile in CurrentTargetFile.Obsolete)
-                                {
-                                    if (StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentObsoleteFile.HashPatched))
-                                    {
-                                        foreach (Patch CurrentPatch in CurrentObsoleteFile.Patches)
-                                        {
-                                            CurrentFile.ApplyPatch(CurrentPatch.Address, CurrentPatch.OriginalBytes);
-                                        }
-                                        break;
-                                    }
-                                }
-                            }
-
-                            CurrentFile.FinishPatching();
-                        }
-                    }
-                }
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex);
-            }
-        }
-    }
-
-    internal class TargetRedirection
-    {
-        private string _RelativePath;
-        private string _TargetPath;
-
-        internal TargetRedirection(string RelativePath, string TargetPath)
-        {
-            this.RelativePath = RelativePath;
-            this.TargetPath = TargetPath;
-        }
-
-        internal string RelativePath
-        {
-            get
-            {
-                return _RelativePath;
-            }
-            set
-            {
-                _RelativePath = value.TrimStart(new char[] { '\\' }).TrimEnd(new char[] { '\\' });
-            }
-        }
-
-        internal string TargetPath
-        {
-            get
-            {
-                return _TargetPath;
-            }
-            set
-            {
-                _TargetPath = value.TrimEnd(new char[] { '\\' });
-            }
-        }
-    }
-
-    internal class FilePatcher
-    {
-        internal byte[] Hash = null;
-        internal string FilePath;
-        internal FileSecurity OriginalACL;
-        internal Privilege TakeOwnershipPrivilege;
-        internal Privilege RestorePrivilege;
-        internal Stream Stream = null;
-
-        internal FilePatcher(string FilePath)
-        {
-            this.FilePath = FilePath;
-            using FileStream stream = File.OpenRead(FilePath);
-            SHA1Managed sha = new();
-            Hash = sha.ComputeHash(stream);
-        }
-
-        internal FilePatcher(string FilePath, Stream FileStream)
-        {
-            if (!FileStream.CanSeek || !FileStream.CanWrite)
-            {
-                throw new WPinternalsException("Incorrect filestream", "The provided file stream for patching does not support seeking and/or writing.");
-            }
-
-            this.FilePath = FilePath;
-            this.Stream = FileStream;
-            FileStream.Position = 0;
-            SHA1Managed sha = new();
-            Hash = sha.ComputeHash(FileStream);
-            FileStream.Position = 0;
-        }
-
-        internal void StartPatching()
-        {
-            if (FilePath.Contains(':'))
-            {
-                FileInfo fileInfo = new(FilePath);
-
-                // Enable Take Ownership AND Restore ownership to original owner
-                // Take Ownership Privilge is not enough.
-                // We need Restore Privilege.
-                RestorePrivilege = new Privilege(Privilege.Restore);
-                RestorePrivilege.Enable();
-
-                if ((Environment.OSVersion.Version.Major == 6) && (Environment.OSVersion.Version.Minor <= 1))
-                {
-                    // On Vista or 7
-                    TakeOwnershipPrivilege = new Privilege(Privilege.TakeOwnership);
-                    TakeOwnershipPrivilege.Enable();
-                }
-
-                // Backup original owner and ACL
-                OriginalACL = fileInfo.GetAccessControl();
-
-                // And take the original security to create new security rules.
-                FileSecurity NewACL = fileInfo.GetAccessControl();
-
-                // Take ownership
-                NewACL.SetOwner(WindowsIdentity.GetCurrent().User);
-                fileInfo.SetAccessControl(NewACL);
-
-                // And create a new access rule
-                NewACL.SetAccessRule(new FileSystemAccessRule(WindowsIdentity.GetCurrent().User, FileSystemRights.FullControl, AccessControlType.Allow));
-                fileInfo.SetAccessControl(NewACL);
-
-                // Open the file for patching
-                Stream = new FileStream(FilePath, FileMode.Open, FileAccess.ReadWrite);
-            }
-        }
-
-        internal void ApplyPatch(UInt32 Offset, byte[] Bytes)
-        {
-            Stream.Position = Offset;
-            Stream.Write(Bytes, 0, Bytes.Length);
-        }
-
-        internal void FinishPatching()
-        {
-            // Close file
-            Stream.Close();
-
-            if (FilePath.Contains(':'))
-            {
-                FileInfo fileInfo = new(FilePath);
-
-                // Restore original owner and access rules.
-                // The OriginalACL cannot be reused directly.
-                FileSecurity NewACL = fileInfo.GetAccessControl();
-                NewACL.SetSecurityDescriptorBinaryForm(OriginalACL.GetSecurityDescriptorBinaryForm());
-                fileInfo.SetAccessControl(NewACL);
-
-                // Revert to self
-                RestorePrivilege.Revert();
-                RestorePrivilege.Disable();
-
-                if ((Environment.OSVersion.Version.Major == 6) && (Environment.OSVersion.Version.Minor <= 1))
-                {
-                    // On Vista or 7
-                    TakeOwnershipPrivilege.Revert();
-                    TakeOwnershipPrivilege.Disable();
-                }
-            }
-        }
-    }
-
-    public class PatchDefinition // Must be public to be serializable
-    {
-        [XmlAttribute]
-        public string Name;
-
-        public List<TargetVersion> TargetVersions = new();
-    }
-
-    public class TargetVersion // Must be public to be serializable
-    {
-        [XmlAttribute]
-        public string Description;
-
-        public List<TargetFile> TargetFiles = new();
-    }
-
-    public class TargetFile // Must be public to be serializable
-    {
-        private string _Path;
-        [XmlAttribute]
-        public string Path
-        {
-            get
-            {
-                return _Path;
-            }
-            set
-            {
-                _Path = value.TrimStart(new char[] { '\\' });
-            }
-        }
-
-        [XmlIgnore]
-        public byte[] HashOriginal;
-        [XmlAttribute("HashOriginal")]
-        public string HashOriginalAsString
-        {
-            get
-            {
-                return Converter.ConvertHexToString(HashOriginal, "");
-            }
-            set
-            {
-                HashOriginal = Converter.ConvertStringToHex(value);
-            }
-        }
-
-        [XmlIgnore]
-        public byte[] HashPatched;
-        [XmlAttribute("HashPatched")]
-        public string HashPatchedAsString
-        {
-            get
-            {
-                return Converter.ConvertHexToString(HashPatched, "");
-            }
-            set
-            {
-                HashPatched = Converter.ConvertStringToHex(value);
-            }
-        }
-
-        public List<Patch> Patches = new();
-        public List<TargetFile> Obsolete = new();
-    }
-
-    public class Patch // Must be public to be serializable
-    {
-        [XmlIgnore]
-        public UInt32 Address;
-        [XmlAttribute("Address")]
-        public string AddressAsString
-        {
-            get
-            {
-                return "0x" + Address.ToString("X8");
-            }
-            set
-            {
-                string NewValue = value;
-                if (NewValue.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
-                {
-                    NewValue = NewValue[2..];
-                }
-
-                Address = Convert.ToUInt32(NewValue, 16);
-            }
-        }
-
-        [XmlIgnore]
-        public byte[] OriginalBytes;
-        [XmlAttribute("OriginalBytes")]
-        public string OriginalBytesAsString
-        {
-            get
-            {
-                return Converter.ConvertHexToString(OriginalBytes, "");
-            }
-            set
-            {
-                OriginalBytes = Converter.ConvertStringToHex(value);
-            }
-        }
-
-        [XmlIgnore]
-        public byte[] PatchedBytes;
-        [XmlAttribute("PatchedBytes")]
-        public string PatchedBytesAsString
-        {
-            get
-            {
-                return Converter.ConvertHexToString(PatchedBytes, "");
-            }
-            set
-            {
-                PatchedBytes = Converter.ConvertStringToHex(value);
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.AccessControl;
+using System.Security.Cryptography;
+using System.Security.Principal;
+using System.Xml;
+using System.Xml.Serialization;
+
+namespace WPinternals
+{
+    internal class PatchEngine
+    {
+        internal List<PatchDefinition> PatchDefinitions = new();
+        internal readonly List<TargetRedirection> TargetRedirections = new();
+
+        internal PatchEngine() { }
+
+        internal PatchEngine(string PatchDefinitionsXmlString)
+        {
+            XmlSerializer x = new(PatchDefinitions.GetType(), null, Array.Empty<Type>(), new XmlRootAttribute("PatchDefinitions"), "");
+            MemoryStream s = new(System.Text.Encoding.ASCII.GetBytes(PatchDefinitionsXmlString));
+            PatchDefinitions = (List<PatchDefinition>)x.Deserialize(s);
+        }
+
+        internal void WriteDefinitions(string FilePath)
+        {
+            XmlSerializer x = new(PatchDefinitions.GetType(), null, Array.Empty<Type>(), new XmlRootAttribute("PatchDefinitions"), "");
+
+            XmlSerializerNamespaces ns = new();
+            ns.Add("", "");
+
+            StreamWriter FileWriter = new(FilePath);
+            XmlWriter XmlWriter = XmlWriter.Create(FileWriter, new XmlWriterSettings() { OmitXmlDeclaration = true, Indent = true, NewLineHandling = NewLineHandling.Entitize });
+
+            FileWriter.WriteLine("<?xml version=\"1.0\" encoding=\"utf-8\"?>");
+            FileWriter.WriteLine("");
+            FileWriter.WriteLine("<!--");
+            FileWriter.WriteLine("Copyright(c) 2018, Rene Lergner - @Heathcliff74xda");
+            FileWriter.WriteLine("");
+            FileWriter.WriteLine("Permission is hereby granted, free of charge, to any person obtaining a");
+            FileWriter.WriteLine("copy of this software and associated documentation files(the \"Software\"),");
+            FileWriter.WriteLine("to deal in the Software without restriction, including without limitation");
+            FileWriter.WriteLine("the rights to use, copy, modify, merge, publish, distribute, sublicense,");
+            FileWriter.WriteLine("and / or sell copies of the Software, and to permit persons to whom the");
+            FileWriter.WriteLine("Software is furnished to do so, subject to the following conditions:");
+            FileWriter.WriteLine("");
+            FileWriter.WriteLine("The above copyright notice and this permission notice shall be included in");
+            FileWriter.WriteLine("all copies or substantial portions of the Software.");
+            FileWriter.WriteLine("");
+            FileWriter.WriteLine("THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR");
+            FileWriter.WriteLine("IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,");
+            FileWriter.WriteLine("FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE");
+            FileWriter.WriteLine("AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER");
+            FileWriter.WriteLine("LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING");
+            FileWriter.WriteLine("FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER");
+            FileWriter.WriteLine("DEALINGS IN THE SOFTWARE.");
+            FileWriter.WriteLine("-->");
+            FileWriter.WriteLine("");
+
+            x.Serialize(XmlWriter, PatchDefinitions, ns);
+
+            FileWriter.Close();
+        }
+
+        private string _TargetPath = null;
+        internal string TargetPath
+        {
+            get
+            {
+                return _TargetPath;
+            }
+            set
+            {
+                _TargetPath = value.TrimEnd(new char[] { '\\' });
+            }
+        }
+
+        private DiscUtils.DiscFileSystem _TargetImage = null;
+        internal DiscUtils.DiscFileSystem TargetImage
+        {
+            get
+            {
+                return _TargetImage;
+            }
+            set
+            {
+                _TargetImage = value;
+                _TargetPath = "";
+            }
+        }
+
+        internal bool Patch(string PatchDefinition)
+        {
+            bool Result = false;
+            List<FilePatcher> LoadedFiles = new();
+
+            LogFile.Log("Attempt patch: " + PatchDefinition);
+
+            // Find a matching TargetVersion
+            PatchDefinition Definition = PatchDefinitions.Single(d => string.Equals(d.Name, PatchDefinition, StringComparison.CurrentCultureIgnoreCase));
+            TargetVersion MatchedVersion = null;
+            int VersionIndex = 0;
+            foreach (TargetVersion CurrentVersion in Definition.TargetVersions)
+            {
+                bool Match = true;
+                int FileIndex = 0;
+
+                foreach (TargetFile CurrentTargetFile in CurrentVersion.TargetFiles)
+                {
+                    // Determine target path
+                    string TargetPath = null;
+                    foreach (TargetRedirection CurrentRedirection in TargetRedirections)
+                    {
+                        if (CurrentTargetFile.Path.StartsWith(CurrentRedirection.RelativePath, StringComparison.OrdinalIgnoreCase))
+                        {
+                            TargetPath = Path.Combine(CurrentRedirection.TargetPath + "\\", CurrentTargetFile.Path);
+                            break;
+                        }
+                    }
+                    if (TargetPath == null)
+                    {
+                        TargetPath = Path.Combine(this.TargetPath + "\\", CurrentTargetFile.Path);
+                    }
+
+                    // Lookup file
+                    FilePatcher CurrentFile = LoadedFiles.SingleOrDefault(f => string.Equals(f.FilePath, TargetPath, StringComparison.CurrentCultureIgnoreCase));
+                    if (CurrentFile == null)
+                    {
+                        CurrentFile = (TargetImage != null) && (!TargetPath.Contains(':'))
+                            ? new FilePatcher(TargetPath, TargetImage.OpenFile(TargetPath, FileMode.Open, FileAccess.ReadWrite))
+                            : new FilePatcher(TargetPath);
+
+                        LoadedFiles.Add(CurrentFile);
+                    }
+
+                    // Compare hash
+                    if (!StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashOriginal) &&
+                        !StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashPatched))
+                    {
+                        Match = false;
+
+                        foreach (TargetFile CurrentObsoleteFile in CurrentTargetFile.Obsolete)
+                        {
+                            if (StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentObsoleteFile.HashPatched))
+                            {
+                                Match = true; // Found match after all. File is patched with an obsolete version of this patch.
+                                break;
+                            }
+                        }
+
+                        if (!Match)
+                        {
+                            LogFile.Log("Pattern: " + VersionIndex.ToString() + ", " + FileIndex.ToString());
+                            break;
+                        }
+                    }
+
+                    FileIndex++;
+                }
+
+                if (Match)
+                {
+                    MatchedVersion = CurrentVersion;
+                    break;
+                }
+
+                VersionIndex++;
+            }
+
+            if (MatchedVersion != null)
+            {
+                LogFile.Log("Apply: " + MatchedVersion.Description);
+
+                foreach (TargetFile CurrentTargetFile in MatchedVersion.TargetFiles)
+                {
+                    FilePatcher CurrentFile = LoadedFiles.SingleOrDefault(f => string.Equals(f.FilePath, Path.Combine(TargetPath + "\\", CurrentTargetFile.Path), StringComparison.CurrentCultureIgnoreCase));
+
+                    if (!StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashPatched))
+                    {
+                        CurrentFile.StartPatching();
+
+                        if (!StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashOriginal))
+                        {
+                            // File is already patched, but with an older version of this patch.
+                            // First unpatch back to original.
+
+                            foreach (TargetFile CurrentObsoleteFile in CurrentTargetFile.Obsolete)
+                            {
+                                if (StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentObsoleteFile.HashPatched))
+                                {
+                                    foreach (Patch CurrentPatch in CurrentObsoleteFile.Patches)
+                                    {
+                                        CurrentFile.ApplyPatch(CurrentPatch.Address, CurrentPatch.OriginalBytes);
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+
+                        foreach (Patch CurrentPatch in CurrentTargetFile.Patches)
+                        {
+                            CurrentFile.ApplyPatch(CurrentPatch.Address, CurrentPatch.PatchedBytes);
+                        }
+
+                        CurrentFile.FinishPatching();
+                    }
+                }
+
+                Result = true;
+            }
+
+            return Result;
+        }
+
+        internal void Restore(string PatchDefinition)
+        {
+            List<FilePatcher> LoadedFiles = new();
+
+            try
+            {
+                // Find a matching TargetVersion
+                PatchDefinition Definition = PatchDefinitions.Single(d => string.Equals(d.Name, PatchDefinition, StringComparison.CurrentCultureIgnoreCase));
+                TargetVersion MatchedVersion = null;
+                foreach (TargetVersion CurrentVersion in Definition.TargetVersions)
+                {
+                    bool Match = true;
+
+                    foreach (TargetFile CurrentTargetFile in CurrentVersion.TargetFiles)
+                    {
+                        // Determine target path
+                        string TargetPath = null;
+                        foreach (TargetRedirection CurrentRedirection in TargetRedirections)
+                        {
+                            if (CurrentTargetFile.Path.StartsWith(CurrentRedirection.RelativePath, StringComparison.OrdinalIgnoreCase))
+                            {
+                                TargetPath = Path.Combine(CurrentRedirection.TargetPath, CurrentTargetFile.Path);
+                                break;
+                            }
+                        }
+                        if (TargetPath == null)
+                        {
+                            TargetPath = Path.Combine(this.TargetPath, CurrentTargetFile.Path);
+                        }
+
+                        // Lookup file
+                        FilePatcher CurrentFile = LoadedFiles.SingleOrDefault(f => string.Equals(f.FilePath, TargetPath, StringComparison.CurrentCultureIgnoreCase));
+                        if (CurrentFile == null)
+                        {
+                            CurrentFile = new FilePatcher(TargetPath);
+                            LoadedFiles.Add(CurrentFile);
+                        }
+
+                        // Compare hash
+                        if (!StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashOriginal) &&
+                            !StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashPatched))
+                        {
+                            Match = false;
+
+                            foreach (TargetFile CurrentObsoleteFile in CurrentTargetFile.Obsolete)
+                            {
+                                if (StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentObsoleteFile.HashPatched))
+                                {
+                                    Match = true; // Found match after all. File is patched with an obsolete version of this patch.
+                                    break;
+                                }
+                            }
+
+                            if (!Match)
+                            {
+                                break;
+                            }
+                        }
+                    }
+
+                    if (Match)
+                    {
+                        MatchedVersion = CurrentVersion;
+                        break;
+                    }
+                }
+
+                if (MatchedVersion != null)
+                {
+                    foreach (TargetFile CurrentTargetFile in MatchedVersion.TargetFiles)
+                    {
+                        FilePatcher CurrentFile = LoadedFiles.SingleOrDefault(f => string.Equals(f.FilePath, Path.Combine(TargetPath, CurrentTargetFile.Path), StringComparison.CurrentCultureIgnoreCase));
+
+                        if (!StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashOriginal))
+                        {
+                            CurrentFile.StartPatching();
+
+                            if (StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentTargetFile.HashPatched))
+                            {
+                                foreach (Patch CurrentPatch in CurrentTargetFile.Patches)
+                                {
+                                    CurrentFile.ApplyPatch(CurrentPatch.Address, CurrentPatch.OriginalBytes);
+                                }
+                            }
+                            else
+                            {
+                                foreach (TargetFile CurrentObsoleteFile in CurrentTargetFile.Obsolete)
+                                {
+                                    if (StructuralComparisons.StructuralEqualityComparer.Equals(CurrentFile.Hash, CurrentObsoleteFile.HashPatched))
+                                    {
+                                        foreach (Patch CurrentPatch in CurrentObsoleteFile.Patches)
+                                        {
+                                            CurrentFile.ApplyPatch(CurrentPatch.Address, CurrentPatch.OriginalBytes);
+                                        }
+                                        break;
+                                    }
+                                }
+                            }
+
+                            CurrentFile.FinishPatching();
+                        }
+                    }
+                }
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex);
+            }
+        }
+    }
+
+    internal class TargetRedirection
+    {
+        private string _RelativePath;
+        private string _TargetPath;
+
+        internal TargetRedirection(string RelativePath, string TargetPath)
+        {
+            this.RelativePath = RelativePath;
+            this.TargetPath = TargetPath;
+        }
+
+        internal string RelativePath
+        {
+            get
+            {
+                return _RelativePath;
+            }
+            set
+            {
+                _RelativePath = value.TrimStart(new char[] { '\\' }).TrimEnd(new char[] { '\\' });
+            }
+        }
+
+        internal string TargetPath
+        {
+            get
+            {
+                return _TargetPath;
+            }
+            set
+            {
+                _TargetPath = value.TrimEnd(new char[] { '\\' });
+            }
+        }
+    }
+
+    internal class FilePatcher
+    {
+        internal byte[] Hash = null;
+        internal string FilePath;
+        internal FileSecurity OriginalACL;
+        internal Privilege TakeOwnershipPrivilege;
+        internal Privilege RestorePrivilege;
+        internal Stream Stream = null;
+
+        internal FilePatcher(string FilePath)
+        {
+            this.FilePath = FilePath;
+            using FileStream stream = File.OpenRead(FilePath);
+            SHA1Managed sha = new();
+            Hash = sha.ComputeHash(stream);
+        }
+
+        internal FilePatcher(string FilePath, Stream FileStream)
+        {
+            if (!FileStream.CanSeek || !FileStream.CanWrite)
+            {
+                throw new WPinternalsException("Incorrect filestream", "The provided file stream for patching does not support seeking and/or writing.");
+            }
+
+            this.FilePath = FilePath;
+            this.Stream = FileStream;
+            FileStream.Position = 0;
+            SHA1Managed sha = new();
+            Hash = sha.ComputeHash(FileStream);
+            FileStream.Position = 0;
+        }
+
+        internal void StartPatching()
+        {
+            if (FilePath.Contains(':'))
+            {
+                FileInfo fileInfo = new(FilePath);
+
+                // Enable Take Ownership AND Restore ownership to original owner
+                // Take Ownership Privilge is not enough.
+                // We need Restore Privilege.
+                RestorePrivilege = new Privilege(Privilege.Restore);
+                RestorePrivilege.Enable();
+
+                if ((Environment.OSVersion.Version.Major == 6) && (Environment.OSVersion.Version.Minor <= 1))
+                {
+                    // On Vista or 7
+                    TakeOwnershipPrivilege = new Privilege(Privilege.TakeOwnership);
+                    TakeOwnershipPrivilege.Enable();
+                }
+
+                // Backup original owner and ACL
+                OriginalACL = fileInfo.GetAccessControl();
+
+                // And take the original security to create new security rules.
+                FileSecurity NewACL = fileInfo.GetAccessControl();
+
+                // Take ownership
+                NewACL.SetOwner(WindowsIdentity.GetCurrent().User);
+                fileInfo.SetAccessControl(NewACL);
+
+                // And create a new access rule
+                NewACL.SetAccessRule(new FileSystemAccessRule(WindowsIdentity.GetCurrent().User, FileSystemRights.FullControl, AccessControlType.Allow));
+                fileInfo.SetAccessControl(NewACL);
+
+                // Open the file for patching
+                Stream = new FileStream(FilePath, FileMode.Open, FileAccess.ReadWrite);
+            }
+        }
+
+        internal void ApplyPatch(UInt32 Offset, byte[] Bytes)
+        {
+            Stream.Position = Offset;
+            Stream.Write(Bytes, 0, Bytes.Length);
+        }
+
+        internal void FinishPatching()
+        {
+            // Close file
+            Stream.Close();
+
+            if (FilePath.Contains(':'))
+            {
+                FileInfo fileInfo = new(FilePath);
+
+                // Restore original owner and access rules.
+                // The OriginalACL cannot be reused directly.
+                FileSecurity NewACL = fileInfo.GetAccessControl();
+                NewACL.SetSecurityDescriptorBinaryForm(OriginalACL.GetSecurityDescriptorBinaryForm());
+                fileInfo.SetAccessControl(NewACL);
+
+                // Revert to self
+                RestorePrivilege.Revert();
+                RestorePrivilege.Disable();
+
+                if ((Environment.OSVersion.Version.Major == 6) && (Environment.OSVersion.Version.Minor <= 1))
+                {
+                    // On Vista or 7
+                    TakeOwnershipPrivilege.Revert();
+                    TakeOwnershipPrivilege.Disable();
+                }
+            }
+        }
+    }
+
+    public class PatchDefinition // Must be public to be serializable
+    {
+        [XmlAttribute]
+        public string Name;
+
+        public List<TargetVersion> TargetVersions = new();
+    }
+
+    public class TargetVersion // Must be public to be serializable
+    {
+        [XmlAttribute]
+        public string Description;
+
+        public List<TargetFile> TargetFiles = new();
+    }
+
+    public class TargetFile // Must be public to be serializable
+    {
+        private string _Path;
+        [XmlAttribute]
+        public string Path
+        {
+            get
+            {
+                return _Path;
+            }
+            set
+            {
+                _Path = value.TrimStart(new char[] { '\\' });
+            }
+        }
+
+        [XmlIgnore]
+        public byte[] HashOriginal;
+        [XmlAttribute("HashOriginal")]
+        public string HashOriginalAsString
+        {
+            get
+            {
+                return Converter.ConvertHexToString(HashOriginal, "");
+            }
+            set
+            {
+                HashOriginal = Converter.ConvertStringToHex(value);
+            }
+        }
+
+        [XmlIgnore]
+        public byte[] HashPatched;
+        [XmlAttribute("HashPatched")]
+        public string HashPatchedAsString
+        {
+            get
+            {
+                return Converter.ConvertHexToString(HashPatched, "");
+            }
+            set
+            {
+                HashPatched = Converter.ConvertStringToHex(value);
+            }
+        }
+
+        public List<Patch> Patches = new();
+        public List<TargetFile> Obsolete = new();
+    }
+
+    public class Patch // Must be public to be serializable
+    {
+        [XmlIgnore]
+        public UInt32 Address;
+        [XmlAttribute("Address")]
+        public string AddressAsString
+        {
+            get
+            {
+                return "0x" + Address.ToString("X8");
+            }
+            set
+            {
+                string NewValue = value;
+                if (NewValue.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
+                {
+                    NewValue = NewValue[2..];
+                }
+
+                Address = Convert.ToUInt32(NewValue, 16);
+            }
+        }
+
+        [XmlIgnore]
+        public byte[] OriginalBytes;
+        [XmlAttribute("OriginalBytes")]
+        public string OriginalBytesAsString
+        {
+            get
+            {
+                return Converter.ConvertHexToString(OriginalBytes, "");
+            }
+            set
+            {
+                OriginalBytes = Converter.ConvertStringToHex(value);
+            }
+        }
+
+        [XmlIgnore]
+        public byte[] PatchedBytes;
+        [XmlAttribute("PatchedBytes")]
+        public string PatchedBytesAsString
+        {
+            get
+            {
+                return Converter.ConvertHexToString(PatchedBytes, "");
+            }
+            set
+            {
+                PatchedBytes = Converter.ConvertStringToHex(value);
+            }
+        }
+    }
+}
diff --git a/Models/Privileges.cs b/WPinternals/Models/Privileges.cs
similarity index 97%
rename from Models/Privileges.cs
rename to WPinternals/Models/Privileges.cs
index 441a38a..11f420f 100644
--- a/Models/Privileges.cs
+++ b/WPinternals/Models/Privileges.cs
@@ -1,637 +1,637 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Specialized;
-using System.Runtime.InteropServices;
-using System.Threading;
-
-namespace WPinternals
-{
-    using Luid = NativeMethods.LUID;
-    using PrivilegeNotHeldException = System.Security.AccessControl.PrivilegeNotHeldException;
-    using Win32Exception = System.ComponentModel.Win32Exception;
-
-    internal delegate void PrivilegedCallback(object state);
-
-    internal sealed class Privilege
-    {
-        #region Private static members
-        private static readonly LocalDataStoreSlot tlsSlot = Thread.AllocateDataSlot();
-        private static readonly HybridDictionary privileges = new();
-        private static readonly HybridDictionary luids = new();
-        private static readonly ReaderWriterLock privilegeLock = new();
-        #endregion
-
-        #region Private members
-        private bool needToRevert = false;
-        private bool initialState = false;
-        private bool stateWasChanged = false;
-        private Luid luid;
-        private readonly Thread currentThread = Thread.CurrentThread;
-        private TlsContents tlsContents = null;
-        #endregion
-
-        #region Privilege names
-        public const string CreateToken = "SeCreateTokenPrivilege";
-        public const string AssignPrimaryToken = "SeAssignPrimaryTokenPrivilege";
-        public const string LockMemory = "SeLockMemoryPrivilege";
-        public const string IncreaseQuota = "SeIncreaseQuotaPrivilege";
-        public const string UnsolicitedInput = "SeUnsolicitedInputPrivilege";
-        public const string MachineAccount = "SeMachineAccountPrivilege";
-        public const string TrustedComputingBase = "SeTcbPrivilege";
-        public const string Security = "SeSecurityPrivilege";
-        public const string TakeOwnership = "SeTakeOwnershipPrivilege";
-        public const string LoadDriver = "SeLoadDriverPrivilege";
-        public const string SystemProfile = "SeSystemProfilePrivilege";
-        public const string SystemTime = "SeSystemtimePrivilege";
-        public const string ProfileSingleProcess = "SeProfileSingleProcessPrivilege";
-        public const string IncreaseBasePriority = "SeIncreaseBasePriorityPrivilege";
-        public const string CreatePageFile = "SeCreatePagefilePrivilege";
-        public const string CreatePermanent = "SeCreatePermanentPrivilege";
-        public const string Backup = "SeBackupPrivilege";
-        public const string Restore = "SeRestorePrivilege";
-        public const string Shutdown = "SeShutdownPrivilege";
-        public const string Debug = "SeDebugPrivilege";
-        public const string Audit = "SeAuditPrivilege";
-        public const string SystemEnvironment = "SeSystemEnvironmentPrivilege";
-        public const string ChangeNotify = "SeChangeNotifyPrivilege";
-        public const string RemoteShutdown = "SeRemoteShutdownPrivilege";
-        public const string Undock = "SeUndockPrivilege";
-        public const string SyncAgent = "SeSyncAgentPrivilege";
-        public const string EnableDelegation = "SeEnableDelegationPrivilege";
-        public const string ManageVolume = "SeManageVolumePrivilege";
-        public const string Impersonate = "SeImpersonatePrivilege";
-        public const string CreateGlobal = "SeCreateGlobalPrivilege";
-        public const string TrustedCredentialManagerAccess = "SeTrustedCredManAccessPrivilege";
-        public const string ReserveProcessor = "SeReserveProcessorPrivilege";
-        #endregion
-
-        #region LUID caching logic
-
-        //
-        // This routine is a wrapper around a hashtable containing mappings
-        // of privilege names to luids
-        //
-
-        private static Luid LuidFromPrivilege(string privilege)
-        {
-            Luid luid;
-            luid.LowPart = 0;
-            luid.HighPart = 0;
-
-            //
-            // Look up the privilege LUID inside the cache
-            //
-
-            try
-            {
-                privilegeLock.AcquireReaderLock(Timeout.Infinite);
-
-                if (luids.Contains(privilege))
-                {
-                    luid = (Luid)luids[privilege];
-
-                    privilegeLock.ReleaseReaderLock();
-                }
-                else
-                {
-                    privilegeLock.ReleaseReaderLock();
-
-                    if (!NativeMethods.LookupPrivilegeValue(null, privilege, ref luid))
-                    {
-                        int error = Marshal.GetLastWin32Error();
-
-                        if (error == NativeMethods.ERROR_NOT_ENOUGH_MEMORY)
-                        {
-                            throw new OutOfMemoryException();
-                        }
-                        else if (error == NativeMethods.ERROR_ACCESS_DENIED)
-                        {
-                            throw new UnauthorizedAccessException("Caller does not have the rights to look up privilege local unique identifier");
-                        }
-                        else if (error == NativeMethods.ERROR_NO_SUCH_PRIVILEGE)
-                        {
-                            throw new ArgumentException(
-                                string.Format("{0} is not a valid privilege name", privilege),
-                                nameof(privilege));
-                        }
-                        else
-                        {
-                            throw new Win32Exception(error);
-                        }
-                    }
-
-                    privilegeLock.AcquireWriterLock(Timeout.Infinite);
-                }
-            }
-            finally
-            {
-                if (privilegeLock.IsReaderLockHeld)
-                {
-                    privilegeLock.ReleaseReaderLock();
-                }
-
-                if (privilegeLock.IsWriterLockHeld)
-                {
-                    if (!luids.Contains(privilege))
-                    {
-                        luids[privilege] = luid;
-                        privileges[luid] = privilege;
-                    }
-
-                    privilegeLock.ReleaseWriterLock();
-                }
-            }
-
-            return luid;
-        }
-        #endregion
-
-        #region Nested classes
-        private sealed class TlsContents : IDisposable
-        {
-            private bool disposed = false;
-            private int referenceCount = 1;
-            private SafeTokenHandle threadHandle = new(IntPtr.Zero);
-
-            private static SafeTokenHandle processHandle = new(IntPtr.Zero);
-            private static readonly object syncRoot = new();
-
-            #region Constructor and finalizer
-            public TlsContents()
-            {
-                int error = 0;
-                int cachingError = 0;
-                bool success = true;
-
-                if (processHandle.IsInvalid)
-                {
-                    lock (syncRoot)
-                    {
-                        if (processHandle.IsInvalid && !NativeMethods.OpenProcessToken(
-                                            NativeMethods.GetCurrentProcess(),
-                                            TokenAccessLevels.Duplicate,
-                                            ref processHandle))
-                        {
-                            cachingError = Marshal.GetLastWin32Error();
-                            success = false;
-                        }
-                    }
-                }
-
-                try
-                {
-                    // Open the thread token; if there is no thread token,
-                    // copy the process token onto the thread
-
-                    if (!NativeMethods.OpenThreadToken(
-                        NativeMethods.GetCurrentThread(),
-                        TokenAccessLevels.Query | TokenAccessLevels.AdjustPrivileges,
-                        true,
-                        ref this.threadHandle))
-                    {
-                        if (success)
-                        {
-                            error = Marshal.GetLastWin32Error();
-
-                            if (error != NativeMethods.ERROR_NO_TOKEN)
-                            {
-                                success = false;
-                            }
-
-                            if (success)
-                            {
-                                error = 0;
-
-                                if (!NativeMethods.DuplicateTokenEx(
-                                    processHandle,
-                                    TokenAccessLevels.Impersonate | TokenAccessLevels.Query | TokenAccessLevels.AdjustPrivileges,
-                                    IntPtr.Zero,
-                                    SecurityImpersonationLevel.Impersonation,
-                                    TokenType.Impersonation,
-                                    ref this.threadHandle))
-                                {
-                                    error = Marshal.GetLastWin32Error();
-                                    success = false;
-                                }
-                            }
-
-                            if (success && !NativeMethods.SetThreadToken(
-                                    IntPtr.Zero,
-                                    this.threadHandle))
-                            {
-                                error = Marshal.GetLastWin32Error();
-                                success = false;
-                            }
-
-                            if (success)
-                            {
-                                // This thread is now impersonating; it needs to be reverted to its original state
-
-                                this.IsImpersonating = true;
-                            }
-                        }
-                        else
-                        {
-                            error = cachingError;
-                        }
-                    }
-                    else
-                    {
-                        success = true;
-                    }
-                }
-                finally
-                {
-                    if (!success)
-                    {
-                        Dispose();
-                    }
-                }
-
-                if (error == NativeMethods.ERROR_NOT_ENOUGH_MEMORY)
-                {
-                    throw new OutOfMemoryException();
-                }
-                else if (error == NativeMethods.ERROR_ACCESS_DENIED ||
-                    error == NativeMethods.ERROR_CANT_OPEN_ANONYMOUS)
-                {
-                    throw new UnauthorizedAccessException("The caller does not have the rights to perform the operation");
-                }
-                else if (error != 0)
-                {
-                    throw new Win32Exception(error);
-                }
-            }
-
-            ~TlsContents()
-            {
-                if (!this.disposed)
-                {
-                    Dispose(false);
-                }
-            }
-            #endregion
-
-            #region IDisposable implementation
-            public void Dispose()
-            {
-                Dispose(true);
-                GC.SuppressFinalize(this);
-            }
-
-            private void Dispose(bool disposing)
-            {
-                if (this.disposed)
-                {
-                    return;
-                }
-
-                if (this.threadHandle != null)
-                {
-                    this.threadHandle.Dispose();
-                    this.threadHandle = null;
-                }
-
-                if (this.IsImpersonating)
-                {
-                    NativeMethods.RevertToSelf();
-                }
-
-                this.disposed = true;
-            }
-            #endregion
-
-            #region Reference-counting
-            public void IncrementReferenceCount()
-            {
-                this.referenceCount++;
-            }
-
-            public int DecrementReferenceCount()
-            {
-                int result = --this.referenceCount;
-
-                if (result == 0)
-                {
-                    Dispose();
-                }
-
-                return result;
-            }
-
-            public int ReferenceCountValue
-            {
-                get { return this.referenceCount; }
-            }
-            #endregion
-
-            #region Properties
-            public SafeTokenHandle ThreadHandle
-            {
-                get { return this.threadHandle; }
-            }
-
-            public bool IsImpersonating { get; } = false;
-            #endregion
-        }
-        #endregion
-
-        #region Constructor
-        public Privilege(string privilegeName)
-        {
-            if (privilegeName == null)
-            {
-                throw new ArgumentNullException(nameof(privilegeName));
-            }
-
-            this.luid = LuidFromPrivilege(privilegeName);
-        }
-        #endregion
-
-        #region Public methods and properties
-        public void Enable()
-        {
-            this.ToggleState(true);
-        }
-
-        public void Disable()
-        {
-            this.ToggleState(false);
-        }
-
-        public void Revert()
-        {
-            int error = 0;
-
-            // All privilege operations must take place on the same thread
-
-            if (!this.currentThread.Equals(Thread.CurrentThread))
-            {
-                throw new InvalidOperationException("Operation must take place on the thread that created the object");
-            }
-
-            if (!this.NeedToRevert)
-            {
-                return;
-            }
-
-            // This code must be eagerly prepared and non-interruptible.
-
-            try
-            {
-                // The payload is entirely in the finally block
-                // This is how we ensure that the code will not be
-                // interrupted by catastrophic exceptions
-            }
-            finally
-            {
-                bool success = true;
-
-                try
-                {
-                    // Only call AdjustTokenPrivileges if we're not going to be reverting to self,
-                    // on this Revert, since doing the latter obliterates the thread token anyway
-
-                    if (this.stateWasChanged &&
-                        (this.tlsContents.ReferenceCountValue > 1 ||
-                        !this.tlsContents.IsImpersonating))
-                    {
-                        NativeMethods.TOKEN_PRIVILEGE newState = new();
-                        newState.PrivilegeCount = 1;
-                        newState.Privilege.Luid = this.luid;
-                        newState.Privilege.Attributes = this.initialState ? NativeMethods.SE_PRIVILEGE_ENABLED : NativeMethods.SE_PRIVILEGE_DISABLED;
-
-                        NativeMethods.TOKEN_PRIVILEGE previousState = new();
-                        uint previousSize = 0;
-
-                        if (!NativeMethods.AdjustTokenPrivileges(
-                                        this.tlsContents.ThreadHandle,
-                                        false,
-                                        ref newState,
-                                        (uint)Marshal.SizeOf(previousState),
-                                        ref previousState,
-                                        ref previousSize))
-                        {
-                            error = Marshal.GetLastWin32Error();
-                            success = false;
-                        }
-                    }
-                }
-                finally
-                {
-                    if (success)
-                    {
-                        this.Reset();
-                    }
-                }
-            }
-
-            if (error == NativeMethods.ERROR_NOT_ENOUGH_MEMORY)
-            {
-                throw new OutOfMemoryException();
-            }
-            else if (error == NativeMethods.ERROR_ACCESS_DENIED)
-            {
-                throw new UnauthorizedAccessException("Caller does not have the permission to change the privilege");
-            }
-            else if (error != 0)
-            {
-                throw new Win32Exception(error);
-            }
-        }
-
-        public bool NeedToRevert
-        {
-            get { return this.needToRevert; }
-        }
-
-        public static void RunWithPrivilege(string privilege, bool enabled, PrivilegedCallback callback, object state)
-        {
-            if (callback == null)
-            {
-                throw new ArgumentNullException(nameof(callback));
-            }
-
-            Privilege p = new(privilege);
-
-            try
-            {
-                if (enabled)
-                {
-                    p.Enable();
-                }
-                else
-                {
-                    p.Disable();
-                }
-
-                callback(state);
-            }
-            catch
-            {
-                p.Revert();
-                throw;
-            }
-            finally
-            {
-                p.Revert();
-            }
-        }
-        #endregion
-
-        #region Private implementation
-        private void ToggleState(bool enable)
-        {
-            int error = 0;
-
-            // All privilege operations must take place on the same thread
-
-            if (!this.currentThread.Equals(Thread.CurrentThread))
-            {
-                throw new InvalidOperationException("Operation must take place on the thread that created the object");
-            }
-
-            // This privilege was already altered and needs to be reverted before it can be altered again
-
-            if (this.NeedToRevert)
-            {
-                throw new InvalidOperationException("Must revert the privilege prior to attempting this operation");
-            }
-
-            // Need to make this block of code non-interruptible so that it would preserve
-            // consistency of thread oken state even in the face of catastrophic exceptions
-
-            try
-            {
-                // The payload is entirely in the finally block
-                // This is how we ensure that the code will not be
-                // interrupted by catastrophic exceptions
-            }
-            finally
-            {
-                try
-                {
-                    // Retrieve TLS state
-
-                    this.tlsContents = Thread.GetData(tlsSlot) as TlsContents;
-
-                    if (this.tlsContents == null)
-                    {
-                        this.tlsContents = new TlsContents();
-                        Thread.SetData(tlsSlot, this.tlsContents);
-                    }
-                    else
-                    {
-                        this.tlsContents.IncrementReferenceCount();
-                    }
-
-                    NativeMethods.TOKEN_PRIVILEGE newState = new();
-                    newState.PrivilegeCount = 1;
-                    newState.Privilege.Luid = this.luid;
-                    newState.Privilege.Attributes = enable ? NativeMethods.SE_PRIVILEGE_ENABLED : NativeMethods.SE_PRIVILEGE_DISABLED;
-
-                    NativeMethods.TOKEN_PRIVILEGE previousState = new();
-                    uint previousSize = 0;
-
-                    // Place the new privilege on the thread token and remember the previous state.
-
-                    if (!NativeMethods.AdjustTokenPrivileges(
-                                    this.tlsContents.ThreadHandle,
-                                    false,
-                                    ref newState,
-                                    (uint)Marshal.SizeOf(previousState),
-                                    ref previousState,
-                                    ref previousSize))
-                    {
-                        error = Marshal.GetLastWin32Error();
-                    }
-                    else if (NativeMethods.ERROR_NOT_ALL_ASSIGNED == Marshal.GetLastWin32Error())
-                    {
-                        error = NativeMethods.ERROR_NOT_ALL_ASSIGNED;
-                    }
-                    else
-                    {
-                        // This is the initial state that revert will have to go back to
-
-                        this.initialState = (previousState.Privilege.Attributes & NativeMethods.SE_PRIVILEGE_ENABLED) != 0;
-
-                        // Remember whether state has changed at all
-
-                        this.stateWasChanged = this.initialState != enable;
-
-                        // If we had to impersonate, or if the privilege state changed we'll need to revert
-
-                        this.needToRevert = this.tlsContents.IsImpersonating || this.stateWasChanged;
-                    }
-                }
-                finally
-                {
-                    if (!this.needToRevert)
-                    {
-                        this.Reset();
-                    }
-                }
-            }
-
-            if (error == NativeMethods.ERROR_NOT_ALL_ASSIGNED)
-            {
-                throw new PrivilegeNotHeldException(privileges[this.luid] as string);
-            }
-            if (error == NativeMethods.ERROR_NOT_ENOUGH_MEMORY)
-            {
-                throw new OutOfMemoryException();
-            }
-            else if (error == NativeMethods.ERROR_ACCESS_DENIED ||
-                error == NativeMethods.ERROR_CANT_OPEN_ANONYMOUS)
-            {
-                throw new UnauthorizedAccessException("The caller does not have the right to change the privilege");
-            }
-            else if (error != 0)
-            {
-                throw new Win32Exception(error);
-            }
-        }
-
-        private void Reset()
-        {
-            try
-            {
-                // Payload is in the finally block
-                // as a way to guarantee execution
-            }
-            finally
-            {
-                this.stateWasChanged = false;
-                this.initialState = false;
-                this.needToRevert = false;
-
-                if (this.tlsContents?.DecrementReferenceCount() == 0)
-                {
-                    this.tlsContents = null;
-                    Thread.SetData(tlsSlot, null);
-                }
-            }
-        }
-        #endregion
-    }
-}
-
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Specialized;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+namespace WPinternals
+{
+    using Luid = NativeMethods.LUID;
+    using PrivilegeNotHeldException = System.Security.AccessControl.PrivilegeNotHeldException;
+    using Win32Exception = System.ComponentModel.Win32Exception;
+
+    internal delegate void PrivilegedCallback(object state);
+
+    internal sealed class Privilege
+    {
+        #region Private static members
+        private static readonly LocalDataStoreSlot tlsSlot = Thread.AllocateDataSlot();
+        private static readonly HybridDictionary privileges = new();
+        private static readonly HybridDictionary luids = new();
+        private static readonly ReaderWriterLock privilegeLock = new();
+        #endregion
+
+        #region Private members
+        private bool needToRevert = false;
+        private bool initialState = false;
+        private bool stateWasChanged = false;
+        private Luid luid;
+        private readonly Thread currentThread = Thread.CurrentThread;
+        private TlsContents tlsContents = null;
+        #endregion
+
+        #region Privilege names
+        public const string CreateToken = "SeCreateTokenPrivilege";
+        public const string AssignPrimaryToken = "SeAssignPrimaryTokenPrivilege";
+        public const string LockMemory = "SeLockMemoryPrivilege";
+        public const string IncreaseQuota = "SeIncreaseQuotaPrivilege";
+        public const string UnsolicitedInput = "SeUnsolicitedInputPrivilege";
+        public const string MachineAccount = "SeMachineAccountPrivilege";
+        public const string TrustedComputingBase = "SeTcbPrivilege";
+        public const string Security = "SeSecurityPrivilege";
+        public const string TakeOwnership = "SeTakeOwnershipPrivilege";
+        public const string LoadDriver = "SeLoadDriverPrivilege";
+        public const string SystemProfile = "SeSystemProfilePrivilege";
+        public const string SystemTime = "SeSystemtimePrivilege";
+        public const string ProfileSingleProcess = "SeProfileSingleProcessPrivilege";
+        public const string IncreaseBasePriority = "SeIncreaseBasePriorityPrivilege";
+        public const string CreatePageFile = "SeCreatePagefilePrivilege";
+        public const string CreatePermanent = "SeCreatePermanentPrivilege";
+        public const string Backup = "SeBackupPrivilege";
+        public const string Restore = "SeRestorePrivilege";
+        public const string Shutdown = "SeShutdownPrivilege";
+        public const string Debug = "SeDebugPrivilege";
+        public const string Audit = "SeAuditPrivilege";
+        public const string SystemEnvironment = "SeSystemEnvironmentPrivilege";
+        public const string ChangeNotify = "SeChangeNotifyPrivilege";
+        public const string RemoteShutdown = "SeRemoteShutdownPrivilege";
+        public const string Undock = "SeUndockPrivilege";
+        public const string SyncAgent = "SeSyncAgentPrivilege";
+        public const string EnableDelegation = "SeEnableDelegationPrivilege";
+        public const string ManageVolume = "SeManageVolumePrivilege";
+        public const string Impersonate = "SeImpersonatePrivilege";
+        public const string CreateGlobal = "SeCreateGlobalPrivilege";
+        public const string TrustedCredentialManagerAccess = "SeTrustedCredManAccessPrivilege";
+        public const string ReserveProcessor = "SeReserveProcessorPrivilege";
+        #endregion
+
+        #region LUID caching logic
+
+        //
+        // This routine is a wrapper around a hashtable containing mappings
+        // of privilege names to luids
+        //
+
+        private static Luid LuidFromPrivilege(string privilege)
+        {
+            Luid luid;
+            luid.LowPart = 0;
+            luid.HighPart = 0;
+
+            //
+            // Look up the privilege LUID inside the cache
+            //
+
+            try
+            {
+                privilegeLock.AcquireReaderLock(Timeout.Infinite);
+
+                if (luids.Contains(privilege))
+                {
+                    luid = (Luid)luids[privilege];
+
+                    privilegeLock.ReleaseReaderLock();
+                }
+                else
+                {
+                    privilegeLock.ReleaseReaderLock();
+
+                    if (!NativeMethods.LookupPrivilegeValue(null, privilege, ref luid))
+                    {
+                        int error = Marshal.GetLastWin32Error();
+
+                        if (error == NativeMethods.ERROR_NOT_ENOUGH_MEMORY)
+                        {
+                            throw new OutOfMemoryException();
+                        }
+                        else if (error == NativeMethods.ERROR_ACCESS_DENIED)
+                        {
+                            throw new UnauthorizedAccessException("Caller does not have the rights to look up privilege local unique identifier");
+                        }
+                        else if (error == NativeMethods.ERROR_NO_SUCH_PRIVILEGE)
+                        {
+                            throw new ArgumentException(
+                                string.Format("{0} is not a valid privilege name", privilege),
+                                nameof(privilege));
+                        }
+                        else
+                        {
+                            throw new Win32Exception(error);
+                        }
+                    }
+
+                    privilegeLock.AcquireWriterLock(Timeout.Infinite);
+                }
+            }
+            finally
+            {
+                if (privilegeLock.IsReaderLockHeld)
+                {
+                    privilegeLock.ReleaseReaderLock();
+                }
+
+                if (privilegeLock.IsWriterLockHeld)
+                {
+                    if (!luids.Contains(privilege))
+                    {
+                        luids[privilege] = luid;
+                        privileges[luid] = privilege;
+                    }
+
+                    privilegeLock.ReleaseWriterLock();
+                }
+            }
+
+            return luid;
+        }
+        #endregion
+
+        #region Nested classes
+        private sealed class TlsContents : IDisposable
+        {
+            private bool disposed = false;
+            private int referenceCount = 1;
+            private SafeTokenHandle threadHandle = new(IntPtr.Zero);
+
+            private static SafeTokenHandle processHandle = new(IntPtr.Zero);
+            private static readonly object syncRoot = new();
+
+            #region Constructor and finalizer
+            public TlsContents()
+            {
+                int error = 0;
+                int cachingError = 0;
+                bool success = true;
+
+                if (processHandle.IsInvalid)
+                {
+                    lock (syncRoot)
+                    {
+                        if (processHandle.IsInvalid && !NativeMethods.OpenProcessToken(
+                                            NativeMethods.GetCurrentProcess(),
+                                            TokenAccessLevels.Duplicate,
+                                            ref processHandle))
+                        {
+                            cachingError = Marshal.GetLastWin32Error();
+                            success = false;
+                        }
+                    }
+                }
+
+                try
+                {
+                    // Open the thread token; if there is no thread token,
+                    // copy the process token onto the thread
+
+                    if (!NativeMethods.OpenThreadToken(
+                        NativeMethods.GetCurrentThread(),
+                        TokenAccessLevels.Query | TokenAccessLevels.AdjustPrivileges,
+                        true,
+                        ref this.threadHandle))
+                    {
+                        if (success)
+                        {
+                            error = Marshal.GetLastWin32Error();
+
+                            if (error != NativeMethods.ERROR_NO_TOKEN)
+                            {
+                                success = false;
+                            }
+
+                            if (success)
+                            {
+                                error = 0;
+
+                                if (!NativeMethods.DuplicateTokenEx(
+                                    processHandle,
+                                    TokenAccessLevels.Impersonate | TokenAccessLevels.Query | TokenAccessLevels.AdjustPrivileges,
+                                    IntPtr.Zero,
+                                    SecurityImpersonationLevel.Impersonation,
+                                    TokenType.Impersonation,
+                                    ref this.threadHandle))
+                                {
+                                    error = Marshal.GetLastWin32Error();
+                                    success = false;
+                                }
+                            }
+
+                            if (success && !NativeMethods.SetThreadToken(
+                                    IntPtr.Zero,
+                                    this.threadHandle))
+                            {
+                                error = Marshal.GetLastWin32Error();
+                                success = false;
+                            }
+
+                            if (success)
+                            {
+                                // This thread is now impersonating; it needs to be reverted to its original state
+
+                                this.IsImpersonating = true;
+                            }
+                        }
+                        else
+                        {
+                            error = cachingError;
+                        }
+                    }
+                    else
+                    {
+                        success = true;
+                    }
+                }
+                finally
+                {
+                    if (!success)
+                    {
+                        Dispose();
+                    }
+                }
+
+                if (error == NativeMethods.ERROR_NOT_ENOUGH_MEMORY)
+                {
+                    throw new OutOfMemoryException();
+                }
+                else if (error == NativeMethods.ERROR_ACCESS_DENIED ||
+                    error == NativeMethods.ERROR_CANT_OPEN_ANONYMOUS)
+                {
+                    throw new UnauthorizedAccessException("The caller does not have the rights to perform the operation");
+                }
+                else if (error != 0)
+                {
+                    throw new Win32Exception(error);
+                }
+            }
+
+            ~TlsContents()
+            {
+                if (!this.disposed)
+                {
+                    Dispose(false);
+                }
+            }
+            #endregion
+
+            #region IDisposable implementation
+            public void Dispose()
+            {
+                Dispose(true);
+                GC.SuppressFinalize(this);
+            }
+
+            private void Dispose(bool disposing)
+            {
+                if (this.disposed)
+                {
+                    return;
+                }
+
+                if (this.threadHandle != null)
+                {
+                    this.threadHandle.Dispose();
+                    this.threadHandle = null;
+                }
+
+                if (this.IsImpersonating)
+                {
+                    NativeMethods.RevertToSelf();
+                }
+
+                this.disposed = true;
+            }
+            #endregion
+
+            #region Reference-counting
+            public void IncrementReferenceCount()
+            {
+                this.referenceCount++;
+            }
+
+            public int DecrementReferenceCount()
+            {
+                int result = --this.referenceCount;
+
+                if (result == 0)
+                {
+                    Dispose();
+                }
+
+                return result;
+            }
+
+            public int ReferenceCountValue
+            {
+                get { return this.referenceCount; }
+            }
+            #endregion
+
+            #region Properties
+            public SafeTokenHandle ThreadHandle
+            {
+                get { return this.threadHandle; }
+            }
+
+            public bool IsImpersonating { get; } = false;
+            #endregion
+        }
+        #endregion
+
+        #region Constructor
+        public Privilege(string privilegeName)
+        {
+            if (privilegeName == null)
+            {
+                throw new ArgumentNullException(nameof(privilegeName));
+            }
+
+            this.luid = LuidFromPrivilege(privilegeName);
+        }
+        #endregion
+
+        #region Public methods and properties
+        public void Enable()
+        {
+            this.ToggleState(true);
+        }
+
+        public void Disable()
+        {
+            this.ToggleState(false);
+        }
+
+        public void Revert()
+        {
+            int error = 0;
+
+            // All privilege operations must take place on the same thread
+
+            if (!this.currentThread.Equals(Thread.CurrentThread))
+            {
+                throw new InvalidOperationException("Operation must take place on the thread that created the object");
+            }
+
+            if (!this.NeedToRevert)
+            {
+                return;
+            }
+
+            // This code must be eagerly prepared and non-interruptible.
+
+            try
+            {
+                // The payload is entirely in the finally block
+                // This is how we ensure that the code will not be
+                // interrupted by catastrophic exceptions
+            }
+            finally
+            {
+                bool success = true;
+
+                try
+                {
+                    // Only call AdjustTokenPrivileges if we're not going to be reverting to self,
+                    // on this Revert, since doing the latter obliterates the thread token anyway
+
+                    if (this.stateWasChanged &&
+                        (this.tlsContents.ReferenceCountValue > 1 ||
+                        !this.tlsContents.IsImpersonating))
+                    {
+                        NativeMethods.TOKEN_PRIVILEGE newState = new();
+                        newState.PrivilegeCount = 1;
+                        newState.Privilege.Luid = this.luid;
+                        newState.Privilege.Attributes = this.initialState ? NativeMethods.SE_PRIVILEGE_ENABLED : NativeMethods.SE_PRIVILEGE_DISABLED;
+
+                        NativeMethods.TOKEN_PRIVILEGE previousState = new();
+                        uint previousSize = 0;
+
+                        if (!NativeMethods.AdjustTokenPrivileges(
+                                        this.tlsContents.ThreadHandle,
+                                        false,
+                                        ref newState,
+                                        (uint)Marshal.SizeOf(previousState),
+                                        ref previousState,
+                                        ref previousSize))
+                        {
+                            error = Marshal.GetLastWin32Error();
+                            success = false;
+                        }
+                    }
+                }
+                finally
+                {
+                    if (success)
+                    {
+                        this.Reset();
+                    }
+                }
+            }
+
+            if (error == NativeMethods.ERROR_NOT_ENOUGH_MEMORY)
+            {
+                throw new OutOfMemoryException();
+            }
+            else if (error == NativeMethods.ERROR_ACCESS_DENIED)
+            {
+                throw new UnauthorizedAccessException("Caller does not have the permission to change the privilege");
+            }
+            else if (error != 0)
+            {
+                throw new Win32Exception(error);
+            }
+        }
+
+        public bool NeedToRevert
+        {
+            get { return this.needToRevert; }
+        }
+
+        public static void RunWithPrivilege(string privilege, bool enabled, PrivilegedCallback callback, object state)
+        {
+            if (callback == null)
+            {
+                throw new ArgumentNullException(nameof(callback));
+            }
+
+            Privilege p = new(privilege);
+
+            try
+            {
+                if (enabled)
+                {
+                    p.Enable();
+                }
+                else
+                {
+                    p.Disable();
+                }
+
+                callback(state);
+            }
+            catch
+            {
+                p.Revert();
+                throw;
+            }
+            finally
+            {
+                p.Revert();
+            }
+        }
+        #endregion
+
+        #region Private implementation
+        private void ToggleState(bool enable)
+        {
+            int error = 0;
+
+            // All privilege operations must take place on the same thread
+
+            if (!this.currentThread.Equals(Thread.CurrentThread))
+            {
+                throw new InvalidOperationException("Operation must take place on the thread that created the object");
+            }
+
+            // This privilege was already altered and needs to be reverted before it can be altered again
+
+            if (this.NeedToRevert)
+            {
+                throw new InvalidOperationException("Must revert the privilege prior to attempting this operation");
+            }
+
+            // Need to make this block of code non-interruptible so that it would preserve
+            // consistency of thread oken state even in the face of catastrophic exceptions
+
+            try
+            {
+                // The payload is entirely in the finally block
+                // This is how we ensure that the code will not be
+                // interrupted by catastrophic exceptions
+            }
+            finally
+            {
+                try
+                {
+                    // Retrieve TLS state
+
+                    this.tlsContents = Thread.GetData(tlsSlot) as TlsContents;
+
+                    if (this.tlsContents == null)
+                    {
+                        this.tlsContents = new TlsContents();
+                        Thread.SetData(tlsSlot, this.tlsContents);
+                    }
+                    else
+                    {
+                        this.tlsContents.IncrementReferenceCount();
+                    }
+
+                    NativeMethods.TOKEN_PRIVILEGE newState = new();
+                    newState.PrivilegeCount = 1;
+                    newState.Privilege.Luid = this.luid;
+                    newState.Privilege.Attributes = enable ? NativeMethods.SE_PRIVILEGE_ENABLED : NativeMethods.SE_PRIVILEGE_DISABLED;
+
+                    NativeMethods.TOKEN_PRIVILEGE previousState = new();
+                    uint previousSize = 0;
+
+                    // Place the new privilege on the thread token and remember the previous state.
+
+                    if (!NativeMethods.AdjustTokenPrivileges(
+                                    this.tlsContents.ThreadHandle,
+                                    false,
+                                    ref newState,
+                                    (uint)Marshal.SizeOf(previousState),
+                                    ref previousState,
+                                    ref previousSize))
+                    {
+                        error = Marshal.GetLastWin32Error();
+                    }
+                    else if (NativeMethods.ERROR_NOT_ALL_ASSIGNED == Marshal.GetLastWin32Error())
+                    {
+                        error = NativeMethods.ERROR_NOT_ALL_ASSIGNED;
+                    }
+                    else
+                    {
+                        // This is the initial state that revert will have to go back to
+
+                        this.initialState = (previousState.Privilege.Attributes & NativeMethods.SE_PRIVILEGE_ENABLED) != 0;
+
+                        // Remember whether state has changed at all
+
+                        this.stateWasChanged = this.initialState != enable;
+
+                        // If we had to impersonate, or if the privilege state changed we'll need to revert
+
+                        this.needToRevert = this.tlsContents.IsImpersonating || this.stateWasChanged;
+                    }
+                }
+                finally
+                {
+                    if (!this.needToRevert)
+                    {
+                        this.Reset();
+                    }
+                }
+            }
+
+            if (error == NativeMethods.ERROR_NOT_ALL_ASSIGNED)
+            {
+                throw new PrivilegeNotHeldException(privileges[this.luid] as string);
+            }
+            if (error == NativeMethods.ERROR_NOT_ENOUGH_MEMORY)
+            {
+                throw new OutOfMemoryException();
+            }
+            else if (error == NativeMethods.ERROR_ACCESS_DENIED ||
+                error == NativeMethods.ERROR_CANT_OPEN_ANONYMOUS)
+            {
+                throw new UnauthorizedAccessException("The caller does not have the right to change the privilege");
+            }
+            else if (error != 0)
+            {
+                throw new Win32Exception(error);
+            }
+        }
+
+        private void Reset()
+        {
+            try
+            {
+                // Payload is in the finally block
+                // as a way to guarantee execution
+            }
+            finally
+            {
+                this.stateWasChanged = false;
+                this.initialState = false;
+                this.needToRevert = false;
+
+                if (this.tlsContents?.DecrementReferenceCount() == 0)
+                {
+                    this.tlsContents = null;
+                    Thread.SetData(tlsSlot, null);
+                }
+            }
+        }
+        #endregion
+    }
+}
+
diff --git a/Models/QualcommDownload.cs b/WPinternals/Models/QualcommDownload.cs
similarity index 97%
rename from Models/QualcommDownload.cs
rename to WPinternals/Models/QualcommDownload.cs
index 5cca117..078a06c 100644
--- a/Models/QualcommDownload.cs
+++ b/WPinternals/Models/QualcommDownload.cs
@@ -1,145 +1,145 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.Linq;
-
-namespace WPinternals
-{
-    internal class QualcommDownload
-    {
-        private readonly QualcommSerial Serial;
-
-        public QualcommDownload(QualcommSerial Serial)
-        {
-            this.Serial = Serial;
-        }
-
-        public bool IsAlive()
-        {
-            try
-            {
-                Serial.SendCommand(new byte[] { 0x06 }, new byte[] { 0x02 });
-                return true;
-            }
-            catch
-            {
-                return false;
-            }
-        }
-
-        public void SendToPhoneMemory(UInt32 Address, Stream Data, UInt32 Length = UInt32.MaxValue)
-        {
-            long Remaining = Length > (Data.Length - Data.Position) ? Data.Length - Data.Position : Length;
-            UInt32 CurrentLength;
-            byte[] Buffer = new byte[0x107];
-            Buffer[0] = 0x0F;
-            System.Buffer.BlockCopy(BitConverter.GetBytes((UInt16)0x100).Reverse().ToArray(), 0, Buffer, 5, 2); // Length is in Big Endian
-            UInt32 CurrentAddress = Address;
-            while (Remaining > 0)
-            {
-                System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentAddress).Reverse().ToArray(), 0, Buffer, 1, 4); // Address is in Big Endian
-
-                CurrentLength = Remaining >= 0x100 ? 0x100 : (UInt32)Remaining;
-
-                CurrentLength = (UInt32)Data.Read(Buffer, 7, (int)CurrentLength);
-                Serial.SendCommand(Buffer, new byte[] { 0x02 });
-
-                CurrentAddress += CurrentLength;
-                Remaining -= CurrentLength;
-            }
-        }
-
-        public void SendToPhoneMemory(UInt32 Address, byte[] Data, UInt32 Offset = 0, UInt32 Length = UInt32.MaxValue)
-        {
-            long Remaining;
-            if (Offset > (Data.Length - 1))
-            {
-                throw new ArgumentException("Wrong offset");
-            }
-
-            Remaining = Length > (Data.Length - Offset) ? Data.Length - Offset : Length;
-
-            UInt32 CurrentLength;
-            UInt32 CurrentOffset = Offset;
-            byte[] Buffer = new byte[0x107];
-            UInt32 CurrentAddress = Address;
-            byte[] CurrentBytes;
-            while (Remaining > 0)
-            {
-                if (Remaining >= 0x100)
-                {
-                    CurrentLength = 0x100;
-                    CurrentBytes = Buffer;
-                }
-                else
-                {
-                    CurrentLength = (UInt32)Remaining;
-                    CurrentBytes = new byte[CurrentLength + 7];
-                }
-                CurrentBytes[0] = 0x0F;
-                System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentAddress).Reverse().ToArray(), 0, CurrentBytes, 1, 4); // Address is in Big Endian
-                System.Buffer.BlockCopy(BitConverter.GetBytes((UInt16)CurrentLength).Reverse().ToArray(), 0, CurrentBytes, 5, 2); // Length is in Big Endian
-                System.Buffer.BlockCopy(Data, (int)CurrentOffset, CurrentBytes, 7, (int)CurrentLength);
-
-                Serial.SendCommand(CurrentBytes, new byte[] { 0x02 });
-
-                CurrentAddress += CurrentLength;
-                CurrentOffset += CurrentLength;
-                Remaining -= CurrentLength;
-            }
-        }
-
-        public void StartBootloader(UInt32 Address)
-        {
-            byte[] Buffer = new byte[5];
-            Buffer[0] = 0x05;
-            System.Buffer.BlockCopy(BitConverter.GetBytes(Address).Reverse().ToArray(), 0, Buffer, 1, 4); // Address is in Big Endian
-            Serial.SendCommand(Buffer, new byte[] { 0x02 });
-        }
-
-        // Reset interface. Interface becomes unresponsive.
-        public void Reset()
-        {
-            Serial.SendCommand(new byte[] { 0x0A }, new byte[] { 0x02 });
-        }
-
-        // This also resets interface. This does not actually reboot the phone. The interface becomes unresponsive.
-        public void Shutdown()
-        {
-            Serial.SendCommand(new byte[] { 0x0E }, new byte[] { 0x02 });
-        }
-
-        // This command only works on 9008 interface.
-        public byte[] GetRKH()
-        {
-            byte[] Response = Serial.SendCommand(new byte[] { 0x18 }, new byte[] { 0x18, 0x01, 0x00 });
-            byte[] Result = new byte[0x20];
-            Buffer.BlockCopy(Response, 3, Result, 0, 0x20);
-            return Result;
-        }
-
-        public void CloseSerial()
-        {
-            Serial.Close();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.IO;
+using System.Linq;
+
+namespace WPinternals
+{
+    internal class QualcommDownload
+    {
+        private readonly QualcommSerial Serial;
+
+        public QualcommDownload(QualcommSerial Serial)
+        {
+            this.Serial = Serial;
+        }
+
+        public bool IsAlive()
+        {
+            try
+            {
+                Serial.SendCommand(new byte[] { 0x06 }, new byte[] { 0x02 });
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+
+        public void SendToPhoneMemory(UInt32 Address, Stream Data, UInt32 Length = UInt32.MaxValue)
+        {
+            long Remaining = Length > (Data.Length - Data.Position) ? Data.Length - Data.Position : Length;
+            UInt32 CurrentLength;
+            byte[] Buffer = new byte[0x107];
+            Buffer[0] = 0x0F;
+            System.Buffer.BlockCopy(BitConverter.GetBytes((UInt16)0x100).Reverse().ToArray(), 0, Buffer, 5, 2); // Length is in Big Endian
+            UInt32 CurrentAddress = Address;
+            while (Remaining > 0)
+            {
+                System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentAddress).Reverse().ToArray(), 0, Buffer, 1, 4); // Address is in Big Endian
+
+                CurrentLength = Remaining >= 0x100 ? 0x100 : (UInt32)Remaining;
+
+                CurrentLength = (UInt32)Data.Read(Buffer, 7, (int)CurrentLength);
+                Serial.SendCommand(Buffer, new byte[] { 0x02 });
+
+                CurrentAddress += CurrentLength;
+                Remaining -= CurrentLength;
+            }
+        }
+
+        public void SendToPhoneMemory(UInt32 Address, byte[] Data, UInt32 Offset = 0, UInt32 Length = UInt32.MaxValue)
+        {
+            long Remaining;
+            if (Offset > (Data.Length - 1))
+            {
+                throw new ArgumentException("Wrong offset");
+            }
+
+            Remaining = Length > (Data.Length - Offset) ? Data.Length - Offset : Length;
+
+            UInt32 CurrentLength;
+            UInt32 CurrentOffset = Offset;
+            byte[] Buffer = new byte[0x107];
+            UInt32 CurrentAddress = Address;
+            byte[] CurrentBytes;
+            while (Remaining > 0)
+            {
+                if (Remaining >= 0x100)
+                {
+                    CurrentLength = 0x100;
+                    CurrentBytes = Buffer;
+                }
+                else
+                {
+                    CurrentLength = (UInt32)Remaining;
+                    CurrentBytes = new byte[CurrentLength + 7];
+                }
+                CurrentBytes[0] = 0x0F;
+                System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentAddress).Reverse().ToArray(), 0, CurrentBytes, 1, 4); // Address is in Big Endian
+                System.Buffer.BlockCopy(BitConverter.GetBytes((UInt16)CurrentLength).Reverse().ToArray(), 0, CurrentBytes, 5, 2); // Length is in Big Endian
+                System.Buffer.BlockCopy(Data, (int)CurrentOffset, CurrentBytes, 7, (int)CurrentLength);
+
+                Serial.SendCommand(CurrentBytes, new byte[] { 0x02 });
+
+                CurrentAddress += CurrentLength;
+                CurrentOffset += CurrentLength;
+                Remaining -= CurrentLength;
+            }
+        }
+
+        public void StartBootloader(UInt32 Address)
+        {
+            byte[] Buffer = new byte[5];
+            Buffer[0] = 0x05;
+            System.Buffer.BlockCopy(BitConverter.GetBytes(Address).Reverse().ToArray(), 0, Buffer, 1, 4); // Address is in Big Endian
+            Serial.SendCommand(Buffer, new byte[] { 0x02 });
+        }
+
+        // Reset interface. Interface becomes unresponsive.
+        public void Reset()
+        {
+            Serial.SendCommand(new byte[] { 0x0A }, new byte[] { 0x02 });
+        }
+
+        // This also resets interface. This does not actually reboot the phone. The interface becomes unresponsive.
+        public void Shutdown()
+        {
+            Serial.SendCommand(new byte[] { 0x0E }, new byte[] { 0x02 });
+        }
+
+        // This command only works on 9008 interface.
+        public byte[] GetRKH()
+        {
+            byte[] Response = Serial.SendCommand(new byte[] { 0x18 }, new byte[] { 0x18, 0x01, 0x00 });
+            byte[] Result = new byte[0x20];
+            Buffer.BlockCopy(Response, 3, Result, 0, 0x20);
+            return Result;
+        }
+
+        public void CloseSerial()
+        {
+            Serial.Close();
+        }
+    }
+}
diff --git a/Models/QualcommFlasher.cs b/WPinternals/Models/QualcommFlasher.cs
similarity index 97%
rename from Models/QualcommFlasher.cs
rename to WPinternals/Models/QualcommFlasher.cs
index 34528f8..b687ec6 100644
--- a/Models/QualcommFlasher.cs
+++ b/WPinternals/Models/QualcommFlasher.cs
@@ -1,228 +1,228 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.IO;
-
-namespace WPinternals
-{
-    internal enum FlashUnit
-    {
-        Bytes,
-        Sectors
-    }
-
-    internal class QualcommFlasher
-    {
-        private readonly QualcommSerial Serial;
-
-        public QualcommFlasher(QualcommSerial Serial)
-        {
-            this.Serial = Serial;
-        }
-
-        public void CloseSerial()
-        {
-            Serial.Close();
-        }
-
-        public void Hello()
-        {
-            byte[] Command = new byte[]
-            {
-                0x01, // Hello command
-                0x51, 0x43, 0x4F, 0x4D, 0x20, 0x66, 0x61, 0x73, 0x74, 0x20, 0x64, 0x6F, 0x77, 0x6E, 0x6C, 0x6F, // "QCOM fast download protocol host"
-                0x61, 0x64, 0x20, 0x70, 0x72, 0x6F, 0x74, 0x6F, 0x63, 0x6F, 0x6C, 0x20, 0x68, 0x6F, 0x73, 0x74,
-                0x02,
-                0x02, // Protocol version - Must be at least 0x02
-                0x01
-            };
-
-            Serial.SendCommand(Command, new byte[] { 0x02 });
-        }
-
-        public void SetSecurityMode(byte Mode)
-        {
-            byte[] Command = new byte[2];
-            Command[0] = 0x17;
-            Command[1] = Mode;
-
-            Serial.SendCommand(Command, new byte[] { 0x18 });
-        }
-
-        // Use PartitionID 0x21
-        public void OpenPartition(byte PartitionID)
-        {
-            byte[] Command = new byte[2];
-            Command[0] = 0x1B;
-            Command[1] = PartitionID;
-
-            Serial.SendCommand(Command, new byte[] { 0x1C });
-        }
-
-        public void ClosePartition()
-        {
-            Serial.SendCommand(new byte[] { 0x15 }, new byte[] { 0x16 });
-        }
-
-        public void Flash(UInt32 StartInBytes, Stream Data, UInt32 LengthInBytes = UInt32.MaxValue)
-        {
-            Flash(StartInBytes, Data, null, null, LengthInBytes);
-        }
-
-        public void Flash(UInt32 StartInBytes, Stream Data, Action<int, TimeSpan?> ProgressUpdateCallback, UInt32 LengthInBytes = UInt32.MaxValue)
-        {
-            Flash(StartInBytes, Data, ProgressUpdateCallback, null, LengthInBytes);
-        }
-
-        public void Flash(UInt32 StartInBytes, Stream Data, ProgressUpdater UpdaterPerSector, UInt32 LengthInBytes = UInt32.MaxValue)
-        {
-            Flash(StartInBytes, Data, null, UpdaterPerSector, LengthInBytes);
-        }
-
-        public void Flash(UInt32 StartInBytes, Stream Data, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector, UInt32 LengthInBytes = UInt32.MaxValue)
-        {
-            long Remaining = (LengthInBytes == UInt32.MaxValue) || (LengthInBytes > (Data.Length - Data.Position))
-                ? Data.Length - Data.Position
-                : LengthInBytes;
-            UInt32 CurrentLength;
-            byte[] Buffer = new byte[0x405];
-            byte[] ResponsePattern = new byte[5];
-            byte[] FinalCommand;
-            Buffer[0] = 0x07;
-            ResponsePattern[0] = 0x08;
-            UInt32 CurrentPosition = StartInBytes;
-
-            ProgressUpdater Progress = UpdaterPerSector;
-            if ((Progress == null) && (ProgressUpdateCallback != null))
-            {
-                Progress = new ProgressUpdater(GetSectorCount((UInt64)Remaining), ProgressUpdateCallback);
-            }
-
-            while (Remaining > 0)
-            {
-                System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentPosition), 0, Buffer, 1, 4); // Start is in bytes and in Little Endian (on Samsung devices start is in sectors!)
-                System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentPosition), 0, ResponsePattern, 1, 4); // Start is in bytes and in Little Endian (on Samsung devices start is in sectors!)
-
-                CurrentLength = Remaining >= 0x400 ? 0x400 : (UInt32)Remaining;
-
-                CurrentLength = (uint)Data.Read(Buffer, 5, (int)CurrentLength);
-
-                if (CurrentLength < 0x400)
-                {
-                    FinalCommand = new byte[CurrentLength + 5];
-                    System.Buffer.BlockCopy(Buffer, 0, FinalCommand, 0, (int)CurrentLength + 5);
-                }
-                else
-                {
-                    FinalCommand = Buffer;
-                }
-
-                Serial.SendCommand(FinalCommand, ResponsePattern);
-
-                CurrentPosition += CurrentLength;
-                Remaining -= CurrentLength;
-
-                Progress?.IncreaseProgress(GetSectorCount(CurrentLength));
-            }
-        }
-
-        public void Flash(UInt32 StartInBytes, byte[] Data, UInt32 OffsetInBytes = 0, UInt32 LengthInBytes = UInt32.MaxValue)
-        {
-            Flash(StartInBytes, Data, null, null, OffsetInBytes, LengthInBytes);
-        }
-
-        public void Flash(UInt32 StartInBytes, byte[] Data, Action<int, TimeSpan?> ProgressUpdateCallback, UInt32 OffsetInBytes = 0, UInt32 LengthInBytes = UInt32.MaxValue)
-        {
-            Flash(StartInBytes, Data, ProgressUpdateCallback, null, OffsetInBytes, LengthInBytes);
-        }
-
-        public void Flash(UInt32 StartInBytes, byte[] Data, ProgressUpdater UpdaterPerSector, UInt32 OffsetInBytes = 0, UInt32 LengthInBytes = UInt32.MaxValue)
-        {
-            Flash(StartInBytes, Data, null, UpdaterPerSector, OffsetInBytes, LengthInBytes);
-        }
-
-        public void Flash(UInt32 StartInBytes, byte[] Data, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector, UInt32 OffsetInBytes = 0, UInt32 LengthInBytes = UInt32.MaxValue)
-        {
-            long RemainingBytes;
-            if (OffsetInBytes > (Data.Length - 1))
-            {
-                throw new ArgumentException("Wrong offset");
-            }
-
-            RemainingBytes = (LengthInBytes == UInt32.MaxValue) || (LengthInBytes > (Data.Length - OffsetInBytes))
-                ? Data.Length - OffsetInBytes
-                : LengthInBytes;
-
-            UInt32 CurrentLength;
-            UInt32 CurrentOffset = OffsetInBytes;
-            byte[] Buffer = new byte[0x405];
-            byte[] ResponsePattern = new byte[5];
-            byte[] FinalCommand;
-            Buffer[0] = 0x07;
-            ResponsePattern[0] = 0x08;
-            UInt32 CurrentPosition = StartInBytes;
-
-            ProgressUpdater Progress = UpdaterPerSector;
-            if ((Progress == null) && (ProgressUpdateCallback != null))
-            {
-                Progress = new ProgressUpdater(GetSectorCount((UInt64)RemainingBytes), ProgressUpdateCallback);
-            }
-
-            while (RemainingBytes > 0)
-            {
-                System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentPosition), 0, Buffer, 1, 4); // Start position is in bytes and in Little Endian (on Samsung phones the start position is in Sectors!!)
-                System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentPosition), 0, ResponsePattern, 1, 4); // Start position is in bytes and in Little Endian (on Samsung phones the start position is in Sectors!!)
-
-                CurrentLength = RemainingBytes >= 0x400 ? 0x400 : (UInt32)RemainingBytes;
-
-                System.Buffer.BlockCopy(Data, (int)CurrentOffset, Buffer, 5, (int)CurrentLength);
-
-                if (CurrentLength < 0x400)
-                {
-                    FinalCommand = new byte[CurrentLength + 5];
-                    System.Buffer.BlockCopy(Buffer, 0, FinalCommand, 0, (int)CurrentLength + 5);
-                }
-                else
-                {
-                    FinalCommand = Buffer;
-                }
-
-                Serial.SendCommand(FinalCommand, ResponsePattern);
-
-                CurrentPosition += CurrentLength;
-                CurrentOffset += CurrentLength;
-                RemainingBytes -= CurrentLength;
-
-                Progress?.IncreaseProgress(GetSectorCount(CurrentLength));
-            }
-        }
-
-        public UInt64 GetSectorCount(UInt64 ByteCount)
-        {
-            return (ByteCount / 0x200) + ((ByteCount % 0x200) > 0 ? 1 : (UInt64)0);
-        }
-
-        public void Reboot()
-        {
-            Serial.SendCommand(new byte[] { 0x0B }, new byte[] { 0x0C });
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.IO;
+
+namespace WPinternals
+{
+    internal enum FlashUnit
+    {
+        Bytes,
+        Sectors
+    }
+
+    internal class QualcommFlasher
+    {
+        private readonly QualcommSerial Serial;
+
+        public QualcommFlasher(QualcommSerial Serial)
+        {
+            this.Serial = Serial;
+        }
+
+        public void CloseSerial()
+        {
+            Serial.Close();
+        }
+
+        public void Hello()
+        {
+            byte[] Command = new byte[]
+            {
+                0x01, // Hello command
+                0x51, 0x43, 0x4F, 0x4D, 0x20, 0x66, 0x61, 0x73, 0x74, 0x20, 0x64, 0x6F, 0x77, 0x6E, 0x6C, 0x6F, // "QCOM fast download protocol host"
+                0x61, 0x64, 0x20, 0x70, 0x72, 0x6F, 0x74, 0x6F, 0x63, 0x6F, 0x6C, 0x20, 0x68, 0x6F, 0x73, 0x74,
+                0x02,
+                0x02, // Protocol version - Must be at least 0x02
+                0x01
+            };
+
+            Serial.SendCommand(Command, new byte[] { 0x02 });
+        }
+
+        public void SetSecurityMode(byte Mode)
+        {
+            byte[] Command = new byte[2];
+            Command[0] = 0x17;
+            Command[1] = Mode;
+
+            Serial.SendCommand(Command, new byte[] { 0x18 });
+        }
+
+        // Use PartitionID 0x21
+        public void OpenPartition(byte PartitionID)
+        {
+            byte[] Command = new byte[2];
+            Command[0] = 0x1B;
+            Command[1] = PartitionID;
+
+            Serial.SendCommand(Command, new byte[] { 0x1C });
+        }
+
+        public void ClosePartition()
+        {
+            Serial.SendCommand(new byte[] { 0x15 }, new byte[] { 0x16 });
+        }
+
+        public void Flash(UInt32 StartInBytes, Stream Data, UInt32 LengthInBytes = UInt32.MaxValue)
+        {
+            Flash(StartInBytes, Data, null, null, LengthInBytes);
+        }
+
+        public void Flash(UInt32 StartInBytes, Stream Data, Action<int, TimeSpan?> ProgressUpdateCallback, UInt32 LengthInBytes = UInt32.MaxValue)
+        {
+            Flash(StartInBytes, Data, ProgressUpdateCallback, null, LengthInBytes);
+        }
+
+        public void Flash(UInt32 StartInBytes, Stream Data, ProgressUpdater UpdaterPerSector, UInt32 LengthInBytes = UInt32.MaxValue)
+        {
+            Flash(StartInBytes, Data, null, UpdaterPerSector, LengthInBytes);
+        }
+
+        public void Flash(UInt32 StartInBytes, Stream Data, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector, UInt32 LengthInBytes = UInt32.MaxValue)
+        {
+            long Remaining = (LengthInBytes == UInt32.MaxValue) || (LengthInBytes > (Data.Length - Data.Position))
+                ? Data.Length - Data.Position
+                : LengthInBytes;
+            UInt32 CurrentLength;
+            byte[] Buffer = new byte[0x405];
+            byte[] ResponsePattern = new byte[5];
+            byte[] FinalCommand;
+            Buffer[0] = 0x07;
+            ResponsePattern[0] = 0x08;
+            UInt32 CurrentPosition = StartInBytes;
+
+            ProgressUpdater Progress = UpdaterPerSector;
+            if ((Progress == null) && (ProgressUpdateCallback != null))
+            {
+                Progress = new ProgressUpdater(GetSectorCount((UInt64)Remaining), ProgressUpdateCallback);
+            }
+
+            while (Remaining > 0)
+            {
+                System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentPosition), 0, Buffer, 1, 4); // Start is in bytes and in Little Endian (on Samsung devices start is in sectors!)
+                System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentPosition), 0, ResponsePattern, 1, 4); // Start is in bytes and in Little Endian (on Samsung devices start is in sectors!)
+
+                CurrentLength = Remaining >= 0x400 ? 0x400 : (UInt32)Remaining;
+
+                CurrentLength = (uint)Data.Read(Buffer, 5, (int)CurrentLength);
+
+                if (CurrentLength < 0x400)
+                {
+                    FinalCommand = new byte[CurrentLength + 5];
+                    System.Buffer.BlockCopy(Buffer, 0, FinalCommand, 0, (int)CurrentLength + 5);
+                }
+                else
+                {
+                    FinalCommand = Buffer;
+                }
+
+                Serial.SendCommand(FinalCommand, ResponsePattern);
+
+                CurrentPosition += CurrentLength;
+                Remaining -= CurrentLength;
+
+                Progress?.IncreaseProgress(GetSectorCount(CurrentLength));
+            }
+        }
+
+        public void Flash(UInt32 StartInBytes, byte[] Data, UInt32 OffsetInBytes = 0, UInt32 LengthInBytes = UInt32.MaxValue)
+        {
+            Flash(StartInBytes, Data, null, null, OffsetInBytes, LengthInBytes);
+        }
+
+        public void Flash(UInt32 StartInBytes, byte[] Data, Action<int, TimeSpan?> ProgressUpdateCallback, UInt32 OffsetInBytes = 0, UInt32 LengthInBytes = UInt32.MaxValue)
+        {
+            Flash(StartInBytes, Data, ProgressUpdateCallback, null, OffsetInBytes, LengthInBytes);
+        }
+
+        public void Flash(UInt32 StartInBytes, byte[] Data, ProgressUpdater UpdaterPerSector, UInt32 OffsetInBytes = 0, UInt32 LengthInBytes = UInt32.MaxValue)
+        {
+            Flash(StartInBytes, Data, null, UpdaterPerSector, OffsetInBytes, LengthInBytes);
+        }
+
+        public void Flash(UInt32 StartInBytes, byte[] Data, Action<int, TimeSpan?> ProgressUpdateCallback, ProgressUpdater UpdaterPerSector, UInt32 OffsetInBytes = 0, UInt32 LengthInBytes = UInt32.MaxValue)
+        {
+            long RemainingBytes;
+            if (OffsetInBytes > (Data.Length - 1))
+            {
+                throw new ArgumentException("Wrong offset");
+            }
+
+            RemainingBytes = (LengthInBytes == UInt32.MaxValue) || (LengthInBytes > (Data.Length - OffsetInBytes))
+                ? Data.Length - OffsetInBytes
+                : LengthInBytes;
+
+            UInt32 CurrentLength;
+            UInt32 CurrentOffset = OffsetInBytes;
+            byte[] Buffer = new byte[0x405];
+            byte[] ResponsePattern = new byte[5];
+            byte[] FinalCommand;
+            Buffer[0] = 0x07;
+            ResponsePattern[0] = 0x08;
+            UInt32 CurrentPosition = StartInBytes;
+
+            ProgressUpdater Progress = UpdaterPerSector;
+            if ((Progress == null) && (ProgressUpdateCallback != null))
+            {
+                Progress = new ProgressUpdater(GetSectorCount((UInt64)RemainingBytes), ProgressUpdateCallback);
+            }
+
+            while (RemainingBytes > 0)
+            {
+                System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentPosition), 0, Buffer, 1, 4); // Start position is in bytes and in Little Endian (on Samsung phones the start position is in Sectors!!)
+                System.Buffer.BlockCopy(BitConverter.GetBytes(CurrentPosition), 0, ResponsePattern, 1, 4); // Start position is in bytes and in Little Endian (on Samsung phones the start position is in Sectors!!)
+
+                CurrentLength = RemainingBytes >= 0x400 ? 0x400 : (UInt32)RemainingBytes;
+
+                System.Buffer.BlockCopy(Data, (int)CurrentOffset, Buffer, 5, (int)CurrentLength);
+
+                if (CurrentLength < 0x400)
+                {
+                    FinalCommand = new byte[CurrentLength + 5];
+                    System.Buffer.BlockCopy(Buffer, 0, FinalCommand, 0, (int)CurrentLength + 5);
+                }
+                else
+                {
+                    FinalCommand = Buffer;
+                }
+
+                Serial.SendCommand(FinalCommand, ResponsePattern);
+
+                CurrentPosition += CurrentLength;
+                CurrentOffset += CurrentLength;
+                RemainingBytes -= CurrentLength;
+
+                Progress?.IncreaseProgress(GetSectorCount(CurrentLength));
+            }
+        }
+
+        public UInt64 GetSectorCount(UInt64 ByteCount)
+        {
+            return (ByteCount / 0x200) + ((ByteCount % 0x200) > 0 ? 1 : (UInt64)0);
+        }
+
+        public void Reboot()
+        {
+            Serial.SendCommand(new byte[] { 0x0B }, new byte[] { 0x0C });
+        }
+    }
+}
diff --git a/Models/QualcommLoader.cs b/WPinternals/Models/QualcommLoader.cs
similarity index 97%
rename from Models/QualcommLoader.cs
rename to WPinternals/Models/QualcommLoader.cs
index 390abaa..2506092 100644
--- a/Models/QualcommLoader.cs
+++ b/WPinternals/Models/QualcommLoader.cs
@@ -1,124 +1,124 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-
-namespace WPinternals
-{
-    internal static class QualcommLoaders
-    {
-        internal static List<QualcommPartition> GetPossibleLoadersForRootKeyHash(string Path, byte[] RootKeyHash)
-        {
-            List<QualcommPartition> Result = new();
-
-            try
-            {
-                foreach (string FilePath in Directory.EnumerateFiles(Path))
-                {
-                    try
-                    {
-                        FileInfo Info = new(FilePath);
-                        if (Info.Length <= 0x80000)
-                        {
-                            QualcommPartition Loader;
-
-#if DEBUG
-                            System.Diagnostics.Debug.Print("Evaluating loader: " + FilePath);
-#endif
-
-                            byte[] Binary = ParseAsHexFile(FilePath);
-                            Loader = Binary == null ? new QualcommPartition(FilePath) : new QualcommPartition(Binary);
-
-                            // Make sure the RootKeyHash is not blank
-                            // If the RootKeyHash is blank, this is an engineering device, and it will accept any RKH
-                            // We expect the user to know what he is doing in such case and we will ignore checks
-                            if (!StructuralComparisons.StructuralEqualityComparer.Equals(RootKeyHash, new byte[RootKeyHash.Length]))
-                            {
-                                if (StructuralComparisons.StructuralEqualityComparer.Equals(Loader.RootKeyHash, RootKeyHash)
-                                    && (ByteOperations.FindUnicode(Loader.Binary, "QHSUSB_ARMPRG") != null)) // To detect that this is a loader, and not SBL1 or something. V1 loaders are QHSUSB_ARMPRG. V2 loaders are QHSUSB__BULK. Only V1 supported for now, because V2 only accepts signed payload.
-                                {
-                                    Result.Add(Loader);
-                                }
-                            }
-                            else
-                            {
-                                if (ByteOperations.FindUnicode(Loader.Binary, "QHSUSB_ARMPRG") != null) // To detect that this is a loader, and not SBL1 or something. V1 loaders are QHSUSB_ARMPRG. V2 loaders are QHSUSB__BULK. Only V1 supported for now, because V2 only accepts signed payload.
-                                {
-                                    Result.Add(Loader);
-                                }
-                            }
-                        }
-                    }
-                    catch { }
-                }
-            }
-            catch { }
-
-            return Result;
-        }
-
-        internal static byte[] ParseAsHexFile(string FilePath)
-        {
-            byte[] Result = null;
-
-            try
-            {
-                string[] Lines = File.ReadAllLines(FilePath);
-                byte[] Buffer = null;
-                int BufferSize = 0;
-
-                foreach (string Line in Lines)
-                {
-                    if (Line[0] != ':')
-                    {
-                        throw new BadImageFormatException();
-                    }
-
-                    byte[] LineBytes = Converter.ConvertStringToHex(Line[1..]);
-
-                    if ((LineBytes[0] + 5) != LineBytes.Length)
-                    {
-                        throw new BadImageFormatException();
-                    }
-
-                    if (Buffer == null)
-                    {
-                        Buffer = new byte[0x40000];
-                    }
-
-                    if (LineBytes[3] == 0) // This is mem data
-                    {
-                        System.Buffer.BlockCopy(LineBytes, 4, Buffer, BufferSize, LineBytes[0]);
-                        BufferSize += LineBytes[0];
-                    }
-                }
-
-                Result = new byte[BufferSize];
-                System.Buffer.BlockCopy(Buffer, 0, Result, 0, BufferSize);
-            }
-            catch { }
-
-            return Result;
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+
+namespace WPinternals
+{
+    internal static class QualcommLoaders
+    {
+        internal static List<QualcommPartition> GetPossibleLoadersForRootKeyHash(string Path, byte[] RootKeyHash)
+        {
+            List<QualcommPartition> Result = new();
+
+            try
+            {
+                foreach (string FilePath in Directory.EnumerateFiles(Path))
+                {
+                    try
+                    {
+                        FileInfo Info = new(FilePath);
+                        if (Info.Length <= 0x80000)
+                        {
+                            QualcommPartition Loader;
+
+#if DEBUG
+                            System.Diagnostics.Debug.Print("Evaluating loader: " + FilePath);
+#endif
+
+                            byte[] Binary = ParseAsHexFile(FilePath);
+                            Loader = Binary == null ? new QualcommPartition(FilePath) : new QualcommPartition(Binary);
+
+                            // Make sure the RootKeyHash is not blank
+                            // If the RootKeyHash is blank, this is an engineering device, and it will accept any RKH
+                            // We expect the user to know what he is doing in such case and we will ignore checks
+                            if (!StructuralComparisons.StructuralEqualityComparer.Equals(RootKeyHash, new byte[RootKeyHash.Length]))
+                            {
+                                if (StructuralComparisons.StructuralEqualityComparer.Equals(Loader.RootKeyHash, RootKeyHash)
+                                    && (ByteOperations.FindUnicode(Loader.Binary, "QHSUSB_ARMPRG") != null)) // To detect that this is a loader, and not SBL1 or something. V1 loaders are QHSUSB_ARMPRG. V2 loaders are QHSUSB__BULK. Only V1 supported for now, because V2 only accepts signed payload.
+                                {
+                                    Result.Add(Loader);
+                                }
+                            }
+                            else
+                            {
+                                if (ByteOperations.FindUnicode(Loader.Binary, "QHSUSB_ARMPRG") != null) // To detect that this is a loader, and not SBL1 or something. V1 loaders are QHSUSB_ARMPRG. V2 loaders are QHSUSB__BULK. Only V1 supported for now, because V2 only accepts signed payload.
+                                {
+                                    Result.Add(Loader);
+                                }
+                            }
+                        }
+                    }
+                    catch { }
+                }
+            }
+            catch { }
+
+            return Result;
+        }
+
+        internal static byte[] ParseAsHexFile(string FilePath)
+        {
+            byte[] Result = null;
+
+            try
+            {
+                string[] Lines = File.ReadAllLines(FilePath);
+                byte[] Buffer = null;
+                int BufferSize = 0;
+
+                foreach (string Line in Lines)
+                {
+                    if (Line[0] != ':')
+                    {
+                        throw new BadImageFormatException();
+                    }
+
+                    byte[] LineBytes = Converter.ConvertStringToHex(Line[1..]);
+
+                    if ((LineBytes[0] + 5) != LineBytes.Length)
+                    {
+                        throw new BadImageFormatException();
+                    }
+
+                    if (Buffer == null)
+                    {
+                        Buffer = new byte[0x40000];
+                    }
+
+                    if (LineBytes[3] == 0) // This is mem data
+                    {
+                        System.Buffer.BlockCopy(LineBytes, 4, Buffer, BufferSize, LineBytes[0]);
+                        BufferSize += LineBytes[0];
+                    }
+                }
+
+                Result = new byte[BufferSize];
+                System.Buffer.BlockCopy(Buffer, 0, Result, 0, BufferSize);
+            }
+            catch { }
+
+            return Result;
+        }
+    }
+}
diff --git a/Models/QualcommPartition.cs b/WPinternals/Models/QualcommPartition.cs
similarity index 97%
rename from Models/QualcommPartition.cs
rename to WPinternals/Models/QualcommPartition.cs
index ff4ce53..9281ddb 100644
--- a/Models/QualcommPartition.cs
+++ b/WPinternals/Models/QualcommPartition.cs
@@ -1,174 +1,174 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.Security.Cryptography;
-
-namespace WPinternals
-{
-    internal enum QualcommPartitionHeaderType
-    {
-        Long,
-        Short
-    };
-
-    internal class QualcommPartition
-    {
-        internal byte[] Binary;
-        internal uint HeaderOffset;
-        internal QualcommPartitionHeaderType HeaderType;
-        internal uint ImageOffset;
-        internal uint ImageAddress;
-        internal uint ImageSize;
-        internal uint CodeSize;
-        internal uint SignatureAddress;
-        internal uint SignatureSize;
-        internal uint SignatureOffset;
-        internal uint CertificatesAddress;
-        internal uint CertificatesSize;
-        internal uint CertificatesOffset;
-        internal byte[] RootKeyHash = null;
-
-        internal QualcommPartition(string Path) : this(File.ReadAllBytes(Path)) { }
-
-        internal QualcommPartition(byte[] Binary, uint Offset = 0)
-        {
-#if DEBUG
-            System.Diagnostics.Debug.Print("Loader: " + Converter.ConvertHexToString(new SHA256Managed().ComputeHash(Binary, 0, Binary.Length), ""));
-#endif
-
-            this.Binary = Binary;
-
-            byte[] LongHeaderPattern = new byte[] { 0xD1, 0xDC, 0x4B, 0x84, 0x34, 0x10, 0xD7, 0x73, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-            byte[] LongHeaderMask = new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-
-            if (ByteOperations.FindPattern(Binary, Offset, 4, new byte[] { 0x7F, 0x45, 0x4C, 0x46 }, new byte[] { 0x00, 0x00, 0x00, 0x00 }, null) == 0)
-            {
-                // This is an ELF image
-                // First program header is a reference to the elf-header
-                // Second program header is a reference to the signed hash-table
-                HeaderType = QualcommPartitionHeaderType.Short;
-                UInt32 ProgramHeaderOffset;
-                UInt16 ProgramHeaderEntrySize;
-                UInt32 HashTableProgramHeaderOffset;
-                if (Binary[Offset + 0x04] == 1)
-                {
-                    // 32-bit elf image
-                    ProgramHeaderOffset = Offset + ByteOperations.ReadUInt32(Binary, Offset + 0x1c);
-                    ProgramHeaderEntrySize = ByteOperations.ReadUInt16(Binary, Offset + 0x2a);
-                    HashTableProgramHeaderOffset = ProgramHeaderOffset + ProgramHeaderEntrySize;
-                    ImageOffset = Offset + ByteOperations.ReadUInt32(Binary, HashTableProgramHeaderOffset + 0x04);
-                    HeaderOffset = ImageOffset + 8;
-                }
-                else if (Binary[Offset + 0x04] == 2)
-                {
-                    // 64-bit elf image
-                    ProgramHeaderOffset = Offset + ByteOperations.ReadUInt32(Binary, Offset + 0x20);
-                    ProgramHeaderEntrySize = ByteOperations.ReadUInt16(Binary, Offset + 0x36);
-                    HashTableProgramHeaderOffset = ProgramHeaderOffset + ProgramHeaderEntrySize;
-                    ImageOffset = Offset + (UInt32)ByteOperations.ReadUInt64(Binary, HashTableProgramHeaderOffset + 0x08);
-                    HeaderOffset = ImageOffset + 8;
-                }
-                else
-                {
-                    throw new WPinternalsException("Invalid programmer", "The type of elf image could not be determined from the provided programmer.");
-                }
-            }
-            else if (ByteOperations.FindPattern(Binary, Offset, (uint)LongHeaderPattern.Length, LongHeaderPattern, LongHeaderMask, null) == null)
-            {
-                HeaderType = QualcommPartitionHeaderType.Short;
-                ImageOffset = Offset;
-                HeaderOffset = ImageOffset + 8;
-            }
-            else
-            {
-                HeaderType = QualcommPartitionHeaderType.Long;
-                ImageOffset = Offset;
-                HeaderOffset = ImageOffset + (uint)LongHeaderPattern.Length;
-            }
-
-            if (ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X00) != 0)
-            {
-                ImageOffset = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X00);
-            }
-            else if (HeaderType == QualcommPartitionHeaderType.Short)
-            {
-                ImageOffset += 0x28;
-            }
-            else
-            {
-                ImageOffset += 0x50;
-            }
-
-            ImageAddress = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X04);
-            ImageSize = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X08);
-            CodeSize = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X0C);
-            SignatureAddress = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X10);
-            SignatureSize = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X14);
-            SignatureOffset = SignatureAddress - ImageAddress + ImageOffset;
-            CertificatesAddress = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X18);
-            CertificatesSize = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X1C);
-            CertificatesOffset = CertificatesAddress - ImageAddress + ImageOffset;
-
-            uint CurrentCertificateOffset = CertificatesOffset;
-            uint CertificateSize = 0;
-            while (CurrentCertificateOffset < (CertificatesOffset + CertificatesSize))
-            {
-                if ((Binary[CurrentCertificateOffset] == 0x30) && (Binary[CurrentCertificateOffset + 1] == 0x82))
-                {
-                    CertificateSize = (uint)(Binary[CurrentCertificateOffset + 2] * 0x100) + Binary[CurrentCertificateOffset + 3] + 4; // Big endian!
-
-                    if ((CurrentCertificateOffset + CertificateSize) == (CertificatesOffset + CertificatesSize))
-                    {
-                        // This is the last certificate. So this is the root key.
-                        RootKeyHash = new SHA256Managed().ComputeHash(Binary, (int)CurrentCertificateOffset, (int)CertificateSize);
-
-#if DEBUG
-                        System.Diagnostics.Debug.Print("RKH: " + Converter.ConvertHexToString(RootKeyHash, ""));
-#endif
-                    }
-#if DEBUG
-                    else
-                    {
-                        System.Diagnostics.Debug.Print("Cert: " + Converter.ConvertHexToString(new SHA256Managed().ComputeHash(Binary, (int)CurrentCertificateOffset, (int)CertificateSize), ""));
-                    }
-#endif
-                    CurrentCertificateOffset += CertificateSize;
-                }
-                else
-                {
-                    if ((RootKeyHash == null) && (CurrentCertificateOffset > CertificatesOffset))
-                    {
-                        CurrentCertificateOffset -= CertificateSize;
-
-                        // This is the last certificate. So this is the root key.
-                        RootKeyHash = new SHA256Managed().ComputeHash(Binary, (int)CurrentCertificateOffset, (int)CertificateSize);
-
-#if DEBUG
-                        System.Diagnostics.Debug.Print("RKH: " + Converter.ConvertHexToString(RootKeyHash, ""));
-#endif
-                    }
-                    break;
-                }
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.IO;
+using System.Security.Cryptography;
+
+namespace WPinternals
+{
+    internal enum QualcommPartitionHeaderType
+    {
+        Long,
+        Short
+    };
+
+    internal class QualcommPartition
+    {
+        internal byte[] Binary;
+        internal uint HeaderOffset;
+        internal QualcommPartitionHeaderType HeaderType;
+        internal uint ImageOffset;
+        internal uint ImageAddress;
+        internal uint ImageSize;
+        internal uint CodeSize;
+        internal uint SignatureAddress;
+        internal uint SignatureSize;
+        internal uint SignatureOffset;
+        internal uint CertificatesAddress;
+        internal uint CertificatesSize;
+        internal uint CertificatesOffset;
+        internal byte[] RootKeyHash = null;
+
+        internal QualcommPartition(string Path) : this(File.ReadAllBytes(Path)) { }
+
+        internal QualcommPartition(byte[] Binary, uint Offset = 0)
+        {
+#if DEBUG
+            System.Diagnostics.Debug.Print("Loader: " + Converter.ConvertHexToString(new SHA256Managed().ComputeHash(Binary, 0, Binary.Length), ""));
+#endif
+
+            this.Binary = Binary;
+
+            byte[] LongHeaderPattern = new byte[] { 0xD1, 0xDC, 0x4B, 0x84, 0x34, 0x10, 0xD7, 0x73, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+            byte[] LongHeaderMask = new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+
+            if (ByteOperations.FindPattern(Binary, Offset, 4, new byte[] { 0x7F, 0x45, 0x4C, 0x46 }, new byte[] { 0x00, 0x00, 0x00, 0x00 }, null) == 0)
+            {
+                // This is an ELF image
+                // First program header is a reference to the elf-header
+                // Second program header is a reference to the signed hash-table
+                HeaderType = QualcommPartitionHeaderType.Short;
+                UInt32 ProgramHeaderOffset;
+                UInt16 ProgramHeaderEntrySize;
+                UInt32 HashTableProgramHeaderOffset;
+                if (Binary[Offset + 0x04] == 1)
+                {
+                    // 32-bit elf image
+                    ProgramHeaderOffset = Offset + ByteOperations.ReadUInt32(Binary, Offset + 0x1c);
+                    ProgramHeaderEntrySize = ByteOperations.ReadUInt16(Binary, Offset + 0x2a);
+                    HashTableProgramHeaderOffset = ProgramHeaderOffset + ProgramHeaderEntrySize;
+                    ImageOffset = Offset + ByteOperations.ReadUInt32(Binary, HashTableProgramHeaderOffset + 0x04);
+                    HeaderOffset = ImageOffset + 8;
+                }
+                else if (Binary[Offset + 0x04] == 2)
+                {
+                    // 64-bit elf image
+                    ProgramHeaderOffset = Offset + ByteOperations.ReadUInt32(Binary, Offset + 0x20);
+                    ProgramHeaderEntrySize = ByteOperations.ReadUInt16(Binary, Offset + 0x36);
+                    HashTableProgramHeaderOffset = ProgramHeaderOffset + ProgramHeaderEntrySize;
+                    ImageOffset = Offset + (UInt32)ByteOperations.ReadUInt64(Binary, HashTableProgramHeaderOffset + 0x08);
+                    HeaderOffset = ImageOffset + 8;
+                }
+                else
+                {
+                    throw new WPinternalsException("Invalid programmer", "The type of elf image could not be determined from the provided programmer.");
+                }
+            }
+            else if (ByteOperations.FindPattern(Binary, Offset, (uint)LongHeaderPattern.Length, LongHeaderPattern, LongHeaderMask, null) == null)
+            {
+                HeaderType = QualcommPartitionHeaderType.Short;
+                ImageOffset = Offset;
+                HeaderOffset = ImageOffset + 8;
+            }
+            else
+            {
+                HeaderType = QualcommPartitionHeaderType.Long;
+                ImageOffset = Offset;
+                HeaderOffset = ImageOffset + (uint)LongHeaderPattern.Length;
+            }
+
+            if (ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X00) != 0)
+            {
+                ImageOffset = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X00);
+            }
+            else if (HeaderType == QualcommPartitionHeaderType.Short)
+            {
+                ImageOffset += 0x28;
+            }
+            else
+            {
+                ImageOffset += 0x50;
+            }
+
+            ImageAddress = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X04);
+            ImageSize = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X08);
+            CodeSize = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X0C);
+            SignatureAddress = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X10);
+            SignatureSize = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X14);
+            SignatureOffset = SignatureAddress - ImageAddress + ImageOffset;
+            CertificatesAddress = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X18);
+            CertificatesSize = ByteOperations.ReadUInt32(Binary, HeaderOffset + 0X1C);
+            CertificatesOffset = CertificatesAddress - ImageAddress + ImageOffset;
+
+            uint CurrentCertificateOffset = CertificatesOffset;
+            uint CertificateSize = 0;
+            while (CurrentCertificateOffset < (CertificatesOffset + CertificatesSize))
+            {
+                if ((Binary[CurrentCertificateOffset] == 0x30) && (Binary[CurrentCertificateOffset + 1] == 0x82))
+                {
+                    CertificateSize = (uint)(Binary[CurrentCertificateOffset + 2] * 0x100) + Binary[CurrentCertificateOffset + 3] + 4; // Big endian!
+
+                    if ((CurrentCertificateOffset + CertificateSize) == (CertificatesOffset + CertificatesSize))
+                    {
+                        // This is the last certificate. So this is the root key.
+                        RootKeyHash = new SHA256Managed().ComputeHash(Binary, (int)CurrentCertificateOffset, (int)CertificateSize);
+
+#if DEBUG
+                        System.Diagnostics.Debug.Print("RKH: " + Converter.ConvertHexToString(RootKeyHash, ""));
+#endif
+                    }
+#if DEBUG
+                    else
+                    {
+                        System.Diagnostics.Debug.Print("Cert: " + Converter.ConvertHexToString(new SHA256Managed().ComputeHash(Binary, (int)CurrentCertificateOffset, (int)CertificateSize), ""));
+                    }
+#endif
+                    CurrentCertificateOffset += CertificateSize;
+                }
+                else
+                {
+                    if ((RootKeyHash == null) && (CurrentCertificateOffset > CertificatesOffset))
+                    {
+                        CurrentCertificateOffset -= CertificateSize;
+
+                        // This is the last certificate. So this is the root key.
+                        RootKeyHash = new SHA256Managed().ComputeHash(Binary, (int)CurrentCertificateOffset, (int)CertificateSize);
+
+#if DEBUG
+                        System.Diagnostics.Debug.Print("RKH: " + Converter.ConvertHexToString(RootKeyHash, ""));
+#endif
+                    }
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/Models/QualcommSahara.cs b/WPinternals/Models/QualcommSahara.cs
similarity index 97%
rename from Models/QualcommSahara.cs
rename to WPinternals/Models/QualcommSahara.cs
index 192e84f..bfbefff 100644
--- a/Models/QualcommSahara.cs
+++ b/WPinternals/Models/QualcommSahara.cs
@@ -1,600 +1,600 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace WPinternals
-{
-    internal enum SaharaMode : uint
-    {
-        ImageTransferPending = 0x00,
-        ImagetransferComplete = 0x01,
-        MemoryDebug = 0x02,
-        Command = 0x03
-    }
-
-    internal delegate void ReadyHandler();
-
-    internal class QualcommSahara
-    {
-        private readonly QualcommSerial Serial;
-
-        public QualcommSahara(QualcommSerial Serial)
-        {
-            Serial.EncodeCommands = false;
-            Serial.DecodeResponses = false;
-            this.Serial = Serial;
-        }
-
-        public bool SendImage(string Path)
-        {
-            bool Result = true;
-
-            LogFile.Log("Sending programmer: " + Path, LogType.FileOnly);
-
-            int Step = 0;
-            UInt32 Offset = 0;
-            UInt32 Length = 0;
-
-            byte[] ImageBuffer = null;
-            try
-            {
-                Step = 1;
-                byte[] Hello = Serial.GetResponse(new byte[] { 0x01, 0x00, 0x00, 0x00 });
-
-                // Incoming Hello packet:
-                // 00000001 = Hello command id
-                // xxxxxxxx = Length
-                // xxxxxxxx = Protocol version
-                // xxxxxxxx = Supported version
-                // xxxxxxxx = Max packet length
-                // xxxxxxxx = Expected mode
-                // 6 dwords reserved space
-                LogFile.Log("Protocol: 0x" + ByteOperations.ReadUInt32(Hello, 0x08).ToString("X8"), LogType.FileOnly);
-                LogFile.Log("Supported: 0x" + ByteOperations.ReadUInt32(Hello, 0x0C).ToString("X8"), LogType.FileOnly);
-                LogFile.Log("MaxLength: 0x" + ByteOperations.ReadUInt32(Hello, 0x10).ToString("X8"), LogType.FileOnly);
-                LogFile.Log("Mode: 0x" + ByteOperations.ReadUInt32(Hello, 0x14).ToString("X8"), LogType.FileOnly);
-
-                // Packet:
-                // 00000002 = Hello response command id
-                // 00000030 = Length
-                // 00000002 = Protocol version
-                // 00000001 = Supported version
-                // 00000000 = Status OK
-                // 00000000 = Mode
-                // rest is reserved space
-                Step = 2;
-                byte[] HelloResponse = new byte[] {
-                    0x02, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                };
-                Serial.SendData(HelloResponse);
-
-                Step = 3;
-                using FileStream FileStream = new(Path, FileMode.Open, FileAccess.Read);
-                while (true)
-                {
-                    Step = 4;
-                    byte[] ReadDataRequest = Serial.GetResponse(null);
-                    UInt32 ResponseID = ByteOperations.ReadUInt32(ReadDataRequest, 0);
-                    if (ResponseID == 4)
-                    {
-                        break;
-                    }
-
-                    if (ResponseID != 3)
-                    {
-                        Step = 5;
-                        throw new BadConnectionException();
-                    }
-
-                    Offset = ByteOperations.ReadUInt32(ReadDataRequest, 0x0C);
-                    Length = ByteOperations.ReadUInt32(ReadDataRequest, 0x10);
-                    if ((ImageBuffer == null) || (ImageBuffer.Length != Length))
-                    {
-                        ImageBuffer = new byte[Length];
-                    }
-
-                    if (FileStream.Position != Offset)
-                    {
-                        FileStream.Seek(Offset, SeekOrigin.Begin);
-                    }
-
-                    Step = 6;
-                    FileStream.Read(ImageBuffer, 0, (int)Length);
-
-                    Step = 7;
-                    Serial.SendData(ImageBuffer);
-                }
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex, LogType.FileAndConsole, Step.ToString() + " 0x" + Offset.ToString("X8") + " 0x" + Length.ToString("X8"));
-                Result = false;
-            }
-
-            if (Result)
-            {
-                LogFile.Log("Programmer loaded into phone memory", LogType.FileOnly);
-            }
-
-            return Result;
-        }
-
-        public bool Handshake()
-        {
-            bool Result = true;
-
-            try
-            {
-                byte[] Hello = Serial.GetResponse(new byte[] { 0x01, 0x00, 0x00, 0x00 });
-
-                // Incoming Hello packet:
-                // 00000001 = Hello command id
-                // xxxxxxxx = Length
-                // xxxxxxxx = Protocol version
-                // xxxxxxxx = Supported version
-                // xxxxxxxx = Max packet length
-                // xxxxxxxx = Expected mode
-                // 6 dwords reserved space
-                LogFile.Log("Protocol: 0x" + ByteOperations.ReadUInt32(Hello, 0x08).ToString("X8"), LogType.FileOnly);
-                LogFile.Log("Supported: 0x" + ByteOperations.ReadUInt32(Hello, 0x0C).ToString("X8"), LogType.FileOnly);
-                LogFile.Log("MaxLength: 0x" + ByteOperations.ReadUInt32(Hello, 0x10).ToString("X8"), LogType.FileOnly);
-                LogFile.Log("Mode: 0x" + ByteOperations.ReadUInt32(Hello, 0x14).ToString("X8"), LogType.FileOnly);
-
-                byte[] HelloResponse = new byte[] {
-                    0x02, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                };
-
-                byte[] Ready = Serial.SendCommand(HelloResponse, new byte[] { 0x03, 0x00, 0x00, 0x00 });
-            }
-            catch
-            {
-                Result = false;
-            }
-
-            return Result;
-        }
-
-        public void ResetSahara()
-        {
-            Serial.SendCommand(new byte[] { 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 }, new byte[] { 0x08, 0x00, 0x00, 0x00 });
-        }
-
-        public bool ConnectToProgrammer(byte[] PacketFromPcToProgrammer)
-        {
-            // Behaviour of old firehose:
-            // Takes about 20 ms to be started.
-            // Then PC has to start talking to the phone.
-            // Behaviour of new firehose:
-            // After 2000 ms the firehose starts talking to the PC
-            //
-            // For the duration of 2.5 seconds we will send Hello packages
-            // And also wait for incoming messages
-            // An incoming message can be a response to our outgoing Hello packet (read incoming until "response value")
-            // Or it can be an incoming Hello-packet from the programmer (always 2 packets, starting with "Chip serial num")
-            // Sending the hello-packet can succeed immediately, or it can timeout.
-            // When sending succeeds, an answer should be incoming immediately to complete the handshake.
-            // When an incoming Hello was received, the phone still expects to receive another Hello.
-
-            int HelloSendCount = 0;
-            bool HandshakeCompleted = false;
-            string Incoming;
-            do
-            {
-                Serial.SetTimeOut(200);
-                HelloSendCount++;
-                try
-                {
-                    LogFile.Log("Send Hello to programmer (" + HelloSendCount.ToString() + ")", LogType.FileOnly);
-                    Serial.SendData(PacketFromPcToProgrammer);
-                    LogFile.Log("Hello packet accepted", LogType.FileOnly);
-                }
-                catch
-                {
-                    LogFile.Log("Hello packet not accepted", LogType.FileOnly);
-                }
-
-                try
-                {
-                    Serial.SetTimeOut(500);
-                    Incoming = Encoding.ASCII.GetString(Serial.GetResponse(null));
-                    LogFile.Log("In: " + Incoming, LogType.FileOnly);
-                    Serial.SetTimeOut(200);
-                    if (Incoming.Contains("Chip serial num"))
-                    {
-                        Incoming = Encoding.ASCII.GetString(Serial.GetResponse(null));
-                        LogFile.Log("In: " + Incoming, LogType.FileOnly);
-                        LogFile.Log("Incoming Hello-packets received", LogType.FileOnly);
-                    }
-
-                    while (Incoming.IndexOf("response value") < 0)
-                    {
-                        Incoming = Encoding.ASCII.GetString(Serial.GetResponse(null));
-                        LogFile.Log("In: " + Incoming, LogType.FileOnly);
-                    }
-
-                    LogFile.Log("Incoming Hello-response received", LogType.FileOnly);
-
-                    if (!Incoming.Contains("Failed to authenticate Digital Signature."))
-                    {
-                        HandshakeCompleted = true;
-                    }
-                    else
-                    {
-                        LogFile.Log("Programmer failed to authenticate Digital Signature", LogType.FileOnly);
-                    }
-                }
-                catch { }
-            }
-            while (!HandshakeCompleted && (HelloSendCount < 6));
-
-            return HandshakeCompleted;
-        }
-
-        public bool ConnectToProgrammerInTestMode()
-        {
-            byte[] HelloPacketFromPcToProgrammer = new byte[0x20C];
-            ByteOperations.WriteUInt32(HelloPacketFromPcToProgrammer, 0, 0x57503730);
-            ByteOperations.WriteUInt32(HelloPacketFromPcToProgrammer, 0x28, 0x57503730);
-            ByteOperations.WriteUInt32(HelloPacketFromPcToProgrammer, 0x208, 0x57503730);
-            ByteOperations.WriteUInt16(HelloPacketFromPcToProgrammer, 0x48, 0x4445);
-
-            bool HandshakeCompleted = ConnectToProgrammer(HelloPacketFromPcToProgrammer);
-
-            if (HandshakeCompleted)
-            {
-                LogFile.Log("Handshake completed with programmer in testmode", LogType.FileOnly);
-            }
-            else
-            {
-                LogFile.Log("Handshake with programmer failed", LogType.FileOnly);
-            }
-
-            return HandshakeCompleted;
-        }
-
-        public async Task<bool> Reset(string ProgrammerPath)
-        {
-            bool SendImageResult = await Task.Run(() => SendImage(ProgrammerPath));
-            if (!SendImageResult)
-            {
-                return false;
-            }
-
-            await Task.Run(() => StartProgrammer());
-
-            bool Connected = await Task.Run(() => ConnectToProgrammerInTestMode());
-            if (!Connected)
-            {
-                return false;
-            }
-
-            LogFile.Log("Rebooting phone", LogType.FileAndConsole);
-            const string Command03 = "<?xml version=\"1.0\" ?><data><power value=\"reset\"/></data>";
-            LogFile.Log("Out: " + Command03, LogType.FileOnly);
-            Serial.SendData(Encoding.ASCII.GetBytes(Command03));
-
-            string Incoming;
-            do
-            {
-                Incoming = Encoding.ASCII.GetString(Serial.GetResponse(null));
-                LogFile.Log("In: " + Incoming, LogType.FileOnly);
-            }
-            while (Incoming.IndexOf("response value") < 0);
-
-            // Workaround for problem
-            // SerialPort is sometimes not disposed correctly when the device is already removed.
-            // So explicitly dispose here
-            Serial.Close();
-
-            return true;
-        }
-
-        public void SwitchMode(SaharaMode Mode)
-        {
-            byte[] SwitchModeCommand = new byte[] { 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-            ByteOperations.WriteUInt32(SwitchModeCommand, 8, (UInt32)Mode);
-            byte[] ResponsePattern = null;
-            switch (Mode)
-            {
-                case SaharaMode.ImageTransferPending:
-                    ResponsePattern = new byte[] { 0x04, 0x00, 0x00, 0x00 };
-                    break;
-                case SaharaMode.MemoryDebug:
-                    ResponsePattern = new byte[] { 0x09, 0x00, 0x00, 0x00 };
-                    break;
-                case SaharaMode.Command:
-                    ResponsePattern = new byte[] { 0x0B, 0x00, 0x00, 0x00 };
-                    break;
-            }
-            Serial.SendCommand(SwitchModeCommand, ResponsePattern);
-        }
-
-        public void StartProgrammer()
-        {
-            LogFile.Log("Starting programmer", LogType.FileAndConsole);
-            byte[] DoneCommand = new byte[] { 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 };
-            bool Started = false;
-            int count = 0;
-            do
-            {
-                count++;
-                try
-                {
-                    byte[] DoneResponse = Serial.SendCommand(DoneCommand, new byte[] { 0x06, 0x00, 0x00, 0x00 });
-                    Started = true;
-                }
-                catch (BadConnectionException)
-                {
-                    LogFile.Log("Problem while starting programmer. Attempting again.", LogType.FileAndConsole);
-                }
-            } while (!Started && count < 3);
-            if (count >= 3 && !Started)
-            {
-                LogFile.Log("Maximum number of attempts to start the programmer exceeded.", LogType.FileAndConsole);
-                throw new BadConnectionException();
-            }
-            LogFile.Log("Programmer being launched on phone", LogType.FileOnly);
-        }
-
-        public async Task<bool> SendEdPayload(string ProgrammerPath, string PayloadPath)
-        {
-            // First, let's read the Emergency Download payload header and verify its validity
-            FileStream PayloadStream = File.OpenRead(PayloadPath);
-
-            byte[] ValidReferencePayloadHeader = new byte[] { 0x45, 0x6D, 0x65, 0x72, 0x67, 0x65, 0x6E, 0x63, 0x79, 0x20, 0x50, 0x61, 0x79, 0x6C, 0x6F, 0x61, 0x64 };
-
-            byte[] PayloadHeader = new byte[17];
-            PayloadStream.Read(PayloadHeader, 0, 17);
-
-            bool IsValidEdPayloadImage = StructuralComparisons.StructuralEqualityComparer.Equals(PayloadHeader, ValidReferencePayloadHeader);
-            if (!IsValidEdPayloadImage)
-            {
-                return false;
-            }
-
-            // Now let's read the information block
-            PayloadStream.Seek(0x64, SeekOrigin.Begin);
-            byte[] PayloadInformationBlock = new byte[0x64];
-
-            PayloadStream.Read(PayloadInformationBlock, 0, 0x64);
-            string buildtime = Encoding.ASCII.GetString(PayloadInformationBlock).Trim('\0');
-
-            PayloadStream.Read(PayloadInformationBlock, 0, 0x64);
-            string builddate = Encoding.ASCII.GetString(PayloadInformationBlock).Trim('\0');
-
-            PayloadStream.Read(PayloadInformationBlock, 0, 0x64);
-            string version = Encoding.ASCII.GetString(PayloadInformationBlock).Trim('\0');
-
-            PayloadInformationBlock = new byte[0x670];
-            PayloadStream.Read(PayloadInformationBlock, 0, 0x670);
-            string Info = Encoding.ASCII.GetString(PayloadInformationBlock).Trim('\0');
-
-            // Print some information about the payload
-            LogFile.Log("Emerency flasher version 0.1", LogType.FileAndConsole);
-            LogFile.Log("Programmer information:", LogType.FileAndConsole);
-            LogFile.Log("Build time: " + buildtime, LogType.FileAndConsole);
-            LogFile.Log("Build date: " + builddate, LogType.FileAndConsole);
-            LogFile.Log("Version: " + version, LogType.FileAndConsole);
-            LogFile.Log("Info: " + Info, LogType.FileAndConsole);
-
-            // Send the emergency programmer to the phone
-            bool SendImageResult = await Task.Run(() => SendImage(ProgrammerPath));
-            if (!SendImageResult)
-            {
-                return false;
-            }
-
-            // Start the emergency programmer on the phone
-            await Task.Run(() => StartProgrammer());
-
-            // Wait a few seconds before sending commands
-            LogFile.Log("Waiting...", LogType.FileAndConsole);
-            Thread.Sleep(2000);
-            LogFile.Log("Waiting...OK", LogType.FileAndConsole);
-
-            bool Terminated = false;
-            bool Connected = false;
-            bool ProgrammerRawMode = false;
-
-            string Incoming;
-
-            while (!Terminated)
-            {
-                PayloadInformationBlock = new byte[0x200];
-                PayloadStream.Read(PayloadInformationBlock, 0, 0x200);
-                string ProgrammerCommand = Encoding.ASCII.GetString(PayloadInformationBlock.Skip(0xC).ToArray()).Trim('\0');
-
-                LogFile.Log(ProgrammerCommand, LogType.FileAndConsole);
-
-                byte[] PacketFromPcToProgrammer = Array.Empty<byte>();
-                byte[] temp = new byte[0x200];
-
-                while (true)
-                {
-                    if (PayloadStream.Position == PayloadStream.Length)
-                    {
-                        Terminated = true;
-                        break;
-                    }
-
-                    PayloadStream.Read(temp, 0, 0x200);
-
-                    if (temp[12] == 77 && temp[13] == 83 && temp[14] == 71 && temp[15] == 95)
-                    {
-                        PayloadStream.Seek(-0x200, SeekOrigin.Current);
-                        break;
-                    }
-
-                    PacketFromPcToProgrammer = PacketFromPcToProgrammer.Concat(temp).ToArray();
-                }
-
-                bool ExpectingReplyFromProgrammer = false;
-
-                if (ProgrammerCommand.Contains("XML"))
-                {
-                    string Outgoing = Encoding.ASCII.GetString(PacketFromPcToProgrammer).Trim('\0');
-                    PacketFromPcToProgrammer = Encoding.ASCII.GetBytes(Outgoing);
-                    LogFile.Log("Out: " + Outgoing, LogType.FileAndConsole);
-                }
-
-                if (!ProgrammerCommand.Contains("RAW_DATA") && !ProgrammerRawMode)
-                {
-                    ExpectingReplyFromProgrammer = true;
-                }
-
-                if (ProgrammerCommand.Contains("LAST") && ProgrammerRawMode)
-                {
-                    ExpectingReplyFromProgrammer = true;
-                }
-
-                if (ProgrammerCommand.Contains("DATA_ALL") && ProgrammerRawMode)
-                {
-                    ExpectingReplyFromProgrammer = true;
-                }
-
-                if (ProgrammerCommand.Contains("RAW_DATA") && !ProgrammerRawMode)
-                {
-                    LogFile.Log("Phone is not in raw mode ON, leaving...", LogType.FileAndConsole);
-
-                    // Workaround for problem
-                    // SerialPort is sometimes not disposed correctly when the device is already removed.
-                    // So explicitly dispose here
-                    Serial.Close();
-
-                    LogFile.Log("Phone has been emergency flashed unsuccessfully!", LogType.FileAndConsole);
-                    PayloadStream.Dispose();
-
-                    return false;
-                }
-
-                if (!ProgrammerCommand.Contains("RAW_DATA") && ProgrammerRawMode)
-                {
-                    LogFile.Log("Phone is not in raw mode ON, leaving...", LogType.FileAndConsole);
-
-                    // Workaround for problem
-                    // SerialPort is sometimes not disposed correctly when the device is already removed.
-                    // So explicitly dispose here
-                    Serial.Close();
-
-                    LogFile.Log("Phone has been emergency flashed unsuccessfully!", LogType.FileAndConsole);
-                    PayloadStream.Dispose();
-
-                    return false;
-                }
-
-                if (Connected)
-                {
-                    Serial.SendData(PacketFromPcToProgrammer);
-                }
-
-                if (ExpectingReplyFromProgrammer)
-                {
-                    if (!Connected)
-                    {
-                        Connected = ConnectToProgrammer(PacketFromPcToProgrammer);
-
-                        if (Connected)
-                        {
-                            LogFile.Log("Handshake completed with programmer in validated image programming (VIP) mode", LogType.FileAndConsole);
-                        }
-                        else
-                        {
-                            LogFile.Log("Handshake with programmer failed", LogType.FileAndConsole);
-                        }
-
-                        if (!Connected)
-                        {
-                            LogFile.Log("Phone programmer is now ignoring us, leaving...", LogType.FileAndConsole);
-
-                            // Workaround for problem
-                            // SerialPort is sometimes not disposed correctly when the device is already removed.
-                            // So explicitly dispose here
-                            Serial.Close();
-
-                            LogFile.Log("Phone has been emergency flashed unsuccessfully!", LogType.FileAndConsole);
-                            PayloadStream.Dispose();
-
-                            return false;
-                        }
-                    }
-                    else
-                    {
-                        do
-                        {
-                            Serial.SetTimeOut(500);
-                            Incoming = Encoding.ASCII.GetString(Serial.GetResponse(null));
-                            Serial.SetTimeOut(200);
-                            LogFile.Log("In: " + Incoming, LogType.FileAndConsole);
-                        }
-                        while (Incoming.IndexOf("response value") < 0);
-
-                        if (Incoming.Contains("rawmode=\"false\""))
-                        {
-                            ProgrammerRawMode = false;
-                            LogFile.Log("Raw mode: OFF", LogType.FileAndConsole);
-                        }
-
-                        if (Incoming.Contains("rawmode=\"true\""))
-                        {
-                            ProgrammerRawMode = true;
-                            LogFile.Log("Raw mode: ON", LogType.FileAndConsole);
-                        }
-
-                        if (!Incoming.Contains("ACK"))
-                        {
-                            LogFile.Log("Phone programmer is now ignoring us, leaving...", LogType.FileAndConsole);
-
-                            // Workaround for problem
-                            // SerialPort is sometimes not disposed correctly when the device is already removed.
-                            // So explicitly dispose here
-                            Serial.Close();
-
-                            LogFile.Log("Phone has been emergency flashed unsuccessfully!", LogType.FileAndConsole);
-                            PayloadStream.Dispose();
-
-                            return false;
-                        }
-                    }
-                }
-            }
-
-            // Workaround for problem
-            // SerialPort is sometimes not disposed correctly when the device is already removed.
-            // So explicitly dispose here
-            Serial.Close();
-
-            LogFile.Log("Phone has been emergency flashed successfully!", LogType.FileAndConsole);
-            PayloadStream.Dispose();
-
-            return true;
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace WPinternals
+{
+    internal enum SaharaMode : uint
+    {
+        ImageTransferPending = 0x00,
+        ImagetransferComplete = 0x01,
+        MemoryDebug = 0x02,
+        Command = 0x03
+    }
+
+    internal delegate void ReadyHandler();
+
+    internal class QualcommSahara
+    {
+        private readonly QualcommSerial Serial;
+
+        public QualcommSahara(QualcommSerial Serial)
+        {
+            Serial.EncodeCommands = false;
+            Serial.DecodeResponses = false;
+            this.Serial = Serial;
+        }
+
+        public bool SendImage(string Path)
+        {
+            bool Result = true;
+
+            LogFile.Log("Sending programmer: " + Path, LogType.FileOnly);
+
+            int Step = 0;
+            UInt32 Offset = 0;
+            UInt32 Length = 0;
+
+            byte[] ImageBuffer = null;
+            try
+            {
+                Step = 1;
+                byte[] Hello = Serial.GetResponse(new byte[] { 0x01, 0x00, 0x00, 0x00 });
+
+                // Incoming Hello packet:
+                // 00000001 = Hello command id
+                // xxxxxxxx = Length
+                // xxxxxxxx = Protocol version
+                // xxxxxxxx = Supported version
+                // xxxxxxxx = Max packet length
+                // xxxxxxxx = Expected mode
+                // 6 dwords reserved space
+                LogFile.Log("Protocol: 0x" + ByteOperations.ReadUInt32(Hello, 0x08).ToString("X8"), LogType.FileOnly);
+                LogFile.Log("Supported: 0x" + ByteOperations.ReadUInt32(Hello, 0x0C).ToString("X8"), LogType.FileOnly);
+                LogFile.Log("MaxLength: 0x" + ByteOperations.ReadUInt32(Hello, 0x10).ToString("X8"), LogType.FileOnly);
+                LogFile.Log("Mode: 0x" + ByteOperations.ReadUInt32(Hello, 0x14).ToString("X8"), LogType.FileOnly);
+
+                // Packet:
+                // 00000002 = Hello response command id
+                // 00000030 = Length
+                // 00000002 = Protocol version
+                // 00000001 = Supported version
+                // 00000000 = Status OK
+                // 00000000 = Mode
+                // rest is reserved space
+                Step = 2;
+                byte[] HelloResponse = new byte[] {
+                    0x02, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                };
+                Serial.SendData(HelloResponse);
+
+                Step = 3;
+                using FileStream FileStream = new(Path, FileMode.Open, FileAccess.Read);
+                while (true)
+                {
+                    Step = 4;
+                    byte[] ReadDataRequest = Serial.GetResponse(null);
+                    UInt32 ResponseID = ByteOperations.ReadUInt32(ReadDataRequest, 0);
+                    if (ResponseID == 4)
+                    {
+                        break;
+                    }
+
+                    if (ResponseID != 3)
+                    {
+                        Step = 5;
+                        throw new BadConnectionException();
+                    }
+
+                    Offset = ByteOperations.ReadUInt32(ReadDataRequest, 0x0C);
+                    Length = ByteOperations.ReadUInt32(ReadDataRequest, 0x10);
+                    if ((ImageBuffer == null) || (ImageBuffer.Length != Length))
+                    {
+                        ImageBuffer = new byte[Length];
+                    }
+
+                    if (FileStream.Position != Offset)
+                    {
+                        FileStream.Seek(Offset, SeekOrigin.Begin);
+                    }
+
+                    Step = 6;
+                    FileStream.Read(ImageBuffer, 0, (int)Length);
+
+                    Step = 7;
+                    Serial.SendData(ImageBuffer);
+                }
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex, LogType.FileAndConsole, Step.ToString() + " 0x" + Offset.ToString("X8") + " 0x" + Length.ToString("X8"));
+                Result = false;
+            }
+
+            if (Result)
+            {
+                LogFile.Log("Programmer loaded into phone memory", LogType.FileOnly);
+            }
+
+            return Result;
+        }
+
+        public bool Handshake()
+        {
+            bool Result = true;
+
+            try
+            {
+                byte[] Hello = Serial.GetResponse(new byte[] { 0x01, 0x00, 0x00, 0x00 });
+
+                // Incoming Hello packet:
+                // 00000001 = Hello command id
+                // xxxxxxxx = Length
+                // xxxxxxxx = Protocol version
+                // xxxxxxxx = Supported version
+                // xxxxxxxx = Max packet length
+                // xxxxxxxx = Expected mode
+                // 6 dwords reserved space
+                LogFile.Log("Protocol: 0x" + ByteOperations.ReadUInt32(Hello, 0x08).ToString("X8"), LogType.FileOnly);
+                LogFile.Log("Supported: 0x" + ByteOperations.ReadUInt32(Hello, 0x0C).ToString("X8"), LogType.FileOnly);
+                LogFile.Log("MaxLength: 0x" + ByteOperations.ReadUInt32(Hello, 0x10).ToString("X8"), LogType.FileOnly);
+                LogFile.Log("Mode: 0x" + ByteOperations.ReadUInt32(Hello, 0x14).ToString("X8"), LogType.FileOnly);
+
+                byte[] HelloResponse = new byte[] {
+                    0x02, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                };
+
+                byte[] Ready = Serial.SendCommand(HelloResponse, new byte[] { 0x03, 0x00, 0x00, 0x00 });
+            }
+            catch
+            {
+                Result = false;
+            }
+
+            return Result;
+        }
+
+        public void ResetSahara()
+        {
+            Serial.SendCommand(new byte[] { 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 }, new byte[] { 0x08, 0x00, 0x00, 0x00 });
+        }
+
+        public bool ConnectToProgrammer(byte[] PacketFromPcToProgrammer)
+        {
+            // Behaviour of old firehose:
+            // Takes about 20 ms to be started.
+            // Then PC has to start talking to the phone.
+            // Behaviour of new firehose:
+            // After 2000 ms the firehose starts talking to the PC
+            //
+            // For the duration of 2.5 seconds we will send Hello packages
+            // And also wait for incoming messages
+            // An incoming message can be a response to our outgoing Hello packet (read incoming until "response value")
+            // Or it can be an incoming Hello-packet from the programmer (always 2 packets, starting with "Chip serial num")
+            // Sending the hello-packet can succeed immediately, or it can timeout.
+            // When sending succeeds, an answer should be incoming immediately to complete the handshake.
+            // When an incoming Hello was received, the phone still expects to receive another Hello.
+
+            int HelloSendCount = 0;
+            bool HandshakeCompleted = false;
+            string Incoming;
+            do
+            {
+                Serial.SetTimeOut(200);
+                HelloSendCount++;
+                try
+                {
+                    LogFile.Log("Send Hello to programmer (" + HelloSendCount.ToString() + ")", LogType.FileOnly);
+                    Serial.SendData(PacketFromPcToProgrammer);
+                    LogFile.Log("Hello packet accepted", LogType.FileOnly);
+                }
+                catch
+                {
+                    LogFile.Log("Hello packet not accepted", LogType.FileOnly);
+                }
+
+                try
+                {
+                    Serial.SetTimeOut(500);
+                    Incoming = Encoding.ASCII.GetString(Serial.GetResponse(null));
+                    LogFile.Log("In: " + Incoming, LogType.FileOnly);
+                    Serial.SetTimeOut(200);
+                    if (Incoming.Contains("Chip serial num"))
+                    {
+                        Incoming = Encoding.ASCII.GetString(Serial.GetResponse(null));
+                        LogFile.Log("In: " + Incoming, LogType.FileOnly);
+                        LogFile.Log("Incoming Hello-packets received", LogType.FileOnly);
+                    }
+
+                    while (Incoming.IndexOf("response value") < 0)
+                    {
+                        Incoming = Encoding.ASCII.GetString(Serial.GetResponse(null));
+                        LogFile.Log("In: " + Incoming, LogType.FileOnly);
+                    }
+
+                    LogFile.Log("Incoming Hello-response received", LogType.FileOnly);
+
+                    if (!Incoming.Contains("Failed to authenticate Digital Signature."))
+                    {
+                        HandshakeCompleted = true;
+                    }
+                    else
+                    {
+                        LogFile.Log("Programmer failed to authenticate Digital Signature", LogType.FileOnly);
+                    }
+                }
+                catch { }
+            }
+            while (!HandshakeCompleted && (HelloSendCount < 6));
+
+            return HandshakeCompleted;
+        }
+
+        public bool ConnectToProgrammerInTestMode()
+        {
+            byte[] HelloPacketFromPcToProgrammer = new byte[0x20C];
+            ByteOperations.WriteUInt32(HelloPacketFromPcToProgrammer, 0, 0x57503730);
+            ByteOperations.WriteUInt32(HelloPacketFromPcToProgrammer, 0x28, 0x57503730);
+            ByteOperations.WriteUInt32(HelloPacketFromPcToProgrammer, 0x208, 0x57503730);
+            ByteOperations.WriteUInt16(HelloPacketFromPcToProgrammer, 0x48, 0x4445);
+
+            bool HandshakeCompleted = ConnectToProgrammer(HelloPacketFromPcToProgrammer);
+
+            if (HandshakeCompleted)
+            {
+                LogFile.Log("Handshake completed with programmer in testmode", LogType.FileOnly);
+            }
+            else
+            {
+                LogFile.Log("Handshake with programmer failed", LogType.FileOnly);
+            }
+
+            return HandshakeCompleted;
+        }
+
+        public async Task<bool> Reset(string ProgrammerPath)
+        {
+            bool SendImageResult = await Task.Run(() => SendImage(ProgrammerPath));
+            if (!SendImageResult)
+            {
+                return false;
+            }
+
+            await Task.Run(() => StartProgrammer());
+
+            bool Connected = await Task.Run(() => ConnectToProgrammerInTestMode());
+            if (!Connected)
+            {
+                return false;
+            }
+
+            LogFile.Log("Rebooting phone", LogType.FileAndConsole);
+            const string Command03 = "<?xml version=\"1.0\" ?><data><power value=\"reset\"/></data>";
+            LogFile.Log("Out: " + Command03, LogType.FileOnly);
+            Serial.SendData(Encoding.ASCII.GetBytes(Command03));
+
+            string Incoming;
+            do
+            {
+                Incoming = Encoding.ASCII.GetString(Serial.GetResponse(null));
+                LogFile.Log("In: " + Incoming, LogType.FileOnly);
+            }
+            while (Incoming.IndexOf("response value") < 0);
+
+            // Workaround for problem
+            // SerialPort is sometimes not disposed correctly when the device is already removed.
+            // So explicitly dispose here
+            Serial.Close();
+
+            return true;
+        }
+
+        public void SwitchMode(SaharaMode Mode)
+        {
+            byte[] SwitchModeCommand = new byte[] { 0x0C, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+            ByteOperations.WriteUInt32(SwitchModeCommand, 8, (UInt32)Mode);
+            byte[] ResponsePattern = null;
+            switch (Mode)
+            {
+                case SaharaMode.ImageTransferPending:
+                    ResponsePattern = new byte[] { 0x04, 0x00, 0x00, 0x00 };
+                    break;
+                case SaharaMode.MemoryDebug:
+                    ResponsePattern = new byte[] { 0x09, 0x00, 0x00, 0x00 };
+                    break;
+                case SaharaMode.Command:
+                    ResponsePattern = new byte[] { 0x0B, 0x00, 0x00, 0x00 };
+                    break;
+            }
+            Serial.SendCommand(SwitchModeCommand, ResponsePattern);
+        }
+
+        public void StartProgrammer()
+        {
+            LogFile.Log("Starting programmer", LogType.FileAndConsole);
+            byte[] DoneCommand = new byte[] { 0x05, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00 };
+            bool Started = false;
+            int count = 0;
+            do
+            {
+                count++;
+                try
+                {
+                    byte[] DoneResponse = Serial.SendCommand(DoneCommand, new byte[] { 0x06, 0x00, 0x00, 0x00 });
+                    Started = true;
+                }
+                catch (BadConnectionException)
+                {
+                    LogFile.Log("Problem while starting programmer. Attempting again.", LogType.FileAndConsole);
+                }
+            } while (!Started && count < 3);
+            if (count >= 3 && !Started)
+            {
+                LogFile.Log("Maximum number of attempts to start the programmer exceeded.", LogType.FileAndConsole);
+                throw new BadConnectionException();
+            }
+            LogFile.Log("Programmer being launched on phone", LogType.FileOnly);
+        }
+
+        public async Task<bool> SendEdPayload(string ProgrammerPath, string PayloadPath)
+        {
+            // First, let's read the Emergency Download payload header and verify its validity
+            FileStream PayloadStream = File.OpenRead(PayloadPath);
+
+            byte[] ValidReferencePayloadHeader = new byte[] { 0x45, 0x6D, 0x65, 0x72, 0x67, 0x65, 0x6E, 0x63, 0x79, 0x20, 0x50, 0x61, 0x79, 0x6C, 0x6F, 0x61, 0x64 };
+
+            byte[] PayloadHeader = new byte[17];
+            PayloadStream.Read(PayloadHeader, 0, 17);
+
+            bool IsValidEdPayloadImage = StructuralComparisons.StructuralEqualityComparer.Equals(PayloadHeader, ValidReferencePayloadHeader);
+            if (!IsValidEdPayloadImage)
+            {
+                return false;
+            }
+
+            // Now let's read the information block
+            PayloadStream.Seek(0x64, SeekOrigin.Begin);
+            byte[] PayloadInformationBlock = new byte[0x64];
+
+            PayloadStream.Read(PayloadInformationBlock, 0, 0x64);
+            string buildtime = Encoding.ASCII.GetString(PayloadInformationBlock).Trim('\0');
+
+            PayloadStream.Read(PayloadInformationBlock, 0, 0x64);
+            string builddate = Encoding.ASCII.GetString(PayloadInformationBlock).Trim('\0');
+
+            PayloadStream.Read(PayloadInformationBlock, 0, 0x64);
+            string version = Encoding.ASCII.GetString(PayloadInformationBlock).Trim('\0');
+
+            PayloadInformationBlock = new byte[0x670];
+            PayloadStream.Read(PayloadInformationBlock, 0, 0x670);
+            string Info = Encoding.ASCII.GetString(PayloadInformationBlock).Trim('\0');
+
+            // Print some information about the payload
+            LogFile.Log("Emerency flasher version 0.1", LogType.FileAndConsole);
+            LogFile.Log("Programmer information:", LogType.FileAndConsole);
+            LogFile.Log("Build time: " + buildtime, LogType.FileAndConsole);
+            LogFile.Log("Build date: " + builddate, LogType.FileAndConsole);
+            LogFile.Log("Version: " + version, LogType.FileAndConsole);
+            LogFile.Log("Info: " + Info, LogType.FileAndConsole);
+
+            // Send the emergency programmer to the phone
+            bool SendImageResult = await Task.Run(() => SendImage(ProgrammerPath));
+            if (!SendImageResult)
+            {
+                return false;
+            }
+
+            // Start the emergency programmer on the phone
+            await Task.Run(() => StartProgrammer());
+
+            // Wait a few seconds before sending commands
+            LogFile.Log("Waiting...", LogType.FileAndConsole);
+            Thread.Sleep(2000);
+            LogFile.Log("Waiting...OK", LogType.FileAndConsole);
+
+            bool Terminated = false;
+            bool Connected = false;
+            bool ProgrammerRawMode = false;
+
+            string Incoming;
+
+            while (!Terminated)
+            {
+                PayloadInformationBlock = new byte[0x200];
+                PayloadStream.Read(PayloadInformationBlock, 0, 0x200);
+                string ProgrammerCommand = Encoding.ASCII.GetString(PayloadInformationBlock.Skip(0xC).ToArray()).Trim('\0');
+
+                LogFile.Log(ProgrammerCommand, LogType.FileAndConsole);
+
+                byte[] PacketFromPcToProgrammer = Array.Empty<byte>();
+                byte[] temp = new byte[0x200];
+
+                while (true)
+                {
+                    if (PayloadStream.Position == PayloadStream.Length)
+                    {
+                        Terminated = true;
+                        break;
+                    }
+
+                    PayloadStream.Read(temp, 0, 0x200);
+
+                    if (temp[12] == 77 && temp[13] == 83 && temp[14] == 71 && temp[15] == 95)
+                    {
+                        PayloadStream.Seek(-0x200, SeekOrigin.Current);
+                        break;
+                    }
+
+                    PacketFromPcToProgrammer = PacketFromPcToProgrammer.Concat(temp).ToArray();
+                }
+
+                bool ExpectingReplyFromProgrammer = false;
+
+                if (ProgrammerCommand.Contains("XML"))
+                {
+                    string Outgoing = Encoding.ASCII.GetString(PacketFromPcToProgrammer).Trim('\0');
+                    PacketFromPcToProgrammer = Encoding.ASCII.GetBytes(Outgoing);
+                    LogFile.Log("Out: " + Outgoing, LogType.FileAndConsole);
+                }
+
+                if (!ProgrammerCommand.Contains("RAW_DATA") && !ProgrammerRawMode)
+                {
+                    ExpectingReplyFromProgrammer = true;
+                }
+
+                if (ProgrammerCommand.Contains("LAST") && ProgrammerRawMode)
+                {
+                    ExpectingReplyFromProgrammer = true;
+                }
+
+                if (ProgrammerCommand.Contains("DATA_ALL") && ProgrammerRawMode)
+                {
+                    ExpectingReplyFromProgrammer = true;
+                }
+
+                if (ProgrammerCommand.Contains("RAW_DATA") && !ProgrammerRawMode)
+                {
+                    LogFile.Log("Phone is not in raw mode ON, leaving...", LogType.FileAndConsole);
+
+                    // Workaround for problem
+                    // SerialPort is sometimes not disposed correctly when the device is already removed.
+                    // So explicitly dispose here
+                    Serial.Close();
+
+                    LogFile.Log("Phone has been emergency flashed unsuccessfully!", LogType.FileAndConsole);
+                    PayloadStream.Dispose();
+
+                    return false;
+                }
+
+                if (!ProgrammerCommand.Contains("RAW_DATA") && ProgrammerRawMode)
+                {
+                    LogFile.Log("Phone is not in raw mode ON, leaving...", LogType.FileAndConsole);
+
+                    // Workaround for problem
+                    // SerialPort is sometimes not disposed correctly when the device is already removed.
+                    // So explicitly dispose here
+                    Serial.Close();
+
+                    LogFile.Log("Phone has been emergency flashed unsuccessfully!", LogType.FileAndConsole);
+                    PayloadStream.Dispose();
+
+                    return false;
+                }
+
+                if (Connected)
+                {
+                    Serial.SendData(PacketFromPcToProgrammer);
+                }
+
+                if (ExpectingReplyFromProgrammer)
+                {
+                    if (!Connected)
+                    {
+                        Connected = ConnectToProgrammer(PacketFromPcToProgrammer);
+
+                        if (Connected)
+                        {
+                            LogFile.Log("Handshake completed with programmer in validated image programming (VIP) mode", LogType.FileAndConsole);
+                        }
+                        else
+                        {
+                            LogFile.Log("Handshake with programmer failed", LogType.FileAndConsole);
+                        }
+
+                        if (!Connected)
+                        {
+                            LogFile.Log("Phone programmer is now ignoring us, leaving...", LogType.FileAndConsole);
+
+                            // Workaround for problem
+                            // SerialPort is sometimes not disposed correctly when the device is already removed.
+                            // So explicitly dispose here
+                            Serial.Close();
+
+                            LogFile.Log("Phone has been emergency flashed unsuccessfully!", LogType.FileAndConsole);
+                            PayloadStream.Dispose();
+
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        do
+                        {
+                            Serial.SetTimeOut(500);
+                            Incoming = Encoding.ASCII.GetString(Serial.GetResponse(null));
+                            Serial.SetTimeOut(200);
+                            LogFile.Log("In: " + Incoming, LogType.FileAndConsole);
+                        }
+                        while (Incoming.IndexOf("response value") < 0);
+
+                        if (Incoming.Contains("rawmode=\"false\""))
+                        {
+                            ProgrammerRawMode = false;
+                            LogFile.Log("Raw mode: OFF", LogType.FileAndConsole);
+                        }
+
+                        if (Incoming.Contains("rawmode=\"true\""))
+                        {
+                            ProgrammerRawMode = true;
+                            LogFile.Log("Raw mode: ON", LogType.FileAndConsole);
+                        }
+
+                        if (!Incoming.Contains("ACK"))
+                        {
+                            LogFile.Log("Phone programmer is now ignoring us, leaving...", LogType.FileAndConsole);
+
+                            // Workaround for problem
+                            // SerialPort is sometimes not disposed correctly when the device is already removed.
+                            // So explicitly dispose here
+                            Serial.Close();
+
+                            LogFile.Log("Phone has been emergency flashed unsuccessfully!", LogType.FileAndConsole);
+                            PayloadStream.Dispose();
+
+                            return false;
+                        }
+                    }
+                }
+            }
+
+            // Workaround for problem
+            // SerialPort is sometimes not disposed correctly when the device is already removed.
+            // So explicitly dispose here
+            Serial.Close();
+
+            LogFile.Log("Phone has been emergency flashed successfully!", LogType.FileAndConsole);
+            PayloadStream.Dispose();
+
+            return true;
+        }
+    }
+}
diff --git a/Models/QualcommSerial.cs b/WPinternals/Models/QualcommSerial.cs
similarity index 97%
rename from Models/QualcommSerial.cs
rename to WPinternals/Models/QualcommSerial.cs
index 0c8f6aa..3b9e2e4 100644
--- a/Models/QualcommSerial.cs
+++ b/WPinternals/Models/QualcommSerial.cs
@@ -1,379 +1,379 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using MadWizard.WinUSBNet;
-using System;
-using System.IO.Ports;
-
-namespace WPinternals
-{
-    internal class QualcommSerial : IDisposable
-    {
-        private bool Disposed = false;
-        private readonly SerialPort Port = null;
-        private readonly USBDevice USBDevice = null;
-        private readonly CRC16 CRC16;
-
-        public bool EncodeCommands = true;
-        public bool DecodeResponses = true;
-
-        public QualcommSerial(string DevicePath)
-        {
-            CRC16 = new CRC16(0x1189, 0xFFFF, 0xFFFF);
-
-            string[] DevicePathElements = DevicePath.Split(new char[] { '#' });
-            if (string.Equals(DevicePathElements[3], "{86E0D1E0-8089-11D0-9CE4-08003E301F73}", StringComparison.CurrentCultureIgnoreCase))
-            {
-                string PortName = (string)Microsoft.Win32.Registry.GetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Enum\USB\" + DevicePathElements[1] + @"\" + DevicePathElements[2] + @"\Device Parameters", "PortName", null);
-                if (PortName != null)
-                {
-                    Port = new SerialPort(PortName, 115200)
-                    {
-                        ReadTimeout = 1000,
-                        WriteTimeout = 1000
-                    };
-                    Port.Open();
-                }
-            }
-            else
-            {
-                try
-                {
-                    this.USBDevice = new USBDevice(DevicePath);
-                }
-                catch { }
-            }
-        }
-
-        public void SendData(byte[] Data)
-        {
-            byte[] FormattedData = EncodeCommands ? FormatCommand(Data) : Data;
-            Port?.Write(FormattedData, 0, FormattedData.Length);
-            if (USBDevice != null)
-            {
-                USBDevice.OutputPipe.Write(FormattedData);
-            }
-        }
-
-        public byte[] SendCommand(byte[] Command, byte[] ResponsePattern)
-        {
-            byte[] FormattedCommand = EncodeCommands ? FormatCommand(Command) : Command;
-            Port?.Write(FormattedCommand, 0, FormattedCommand.Length);
-            if (USBDevice != null)
-            {
-                USBDevice.OutputPipe.Write(FormattedCommand);
-            }
-
-            return GetResponse(ResponsePattern);
-        }
-
-        internal byte[] GetResponse(byte[] ResponsePattern)
-        {
-            byte[] ResponseBuffer = new byte[0x2000];
-            int Length = 0;
-            bool IsIncomplete = false;
-
-            do
-            {
-                IsIncomplete = false;
-
-                try
-                {
-                    int BytesRead = 0;
-
-                    if (Port != null)
-                    {
-                        BytesRead = Port.Read(ResponseBuffer, Length, ResponseBuffer.Length - Length);
-                    }
-
-                    if (USBDevice != null)
-                    {
-                        BytesRead = USBDevice.InputPipe.Read(ResponseBuffer);
-                    }
-
-                    if (BytesRead == 0)
-                    {
-                        LogFile.Log("Emergency mode of phone is ignoring us", LogType.FileAndConsole);
-                        throw new BadMessageException();
-                    }
-
-                    Length += BytesRead;
-                    byte[] DecodedResponse;
-                    if (DecodeResponses)
-                    {
-                        DecodedResponse = DecodeResponse(ResponseBuffer, (UInt32)Length);
-                    }
-                    else
-                    {
-                        DecodedResponse = new byte[Length];
-                        Buffer.BlockCopy(ResponseBuffer, 0, DecodedResponse, 0, Length);
-                    }
-
-                    if (ResponsePattern != null)
-                    {
-                        for (int i = 0; i < ResponsePattern.Length; i++)
-                        {
-                            if (DecodedResponse[i] != ResponsePattern[i])
-                            {
-                                byte[] LogResponse = new byte[DecodedResponse.Length < 0x10 ? DecodedResponse.Length : 0x10];
-                                LogFile.Log("Qualcomm serial response: " + Converter.ConvertHexToString(LogResponse, ""), LogType.FileOnly);
-                                LogFile.Log("Expected: " + Converter.ConvertHexToString(ResponsePattern, ""), LogType.FileOnly);
-                                throw new BadMessageException();
-                            }
-                        }
-                    }
-
-                    return DecodedResponse;
-                }
-                catch (IncompleteMessageException)
-                {
-                    IsIncomplete = true;
-                }
-                catch { } // Will be rethrown as BadConnectionException
-            }
-            while (IsIncomplete);
-
-            Port?.DiscardInBuffer();
-            if (USBDevice != null)
-            {
-                USBDevice.InputPipe.Flush();
-            }
-
-            throw new BadConnectionException();
-        }
-
-        private byte[] FormatCommand(byte[] Command)
-        {
-            if ((Command == null) || (Command.Length == 0))
-            {
-                throw new BadMessageException();
-            }
-
-            byte[] Decoded = new byte[(Command.Length * 2) + 4];
-            int Length = 0;
-
-            Decoded[Length++] = 0x7E;
-
-            for (int i = 0; i < Command.Length; i++)
-            {
-                if ((Command[i] == 0x7D) || (Command[i] == 0x7E))
-                {
-                    Decoded[Length++] = 0x7D;
-                    Decoded[Length++] = (byte)(Command[i] ^ 0x20);
-                }
-                else
-                {
-                    Decoded[Length++] = Command[i];
-                }
-            }
-
-            UInt16 Checksum = CRC16.CalculateChecksum(Command);
-            if (((byte)(Checksum & 0xFF) == 0x7D) || ((byte)(Checksum & 0xFF) == 0x7E))
-            {
-                Decoded[Length++] = 0x7D;
-                Decoded[Length++] = (byte)((Checksum & 0xFF) ^ 0x20);
-            }
-            else
-            {
-                Decoded[Length++] = (byte)(Checksum & 0xFF);
-            }
-
-            if (((byte)(Checksum >> 8) == 0x7D) || ((byte)(Checksum >> 8) == 0x7E))
-            {
-                Decoded[Length++] = 0x7D;
-                Decoded[Length++] = (byte)((Checksum >> 8) ^ 0x20);
-            }
-            else
-            {
-                Decoded[Length++] = (byte)(Checksum >> 8);
-            }
-
-            Decoded[Length++] = 0x7E;
-
-            if (Length > 0)
-            {
-                byte[] Result = new byte[Length];
-                Buffer.BlockCopy(Decoded, 0, Result, 0, Length);
-                return Result;
-            }
-            else
-            {
-                return null;
-            }
-        }
-
-        private byte[] DecodeResponse(byte[] Response, UInt32 Length)
-        {
-            if ((Response == null) || (Response.Length == 0) || (Response[0] != 0x7E))
-            {
-                throw new BadMessageException();
-            }
-
-            UInt32 SourceLength = Length;
-            Length = 0;
-            UInt32 SourcePos = 1;
-
-            byte[] Message = new byte[SourceLength];
-
-            while (SourcePos < SourceLength)
-            {
-                if (Response[SourcePos] == 0x7E)
-                {
-                    break;
-                }
-
-                Message[Length++] = Response[SourcePos] == 0x7D ? (byte)(Response[++SourcePos] ^ 0x20) : Response[SourcePos];
-
-                SourcePos++;
-            }
-
-            if (SourcePos == SourceLength)
-            {
-                throw new IncompleteMessageException();
-            }
-
-            if (Length < 3)
-            {
-                throw new BadMessageException();
-            }
-
-            byte[] TrimmedMessage = new byte[Length - 2];
-            Buffer.BlockCopy(Message, 0, TrimmedMessage, 0, (int)(Length - 2));
-
-            UInt16 Checksum = CRC16.CalculateChecksum(TrimmedMessage);
-            if (((byte)(Checksum & 0xFF) != Message[Length - 2]) || ((byte)(Checksum >> 8) != Message[Length - 1]))
-            {
-                throw new BadMessageException();
-            }
-
-            return TrimmedMessage;
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        ~QualcommSerial()
-        {
-            Dispose(false);
-        }
-
-        public void Close()
-        {
-            Port?.Close();
-            USBDevice?.Dispose();
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (Disposed)
-            {
-                return;
-            }
-
-            if (disposing)
-            {
-                // Other disposables
-            }
-
-            // Clean unmanaged resources here.
-            Close();
-
-            Disposed = true;
-        }
-
-        internal void SetTimeOut(int v)
-        {
-            if (USBDevice != null)
-            {
-                USBDevice.ControlPipeTimeout = v;
-            }
-
-            if (Port != null)
-            {
-                Port.ReadTimeout = v;
-                Port.WriteTimeout = v;
-            }
-        }
-    }
-
-    public class IncompleteMessageException : Exception { public IncompleteMessageException() { } public IncompleteMessageException(string message) : base(message) { } public IncompleteMessageException(string message, Exception innerException) : base(message, innerException) { } }
-    public class BadMessageException : Exception { public BadMessageException() { } public BadMessageException(string message) : base(message) { } public BadMessageException(string message, Exception innerException) : base(message, innerException) { } }
-    public class BadConnectionException : Exception { public BadConnectionException() { } public BadConnectionException(string message) : base(message) { } public BadConnectionException(string message, Exception innerException) : base(message, innerException) { } }
-
-    public class CRC16
-    {
-        private readonly UInt16[] ChecksumTable =
-            new UInt16[] {
-                0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
-                0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
-                0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
-                0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
-                0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
-                0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
-                0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
-                0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
-                0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
-                0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
-                0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
-                0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
-                0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
-                0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
-                0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
-                0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
-                0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
-                0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
-                0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
-                0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
-                0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
-                0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
-                0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
-                0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
-                0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
-                0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
-                0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
-                0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
-                0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
-                0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
-                0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
-                0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
-            };
-
-        private readonly UInt16 Seed, FinalXor;
-
-        public CRC16(UInt16 Polynomial, UInt16 Seed, UInt16 FinalXor)
-        {
-            this.Seed = Seed;
-            this.FinalXor = FinalXor;
-        }
-
-        public UInt16 CalculateChecksum(byte[] Bytes)
-        {
-            UInt16 Crc = Seed;
-            for (int i = 0; i < Bytes.Length; ++i)
-            {
-                Crc = (UInt16)((Crc >> 8) ^ ChecksumTable[(byte)(Crc ^ Bytes[i])]); // Qualcomm implementation
-            }
-            return (UInt16)(Crc ^ FinalXor);
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using MadWizard.WinUSBNet;
+using System;
+using System.IO.Ports;
+
+namespace WPinternals
+{
+    internal class QualcommSerial : IDisposable
+    {
+        private bool Disposed = false;
+        private readonly SerialPort Port = null;
+        private readonly USBDevice USBDevice = null;
+        private readonly CRC16 CRC16;
+
+        public bool EncodeCommands = true;
+        public bool DecodeResponses = true;
+
+        public QualcommSerial(string DevicePath)
+        {
+            CRC16 = new CRC16(0x1189, 0xFFFF, 0xFFFF);
+
+            string[] DevicePathElements = DevicePath.Split(new char[] { '#' });
+            if (string.Equals(DevicePathElements[3], "{86E0D1E0-8089-11D0-9CE4-08003E301F73}", StringComparison.CurrentCultureIgnoreCase))
+            {
+                string PortName = (string)Microsoft.Win32.Registry.GetValue(@"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Enum\USB\" + DevicePathElements[1] + @"\" + DevicePathElements[2] + @"\Device Parameters", "PortName", null);
+                if (PortName != null)
+                {
+                    Port = new SerialPort(PortName, 115200)
+                    {
+                        ReadTimeout = 1000,
+                        WriteTimeout = 1000
+                    };
+                    Port.Open();
+                }
+            }
+            else
+            {
+                try
+                {
+                    this.USBDevice = new USBDevice(DevicePath);
+                }
+                catch { }
+            }
+        }
+
+        public void SendData(byte[] Data)
+        {
+            byte[] FormattedData = EncodeCommands ? FormatCommand(Data) : Data;
+            Port?.Write(FormattedData, 0, FormattedData.Length);
+            if (USBDevice != null)
+            {
+                USBDevice.OutputPipe.Write(FormattedData);
+            }
+        }
+
+        public byte[] SendCommand(byte[] Command, byte[] ResponsePattern)
+        {
+            byte[] FormattedCommand = EncodeCommands ? FormatCommand(Command) : Command;
+            Port?.Write(FormattedCommand, 0, FormattedCommand.Length);
+            if (USBDevice != null)
+            {
+                USBDevice.OutputPipe.Write(FormattedCommand);
+            }
+
+            return GetResponse(ResponsePattern);
+        }
+
+        internal byte[] GetResponse(byte[] ResponsePattern)
+        {
+            byte[] ResponseBuffer = new byte[0x2000];
+            int Length = 0;
+            bool IsIncomplete = false;
+
+            do
+            {
+                IsIncomplete = false;
+
+                try
+                {
+                    int BytesRead = 0;
+
+                    if (Port != null)
+                    {
+                        BytesRead = Port.Read(ResponseBuffer, Length, ResponseBuffer.Length - Length);
+                    }
+
+                    if (USBDevice != null)
+                    {
+                        BytesRead = USBDevice.InputPipe.Read(ResponseBuffer);
+                    }
+
+                    if (BytesRead == 0)
+                    {
+                        LogFile.Log("Emergency mode of phone is ignoring us", LogType.FileAndConsole);
+                        throw new BadMessageException();
+                    }
+
+                    Length += BytesRead;
+                    byte[] DecodedResponse;
+                    if (DecodeResponses)
+                    {
+                        DecodedResponse = DecodeResponse(ResponseBuffer, (UInt32)Length);
+                    }
+                    else
+                    {
+                        DecodedResponse = new byte[Length];
+                        Buffer.BlockCopy(ResponseBuffer, 0, DecodedResponse, 0, Length);
+                    }
+
+                    if (ResponsePattern != null)
+                    {
+                        for (int i = 0; i < ResponsePattern.Length; i++)
+                        {
+                            if (DecodedResponse[i] != ResponsePattern[i])
+                            {
+                                byte[] LogResponse = new byte[DecodedResponse.Length < 0x10 ? DecodedResponse.Length : 0x10];
+                                LogFile.Log("Qualcomm serial response: " + Converter.ConvertHexToString(LogResponse, ""), LogType.FileOnly);
+                                LogFile.Log("Expected: " + Converter.ConvertHexToString(ResponsePattern, ""), LogType.FileOnly);
+                                throw new BadMessageException();
+                            }
+                        }
+                    }
+
+                    return DecodedResponse;
+                }
+                catch (IncompleteMessageException)
+                {
+                    IsIncomplete = true;
+                }
+                catch { } // Will be rethrown as BadConnectionException
+            }
+            while (IsIncomplete);
+
+            Port?.DiscardInBuffer();
+            if (USBDevice != null)
+            {
+                USBDevice.InputPipe.Flush();
+            }
+
+            throw new BadConnectionException();
+        }
+
+        private byte[] FormatCommand(byte[] Command)
+        {
+            if ((Command == null) || (Command.Length == 0))
+            {
+                throw new BadMessageException();
+            }
+
+            byte[] Decoded = new byte[(Command.Length * 2) + 4];
+            int Length = 0;
+
+            Decoded[Length++] = 0x7E;
+
+            for (int i = 0; i < Command.Length; i++)
+            {
+                if ((Command[i] == 0x7D) || (Command[i] == 0x7E))
+                {
+                    Decoded[Length++] = 0x7D;
+                    Decoded[Length++] = (byte)(Command[i] ^ 0x20);
+                }
+                else
+                {
+                    Decoded[Length++] = Command[i];
+                }
+            }
+
+            UInt16 Checksum = CRC16.CalculateChecksum(Command);
+            if (((byte)(Checksum & 0xFF) == 0x7D) || ((byte)(Checksum & 0xFF) == 0x7E))
+            {
+                Decoded[Length++] = 0x7D;
+                Decoded[Length++] = (byte)((Checksum & 0xFF) ^ 0x20);
+            }
+            else
+            {
+                Decoded[Length++] = (byte)(Checksum & 0xFF);
+            }
+
+            if (((byte)(Checksum >> 8) == 0x7D) || ((byte)(Checksum >> 8) == 0x7E))
+            {
+                Decoded[Length++] = 0x7D;
+                Decoded[Length++] = (byte)((Checksum >> 8) ^ 0x20);
+            }
+            else
+            {
+                Decoded[Length++] = (byte)(Checksum >> 8);
+            }
+
+            Decoded[Length++] = 0x7E;
+
+            if (Length > 0)
+            {
+                byte[] Result = new byte[Length];
+                Buffer.BlockCopy(Decoded, 0, Result, 0, Length);
+                return Result;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        private byte[] DecodeResponse(byte[] Response, UInt32 Length)
+        {
+            if ((Response == null) || (Response.Length == 0) || (Response[0] != 0x7E))
+            {
+                throw new BadMessageException();
+            }
+
+            UInt32 SourceLength = Length;
+            Length = 0;
+            UInt32 SourcePos = 1;
+
+            byte[] Message = new byte[SourceLength];
+
+            while (SourcePos < SourceLength)
+            {
+                if (Response[SourcePos] == 0x7E)
+                {
+                    break;
+                }
+
+                Message[Length++] = Response[SourcePos] == 0x7D ? (byte)(Response[++SourcePos] ^ 0x20) : Response[SourcePos];
+
+                SourcePos++;
+            }
+
+            if (SourcePos == SourceLength)
+            {
+                throw new IncompleteMessageException();
+            }
+
+            if (Length < 3)
+            {
+                throw new BadMessageException();
+            }
+
+            byte[] TrimmedMessage = new byte[Length - 2];
+            Buffer.BlockCopy(Message, 0, TrimmedMessage, 0, (int)(Length - 2));
+
+            UInt16 Checksum = CRC16.CalculateChecksum(TrimmedMessage);
+            if (((byte)(Checksum & 0xFF) != Message[Length - 2]) || ((byte)(Checksum >> 8) != Message[Length - 1]))
+            {
+                throw new BadMessageException();
+            }
+
+            return TrimmedMessage;
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        ~QualcommSerial()
+        {
+            Dispose(false);
+        }
+
+        public void Close()
+        {
+            Port?.Close();
+            USBDevice?.Dispose();
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (Disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                // Other disposables
+            }
+
+            // Clean unmanaged resources here.
+            Close();
+
+            Disposed = true;
+        }
+
+        internal void SetTimeOut(int v)
+        {
+            if (USBDevice != null)
+            {
+                USBDevice.ControlPipeTimeout = v;
+            }
+
+            if (Port != null)
+            {
+                Port.ReadTimeout = v;
+                Port.WriteTimeout = v;
+            }
+        }
+    }
+
+    public class IncompleteMessageException : Exception { public IncompleteMessageException() { } public IncompleteMessageException(string message) : base(message) { } public IncompleteMessageException(string message, Exception innerException) : base(message, innerException) { } }
+    public class BadMessageException : Exception { public BadMessageException() { } public BadMessageException(string message) : base(message) { } public BadMessageException(string message, Exception innerException) : base(message, innerException) { } }
+    public class BadConnectionException : Exception { public BadConnectionException() { } public BadConnectionException(string message) : base(message) { } public BadConnectionException(string message, Exception innerException) : base(message, innerException) { } }
+
+    public class CRC16
+    {
+        private readonly UInt16[] ChecksumTable =
+            new UInt16[] {
+                0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
+                0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
+                0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
+                0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
+                0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
+                0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
+                0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
+                0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
+                0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
+                0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
+                0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
+                0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
+                0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
+                0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
+                0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
+                0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
+                0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
+                0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
+                0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
+                0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
+                0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
+                0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
+                0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
+                0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
+                0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
+                0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
+                0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
+                0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
+                0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
+                0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
+                0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
+                0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
+            };
+
+        private readonly UInt16 Seed, FinalXor;
+
+        public CRC16(UInt16 Polynomial, UInt16 Seed, UInt16 FinalXor)
+        {
+            this.Seed = Seed;
+            this.FinalXor = FinalXor;
+        }
+
+        public UInt16 CalculateChecksum(byte[] Bytes)
+        {
+            UInt16 Crc = Seed;
+            for (int i = 0; i < Bytes.Length; ++i)
+            {
+                Crc = (UInt16)((Crc >> 8) ^ ChecksumTable[(byte)(Crc ^ Bytes[i])]); // Qualcomm implementation
+            }
+            return (UInt16)(Crc ^ FinalXor);
+        }
+    }
+}
diff --git a/Models/SBL1.cs b/WPinternals/Models/SBL1.cs
similarity index 97%
rename from Models/SBL1.cs
rename to WPinternals/Models/SBL1.cs
index f266e51..345f1be 100644
--- a/Models/SBL1.cs
+++ b/WPinternals/Models/SBL1.cs
@@ -1,119 +1,119 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace WPinternals
-{
-    internal class SBL1 : QualcommPartition
-    {
-        internal SBL1(byte[] Binary) : base(Binary, 0x2800) { }
-
-        internal byte[] GenerateExtraSector(byte[] PartitionHeader)
-        {
-            UInt32? Offset = ByteOperations.FindPattern(Binary,
-                new byte[] {
-                    0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                }, null, null);
-            if (Offset == null)
-            {
-                throw new BadImageFormatException();
-            }
-
-            UInt32 PartitionLoaderTableOffset = (UInt32)Offset;
-
-            byte[] FoundPattern = new byte[0x10];
-            Offset = ByteOperations.FindPattern(Binary,
-                new byte[] {
-                    0x04, 0x00, 0x9F, 0xE5, 0x28, 0x00, 0xD0, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1, 0xFF, 0xFF, 0xFF, 0xFF
-                },
-                new byte[] {
-                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
-                },
-                FoundPattern);
-            if (Offset == null)
-            {
-                throw new BadImageFormatException();
-            }
-
-            UInt32 SharedMemoryAddress = ByteOperations.ReadUInt32(FoundPattern, 0x0C);
-            UInt32 GlobalIsSecurityEnabledAddress = SharedMemoryAddress + 0x28;
-
-            Offset = ByteOperations.FindPattern(Binary,
-                new byte[] {
-                    0x01, 0xFF, 0xA0, 0xE3, 0xFF, 0xFF, 0xA0, 0xE1, 0x1C, 0xD0, 0x8D, 0xE2, 0xF0, 0x4F, 0xBD, 0xE8,
-                    0x1E, 0xFF, 0x2F, 0xE1
-                },
-                new byte[] {
-                    0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                    0x00, 0x00, 0x00, 0x00
-                },
-                null);
-            if (Offset == null)
-            {
-                throw new BadImageFormatException();
-            }
-
-            UInt32 ReturnAddress = (UInt32)Offset - ImageOffset + ImageAddress;
-
-            byte[] Sector = new byte[0x200];
-            Array.Clear(Sector, 0, 0x200);
-
-            byte[] Content = new byte[] {
-                0x16, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x28, 0xBD, 0x02, 0x00,
-                0xD8, 0x01, 0x00, 0x00, 0xD8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xE3, 0x3C, 0x10, 0x9F, 0xE5,
-                0x00, 0x00, 0xC1, 0xE5, 0x38, 0x00, 0x9F, 0xE5, 0x38, 0x10, 0x9F, 0xE5, 0x00, 0x00, 0x81, 0xE5,
-                0x34, 0x10, 0x9F, 0xE5, 0x00, 0x00, 0x81, 0xE5, 0x30, 0x00, 0x9F, 0xE5, 0x20, 0x10, 0x9F, 0xE5,
-                0x2C, 0x30, 0x9F, 0xE5, 0x00, 0x20, 0x90, 0xE5, 0x00, 0x20, 0x81, 0xE5, 0x04, 0x00, 0x80, 0xE2,
-                0x04, 0x10, 0x81, 0xE2, 0x03, 0x00, 0x50, 0xE1, 0xF9, 0xFF, 0xFF, 0xBA, 0x14, 0xF0, 0x9F, 0xE5,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x90, 0xBF, 0x02, 0x00, 0xD0, 0xBF, 0x02, 0x00,
-                0xA0, 0xBD, 0x02, 0x00, 0xA0, 0xBE, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00
-            };
-
-            byte[] PartitionTypeGuid = new byte[] {
-                0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74
-            };
-
-            Buffer.BlockCopy(Content, 0, Sector, 0, Content.Length);
-
-            // Overwrite first part of partition-header with model-specific header
-            Buffer.BlockCopy(PartitionHeader, 0, Sector, 0, PartitionHeader.Length);
-
-            ByteOperations.WriteUInt32(Sector, 0x70, GlobalIsSecurityEnabledAddress);
-            ByteOperations.WriteUInt32(Sector, 0x88, ReturnAddress);
-
-            Buffer.BlockCopy(Binary, (int)PartitionLoaderTableOffset, Sector, 0xA0, 0x50);
-            ByteOperations.WriteUInt32(Sector, 0xA0 + 0x30, 0);
-
-            Buffer.BlockCopy(Binary, (int)PartitionLoaderTableOffset, Sector, 0xF0, 0x50);
-            ByteOperations.WriteUInt32(Sector, 0xF0 + 0x2C, 0);
-            ByteOperations.WriteUInt32(Sector, 0xF0 + 0x38, 0x210F0);
-
-            Buffer.BlockCopy(PartitionTypeGuid, 0, Sector, 0x190, 0x10);
-
-            ByteOperations.WriteUInt32(Sector, 0x1FC, 0x0002BD28);
-
-            return Sector;
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+
+namespace WPinternals
+{
+    internal class SBL1 : QualcommPartition
+    {
+        internal SBL1(byte[] Binary) : base(Binary, 0x2800) { }
+
+        internal byte[] GenerateExtraSector(byte[] PartitionHeader)
+        {
+            UInt32? Offset = ByteOperations.FindPattern(Binary,
+                new byte[] {
+                    0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x05, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                }, null, null);
+            if (Offset == null)
+            {
+                throw new BadImageFormatException();
+            }
+
+            UInt32 PartitionLoaderTableOffset = (UInt32)Offset;
+
+            byte[] FoundPattern = new byte[0x10];
+            Offset = ByteOperations.FindPattern(Binary,
+                new byte[] {
+                    0x04, 0x00, 0x9F, 0xE5, 0x28, 0x00, 0xD0, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1, 0xFF, 0xFF, 0xFF, 0xFF
+                },
+                new byte[] {
+                    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF
+                },
+                FoundPattern);
+            if (Offset == null)
+            {
+                throw new BadImageFormatException();
+            }
+
+            UInt32 SharedMemoryAddress = ByteOperations.ReadUInt32(FoundPattern, 0x0C);
+            UInt32 GlobalIsSecurityEnabledAddress = SharedMemoryAddress + 0x28;
+
+            Offset = ByteOperations.FindPattern(Binary,
+                new byte[] {
+                    0x01, 0xFF, 0xA0, 0xE3, 0xFF, 0xFF, 0xA0, 0xE1, 0x1C, 0xD0, 0x8D, 0xE2, 0xF0, 0x4F, 0xBD, 0xE8,
+                    0x1E, 0xFF, 0x2F, 0xE1
+                },
+                new byte[] {
+                    0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                    0x00, 0x00, 0x00, 0x00
+                },
+                null);
+            if (Offset == null)
+            {
+                throw new BadImageFormatException();
+            }
+
+            UInt32 ReturnAddress = (UInt32)Offset - ImageOffset + ImageAddress;
+
+            byte[] Sector = new byte[0x200];
+            Array.Clear(Sector, 0, 0x200);
+
+            byte[] Content = new byte[] {
+                0x16, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x28, 0xBD, 0x02, 0x00,
+                0xD8, 0x01, 0x00, 0x00, 0xD8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xA0, 0xE3, 0x3C, 0x10, 0x9F, 0xE5,
+                0x00, 0x00, 0xC1, 0xE5, 0x38, 0x00, 0x9F, 0xE5, 0x38, 0x10, 0x9F, 0xE5, 0x00, 0x00, 0x81, 0xE5,
+                0x34, 0x10, 0x9F, 0xE5, 0x00, 0x00, 0x81, 0xE5, 0x30, 0x00, 0x9F, 0xE5, 0x20, 0x10, 0x9F, 0xE5,
+                0x2C, 0x30, 0x9F, 0xE5, 0x00, 0x20, 0x90, 0xE5, 0x00, 0x20, 0x81, 0xE5, 0x04, 0x00, 0x80, 0xE2,
+                0x04, 0x10, 0x81, 0xE2, 0x03, 0x00, 0x50, 0xE1, 0xF9, 0xFF, 0xFF, 0xBA, 0x14, 0xF0, 0x9F, 0xE5,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x02, 0x00, 0x90, 0xBF, 0x02, 0x00, 0xD0, 0xBF, 0x02, 0x00,
+                0xA0, 0xBD, 0x02, 0x00, 0xA0, 0xBE, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00
+            };
+
+            byte[] PartitionTypeGuid = new byte[] {
+                0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74, 0x74
+            };
+
+            Buffer.BlockCopy(Content, 0, Sector, 0, Content.Length);
+
+            // Overwrite first part of partition-header with model-specific header
+            Buffer.BlockCopy(PartitionHeader, 0, Sector, 0, PartitionHeader.Length);
+
+            ByteOperations.WriteUInt32(Sector, 0x70, GlobalIsSecurityEnabledAddress);
+            ByteOperations.WriteUInt32(Sector, 0x88, ReturnAddress);
+
+            Buffer.BlockCopy(Binary, (int)PartitionLoaderTableOffset, Sector, 0xA0, 0x50);
+            ByteOperations.WriteUInt32(Sector, 0xA0 + 0x30, 0);
+
+            Buffer.BlockCopy(Binary, (int)PartitionLoaderTableOffset, Sector, 0xF0, 0x50);
+            ByteOperations.WriteUInt32(Sector, 0xF0 + 0x2C, 0);
+            ByteOperations.WriteUInt32(Sector, 0xF0 + 0x38, 0x210F0);
+
+            Buffer.BlockCopy(PartitionTypeGuid, 0, Sector, 0x190, 0x10);
+
+            ByteOperations.WriteUInt32(Sector, 0x1FC, 0x0002BD28);
+
+            return Sector;
+        }
+    }
+}
diff --git a/Models/SBL2.cs b/WPinternals/Models/SBL2.cs
similarity index 97%
rename from Models/SBL2.cs
rename to WPinternals/Models/SBL2.cs
index 14ef595..90973f6 100644
--- a/Models/SBL2.cs
+++ b/WPinternals/Models/SBL2.cs
@@ -1,56 +1,56 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace WPinternals
-{
-    internal class SBL2
-    {
-        internal byte[] Binary;
-
-        internal SBL2(byte[] Binary)
-        {
-            this.Binary = Binary;
-        }
-
-        // Magic!
-        internal byte[] Patch()
-        {
-            UInt32? PatchOffset = ByteOperations.FindPattern(Binary,
-                new byte[] {
-                    0xFF, 0xFF, 0xFF, 0xE3, 0x01, 0x0E, 0x42, 0xE3, 0x28, 0x00, 0xD0, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1
-                },
-                new byte[] {
-                    0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-                },
-                null);
-
-            if (PatchOffset == null)
-            {
-                throw new BadImageFormatException();
-            }
-
-            Buffer.BlockCopy(new byte[] { 0x00, 0x00, 0xA0, 0xE3 }, 0, Binary, (int)PatchOffset + 8, 4);
-
-            return Binary;
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+
+namespace WPinternals
+{
+    internal class SBL2
+    {
+        internal byte[] Binary;
+
+        internal SBL2(byte[] Binary)
+        {
+            this.Binary = Binary;
+        }
+
+        // Magic!
+        internal byte[] Patch()
+        {
+            UInt32? PatchOffset = ByteOperations.FindPattern(Binary,
+                new byte[] {
+                    0xFF, 0xFF, 0xFF, 0xE3, 0x01, 0x0E, 0x42, 0xE3, 0x28, 0x00, 0xD0, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1
+                },
+                new byte[] {
+                    0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+                },
+                null);
+
+            if (PatchOffset == null)
+            {
+                throw new BadImageFormatException();
+            }
+
+            Buffer.BlockCopy(new byte[] { 0x00, 0x00, 0xA0, 0xE3 }, 0, Binary, (int)PatchOffset + 8, 4);
+
+            return Binary;
+        }
+    }
+}
diff --git a/Models/SBL3.cs b/WPinternals/Models/SBL3.cs
similarity index 97%
rename from Models/SBL3.cs
rename to WPinternals/Models/SBL3.cs
index 3a41d4f..ebe7477 100644
--- a/Models/SBL3.cs
+++ b/WPinternals/Models/SBL3.cs
@@ -1,88 +1,88 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.IO;
-
-namespace WPinternals
-{
-    internal class SBL3
-    {
-        internal byte[] Binary;
-
-        internal SBL3(byte[] Binary)
-        {
-            this.Binary = Binary;
-        }
-
-        internal SBL3(string FileName)
-        {
-            Binary = null;
-
-            // First try to parse as FFU
-            try
-            {
-                if (FFU.IsFFU(FileName))
-                {
-                    FFU FFUFile = new(FileName);
-                    Binary = FFUFile.GetPartition("SBL3");
-                }
-            }
-            catch { }
-
-            // If not succeeded, then try to parse it as raw image
-            if (Binary == null)
-            {
-                byte[] SBL3Pattern = new byte[] { 0x18, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x8F, 0xFF, 0xFF, 0xFF, 0xFF };
-                byte[] SBL3Mask = new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF };
-
-                UInt32? Offset = ByteOperations.FindPatternInFile(FileName, SBL3Pattern, SBL3Mask, out byte[] SBL3Header);
-
-                if (Offset != null)
-                {
-                    UInt32 Length = ByteOperations.ReadUInt32(SBL3Header, 0x10) + 0x28; // SBL3 Image Size + Header Size
-                    Binary = new byte[Length];
-
-                    FileStream Stream = new(FileName, FileMode.Open, FileAccess.Read);
-                    Stream.Seek((long)Offset, SeekOrigin.Begin);
-                    Stream.Read(Binary, 0, (int)Length);
-                    Stream.Close();
-                }
-            }
-        }
-
-        // Magic!
-        internal byte[] Patch()
-        {
-            UInt32? PatchOffset = ByteOperations.FindPattern(Binary,
-                new byte[] { 0x04, 0x00, 0x9F, 0xE5, 0x28, 0x00, 0xD0, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1 },
-                null, null);
-
-            if (PatchOffset == null)
-            {
-                throw new BadImageFormatException();
-            }
-
-            Buffer.BlockCopy(new byte[] { 0x00, 0x00, 0xA0, 0xE3 }, 0, Binary, (int)PatchOffset + 4, 4);
-
-            return Binary;
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.IO;
+
+namespace WPinternals
+{
+    internal class SBL3
+    {
+        internal byte[] Binary;
+
+        internal SBL3(byte[] Binary)
+        {
+            this.Binary = Binary;
+        }
+
+        internal SBL3(string FileName)
+        {
+            Binary = null;
+
+            // First try to parse as FFU
+            try
+            {
+                if (FFU.IsFFU(FileName))
+                {
+                    FFU FFUFile = new(FileName);
+                    Binary = FFUFile.GetPartition("SBL3");
+                }
+            }
+            catch { }
+
+            // If not succeeded, then try to parse it as raw image
+            if (Binary == null)
+            {
+                byte[] SBL3Pattern = new byte[] { 0x18, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x8F, 0xFF, 0xFF, 0xFF, 0xFF };
+                byte[] SBL3Mask = new byte[] { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF };
+
+                UInt32? Offset = ByteOperations.FindPatternInFile(FileName, SBL3Pattern, SBL3Mask, out byte[] SBL3Header);
+
+                if (Offset != null)
+                {
+                    UInt32 Length = ByteOperations.ReadUInt32(SBL3Header, 0x10) + 0x28; // SBL3 Image Size + Header Size
+                    Binary = new byte[Length];
+
+                    FileStream Stream = new(FileName, FileMode.Open, FileAccess.Read);
+                    Stream.Seek((long)Offset, SeekOrigin.Begin);
+                    Stream.Read(Binary, 0, (int)Length);
+                    Stream.Close();
+                }
+            }
+        }
+
+        // Magic!
+        internal byte[] Patch()
+        {
+            UInt32? PatchOffset = ByteOperations.FindPattern(Binary,
+                new byte[] { 0x04, 0x00, 0x9F, 0xE5, 0x28, 0x00, 0xD0, 0xE5, 0x1E, 0xFF, 0x2F, 0xE1 },
+                null, null);
+
+            if (PatchOffset == null)
+            {
+                throw new BadImageFormatException();
+            }
+
+            Buffer.BlockCopy(new byte[] { 0x00, 0x00, 0xA0, 0xE3 }, 0, Binary, (int)PatchOffset + 4, 4);
+
+            return Binary;
+        }
+    }
+}
diff --git a/Models/UEFI.cs b/WPinternals/Models/UEFI.cs
similarity index 97%
rename from Models/UEFI.cs
rename to WPinternals/Models/UEFI.cs
index f158800..54794f6 100644
--- a/Models/UEFI.cs
+++ b/WPinternals/Models/UEFI.cs
@@ -1,647 +1,647 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace WPinternals
-{
-    internal class EFI
-    {
-        internal Guid Guid;
-        internal string Name;
-        internal int Type;
-        internal UInt32 Size;
-        internal UInt32 FileOffset;
-        internal UInt32 SectionOffset;
-        internal UInt32 BinaryOffset;
-    }
-
-    internal class UEFI
-    {
-        internal byte[] Binary;
-        private byte[] DecompressedImage;
-        internal List<EFI> EFIs = new();
-        private readonly byte PaddingByteValue = 0xFF;
-        private readonly UInt32 DecompressedVolumeSectionHeaderOffset;
-        private readonly UInt32 DecompressedVolumeHeaderOffset;
-        private readonly UInt32 VolumeSize;
-        private readonly UInt16 VolumeHeaderSize;
-        private readonly UInt32 FileHeaderOffset;
-        private readonly UInt32 SectionHeaderOffset;
-        private readonly UInt32 CompressedSubImageOffset;
-        private UInt32 CompressedSubImageSize;
-
-        // First 0x28 bytes are Qualcomm partition header
-        // Inside the attributes of the VolumeHeader, the Volume-alignment is set to 8 (on Windows Phone UEFI images)
-        // The Volume always starts right after the Qualcomm header at position 0x28.
-        // So the VolumeHeader-alignment is always complied.
-        private readonly UInt32 VolumeHeaderOffset = 0x28;
-
-        internal UEFI(byte[] UefiBinary)
-        {
-            Binary = UefiBinary;
-
-            string VolumeHeaderMagic;
-            UInt32? Offset = ByteOperations.FindAscii(Binary, "_FVH");
-            VolumeHeaderOffset = Offset == null ? throw new BadImageFormatException() : (UInt32)Offset - 0x28;
-
-            if (!VerifyVolumeChecksum(Binary, VolumeHeaderOffset))
-            {
-                throw new BadImageFormatException();
-            }
-
-            VolumeSize = ByteOperations.ReadUInt32(Binary, VolumeHeaderOffset + 0x20); // TODO: This is actually a QWORD
-            VolumeHeaderSize = ByteOperations.ReadUInt16(Binary, VolumeHeaderOffset + 0x30);
-            PaddingByteValue = (ByteOperations.ReadUInt32(Binary, VolumeHeaderOffset + 0x2C) & 0x00000800) > 0 ? (byte)0xFF : (byte)0x00; // EFI_FVB_ERASE_POLARITY = 0x00000800
-
-            // In the volume look for a file of type EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE (0x0B)
-
-            FileHeaderOffset = VolumeHeaderOffset + VolumeHeaderSize;
-            bool VolumeFound = false;
-            int FileType;
-            UInt32 FileSize;
-            do
-            {
-                if (!VerifyFileChecksum(Binary, FileHeaderOffset))
-                {
-                    throw new BadImageFormatException();
-                }
-
-                FileType = ByteOperations.ReadUInt8(Binary, FileHeaderOffset + 0x12);
-                FileSize = ByteOperations.ReadUInt24(Binary, FileHeaderOffset + 0x14);
-
-                if (FileType == 0x0B) // EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE
-                {
-                    VolumeFound = true;
-                }
-                else
-                {
-                    FileHeaderOffset += FileSize;
-
-                    // FileHeaderOffset in Volume-body must be Align 8
-                    // In the file-header-attributes the file-alignment relative to the start of the volume is always set to 1,
-                    // so that alignment can be ignored.
-                    FileHeaderOffset = ByteOperations.Align(VolumeHeaderOffset + VolumeHeaderSize, FileHeaderOffset, 8);
-                }
-            }
-            while (!VolumeFound && (FileHeaderOffset < (VolumeHeaderOffset + VolumeSize)));
-
-            if (!VolumeFound)
-            {
-                throw new BadImageFormatException();
-            }
-
-            // Look in file for section of type EFI_SECTION_GUID_DEFINED (0x02)
-
-            SectionHeaderOffset = FileHeaderOffset + 0x18;
-            int SectionType;
-            UInt32 SectionSize;
-            UInt16 SectionHeaderSize = 0;
-
-            bool DecompressedVolumeFound = false;
-            do
-            {
-                SectionType = ByteOperations.ReadUInt8(Binary, SectionHeaderOffset + 0x03);
-                SectionSize = ByteOperations.ReadUInt24(Binary, SectionHeaderOffset + 0x00);
-
-                if (SectionType == 0x02) // EFI_SECTION_GUID_DEFINED
-                {
-                    SectionHeaderSize = ByteOperations.ReadUInt16(Binary, SectionHeaderOffset + 0x14);
-                    DecompressedVolumeFound = true;
-                }
-                else
-                {
-                    SectionHeaderOffset += SectionSize;
-
-                    // SectionHeaderOffset in File-body must be Align 4
-                    SectionHeaderOffset = ByteOperations.Align(FileHeaderOffset + 0x18, SectionHeaderOffset, 4);
-                }
-            }
-            while (!DecompressedVolumeFound && (SectionHeaderOffset < (FileHeaderOffset + FileSize)));
-
-            if (!DecompressedVolumeFound)
-            {
-                throw new BadImageFormatException();
-            }
-
-            // Decompress subvolume
-            CompressedSubImageOffset = SectionHeaderOffset + SectionHeaderSize;
-            CompressedSubImageSize = SectionSize - SectionHeaderSize;
-
-            // DECOMPRESS HERE
-            DecompressedImage = LZMA.Decompress(Binary, CompressedSubImageOffset, CompressedSubImageSize);
-
-            // Extracted volume contains Sections at its root level
-
-            DecompressedVolumeSectionHeaderOffset = 0;
-            DecompressedVolumeFound = false;
-            do
-            {
-                SectionType = ByteOperations.ReadUInt8(DecompressedImage, DecompressedVolumeSectionHeaderOffset + 0x03);
-                SectionSize = ByteOperations.ReadUInt24(DecompressedImage, DecompressedVolumeSectionHeaderOffset + 0x00);
-                SectionHeaderSize = ByteOperations.ReadUInt16(DecompressedImage, DecompressedVolumeSectionHeaderOffset + 0x14);
-
-                if (SectionType == 0x17) // EFI_SECTION_FIRMWARE_VOLUME_IMAGE
-                {
-                    DecompressedVolumeFound = true;
-                }
-                else
-                {
-                    DecompressedVolumeSectionHeaderOffset += SectionSize;
-
-                    // SectionHeaderOffset in File-body must be Align 4
-                    DecompressedVolumeSectionHeaderOffset = ByteOperations.Align(FileHeaderOffset + 0x18, DecompressedVolumeSectionHeaderOffset, 4);
-                }
-            }
-            while (!DecompressedVolumeFound && (DecompressedVolumeSectionHeaderOffset < DecompressedImage.Length));
-
-            if (!DecompressedVolumeFound)
-            {
-                throw new BadImageFormatException();
-            }
-
-            DecompressedVolumeHeaderOffset = DecompressedVolumeSectionHeaderOffset + 4;
-
-            // PARSE COMPRESSED VOLUME
-            VolumeHeaderMagic = ByteOperations.ReadAsciiString(DecompressedImage, DecompressedVolumeHeaderOffset + 0x28, 0x04);
-            if (VolumeHeaderMagic != "_FVH")
-            {
-                throw new BadImageFormatException();
-            }
-
-            if (!VerifyVolumeChecksum(DecompressedImage, DecompressedVolumeHeaderOffset))
-            {
-                throw new BadImageFormatException();
-            }
-
-            Int32 DecompressedVolumeSize = ByteOperations.ReadInt32(DecompressedImage, DecompressedVolumeHeaderOffset + 0x20); // TODO: This is actually a QWORD
-            UInt16 DecompressedVolumeHeaderSize = ByteOperations.ReadUInt16(DecompressedImage, DecompressedVolumeHeaderOffset + 0x30);
-
-            // The files in this decompressed volume are the real EFI's.
-            UInt32 DecompressedFileHeaderOffset = DecompressedVolumeHeaderOffset + DecompressedVolumeHeaderSize;
-            EFI CurrentEFI;
-            do
-            {
-                if ((DecompressedFileHeaderOffset + 0x18) >= (DecompressedVolumeHeaderOffset + DecompressedVolumeSize))
-                {
-                    break;
-                }
-
-                bool ContentFound = false;
-                for (int i = 0; i < 0x18; i++)
-                {
-                    if (DecompressedImage[DecompressedFileHeaderOffset + i] != PaddingByteValue)
-                    {
-                        ContentFound = true;
-                        break;
-                    }
-                }
-                if (!ContentFound)
-                {
-                    break;
-                }
-
-                FileSize = ByteOperations.ReadUInt24(DecompressedImage, DecompressedFileHeaderOffset + 0x14);
-
-                if ((DecompressedFileHeaderOffset + FileSize) >= (DecompressedVolumeHeaderOffset + DecompressedVolumeSize))
-                {
-                    break;
-                }
-
-                if (!VerifyFileChecksum(DecompressedImage, DecompressedFileHeaderOffset))
-                {
-                    throw new BadImageFormatException();
-                }
-
-                CurrentEFI = new EFI
-                {
-                    Type = ByteOperations.ReadUInt8(DecompressedImage, DecompressedFileHeaderOffset + 0x12)
-                };
-                byte[] FileGuidBytes = new byte[0x10];
-                Buffer.BlockCopy(DecompressedImage, (int)DecompressedFileHeaderOffset + 0x00, FileGuidBytes, 0, 0x10);
-                CurrentEFI.Guid = new Guid(FileGuidBytes);
-
-                // Parse sections of the EFI
-                CurrentEFI.FileOffset = DecompressedFileHeaderOffset;
-                UInt32 DecompressedSectionHeaderOffset = DecompressedFileHeaderOffset + 0x18;
-                do
-                {
-                    SectionType = ByteOperations.ReadUInt8(DecompressedImage, DecompressedSectionHeaderOffset + 0x03);
-                    SectionSize = ByteOperations.ReadUInt24(DecompressedImage, DecompressedSectionHeaderOffset + 0x00);
-
-                    // SectionTypes that are relevant here:
-                    // 0x10 = PE File
-                    // 0x19 = RAW
-                    // 0x15 = Description
-                    // Not all section headers in the UEFI specs are 4 bytes long,
-                    // but the sections that are used in Windows Phone EFI's all have a header of 4 bytes.
-                    if (SectionType == 0x15)
-                    {
-                        CurrentEFI.Name = ByteOperations.ReadUnicodeString(DecompressedImage, DecompressedSectionHeaderOffset + 0x04, SectionSize - 0x04).TrimEnd(new char[] { (char)0, ' ' });
-                    }
-                    else if ((SectionType == 0x10) || (SectionType == 0x19))
-                    {
-                        CurrentEFI.SectionOffset = DecompressedSectionHeaderOffset;
-                        CurrentEFI.BinaryOffset = DecompressedSectionHeaderOffset + 0x04;
-                        CurrentEFI.Size = SectionSize - 0x04;
-                    }
-
-                    DecompressedSectionHeaderOffset += SectionSize;
-
-                    // SectionHeaderOffset in File-body must be Align 4
-                    DecompressedSectionHeaderOffset = ByteOperations.Align(DecompressedFileHeaderOffset + 0x18, DecompressedSectionHeaderOffset, 4);
-                }
-                while (DecompressedSectionHeaderOffset < (DecompressedFileHeaderOffset + FileSize));
-
-                DecompressedFileHeaderOffset += FileSize;
-
-                // FileHeaderOffset in Volume-body must be Align 8
-                // In the file-header-attributes the file-alignment relative to the start of the volume is always set to 1,
-                // so that alignment can be ignored.
-                DecompressedFileHeaderOffset = ByteOperations.Align(DecompressedVolumeHeaderOffset + DecompressedVolumeHeaderSize, DecompressedFileHeaderOffset, 8);
-
-                EFIs.Add(CurrentEFI);
-            }
-            while (DecompressedFileHeaderOffset < (DecompressedVolumeHeaderOffset + DecompressedVolumeSize));
-        }
-
-        internal byte[] GetFile(string Name)
-        {
-            EFI File = EFIs.Find(f => string.Equals(Name, f.Name, StringComparison.CurrentCultureIgnoreCase) || string.Equals(Name, f.Guid.ToString(), StringComparison.CurrentCultureIgnoreCase));
-            if (File == null)
-            {
-                return null;
-            }
-
-            byte[] Bytes = new byte[File.Size];
-            Buffer.BlockCopy(DecompressedImage, (int)File.BinaryOffset, Bytes, 0, (int)File.Size);
-
-            return Bytes;
-        }
-
-        internal byte[] GetFile(Guid Guid)
-        {
-            EFI File = EFIs.Find(f => Guid == f.Guid);
-            if (File == null)
-            {
-                return null;
-            }
-
-            byte[] Bytes = new byte[File.Size];
-            Buffer.BlockCopy(DecompressedImage, (int)File.BinaryOffset, Bytes, 0, (int)File.Size);
-
-            return Bytes;
-        }
-
-        internal void ReplaceFile(string Name, byte[] Binary)
-        {
-            EFI File = EFIs.Find(f => string.Equals(Name, f.Name, StringComparison.CurrentCultureIgnoreCase) || string.Equals(Name, f.Guid.ToString(), StringComparison.CurrentCultureIgnoreCase));
-            if (File == null)
-            {
-                throw new ArgumentOutOfRangeException();
-            }
-
-            UInt32 OldBinarySize = File.Size;
-            UInt32 NewBinarySize = (UInt32)Binary.Length;
-
-            UInt32 OldSectionPadding = ByteOperations.Align(0, OldBinarySize, 4) - OldBinarySize;
-            UInt32 NewSectionPadding = ByteOperations.Align(0, NewBinarySize, 4) - NewBinarySize;
-
-            UInt32 OldFileSize = ByteOperations.ReadUInt24(DecompressedImage, File.FileOffset + 0x14);
-            UInt32 NewFileSize = OldFileSize - OldBinarySize - OldSectionPadding + NewBinarySize + NewSectionPadding;
-
-            UInt32 OldFilePadding = ByteOperations.Align(0, OldFileSize, 8) - OldFileSize;
-            UInt32 NewFilePadding = ByteOperations.Align(0, NewFileSize, 8) - NewFileSize;
-
-            if ((OldBinarySize + OldSectionPadding) != (NewBinarySize + NewSectionPadding))
-            {
-                byte[] NewImage = new byte[DecompressedImage.Length - OldFileSize - OldFilePadding + NewFileSize + NewFilePadding]; // Also preserve space for File-alignement here
-
-                // Copy Volume-head and File-head
-                Buffer.BlockCopy(DecompressedImage, 0, NewImage, 0, (int)File.BinaryOffset);
-
-                // Copy new binary
-                Buffer.BlockCopy(Binary, 0, NewImage, (int)File.BinaryOffset, Binary.Length);
-
-                // Insert section-padding
-                for (int i = 0; i < NewSectionPadding; i++)
-                {
-                    NewImage[File.BinaryOffset + NewBinarySize + i] = PaddingByteValue;
-                }
-
-                // Copy file-tail
-                Buffer.BlockCopy(
-                    DecompressedImage,
-                    (int)(File.BinaryOffset + OldBinarySize + OldSectionPadding),
-                    NewImage,
-                    (int)(File.BinaryOffset + NewBinarySize + NewSectionPadding),
-                    (int)(File.FileOffset + OldFileSize - File.BinaryOffset - OldBinarySize - OldSectionPadding));
-
-                // Insert file-padding
-                for (int i = 0; i < NewFilePadding; i++)
-                {
-                    NewImage[File.BinaryOffset + NewFileSize + i] = PaddingByteValue;
-                }
-
-                // Copy volume-tail
-                Buffer.BlockCopy(
-                    DecompressedImage,
-                    (int)(File.FileOffset + OldFileSize + OldFilePadding),
-                    NewImage,
-                    (int)(File.FileOffset + NewFileSize + NewFilePadding),
-                    (int)(DecompressedImage.Length - File.FileOffset - OldFileSize - OldFilePadding));
-
-                Int32 NewOffset = (int)(NewFileSize + NewFilePadding) - (int)(OldFileSize - OldFilePadding);
-
-                // Fix section-size
-                ByteOperations.WriteUInt24(NewImage, File.SectionOffset, (UInt32)(ByteOperations.ReadUInt24(NewImage, File.SectionOffset) + NewOffset));
-
-                // Fix file-size
-                ByteOperations.WriteUInt24(NewImage, File.FileOffset + 0x14, (UInt32)(ByteOperations.ReadUInt24(NewImage, File.FileOffset + 0x14) + NewOffset));
-
-                // Fix volume-size - TODO: This is actually a QWORD
-                ByteOperations.WriteUInt32(NewImage, DecompressedVolumeHeaderOffset + 0x20, (UInt32)(ByteOperations.ReadUInt32(NewImage, DecompressedVolumeHeaderOffset + 0x20) + NewOffset));
-
-                // Fix section-size
-                ByteOperations.WriteUInt24(NewImage, DecompressedVolumeSectionHeaderOffset, (UInt32)(ByteOperations.ReadUInt24(NewImage, DecompressedVolumeSectionHeaderOffset) + NewOffset));
-
-                DecompressedImage = NewImage;
-
-                // Modify all sizes in EFI's
-                foreach (EFI CurrentFile in EFIs)
-                {
-                    if (CurrentFile.FileOffset > File.FileOffset)
-                    {
-                        CurrentFile.FileOffset = (UInt32)(CurrentFile.FileOffset + NewOffset);
-                        CurrentFile.SectionOffset = (UInt32)(CurrentFile.SectionOffset + NewOffset);
-                        CurrentFile.BinaryOffset = (UInt32)(CurrentFile.BinaryOffset + NewOffset);
-                    }
-                }
-            }
-            else
-            {
-                Buffer.BlockCopy(Binary, 0, DecompressedImage, (int)File.BinaryOffset, Binary.Length);
-                for (int i = 0; i < NewSectionPadding; i++)
-                {
-                    DecompressedImage[File.BinaryOffset + Binary.Length + i] = PaddingByteValue;
-                }
-            }
-
-            // Calculate File-checksum
-            CalculateFileChecksum(DecompressedImage, File.FileOffset);
-
-            // Calculate Volume-checksum
-            CalculateVolumeChecksum(DecompressedImage, DecompressedVolumeHeaderOffset);
-        }
-
-        internal byte[] Rebuild()
-        {
-            // The new binary will include the Qualcomm header, but not the signature and certificates, because they won't match anyway.
-            byte[] NewBinary = new byte[Binary.Length];
-            Buffer.BlockCopy(Binary, 0, NewBinary, 0, (int)CompressedSubImageOffset);
-
-            ByteOperations.WriteUInt32(NewBinary, 0x10, ByteOperations.ReadUInt32(NewBinary, 0x14)); // Complete image size - does not include signature and certs anymore
-            ByteOperations.WriteUInt32(NewBinary, 0x18, 0x00000000); // Address of signature
-            ByteOperations.WriteUInt32(NewBinary, 0x1C, 0x00000000); // Signature length
-            ByteOperations.WriteUInt32(NewBinary, 0x20, 0x00000000); // Address of certificate
-            ByteOperations.WriteUInt32(NewBinary, 0x24, 0x00000000); // Certificate length
-
-            // Compress volume
-            byte[] NewCompressedImage = LZMA.Compress(DecompressedImage, 0, (UInt32)DecompressedImage.Length);
-
-            // Replace compressed volume and add correct padding
-            // First copy new image
-            Buffer.BlockCopy(NewCompressedImage, 0, NewBinary, (int)CompressedSubImageOffset, NewCompressedImage.Length);
-
-            // Determine padding
-            UInt32 OldSectionPadding = ByteOperations.Align(0, CompressedSubImageSize, 4) - CompressedSubImageSize;
-            UInt32 NewSectionPadding = ByteOperations.Align(0, (UInt32)NewCompressedImage.Length, 4) - (UInt32)NewCompressedImage.Length;
-            UInt32 OldFileSize = ByteOperations.ReadUInt24(Binary, FileHeaderOffset + 0x14);
-
-            // Filesize includes fileheader. But it does not include the padding-bytes. Not even the padding bytes of the last section.
-            UInt32 NewFileSize;
-            if ((CompressedSubImageOffset + CompressedSubImageSize + OldSectionPadding) >= (FileHeaderOffset + OldFileSize))
-            {
-                // Compressed image is the last section of this file
-                NewFileSize = CompressedSubImageOffset - FileHeaderOffset + (UInt32)NewCompressedImage.Length;
-            }
-            else
-            {
-                // Compressed image is NOT the last section of this file
-                NewFileSize = OldFileSize - CompressedSubImageSize - OldSectionPadding + (UInt32)NewCompressedImage.Length + NewSectionPadding;
-            }
-
-            // Add section padding
-            for (int i = 0; i < NewSectionPadding; i++)
-            {
-                NewBinary[CompressedSubImageOffset + NewCompressedImage.Length + i] = PaddingByteValue;
-            }
-
-            // If there are more bytes after the section padding of the compressed image, then copy the trailing sections
-            if (((Int32)FileHeaderOffset + OldFileSize - CompressedSubImageOffset - CompressedSubImageSize - OldSectionPadding) > 0)
-            {
-                Buffer.BlockCopy(Binary, (int)(CompressedSubImageOffset + CompressedSubImageSize + OldSectionPadding), NewBinary,
-                    (int)(CompressedSubImageOffset + NewCompressedImage.Length + NewSectionPadding),
-                    (int)(FileHeaderOffset + OldFileSize - CompressedSubImageOffset - CompressedSubImageSize - OldSectionPadding));
-            }
-
-            // Add file padding
-            // Filesize does not include last section padding or file padding
-            UInt32 OldFilePadding = ByteOperations.Align(0, OldFileSize, 8) - OldFileSize;
-            UInt32 NewFilePadding = ByteOperations.Align(0, NewFileSize, 8) - NewFileSize;
-            for (int i = 0; i < NewFilePadding; i++)
-            {
-                NewBinary[FileHeaderOffset + NewFileSize + i] = PaddingByteValue;
-            }
-
-            if (NewCompressedImage.Length > CompressedSubImageSize)
-            {
-                Buffer.BlockCopy(Binary, (int)(FileHeaderOffset + OldFileSize + OldFilePadding), NewBinary, (int)(FileHeaderOffset + NewFileSize + NewFilePadding),
-                    (int)(VolumeHeaderOffset + VolumeSize - FileHeaderOffset - NewFileSize - NewFilePadding));
-            }
-            else
-            {
-                Buffer.BlockCopy(Binary, (int)(FileHeaderOffset + OldFileSize + OldFilePadding), NewBinary, (int)(FileHeaderOffset + NewFileSize + NewFilePadding),
-                    (int)(VolumeHeaderOffset + VolumeSize - FileHeaderOffset - OldFileSize - OldFilePadding));
-                for (int i = (int)(VolumeHeaderOffset + VolumeSize - OldFileSize - OldFilePadding + NewFileSize + NewFilePadding); i < VolumeHeaderOffset + VolumeSize; i++)
-                {
-                    NewBinary[i] = PaddingByteValue;
-                }
-            }
-            CompressedSubImageSize = (UInt32)NewCompressedImage.Length;
-
-            // Fix section
-            ByteOperations.WriteUInt24(NewBinary, SectionHeaderOffset, CompressedSubImageSize + ByteOperations.ReadUInt16(Binary, SectionHeaderOffset + 0x14));
-
-            // Fix file
-            ByteOperations.WriteUInt24(NewBinary, FileHeaderOffset + 0x14, NewFileSize);
-            CalculateFileChecksum(NewBinary, FileHeaderOffset);
-
-            // Fix volume (volume size is fixed)
-            CalculateVolumeChecksum(NewBinary, VolumeHeaderOffset);
-
-            Binary = NewBinary;
-            return Binary;
-        }
-
-        private void CalculateVolumeChecksum(byte[] Image, UInt32 Offset)
-        {
-            UInt16 VolumeHeaderSize = ByteOperations.ReadUInt16(Image, Offset + 0x30);
-            ByteOperations.WriteUInt16(Image, Offset + 0x32, 0); // Clear checksum
-            UInt16 NewChecksum = ByteOperations.CalculateChecksum16(Image, Offset, VolumeHeaderSize);
-            ByteOperations.WriteUInt16(Image, Offset + 0x32, NewChecksum);
-        }
-
-        private bool VerifyVolumeChecksum(byte[] Image, UInt32 Offset)
-        {
-            UInt16 VolumeHeaderSize = ByteOperations.ReadUInt16(Image, Offset + 0x30);
-            byte[] Header = new byte[VolumeHeaderSize];
-            Buffer.BlockCopy(Image, (int)Offset, Header, 0, VolumeHeaderSize);
-            ByteOperations.WriteUInt16(Header, 0x32, 0); // Clear checksum
-            UInt16 CurrentChecksum = ByteOperations.ReadUInt16(Image, Offset + 0x32);
-            UInt16 NewChecksum = ByteOperations.CalculateChecksum16(Header, 0, VolumeHeaderSize);
-            return CurrentChecksum == NewChecksum;
-        }
-
-        private void CalculateFileChecksum(byte[] Image, UInt32 Offset)
-        {
-            const UInt16 FileHeaderSize = 0x18;
-            UInt32 FileSize = ByteOperations.ReadUInt24(Image, Offset + 0x14);
-
-            ByteOperations.WriteUInt16(Image, Offset + 0x10, 0); // Clear checksum
-            byte NewChecksum = ByteOperations.CalculateChecksum8(Image, Offset, (UInt32)FileHeaderSize - 1);
-            ByteOperations.WriteUInt8(Image, Offset + 0x10, NewChecksum); // File-Header checksum
-
-            byte FileAttribs = ByteOperations.ReadUInt8(Image, Offset + 0x13);
-            if ((FileAttribs & 0x40) > 0)
-            {
-                // Calculate file checksum
-                byte CalculatedFileChecksum = ByteOperations.CalculateChecksum8(Image, Offset + FileHeaderSize, FileSize - FileHeaderSize);
-                ByteOperations.WriteUInt8(Image, Offset + 0x11, CalculatedFileChecksum);
-            }
-            else
-            {
-                // Fixed file checksum
-                ByteOperations.WriteUInt8(Image, Offset + 0x11, 0xAA);
-            }
-        }
-
-        private bool VerifyFileChecksum(byte[] Image, UInt32 Offset)
-        {
-            // This function only checks fixed checksum-values 0x55 and 0xAA.
-
-            const UInt16 FileHeaderSize = 0x18;
-            UInt32 FileSize = ByteOperations.ReadUInt24(Image, Offset + 0x14);
-
-            byte[] Header = new byte[FileHeaderSize - 1];
-            Buffer.BlockCopy(Image, (int)Offset, Header, 0, FileHeaderSize - 1);
-            ByteOperations.WriteUInt16(Header, 0x10, 0); // Clear checksum
-            byte CurrentHeaderChecksum = ByteOperations.ReadUInt8(Image, Offset + 0x10);
-            byte CalculatedHeaderChecksum = ByteOperations.CalculateChecksum8(Header, 0, (UInt32)FileHeaderSize - 1);
-
-            if (CurrentHeaderChecksum != CalculatedHeaderChecksum)
-            {
-                return false;
-            }
-
-            byte FileAttribs = ByteOperations.ReadUInt8(Image, Offset + 0x13);
-            byte CurrentFileChecksum = ByteOperations.ReadUInt8(Image, Offset + 0x11);
-            if ((FileAttribs & 0x40) > 0)
-            {
-                // Calculate file checksum
-                byte CalculatedFileChecksum = ByteOperations.CalculateChecksum8(Image, Offset + FileHeaderSize, FileSize - FileHeaderSize);
-                if (CurrentFileChecksum != CalculatedFileChecksum)
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                // Fixed file checksum
-                if ((CurrentFileChecksum != 0xAA) && (CurrentFileChecksum != 0x55))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        private void ClearEfiChecksum(byte[] EfiFile)
-        {
-            UInt32 PEHeaderOffset = ByteOperations.ReadUInt32(EfiFile, 0x3C);
-            ByteOperations.WriteUInt32(EfiFile, PEHeaderOffset + 0x58, 0);
-        }
-
-        // Magic!
-        internal byte[] Patch()
-        {
-            byte[] SecurityDxe = GetFile("SecurityDxe");
-            ClearEfiChecksum(SecurityDxe);
-
-            UInt32? PatchOffset = ByteOperations.FindPattern(SecurityDxe,
-                new byte[] { 0xF0, 0x41, 0x2D, 0xE9, 0xFF, 0xFF, 0xB0, 0xE1, 0x28, 0xD0, 0x4D, 0xE2, 0xFF, 0xFF, 0xA0, 0xE1, 0x00, 0x00, 0xFF, 0x13, 0x20, 0xFF, 0xA0, 0xE3 },
-                new byte[] { 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00 },
-                null);
-
-            if (PatchOffset == null)
-            {
-                throw new BadImageFormatException();
-            }
-
-            Buffer.BlockCopy(new byte[] { 0x00, 0x00, 0xA0, 0xE3, 0x1E, 0xFF, 0x2F, 0xE1 }, 0, SecurityDxe, (int)PatchOffset, 8);
-
-            ReplaceFile("SecurityDxe", SecurityDxe);
-
-            byte[] SecurityServicesDxe = GetFile("SecurityServicesDxe");
-            ClearEfiChecksum(SecurityServicesDxe);
-
-            PatchOffset = ByteOperations.FindPattern(SecurityServicesDxe,
-                new byte[] { 0x10, 0xFF, 0xFF, 0xE5, 0x80, 0xFF, 0x10, 0xE3, 0xFF, 0xFF, 0xFF, 0x0A },
-                new byte[] { 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00 },
-                null);
-
-            if (PatchOffset == null)
-            {
-                throw new BadImageFormatException();
-            }
-
-            ByteOperations.WriteUInt8(SecurityServicesDxe, (UInt32)PatchOffset + 0x0B, 0xEA);
-
-            PatchOffset = ByteOperations.FindPattern(SecurityServicesDxe,
-                new byte[] { 0x11, 0xFF, 0xFF, 0xE5, 0x40, 0xFF, 0x10, 0xE3, 0xFF, 0xFF, 0xFF, 0x0A },
-                new byte[] { 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00 },
-                null);
-
-            if (PatchOffset == null)
-            {
-                throw new BadImageFormatException();
-            }
-
-            ByteOperations.WriteUInt8(SecurityServicesDxe, (UInt32)PatchOffset + 0x0B, 0xEA);
-
-            ReplaceFile("SecurityServicesDxe", SecurityServicesDxe);
-
-            return Rebuild();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace WPinternals
+{
+    internal class EFI
+    {
+        internal Guid Guid;
+        internal string Name;
+        internal int Type;
+        internal UInt32 Size;
+        internal UInt32 FileOffset;
+        internal UInt32 SectionOffset;
+        internal UInt32 BinaryOffset;
+    }
+
+    internal class UEFI
+    {
+        internal byte[] Binary;
+        private byte[] DecompressedImage;
+        internal List<EFI> EFIs = new();
+        private readonly byte PaddingByteValue = 0xFF;
+        private readonly UInt32 DecompressedVolumeSectionHeaderOffset;
+        private readonly UInt32 DecompressedVolumeHeaderOffset;
+        private readonly UInt32 VolumeSize;
+        private readonly UInt16 VolumeHeaderSize;
+        private readonly UInt32 FileHeaderOffset;
+        private readonly UInt32 SectionHeaderOffset;
+        private readonly UInt32 CompressedSubImageOffset;
+        private UInt32 CompressedSubImageSize;
+
+        // First 0x28 bytes are Qualcomm partition header
+        // Inside the attributes of the VolumeHeader, the Volume-alignment is set to 8 (on Windows Phone UEFI images)
+        // The Volume always starts right after the Qualcomm header at position 0x28.
+        // So the VolumeHeader-alignment is always complied.
+        private readonly UInt32 VolumeHeaderOffset = 0x28;
+
+        internal UEFI(byte[] UefiBinary)
+        {
+            Binary = UefiBinary;
+
+            string VolumeHeaderMagic;
+            UInt32? Offset = ByteOperations.FindAscii(Binary, "_FVH");
+            VolumeHeaderOffset = Offset == null ? throw new BadImageFormatException() : (UInt32)Offset - 0x28;
+
+            if (!VerifyVolumeChecksum(Binary, VolumeHeaderOffset))
+            {
+                throw new BadImageFormatException();
+            }
+
+            VolumeSize = ByteOperations.ReadUInt32(Binary, VolumeHeaderOffset + 0x20); // TODO: This is actually a QWORD
+            VolumeHeaderSize = ByteOperations.ReadUInt16(Binary, VolumeHeaderOffset + 0x30);
+            PaddingByteValue = (ByteOperations.ReadUInt32(Binary, VolumeHeaderOffset + 0x2C) & 0x00000800) > 0 ? (byte)0xFF : (byte)0x00; // EFI_FVB_ERASE_POLARITY = 0x00000800
+
+            // In the volume look for a file of type EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE (0x0B)
+
+            FileHeaderOffset = VolumeHeaderOffset + VolumeHeaderSize;
+            bool VolumeFound = false;
+            int FileType;
+            UInt32 FileSize;
+            do
+            {
+                if (!VerifyFileChecksum(Binary, FileHeaderOffset))
+                {
+                    throw new BadImageFormatException();
+                }
+
+                FileType = ByteOperations.ReadUInt8(Binary, FileHeaderOffset + 0x12);
+                FileSize = ByteOperations.ReadUInt24(Binary, FileHeaderOffset + 0x14);
+
+                if (FileType == 0x0B) // EFI_FV_FILETYPE_FIRMWARE_VOLUME_IMAGE
+                {
+                    VolumeFound = true;
+                }
+                else
+                {
+                    FileHeaderOffset += FileSize;
+
+                    // FileHeaderOffset in Volume-body must be Align 8
+                    // In the file-header-attributes the file-alignment relative to the start of the volume is always set to 1,
+                    // so that alignment can be ignored.
+                    FileHeaderOffset = ByteOperations.Align(VolumeHeaderOffset + VolumeHeaderSize, FileHeaderOffset, 8);
+                }
+            }
+            while (!VolumeFound && (FileHeaderOffset < (VolumeHeaderOffset + VolumeSize)));
+
+            if (!VolumeFound)
+            {
+                throw new BadImageFormatException();
+            }
+
+            // Look in file for section of type EFI_SECTION_GUID_DEFINED (0x02)
+
+            SectionHeaderOffset = FileHeaderOffset + 0x18;
+            int SectionType;
+            UInt32 SectionSize;
+            UInt16 SectionHeaderSize = 0;
+
+            bool DecompressedVolumeFound = false;
+            do
+            {
+                SectionType = ByteOperations.ReadUInt8(Binary, SectionHeaderOffset + 0x03);
+                SectionSize = ByteOperations.ReadUInt24(Binary, SectionHeaderOffset + 0x00);
+
+                if (SectionType == 0x02) // EFI_SECTION_GUID_DEFINED
+                {
+                    SectionHeaderSize = ByteOperations.ReadUInt16(Binary, SectionHeaderOffset + 0x14);
+                    DecompressedVolumeFound = true;
+                }
+                else
+                {
+                    SectionHeaderOffset += SectionSize;
+
+                    // SectionHeaderOffset in File-body must be Align 4
+                    SectionHeaderOffset = ByteOperations.Align(FileHeaderOffset + 0x18, SectionHeaderOffset, 4);
+                }
+            }
+            while (!DecompressedVolumeFound && (SectionHeaderOffset < (FileHeaderOffset + FileSize)));
+
+            if (!DecompressedVolumeFound)
+            {
+                throw new BadImageFormatException();
+            }
+
+            // Decompress subvolume
+            CompressedSubImageOffset = SectionHeaderOffset + SectionHeaderSize;
+            CompressedSubImageSize = SectionSize - SectionHeaderSize;
+
+            // DECOMPRESS HERE
+            DecompressedImage = LZMA.Decompress(Binary, CompressedSubImageOffset, CompressedSubImageSize);
+
+            // Extracted volume contains Sections at its root level
+
+            DecompressedVolumeSectionHeaderOffset = 0;
+            DecompressedVolumeFound = false;
+            do
+            {
+                SectionType = ByteOperations.ReadUInt8(DecompressedImage, DecompressedVolumeSectionHeaderOffset + 0x03);
+                SectionSize = ByteOperations.ReadUInt24(DecompressedImage, DecompressedVolumeSectionHeaderOffset + 0x00);
+                SectionHeaderSize = ByteOperations.ReadUInt16(DecompressedImage, DecompressedVolumeSectionHeaderOffset + 0x14);
+
+                if (SectionType == 0x17) // EFI_SECTION_FIRMWARE_VOLUME_IMAGE
+                {
+                    DecompressedVolumeFound = true;
+                }
+                else
+                {
+                    DecompressedVolumeSectionHeaderOffset += SectionSize;
+
+                    // SectionHeaderOffset in File-body must be Align 4
+                    DecompressedVolumeSectionHeaderOffset = ByteOperations.Align(FileHeaderOffset + 0x18, DecompressedVolumeSectionHeaderOffset, 4);
+                }
+            }
+            while (!DecompressedVolumeFound && (DecompressedVolumeSectionHeaderOffset < DecompressedImage.Length));
+
+            if (!DecompressedVolumeFound)
+            {
+                throw new BadImageFormatException();
+            }
+
+            DecompressedVolumeHeaderOffset = DecompressedVolumeSectionHeaderOffset + 4;
+
+            // PARSE COMPRESSED VOLUME
+            VolumeHeaderMagic = ByteOperations.ReadAsciiString(DecompressedImage, DecompressedVolumeHeaderOffset + 0x28, 0x04);
+            if (VolumeHeaderMagic != "_FVH")
+            {
+                throw new BadImageFormatException();
+            }
+
+            if (!VerifyVolumeChecksum(DecompressedImage, DecompressedVolumeHeaderOffset))
+            {
+                throw new BadImageFormatException();
+            }
+
+            Int32 DecompressedVolumeSize = ByteOperations.ReadInt32(DecompressedImage, DecompressedVolumeHeaderOffset + 0x20); // TODO: This is actually a QWORD
+            UInt16 DecompressedVolumeHeaderSize = ByteOperations.ReadUInt16(DecompressedImage, DecompressedVolumeHeaderOffset + 0x30);
+
+            // The files in this decompressed volume are the real EFI's.
+            UInt32 DecompressedFileHeaderOffset = DecompressedVolumeHeaderOffset + DecompressedVolumeHeaderSize;
+            EFI CurrentEFI;
+            do
+            {
+                if ((DecompressedFileHeaderOffset + 0x18) >= (DecompressedVolumeHeaderOffset + DecompressedVolumeSize))
+                {
+                    break;
+                }
+
+                bool ContentFound = false;
+                for (int i = 0; i < 0x18; i++)
+                {
+                    if (DecompressedImage[DecompressedFileHeaderOffset + i] != PaddingByteValue)
+                    {
+                        ContentFound = true;
+                        break;
+                    }
+                }
+                if (!ContentFound)
+                {
+                    break;
+                }
+
+                FileSize = ByteOperations.ReadUInt24(DecompressedImage, DecompressedFileHeaderOffset + 0x14);
+
+                if ((DecompressedFileHeaderOffset + FileSize) >= (DecompressedVolumeHeaderOffset + DecompressedVolumeSize))
+                {
+                    break;
+                }
+
+                if (!VerifyFileChecksum(DecompressedImage, DecompressedFileHeaderOffset))
+                {
+                    throw new BadImageFormatException();
+                }
+
+                CurrentEFI = new EFI
+                {
+                    Type = ByteOperations.ReadUInt8(DecompressedImage, DecompressedFileHeaderOffset + 0x12)
+                };
+                byte[] FileGuidBytes = new byte[0x10];
+                Buffer.BlockCopy(DecompressedImage, (int)DecompressedFileHeaderOffset + 0x00, FileGuidBytes, 0, 0x10);
+                CurrentEFI.Guid = new Guid(FileGuidBytes);
+
+                // Parse sections of the EFI
+                CurrentEFI.FileOffset = DecompressedFileHeaderOffset;
+                UInt32 DecompressedSectionHeaderOffset = DecompressedFileHeaderOffset + 0x18;
+                do
+                {
+                    SectionType = ByteOperations.ReadUInt8(DecompressedImage, DecompressedSectionHeaderOffset + 0x03);
+                    SectionSize = ByteOperations.ReadUInt24(DecompressedImage, DecompressedSectionHeaderOffset + 0x00);
+
+                    // SectionTypes that are relevant here:
+                    // 0x10 = PE File
+                    // 0x19 = RAW
+                    // 0x15 = Description
+                    // Not all section headers in the UEFI specs are 4 bytes long,
+                    // but the sections that are used in Windows Phone EFI's all have a header of 4 bytes.
+                    if (SectionType == 0x15)
+                    {
+                        CurrentEFI.Name = ByteOperations.ReadUnicodeString(DecompressedImage, DecompressedSectionHeaderOffset + 0x04, SectionSize - 0x04).TrimEnd(new char[] { (char)0, ' ' });
+                    }
+                    else if ((SectionType == 0x10) || (SectionType == 0x19))
+                    {
+                        CurrentEFI.SectionOffset = DecompressedSectionHeaderOffset;
+                        CurrentEFI.BinaryOffset = DecompressedSectionHeaderOffset + 0x04;
+                        CurrentEFI.Size = SectionSize - 0x04;
+                    }
+
+                    DecompressedSectionHeaderOffset += SectionSize;
+
+                    // SectionHeaderOffset in File-body must be Align 4
+                    DecompressedSectionHeaderOffset = ByteOperations.Align(DecompressedFileHeaderOffset + 0x18, DecompressedSectionHeaderOffset, 4);
+                }
+                while (DecompressedSectionHeaderOffset < (DecompressedFileHeaderOffset + FileSize));
+
+                DecompressedFileHeaderOffset += FileSize;
+
+                // FileHeaderOffset in Volume-body must be Align 8
+                // In the file-header-attributes the file-alignment relative to the start of the volume is always set to 1,
+                // so that alignment can be ignored.
+                DecompressedFileHeaderOffset = ByteOperations.Align(DecompressedVolumeHeaderOffset + DecompressedVolumeHeaderSize, DecompressedFileHeaderOffset, 8);
+
+                EFIs.Add(CurrentEFI);
+            }
+            while (DecompressedFileHeaderOffset < (DecompressedVolumeHeaderOffset + DecompressedVolumeSize));
+        }
+
+        internal byte[] GetFile(string Name)
+        {
+            EFI File = EFIs.Find(f => string.Equals(Name, f.Name, StringComparison.CurrentCultureIgnoreCase) || string.Equals(Name, f.Guid.ToString(), StringComparison.CurrentCultureIgnoreCase));
+            if (File == null)
+            {
+                return null;
+            }
+
+            byte[] Bytes = new byte[File.Size];
+            Buffer.BlockCopy(DecompressedImage, (int)File.BinaryOffset, Bytes, 0, (int)File.Size);
+
+            return Bytes;
+        }
+
+        internal byte[] GetFile(Guid Guid)
+        {
+            EFI File = EFIs.Find(f => Guid == f.Guid);
+            if (File == null)
+            {
+                return null;
+            }
+
+            byte[] Bytes = new byte[File.Size];
+            Buffer.BlockCopy(DecompressedImage, (int)File.BinaryOffset, Bytes, 0, (int)File.Size);
+
+            return Bytes;
+        }
+
+        internal void ReplaceFile(string Name, byte[] Binary)
+        {
+            EFI File = EFIs.Find(f => string.Equals(Name, f.Name, StringComparison.CurrentCultureIgnoreCase) || string.Equals(Name, f.Guid.ToString(), StringComparison.CurrentCultureIgnoreCase));
+            if (File == null)
+            {
+                throw new ArgumentOutOfRangeException();
+            }
+
+            UInt32 OldBinarySize = File.Size;
+            UInt32 NewBinarySize = (UInt32)Binary.Length;
+
+            UInt32 OldSectionPadding = ByteOperations.Align(0, OldBinarySize, 4) - OldBinarySize;
+            UInt32 NewSectionPadding = ByteOperations.Align(0, NewBinarySize, 4) - NewBinarySize;
+
+            UInt32 OldFileSize = ByteOperations.ReadUInt24(DecompressedImage, File.FileOffset + 0x14);
+            UInt32 NewFileSize = OldFileSize - OldBinarySize - OldSectionPadding + NewBinarySize + NewSectionPadding;
+
+            UInt32 OldFilePadding = ByteOperations.Align(0, OldFileSize, 8) - OldFileSize;
+            UInt32 NewFilePadding = ByteOperations.Align(0, NewFileSize, 8) - NewFileSize;
+
+            if ((OldBinarySize + OldSectionPadding) != (NewBinarySize + NewSectionPadding))
+            {
+                byte[] NewImage = new byte[DecompressedImage.Length - OldFileSize - OldFilePadding + NewFileSize + NewFilePadding]; // Also preserve space for File-alignement here
+
+                // Copy Volume-head and File-head
+                Buffer.BlockCopy(DecompressedImage, 0, NewImage, 0, (int)File.BinaryOffset);
+
+                // Copy new binary
+                Buffer.BlockCopy(Binary, 0, NewImage, (int)File.BinaryOffset, Binary.Length);
+
+                // Insert section-padding
+                for (int i = 0; i < NewSectionPadding; i++)
+                {
+                    NewImage[File.BinaryOffset + NewBinarySize + i] = PaddingByteValue;
+                }
+
+                // Copy file-tail
+                Buffer.BlockCopy(
+                    DecompressedImage,
+                    (int)(File.BinaryOffset + OldBinarySize + OldSectionPadding),
+                    NewImage,
+                    (int)(File.BinaryOffset + NewBinarySize + NewSectionPadding),
+                    (int)(File.FileOffset + OldFileSize - File.BinaryOffset - OldBinarySize - OldSectionPadding));
+
+                // Insert file-padding
+                for (int i = 0; i < NewFilePadding; i++)
+                {
+                    NewImage[File.BinaryOffset + NewFileSize + i] = PaddingByteValue;
+                }
+
+                // Copy volume-tail
+                Buffer.BlockCopy(
+                    DecompressedImage,
+                    (int)(File.FileOffset + OldFileSize + OldFilePadding),
+                    NewImage,
+                    (int)(File.FileOffset + NewFileSize + NewFilePadding),
+                    (int)(DecompressedImage.Length - File.FileOffset - OldFileSize - OldFilePadding));
+
+                Int32 NewOffset = (int)(NewFileSize + NewFilePadding) - (int)(OldFileSize - OldFilePadding);
+
+                // Fix section-size
+                ByteOperations.WriteUInt24(NewImage, File.SectionOffset, (UInt32)(ByteOperations.ReadUInt24(NewImage, File.SectionOffset) + NewOffset));
+
+                // Fix file-size
+                ByteOperations.WriteUInt24(NewImage, File.FileOffset + 0x14, (UInt32)(ByteOperations.ReadUInt24(NewImage, File.FileOffset + 0x14) + NewOffset));
+
+                // Fix volume-size - TODO: This is actually a QWORD
+                ByteOperations.WriteUInt32(NewImage, DecompressedVolumeHeaderOffset + 0x20, (UInt32)(ByteOperations.ReadUInt32(NewImage, DecompressedVolumeHeaderOffset + 0x20) + NewOffset));
+
+                // Fix section-size
+                ByteOperations.WriteUInt24(NewImage, DecompressedVolumeSectionHeaderOffset, (UInt32)(ByteOperations.ReadUInt24(NewImage, DecompressedVolumeSectionHeaderOffset) + NewOffset));
+
+                DecompressedImage = NewImage;
+
+                // Modify all sizes in EFI's
+                foreach (EFI CurrentFile in EFIs)
+                {
+                    if (CurrentFile.FileOffset > File.FileOffset)
+                    {
+                        CurrentFile.FileOffset = (UInt32)(CurrentFile.FileOffset + NewOffset);
+                        CurrentFile.SectionOffset = (UInt32)(CurrentFile.SectionOffset + NewOffset);
+                        CurrentFile.BinaryOffset = (UInt32)(CurrentFile.BinaryOffset + NewOffset);
+                    }
+                }
+            }
+            else
+            {
+                Buffer.BlockCopy(Binary, 0, DecompressedImage, (int)File.BinaryOffset, Binary.Length);
+                for (int i = 0; i < NewSectionPadding; i++)
+                {
+                    DecompressedImage[File.BinaryOffset + Binary.Length + i] = PaddingByteValue;
+                }
+            }
+
+            // Calculate File-checksum
+            CalculateFileChecksum(DecompressedImage, File.FileOffset);
+
+            // Calculate Volume-checksum
+            CalculateVolumeChecksum(DecompressedImage, DecompressedVolumeHeaderOffset);
+        }
+
+        internal byte[] Rebuild()
+        {
+            // The new binary will include the Qualcomm header, but not the signature and certificates, because they won't match anyway.
+            byte[] NewBinary = new byte[Binary.Length];
+            Buffer.BlockCopy(Binary, 0, NewBinary, 0, (int)CompressedSubImageOffset);
+
+            ByteOperations.WriteUInt32(NewBinary, 0x10, ByteOperations.ReadUInt32(NewBinary, 0x14)); // Complete image size - does not include signature and certs anymore
+            ByteOperations.WriteUInt32(NewBinary, 0x18, 0x00000000); // Address of signature
+            ByteOperations.WriteUInt32(NewBinary, 0x1C, 0x00000000); // Signature length
+            ByteOperations.WriteUInt32(NewBinary, 0x20, 0x00000000); // Address of certificate
+            ByteOperations.WriteUInt32(NewBinary, 0x24, 0x00000000); // Certificate length
+
+            // Compress volume
+            byte[] NewCompressedImage = LZMA.Compress(DecompressedImage, 0, (UInt32)DecompressedImage.Length);
+
+            // Replace compressed volume and add correct padding
+            // First copy new image
+            Buffer.BlockCopy(NewCompressedImage, 0, NewBinary, (int)CompressedSubImageOffset, NewCompressedImage.Length);
+
+            // Determine padding
+            UInt32 OldSectionPadding = ByteOperations.Align(0, CompressedSubImageSize, 4) - CompressedSubImageSize;
+            UInt32 NewSectionPadding = ByteOperations.Align(0, (UInt32)NewCompressedImage.Length, 4) - (UInt32)NewCompressedImage.Length;
+            UInt32 OldFileSize = ByteOperations.ReadUInt24(Binary, FileHeaderOffset + 0x14);
+
+            // Filesize includes fileheader. But it does not include the padding-bytes. Not even the padding bytes of the last section.
+            UInt32 NewFileSize;
+            if ((CompressedSubImageOffset + CompressedSubImageSize + OldSectionPadding) >= (FileHeaderOffset + OldFileSize))
+            {
+                // Compressed image is the last section of this file
+                NewFileSize = CompressedSubImageOffset - FileHeaderOffset + (UInt32)NewCompressedImage.Length;
+            }
+            else
+            {
+                // Compressed image is NOT the last section of this file
+                NewFileSize = OldFileSize - CompressedSubImageSize - OldSectionPadding + (UInt32)NewCompressedImage.Length + NewSectionPadding;
+            }
+
+            // Add section padding
+            for (int i = 0; i < NewSectionPadding; i++)
+            {
+                NewBinary[CompressedSubImageOffset + NewCompressedImage.Length + i] = PaddingByteValue;
+            }
+
+            // If there are more bytes after the section padding of the compressed image, then copy the trailing sections
+            if (((Int32)FileHeaderOffset + OldFileSize - CompressedSubImageOffset - CompressedSubImageSize - OldSectionPadding) > 0)
+            {
+                Buffer.BlockCopy(Binary, (int)(CompressedSubImageOffset + CompressedSubImageSize + OldSectionPadding), NewBinary,
+                    (int)(CompressedSubImageOffset + NewCompressedImage.Length + NewSectionPadding),
+                    (int)(FileHeaderOffset + OldFileSize - CompressedSubImageOffset - CompressedSubImageSize - OldSectionPadding));
+            }
+
+            // Add file padding
+            // Filesize does not include last section padding or file padding
+            UInt32 OldFilePadding = ByteOperations.Align(0, OldFileSize, 8) - OldFileSize;
+            UInt32 NewFilePadding = ByteOperations.Align(0, NewFileSize, 8) - NewFileSize;
+            for (int i = 0; i < NewFilePadding; i++)
+            {
+                NewBinary[FileHeaderOffset + NewFileSize + i] = PaddingByteValue;
+            }
+
+            if (NewCompressedImage.Length > CompressedSubImageSize)
+            {
+                Buffer.BlockCopy(Binary, (int)(FileHeaderOffset + OldFileSize + OldFilePadding), NewBinary, (int)(FileHeaderOffset + NewFileSize + NewFilePadding),
+                    (int)(VolumeHeaderOffset + VolumeSize - FileHeaderOffset - NewFileSize - NewFilePadding));
+            }
+            else
+            {
+                Buffer.BlockCopy(Binary, (int)(FileHeaderOffset + OldFileSize + OldFilePadding), NewBinary, (int)(FileHeaderOffset + NewFileSize + NewFilePadding),
+                    (int)(VolumeHeaderOffset + VolumeSize - FileHeaderOffset - OldFileSize - OldFilePadding));
+                for (int i = (int)(VolumeHeaderOffset + VolumeSize - OldFileSize - OldFilePadding + NewFileSize + NewFilePadding); i < VolumeHeaderOffset + VolumeSize; i++)
+                {
+                    NewBinary[i] = PaddingByteValue;
+                }
+            }
+            CompressedSubImageSize = (UInt32)NewCompressedImage.Length;
+
+            // Fix section
+            ByteOperations.WriteUInt24(NewBinary, SectionHeaderOffset, CompressedSubImageSize + ByteOperations.ReadUInt16(Binary, SectionHeaderOffset + 0x14));
+
+            // Fix file
+            ByteOperations.WriteUInt24(NewBinary, FileHeaderOffset + 0x14, NewFileSize);
+            CalculateFileChecksum(NewBinary, FileHeaderOffset);
+
+            // Fix volume (volume size is fixed)
+            CalculateVolumeChecksum(NewBinary, VolumeHeaderOffset);
+
+            Binary = NewBinary;
+            return Binary;
+        }
+
+        private void CalculateVolumeChecksum(byte[] Image, UInt32 Offset)
+        {
+            UInt16 VolumeHeaderSize = ByteOperations.ReadUInt16(Image, Offset + 0x30);
+            ByteOperations.WriteUInt16(Image, Offset + 0x32, 0); // Clear checksum
+            UInt16 NewChecksum = ByteOperations.CalculateChecksum16(Image, Offset, VolumeHeaderSize);
+            ByteOperations.WriteUInt16(Image, Offset + 0x32, NewChecksum);
+        }
+
+        private bool VerifyVolumeChecksum(byte[] Image, UInt32 Offset)
+        {
+            UInt16 VolumeHeaderSize = ByteOperations.ReadUInt16(Image, Offset + 0x30);
+            byte[] Header = new byte[VolumeHeaderSize];
+            Buffer.BlockCopy(Image, (int)Offset, Header, 0, VolumeHeaderSize);
+            ByteOperations.WriteUInt16(Header, 0x32, 0); // Clear checksum
+            UInt16 CurrentChecksum = ByteOperations.ReadUInt16(Image, Offset + 0x32);
+            UInt16 NewChecksum = ByteOperations.CalculateChecksum16(Header, 0, VolumeHeaderSize);
+            return CurrentChecksum == NewChecksum;
+        }
+
+        private void CalculateFileChecksum(byte[] Image, UInt32 Offset)
+        {
+            const UInt16 FileHeaderSize = 0x18;
+            UInt32 FileSize = ByteOperations.ReadUInt24(Image, Offset + 0x14);
+
+            ByteOperations.WriteUInt16(Image, Offset + 0x10, 0); // Clear checksum
+            byte NewChecksum = ByteOperations.CalculateChecksum8(Image, Offset, (UInt32)FileHeaderSize - 1);
+            ByteOperations.WriteUInt8(Image, Offset + 0x10, NewChecksum); // File-Header checksum
+
+            byte FileAttribs = ByteOperations.ReadUInt8(Image, Offset + 0x13);
+            if ((FileAttribs & 0x40) > 0)
+            {
+                // Calculate file checksum
+                byte CalculatedFileChecksum = ByteOperations.CalculateChecksum8(Image, Offset + FileHeaderSize, FileSize - FileHeaderSize);
+                ByteOperations.WriteUInt8(Image, Offset + 0x11, CalculatedFileChecksum);
+            }
+            else
+            {
+                // Fixed file checksum
+                ByteOperations.WriteUInt8(Image, Offset + 0x11, 0xAA);
+            }
+        }
+
+        private bool VerifyFileChecksum(byte[] Image, UInt32 Offset)
+        {
+            // This function only checks fixed checksum-values 0x55 and 0xAA.
+
+            const UInt16 FileHeaderSize = 0x18;
+            UInt32 FileSize = ByteOperations.ReadUInt24(Image, Offset + 0x14);
+
+            byte[] Header = new byte[FileHeaderSize - 1];
+            Buffer.BlockCopy(Image, (int)Offset, Header, 0, FileHeaderSize - 1);
+            ByteOperations.WriteUInt16(Header, 0x10, 0); // Clear checksum
+            byte CurrentHeaderChecksum = ByteOperations.ReadUInt8(Image, Offset + 0x10);
+            byte CalculatedHeaderChecksum = ByteOperations.CalculateChecksum8(Header, 0, (UInt32)FileHeaderSize - 1);
+
+            if (CurrentHeaderChecksum != CalculatedHeaderChecksum)
+            {
+                return false;
+            }
+
+            byte FileAttribs = ByteOperations.ReadUInt8(Image, Offset + 0x13);
+            byte CurrentFileChecksum = ByteOperations.ReadUInt8(Image, Offset + 0x11);
+            if ((FileAttribs & 0x40) > 0)
+            {
+                // Calculate file checksum
+                byte CalculatedFileChecksum = ByteOperations.CalculateChecksum8(Image, Offset + FileHeaderSize, FileSize - FileHeaderSize);
+                if (CurrentFileChecksum != CalculatedFileChecksum)
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                // Fixed file checksum
+                if ((CurrentFileChecksum != 0xAA) && (CurrentFileChecksum != 0x55))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private void ClearEfiChecksum(byte[] EfiFile)
+        {
+            UInt32 PEHeaderOffset = ByteOperations.ReadUInt32(EfiFile, 0x3C);
+            ByteOperations.WriteUInt32(EfiFile, PEHeaderOffset + 0x58, 0);
+        }
+
+        // Magic!
+        internal byte[] Patch()
+        {
+            byte[] SecurityDxe = GetFile("SecurityDxe");
+            ClearEfiChecksum(SecurityDxe);
+
+            UInt32? PatchOffset = ByteOperations.FindPattern(SecurityDxe,
+                new byte[] { 0xF0, 0x41, 0x2D, 0xE9, 0xFF, 0xFF, 0xB0, 0xE1, 0x28, 0xD0, 0x4D, 0xE2, 0xFF, 0xFF, 0xA0, 0xE1, 0x00, 0x00, 0xFF, 0x13, 0x20, 0xFF, 0xA0, 0xE3 },
+                new byte[] { 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00 },
+                null);
+
+            if (PatchOffset == null)
+            {
+                throw new BadImageFormatException();
+            }
+
+            Buffer.BlockCopy(new byte[] { 0x00, 0x00, 0xA0, 0xE3, 0x1E, 0xFF, 0x2F, 0xE1 }, 0, SecurityDxe, (int)PatchOffset, 8);
+
+            ReplaceFile("SecurityDxe", SecurityDxe);
+
+            byte[] SecurityServicesDxe = GetFile("SecurityServicesDxe");
+            ClearEfiChecksum(SecurityServicesDxe);
+
+            PatchOffset = ByteOperations.FindPattern(SecurityServicesDxe,
+                new byte[] { 0x10, 0xFF, 0xFF, 0xE5, 0x80, 0xFF, 0x10, 0xE3, 0xFF, 0xFF, 0xFF, 0x0A },
+                new byte[] { 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00 },
+                null);
+
+            if (PatchOffset == null)
+            {
+                throw new BadImageFormatException();
+            }
+
+            ByteOperations.WriteUInt8(SecurityServicesDxe, (UInt32)PatchOffset + 0x0B, 0xEA);
+
+            PatchOffset = ByteOperations.FindPattern(SecurityServicesDxe,
+                new byte[] { 0x11, 0xFF, 0xFF, 0xE5, 0x40, 0xFF, 0x10, 0xE3, 0xFF, 0xFF, 0xFF, 0x0A },
+                new byte[] { 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0x00 },
+                null);
+
+            if (PatchOffset == null)
+            {
+                throw new BadImageFormatException();
+            }
+
+            ByteOperations.WriteUInt8(SecurityServicesDxe, (UInt32)PatchOffset + 0x0B, 0xEA);
+
+            ReplaceFile("SecurityServicesDxe", SecurityServicesDxe);
+
+            return Rebuild();
+        }
+    }
+}
diff --git a/PatchDefinitions.xml b/WPinternals/PatchDefinitions.xml
similarity index 98%
rename from PatchDefinitions.xml
rename to WPinternals/PatchDefinitions.xml
index 1bb28b5..abdf64d 100644
--- a/PatchDefinitions.xml
+++ b/WPinternals/PatchDefinitions.xml
@@ -1,5430 +1,5430 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright(c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files(the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and / or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<PatchDefinitions>
-  <PatchDefinition Name="RootAccess-MainOS">
-    <TargetVersions>
-      <TargetVersion Description="8.10.12393.890">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="72AB4E2ABC6BD2E72C5F0C36DE290AA50A1359A3" HashPatched="71D3DC3185B91583137C9527013873ECD1415D3B">
-            <Patches>
-              <Patch Address="0x0023F0C4" OriginalBytes="33F0D1AA" PatchedBytes="F3F0D1BA" />
-              <Patch Address="0x00000160" OriginalBytes="9E3C5100" PatchedBytes="BFCD5000" />
-              <Patch Address="0x0002BCEA" OriginalBytes="01D1" PatchedBytes="00BF" />
-              <Patch Address="0x0002BD3C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-              <Patch Address="0x0002C28E" OriginalBytes="04D1" PatchedBytes="04E0" />
-              <Patch Address="0x0002C2B0" OriginalBytes="05D1" PatchedBytes="05E0" />
-              <Patch Address="0x0002C6E8" OriginalBytes="14B9" PatchedBytes="02E0" />
-              <Patch Address="0x0002C81A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-              <Patch Address="0x0002C8FE" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x0002C92E" OriginalBytes="08B9" PatchedBytes="01E0" />
-              <Patch Address="0x002D2248" OriginalBytes="22B9" PatchedBytes="04E0" />
-              <Patch Address="0x002D2710" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-              <Patch Address="0x002D2788" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-              <Patch Address="0x0018AEF0" OriginalBytes="EBB9" PatchedBytes="00BF" />
-              <Patch Address="0x00045C48" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-              <Patch Address="0x00222E44" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x00044C18" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x000C1470" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0014930C" OriginalBytes="BAF1" PatchedBytes="85E7" />
-              <Patch Address="0x001493BC" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00149440" OriginalBytes="BDD1" PatchedBytes="00BF" />
-              <Patch Address="0x0014947E" OriginalBytes="9ED1" PatchedBytes="00BF" />
-              <Patch Address="0x0014954E" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0014958A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-              <Patch Address="0x001495C8" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-              <Patch Address="0x0014921E" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-              <Patch Address="0x00046480" OriginalBytes="5CD1" PatchedBytes="00BF" />
-              <Patch Address="0x000464A0" OriginalBytes="4CD1" PatchedBytes="00BF" />
-              <Patch Address="0x000465A6" OriginalBytes="C9D1" PatchedBytes="00BF" />
-              <Patch Address="0x00103BE6" OriginalBytes="BEF1007F" PatchedBytes="42F764BC" />
-              <Patch Address="0x000464BA" OriginalBytes="40D0" PatchedBytes="00BF" />
-              <Patch Address="0x00046642" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-              <Patch Address="0x000467CA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-              <Patch Address="0x00123EC8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000C1516" OriginalBytes="22F0B6A4" PatchedBytes="AFF30080" />
-              <Patch Address="0x000C151C" OriginalBytes="22F0AAA4" PatchedBytes="AFF30080" />
-              <Patch Address="0x000C14A4" OriginalBytes="02D1" PatchedBytes="00BF" />
-              <Patch Address="0x00103C6A" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x00103C78" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x00103D16" OriginalBytes="02F4CCA3" PatchedBytes="42F7CCBB" />
-              <Patch Address="0x00123DD0" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x00123E2E" OriginalBytes="0BD0" PatchedBytes="11E0" />
-              <Patch Address="0x0023F1C6" OriginalBytes="D3D0" PatchedBytes="D3E7" />
-              <Patch Address="0x0023F1D0" OriginalBytes="73F0FAA9" PatchedBytes="AFF30080" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="72AB4E2ABC6BD2E72C5F0C36DE290AA50A1359A3" HashPatched="417E48E9334B0A62B7259786DF1F62B43C22C61C">
-                <Patches>
-                  <Patch Address="0x0023F0C4" OriginalBytes="33F0D1AA" PatchedBytes="F3F0D1BA" />
-                  <Patch Address="0x00000160" OriginalBytes="9E3C5100" PatchedBytes="3E835100" />
-                  <Patch Address="0x0002BCEA" OriginalBytes="01D1" PatchedBytes="00BF" />
-                  <Patch Address="0x0002BD3C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-                  <Patch Address="0x0002C28E" OriginalBytes="04D1" PatchedBytes="04E0" />
-                  <Patch Address="0x0002C2B0" OriginalBytes="05D1" PatchedBytes="05E0" />
-                  <Patch Address="0x0002C6E8" OriginalBytes="14B9" PatchedBytes="02E0" />
-                  <Patch Address="0x0002C81A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-                  <Patch Address="0x0002C8FE" OriginalBytes="02D1" PatchedBytes="02E0" />
-                  <Patch Address="0x0002C92E" OriginalBytes="08B9" PatchedBytes="01E0" />
-                  <Patch Address="0x002D2248" OriginalBytes="22B9" PatchedBytes="04E0" />
-                  <Patch Address="0x002D2710" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-                  <Patch Address="0x002D2788" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-                  <Patch Address="0x0018AEF0" OriginalBytes="EBB9" PatchedBytes="00BF" />
-                  <Patch Address="0x00045C48" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-                  <Patch Address="0x00222E44" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-                  <Patch Address="0x00044C18" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-                  <Patch Address="0x000C1470" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                  <Patch Address="0x0014930C" OriginalBytes="BAF1" PatchedBytes="85E7" />
-                  <Patch Address="0x001493BC" OriginalBytes="13B1" PatchedBytes="02E0" />
-                  <Patch Address="0x00149440" OriginalBytes="BDD1" PatchedBytes="00BF" />
-                  <Patch Address="0x0014947E" OriginalBytes="9ED1" PatchedBytes="00BF" />
-                  <Patch Address="0x0014954E" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0014958A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-                  <Patch Address="0x001495C8" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-                  <Patch Address="0x0014921E" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00046480" OriginalBytes="5CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x000464A0" OriginalBytes="4CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x000465A6" OriginalBytes="C9D1" PatchedBytes="00BF" />
-                  <Patch Address="0x00103BE6" OriginalBytes="BEF1007F" PatchedBytes="42F764BC" />
-                  <Patch Address="0x000464BA" OriginalBytes="40D0" PatchedBytes="00BF" />
-                  <Patch Address="0x00046642" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-                  <Patch Address="0x000467CA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-                  <Patch Address="0x00123EC8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-                  <Patch Address="0x000C1516" OriginalBytes="22F0B6A4" PatchedBytes="AFF30080" />
-                  <Patch Address="0x000C151C" OriginalBytes="22F0AAA4" PatchedBytes="AFF30080" />
-                  <Patch Address="0x000C14A4" OriginalBytes="02D1" PatchedBytes="00BF" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="F7491D2A8961309217D4DD81190EEE25FD602C6A" HashPatched="5847AFE9F6F1969BEECA9601D7DE676A09331AF5">
-            <Patches>
-              <Patch Address="0x0004E7E8" OriginalBytes="2DE970480DF10C0BEAF740FA" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000158" OriginalBytes="460C0E00" PatchedBytes="D47C0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="17DDDA5928707A6079A1810C4EAFA7CC44114D05" HashPatched="29203AEC49C64F92C3AC975DA680D513440956F0">
-            <Patches>
-              <Patch Address="0x0000A088" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
-              <Patch Address="0x00000148" OriginalBytes="36EF0100" PatchedBytes="BCB30100" />
-              <Patch Address="0x0000D9AC" OriginalBytes="2DE9F0480DF1100B" PatchedBytes="0121016000207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="DA8ADBD74C526143D96C45553B067214346F0105" HashPatched="234DCD4A8FE676CF9435C03766D02275671955AD">
-            <Patches>
-              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="DBFD0000" PatchedBytes="96B80000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="038F50F3055494D101BD06FA5A515F8EDB164167" HashPatched="A32BA14798874E598691A1CDD35C94087F779BAA">
-            <Patches>
-              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000148" OriginalBytes="45400600" PatchedBytes="986E0600" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="AB5B285A4ABCEB4C910ABF2EEEDDC25890D9EBE2" HashPatched="3F050CD938C91725E7A2794570E6AA01E6DAC92B">
-            <Patches>
-              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="F9050100" PatchedBytes="4B3B0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="F2B3CF6F0F5FBAF441FA8463B044E88F65B7F7E5" HashPatched="376261707CFE6ACA2FBF60B6FCAD53C670AC3EEE">
-            <Patches>
-              <Patch Address="0x00000140" OriginalBytes="B3C10300" PatchedBytes="88860300" />
-              <Patch Address="0x00000180" OriginalBytes="00100300282B0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.14226.359">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="3B894A8672A25F30BF3C892D343FA0D59994AFDA" HashPatched="6C79893BA4BD12687F4AABCADAB426625348E017">
-            <Patches>
-              <Patch Address="0x0000A088" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
-              <Patch Address="0x00000148" OriginalBytes="E95D0200" PatchedBytes="6F220200" />
-              <Patch Address="0x0000D9AC" OriginalBytes="2DE9F0480DF1100B" PatchedBytes="0121016000207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="527F8453C60C0A6A300CEB23569C89F0219CB10C" HashPatched="E326EC5AFAE7670CEB4079F17836272E7811EE44">
-            <Patches>
-              <Patch Address="0x0004F364" OriginalBytes="2DE970480DF10C0BEAF72AFC" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000148" OriginalBytes="A8B90D00" PatchedBytes="4C280E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="1DCFBEBACAA0B67670B4E1790A380889C039A7BD" HashPatched="EB83B4B906F6EF5D65E6E60FC6034AF1D3595875">
-            <Patches>
-              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="950D0100" PatchedBytes="50C80000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="29552EBAE856B4FF8457397E6B0D1356912005EA" HashPatched="321E73E78AB350B3D9C1110C64932AFB85E2684C">
-            <Patches>
-              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000148" OriginalBytes="047C0600" PatchedBytes="58AA0500" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="1D770DBFF87E94DA9F2F71642392094ADA77F69E" HashPatched="B253EB164F588648B0C482D1851D35D7E03D9270">
-            <Patches>
-              <Patch Address="0x00027F1A" OriginalBytes="01D1" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="2CEA4F00" PatchedBytes="CF795000" />
-              <Patch Address="0x00027F6C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-              <Patch Address="0x000284BE" OriginalBytes="04D1" PatchedBytes="04E0" />
-              <Patch Address="0x000284E0" OriginalBytes="05D1" PatchedBytes="05E0" />
-              <Patch Address="0x00028918" OriginalBytes="14B9" PatchedBytes="02E0" />
-              <Patch Address="0x00028A4A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-              <Patch Address="0x00028B2E" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x00028B5E" OriginalBytes="08B9" PatchedBytes="01E0" />
-              <Patch Address="0x002140FC" OriginalBytes="22B9" PatchedBytes="04E0" />
-              <Patch Address="0x002145C4" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-              <Patch Address="0x0021463C" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-              <Patch Address="0x001793EC" OriginalBytes="EBB9" PatchedBytes="00BF" />
-              <Patch Address="0x00058448" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-              <Patch Address="0x002306B8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x00226444" OriginalBytes="3AF0B7AB" PatchedBytes="FAF0B7BB" />
-              <Patch Address="0x0002C27C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00027744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00134C24" OriginalBytes="BAF1" PatchedBytes="85E7" />
-              <Patch Address="0x00134CD4" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00134D58" OriginalBytes="BDD1" PatchedBytes="00BF" />
-              <Patch Address="0x00134D96" OriginalBytes="9ED1" PatchedBytes="00BF" />
-              <Patch Address="0x00134E66" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x00134EA2" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-              <Patch Address="0x00134EE0" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-              <Patch Address="0x00134B36" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-              <Patch Address="0x00058C80" OriginalBytes="5CD1" PatchedBytes="00BF" />
-              <Patch Address="0x00058CA0" OriginalBytes="4CD1" PatchedBytes="00BF" />
-              <Patch Address="0x00058DA6" OriginalBytes="C9D1" PatchedBytes="00BF" />
-              <Patch Address="0x0010084E" OriginalBytes="BEF1007F" PatchedBytes="58F730BA" />
-              <Patch Address="0x00058CBA" OriginalBytes="40D0" PatchedBytes="00BF" />
-              <Patch Address="0x00058E42" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-              <Patch Address="0x00058FCA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-              <Patch Address="0x00110A84" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000B125A" OriginalBytes="1FF0F2A3" PatchedBytes="AFF30080" />
-              <Patch Address="0x000B1260" OriginalBytes="1FF0E6A3" PatchedBytes="AFF30080" />
-              <Patch Address="0x00027778" OriginalBytes="02D1" PatchedBytes="00BF" />
-              <Patch Address="0x001008D2" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x001008E0" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x0010097E" OriginalBytes="18F498A1" PatchedBytes="58F798B9" />
-              <Patch Address="0x00110ADC" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x00110B3A" OriginalBytes="0BD0" PatchedBytes="11E0" />
-              <Patch Address="0x00226546" OriginalBytes="D3D0" PatchedBytes="D3E7" />
-              <Patch Address="0x00226550" OriginalBytes="7AF0E0AA" PatchedBytes="AFF30080" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="1D770DBFF87E94DA9F2F71642392094ADA77F69E" HashPatched="382F1DE73BF710700CE6EE401E033FE05AB10B1E">
-                <Patches>
-                  <Patch Address="0x00027F1A" OriginalBytes="01D1" PatchedBytes="00BF" />
-                  <Patch Address="0x00000158" OriginalBytes="2CEA4F00" PatchedBytes="3C305000" />
-                  <Patch Address="0x00027F6C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-                  <Patch Address="0x000284BE" OriginalBytes="04D1" PatchedBytes="04E0" />
-                  <Patch Address="0x000284E0" OriginalBytes="05D1" PatchedBytes="05E0" />
-                  <Patch Address="0x00028918" OriginalBytes="14B9" PatchedBytes="02E0" />
-                  <Patch Address="0x00028A4A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-                  <Patch Address="0x00028B2E" OriginalBytes="02D1" PatchedBytes="02E0" />
-                  <Patch Address="0x00028B5E" OriginalBytes="08B9" PatchedBytes="01E0" />
-                  <Patch Address="0x002140FC" OriginalBytes="22B9" PatchedBytes="04E0" />
-                  <Patch Address="0x002145C4" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-                  <Patch Address="0x0021463C" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-                  <Patch Address="0x001793EC" OriginalBytes="EBB9" PatchedBytes="00BF" />
-                  <Patch Address="0x00058448" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-                  <Patch Address="0x002306B8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-                  <Patch Address="0x00226444" OriginalBytes="3AF0B7AB" PatchedBytes="FAF0B7BB" />
-                  <Patch Address="0x0002C27C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-                  <Patch Address="0x00027744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                  <Patch Address="0x00134C24" OriginalBytes="BAF1" PatchedBytes="85E7" />
-                  <Patch Address="0x00134CD4" OriginalBytes="13B1" PatchedBytes="02E0" />
-                  <Patch Address="0x00134D58" OriginalBytes="BDD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00134D96" OriginalBytes="9ED1" PatchedBytes="00BF" />
-                  <Patch Address="0x00134E66" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00134EA2" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-                  <Patch Address="0x00134EE0" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-                  <Patch Address="0x00134B36" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00058C80" OriginalBytes="5CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00058CA0" OriginalBytes="4CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00058DA6" OriginalBytes="C9D1" PatchedBytes="00BF" />
-                  <Patch Address="0x0010084E" OriginalBytes="BEF1007F" PatchedBytes="58F730BA" />
-                  <Patch Address="0x00058CBA" OriginalBytes="40D0" PatchedBytes="00BF" />
-                  <Patch Address="0x00058E42" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-                  <Patch Address="0x00058FCA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-                  <Patch Address="0x00110A84" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-                  <Patch Address="0x000B125A" OriginalBytes="1FF0F2A3" PatchedBytes="AFF30080" />
-                  <Patch Address="0x000B1260" OriginalBytes="1FF0E6A3" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00027778" OriginalBytes="02D1" PatchedBytes="00BF" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="49AD6BD8E1C2D60B64A6D81EA62DC7165F9C7503" HashPatched="CAC419935E83132508662191376FF0F40F9C63FF">
-            <Patches>
-              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="DCFB0000" PatchedBytes="2E310100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="4DD1B80DDF35512801B496D713E113492EC5F241" HashPatched="0F91AED1A4C7FF4AC1750543EF01318260154479">
-            <Patches>
-              <Patch Address="0x00000140" OriginalBytes="2A140400" PatchedBytes="17D90300" />
-              <Patch Address="0x00000180" OriginalBytes="00100300102B0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.12397.895">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="0ACB398B35B97CAA09FED9E2712F4112B56A92E0" HashPatched="9F2F8E61786B8D912EE91B0628E41A9AF473CDB9">
-            <Patches>
-              <Patch Address="0x0000A088" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
-              <Patch Address="0x00000148" OriginalBytes="8BC70100" PatchedBytes="118C0100" />
-              <Patch Address="0x0000D9AC" OriginalBytes="2DE9F0480DF1100B" PatchedBytes="0121016000207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="F7491D2A8961309217D4DD81190EEE25FD602C6A" HashPatched="5847AFE9F6F1969BEECA9601D7DE676A09331AF5">
-            <Patches>
-              <Patch Address="0x0004E7E8" OriginalBytes="2DE970480DF10C0BEAF740FA" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000158" OriginalBytes="460C0E00" PatchedBytes="D47C0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="DA8ADBD74C526143D96C45553B067214346F0105" HashPatched="234DCD4A8FE676CF9435C03766D02275671955AD">
-            <Patches>
-              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="DBFD0000" PatchedBytes="96B80000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="038F50F3055494D101BD06FA5A515F8EDB164167" HashPatched="A32BA14798874E598691A1CDD35C94087F779BAA">
-            <Patches>
-              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000148" OriginalBytes="45400600" PatchedBytes="986E0600" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="72AB4E2ABC6BD2E72C5F0C36DE290AA50A1359A3" HashPatched="71D3DC3185B91583137C9527013873ECD1415D3B">
-            <Patches>
-              <Patch Address="0x0023F0C4" OriginalBytes="33F0D1AA" PatchedBytes="F3F0D1BA" />
-              <Patch Address="0x00000160" OriginalBytes="9E3C5100" PatchedBytes="BFCD5000" />
-              <Patch Address="0x0002BCEA" OriginalBytes="01D1" PatchedBytes="00BF" />
-              <Patch Address="0x0002BD3C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-              <Patch Address="0x0002C28E" OriginalBytes="04D1" PatchedBytes="04E0" />
-              <Patch Address="0x0002C2B0" OriginalBytes="05D1" PatchedBytes="05E0" />
-              <Patch Address="0x0002C6E8" OriginalBytes="14B9" PatchedBytes="02E0" />
-              <Patch Address="0x0002C81A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-              <Patch Address="0x0002C8FE" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x0002C92E" OriginalBytes="08B9" PatchedBytes="01E0" />
-              <Patch Address="0x002D2248" OriginalBytes="22B9" PatchedBytes="04E0" />
-              <Patch Address="0x002D2710" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-              <Patch Address="0x002D2788" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-              <Patch Address="0x0018AEF0" OriginalBytes="EBB9" PatchedBytes="00BF" />
-              <Patch Address="0x00045C48" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-              <Patch Address="0x00222E44" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x00044C18" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x000C1470" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0014930C" OriginalBytes="BAF1" PatchedBytes="85E7" />
-              <Patch Address="0x001493BC" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00149440" OriginalBytes="BDD1" PatchedBytes="00BF" />
-              <Patch Address="0x0014947E" OriginalBytes="9ED1" PatchedBytes="00BF" />
-              <Patch Address="0x0014954E" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0014958A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-              <Patch Address="0x001495C8" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-              <Patch Address="0x0014921E" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-              <Patch Address="0x00046480" OriginalBytes="5CD1" PatchedBytes="00BF" />
-              <Patch Address="0x000464A0" OriginalBytes="4CD1" PatchedBytes="00BF" />
-              <Patch Address="0x000465A6" OriginalBytes="C9D1" PatchedBytes="00BF" />
-              <Patch Address="0x00103BE6" OriginalBytes="BEF1007F" PatchedBytes="42F764BC" />
-              <Patch Address="0x000464BA" OriginalBytes="40D0" PatchedBytes="00BF" />
-              <Patch Address="0x00046642" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-              <Patch Address="0x000467CA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-              <Patch Address="0x00123EC8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000C1516" OriginalBytes="22F0B6A4" PatchedBytes="AFF30080" />
-              <Patch Address="0x000C151C" OriginalBytes="22F0AAA4" PatchedBytes="AFF30080" />
-              <Patch Address="0x000C14A4" OriginalBytes="02D1" PatchedBytes="00BF" />
-              <Patch Address="0x00103C6A" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x00103C78" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x00103D16" OriginalBytes="02F4CCA3" PatchedBytes="42F7CCBB" />
-              <Patch Address="0x00123DD0" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x00123E2E" OriginalBytes="0BD0" PatchedBytes="11E0" />
-              <Patch Address="0x0023F1C6" OriginalBytes="D3D0" PatchedBytes="D3E7" />
-              <Patch Address="0x0023F1D0" OriginalBytes="73F0FAA9" PatchedBytes="AFF30080" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="72AB4E2ABC6BD2E72C5F0C36DE290AA50A1359A3" HashPatched="417E48E9334B0A62B7259786DF1F62B43C22C61C">
-                <Patches>
-                  <Patch Address="0x0023F0C4" OriginalBytes="33F0D1AA" PatchedBytes="F3F0D1BA" />
-                  <Patch Address="0x00000160" OriginalBytes="9E3C5100" PatchedBytes="3E835100" />
-                  <Patch Address="0x0002BCEA" OriginalBytes="01D1" PatchedBytes="00BF" />
-                  <Patch Address="0x0002BD3C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-                  <Patch Address="0x0002C28E" OriginalBytes="04D1" PatchedBytes="04E0" />
-                  <Patch Address="0x0002C2B0" OriginalBytes="05D1" PatchedBytes="05E0" />
-                  <Patch Address="0x0002C6E8" OriginalBytes="14B9" PatchedBytes="02E0" />
-                  <Patch Address="0x0002C81A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-                  <Patch Address="0x0002C8FE" OriginalBytes="02D1" PatchedBytes="02E0" />
-                  <Patch Address="0x0002C92E" OriginalBytes="08B9" PatchedBytes="01E0" />
-                  <Patch Address="0x002D2248" OriginalBytes="22B9" PatchedBytes="04E0" />
-                  <Patch Address="0x002D2710" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-                  <Patch Address="0x002D2788" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-                  <Patch Address="0x0018AEF0" OriginalBytes="EBB9" PatchedBytes="00BF" />
-                  <Patch Address="0x00045C48" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-                  <Patch Address="0x00222E44" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-                  <Patch Address="0x00044C18" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-                  <Patch Address="0x000C1470" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                  <Patch Address="0x0014930C" OriginalBytes="BAF1" PatchedBytes="85E7" />
-                  <Patch Address="0x001493BC" OriginalBytes="13B1" PatchedBytes="02E0" />
-                  <Patch Address="0x00149440" OriginalBytes="BDD1" PatchedBytes="00BF" />
-                  <Patch Address="0x0014947E" OriginalBytes="9ED1" PatchedBytes="00BF" />
-                  <Patch Address="0x0014954E" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0014958A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-                  <Patch Address="0x001495C8" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-                  <Patch Address="0x0014921E" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00046480" OriginalBytes="5CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x000464A0" OriginalBytes="4CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x000465A6" OriginalBytes="C9D1" PatchedBytes="00BF" />
-                  <Patch Address="0x00103BE6" OriginalBytes="BEF1007F" PatchedBytes="42F764BC" />
-                  <Patch Address="0x000464BA" OriginalBytes="40D0" PatchedBytes="00BF" />
-                  <Patch Address="0x00046642" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-                  <Patch Address="0x000467CA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-                  <Patch Address="0x00123EC8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-                  <Patch Address="0x000C1516" OriginalBytes="22F0B6A4" PatchedBytes="AFF30080" />
-                  <Patch Address="0x000C151C" OriginalBytes="22F0AAA4" PatchedBytes="AFF30080" />
-                  <Patch Address="0x000C14A4" OriginalBytes="02D1" PatchedBytes="00BF" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="AB5B285A4ABCEB4C910ABF2EEEDDC25890D9EBE2" HashPatched="3F050CD938C91725E7A2794570E6AA01E6DAC92B">
-            <Patches>
-              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="F9050100" PatchedBytes="4B3B0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="F2B3CF6F0F5FBAF441FA8463B044E88F65B7F7E5" HashPatched="376261707CFE6ACA2FBF60B6FCAD53C670AC3EEE">
-            <Patches>
-              <Patch Address="0x00000140" OriginalBytes="B3C10300" PatchedBytes="88860300" />
-              <Patch Address="0x00000180" OriginalBytes="00100300282B0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.14219.341">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="1DCFBEBACAA0B67670B4E1790A380889C039A7BD" HashPatched="EB83B4B906F6EF5D65E6E60FC6034AF1D3595875">
-            <Patches>
-              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="950D0100" PatchedBytes="50C80000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="29552EBAE856B4FF8457397E6B0D1356912005EA" HashPatched="321E73E78AB350B3D9C1110C64932AFB85E2684C">
-            <Patches>
-              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000148" OriginalBytes="047C0600" PatchedBytes="58AA0500" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="1D770DBFF87E94DA9F2F71642392094ADA77F69E" HashPatched="B253EB164F588648B0C482D1851D35D7E03D9270">
-            <Patches>
-              <Patch Address="0x00027F1A" OriginalBytes="01D1" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="2CEA4F00" PatchedBytes="CF795000" />
-              <Patch Address="0x00027F6C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-              <Patch Address="0x000284BE" OriginalBytes="04D1" PatchedBytes="04E0" />
-              <Patch Address="0x000284E0" OriginalBytes="05D1" PatchedBytes="05E0" />
-              <Patch Address="0x00028918" OriginalBytes="14B9" PatchedBytes="02E0" />
-              <Patch Address="0x00028A4A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-              <Patch Address="0x00028B2E" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x00028B5E" OriginalBytes="08B9" PatchedBytes="01E0" />
-              <Patch Address="0x002140FC" OriginalBytes="22B9" PatchedBytes="04E0" />
-              <Patch Address="0x002145C4" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-              <Patch Address="0x0021463C" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-              <Patch Address="0x001793EC" OriginalBytes="EBB9" PatchedBytes="00BF" />
-              <Patch Address="0x00058448" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-              <Patch Address="0x002306B8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x00226444" OriginalBytes="3AF0B7AB" PatchedBytes="FAF0B7BB" />
-              <Patch Address="0x0002C27C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00027744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00134C24" OriginalBytes="BAF1" PatchedBytes="85E7" />
-              <Patch Address="0x00134CD4" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00134D58" OriginalBytes="BDD1" PatchedBytes="00BF" />
-              <Patch Address="0x00134D96" OriginalBytes="9ED1" PatchedBytes="00BF" />
-              <Patch Address="0x00134E66" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x00134EA2" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-              <Patch Address="0x00134EE0" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-              <Patch Address="0x00134B36" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-              <Patch Address="0x00058C80" OriginalBytes="5CD1" PatchedBytes="00BF" />
-              <Patch Address="0x00058CA0" OriginalBytes="4CD1" PatchedBytes="00BF" />
-              <Patch Address="0x00058DA6" OriginalBytes="C9D1" PatchedBytes="00BF" />
-              <Patch Address="0x0010084E" OriginalBytes="BEF1007F" PatchedBytes="58F730BA" />
-              <Patch Address="0x00058CBA" OriginalBytes="40D0" PatchedBytes="00BF" />
-              <Patch Address="0x00058E42" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-              <Patch Address="0x00058FCA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-              <Patch Address="0x00110A84" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000B125A" OriginalBytes="1FF0F2A3" PatchedBytes="AFF30080" />
-              <Patch Address="0x000B1260" OriginalBytes="1FF0E6A3" PatchedBytes="AFF30080" />
-              <Patch Address="0x00027778" OriginalBytes="02D1" PatchedBytes="00BF" />
-              <Patch Address="0x001008D2" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x001008E0" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x0010097E" OriginalBytes="18F498A1" PatchedBytes="58F798B9" />
-              <Patch Address="0x00110ADC" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x00110B3A" OriginalBytes="0BD0" PatchedBytes="11E0" />
-              <Patch Address="0x00226546" OriginalBytes="D3D0" PatchedBytes="D3E7" />
-              <Patch Address="0x00226550" OriginalBytes="7AF0E0AA" PatchedBytes="AFF30080" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="1D770DBFF87E94DA9F2F71642392094ADA77F69E" HashPatched="382F1DE73BF710700CE6EE401E033FE05AB10B1E">
-                <Patches>
-                  <Patch Address="0x00027F1A" OriginalBytes="01D1" PatchedBytes="00BF" />
-                  <Patch Address="0x00000158" OriginalBytes="2CEA4F00" PatchedBytes="3C305000" />
-                  <Patch Address="0x00027F6C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-                  <Patch Address="0x000284BE" OriginalBytes="04D1" PatchedBytes="04E0" />
-                  <Patch Address="0x000284E0" OriginalBytes="05D1" PatchedBytes="05E0" />
-                  <Patch Address="0x00028918" OriginalBytes="14B9" PatchedBytes="02E0" />
-                  <Patch Address="0x00028A4A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-                  <Patch Address="0x00028B2E" OriginalBytes="02D1" PatchedBytes="02E0" />
-                  <Patch Address="0x00028B5E" OriginalBytes="08B9" PatchedBytes="01E0" />
-                  <Patch Address="0x002140FC" OriginalBytes="22B9" PatchedBytes="04E0" />
-                  <Patch Address="0x002145C4" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-                  <Patch Address="0x0021463C" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-                  <Patch Address="0x001793EC" OriginalBytes="EBB9" PatchedBytes="00BF" />
-                  <Patch Address="0x00058448" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-                  <Patch Address="0x002306B8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-                  <Patch Address="0x00226444" OriginalBytes="3AF0B7AB" PatchedBytes="FAF0B7BB" />
-                  <Patch Address="0x0002C27C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-                  <Patch Address="0x00027744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                  <Patch Address="0x00134C24" OriginalBytes="BAF1" PatchedBytes="85E7" />
-                  <Patch Address="0x00134CD4" OriginalBytes="13B1" PatchedBytes="02E0" />
-                  <Patch Address="0x00134D58" OriginalBytes="BDD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00134D96" OriginalBytes="9ED1" PatchedBytes="00BF" />
-                  <Patch Address="0x00134E66" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00134EA2" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-                  <Patch Address="0x00134EE0" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-                  <Patch Address="0x00134B36" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00058C80" OriginalBytes="5CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00058CA0" OriginalBytes="4CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00058DA6" OriginalBytes="C9D1" PatchedBytes="00BF" />
-                  <Patch Address="0x0010084E" OriginalBytes="BEF1007F" PatchedBytes="58F730BA" />
-                  <Patch Address="0x00058CBA" OriginalBytes="40D0" PatchedBytes="00BF" />
-                  <Patch Address="0x00058E42" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-                  <Patch Address="0x00058FCA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-                  <Patch Address="0x00110A84" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-                  <Patch Address="0x000B125A" OriginalBytes="1FF0F2A3" PatchedBytes="AFF30080" />
-                  <Patch Address="0x000B1260" OriginalBytes="1FF0E6A3" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00027778" OriginalBytes="02D1" PatchedBytes="00BF" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="49AD6BD8E1C2D60B64A6D81EA62DC7165F9C7503" HashPatched="CAC419935E83132508662191376FF0F40F9C63FF">
-            <Patches>
-              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="DCFB0000" PatchedBytes="2E310100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="D1CCB841D102FA5C6DFE7BFBB9A8737891AEE93F" HashPatched="959B75175AEFE49E4416FD4E6314313795CD88B3">
-            <Patches>
-              <Patch Address="0x0000A088" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
-              <Patch Address="0x00000148" OriginalBytes="8B8E0100" PatchedBytes="10530200" />
-              <Patch Address="0x0000D9AC" OriginalBytes="2DE9F0480DF1100B" PatchedBytes="0121016000207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="52F9139FDF275ACE9E6CA87ADA5F17BA3979271C" HashPatched="C0EC590B080ECF8218B145159495671C75DF4728">
-            <Patches>
-              <Patch Address="0x0004F364" OriginalBytes="2DE970480DF10C0BEAF72AFC" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000148" OriginalBytes="FDB40D00" PatchedBytes="A1230E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="4DD1B80DDF35512801B496D713E113492EC5F241" HashPatched="0F91AED1A4C7FF4AC1750543EF01318260154479">
-            <Patches>
-              <Patch Address="0x00000140" OriginalBytes="2A140400" PatchedBytes="17D90300" />
-              <Patch Address="0x00000180" OriginalBytes="00100300102B0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.14234.375">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="A322228BBD070049127621D35C7C94205E302D5D" HashPatched="7AD89113F0396623D7DC815591E4CA05B4B52211">
-            <Patches>
-              <Patch Address="0x0000A088" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
-              <Patch Address="0x00000148" OriginalBytes="7F820100" PatchedBytes="04470200" />
-              <Patch Address="0x0000D9AC" OriginalBytes="2DE9F0480DF1100B" PatchedBytes="0121016000207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="D599BD0D8D61CEE47720941EC7AD138DEB537F6E" HashPatched="8C1CA8E2500E5391D79EA800E68C117421991481">
-            <Patches>
-              <Patch Address="0x0004F364" OriginalBytes="2DE970480DF10C0BEAF72AFC" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000148" OriginalBytes="CDA10D00" PatchedBytes="71100E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="49370984AD49FFCB5E33D4D9481FB2A6459A5829" HashPatched="EE96B75904F2D638E3B3734584CCD9E9448E1B66">
-            <Patches>
-              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="E6C70000" PatchedBytes="A0820100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="9A4A52C9B66B508F8B5D29DC8F76DDA7426EA852" HashPatched="2B73B49869EB7C1E11C34FC00E4D5A7387BF1580">
-            <Patches>
-              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000148" OriginalBytes="33B00500" PatchedBytes="86DE0500" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="A3D49F5D2F46998B8CB500EC0705A91DA2E10B05" HashPatched="1439C3AB0C84AB93ECB77121744208497F9933A6">
-            <Patches>
-              <Patch Address="0x00027F1A" OriginalBytes="01D1" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="48515000" PatchedBytes="41315000" />
-              <Patch Address="0x00027F6C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-              <Patch Address="0x000284B8" OriginalBytes="1DD2" PatchedBytes="1DE0" />
-              <Patch Address="0x000284E0" OriginalBytes="05D1" PatchedBytes="05E0" />
-              <Patch Address="0x00028918" OriginalBytes="14B9" PatchedBytes="02E0" />
-              <Patch Address="0x00028A4A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-              <Patch Address="0x00028B2E" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x00028B5E" OriginalBytes="08B9" PatchedBytes="01E0" />
-              <Patch Address="0x002140FC" OriginalBytes="22B9" PatchedBytes="04E0" />
-              <Patch Address="0x002145C4" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-              <Patch Address="0x0021463C" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-              <Patch Address="0x001793EC" OriginalBytes="EBB9" PatchedBytes="00BF" />
-              <Patch Address="0x00058448" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-              <Patch Address="0x002306B8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x00226444" OriginalBytes="3AF061AB" PatchedBytes="FAF061BB" />
-              <Patch Address="0x0002C27C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00027744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00134C24" OriginalBytes="BAF1007F" PatchedBytes="FFF785BF" />
-              <Patch Address="0x00134CD4" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00134D58" OriginalBytes="BDD1" PatchedBytes="00BF" />
-              <Patch Address="0x00134D96" OriginalBytes="9ED1" PatchedBytes="00BF" />
-              <Patch Address="0x00134E66" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x00134EA2" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-              <Patch Address="0x00134EE0" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-              <Patch Address="0x00134B36" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-              <Patch Address="0x00058C80" OriginalBytes="5CD1" PatchedBytes="00BF" />
-              <Patch Address="0x00058CA0" OriginalBytes="4CD1" PatchedBytes="00BF" />
-              <Patch Address="0x00058DA6" OriginalBytes="C9D1" PatchedBytes="00BF" />
-              <Patch Address="0x0010084E" OriginalBytes="BEF1007F" PatchedBytes="58F730BA" />
-              <Patch Address="0x00058CBA" OriginalBytes="40D0" PatchedBytes="00BF" />
-              <Patch Address="0x00058E42" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-              <Patch Address="0x00058FCA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-              <Patch Address="0x00110A84" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000B125A" OriginalBytes="1FF0F2A3" PatchedBytes="AFF30080" />
-              <Patch Address="0x000B1260" OriginalBytes="1FF0E6A3" PatchedBytes="AFF30080" />
-              <Patch Address="0x00027778" OriginalBytes="02D1" PatchedBytes="00BF" />
-              <Patch Address="0x001008D2" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x001008E0" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x0010097E" OriginalBytes="18F498A1" PatchedBytes="58F798B9" />
-              <Patch Address="0x00110ADC" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x00110B3A" OriginalBytes="0BD0" PatchedBytes="11E0" />
-              <Patch Address="0x00226546" OriginalBytes="D3D0" PatchedBytes="D3E7" />
-              <Patch Address="0x00226550" OriginalBytes="7AF08AAA" PatchedBytes="AFF30080" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="A3D49F5D2F46998B8CB500EC0705A91DA2E10B05" HashPatched="BF75601D82A81D06741E305F6F8A693990F43250">
-                <Patches>
-                  <Patch Address="0x00027F1A" OriginalBytes="01D1" PatchedBytes="00BF" />
-                  <Patch Address="0x00000158" OriginalBytes="48515000" PatchedBytes="58E74F00" />
-                  <Patch Address="0x00027F6C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-                  <Patch Address="0x000284B8" OriginalBytes="1DD2" PatchedBytes="1DE0" />
-                  <Patch Address="0x000284E0" OriginalBytes="05D1" PatchedBytes="05E0" />
-                  <Patch Address="0x00028918" OriginalBytes="14B9" PatchedBytes="02E0" />
-                  <Patch Address="0x00028A4A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-                  <Patch Address="0x00028B2E" OriginalBytes="02D1" PatchedBytes="02E0" />
-                  <Patch Address="0x00028B5E" OriginalBytes="08B9" PatchedBytes="01E0" />
-                  <Patch Address="0x002140FC" OriginalBytes="22B9" PatchedBytes="04E0" />
-                  <Patch Address="0x002145C4" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-                  <Patch Address="0x0021463C" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-                  <Patch Address="0x001793EC" OriginalBytes="EBB9" PatchedBytes="00BF" />
-                  <Patch Address="0x00058448" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-                  <Patch Address="0x002306B8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-                  <Patch Address="0x00226444" OriginalBytes="3AF061AB" PatchedBytes="FAF061BB" />
-                  <Patch Address="0x0002C27C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-                  <Patch Address="0x00027744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                  <Patch Address="0x00134C24" OriginalBytes="BAF1007F" PatchedBytes="FFF785BF" />
-                  <Patch Address="0x00134CD4" OriginalBytes="13B1" PatchedBytes="02E0" />
-                  <Patch Address="0x00134D58" OriginalBytes="BDD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00134D96" OriginalBytes="9ED1" PatchedBytes="00BF" />
-                  <Patch Address="0x00134E66" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00134EA2" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-                  <Patch Address="0x00134EE0" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-                  <Patch Address="0x00134B36" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00058C80" OriginalBytes="5CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00058CA0" OriginalBytes="4CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00058DA6" OriginalBytes="C9D1" PatchedBytes="00BF" />
-                  <Patch Address="0x0010084E" OriginalBytes="BEF1007F" PatchedBytes="58F730BA" />
-                  <Patch Address="0x00058CBA" OriginalBytes="40D0" PatchedBytes="00BF" />
-                  <Patch Address="0x00058E42" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-                  <Patch Address="0x00058FCA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-                  <Patch Address="0x00110A84" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-                  <Patch Address="0x000B125A" OriginalBytes="1FF0F2A3" PatchedBytes="AFF30080" />
-                  <Patch Address="0x000B1260" OriginalBytes="1FF0E6A3" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00027778" OriginalBytes="02D1" PatchedBytes="00BF" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="5BB197356E69C87A489095C8192C810F5353D5F1" HashPatched="6B3BF6EF63E8A6CE2B492923865AC4C4B02619E3">
-            <Patches>
-              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="ED7E0100" PatchedBytes="3FB40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="A299FFCB35322EFE0944A1D938EC8F3F8F8B497B" HashPatched="A0BB16A9E7E3D391536F0C32AF2D5DEB0949AC2B">
-            <Patches>
-              <Patch Address="0x00000140" OriginalBytes="7F830300" PatchedBytes="6C480300" />
-              <Patch Address="0x00000180" OriginalBytes="00100300102B0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.20.10512.11662">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="A3A8F2ABA52ED101DF76E771A0F110701E8EBC4E" HashPatched="AF970597BAB1C7A45B0C1FD15EE44E7E5A95DC4B">
-            <Patches>
-              <Patch Address="0x00009B0C" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
-              <Patch Address="0x00000140" OriginalBytes="51A20100" PatchedBytes="5A670200" />
-              <Patch Address="0x0000DDE4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="86FB209AA9DF0E901CE220FFA768A1B30C992D48" HashPatched="D4A309D3605274997AA73DDB5FCB423453173AA2">
-            <Patches>
-              <Patch Address="0x000C1A3C" OriginalBytes="2DE970480DF10C0B8AF7ECFB" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000150" OriginalBytes="F2981000" PatchedBytes="35081000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="2A3B05327D5DCA02183D327A4DB43583FF67D9E7" HashPatched="C2C2F21C21F97340BF867AE44E81B93FACCCA368">
-            <Patches>
-              <Patch Address="0x000024AC" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000148" OriginalBytes="1EE40000" PatchedBytes="D99E0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="00F7EF0B7E8F72DBFFB901A1CFB3B8D462362152" HashPatched="76BED613846C9227420669EA4D66AEBF30A01F12">
-            <Patches>
-              <Patch Address="0x00002BF8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000150" OriginalBytes="ACAE0100" PatchedBytes="00DD0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="1CA73470017B88F0E487D6BDF19E7DF6A484C722" HashPatched="4444C3D0D3149FE143C5CF8A609A5944856D33B9">
-            <Patches>
-              <Patch Address="0x000D4EAE" OriginalBytes="6ED1" PatchedBytes="6EE0" />
-              <Patch Address="0x000D50F0" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000D510E" OriginalBytes="29B9" PatchedBytes="05E0" />
-              <Patch Address="0x000D55C4" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000D57AE" OriginalBytes="56D0" PatchedBytes="56E0" />
-              <Patch Address="0x000D5898" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000D58CA" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x002E0D10" OriginalBytes="E1B9" PatchedBytes="1CE0" />
-              <Patch Address="0x002E1220" OriginalBytes="09BB" PatchedBytes="21E0" />
-              <Patch Address="0x002E12A6" OriginalBytes="5BB3" PatchedBytes="2BE0" />
-              <Patch Address="0x001A37C0" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0006D7BC" OriginalBytes="00F01782" PatchedBytes="00F017BA" />
-              <Patch Address="0x0030681C" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x002B0A7C" OriginalBytes="40F0B180" PatchedBytes="AFF30080" />
-              <Patch Address="0x0006AE2C" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
-              <Patch Address="0x000D4344" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x001A3322" OriginalBytes="BAF1007F" PatchedBytes="FFF776BF" />
-              <Patch Address="0x001A33E0" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x001A3458" OriginalBytes="C3D1" PatchedBytes="00BF" />
-              <Patch Address="0x001A3496" OriginalBytes="A4D1" PatchedBytes="00BF" />
-              <Patch Address="0x001A355A" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x001A3598" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
-              <Patch Address="0x001A35D0" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
-              <Patch Address="0x001A3216" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0006E0E8" OriginalBytes="CDD1" PatchedBytes="00BF" />
-              <Patch Address="0x0006E16E" OriginalBytes="3FF443AF" PatchedBytes="FFF743BF" />
-              <Patch Address="0x0006E004" OriginalBytes="00F03C81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0012FD58" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000D4324" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0012FE2C" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x0012FE96" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x0012FCEE" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x00130686" OriginalBytes="BAF1007F" PatchedBytes="3DF7B7BC" />
-              <Patch Address="0x0039D270" OriginalBytes="13F40E85" PatchedBytes="13F70EBD" />
-              <Patch Address="0x0039D2A0" OriginalBytes="E8D1" PatchedBytes="00BF" />
-              <Patch Address="0x00000160" OriginalBytes="7F5D5700" PatchedBytes="A74C5700" />
-              <Patch Address="0x00130680" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x0006DFD2" OriginalBytes="40F0FB80" PatchedBytes="AFF30080" />
-              <Patch Address="0x0006DFE8" OriginalBytes="4DD1" PatchedBytes="00BF" />
-              <Patch Address="0x0006E0C4" OriginalBytes="40F0B580" PatchedBytes="AFF30080" />
-              <Patch Address="0x0006E0D2" OriginalBytes="68D0" PatchedBytes="00BF" />
-              <Patch Address="0x0013071C" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x0013072A" OriginalBytes="03D0" PatchedBytes="03E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="3C51D51D96EE92FA959623A31FE7DEEFDC67F23E" HashPatched="9811476088C18800F6597DB50A831B735879E53C">
-            <Patches>
-              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="9F060100" PatchedBytes="F13B0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ngccredprov.dll" HashOriginal="4F58E2BDD73A7B87502F769B9D55837ECF8DBB6B" HashPatched="1E0C6919094AF4F9645212C02A06A53C74903250">
-            <Patches>
-              <Patch Address="0x0001CBD0" OriginalBytes="31000980" PatchedBytes="FDFF0980" />
-              <Patch Address="0x00000160" OriginalBytes="767F0500" PatchedBytes="E07E0500" />
-              <Patch Address="0x0001DBAC" OriginalBytes="31000980" PatchedBytes="FEFF0980" />
-              <Patch Address="0x000248AC" OriginalBytes="31000980" PatchedBytes="FFFF0980" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\audiodg.exe" HashOriginal="9326BB43E990EA31A3A7627D2B8B4DC4932069DB" HashPatched="68B5B536BC86B9C538324B1B80E5540A41657B0A">
-            <Patches>
-              <Patch Address="0x00000140" OriginalBytes="767F0400" PatchedBytes="71340500" />
-              <Patch Address="0x00000180" OriginalBytes="00300400001B0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.15116.125">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="C88434E8DD80E0110C007CB08F5036E00CACABBB" HashPatched="6C21AB57C4EA359C76C556214C1F2B26E10E467A">
-            <Patches>
-              <Patch Address="0x0000A538" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
-              <Patch Address="0x00000140" OriginalBytes="5B9A0100" PatchedBytes="E05E0200" />
-              <Patch Address="0x0000E3C8" OriginalBytes="2DE9F0480DF1100B" PatchedBytes="0121016000207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="716712DC7AB1F0A201DED8ACCBF1C10B0D6212E9" HashPatched="8A30787A77FF73BB248BCA0BE408A9AE1A491274">
-            <Patches>
-              <Patch Address="0x0004F278" OriginalBytes="2DE970480DF10C0BEAF7B0FC" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000148" OriginalBytes="16820E00" PatchedBytes="35F00D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="5D8F27E308289917E4C81F14374B80B461A377C1" HashPatched="4416AA2CB08EC0BB7829EF66B8F1197B443AAFAF">
-            <Patches>
-              <Patch Address="0x0002C06E" OriginalBytes="01D1" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="0EB04F00" PatchedBytes="A6C24F00" />
-              <Patch Address="0x0002C0C0" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-              <Patch Address="0x0002C60C" OriginalBytes="1DD2" PatchedBytes="1DE0" />
-              <Patch Address="0x0002C634" OriginalBytes="05D1" PatchedBytes="05E0" />
-              <Patch Address="0x0002CA6C" OriginalBytes="14B9" PatchedBytes="02E0" />
-              <Patch Address="0x0002CB9E" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-              <Patch Address="0x0002CC82" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x0002CCB2" OriginalBytes="08B9" PatchedBytes="01E0" />
-              <Patch Address="0x002195A4" OriginalBytes="22B9" PatchedBytes="04E0" />
-              <Patch Address="0x00219A6C" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-              <Patch Address="0x00219AE4" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-              <Patch Address="0x00173634" OriginalBytes="EBB9" PatchedBytes="00BF" />
-              <Patch Address="0x00064E38" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-              <Patch Address="0x0025C3CC" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0022B8E8" OriginalBytes="30F011AE" PatchedBytes="F0F011BE" />
-              <Patch Address="0x0003039C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0002B898" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0012F6AC" OriginalBytes="BAF1007F" PatchedBytes="FFF785BF" />
-              <Patch Address="0x0012F75C" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0012F7E0" OriginalBytes="BDD1" PatchedBytes="00BF" />
-              <Patch Address="0x0012F81E" OriginalBytes="9ED1" PatchedBytes="00BF" />
-              <Patch Address="0x0012F8EE" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0012F92A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-              <Patch Address="0x0012F968" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-              <Patch Address="0x0012F5BE" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-              <Patch Address="0x00065670" OriginalBytes="5CD1" PatchedBytes="00BF" />
-              <Patch Address="0x00065690" OriginalBytes="4CD1" PatchedBytes="00BF" />
-              <Patch Address="0x00065796" OriginalBytes="C9D1" PatchedBytes="00BF" />
-              <Patch Address="0x0010045A" OriginalBytes="BEF1007F" PatchedBytes="65F722B9" />
-              <Patch Address="0x000656AA" OriginalBytes="40D0" PatchedBytes="00BF" />
-              <Patch Address="0x00065832" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-              <Patch Address="0x000659BA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-              <Patch Address="0x000F7A88" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x0002B03A" OriginalBytes="0CF004AD" PatchedBytes="AFF30080" />
-              <Patch Address="0x0002B040" OriginalBytes="0CF0F8AC" PatchedBytes="AFF30080" />
-              <Patch Address="0x0002B8BC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x001004DE" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x001004EC" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x0010058A" OriginalBytes="25F48AA0" PatchedBytes="65F78AB8" />
-              <Patch Address="0x000F7AE0" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x000F7B3E" OriginalBytes="0BD0" PatchedBytes="11E0" />
-              <Patch Address="0x0022B9EA" OriginalBytes="D3D0" PatchedBytes="D3E7" />
-              <Patch Address="0x0022B9F4" OriginalBytes="70F03AAD" PatchedBytes="AFF30080" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="5D8F27E308289917E4C81F14374B80B461A377C1" HashPatched="CE84ECBB9562BD1035030C67761439C9F892A460">
-                <Patches>
-                  <Patch Address="0x0002C06E" OriginalBytes="01D1" PatchedBytes="00BF" />
-                  <Patch Address="0x00000158" OriginalBytes="0EB04F00" PatchedBytes="637B4F00" />
-                  <Patch Address="0x0002C0C0" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-                  <Patch Address="0x0002C60C" OriginalBytes="1DD2" PatchedBytes="1DE0" />
-                  <Patch Address="0x0002C634" OriginalBytes="05D1" PatchedBytes="05E0" />
-                  <Patch Address="0x0002CA6C" OriginalBytes="14B9" PatchedBytes="02E0" />
-                  <Patch Address="0x0002CB9E" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-                  <Patch Address="0x0002CC82" OriginalBytes="02D1" PatchedBytes="02E0" />
-                  <Patch Address="0x0002CCB2" OriginalBytes="08B9" PatchedBytes="01E0" />
-                  <Patch Address="0x002195A4" OriginalBytes="22B9" PatchedBytes="04E0" />
-                  <Patch Address="0x00219A6C" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-                  <Patch Address="0x00219AE4" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-                  <Patch Address="0x00173634" OriginalBytes="EBB9" PatchedBytes="00BF" />
-                  <Patch Address="0x00064E38" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-                  <Patch Address="0x0025C3CC" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-                  <Patch Address="0x0022B8E8" OriginalBytes="30F011AE" PatchedBytes="F0F011BE" />
-                  <Patch Address="0x0003039C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-                  <Patch Address="0x0002B898" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                  <Patch Address="0x0012F6AC" OriginalBytes="BAF1007F" PatchedBytes="FFF785BF" />
-                  <Patch Address="0x0012F75C" OriginalBytes="13B1" PatchedBytes="02E0" />
-                  <Patch Address="0x0012F7E0" OriginalBytes="BDD1" PatchedBytes="00BF" />
-                  <Patch Address="0x0012F81E" OriginalBytes="9ED1" PatchedBytes="00BF" />
-                  <Patch Address="0x0012F8EE" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0012F92A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-                  <Patch Address="0x0012F968" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-                  <Patch Address="0x0012F5BE" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00065670" OriginalBytes="5CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00065690" OriginalBytes="4CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00065796" OriginalBytes="C9D1" PatchedBytes="00BF" />
-                  <Patch Address="0x0010045A" OriginalBytes="BEF1007F" PatchedBytes="65F722B9" />
-                  <Patch Address="0x000656AA" OriginalBytes="40D0" PatchedBytes="00BF" />
-                  <Patch Address="0x00065832" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-                  <Patch Address="0x000659BA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-                  <Patch Address="0x000F7A88" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-                  <Patch Address="0x0002B03A" OriginalBytes="0CF004AD" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0002B040" OriginalBytes="0CF0F8AC" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0002B8BC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="B47C67DAF5AB8AF922844A6E22A21E5D84BD89D7" HashPatched="18E95209DD0A11E046F8AFD7C126774EF97796EB">
-            <Patches>
-              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="FFF50000" PatchedBytes="BAB00000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="1A03E87113EDEC61926962CC37D6FC4F3EAE9C20" HashPatched="FCF347E5F519FEC9CB776A1E569C81295DBD02F7">
-            <Patches>
-              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000148" OriginalBytes="D0990500" PatchedBytes="23C80500" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="BAA998952EF35A0A04E6C2A8D163567382152E78" HashPatched="3A6F331764EE99CC63D2097C4F9E8C77201949F4">
-            <Patches>
-              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="5CB40100" PatchedBytes="AFE90000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="63B667C9211E5C21653F0CA0E8CAFAF94481E22C" HashPatched="8D71216491618086C25CA838264335D3755A4D5E">
-            <Patches>
-              <Patch Address="0x00000140" OriginalBytes="75260400" PatchedBytes="62EB0300" />
-              <Patch Address="0x00000180" OriginalBytes="00100300102B0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.15148.160">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="9666CC8237C04158E2343AB29104492ECB7D0259" HashPatched="9C68A00C127DC4106830EE67464D091D6A75AFCA">
-            <Patches>
-              <Patch Address="0x0000A5AC" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
-              <Patch Address="0x00000140" OriginalBytes="1F360200" PatchedBytes="29FB0100" />
-              <Patch Address="0x0000E540" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="C4EFB27306E07AF5DF33893518497042C1EB139E" HashPatched="02AA382FD4F11FEB1FD8A89EC83F20A8033AF4AF">
-            <Patches>
-              <Patch Address="0x0004F2AC" OriginalBytes="2DE970480DF10C0BEAF7A2FC" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000148" OriginalBytes="F1880E00" PatchedBytes="1EF70D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="E43F181B78A3CCFCD4DFF6DB968DE1938994522D" HashPatched="05DFF3B2445208EE04BD16A2D648CD2A6A485361">
-            <Patches>
-              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="5D100100" PatchedBytes="18CB0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="C347C56C4A3E864C2C9D53222FC45D4E6DDB8431" HashPatched="2C0507FE762FA7869341EF493D5306B0C04D7EB3">
-            <Patches>
-              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000148" OriginalBytes="A29A0500" PatchedBytes="F5C80500" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="71697CC9EC0211446CFF5E3C52D50DE1B99DCDA4" HashPatched="2F8F2A0D9FCCE929CAA238F8B4AEAABA2EA58AEB">
-            <Patches>
-              <Patch Address="0x0002C06E" OriginalBytes="01D1" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="DE974F00" PatchedBytes="76AA4F00" />
-              <Patch Address="0x0002C0C0" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-              <Patch Address="0x0002C60C" OriginalBytes="1DD2" PatchedBytes="1DE0" />
-              <Patch Address="0x0002C634" OriginalBytes="05D1" PatchedBytes="05E0" />
-              <Patch Address="0x0002CA6C" OriginalBytes="14B9" PatchedBytes="02E0" />
-              <Patch Address="0x0002CB9E" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-              <Patch Address="0x0002CC82" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x0002CCB2" OriginalBytes="08B9" PatchedBytes="01E0" />
-              <Patch Address="0x002195A4" OriginalBytes="22B9" PatchedBytes="04E0" />
-              <Patch Address="0x00219A6C" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-              <Patch Address="0x00219AE4" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-              <Patch Address="0x00173634" OriginalBytes="EBB9" PatchedBytes="00BF" />
-              <Patch Address="0x00064E38" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-              <Patch Address="0x0025C3CC" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0022B8E8" OriginalBytes="30F011AE" PatchedBytes="F0F011BE" />
-              <Patch Address="0x0003039C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0002B898" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0012F6AC" OriginalBytes="BAF1007F" PatchedBytes="FFF785BF" />
-              <Patch Address="0x0012F75C" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0012F7E0" OriginalBytes="BDD1" PatchedBytes="00BF" />
-              <Patch Address="0x0012F81E" OriginalBytes="9ED1" PatchedBytes="00BF" />
-              <Patch Address="0x0012F8EE" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0012F92A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-              <Patch Address="0x0012F968" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-              <Patch Address="0x0012F5BE" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-              <Patch Address="0x00065670" OriginalBytes="5CD1" PatchedBytes="00BF" />
-              <Patch Address="0x00065690" OriginalBytes="4CD1" PatchedBytes="00BF" />
-              <Patch Address="0x00065796" OriginalBytes="C9D1" PatchedBytes="00BF" />
-              <Patch Address="0x0010045A" OriginalBytes="BEF1007F" PatchedBytes="65F722B9" />
-              <Patch Address="0x000656AA" OriginalBytes="40D0" PatchedBytes="00BF" />
-              <Patch Address="0x00065832" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-              <Patch Address="0x000659BA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-              <Patch Address="0x000F7A88" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x0002B03A" OriginalBytes="0CF004AD" PatchedBytes="AFF30080" />
-              <Patch Address="0x0002B040" OriginalBytes="0CF0F8AC" PatchedBytes="AFF30080" />
-              <Patch Address="0x0002B8BC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x001004DE" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x001004EC" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x0010058A" OriginalBytes="25F48AA0" PatchedBytes="65F78AB8" />
-              <Patch Address="0x000F7AE0" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x000F7B3E" OriginalBytes="0BD0" PatchedBytes="11E0" />
-              <Patch Address="0x0022B9EA" OriginalBytes="D3D0" PatchedBytes="D3E7" />
-              <Patch Address="0x0022B9F4" OriginalBytes="70F03AAD" PatchedBytes="AFF30080" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="71697CC9EC0211446CFF5E3C52D50DE1B99DCDA4" HashPatched="7CF16FC1318C5D19C48F9ADA90C79B78DBFA8979">
-                <Patches>
-                  <Patch Address="0x0002C06E" OriginalBytes="01D1" PatchedBytes="00BF" />
-                  <Patch Address="0x00000158" OriginalBytes="DE974F00" PatchedBytes="33634F00" />
-                  <Patch Address="0x0002C0C0" OriginalBytes="F7D0" PatchedBytes="F7E7" />
-                  <Patch Address="0x0002C60C" OriginalBytes="1DD2" PatchedBytes="1DE0" />
-                  <Patch Address="0x0002C634" OriginalBytes="05D1" PatchedBytes="05E0" />
-                  <Patch Address="0x0002CA6C" OriginalBytes="14B9" PatchedBytes="02E0" />
-                  <Patch Address="0x0002CB9E" OriginalBytes="4FD0" PatchedBytes="4FE0" />
-                  <Patch Address="0x0002CC82" OriginalBytes="02D1" PatchedBytes="02E0" />
-                  <Patch Address="0x0002CCB2" OriginalBytes="08B9" PatchedBytes="01E0" />
-                  <Patch Address="0x002195A4" OriginalBytes="22B9" PatchedBytes="04E0" />
-                  <Patch Address="0x00219A6C" OriginalBytes="1AD1" PatchedBytes="1AE0" />
-                  <Patch Address="0x00219AE4" OriginalBytes="F3B1" PatchedBytes="1EE0" />
-                  <Patch Address="0x00173634" OriginalBytes="EBB9" PatchedBytes="00BF" />
-                  <Patch Address="0x00064E38" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
-                  <Patch Address="0x0025C3CC" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-                  <Patch Address="0x0022B8E8" OriginalBytes="30F011AE" PatchedBytes="F0F011BE" />
-                  <Patch Address="0x0003039C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-                  <Patch Address="0x0002B898" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                  <Patch Address="0x0012F6AC" OriginalBytes="BAF1007F" PatchedBytes="FFF785BF" />
-                  <Patch Address="0x0012F75C" OriginalBytes="13B1" PatchedBytes="02E0" />
-                  <Patch Address="0x0012F7E0" OriginalBytes="BDD1" PatchedBytes="00BF" />
-                  <Patch Address="0x0012F81E" OriginalBytes="9ED1" PatchedBytes="00BF" />
-                  <Patch Address="0x0012F8EE" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0012F92A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
-                  <Patch Address="0x0012F968" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
-                  <Patch Address="0x0012F5BE" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00065670" OriginalBytes="5CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00065690" OriginalBytes="4CD1" PatchedBytes="00BF" />
-                  <Patch Address="0x00065796" OriginalBytes="C9D1" PatchedBytes="00BF" />
-                  <Patch Address="0x0010045A" OriginalBytes="BEF1007F" PatchedBytes="65F722B9" />
-                  <Patch Address="0x000656AA" OriginalBytes="40D0" PatchedBytes="00BF" />
-                  <Patch Address="0x00065832" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
-                  <Patch Address="0x000659BA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
-                  <Patch Address="0x000F7A88" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-                  <Patch Address="0x0002B03A" OriginalBytes="0CF004AD" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0002B040" OriginalBytes="0CF0F8AC" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0002B8BC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="341094F2FD0619030ADAC3A125F959E60146A9C4" HashPatched="4E8DD35956D1EBB9E4983526A3F8AA89C61DBC00">
-            <Patches>
-              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="73C90100" PatchedBytes="C6FE0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="C19E72CB6BF93D9F2BB5DE98A7AEA6CA3BA03D23" HashPatched="750FDFEB62A84E029F47BFB1AB6A0CD410B11504">
-            <Patches>
-              <Patch Address="0x00000140" OriginalBytes="AE5E0300" PatchedBytes="9A230400" />
-              <Patch Address="0x00000180" OriginalBytes="00100300102B0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.20.10536.11738">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="79AECA59296D6DE9C49684BD9FA5A15076DDC22D" HashPatched="6759F0A2841D3B5E6AD072B7F58E51860282A78A">
-            <Patches>
-              <Patch Address="0x000024AC" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000148" OriginalBytes="687B0100" PatchedBytes="23360100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="91FFC0914ED1EDB8F4E19329EBE0D0C2A1A6D9C7" HashPatched="B71952DC0F9896D0C7D1F8C7AD31F05685431A0D">
-            <Patches>
-              <Patch Address="0x00002C80" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000148" OriginalBytes="F7D00000" PatchedBytes="4AFF0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="8DE3974EE35EB1AF162FE954BAAC73248B9791F4" HashPatched="61663640C3BDEBC4DB6E638F716DD8ADD7E76A93">
-            <Patches>
-              <Patch Address="0x00009B0C" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
-              <Patch Address="0x00000140" OriginalBytes="01F80100" PatchedBytes="0BBD0100" />
-              <Patch Address="0x0000DEE4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="9BB18454FB221B25F7A18EDB037CAEE92541366A" HashPatched="46E053E7CB5C176B20CDDD9DC575B9C5CE59BD40">
-            <Patches>
-              <Patch Address="0x000C2B8C" OriginalBytes="2DE970480DF10C0B8CF7F0FF" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000150" OriginalBytes="8E1E1000" PatchedBytes="CA891000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1AE34A842C6885730954C0D734D28F58F7DDB858" HashPatched="F6F86F25C3E73AF922902891F3061788D5DAEF5D">
-            <Patches>
-              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="E50E0100" PatchedBytes="37440100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="252E1D5AE0DB9800DC7E5E6C0C16F5683BDECB19" HashPatched="9DC9A7142CBA9911EB9BBF4DEF833DC869F4EAE9">
-            <Patches>
-              <Patch Address="0x000BAF4A" OriginalBytes="6ED1" PatchedBytes="6EE0" />
-              <Patch Address="0x00000158" OriginalBytes="4BBD5700" PatchedBytes="C81C5700" />
-              <Patch Address="0x000BB18C" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000BB1AA" OriginalBytes="29B9" PatchedBytes="05E0" />
-              <Patch Address="0x000BB660" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000BB84A" OriginalBytes="56D0" PatchedBytes="56E0" />
-              <Patch Address="0x000BB934" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000BB966" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x002CD186" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x002CD66A" OriginalBytes="09BB" PatchedBytes="21E0" />
-              <Patch Address="0x002CD6F0" OriginalBytes="5BB3" PatchedBytes="2BE0" />
-              <Patch Address="0x001A5F50" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x00091FA0" OriginalBytes="00F00382" PatchedBytes="00F003BA" />
-              <Patch Address="0x002C8AE0" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x003793B4" OriginalBytes="47D1" PatchedBytes="00BF" />
-              <Patch Address="0x000B8E68" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
-              <Patch Address="0x000BC084" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x001A5AB2" OriginalBytes="BAF1" PatchedBytes="76E7" />
-              <Patch Address="0x001A5B70" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x001A5BE8" OriginalBytes="C3D1" PatchedBytes="00BF" />
-              <Patch Address="0x001A5C26" OriginalBytes="A4D1" PatchedBytes="00BF" />
-              <Patch Address="0x001A5CEA" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x001A5D28" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
-              <Patch Address="0x001A5D60" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
-              <Patch Address="0x001A59A6" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
-              <Patch Address="0x000927B6" OriginalBytes="4ED1" PatchedBytes="00BF" />
-              <Patch Address="0x000928B8" OriginalBytes="CDD1" PatchedBytes="00BF" />
-              <Patch Address="0x000928DA" OriginalBytes="3FF474AF" PatchedBytes="FFF774BF" />
-              <Patch Address="0x000927D2" OriginalBytes="00F04081" PatchedBytes="AFF30080" />
-              <Patch Address="0x00147C60" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000BC0A8" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00147D00" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x00147D5E" OriginalBytes="0BD0" PatchedBytes="11E0" />
-              <Patch Address="0x00147BF6" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0013C3E2" OriginalBytes="BAF1007F" PatchedBytes="56F7F0B9" />
-              <Patch Address="0x0013C45A" OriginalBytes="22D0" PatchedBytes="22E0" />
-              <Patch Address="0x00379486" OriginalBytes="47D1" PatchedBytes="00BF" />
-              <Patch Address="0x00379700" OriginalBytes="40F0BF80" PatchedBytes="AFF30080" />
-              <Patch Address="0x0013C3DC" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000927A6" OriginalBytes="40F0F280" PatchedBytes="AFF30080" />
-              <Patch Address="0x00092894" OriginalBytes="40F0B580" PatchedBytes="AFF30080" />
-              <Patch Address="0x000928A2" OriginalBytes="68D0" PatchedBytes="00BF" />
-              <Patch Address="0x0013C478" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x0013C486" OriginalBytes="03D0" PatchedBytes="03E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\audiodg.exe" HashOriginal="8F2D5873578F139C725668409B6C3B1B97546111" HashPatched="C48D64172026D40CE11D1F149C67F0B9F2D4037E">
-            <Patches>
-              <Patch Address="0x00000148" OriginalBytes="35460400" PatchedBytes="C13B0400" />
-              <Patch Address="0x00000188" OriginalBytes="00F00300701A0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.20.10549.11796">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="1477FED9E175AE16327410F0C45D724B9C02197B" HashPatched="6581A029260077E81907983E32F0F8F0D0D7368A">
-            <Patches>
-              <Patch Address="0x000024AC" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000148" OriginalBytes="76610100" PatchedBytes="311C0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="0638789326CD960B1D57A41EEA3730F875520289" HashPatched="7B39A1B0056E822BF3FEDBB8229269731FE26BEE">
-            <Patches>
-              <Patch Address="0x0000D360" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000150" OriginalBytes="122C0200" PatchedBytes="CDE60100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="B9239DFE7D2CCD7318879E6A53C0E51E924924F6" HashPatched="3C9DE9B46E9267728518E701CC4D0B4CB4D57A54">
-            <Patches>
-              <Patch Address="0x000C3138" OriginalBytes="2DE970480DF10C0B8CF758FC" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000158" OriginalBytes="27431000" PatchedBytes="FBB11000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="650F9CC5C18207E8BE944C99832DA5326EA7EDE7" HashPatched="FD81354831B4ED6197B98467BECC4E90BE1D887C">
-            <Patches>
-              <Patch Address="0x00002C98" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000150" OriginalBytes="44450100" PatchedBytes="97730100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1ECD920A30E074DE8DE9F605B2B662FCB8D1C741" HashPatched="D3C00A04693C4FF8A4EF5A93879D0F7B50F99BE3">
-            <Patches>
-              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="24E10100" PatchedBytes="77160100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="AC4E0B490CCECAF73226E505BAD544F4DAD4AED6" HashPatched="1D10F36AA886AEBFA2B1A4FA8BDA4D5100CA9ACF">
-            <Patches>
-              <Patch Address="0x000B4A1E" OriginalBytes="5DD1" PatchedBytes="5DE0" />
-              <Patch Address="0x00000160" OriginalBytes="F9465000" PatchedBytes="48E54F00" />
-              <Patch Address="0x000B4C3C" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000B4C58" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000B50A0" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000B51A2" OriginalBytes="5AD0" PatchedBytes="5AE0" />
-              <Patch Address="0x000B5294" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000B52C6" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x0029EB24" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x0029F00A" OriginalBytes="09BB" PatchedBytes="21E0" />
-              <Patch Address="0x0029F090" OriginalBytes="5BB3" PatchedBytes="2BE0" />
-              <Patch Address="0x0016AC94" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x000B63CC" OriginalBytes="00F00382" PatchedBytes="00F003BA" />
-              <Patch Address="0x00294F14" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0032D026" OriginalBytes="1CD1" PatchedBytes="00BF" />
-              <Patch Address="0x000B5A00" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
-              <Patch Address="0x000B592C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0016A7F6" OriginalBytes="BAF1007F" PatchedBytes="FFF776BF" />
-              <Patch Address="0x0016A8B4" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0016A92C" OriginalBytes="C3D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016A96A" OriginalBytes="A4D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016AA2E" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0016AA6C" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
-              <Patch Address="0x0016AAA4" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
-              <Patch Address="0x0016A6EA" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
-              <Patch Address="0x000B6BE2" OriginalBytes="4ED1" PatchedBytes="00BF" />
-              <Patch Address="0x000B6CE4" OriginalBytes="CDD1" PatchedBytes="00BF" />
-              <Patch Address="0x000B6D06" OriginalBytes="3FF474AF" PatchedBytes="FFF774BF" />
-              <Patch Address="0x000B6BFE" OriginalBytes="00F04081" PatchedBytes="AFF30080" />
-              <Patch Address="0x0011D870" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000B5950" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0011D75C" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x0011D7BA" OriginalBytes="0BD0" PatchedBytes="11E0" />
-              <Patch Address="0x0011D806" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0011D35A" OriginalBytes="BAF1007F" PatchedBytes="99F74ABC" />
-              <Patch Address="0x0011D3D2" OriginalBytes="22D0" PatchedBytes="22E0" />
-              <Patch Address="0x0032D09C" OriginalBytes="1CD1" PatchedBytes="00BF" />
-              <Patch Address="0x0032D278" OriginalBytes="69D1" PatchedBytes="00BF" />
-              <Patch Address="0x0011D354" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000B6BD2" OriginalBytes="40F0F280" PatchedBytes="AFF30080" />
-              <Patch Address="0x000B6CC0" OriginalBytes="40F0B580" PatchedBytes="AFF30080" />
-              <Patch Address="0x000B6CCE" OriginalBytes="68D0" PatchedBytes="00BF" />
-              <Patch Address="0x0011D3F0" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x0011D3FE" OriginalBytes="03D0" PatchedBytes="03E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\audiodg.exe" HashOriginal="5F58374B9D9A18DD4D14BD49D8DDDD4883FB86E0" HashPatched="0FAF3D5CC8CC12254D5B808E63A4148A7CEE9392">
-            <Patches>
-              <Patch Address="0x00000148" OriginalBytes="5E040500" PatchedBytes="EAF90400" />
-              <Patch Address="0x00000188" OriginalBytes="00F00300701A0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10581.0">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="040CF95B35AF689B496F611549F50A1E9B0E556B" HashPatched="63540E5D95737262E8B6E0333E821938515C46B7">
-            <Patches>
-              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="F86F0100" PatchedBytes="4AA50100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="DC2BE77A702DE6BBD401007C670C0EAB464CEB0B" HashPatched="C2FF8852DA6F1B9D57D0034B5854B1F1B7E55CA9">
-            <Patches>
-              <Patch Address="0x0000D7E4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000150" OriginalBytes="58C60100" PatchedBytes="13810100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="8A8EE6C3E38D1D42A76AA0C655FDD107235E6974" HashPatched="717FCEEE54323297DEC1FE120A950A5EE9C545BA">
-            <Patches>
-              <Patch Address="0x000C3454" OriginalBytes="2DE970480DF10C0B8CF77EFC" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000148" OriginalBytes="5B861000" PatchedBytes="09F51000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="E05F7D8F84B5611BB1311B1194CB849D606E3EEC" HashPatched="CE98A2EF3BE84B671F5F68694A11415E9BA3E90D">
-            <Patches>
-              <Patch Address="0x000023A4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000148" OriginalBytes="85480100" PatchedBytes="40030100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="98056F1246B1B34AC6DBCCE9D2B461CFA448D49B" HashPatched="899264FE51D2E31D50B258B836165FBA80D3A14C">
-            <Patches>
-              <Patch Address="0x00002CD0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="BC370100" PatchedBytes="0F660100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="2114F0FAD7099BE55719D84354F195376F55774D" HashPatched="8B27D643934D844F6A64D11497ED9EF4EE69203B">
-            <Patches>
-              <Patch Address="0x00000150" OriginalBytes="3E205200" PatchedBytes="15045200" />
-              <Patch Address="0x000B9836" OriginalBytes="5ED1" PatchedBytes="5EE0" />
-              <Patch Address="0x000B9A5E" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000B9A7A" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000B9EB6" OriginalBytes="09B9" PatchedBytes="01E0" />
-              <Patch Address="0x000B9FB2" OriginalBytes="5AD0" PatchedBytes="5AE0" />
-              <Patch Address="0x000BA0AA" OriginalBytes="1AB9" PatchedBytes="03E0" />
-              <Patch Address="0x000BA0DC" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x002A75E8" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x002A7ACE" OriginalBytes="09BB" PatchedBytes="21E0" />
-              <Patch Address="0x002A7B54" OriginalBytes="5BB3" PatchedBytes="2BE0" />
-              <Patch Address="0x0016F01C" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x000AB3E8" OriginalBytes="00F04682" PatchedBytes="00F046BA" />
-              <Patch Address="0x002A69F8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0029D6B0" OriginalBytes="6BD1" PatchedBytes="00BF" />
-              <Patch Address="0x0035746C" OriginalBytes="06F4DBA1" PatchedBytes="46F7DBB9" />
-              <Patch Address="0x0035747A" OriginalBytes="F9D1" PatchedBytes="00BF" />
-              <Patch Address="0x000BA8D8" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
-              <Patch Address="0x000BA7CC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0016EB7E" OriginalBytes="BAF1007F" PatchedBytes="FFF776BF" />
-              <Patch Address="0x0016EC3C" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0016ECB4" OriginalBytes="C3D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016ECF2" OriginalBytes="A4D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016EDB6" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0016EDF4" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
-              <Patch Address="0x0016EE2C" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
-              <Patch Address="0x0016EA72" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABC0E" OriginalBytes="40F0F480" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABCD6" OriginalBytes="40F0A880" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABCE6" OriginalBytes="7CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000ABC26" OriginalBytes="40F08180" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABCFC" OriginalBytes="16D1" PatchedBytes="00BF" />
-              <Patch Address="0x000ABDCA" OriginalBytes="3FF437AF" PatchedBytes="FFF737BF" />
-              <Patch Address="0x000ABC44" OriginalBytes="00F0C880" PatchedBytes="AFF30080" />
-              <Patch Address="0x0011FE44" OriginalBytes="02D0" PatchedBytes="02E0" />
-              <Patch Address="0x0011FE4C" OriginalBytes="B0F1007F" PatchedBytes="8BF7F6BE" />
-              <Patch Address="0x0011FEC0" OriginalBytes="24D0" PatchedBytes="24E0" />
-              <Patch Address="0x0011FEE0" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x0011FEEE" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x00105D48" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x00105CDE" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x000BA7F0" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00105DA0" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x00105DFE" OriginalBytes="0BD0" PatchedBytes="11E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\audiodg.exe" HashOriginal="0B8DEDC37638335E2B2A26DD243F48ACDDB7DD17" HashPatched="A9BA95085EC8DAA9F9F1B59EBF6EF236C347EB96">
-            <Patches>
-              <Patch Address="0x00000150" OriginalBytes="10D00400" PatchedBytes="4CA50400" />
-              <Patch Address="0x00000190" OriginalBytes="00100400C01A0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.11">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="47355EC0BFCC689C786A8D5AB044F175CBBE78AD" HashPatched="43DC792CBEC46E5FA38669174EBAB273764534B0">
-            <Patches>
-              <Patch Address="0x000C34C4" OriginalBytes="2DE970480DF10C0B8CF756FC" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000148" OriginalBytes="DF061100" PatchedBytes="B6751000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="88DE45A259A63ED6626AF8E20340C762EEFD3009" HashPatched="4447374DA2F857AC007D8D74FA50D8EB1D7DD765">
-            <Patches>
-              <Patch Address="0x000023A4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000148" OriginalBytes="064B0100" PatchedBytes="C1050100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="CF489D92C9352D425BC29846EDE862AC8AF0BEC5" HashPatched="2FACAA73B618A2EB5B0B9CE4A394E9972F9629E1">
-            <Patches>
-              <Patch Address="0x00002CD0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="6C330100" PatchedBytes="BF610100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="FA545908961B5C3C373A68EB185678C71D3C70A2" HashPatched="CE0AD5F5D026EC3D8AC0DAFF03736EF5B12425FA">
-            <Patches>
-              <Patch Address="0x00002CD0" OriginalBytes="00000000" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="5F250100" PatchedBytes="CF8C0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="291CF03466C44BB5556EEDE4EEE1060C15F6A6FE" HashPatched="D0CFE61DABE633DBA53C9D4BED7AECF37B9B92AE">
-            <Patches>
-              <Patch Address="0x000B988E" OriginalBytes="5ED1" PatchedBytes="5EE0" />
-              <Patch Address="0x00000150" OriginalBytes="33D95100" PatchedBytes="16BD5100" />
-              <Patch Address="0x000B9AB6" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000B9AD2" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000B9F0E" OriginalBytes="09B9" PatchedBytes="01E0" />
-              <Patch Address="0x000BA00A" OriginalBytes="5AD0" PatchedBytes="5AE0" />
-              <Patch Address="0x000BA102" OriginalBytes="1AB9" PatchedBytes="03E0" />
-              <Patch Address="0x000BA134" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x002A76B8" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x002A7B9E" OriginalBytes="09BB" PatchedBytes="21E0" />
-              <Patch Address="0x002A7C24" OriginalBytes="5BB3" PatchedBytes="2BE0" />
-              <Patch Address="0x0016F048" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x000AB434" OriginalBytes="00F04682" PatchedBytes="00F046BA" />
-              <Patch Address="0x002A6AC8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0029D67C" OriginalBytes="6BD1" PatchedBytes="00BF" />
-              <Patch Address="0x003574B0" OriginalBytes="06F49FA1" PatchedBytes="46F79FB9" />
-              <Patch Address="0x003574BE" OriginalBytes="F9D1" PatchedBytes="00BF" />
-              <Patch Address="0x000BA930" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
-              <Patch Address="0x000BA824" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0016EBAA" OriginalBytes="BAF1007F" PatchedBytes="FFF776BF" />
-              <Patch Address="0x0016EC68" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0016ECE0" OriginalBytes="C3D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016ED1E" OriginalBytes="A4D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016EDE2" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0016EE20" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
-              <Patch Address="0x0016EE58" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
-              <Patch Address="0x0016EA9E" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABC5A" OriginalBytes="40F0F480" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABD22" OriginalBytes="40F0A880" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABD32" OriginalBytes="7CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000ABC72" OriginalBytes="40F08180" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABD48" OriginalBytes="16D1" PatchedBytes="00BF" />
-              <Patch Address="0x000ABE16" OriginalBytes="3FF437AF" PatchedBytes="FFF737BF" />
-              <Patch Address="0x000ABC90" OriginalBytes="00F0C880" PatchedBytes="AFF30080" />
-              <Patch Address="0x0011FE78" OriginalBytes="02D0" PatchedBytes="02E0" />
-              <Patch Address="0x0011FE80" OriginalBytes="B0F1007F" PatchedBytes="8BF702BF" />
-              <Patch Address="0x0011FEF4" OriginalBytes="24D0" PatchedBytes="24E0" />
-              <Patch Address="0x0011FF14" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x0011FF22" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x00105D80" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x00105D16" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x000BA848" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00105DD8" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x00105E36" OriginalBytes="0BD0" PatchedBytes="11E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="187ABA56D8F0D4CD3EE8557064CDF754A93C7B37" HashPatched="C455F52BE0F1CE8875F888B4A3A598539EA1D037">
-            <Patches>
-              <Patch Address="0x0000D7E4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000150" OriginalBytes="0C260200" PatchedBytes="C7E00100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\audiodg.exe" HashOriginal="EBCE638B6A9D4811D6EAE232A4AE0AA4381A5DB3" HashPatched="1AE92E1B5C3B06F87CC6A2CE0FCD20F0BE8F1001">
-            <Patches>
-              <Patch Address="0x00000150" OriginalBytes="ADE20400" PatchedBytes="41A50400" />
-              <Patch Address="0x00000190" OriginalBytes="00100400682D0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.36">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="2AA15BC515F723F2560728A3CBE4478BD074970E" HashPatched="C1605CB02F7C87561157D14E6249B0EB9B08CC0A">
-            <Patches>
-              <Patch Address="0x0000D7E4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000150" OriginalBytes="51280200" PatchedBytes="0CE30100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="92BF7CF25E8CC892B87091719479E1FA8D8A1A42" HashPatched="421B2E49B4690CBA05AF29D0D7DC3C1DBD483D54">
-            <Patches>
-              <Patch Address="0x000C34C4" OriginalBytes="2DE970480DF10C0B8CF756FC" PatchedBytes="0149016000207047FFFFFF7F" />
-              <Patch Address="0x00000148" OriginalBytes="B8AA1000" PatchedBytes="8E191100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="582A5B83320F5DB537F1CF49490C885ABAE9ECF4" HashPatched="AAFDE1104808523A0108B3F636E9C730EBC673C7">
-            <Patches>
-              <Patch Address="0x000023A4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000148" OriginalBytes="7AF30000" PatchedBytes="35AE0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="D72EFD5A413D3F227EA86F070117C0F1BB67FFA4" HashPatched="CE07E4B891EA4496111234F69F50F06258F11C6D">
-            <Patches>
-              <Patch Address="0x00002CD0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="99800100" PatchedBytes="ECAE0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="28E0126845681AA7B7FD124D404C03F3E150BA86" HashPatched="824AC25AE8D3E86DB3CFEA783271B6C449D81F3A">
-            <Patches>
-              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="14FD0000" PatchedBytes="66320100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\audiodg.exe" HashOriginal="73361D56C1115AF1DCF93F64B874EF751EFCBE55" HashPatched="86AAF66CA0010CF64F42992C6E967C5B88B778EE">
-            <Patches>
-              <Patch Address="0x00000150" OriginalBytes="32890400" PatchedBytes="C64B0400" />
-              <Patch Address="0x00000190" OriginalBytes="00100400682D0000" PatchedBytes="0000000000000000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="89E655120D2846F826166B7A8107D9B43E92C290" HashPatched="E028A15E5D52B5322170EE8E429B5CE9BB9C7D24">
-            <Patches>
-              <Patch Address="0x000B9992" OriginalBytes="5ED1" PatchedBytes="5EE0" />
-              <Patch Address="0x00000150" OriginalBytes="38925100" PatchedBytes="07255200" />
-              <Patch Address="0x000B9BBA" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000B9BD6" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000BA012" OriginalBytes="09B9" PatchedBytes="01E0" />
-              <Patch Address="0x000BA10E" OriginalBytes="5AD0" PatchedBytes="5AE0" />
-              <Patch Address="0x000BA206" OriginalBytes="1AB9" PatchedBytes="03E0" />
-              <Patch Address="0x000BA238" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x002A76B8" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x002A7B9E" OriginalBytes="09BB" PatchedBytes="21E0" />
-              <Patch Address="0x002A7C24" OriginalBytes="5BB3" PatchedBytes="2BE0" />
-              <Patch Address="0x0016F0B0" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x000AB544" OriginalBytes="00F04682" PatchedBytes="00F046BA" />
-              <Patch Address="0x002A6AC8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0029D67C" OriginalBytes="6BD1" PatchedBytes="00BF" />
-              <Patch Address="0x003574CC" OriginalBytes="06F491A1" PatchedBytes="46F791B9" />
-              <Patch Address="0x003574DA" OriginalBytes="F9D1" PatchedBytes="00BF" />
-              <Patch Address="0x000BAA34" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
-              <Patch Address="0x000BA928" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0016EC16" OriginalBytes="28D1" PatchedBytes="74E7" />
-              <Patch Address="0x0016ECD0" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0016ED48" OriginalBytes="C3D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016ED86" OriginalBytes="A4D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016EE4A" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0016EE88" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
-              <Patch Address="0x0016EEC0" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
-              <Patch Address="0x0016EB06" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABD6A" OriginalBytes="40F0F480" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABE32" OriginalBytes="40F0A880" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABE42" OriginalBytes="7CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000ABD82" OriginalBytes="40F08180" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABE58" OriginalBytes="16D1" PatchedBytes="00BF" />
-              <Patch Address="0x000ABF26" OriginalBytes="3FF437AF" PatchedBytes="FFF737BF" />
-              <Patch Address="0x000ABDA0" OriginalBytes="00F0C880" PatchedBytes="AFF30080" />
-              <Patch Address="0x0011FECC" OriginalBytes="02D0" PatchedBytes="00BF" />
-              <Patch Address="0x0011FED4" OriginalBytes="B0F1007F" PatchedBytes="8BF760BF" />
-              <Patch Address="0x0011FF48" OriginalBytes="24D0" PatchedBytes="24E0" />
-              <Patch Address="0x0011FF68" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x0011FF76" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x00105DDC" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x00105D72" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x000BA94C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00105E34" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x00105E92" OriginalBytes="0BD0" PatchedBytes="11E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15063.0">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="9A1C677EED430AF150FD0148F2FA580453792C84" HashPatched="339E85FAD5077B4E5DD61B2F9759EF2D5A914B06">
-            <Patches>
-              <Patch Address="0x00002634" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="A22C0100" PatchedBytes="5DE70000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="5B01B46E277A05A742AE7D22E3CD4E0D6A368329" HashPatched="3449F5A9B22F5AF942377D7153DD4C749683EF2D">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="818E0100" PatchedBytes="D4BC0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="5AE0712C0511C34B9E91E460CD88CE4C793213A1" HashPatched="8293DB91D8F02436059BBF47A77F4AFBE9BD2079">
-            <Patches>
-              <Patch Address="0x0012DB10" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="507B1700" PatchedBytes="454F1700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="F5C8702BED7A681BFAF2F781493772BFCF62497B" HashPatched="D9562721B3C87F87521215F11EAD04E1A36C7967">
-            <Patches>
-              <Patch Address="0x00035830" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x00035A46" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x00035A66" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x00035EB8" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x00035F78" OriginalBytes="19F0" PatchedBytes="7DE0" />
-              <Patch Address="0x000360BA" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x000360EA" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x000360AA" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x00036098" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x002AB9FA" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x002ABEF4" OriginalBytes="27D1" PatchedBytes="27E0" />
-              <Patch Address="0x002ABF06" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x00179E4E" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0006E1C4" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x00251FF0" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0026D644" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x002E1FD4" OriginalBytes="0BF4C88B" PatchedBytes="8BF7C8BB" />
-              <Patch Address="0x002E1FF8" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x00034DE8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0006E734" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00179A10" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x00179A7C" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00179AFA" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x00179B38" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x00179BFC" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x00179C3E" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x00179C7E" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x001798C0" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0006EDA6" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x0006EE8A" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x0006EE9A" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x0006EDB6" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0006EEB0" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x0006EE30" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x0006EDCA" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E0644" OriginalBytes="BEF1000F" PatchedBytes="8EF7F5BB" />
-              <Patch Address="0x000E0782" OriginalBytes="0EF4568B" PatchedBytes="8EF756BB" />
-              <Patch Address="0x000E06B0" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000CEB7C" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000CEB12" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0006E630" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000CE92C" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000CE990" OriginalBytes="0AD0" PatchedBytes="10E0" />
-              <Patch Address="0x00000168" OriginalBytes="E4DB5300" PatchedBytes="82385400" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="2DFE0BD2E996008498D1FBCFE147A4331ABC0720" HashPatched="1A0AB26F7F42B65D282601A241E5EA727165C37E">
-            <Patches>
-              <Patch Address="0x000A884E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="62F91000" PatchedBytes="E91F1000" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="2DFE0BD2E996008498D1FBCFE147A4331ABC0720" HashPatched="5CC226BD63C22D3970A3380B363C2A048EADE9E6">
-                <Patches>
-                  <Patch Address="0x000A8784" OriginalBytes="2DE9F04B" PatchedBytes="00207047" />
-                  <Patch Address="0x00000148" OriginalBytes="62F91000" PatchedBytes="B52B1000" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15063.297">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="AFEF61703D8C42933BC4BB68F4DEA14BC4C32E58" HashPatched="C0A12ECB84BC2377752EED0F7BE1BB14C97E0BA0">
-            <Patches>
-              <Patch Address="0x00002634" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="FC2F0100" PatchedBytes="B7EA0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="992830FBE32A274EB40851AEC1FE0FC571EEA8AC" HashPatched="9B885860C99553C2655F308B5DEF16981EE7D97D">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="F4580100" PatchedBytes="47870100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="99A6323A0A0CF08288DDB0DEC3904EC7C8DF2AE6" HashPatched="AD80572B88332FB6CC2F5AA18C164D83543BEC4F">
-            <Patches>
-              <Patch Address="0x0012DB10" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="34811700" PatchedBytes="29551700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="156F11F19D3740CD885CA957511ECDE6F26981CE" HashPatched="21B4B8248106A14198ECBBDA70DE632BCB83B20E">
-            <Patches>
-              <Patch Address="0x00035830" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x00000168" OriginalBytes="A9925400" PatchedBytes="28405400" />
-              <Patch Address="0x00035A46" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x00035A66" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x00035EB8" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x00035F78" OriginalBytes="19F0" PatchedBytes="7DE0" />
-              <Patch Address="0x000360BA" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x000360EA" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x000360AA" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x00036098" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x002ABDEE" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x002AC2E6" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x002AC2FA" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x00179E7E" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0006E1C4" OriginalBytes="00F0" PatchedBytes="72E1" />
-              <Patch Address="0x002523E4" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0026DA38" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x002E232C" OriginalBytes="0BF4168C" PatchedBytes="8BF716BC" />
-              <Patch Address="0x002E2350" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x00034DE8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0006E734" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00179A40" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x00179AAC" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00179B2A" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x00179B68" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x00179C2C" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x00179C6E" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x00179CAE" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x001798F0" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0006EDA6" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x0006EE8A" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x0006EE9A" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x0006EDB6" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0006EEB0" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x0006EE30" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x0006EDCA" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E0626" OriginalBytes="C0F80CE0" PatchedBytes="8EF704BC" />
-              <Patch Address="0x000E0782" OriginalBytes="0EF4568B" PatchedBytes="8EF756BB" />
-              <Patch Address="0x000E06B0" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000CEB7C" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000CEB12" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0006E630" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000CE92C" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000CE990" OriginalBytes="0AD0" PatchedBytes="10E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="B971EFF98207F66475ED5688C4CD943FF3B3A6A3" HashPatched="DFD74A46BE69C92791A09164DE7382112882E591">
-            <Patches>
-              <Patch Address="0x000A884E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="89881000" PatchedBytes="0FAF1000" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="B971EFF98207F66475ED5688C4CD943FF3B3A6A3" HashPatched="1262C63E943B1E7505E0B0A26B8CBD84F4C40313">
-                <Patches>
-                  <Patch Address="0x000A8784" OriginalBytes="2DE9F04B" PatchedBytes="00207047" />
-                  <Patch Address="0x00000148" OriginalBytes="89881000" PatchedBytes="DBBA1000" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.318">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="CAB388D2F3FAFE13AD0C137299DD3FE1A8615384" HashPatched="AF9FFC8E71D67ECCD90E7A95BF10579300521025">
-            <Patches>
-              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="3B210100" PatchedBytes="8D560100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="B4DA203053428208B108BF96D450AB58D6F839AB" HashPatched="08A575DE048FF077332AA7ACF50E511F061C4209">
-            <Patches>
-              <Patch Address="0x000023A4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000148" OriginalBytes="C6160100" PatchedBytes="81D10000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="F4EED9633DD8BD02BDD996E0B3EE398EEFEAFC06" HashPatched="F797CFA297B36C74D39113D116FE117DDF0143C6">
-            <Patches>
-              <Patch Address="0x00002CD0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="C8E50000" PatchedBytes="1B140100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="1EB718CF1C64B74E554754F1346813A0EF247D70" HashPatched="EE17DFDAA7968BE18B6895647AC51451D51D3C35">
-            <Patches>
-              <Patch Address="0x000C3960" OriginalBytes="2DE970480DF10C0B8CF7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="031F1100" PatchedBytes="A0F21000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="8AB0D0C96039E96098DCECA08956C7737595B2F7" HashPatched="F88DA1325CC1AAA3B76973530F1CE6546E6C0006">
-            <Patches>
-              <Patch Address="0x000A1416" OriginalBytes="5ED1" PatchedBytes="5EE0" />
-              <Patch Address="0x00000150" OriginalBytes="876E5100" PatchedBytes="95215200" />
-              <Patch Address="0x000A163E" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000A165A" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000A1A96" OriginalBytes="09B9" PatchedBytes="01E0" />
-              <Patch Address="0x000A1B92" OriginalBytes="5AD0" PatchedBytes="5AE0" />
-              <Patch Address="0x000A1C8A" OriginalBytes="1AB9" PatchedBytes="03E0" />
-              <Patch Address="0x000A1CBC" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x0028F6B0" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x0028FB96" OriginalBytes="09BB" PatchedBytes="21E0" />
-              <Patch Address="0x0028FC1C" OriginalBytes="5BB3" PatchedBytes="2BE0" />
-              <Patch Address="0x0016F0B8" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x00092FC0" OriginalBytes="00F04682" PatchedBytes="00F046BA" />
-              <Patch Address="0x0028EAC0" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x00285670" OriginalBytes="6BD1" PatchedBytes="00BF" />
-              <Patch Address="0x00351338" OriginalBytes="34F45582" PatchedBytes="34F755BA" />
-              <Patch Address="0x00351346" OriginalBytes="F9D1" PatchedBytes="00BF" />
-              <Patch Address="0x000A24B8" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
-              <Patch Address="0x000A23AC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0016EC1A" OriginalBytes="BAF1" PatchedBytes="76E7" />
-              <Patch Address="0x0016ECD8" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0016ED50" OriginalBytes="C3D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016ED8E" OriginalBytes="A4D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016EE52" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0016EE90" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
-              <Patch Address="0x0016EEC8" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
-              <Patch Address="0x0016EB0E" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
-              <Patch Address="0x000937E6" OriginalBytes="40F0F480" PatchedBytes="AFF30080" />
-              <Patch Address="0x000938AE" OriginalBytes="40F0A880" PatchedBytes="AFF30080" />
-              <Patch Address="0x000938BE" OriginalBytes="7CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000937FE" OriginalBytes="40F08180" PatchedBytes="AFF30080" />
-              <Patch Address="0x000938D4" OriginalBytes="16D1" PatchedBytes="00BF" />
-              <Patch Address="0x000939A2" OriginalBytes="3FF437AF" PatchedBytes="FFF737BF" />
-              <Patch Address="0x0009381C" OriginalBytes="00F0C880" PatchedBytes="AFF30080" />
-              <Patch Address="0x0011890C" OriginalBytes="02D0" PatchedBytes="02E0" />
-              <Patch Address="0x00118914" OriginalBytes="B0F1007F" PatchedBytes="7AF77EBF" />
-              <Patch Address="0x00118988" OriginalBytes="24D0" PatchedBytes="24E0" />
-              <Patch Address="0x001189A8" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x001189B6" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x000FF394" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000FF32A" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x000A23D0" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000FF3EC" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x000FF44A" OriginalBytes="0BD0" PatchedBytes="11E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="287A550060C163F5E8CF5451515FCD2BDF5C53FA" HashPatched="C2979D6FDC4B43FD2314D8A43A81CC55D95A9349">
-            <Patches>
-              <Patch Address="0x00054AB6" OriginalBytes="6BB9" PatchedBytes="0DE0" />
-              <Patch Address="0x00000140" OriginalBytes="1E940A00" PatchedBytes="C0BA0A00" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="287A550060C163F5E8CF5451515FCD2BDF5C53FA" HashPatched="92D579CA1EDE2F343896559FF85E866B44417192">
-                <Patches>
-                  <Patch Address="0x000549EC" OriginalBytes="2DE9F04B" PatchedBytes="00207047" />
-                  <Patch Address="0x00000140" OriginalBytes="1E940A00" PatchedBytes="70C60A00" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.494">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="903CD4BC60BA9BFD2409266F783F6F8CCD382145" HashPatched="AAE13F70403EB3A18A04AC0D289519E5E937A74C">
-            <Patches>
-              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="00130100" PatchedBytes="52480100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="F4F271CB5A6FD6329FD0EEA1A608077F7B9FAE3B" HashPatched="AB1EA75BF535BB27DBD445CAE263CD700075939B">
-            <Patches>
-              <Patch Address="0x000023A4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000148" OriginalBytes="690A0100" PatchedBytes="24C50000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="90BB9DF8ACCF93BD2AD288B1E4E0976EC9303548" HashPatched="A2C27832E9B144A8124FD26348FD71132913674C">
-            <Patches>
-              <Patch Address="0x00002CD0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="DB080100" PatchedBytes="2E370100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="66223648145D210CB5208571C95AB4950C2FBFAE" HashPatched="E0A1EABF50769FDF1F32F2C8123F711A6F390DDA">
-            <Patches>
-              <Patch Address="0x000C3930" OriginalBytes="2DE970480DF10C0B8CF7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="679B1000" PatchedBytes="046F1000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="E8CE0EBC09DE39CCEA7BC0988850E08DBF5715A5" HashPatched="4DF82E2621C87FEEE593D3F38E7299E0BC95B4B7">
-            <Patches>
-              <Patch Address="0x00097822" OriginalBytes="5ED1" PatchedBytes="5EE0" />
-              <Patch Address="0x00000150" OriginalBytes="DB425200" PatchedBytes="31D65100" />
-              <Patch Address="0x00097A4A" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x00097A66" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x00097EA2" OriginalBytes="09B9" PatchedBytes="01E0" />
-              <Patch Address="0x00097F9E" OriginalBytes="5AD0" PatchedBytes="5AE0" />
-              <Patch Address="0x00098096" OriginalBytes="1AB9" PatchedBytes="03E0" />
-              <Patch Address="0x000980C8" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x002A6D14" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x002A71FA" OriginalBytes="09BB" PatchedBytes="21E0" />
-              <Patch Address="0x002A7280" OriginalBytes="5BB3" PatchedBytes="2BE0" />
-              <Patch Address="0x0016F124" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x000892BC" OriginalBytes="00F04682" PatchedBytes="00F046BA" />
-              <Patch Address="0x002A6124" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0029B59C" OriginalBytes="6BD1" PatchedBytes="00BF" />
-              <Patch Address="0x0035708C" OriginalBytes="04F441A3" PatchedBytes="44F741BB" />
-              <Patch Address="0x0035709A" OriginalBytes="F9D1" PatchedBytes="00BF" />
-              <Patch Address="0x000988C4" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
-              <Patch Address="0x000987B8" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0016EC86" OriginalBytes="BAF1" PatchedBytes="76E7" />
-              <Patch Address="0x0016ED44" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0016EDBC" OriginalBytes="C3D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016EDFA" OriginalBytes="A4D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016EEBE" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0016EEFC" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
-              <Patch Address="0x0016EF34" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
-              <Patch Address="0x0016EB7A" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
-              <Patch Address="0x00089AE2" OriginalBytes="40F0F480" PatchedBytes="AFF30080" />
-              <Patch Address="0x00089BAA" OriginalBytes="40F0A880" PatchedBytes="AFF30080" />
-              <Patch Address="0x00089BBA" OriginalBytes="7CD0" PatchedBytes="00BF" />
-              <Patch Address="0x00089AFA" OriginalBytes="40F08180" PatchedBytes="AFF30080" />
-              <Patch Address="0x00089BD0" OriginalBytes="16D1" PatchedBytes="00BF" />
-              <Patch Address="0x00089C9E" OriginalBytes="3FF437AF" PatchedBytes="FFF737BF" />
-              <Patch Address="0x00089B18" OriginalBytes="00F0C880" PatchedBytes="AFF30080" />
-              <Patch Address="0x00115BEC" OriginalBytes="02D0" PatchedBytes="02E0" />
-              <Patch Address="0x00115BF4" OriginalBytes="B0F1007F" PatchedBytes="73F78CBF" />
-              <Patch Address="0x00115C68" OriginalBytes="24D0" PatchedBytes="24E0" />
-              <Patch Address="0x00115C88" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x00115C96" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x000FD320" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000FD2B6" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x000987DC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000FD378" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x000FD3D6" OriginalBytes="0BD0" PatchedBytes="11E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="7E383C4792E425799C9691D0EC5B6D9880F394F4" HashPatched="AE778A7BA9427CB402645837A91EACAA350D1764">
-            <Patches>
-              <Patch Address="0x00054AB6" OriginalBytes="6BB9" PatchedBytes="0DE0" />
-              <Patch Address="0x00000140" OriginalBytes="66D30A00" PatchedBytes="08FA0A00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10240.16384">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="222E73E695D4016F85BBD40DA2A3524E71422D6F" HashPatched="659B23061601921F8C3DCD3A6823AE080ECD6146">
-            <Patches>
-              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="392F0100" PatchedBytes="8B640100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="6BF83EEBBB3BF0886473D8D09348D4C10AC28387" HashPatched="350A9F65701C113D198F8AD4F6684C95E5A97623">
-            <Patches>
-              <Patch Address="0x00002BF8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000150" OriginalBytes="9BC80000" PatchedBytes="EEF60000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="667673B16A4C2E95C9AA71E7398D066008A9845A" HashPatched="1B04DA3FB8CC5DE9656CAD256C00CE450E23A572">
-            <Patches>
-              <Patch Address="0x000C0FB4" OriginalBytes="2DE970480DF10C0B8AF7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000150" OriginalBytes="D3671000" PatchedBytes="723B1000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="EE5866A17A24CA80A3210131E1A378032E55A00C" HashPatched="59EB4839A13E38E53DE6791C6BF0BF0A54E19333">
-            <Patches>
-              <Patch Address="0x000024AC" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000148" OriginalBytes="FE9F0000" PatchedBytes="B85A0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="68FF93E1EAB6E263B7A65048C9385135759EF9FB" HashPatched="52C1400223D1FCA6862CDA22F145DA20F71005B7">
-            <Patches>
-              <Patch Address="0x00078EF6" OriginalBytes="6ED1" PatchedBytes="6EE0" />
-              <Patch Address="0x00000160" OriginalBytes="5B875800" PatchedBytes="0B515900" />
-              <Patch Address="0x00079138" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x00079156" OriginalBytes="29B9" PatchedBytes="05E0" />
-              <Patch Address="0x0007960C" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x00079824" OriginalBytes="0BD2" PatchedBytes="0BE0" />
-              <Patch Address="0x0029EC88" OriginalBytes="E1B9" PatchedBytes="1CE0" />
-              <Patch Address="0x0029F198" OriginalBytes="09BB" PatchedBytes="21E0" />
-              <Patch Address="0x0029F21E" OriginalBytes="5BB3" PatchedBytes="2BE0" />
-              <Patch Address="0x001A4648" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0007A548" OriginalBytes="00F01782" PatchedBytes="00F017BA" />
-              <Patch Address="0x00279EC0" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x002F1174" OriginalBytes="40F0B180" PatchedBytes="AFF30080" />
-              <Patch Address="0x003B6EB4" OriginalBytes="3AF46882" PatchedBytes="3AF768BA" />
-              <Patch Address="0x003B6EE4" OriginalBytes="E8D1" PatchedBytes="00BF" />
-              <Patch Address="0x0003A3E8" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
-              <Patch Address="0x0004AFC0" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x001A41AA" OriginalBytes="BAF1007F" PatchedBytes="FFF776BF" />
-              <Patch Address="0x001A4268" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x001A42E0" OriginalBytes="C3D1" PatchedBytes="00BF" />
-              <Patch Address="0x001A431E" OriginalBytes="A4D1" PatchedBytes="00BF" />
-              <Patch Address="0x001A43E2" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x001A4420" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
-              <Patch Address="0x001A4458" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
-              <Patch Address="0x001A409E" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0007AD5E" OriginalBytes="40F0FB80" PatchedBytes="AFF30080" />
-              <Patch Address="0x0007AE50" OriginalBytes="40F0B580" PatchedBytes="AFF30080" />
-              <Patch Address="0x0007AE5E" OriginalBytes="68D0" PatchedBytes="00BF" />
-              <Patch Address="0x0007AD74" OriginalBytes="4DD1" PatchedBytes="00BF" />
-              <Patch Address="0x0007AE74" OriginalBytes="CDD1" PatchedBytes="00BF" />
-              <Patch Address="0x0007AEFA" OriginalBytes="3FF443AF" PatchedBytes="FFF743BF" />
-              <Patch Address="0x0007AD90" OriginalBytes="00F03C81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0012DF4C" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x0012DF52" OriginalBytes="BAF1007F" PatchedBytes="4CF717BF" />
-              <Patch Address="0x0012DFCA" OriginalBytes="22D0" PatchedBytes="22E0" />
-              <Patch Address="0x0012DFE8" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x0012DFF6" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x0011D9CC" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x0011D962" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0004AFE4" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0011D8B8" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x0011D916" OriginalBytes="0BD0" PatchedBytes="11E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="4490A1AECF60876F27B53BFBA471890D4E0CAA9A" HashPatched="22242F327527CA42A88F200C0EB649B58EEDFC9B">
-            <Patches>
-              <Patch Address="0x0004F922" OriginalBytes="6BB9" PatchedBytes="0DE0" />
-              <Patch Address="0x00000150" OriginalBytes="D0AA0900" PatchedBytes="72D10900" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.107">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1EE98D02C45D89E9975664B9F2897E52DA797D0C" HashPatched="CB63BB55746E0B757992724FF2785968C06A91E0">
-            <Patches>
-              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="E56D0100" PatchedBytes="37A30100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="D8F9BF9E8B60078F564B817B2DE5B17327D87B09" HashPatched="C421C0398EA695EBE9D503CB264AA20829C940BD">
-            <Patches>
-              <Patch Address="0x00002CD0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="D75A0100" PatchedBytes="2A890100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="11894FA68CE4C718EC8AA80F716E72A9CDCE3650" HashPatched="4C84A789218F8B02F904955A11E333160A9B93C4">
-            <Patches>
-              <Patch Address="0x000C34C4" OriginalBytes="2DE970480DF10C0B8CF7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000148" OriginalBytes="236A1000" PatchedBytes="C03D1000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="C249DEFF718FA93F8163C6827DA1240DF90A4604" HashPatched="2187232F9F5FC59A39B44678E882E9C65C492D45">
-            <Patches>
-              <Patch Address="0x000023A4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000148" OriginalBytes="59630100" PatchedBytes="141E0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="077146F9D9541AA5156FCC5E91FE7237B595CCA4" HashPatched="E76FC3445E73CB96ABF9B1AE14693E6C8DAE9AE6">
-            <Patches>
-              <Patch Address="0x000B99B4" OriginalBytes="7BB1" PatchedBytes="0FE0" />
-              <Patch Address="0x00000150" OriginalBytes="DB605100" PatchedBytes="7B485100" />
-              <Patch Address="0x000B9BBA" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000B9BD6" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000BA012" OriginalBytes="09B9" PatchedBytes="01E0" />
-              <Patch Address="0x000BA10E" OriginalBytes="5AD0" PatchedBytes="5AE0" />
-              <Patch Address="0x000BA206" OriginalBytes="1AB9" PatchedBytes="03E0" />
-              <Patch Address="0x000BA238" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x002A7790" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x002A7C76" OriginalBytes="09BB" PatchedBytes="21E0" />
-              <Patch Address="0x002A7CFC" OriginalBytes="5BB3" PatchedBytes="2BE0" />
-              <Patch Address="0x0016F0E0" OriginalBytes="E3B9" PatchedBytes="1CE0" />
-              <Patch Address="0x000AB544" OriginalBytes="00F04682" PatchedBytes="00F046BA" />
-              <Patch Address="0x002A6BA0" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0029D750" OriginalBytes="6BD1" PatchedBytes="00BF" />
-              <Patch Address="0x003575E8" OriginalBytes="06F46DA1" PatchedBytes="46F76DB9" />
-              <Patch Address="0x003575F6" OriginalBytes="F9D1" PatchedBytes="00BF" />
-              <Patch Address="0x000BAA34" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
-              <Patch Address="0x000BA928" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0016EC42" OriginalBytes="BAF1" PatchedBytes="76E7" />
-              <Patch Address="0x0016ECAA" OriginalBytes="3FF442AF" PatchedBytes="FFF742BF" />
-              <Patch Address="0x0016ED00" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0016ED78" OriginalBytes="C3D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016EDB6" OriginalBytes="A4D1" PatchedBytes="00BF" />
-              <Patch Address="0x0016EE7A" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0016EEB8" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
-              <Patch Address="0x0016EEF0" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
-              <Patch Address="0x0016EB36" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABD6A" OriginalBytes="40F0F480" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABE32" OriginalBytes="40F0A880" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABE42" OriginalBytes="7CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000ABD82" OriginalBytes="40F08180" PatchedBytes="AFF30080" />
-              <Patch Address="0x000ABE58" OriginalBytes="16D1" PatchedBytes="00BF" />
-              <Patch Address="0x000ABF26" OriginalBytes="3FF437AF" PatchedBytes="FFF737BF" />
-              <Patch Address="0x000ABDA0" OriginalBytes="00F0C880" PatchedBytes="AFF30080" />
-              <Patch Address="0x0011FEF0" OriginalBytes="02D0" PatchedBytes="02E0" />
-              <Patch Address="0x0011FEF8" OriginalBytes="B0F1007F" PatchedBytes="8BF74EBF" />
-              <Patch Address="0x0011FF6C" OriginalBytes="24D0" PatchedBytes="24E0" />
-              <Patch Address="0x0011FF8C" OriginalBytes="03D1" PatchedBytes="03E0" />
-              <Patch Address="0x0011FF9A" OriginalBytes="03D0" PatchedBytes="03E0" />
-              <Patch Address="0x00105DF8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x00105D8E" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x000BA94C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00105E50" OriginalBytes="11D0" PatchedBytes="09E0" />
-              <Patch Address="0x00105EAE" OriginalBytes="0BD0" PatchedBytes="11E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="079533A1183A1C86C4F1596EA3D76F183FA0450F" HashPatched="C9A42FC3F80E2983721617BAE41A80A9D143FD89">
-            <Patches>
-              <Patch Address="0x00054AB6" OriginalBytes="6BB9" PatchedBytes="0DE0" />
-              <Patch Address="0x00000140" OriginalBytes="D6780A00" PatchedBytes="789F0A00" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="079533A1183A1C86C4F1596EA3D76F183FA0450F" HashPatched="924443E69C1D80FE8CA297AE9689CB52EEB89E8C">
-                <Patches>
-                  <Patch Address="0x000549EC" OriginalBytes="2DE9F04B" PatchedBytes="00207047" />
-                  <Patch Address="0x00000140" OriginalBytes="D6780A00" PatchedBytes="28AB0A00" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.1">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="DA52084257CFB047CA81A87EBA7AC977C7228DD7" HashPatched="0633EBC4C62B3563893641047F33E06B03E43D0B">
-            <Patches>
-              <Patch Address="0x000A117C" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x00000168" OriginalBytes="33925400" PatchedBytes="055C5400" />
-              <Patch Address="0x000A1392" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000A13B2" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000A1804" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000A18C4" OriginalBytes="19F0" PatchedBytes="7DE0" />
-              <Patch Address="0x000A1A06" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x000A1A36" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x000A19F6" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000A19E4" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x0024E12A" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x0024E622" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x0024E636" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x0017A40A" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x000718DC" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x002A0774" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0027D878" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x002E71C4" OriginalBytes="16F4EA8B" PatchedBytes="96F7EABB" />
-              <Patch Address="0x002E71E8" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x000A0734" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00071E4C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00179FCC" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x0017A038" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0017A0B6" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x0017A0F4" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x0017A1B8" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0017A1FA" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x0017A23A" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00179E7C" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x000724BE" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x000725A2" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x000725B2" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x000724CE" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x000725C8" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x00072548" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x000724E2" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E51D0" OriginalBytes="BEF1000F" PatchedBytes="8DF7BBB9" />
-              <Patch Address="0x000E530E" OriginalBytes="0DF41C89" PatchedBytes="8DF71CB9" />
-              <Patch Address="0x000E523C" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F6AD4" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F6A6A" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x00071D48" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000F6884" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000F68E8" OriginalBytes="0AD0" PatchedBytes="10E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="01D1A2F1D7FEBA438F5B06541C2F45C4063AE777" HashPatched="071B9B3E701EC0DB1A118D6F81F3E9A5A8EA49B5">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="8C040100" PatchedBytes="DF320100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="63AEB8060D83670576E3D55DAC70B7A7C67A3CB5" HashPatched="0F8CAD7062B78E2877562315E3BDFBBAC4430A79">
-            <Patches>
-              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="7AAC1700" PatchedBytes="6F801700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="D50CDED0F9D54F16DCA4BAB35DFBB7C00F4BBE64" HashPatched="A961BB5533D171977B78A64DDFB269F650779D44">
-            <Patches>
-              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="1B900000" PatchedBytes="D54A0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="8B0E5EA8C0C100705C06ABBD3C252AFE09304CFC" HashPatched="F2484DF9E304DD30690856A432968F06CAAED619">
-            <Patches>
-              <Patch Address="0x000A882E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="3AFE1000" PatchedBytes="C1241000" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="8B0E5EA8C0C100705C06ABBD3C252AFE09304CFC" HashPatched="456A05A3D0020C6232D245A4773039E7ACB2F594">
-                <Patches>
-                  <Patch Address="0x000A8764" OriginalBytes="2DE9F04B" PatchedBytes="00207047" />
-                  <Patch Address="0x00000148" OriginalBytes="3AFE1000" PatchedBytes="8D301000" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.12">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="EB0C4F79F48FB0A98C497BEF59C15A3BA7E3F5CC" HashPatched="D764B4B4CE269F3EF5F7D97CB7C59A7B53363263">
-            <Patches>
-              <Patch Address="0x000A1120" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x00000168" OriginalBytes="E5B15400" PatchedBytes="B70B5400" />
-              <Patch Address="0x000A1336" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000A1356" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000A17A8" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000A1868" OriginalBytes="19F0" PatchedBytes="7DE0" />
-              <Patch Address="0x000A19AA" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x000A19DA" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x000A199A" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000A1988" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x0024E2A2" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x0024E79A" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x0024E7AE" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x0017A4BE" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x00071880" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x002A0C64" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0027D9F8" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x002E76A0" OriginalBytes="16F43C8A" PatchedBytes="96F73CBA" />
-              <Patch Address="0x002E76C4" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x000A06D8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00071DF0" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0017A080" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x0017A0EC" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0017A16A" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x0017A1A8" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x0017A26C" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0017A2AE" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x0017A2EE" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00179F30" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x00072462" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x00072546" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x00072556" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x00072472" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0007256C" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x000724EC" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x00072486" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E5168" OriginalBytes="BEF1007F" PatchedBytes="8DF7C1B9" />
-              <Patch Address="0x000E52B2" OriginalBytes="0DF41C89" PatchedBytes="8DF71CB9" />
-              <Patch Address="0x000E51E0" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F6A80" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F6A16" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x00071CEC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000F6830" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000F6894" OriginalBytes="0AD0" PatchedBytes="0AE0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="F3CD62EC78E067357C409529065D55FD232E4D4F" HashPatched="4A8D7D9F534CBCAACE7A1FB88B64AC3049C7E0B5">
-            <Patches>
-              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="AB900000" PatchedBytes="654B0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="DDDDA0628A91039BC704B39F0775D5118C60B51E" HashPatched="B836259771F1D6C53F5789F8AD42671F1568628D">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="C9230100" PatchedBytes="1C520100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="4FBC261278637DB6913DF9245BF79FF45214C312" HashPatched="A43A3515422204DA3F2FDAC98B1BDED525F219FE">
-            <Patches>
-              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="0AAD1700" PatchedBytes="FF801700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="D82628079D20752E2A96F1D00AC6A9D66C973FAF" HashPatched="947E010E59B8271140B108E8A93BEE06DA5F7AD8">
-            <Patches>
-              <Patch Address="0x000A882E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="659B1000" PatchedBytes="EBC11000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.124">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="9BFD87C00B7FCF5ED9354874B87D7518E4DFA8DF" HashPatched="E4ECF771710D11A494DCF8E75B303F5BC79503E5">
-            <Patches>
-              <Patch Address="0x000A1120" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x00000168" OriginalBytes="2D075400" PatchedBytes="FE605400" />
-              <Patch Address="0x000A1336" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000A1356" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000A17A8" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000A1868" OriginalBytes="19F0" PatchedBytes="7DE0" />
-              <Patch Address="0x000A19AA" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x000A19DA" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x000A199A" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000A1988" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x0024E2A2" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x0024E79A" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x0024E7AE" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x0017A4BE" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x00071880" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x002A0C64" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0027D9F8" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x002E76A0" OriginalBytes="16F43C8A" PatchedBytes="96F73CBA" />
-              <Patch Address="0x002E76C4" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x000A06D8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00071DF0" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0017A080" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x0017A0EC" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0017A16A" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x0017A1A8" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x0017A26C" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0017A2AE" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x0017A2EE" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00179F30" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x00072462" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x00072546" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x00072556" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x00072472" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0007256C" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x000724EC" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x00072486" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E5168" OriginalBytes="BEF1007F" PatchedBytes="8DF7C1B9" />
-              <Patch Address="0x000E52B2" OriginalBytes="0DF41C89" PatchedBytes="8DF71CB9" />
-              <Patch Address="0x000E51E0" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F6A80" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F6A16" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x00071CEC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000F6830" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000F6894" OriginalBytes="0AD0" PatchedBytes="0AE0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="2DA15B525F50219C171A890EAC7FC31DCA08F15C" HashPatched="5511FF2E4FE5351AE11A8604F821A81EF036034D">
-            <Patches>
-              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="01920000" PatchedBytes="BB4C0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="400DD1EDB960E1BB6FB5DDB3BBED4A2CD4D063AE" HashPatched="218B3521EFD536A0A77876C6953EC2028862CA83">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="F5130100" PatchedBytes="48420100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="D8F4D8051F4366ED6ADF20E7522C7C200FB5250E" HashPatched="94E57A074FB82F17C91EF8857F4EEFDEC0B65181">
-            <Patches>
-              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="60AE1700" PatchedBytes="55821700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="47FD84099380E017501669486CEE33A1B8635950" HashPatched="FC0ECB1C61464785B388EF116B00C790296DBA20">
-            <Patches>
-              <Patch Address="0x000A882E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="E0491000" PatchedBytes="66701000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.16">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="A60F1AF85D262B2C943BC570263F1BDF3CC179B7" HashPatched="BA3F4A1D2530C26C936686E896254522FD12FF4B">
-            <Patches>
-              <Patch Address="0x000A1120" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x00000168" OriginalBytes="78CC5300" PatchedBytes="49265400" />
-              <Patch Address="0x000A1336" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000A1356" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000A17A8" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000A1868" OriginalBytes="19F0" PatchedBytes="7DE0" />
-              <Patch Address="0x000A19AA" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x000A19DA" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x000A199A" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000A1988" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x0024E2A2" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x0024E79A" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x0024E7AE" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x0017A4BE" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x00071880" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x002A0C64" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x0027D9F8" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x002E76A0" OriginalBytes="16F43C8A" PatchedBytes="96F73CBA" />
-              <Patch Address="0x002E76C4" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x000A06D8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00071DF0" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x0017A080" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x0017A0EC" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0017A16A" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x0017A1A8" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x0017A26C" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0017A2AE" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x0017A2EE" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00179F30" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x00072462" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x00072546" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x00072556" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x00072472" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0007256C" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x000724EC" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x00072486" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E5168" OriginalBytes="BEF1007F" PatchedBytes="8DF7C1B9" />
-              <Patch Address="0x000E52B2" OriginalBytes="0DF41C89" PatchedBytes="8DF71CB9" />
-              <Patch Address="0x000E51E0" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F6A80" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F6A16" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x00071CEC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000F6830" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000F6894" OriginalBytes="0AD0" PatchedBytes="0AE0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="2986CBE71ABA16498A20FA35A01A671BA2BEBEBE" HashPatched="534FCFD0A37B67B0427050E0813D9C74EE3706F1">
-            <Patches>
-              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="BB900000" PatchedBytes="754B0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="81FFCAF8204D4B5F57271050C0CD502ED95E387A" HashPatched="2A1ABC65B39075B45BC585585539724E72C2F4AA">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="3FA10100" PatchedBytes="93CF0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="5C60D463A889028B97D525B1B03ACBF304E5E627" HashPatched="F349186B3BE3CC2829CC6FA8FA4534F4FE29E51D">
-            <Patches>
-              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="1AAD1700" PatchedBytes="0F811700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="23D5559FC1631C21B02D19B73E982EA0EDBCE768" HashPatched="3DB556CB05042A83E3D30458EC874B44C5C98F86">
-            <Patches>
-              <Patch Address="0x000A882E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="BBC71000" PatchedBytes="41EE1000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.158">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="4A63C13C6A45B6EA7FEE66761982489F068F6C33" HashPatched="5422000B11036B408CC0B86E9D6782B563785BFE">
-            <Patches>
-              <Patch Address="0x000849B4" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x00000158" OriginalBytes="C4F05300" PatchedBytes="A8FD5300" />
-              <Patch Address="0x00084BCA" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x00084BEA" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x0008503C" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x00085104" OriginalBytes="1AD0" PatchedBytes="79E0" />
-              <Patch Address="0x0008523E" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x0008526E" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x0008522E" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x0008521C" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x002A2372" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x002A286A" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x002A287E" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x001785DE" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0005D688" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x00272468" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x00254E54" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x002DADBC" OriginalBytes="3AF4DCA0" PatchedBytes="7AF7DCB8" />
-              <Patch Address="0x002DADE0" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x00083F6C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0005DBF8" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x001781A0" OriginalBytes="B0F1007F" PatchedBytes="FFF754BF" />
-              <Patch Address="0x0017820C" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0017828A" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x001782C8" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x0017838C" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x001783CE" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x0017840E" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00178050" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005E26A" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005E34E" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005E35E" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x0005E27A" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005E374" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005E2F4" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005E28E" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E4A24" OriginalBytes="BEF1000F" PatchedBytes="79F767BC" />
-              <Patch Address="0x000E4B62" OriginalBytes="39F4C8A3" PatchedBytes="79F7C8BB" />
-              <Patch Address="0x000E4A90" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F6088" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F601E" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0005DAF4" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000EA6E0" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000EA744" OriginalBytes="0AD0" PatchedBytes="10E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="E74A89AFD1A1255473427AD6C75F4EC2EE88F3D4" HashPatched="D792DE6F4411858E9CA3647B5ABF1F05010D5EF7">
-            <Patches>
-              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="53920000" PatchedBytes="0D4D0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="8F980218223A101D37FD8099FD428F17F63405A4" HashPatched="D17BEC7B845BDE7AC4219E7498FF5C0F76CCDA9B">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="FF130100" PatchedBytes="52420100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="18A39C161EC40A8343C079994CF216EC25CB0350" HashPatched="6C737EC7D389C63EBBE0503FE00FE324D0E36318">
-            <Patches>
-              <Patch Address="0x0012DBE0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="026E1700" PatchedBytes="F7411700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="910B7DA8634F5B8A8255B93996DC6843BBBD7247" HashPatched="F22BBE17ED79C4E49C27B25B2AA2FE992A160659">
-            <Patches>
-              <Patch Address="0x000A88AE" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="4A2B1000" PatchedBytes="D0511000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.158 (dev)">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="9B9BEEF471900398B288C9BAEF33CE4D4A14F8B2" HashPatched="76C9CA9D006D20FD36848C19A7E427CE2E233B85">
-            <Patches>
-              <Patch Address="0x000849B4" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x00000158" OriginalBytes="79795400" PatchedBytes="5D865400" />
-              <Patch Address="0x00084BCA" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x00084BEA" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x0008503C" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x00085104" OriginalBytes="1AD0" PatchedBytes="79E0" />
-              <Patch Address="0x0008523E" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x0008526E" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x0008522E" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x0008521C" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x002A2372" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x002A286A" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x002A287E" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x001785DE" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0005D688" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x00272468" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x00254E54" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x002DADBC" OriginalBytes="3AF4DCA0" PatchedBytes="7AF7DCB8" />
-              <Patch Address="0x002DADE0" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x00083F6C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0005DBF8" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x001781A0" OriginalBytes="B0F1007F" PatchedBytes="FFF754BF" />
-              <Patch Address="0x0017820C" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x0017828A" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x001782C8" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x0017838C" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x001783CE" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x0017840E" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00178050" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005E26A" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005E34E" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005E35E" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x0005E27A" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005E374" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005E2F4" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005E28E" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E4A24" OriginalBytes="BEF1000F" PatchedBytes="79F767BC" />
-              <Patch Address="0x000E4B62" OriginalBytes="39F4C8A3" PatchedBytes="79F7C8BB" />
-              <Patch Address="0x000E4A90" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F6088" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F601E" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0005DAF4" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000EA6E0" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000EA744" OriginalBytes="0AD0" PatchedBytes="10E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="E74A89AFD1A1255473427AD6C75F4EC2EE88F3D4" HashPatched="D792DE6F4411858E9CA3647B5ABF1F05010D5EF7">
-            <Patches>
-              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="53920000" PatchedBytes="0D4D0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="658CFDDAC4F160DFBFB8B314EB4CDC24F860CA02" HashPatched="281CAB86446B1EC6F5F9922F20B4AD8A2FF4916E">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="B0630100" PatchedBytes="03920100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="18A39C161EC40A8343C079994CF216EC25CB0350" HashPatched="6C737EC7D389C63EBBE0503FE00FE324D0E36318">
-            <Patches>
-              <Patch Address="0x0012DBE0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="026E1700" PatchedBytes="F7411700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="5B13F0535BC4174A0C9C1D573469F76E22521705" HashPatched="185D77696E409B6A79F7F78AA2C6FCF7524275FF">
-            <Patches>
-              <Patch Address="0x000A88AE" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="72521000" PatchedBytes="F8781000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.490">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="35FE0D2429189720900FB2DA9793561647765C54" HashPatched="A69AFD759AA21216C004B6BA07C268FACFD61195">
-            <Patches>
-              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="9F5D1000" PatchedBytes="25841000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="AA31D5551495EB88B8384B0018FE9EA02A83DCF7" HashPatched="519E5C3F4E1727268AA011AF99EEF9F6291297FA">
-            <Patches>
-              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="8D171800" PatchedBytes="82EB1700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="C66F0A507B89A6AF07D52C2012138DA73F49F2E9" HashPatched="C8FF282DCB71CCFC1FEAACC652A8D017A9063AAD">
-            <Patches>
-              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="E9940000" PatchedBytes="A34F0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="AB17E4F9E5902C58871DF8502A81CF1C382E8931" HashPatched="E1DB44BDBF94B3EEF63E8E0F354533F2D1925131">
-            <Patches>
-              <Patch Address="0x00084A94" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x00000158" OriginalBytes="A1A45400" PatchedBytes="760E5400" />
-              <Patch Address="0x00084CAA" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x00084CCA" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x0008511C" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000851E6" OriginalBytes="3BB1" PatchedBytes="78E0" />
-              <Patch Address="0x0008531E" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x0008534E" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x0008530E" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000852FC" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x002A27D2" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x002A2CCA" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x002A2CDE" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x0017862A" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0005D69C" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x002724A0" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x00254E54" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x002DB234" OriginalBytes="39F4A0A6" PatchedBytes="79F7A0BE" />
-              <Patch Address="0x002DB258" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x0008404C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0005DC0C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x001781EC" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x00178258" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x001782D6" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x00178314" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x001783D8" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x0017841A" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x0017845A" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x0017809C" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005E27E" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005E362" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005E372" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x0005E28E" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005E388" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005E308" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005E2A2" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E4C14" OriginalBytes="BEF1007F" PatchedBytes="79F779BB" />
-              <Patch Address="0x000E4D5E" OriginalBytes="39F4D4A2" PatchedBytes="79F7D4BA" />
-              <Patch Address="0x000E4C8C" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F6298" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F622E" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0005DB08" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000EA9F0" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000EAA54" OriginalBytes="0AD0" PatchedBytes="10E0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.14393.1066">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="7E66B7A9F314B3693218B5879FD964437D952EBE" HashPatched="3845691BC35B0FBC5DABC55330CB1F697A8173A0">
-            <Patches>
-              <Patch Address="0x0021706C" OriginalBytes="0BB9" PatchedBytes="00BF" />
-              <Patch Address="0x00000150" OriginalBytes="39375300" PatchedBytes="2E3D5300" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.527">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="D87E2A032814D2834B97AFA5F526234A777D0A4F" HashPatched="825A2694EBEDD98D32F5D2A6D8CD0E0C6CFF4BA0">
-            <Patches>
-              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="35950000" PatchedBytes="EF4F0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="9FD01D384868A3E1007255BABF3987DAC0115D9D" HashPatched="93D0E4BC56844F377F49E90DD52F75FBA86A1E09">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="35ED0000" PatchedBytes="881B0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="C937CA583AEA63597E142FC789B184AD5CED0CE5" HashPatched="97B372CA757444D8FBABE37989DE1969D4ACBE66">
-            <Patches>
-              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="D9171800" PatchedBytes="CEEB1700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="3B62EB09C37369A797D5215B4179B1E761F2D7FB" HashPatched="049A8A4E32907202A1B28A7F3B2E0C88795E5E9F">
-            <Patches>
-              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="75251000" PatchedBytes="FB4B1000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="AA03E34592A2B12AE1A7F6987165DC20090DCA76" HashPatched="BD0084827482CCA508FE2D849FAF06E5AC599E75">
-            <Patches>
-              <Patch Address="0x000AB4EC" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x000AB702" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000AB722" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000ABB74" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000ABC3C" OriginalBytes="1AD0" PatchedBytes="79E0" />
-              <Patch Address="0x000ABD76" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x000ABDA6" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x000ABD66" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000ABD54" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x002866E2" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x00286BDA" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x00286BEE" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x00178292" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0005F2D8" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x002AB85C" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x002DEE8C" OriginalBytes="01F48C8D" PatchedBytes="81F78CBD" />
-              <Patch Address="0x002DEEB0" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x00260884" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x000AAAA4" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0005F848" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00177E54" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x00177EC0" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00177F3E" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x00177F7C" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x00178040" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x00178082" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x001780C2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00177D04" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FEBA" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FF9E" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FFAE" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x0005FECA" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FFC4" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005FF44" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005FEDE" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E64D8" OriginalBytes="BEF1007F" PatchedBytes="79F735BD" />
-              <Patch Address="0x000E6622" OriginalBytes="39F490A4" PatchedBytes="79F790BC" />
-              <Patch Address="0x000E6550" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F2CB8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F2C4E" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0005F744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000F7254" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000F72B8" OriginalBytes="0AD0" PatchedBytes="10E0" />
-              <Patch Address="0x00000158" OriginalBytes="00FF5300" PatchedBytes="F2635400" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="AA03E34592A2B12AE1A7F6987165DC20090DCA76" HashPatched="3D5AB56C9DF9598DDA637298B5D0B15A8BBC045D">
-                <Patches>
-                  <Patch Address="0x000AB4EC" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-                  <Patch Address="0x00000158" OriginalBytes="00FF5300" PatchedBytes="93625400" />
-                  <Patch Address="0x000AB702" OriginalBytes="21B9" PatchedBytes="04E0" />
-                  <Patch Address="0x000AB722" OriginalBytes="31B9" PatchedBytes="06E0" />
-                  <Patch Address="0x000ABB74" OriginalBytes="12B9" PatchedBytes="02E0" />
-                  <Patch Address="0x000ABC46" OriginalBytes="74D1" PatchedBytes="74E0" />
-                  <Patch Address="0x000ABD76" OriginalBytes="02D1" PatchedBytes="02E0" />
-                  <Patch Address="0x000ABDA6" OriginalBytes="01D1" PatchedBytes="01E0" />
-                  <Patch Address="0x000ABD66" OriginalBytes="2CD0" PatchedBytes="00BF" />
-                  <Patch Address="0x000ABD54" OriginalBytes="37D0" PatchedBytes="00BF" />
-                  <Patch Address="0x002866E2" OriginalBytes="19B9" PatchedBytes="03E0" />
-                  <Patch Address="0x00286BDA" OriginalBytes="BA61" PatchedBytes="28E0" />
-                  <Patch Address="0x00286BEE" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-                  <Patch Address="0x00178292" OriginalBytes="E3B9" PatchedBytes="00BF" />
-                  <Patch Address="0x0005F2D8" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-                  <Patch Address="0x002AB85C" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-                  <Patch Address="0x00260884" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-                  <Patch Address="0x002DEE8C" OriginalBytes="01F48C8D" PatchedBytes="81F78CBD" />
-                  <Patch Address="0x002DEEB0" OriginalBytes="EED1" PatchedBytes="00BF" />
-                  <Patch Address="0x000AAAA4" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-                  <Patch Address="0x0005F848" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                  <Patch Address="0x00177E54" OriginalBytes="B0F1" PatchedBytes="54E7" />
-                  <Patch Address="0x00177EC0" OriginalBytes="13B1" PatchedBytes="02E0" />
-                  <Patch Address="0x00177F3E" OriginalBytes="C0D1" PatchedBytes="00BF" />
-                  <Patch Address="0x00177F7C" OriginalBytes="A1D1" PatchedBytes="00BF" />
-                  <Patch Address="0x00178040" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00178082" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-                  <Patch Address="0x001780C2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-                  <Patch Address="0x00177D04" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0005FEBA" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0005FF9E" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0005FFAE" OriginalBytes="5ED0" PatchedBytes="00BF" />
-                  <Patch Address="0x0005FECA" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0005FFC4" OriginalBytes="13D1" PatchedBytes="00BF" />
-                  <Patch Address="0x0005FF44" OriginalBytes="57D1" PatchedBytes="00BF" />
-                  <Patch Address="0x0005FEDE" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-                  <Patch Address="0x000E64D8" OriginalBytes="BEF1007F" PatchedBytes="79F735BD" />
-                  <Patch Address="0x000E6622" OriginalBytes="39F490A4" PatchedBytes="79F790BC" />
-                  <Patch Address="0x000E6550" OriginalBytes="3EB3" PatchedBytes="27E0" />
-                  <Patch Address="0x000F2CB8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-                  <Patch Address="0x000F2C4E" OriginalBytes="12D0" PatchedBytes="08E0" />
-                  <Patch Address="0x0005F744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                  <Patch Address="0x000F7254" OriginalBytes="13D0" PatchedBytes="0AE0" />
-                  <Patch Address="0x000F72B8" OriginalBytes="0AD0" PatchedBytes="10E0" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.530">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="6009127C44CCAFD3A8CA7A7FFB749CD46F0E1181" HashPatched="5F4B03DA614828667FCECAF793EF36186DDE6C67">
-            <Patches>
-              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="2F950000" PatchedBytes="E94F0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="0E88138BFE933F6930786B5D309B80DB7D378685" HashPatched="069EB7E0418B34ED25C32EE32C397A2552AA32E6">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="878A0100" PatchedBytes="DAB80100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="5DA7802C14A7EA1DD9C1DC30EFBD16EAC8AF8C17" HashPatched="D79632FB72CE2674B549B037965E90111BF3017C">
-            <Patches>
-              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="D3171800" PatchedBytes="C8EB1700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="B6B0EE55EF0F732796592AE333B842169E69CED3" HashPatched="CBCF30705ACC4E7F193A00B856466F06A70A1FD6">
-            <Patches>
-              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="A7E01000" PatchedBytes="2D071100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="AFC0567924C75DA621CE6422AB2E6620C649A21E" HashPatched="843F7527AB37B4B7EDDA3A3DC3AAEB57B3F3F1E3">
-            <Patches>
-              <Patch Address="0x000AB4EC" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x000AB702" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000AB722" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000ABB74" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000ABC3C" OriginalBytes="1AD0" PatchedBytes="79E0" />
-              <Patch Address="0x000ABD76" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x000ABDA6" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x000ABD66" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000ABD54" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x002866DE" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x00286BD6" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x00286BEA" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x00178292" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0005F2D8" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x002AB858" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x002DEE8C" OriginalBytes="01F4888D" PatchedBytes="81F788BD" />
-              <Patch Address="0x002DEEB0" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x0026087C" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x000AAAA4" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0005F848" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00177E54" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x00177EC0" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00177F3E" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x00177F7C" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x00178040" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x00178082" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x001780C2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00177D04" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FEBA" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FF9E" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FFAE" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x0005FECA" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FFC4" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005FF44" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005FEDE" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E64D8" OriginalBytes="BEF1007F" PatchedBytes="79F735BD" />
-              <Patch Address="0x000E6622" OriginalBytes="39F490A4" PatchedBytes="79F790BC" />
-              <Patch Address="0x000E6550" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F2CB8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F2C4E" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0005F744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000F7254" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000F72B8" OriginalBytes="0AD0" PatchedBytes="10E0" />
-              <Patch Address="0x00000158" OriginalBytes="B5DA5300" PatchedBytes="A73F5400" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="AFC0567924C75DA621CE6422AB2E6620C649A21E" HashPatched="F4C230DFB09013E7B0DC2E10F31FC6072BB8287D">
-                <Patches>
-                  <Patch Address="0x000AB4EC" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-                  <Patch Address="0x00000158" OriginalBytes="B5DA5300" PatchedBytes="478F5400" />
-                  <Patch Address="0x000AB702" OriginalBytes="21B9" PatchedBytes="04E0" />
-                  <Patch Address="0x000AB722" OriginalBytes="31B9" PatchedBytes="06E0" />
-                  <Patch Address="0x000ABB74" OriginalBytes="12B9" PatchedBytes="02E0" />
-                  <Patch Address="0x000ABC46" OriginalBytes="74D1" PatchedBytes="74E0" />
-                  <Patch Address="0x000ABD76" OriginalBytes="02D1" PatchedBytes="02E0" />
-                  <Patch Address="0x000ABDA6" OriginalBytes="01D1" PatchedBytes="01E0" />
-                  <Patch Address="0x000ABD66" OriginalBytes="2CD0" PatchedBytes="00BF" />
-                  <Patch Address="0x000ABD54" OriginalBytes="37D0" PatchedBytes="00BF" />
-                  <Patch Address="0x002866DE" OriginalBytes="19B9" PatchedBytes="03E0" />
-                  <Patch Address="0x00286BD6" OriginalBytes="BA61" PatchedBytes="28E0" />
-                  <Patch Address="0x00286BEA" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-                  <Patch Address="0x00178292" OriginalBytes="E3B9" PatchedBytes="00BF" />
-                  <Patch Address="0x0005F2D8" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-                  <Patch Address="0x002AB858" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-                  <Patch Address="0x0026087C" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-                  <Patch Address="0x002DEE8C" OriginalBytes="01F4888D" PatchedBytes="81F788BD" />
-                  <Patch Address="0x002DEEB0" OriginalBytes="EED1" PatchedBytes="00BF" />
-                  <Patch Address="0x000AAAA4" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-                  <Patch Address="0x0005F848" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                  <Patch Address="0x00177E54" OriginalBytes="B0F1007F" PatchedBytes="FFF754BF" />
-                  <Patch Address="0x00177EC0" OriginalBytes="13B1" PatchedBytes="02E0" />
-                  <Patch Address="0x00177F3E" OriginalBytes="C0D1" PatchedBytes="00BF" />
-                  <Patch Address="0x00177F7C" OriginalBytes="A1D1" PatchedBytes="00BF" />
-                  <Patch Address="0x00178040" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-                  <Patch Address="0x00178082" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-                  <Patch Address="0x001780C2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-                  <Patch Address="0x00177D04" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0005FEBA" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0005FF9E" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0005FFAE" OriginalBytes="5ED0" PatchedBytes="00BF" />
-                  <Patch Address="0x0005FECA" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-                  <Patch Address="0x0005FFC4" OriginalBytes="13D1" PatchedBytes="00BF" />
-                  <Patch Address="0x0005FF44" OriginalBytes="57D1" PatchedBytes="00BF" />
-                  <Patch Address="0x0005FEDE" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-                  <Patch Address="0x000E64D8" OriginalBytes="BEF1007F" PatchedBytes="79F735BD" />
-                  <Patch Address="0x000E6622" OriginalBytes="39F490A4" PatchedBytes="79F790BC" />
-                  <Patch Address="0x000E6550" OriginalBytes="3EB3" PatchedBytes="27E0" />
-                  <Patch Address="0x000F2CB8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-                  <Patch Address="0x000F2C4E" OriginalBytes="12D0" PatchedBytes="08E0" />
-                  <Patch Address="0x0005F744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-                  <Patch Address="0x000F7254" OriginalBytes="13D0" PatchedBytes="0AE0" />
-                  <Patch Address="0x000F72B8" OriginalBytes="0AD0" PatchedBytes="10E0" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.538">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="4D9B70757FC549BE74FD5467BF491A791C9F6464" HashPatched="500EDC8A40902D80B4735308FC7525954D9177DC">
-            <Patches>
-              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="4F950000" PatchedBytes="09500100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="80484523DED7438976B57D42E55D7FB00A42ABF2" HashPatched="E3A8D3381FDE7D6C95A93828021388831E10A1F2">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="70300100" PatchedBytes="C35E0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="F891A9CC11794592E508F3AFF001456148C393DB" HashPatched="77D9633477E681A5E52B082C23865A801B7D064B">
-            <Patches>
-              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="F3171800" PatchedBytes="E8EB1700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="0517DF554DA44436D12D9464034A0D2B781F419A" HashPatched="A873F7C314C96F123DEF09A90FACA437AF4D0EB5">
-            <Patches>
-              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="AB961000" PatchedBytes="31BD1000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="10A1BACA1D054ECD8D58BD40583614223F6841A6" HashPatched="B512C25958D731748281266D386F12F91FA70699">
-            <Patches>
-              <Patch Address="0x000AB428" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x000AB63E" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000AB65E" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000ABAB0" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000ABB78" OriginalBytes="1AD0" PatchedBytes="79E0" />
-              <Patch Address="0x000ABCB2" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x000ABCE2" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x000ABCA2" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000ABC90" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x002856AE" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x00285BA6" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x00285BBA" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x001781B2" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0005F1CC" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x002AA828" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x002DDE6C" OriginalBytes="01F4988D" PatchedBytes="81F798BD" />
-              <Patch Address="0x002DDE90" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x0025F87C" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x000AA9E0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0005F73C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00177D74" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x00177DE0" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00177E5E" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x00177E9C" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x00177F60" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x00177FA2" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x00177FE2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00177C24" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FDAE" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FE92" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FEA2" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x0005FDBE" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FEB8" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005FE38" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005FDD2" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E63FC" OriginalBytes="BEF1007F" PatchedBytes="79F71DBD" />
-              <Patch Address="0x000E6546" OriginalBytes="39F478A4" PatchedBytes="79F778BC" />
-              <Patch Address="0x000E6474" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F2B60" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F2AF6" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0005F638" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000F70FC" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000F7160" OriginalBytes="0AD0" PatchedBytes="10E0" />
-              <Patch Address="0x00000158" OriginalBytes="25785400" PatchedBytes="00DD5300" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.541">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="5AD3ACEB5209702C88FA65037D451CE6BEB504FF" HashPatched="1FCDF5C1D0D23A36F5E77A88C0605CB169010D19">
-            <Patches>
-              <Patch Address="0x00002654" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="8D140100" PatchedBytes="48CF0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="842DA3F9B37D9A6378BACFBB6F8C08A2B5FA4237" HashPatched="5171F7AAAC1D27E89D8CC18FF9EFF0A03F46913D">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="50F50000" PatchedBytes="A3230100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="780D4ADB7E33C020A1704006D219C497DBE628FF" HashPatched="A79477E5EADE7F8A2BF2CC34EE74CE7E9117DB88">
-            <Patches>
-              <Patch Address="0x0012DBD0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="1B4E1700" PatchedBytes="0F221800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="497DAA7F918F08882096249CB092F07B5F385041" HashPatched="D07F6DC614A15C4789B8E6D4BD0C4241DD3B0688">
-            <Patches>
-              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="0E151100" PatchedBytes="953B1000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="8DF1BD7621B47122E772B88AC748CC7080019E1E" HashPatched="5F6A7BE75D98C9E25EAFCB2653C01755E32F6F4D">
-            <Patches>
-              <Patch Address="0x000AB428" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x000AB63E" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000AB65E" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000ABAB0" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000ABB78" OriginalBytes="1AD0" PatchedBytes="79E0" />
-              <Patch Address="0x000ABCB2" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x000ABCE2" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x000ABCA2" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000ABC90" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x002856AE" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x00285BA6" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x00285BBA" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x001781B2" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0005F1CC" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x002AA82C" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x002DDE70" OriginalBytes="01F4968D" PatchedBytes="81F796BD" />
-              <Patch Address="0x002DDE94" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x0025F87C" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x000AA9E0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0005F73C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00177D74" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x00177DE0" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00177E5E" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x00177E9C" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x00177F60" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x00177FA2" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x00177FE2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00177C24" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FDAE" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FE92" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FEA2" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x0005FDBE" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FEB8" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005FE38" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005FDD2" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E63FC" OriginalBytes="BEF1007F" PatchedBytes="79F71DBD" />
-              <Patch Address="0x000E6546" OriginalBytes="39F478A4" PatchedBytes="79F778BC" />
-              <Patch Address="0x000E6474" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F2B60" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F2AF6" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0005F638" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000F70FC" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000F7160" OriginalBytes="0AD0" PatchedBytes="10E0" />
-              <Patch Address="0x00000158" OriginalBytes="1FBE5300" PatchedBytes="F9225400" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.544">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="6BD62429C21675AA46257C1393022BC405AA9737" HashPatched="43E7AAA5799DD6572B0A2EC98D7F5ADD7621F2B9">
-            <Patches>
-              <Patch Address="0x00002654" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="99140100" PatchedBytes="54CF0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="026F77F64F30B4CF2AEBCEF0C325D51EF745AA64" HashPatched="E606F9FF25BAAC357953D297C5531594A8D8B38A">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="FDBF0100" PatchedBytes="51EE0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="4F1F1140B5CCCA90620F1AD24AF4A85C1B8A098B" HashPatched="C2B976AA68DF8B80FA912A193DDE75DAD0E5119A">
-            <Patches>
-              <Patch Address="0x0012DBD0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="274E1700" PatchedBytes="1B221800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="D3A936A9B2B64EC7CA7BC471E7BF11C96991A387" HashPatched="21434CE22741629D5F123DBACCC99C5ACC194484">
-            <Patches>
-              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="4D321000" PatchedBytes="D3581000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="3463D4003998C171B8290D38ABF1F74FE919EACC" HashPatched="77A64FE1A7C717670BC2DABD1D03A78957669BA6">
-            <Patches>
-              <Patch Address="0x000AB428" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x000AB63E" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000AB65E" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000ABAB0" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000ABB78" OriginalBytes="1AD0" PatchedBytes="79E0" />
-              <Patch Address="0x000ABCB2" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x000ABCE2" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x000ABCA2" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000ABC90" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x002856AE" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x00285BA6" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x00285BBA" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x001781B2" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0005F1CC" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x002AA82C" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x002DDE70" OriginalBytes="01F4968D" PatchedBytes="81F796BD" />
-              <Patch Address="0x002DDE94" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x0025F87C" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x000AA9E0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0005F73C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00177D74" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x00177DE0" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00177E5E" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x00177E9C" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x00177F60" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x00177FA2" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x00177FE2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00177C24" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FDAE" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FE92" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FEA2" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x0005FDBE" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FEB8" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005FE38" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005FDD2" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E63FC" OriginalBytes="BEF1007F" PatchedBytes="79F71DBD" />
-              <Patch Address="0x000E6546" OriginalBytes="39F478A4" PatchedBytes="79F778BC" />
-              <Patch Address="0x000E6474" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F2B60" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F2AF6" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0005F638" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000F70FC" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000F7160" OriginalBytes="0AD0" PatchedBytes="10E0" />
-              <Patch Address="0x00000158" OriginalBytes="35F45300" PatchedBytes="0F595400" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.547">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="6A4777FDB5F8DD48A2A25BB9E582AD69E99C0779" HashPatched="8C2BAF6BDFCB088D22B696E64D7A15AE6B0EB159">
-            <Patches>
-              <Patch Address="0x00002654" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="A5140100" PatchedBytes="60CF0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="CF0726B86F3FCA8007AE36CCA0AFB7CB3C195A08" HashPatched="127B7E1B8B07D46C3C502410D4EE1743E4856A8F">
-            <Patches>
-              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="4C3E0100" PatchedBytes="9F6C0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="608A76E57FA789D0DE44FBCA467193FD03429303" HashPatched="76A445FE9E99BE8AE57BCB713E2B1EAD02BA7E60">
-            <Patches>
-              <Patch Address="0x0012DBD0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="334E1700" PatchedBytes="27221800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="76D7C9D7AE8804BA64ACF90B08DCA88965CAACB7" HashPatched="253D426EF045AC9B22DA5069BE84E0A76101E98D">
-            <Patches>
-              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="1DFB1000" PatchedBytes="A4211000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="3AEFB34CC5B7230FDD50E1629738872FF944A0CE" HashPatched="B14D1D8170102A1AF8792D5D32AC58F23B6AE822">
-            <Patches>
-              <Patch Address="0x000AB428" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x000AB63E" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000AB65E" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x000ABAB0" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x000ABB78" OriginalBytes="1AD0" PatchedBytes="79E0" />
-              <Patch Address="0x000ABCB2" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x000ABCE2" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x000ABCA2" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x000ABC90" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x00285726" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x00285C1E" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x00285C32" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x001781B2" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x0005F1CC" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x002AA8A4" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x002DDE34" OriginalBytes="01F4F28D" PatchedBytes="81F7F2BD" />
-              <Patch Address="0x002DDE58" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x0025F8F8" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x000AA9E0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x0005F73C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00177D74" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x00177DE0" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00177E5E" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x00177E9C" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x00177F60" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x00177FA2" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x00177FE2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00177C24" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FDAE" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FE92" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FEA2" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x0005FDBE" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x0005FEB8" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005FE38" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x0005FDD2" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E63FC" OriginalBytes="BEF1007F" PatchedBytes="79F71DBD" />
-              <Patch Address="0x000E6546" OriginalBytes="39F478A4" PatchedBytes="79F778BC" />
-              <Patch Address="0x000E6474" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F2B60" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F2AF6" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x0005F638" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000F70FC" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000F7160" OriginalBytes="0AD0" PatchedBytes="10E0" />
-              <Patch Address="0x00000158" OriginalBytes="A56D5400" PatchedBytes="80D25300" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.603">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="E40AE0607C8BDBE2BDE4D3C66007EB868505C2E6" HashPatched="AE85CDF9C03F1FA66160EE522E8877F1AAEFABCB">
-            <Patches>
-              <Patch Address="0x00002654" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
-              <Patch Address="0x00000140" OriginalBytes="07150100" PatchedBytes="C2CF0000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="21A7BAB4E97E73A6D9DADAEAD29F76FCF7802442" HashPatched="9087D3D1635EA2695861118825D0FC7C5560A3FB">
-            <Patches>
-              <Patch Address="0x00002FC0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x00000140" OriginalBytes="314F0100" PatchedBytes="847D0100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="B003FA8BD05369162FED68695B49CFBB55519DAA" HashPatched="FE7FDAD1B3AB6DF191F3745B29DDD6C261811DBF">
-            <Patches>
-              <Patch Address="0x0012DBE0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
-              <Patch Address="0x00000158" OriginalBytes="781B1800" PatchedBytes="6DEF1700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
-            <Patches>
-              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="265ACD651DA9126D0FE545703FC6BD7CF4D8DB10" HashPatched="8F055F9BBEEB2BFBAAF088E9A2ADBE0E59B81279">
-            <Patches>
-              <Patch Address="0x000A884E" OriginalBytes="8BB9" PatchedBytes="11E0" />
-              <Patch Address="0x00000148" OriginalBytes="7A6F1000" PatchedBytes="00961000" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="611BDC087C34E5F626EC2889F4C2B8CBB7DB5582" HashPatched="90D0402F2FB4EE7F17495288079C7160BB9FB497">
-            <Patches>
-              <Patch Address="0x000307A8" OriginalBytes="5FD1" PatchedBytes="5FE0" />
-              <Patch Address="0x000309BE" OriginalBytes="21B9" PatchedBytes="04E0" />
-              <Patch Address="0x000309DE" OriginalBytes="31B9" PatchedBytes="06E0" />
-              <Patch Address="0x00030E30" OriginalBytes="12B9" PatchedBytes="02E0" />
-              <Patch Address="0x00030EF8" OriginalBytes="1AD0" PatchedBytes="79E0" />
-              <Patch Address="0x00031032" OriginalBytes="02D1" PatchedBytes="02E0" />
-              <Patch Address="0x00031062" OriginalBytes="01D1" PatchedBytes="01E0" />
-              <Patch Address="0x00031022" OriginalBytes="2CD0" PatchedBytes="00BF" />
-              <Patch Address="0x00031010" OriginalBytes="37D0" PatchedBytes="00BF" />
-              <Patch Address="0x002B310A" OriginalBytes="19B9" PatchedBytes="03E0" />
-              <Patch Address="0x002B3602" OriginalBytes="BA61" PatchedBytes="28E0" />
-              <Patch Address="0x002B3616" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
-              <Patch Address="0x00177FB6" OriginalBytes="E3B9" PatchedBytes="00BF" />
-              <Patch Address="0x00064E5C" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
-              <Patch Address="0x0025343C" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
-              <Patch Address="0x002E3460" OriginalBytes="0EF49E88" PatchedBytes="8EF79EB8" />
-              <Patch Address="0x002E3484" OriginalBytes="EED1" PatchedBytes="00BF" />
-              <Patch Address="0x0027147C" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
-              <Patch Address="0x0002FD60" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
-              <Patch Address="0x000653CC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x00177B78" OriginalBytes="B0F1" PatchedBytes="54E7" />
-              <Patch Address="0x00177BE4" OriginalBytes="13B1" PatchedBytes="02E0" />
-              <Patch Address="0x00177C62" OriginalBytes="C0D1" PatchedBytes="00BF" />
-              <Patch Address="0x00177CA0" OriginalBytes="A1D1" PatchedBytes="00BF" />
-              <Patch Address="0x00177D64" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
-              <Patch Address="0x00177DA6" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
-              <Patch Address="0x00177DE6" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
-              <Patch Address="0x00177A28" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
-              <Patch Address="0x00065A3E" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
-              <Patch Address="0x00065B22" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
-              <Patch Address="0x00065B32" OriginalBytes="5ED0" PatchedBytes="00BF" />
-              <Patch Address="0x00065A4E" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
-              <Patch Address="0x00065B48" OriginalBytes="13D1" PatchedBytes="00BF" />
-              <Patch Address="0x00065AC8" OriginalBytes="57D1" PatchedBytes="00BF" />
-              <Patch Address="0x00065A62" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
-              <Patch Address="0x000E7AB4" OriginalBytes="BEF1007F" PatchedBytes="7EF709B8" />
-              <Patch Address="0x000E7BFE" OriginalBytes="3DF464A7" PatchedBytes="7DF764BF" />
-              <Patch Address="0x000E7B2C" OriginalBytes="3EB3" PatchedBytes="27E0" />
-              <Patch Address="0x000F5A04" OriginalBytes="0FD0" PatchedBytes="0BE0" />
-              <Patch Address="0x000F599A" OriginalBytes="12D0" PatchedBytes="08E0" />
-              <Patch Address="0x000652C8" OriginalBytes="2DE90048" PatchedBytes="00207047" />
-              <Patch Address="0x000D9144" OriginalBytes="13D0" PatchedBytes="0AE0" />
-              <Patch Address="0x000D91A8" OriginalBytes="0AD0" PatchedBytes="10E0" />
-              <Patch Address="0x00000158" OriginalBytes="9E585400" PatchedBytes="6AB85300" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-    </TargetVersions>
-  </PatchDefinition>
-  <PatchDefinition Name="SecureBootHack-V1-EFIESP">
-    <TargetVersions>
-      <TargetVersion Description="8.10.12393.890">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="EEFA96DD8A4DC60CF8FF3D1E1FA14F018C812A60" HashPatched="44C0B18252F021559701D8C8161238DE69CD1403">
-            <Patches>
-              <Patch Address="0x0003C200" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="01610C00" PatchedBytes="548F0B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="40941860A7B7CED19BEAF25E76227AAFDFED689B" HashPatched="10AF6CB6948346DDE22D1519D7BA156C3AC7888F">
-            <Patches>
-              <Patch Address="0x00025AE8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="B3900A00" PatchedBytes="05BF0A00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.14226.359">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="501652BBAB34CE5CB283231D77EBBDDD90864F1D" HashPatched="0262E3064BA0D2B2729B347616F007C1357AA841">
-            <Patches>
-              <Patch Address="0x0003FC20" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="9EC20B00" PatchedBytes="F0F00B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="2461A5E125973057FF7446E47C5A4CA91797E359" HashPatched="F849B9F54B503E57531B9D154099B2D370169954">
-            <Patches>
-              <Patch Address="0x00026BEC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="897F0B00" PatchedBytes="DBAD0B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.12397.895">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="EEFA96DD8A4DC60CF8FF3D1E1FA14F018C812A60" HashPatched="44C0B18252F021559701D8C8161238DE69CD1403">
-            <Patches>
-              <Patch Address="0x0003C200" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="01610C00" PatchedBytes="548F0B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="1A14708817F9C5A4FC1E1E35474B794DC47D807B" HashPatched="C631135707CE9F6D13C403CF193CEEF62CD00979">
-            <Patches>
-              <Patch Address="0x00025AE8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="E45F0B00" PatchedBytes="378E0A00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.14219.341">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="501652BBAB34CE5CB283231D77EBBDDD90864F1D" HashPatched="0262E3064BA0D2B2729B347616F007C1357AA841">
-            <Patches>
-              <Patch Address="0x0003FC20" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="9EC20B00" PatchedBytes="F0F00B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="D528133F6F6E88FCD1FD7151BF5F041EAF8665AA" HashPatched="9484FFF0F0E22EF3FB555C6D63D579DD2D8B3B47">
-            <Patches>
-              <Patch Address="0x00026BEC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="70B70B00" PatchedBytes="C3E50A00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.14234.375">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="501652BBAB34CE5CB283231D77EBBDDD90864F1D" HashPatched="0262E3064BA0D2B2729B347616F007C1357AA841">
-            <Patches>
-              <Patch Address="0x0003FC20" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="9EC20B00" PatchedBytes="F0F00B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="20EDDF16CF5C28F170365332290ACDBA8C2CD4C8" HashPatched="403C494ECB1540CF7E86B4213015C7514D907765">
-            <Patches>
-              <Patch Address="0x00026BEC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="FD6C0B00" PatchedBytes="4F9B0B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.20.10512.11662">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="DC6F06F3FB84841722963AF9A9D6D370C9CE6658" HashPatched="B29975C8814BFBB97C00F2C3A6D678B8A6C05C70">
-            <Patches>
-              <Patch Address="0x00045318" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="E8C10D00" PatchedBytes="3AF00D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="366C1275EE4359BCCB5CCD0F2F27B4CA4092B348" HashPatched="C209DFBEE3D5A2EE131F6475F4EA8EF6194C6D25">
-            <Patches>
-              <Patch Address="0x000285B4" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="E9EC0B00" PatchedBytes="3B1B0C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.15116.125">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="0051AB13FE4BDB76E75614187B10E1DF50626883" HashPatched="4E0A941D506D139FFC9697ABD94032F7EB27E059">
-            <Patches>
-              <Patch Address="0x0003FC30" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="8EDB0B00" PatchedBytes="E0090C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="1BEB29917B69077FDB2EB21FA0766C7D69D44513" HashPatched="FCCE5AEFEC691E3BFCA5C7CFA26C678BB1E496C4">
-            <Patches>
-              <Patch Address="0x00026C0C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="C4120B00" PatchedBytes="16410B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.15148.160">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="446381C857DE5CC0DE17F558FC21F69DF193BF80" HashPatched="C21523A82C7637DE3C0A2078F729553C407CD5B9">
-            <Patches>
-              <Patch Address="0x0003FD18" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1A080C00" PatchedBytes="6C360C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="0407FA2C115FD152FB15DF1A6B40A2792563C433" HashPatched="5047FA8051DF7E3279388FEEC12881812CEE7D7D">
-            <Patches>
-              <Patch Address="0x00026C0C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000150" OriginalBytes="45640B00" PatchedBytes="97920B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.20.10536.11738">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="D46D4E0F78255D5EC6051EB0DCF4B483FC0B4D14" HashPatched="D96FA12ED65D07986D77FA279740226B8721A8F9">
-            <Patches>
-              <Patch Address="0x000462C0" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="A8920E00" PatchedBytes="FAC00E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="1A2D5E69C42A2F233F83757FD0A31D332090EC1C" HashPatched="63AE71B59C53236FBE78DDB52B3086F817F469C4">
-            <Patches>
-              <Patch Address="0x000285CC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="06AD0C00" PatchedBytes="58DB0C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.20.10549.11796">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="6EFD1F955C6E7BAA7A68BFD5B5BB7181E3EE9A44" HashPatched="A9C62DBCFB034583C374DFD1BF235F5110A939EC">
-            <Patches>
-              <Patch Address="0x0009EA74" OriginalBytes="0FB42DE9" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="D0BA1300" PatchedBytes="03851300" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="2BB0AF2C666421B3CE771E23C44BEE6032796228" HashPatched="289BBB83036CD5C94E1DB076ABE2F189B3A89AD1">
-            <Patches>
-              <Patch Address="0x000285FC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="C5630C00" PatchedBytes="17920C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10581.0">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="4DBD72B081023419654F712B4A611E44C52A8C15" HashPatched="AC5E100C17F47B624B049AF541C473A811A60F75">
-            <Patches>
-              <Patch Address="0x00044C80" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="A8A00D00" PatchedBytes="FACE0D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="99F4D5DBA68AF51B3797E102153D490F90E46CB5" HashPatched="7F122B066913566DC189AA468252617CFBE88797">
-            <Patches>
-              <Patch Address="0x00028A04" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="9D290D00" PatchedBytes="EF570D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.11">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="4DBD72B081023419654F712B4A611E44C52A8C15" HashPatched="AC5E100C17F47B624B049AF541C473A811A60F75">
-            <Patches>
-              <Patch Address="0x00044C80" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="A8A00D00" PatchedBytes="FACE0D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B5730E477D68F8E83FC13748198B7AA42A4FBD9F" HashPatched="BE75BC099969DE25F666534F90F10ABFA29F09DC">
-            <Patches>
-              <Patch Address="0x00028A04" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="71E90C00" PatchedBytes="C3170D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.36">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="4DBD72B081023419654F712B4A611E44C52A8C15" HashPatched="AC5E100C17F47B624B049AF541C473A811A60F75">
-            <Patches>
-              <Patch Address="0x00044C80" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="A8A00D00" PatchedBytes="FACE0D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="0038C204F5C9866A23198C3253C44C3ABFC8D5DE" HashPatched="8996626E999230DB1239125AD420940C82C31CF7">
-            <Patches>
-              <Patch Address="0x00028A04" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="592C0D00" PatchedBytes="AB5A0D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10240.16384">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="DC6F06F3FB84841722963AF9A9D6D370C9CE6658" HashPatched="B29975C8814BFBB97C00F2C3A6D678B8A6C05C70">
-            <Patches>
-              <Patch Address="0x00045318" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="E8C10D00" PatchedBytes="3AF00D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="240B7F0B6BC5CD923CBEAEE85DBBA1F240C96C3B" HashPatched="632C2C27A5791CE5A1D1F3C1A7641F057919DCE8">
-            <Patches>
-              <Patch Address="0x000285F8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="E5280C00" PatchedBytes="37570C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.107">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="4DBD72B081023419654F712B4A611E44C52A8C15" HashPatched="AC5E100C17F47B624B049AF541C473A811A60F75">
-            <Patches>
-              <Patch Address="0x00044C80" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="A8A00D00" PatchedBytes="FACE0D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B758EE117AEF2E6ED3DC6C0F07BC65CBCF944D6A" HashPatched="38F7D8508781FEEB36BDB43A9A17CCD5F5B0CD11">
-            <Patches>
-              <Patch Address="0x00028A04" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="178C0C00" PatchedBytes="69BA0C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.318">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="4DBD72B081023419654F712B4A611E44C52A8C15" HashPatched="AC5E100C17F47B624B049AF541C473A811A60F75">
-            <Patches>
-              <Patch Address="0x00044C80" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="A8A00D00" PatchedBytes="FACE0D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="8E71D1F0255E8C71BDE6F8D3780C4827C244375B" HashPatched="348C48C617F6114F88B61E0AD3FC1C06CE716FCB">
-            <Patches>
-              <Patch Address="0x00028A2C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="DABE0C00" PatchedBytes="2CED0C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.494">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="4DBD72B081023419654F712B4A611E44C52A8C15" HashPatched="AC5E100C17F47B624B049AF541C473A811A60F75">
-            <Patches>
-              <Patch Address="0x00044C80" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="A8A00D00" PatchedBytes="FACE0D00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B03EA0984975D4025960C87527E8760B58C504F3" HashPatched="E84977E96462FDC41596A6D4DB80FB1CF5A64528">
-            <Patches>
-              <Patch Address="0x00028A2C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="21730C00" PatchedBytes="73A10C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15063.0">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="1B6436EC18CB0FDF541CB382DA2CCD615E4379A6" HashPatched="CFB1560E6F215C198443C4AC09F08DB24E6F87F5">
-            <Patches>
-              <Patch Address="0x0002BC08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="EFA81C00" PatchedBytes="42D71B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15063.297">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E62882C993FAFEAF0E76622612FE9DCC70192C96" HashPatched="2DA62DC2BF9F278E2E7829A57A5BBEC504D774AF">
-            <Patches>
-              <Patch Address="0x0002BC08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="8F591C00" PatchedBytes="E1871C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.1">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="F27A93F8E597B8C270E0308F4ED59245A0FAD534" HashPatched="738916C95AF85B5C4087470121ED4D8A9D05A6E2">
-            <Patches>
-              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="F0181C00" PatchedBytes="42471C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.12">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="5A9B06CB5E49D8D8E062DDD3D7E3492144E85BB2" HashPatched="5F431432AB61B977F01F454A8F93EC08001EF1BF">
-            <Patches>
-              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="A2171C00" PatchedBytes="F4451C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.124">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="8FDA31B9DE443ED718280CC190641EF33C2677B1" HashPatched="6D00622A1CDC43134D04886E86E98B9F78045B8A">
-            <Patches>
-              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="9FB41C00" PatchedBytes="F2E21B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.16">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="05598D2CCE248D56DC61175F97D64849F82AE09D" HashPatched="CC9DA8EEFD21B0B7882DC7125A7C385126B784CD">
-            <Patches>
-              <Patch Address="0x0002BBC8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="904C1C00" PatchedBytes="E27A1C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.158">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="AAFE7C3D97921BDA6C48C4AEDA4FFA966EFFE1FA" HashPatched="5838197485F84CBDA40040E7A5F0A877BF2EDFB2">
-            <Patches>
-              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="E34D1C00" PatchedBytes="357C1C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.158 (dev)">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E832131801F6BCEED764098B73A5DA7F53AAEBA1" HashPatched="C4E99F0DB736037373C114DD8B139F79E7A38EB7">
-            <Patches>
-              <Patch Address="0x0002BBC8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="C1A61C00" PatchedBytes="14D51B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.490">
-        <TargetFiles>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="ACC23258B4B96209ADCFCC8183CEF12F5E93A0E6" HashPatched="93480ACD9FDA7A7B33E433C9297AA90968F5ADBC">
-            <Patches>
-              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="17BE1C00" PatchedBytes="6AEC1B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.527">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E1CDC15B381A874DBAA94BA734C78A6ED801F66A" HashPatched="37A4ADDBB7FE997699F2E8670C3CB2CCFDF7C05D">
-            <Patches>
-              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x0006D474" OriginalBytes="2DE93048" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="FA751C00" PatchedBytes="5FDA1B00" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E1CDC15B381A874DBAA94BA734C78A6ED801F66A" HashPatched="E001FB4B6C4B4A119D76A625AEFDD3DE041A6E6D">
-                <Patches>
-                  <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-                  <Patch Address="0x00000138" OriginalBytes="FA751C00" PatchedBytes="4CA41C00" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.530">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="528D1D9FA0371FEDD92548FC1E3695747BF637DB" HashPatched="C80088788F4C4B6762BD834126624958470D4273">
-            <Patches>
-              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x0006D474" OriginalBytes="2DE93048" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="409A1C00" PatchedBytes="A5FE1B00" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="528D1D9FA0371FEDD92548FC1E3695747BF637DB" HashPatched="194D04F6AAFBB9E06FA476911D0EB3A768AB7831">
-                <Patches>
-                  <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-                  <Patch Address="0x00000138" OriginalBytes="409A1C00" PatchedBytes="93C81B00" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.538">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="3045E7B081960E0615AC876E34AABF0A4A5CAC41" HashPatched="964C762F86630E7E2467921E1F51FF08A1E359D9">
-            <Patches>
-              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="93731C00" PatchedBytes="F8D71B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.541">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="F92F5A3E9379DB70CB7F20C751571A4AD53C746F" HashPatched="C17472D8A2046AF09ED4C75250FD307903D19C83">
-            <Patches>
-              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="07E31B00" PatchedBytes="6B471C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.544">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E57366397EFF615272D5996BFCA68F89566032B6" HashPatched="8AFB66E6BD9172923917E9711EE7C332CB994C66">
-            <Patches>
-              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="35111C00" PatchedBytes="99751C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.547">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="31CF8F2ECBBB0FC4F5FA56919D7A13CAAA9A8C27" HashPatched="085A195FE48527E22E556133849F5DBE1C4D6764">
-            <Patches>
-              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="E31B1C00" PatchedBytes="47801C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.603">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="D6D520A854C8C448BF63509F558C9DD4A198165E" HashPatched="1642DBB634A7AF82EB1D5DABF035FBB66D966632">
-            <Patches>
-              <Patch Address="0x0002B89C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000BBE10" OriginalBytes="42006F00" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="0FC01B00" PatchedBytes="20551C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
-            <Patches>
-              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-    </TargetVersions>
-  </PatchDefinition>
-  <PatchDefinition Name="SecureBootHack-V1.1-EFIESP">
-    <TargetVersions>
-      <TargetVersion Description="10.0.10240.16384">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="240B7F0B6BC5CD923CBEAEE85DBBA1F240C96C3B" HashPatched="14EE38E1229C8D770493A09A8CDC6B044A694720">
-            <Patches>
-              <Patch Address="0x00065514" OriginalBytes="2DE930480DF1080B9BF7B6FAADF50B7D0023039304932C4B0DF1220040F206221B8800210024ADF820309CF76DF900238DF80830012305932149204802AB009305AB06AA9DF7A6F9002805DB059B012B02D19DF8083053BB08A800F037F80446002C24DB03AA04A908A800F097F80446039D002C04DA134B9C4214D1002412E0049B0095C6F794FA0446002C0BDB01238DF8083002AB0A4908480093012303229DF7BCF9044615B12846CFF74FF820460DF50B7D9BF76CFA" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2315604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C72604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B1C61060098E30A00847F0A00BD2E0800652E0800A47B0E0081D40600" />
-              <Patch Address="0x00000138" OriginalBytes="E5280C00" PatchedBytes="41FE0C00" />
-              <Patch Address="0x000733D8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x000285F8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000AC198" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x00001EBC" OriginalBytes="03D1" PatchedBytes="00BF" />
-              <Patch Address="0x00001EC2" OriginalBytes="6AF0DDFC" PatchedBytes="63F029BB" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10011.16384">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="240B7F0B6BC5CD923CBEAEE85DBBA1F240C96C3B" HashPatched="14EE38E1229C8D770493A09A8CDC6B044A694720">
-            <Patches>
-              <Patch Address="0x00065514" OriginalBytes="2DE930480DF1080B9BF7B6FAADF50B7D0023039304932C4B0DF1220040F206221B8800210024ADF820309CF76DF900238DF80830012305932149204802AB009305AB06AA9DF7A6F9002805DB059B012B02D19DF8083053BB08A800F037F80446002C24DB03AA04A908A800F097F80446039D002C04DA134B9C4214D1002412E0049B0095C6F794FA0446002C0BDB01238DF8083002AB0A4908480093012303229DF7BCF9044615B12846CFF74FF820460DF50B7D9BF76CFA" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2315604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C72604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B1C61060098E30A00847F0A00BD2E0800652E0800A47B0E0081D40600" />
-              <Patch Address="0x00000138" OriginalBytes="E5280C00" PatchedBytes="41FE0C00" />
-              <Patch Address="0x000733D8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x000285F8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000AC198" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x00001EBC" OriginalBytes="03D1" PatchedBytes="00BF" />
-              <Patch Address="0x00001EC2" OriginalBytes="6AF0DDFC" PatchedBytes="63F029BB" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.107">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B758EE117AEF2E6ED3DC6C0F07BC65CBCF944D6A" HashPatched="85CEB6E5D5258C1312E809BB73B3ACFA14CCA4EB">
-            <Patches>
-              <Patch Address="0x00068188" OriginalBytes="2DE930480DF1080BADF50A7D002303932D4B0DF1220040F206221B880021ADF8203099F737FB002304938DF80830012305932249204802AB009305AB06AA00249AF76CFB002805DB059B012B02D19DF8083063BB08A800F039F80446002C26DB03AA04A908A800F093F80446039D002C04DA144B9C4216D1002414E01048049B03220095C4F730F90446002C0BDB01238DF8083002AB094907480093012303229AF780FB044615B12846CEF7EDF820460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F22D5604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C12604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B908D060028120B0048120B00A187070049870700C4CF0E001DFF0600" />
-              <Patch Address="0x000710D4" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00028A04" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000AF828" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x00001EB6" OriginalBytes="03D1" PatchedBytes="00BF" />
-              <Patch Address="0x00001EBC" OriginalBytes="6DF02EFA" PatchedBytes="66F066B9" />
-              <Patch Address="0x00000138" OriginalBytes="178C0C00" PatchedBytes="67850C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15063.0">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\mobilestartup.efi" HashOriginal="1B6436EC18CB0FDF541CB382DA2CCD615E4379A6" HashPatched="456E632E8FA39D3820169E485573F221A2663FCE">
-            <Patches>
-              <Patch Address="0x0006D374" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F74DFA002305938DF80830012303932249204802AB009303AB06AA002495F720F9002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF732FA0446002C0BDB01238DF8083002AB0949074800930123032295F734F9044615B12846CCF7E1FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CDF06003C320C0084320C0045980800ED970800488C1E0079520700" />
-              <Patch Address="0x00000138" OriginalBytes="EFA81C00" PatchedBytes="C9791C00" />
-              <Patch Address="0x0002BC08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000C0E3C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x0007465E" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F0E6FA" PatchedBytes="6BF066B9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15063.297">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\mobilestartup.efi" HashOriginal="1B6436EC18CB0FDF541CB382DA2CCD615E4379A6" HashPatched="456E632E8FA39D3820169E485573F221A2663FCE">
-            <Patches>
-              <Patch Address="0x0002BC08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="EFA81C00" PatchedBytes="C9791C00" />
-              <Patch Address="0x000C0E3C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x0007465E" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F0E6FA" PatchedBytes="6BF066B9" />
-              <Patch Address="0x0006D374" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F74DFA002305938DF80830012303932249204802AB009303AB06AA002495F720F9002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF732FA0446002C0BDB01238DF8083002AB0949074800930123032295F734F9044615B12846CCF7E1FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CDF06003C320C0084320C0045980800ED970800488C1E0079520700" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.318">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="8E71D1F0255E8C71BDE6F8D3780C4827C244375B" HashPatched="619484E25618AFE34A651741921430520CF51DDD">
-            <Patches>
-              <Patch Address="0x000681A8" OriginalBytes="2DE930480DF1080BADF50A7D002303932D4B0DF1220040F206221B880021ADF8203099F727FB002304938DF80830012305932249204802AB009305AB06AA00249AF75CFB002805DB059B012B02D19DF8083063BB08A800F039F80446002C26DB03AA04A908A800F095F80446039D002C04DA144B9C4216D1002414E01048049B03220095C4F71AF90446002C0BDB01238DF8083002AB094907480093012303229AF770FB044615B12846CEF7EDF820460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F22D5604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C12604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BB08D060028120B0048120B00C58707006D870700C4CF0E0041FF0600" />
-              <Patch Address="0x00000138" OriginalBytes="DABE0C00" PatchedBytes="F8B80C00" />
-              <Patch Address="0x000710F8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00028A2C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000AF828" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x00001EB6" OriginalBytes="03D1" PatchedBytes="00BF" />
-              <Patch Address="0x00001EBC" OriginalBytes="6DF040FA" PatchedBytes="66F076B9" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.494">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B03EA0984975D4025960C87527E8760B58C504F3" HashPatched="ED4CE6DD96EF4FA440B6898EFD4AE9EB1025D10A">
-            <Patches>
-              <Patch Address="0x000681A8" OriginalBytes="2DE930480DF1080BADF50A7D002303932D4B0DF1220040F206221B880021ADF8203099F727FB002304938DF80830012305932249204802AB009305AB06AA00249AF75CFB002805DB059B012B02D19DF8083063BB08A800F039F80446002C26DB03AA04A908A800F095F80446039D002C04DA144B9C4216D1002414E01048049B03220095C4F71AF90446002C0BDB01238DF8083002AB094907480093012303229AF770FB044615B12846CEF7EDF820460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F22D5604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C12604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BB08D060028120B0048120B00C58707006D870700C4CF0E0041FF0600" />
-              <Patch Address="0x00000138" OriginalBytes="21730C00" PatchedBytes="3F6D0C00" />
-              <Patch Address="0x000710F8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00028A2C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000AF828" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x00001EB6" OriginalBytes="03D1" PatchedBytes="00BF" />
-              <Patch Address="0x00001EBC" OriginalBytes="6DF040FA" PatchedBytes="66F076B9" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.1">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\mobilestartup.efi" HashOriginal="F27A93F8E597B8C270E0308F4ED59245A0FAD534" HashPatched="034E15A4E8553337E617D167440EE7DD7E633467">
-            <Patches>
-              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="F0181C00" PatchedBytes="E0ED1B00" />
-              <Patch Address="0x000C1054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
-              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E0060054320C0074320C00D998080081980800488C1E000D530700" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.12">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="5A9B06CB5E49D8D8E062DDD3D7E3492144E85BB2" HashPatched="54BFB9319C2937FF6DB5BEAA3F7831DEB119B06B">
-            <Patches>
-              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000C1054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
-              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E0060054320C0074320C00D998080081980800488C1E000D530700" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x00000138" OriginalBytes="A2171C00" PatchedBytes="92EC1B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.124">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="8FDA31B9DE443ED718280CC190641EF33C2677B1" HashPatched="8B99B3E8219B96DA87C09AE745A5448E9E85CEFF">
-            <Patches>
-              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000C1054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
-              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E0060054320C0074320C00D998080081980800488C1E000D530700" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x00000138" OriginalBytes="9FB41C00" PatchedBytes="8F891C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.16">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="05598D2CCE248D56DC61175F97D64849F82AE09D" HashPatched="AB679BC7D8A2944587CE552100CF3CADFD5CD93A">
-            <Patches>
-              <Patch Address="0x0002BBC8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="904C1C00" PatchedBytes="50211C00" />
-              <Patch Address="0x000C103C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746CA" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F01CFB" PatchedBytes="6BF09CB9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x0006D3E0" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F717FA002305938DF80830012303932249204802AB009303AB06AA002495F7EAF8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7D6F90446002C0BDB01238DF8083002AB0949074800930123032295F7FEF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BE8DF06003C320C0084320C0015990800BD980800488C1E00E5520700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.158">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="AAFE7C3D97921BDA6C48C4AEDA4FFA966EFFE1FA" HashPatched="1B9860D14CAD17957B9E853F5E67660C4B521D77">
-            <Patches>
-              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="E34D1C00" PatchedBytes="CB221C00" />
-              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E006003C320C0084320C00D998080081980800488C1E000D530700" />
-              <Patch Address="0x000C103C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.158 (dev)">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E832131801F6BCEED764098B73A5DA7F53AAEBA1" HashPatched="40C1CC59F2DA738501E6373AAA430F085C5B9DD6">
-            <Patches>
-              <Patch Address="0x0002BBC8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="C1A61C00" PatchedBytes="4D7B1C00" />
-              <Patch Address="0x0006D3E0" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F717FA002305938DF80830012303932249204802AB009303AB06AA002495F7EAF8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7D6F90446002C0BDB01238DF8083002AB0949074800930123032295F7FEF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BE8DF060048320C0090320C0015990800BD980800FC8B1E00E5520700" />
-              <Patch Address="0x000C1048" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746CA" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F01CFB" PatchedBytes="6BF09CB9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.490">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="ACC23258B4B96209ADCFCC8183CEF12F5E93A0E6" HashPatched="4344BADBBA3D4BC61EEB2DC5F74DB974FA4F0F33">
-            <Patches>
-              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="17BE1C00" PatchedBytes="AB951C00" />
-              <Patch Address="0x000C1060" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x0007475E" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F066FB" PatchedBytes="6BF0E6B9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x0006D474" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060060320C0080320C0045990800ED980800888C1E0079530700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.527">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E1CDC15B381A874DBAA94BA734C78A6ED801F66A" HashPatched="69E58EFA38729C4086A58FF76E0D0F6355A923AC">
-            <Patches>
-              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="FA751C00" PatchedBytes="5BED1B00" />
-              <Patch Address="0x000C0054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x0007475E" OriginalBytes="01D00348" PatchedBytes="F8F789BE" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x0006D474" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060054220C0074220C0045990800ED980800687C1E0079530700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.530">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="528D1D9FA0371FEDD92548FC1E3695747BF637DB" HashPatched="552F56CB428A32063C292785B7EFA711D0AD1EC4">
-            <Patches>
-              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000C0054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x0007475E" OriginalBytes="01D00348" PatchedBytes="F8F789BE" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x0006D474" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060054220C0074220C0045990800ED980800687C1E0079530700" />
-              <Patch Address="0x00000138" OriginalBytes="409A1C00" PatchedBytes="A1111C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-    </TargetVersions>
-  </PatchDefinition>
-  <PatchDefinition Name="SecureBootHack-V2-EFIESP">
-    <TargetVersions>
-      <TargetVersion Description="10.0.10240.16384">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="240B7F0B6BC5CD923CBEAEE85DBBA1F240C96C3B" HashPatched="14EE38E1229C8D770493A09A8CDC6B044A694720">
-            <Patches>
-              <Patch Address="0x00065514" OriginalBytes="2DE930480DF1080B9BF7B6FAADF50B7D0023039304932C4B0DF1220040F206221B8800210024ADF820309CF76DF900238DF80830012305932149204802AB009305AB06AA9DF7A6F9002805DB059B012B02D19DF8083053BB08A800F037F80446002C24DB03AA04A908A800F097F80446039D002C04DA134B9C4214D1002412E0049B0095C6F794FA0446002C0BDB01238DF8083002AB0A4908480093012303229DF7BCF9044615B12846CFF74FF820460DF50B7D9BF76CFA" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2315604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C72604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B1C61060098E30A00847F0A00BD2E0800652E0800A47B0E0081D40600" />
-              <Patch Address="0x00000138" OriginalBytes="E5280C00" PatchedBytes="41FE0C00" />
-              <Patch Address="0x000733D8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x000285F8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000AC198" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x00001EBC" OriginalBytes="03D1" PatchedBytes="00BF" />
-              <Patch Address="0x00001EC2" OriginalBytes="6AF0DDFC" PatchedBytes="63F029BB" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10011.16384">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="240B7F0B6BC5CD923CBEAEE85DBBA1F240C96C3B" HashPatched="14EE38E1229C8D770493A09A8CDC6B044A694720">
-            <Patches>
-              <Patch Address="0x00065514" OriginalBytes="2DE930480DF1080B9BF7B6FAADF50B7D0023039304932C4B0DF1220040F206221B8800210024ADF820309CF76DF900238DF80830012305932149204802AB009305AB06AA9DF7A6F9002805DB059B012B02D19DF8083053BB08A800F037F80446002C24DB03AA04A908A800F097F80446039D002C04DA134B9C4214D1002412E0049B0095C6F794FA0446002C0BDB01238DF8083002AB0A4908480093012303229DF7BCF9044615B12846CFF74FF820460DF50B7D9BF76CFA" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2315604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C72604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B1C61060098E30A00847F0A00BD2E0800652E0800A47B0E0081D40600" />
-              <Patch Address="0x00000138" OriginalBytes="E5280C00" PatchedBytes="41FE0C00" />
-              <Patch Address="0x000733D8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x000285F8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000AC198" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x00001EBC" OriginalBytes="03D1" PatchedBytes="00BF" />
-              <Patch Address="0x00001EC2" OriginalBytes="6AF0DDFC" PatchedBytes="63F029BB" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.107">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B758EE117AEF2E6ED3DC6C0F07BC65CBCF944D6A" HashPatched="85CEB6E5D5258C1312E809BB73B3ACFA14CCA4EB">
-            <Patches>
-              <Patch Address="0x00068188" OriginalBytes="2DE930480DF1080BADF50A7D002303932D4B0DF1220040F206221B880021ADF8203099F737FB002304938DF80830012305932249204802AB009305AB06AA00249AF76CFB002805DB059B012B02D19DF8083063BB08A800F039F80446002C26DB03AA04A908A800F093F80446039D002C04DA144B9C4216D1002414E01048049B03220095C4F730F90446002C0BDB01238DF8083002AB094907480093012303229AF780FB044615B12846CEF7EDF820460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F22D5604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C12604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B908D060028120B0048120B00A187070049870700C4CF0E001DFF0600" />
-              <Patch Address="0x000710D4" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00028A04" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000AF828" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x00001EB6" OriginalBytes="03D1" PatchedBytes="00BF" />
-              <Patch Address="0x00001EBC" OriginalBytes="6DF02EFA" PatchedBytes="66F066B9" />
-              <Patch Address="0x00000138" OriginalBytes="178C0C00" PatchedBytes="67850C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15063.0">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\mobilestartup.efi" HashOriginal="1B6436EC18CB0FDF541CB382DA2CCD615E4379A6" HashPatched="456E632E8FA39D3820169E485573F221A2663FCE">
-            <Patches>
-              <Patch Address="0x0006D374" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F74DFA002305938DF80830012303932249204802AB009303AB06AA002495F720F9002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF732FA0446002C0BDB01238DF8083002AB0949074800930123032295F734F9044615B12846CCF7E1FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CDF06003C320C0084320C0045980800ED970800488C1E0079520700" />
-              <Patch Address="0x00000138" OriginalBytes="EFA81C00" PatchedBytes="C9791C00" />
-              <Patch Address="0x0002BC08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000C0E3C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x0007465E" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F0E6FA" PatchedBytes="6BF066B9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15063.297">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\mobilestartup.efi" HashOriginal="1B6436EC18CB0FDF541CB382DA2CCD615E4379A6" HashPatched="456E632E8FA39D3820169E485573F221A2663FCE">
-            <Patches>
-              <Patch Address="0x0002BC08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="EFA81C00" PatchedBytes="C9791C00" />
-              <Patch Address="0x000C0E3C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x0007465E" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F0E6FA" PatchedBytes="6BF066B9" />
-              <Patch Address="0x0006D374" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F74DFA002305938DF80830012303932249204802AB009303AB06AA002495F720F9002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF732FA0446002C0BDB01238DF8083002AB0949074800930123032295F734F9044615B12846CCF7E1FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CDF06003C320C0084320C0045980800ED970800488C1E0079520700" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.318">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="8E71D1F0255E8C71BDE6F8D3780C4827C244375B" HashPatched="619484E25618AFE34A651741921430520CF51DDD">
-            <Patches>
-              <Patch Address="0x000681A8" OriginalBytes="2DE930480DF1080BADF50A7D002303932D4B0DF1220040F206221B880021ADF8203099F727FB002304938DF80830012305932249204802AB009305AB06AA00249AF75CFB002805DB059B012B02D19DF8083063BB08A800F039F80446002C26DB03AA04A908A800F095F80446039D002C04DA144B9C4216D1002414E01048049B03220095C4F71AF90446002C0BDB01238DF8083002AB094907480093012303229AF770FB044615B12846CEF7EDF820460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F22D5604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C12604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BB08D060028120B0048120B00C58707006D870700C4CF0E0041FF0600" />
-              <Patch Address="0x00000138" OriginalBytes="DABE0C00" PatchedBytes="F8B80C00" />
-              <Patch Address="0x000710F8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00028A2C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000AF828" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x00001EB6" OriginalBytes="03D1" PatchedBytes="00BF" />
-              <Patch Address="0x00001EBC" OriginalBytes="6DF040FA" PatchedBytes="66F076B9" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.494">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B03EA0984975D4025960C87527E8760B58C504F3" HashPatched="ED4CE6DD96EF4FA440B6898EFD4AE9EB1025D10A">
-            <Patches>
-              <Patch Address="0x000681A8" OriginalBytes="2DE930480DF1080BADF50A7D002303932D4B0DF1220040F206221B880021ADF8203099F727FB002304938DF80830012305932249204802AB009305AB06AA00249AF75CFB002805DB059B012B02D19DF8083063BB08A800F039F80446002C26DB03AA04A908A800F095F80446039D002C04DA144B9C4216D1002414E01048049B03220095C4F71AF90446002C0BDB01238DF8083002AB094907480093012303229AF770FB044615B12846CEF7EDF820460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F22D5604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C12604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BB08D060028120B0048120B00C58707006D870700C4CF0E0041FF0600" />
-              <Patch Address="0x00000138" OriginalBytes="21730C00" PatchedBytes="3F6D0C00" />
-              <Patch Address="0x000710F8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
-              <Patch Address="0x00028A2C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000AF828" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x00001EB6" OriginalBytes="03D1" PatchedBytes="00BF" />
-              <Patch Address="0x00001EBC" OriginalBytes="6DF040FA" PatchedBytes="66F076B9" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.1">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\mobilestartup.efi" HashOriginal="F27A93F8E597B8C270E0308F4ED59245A0FAD534" HashPatched="034E15A4E8553337E617D167440EE7DD7E633467">
-            <Patches>
-              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="F0181C00" PatchedBytes="E0ED1B00" />
-              <Patch Address="0x000C1054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
-              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E0060054320C0074320C00D998080081980800488C1E000D530700" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.12">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="5A9B06CB5E49D8D8E062DDD3D7E3492144E85BB2" HashPatched="54BFB9319C2937FF6DB5BEAA3F7831DEB119B06B">
-            <Patches>
-              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000C1054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
-              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E0060054320C0074320C00D998080081980800488C1E000D530700" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x00000138" OriginalBytes="A2171C00" PatchedBytes="92EC1B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.124">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="8FDA31B9DE443ED718280CC190641EF33C2677B1" HashPatched="8B99B3E8219B96DA87C09AE745A5448E9E85CEFF">
-            <Patches>
-              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000C1054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
-              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E0060054320C0074320C00D998080081980800488C1E000D530700" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x00000138" OriginalBytes="9FB41C00" PatchedBytes="8F891C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.16">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="05598D2CCE248D56DC61175F97D64849F82AE09D" HashPatched="AB679BC7D8A2944587CE552100CF3CADFD5CD93A">
-            <Patches>
-              <Patch Address="0x0002BBC8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="904C1C00" PatchedBytes="50211C00" />
-              <Patch Address="0x000C103C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746CA" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F01CFB" PatchedBytes="6BF09CB9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x0006D3E0" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F717FA002305938DF80830012303932249204802AB009303AB06AA002495F7EAF8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7D6F90446002C0BDB01238DF8083002AB0949074800930123032295F7FEF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BE8DF06003C320C0084320C0015990800BD980800488C1E00E5520700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.158">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="AAFE7C3D97921BDA6C48C4AEDA4FFA966EFFE1FA" HashPatched="1B9860D14CAD17957B9E853F5E67660C4B521D77">
-            <Patches>
-              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="E34D1C00" PatchedBytes="CB221C00" />
-              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E006003C320C0084320C00D998080081980800488C1E000D530700" />
-              <Patch Address="0x000C103C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.158 (dev)">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E832131801F6BCEED764098B73A5DA7F53AAEBA1" HashPatched="40C1CC59F2DA738501E6373AAA430F085C5B9DD6">
-            <Patches>
-              <Patch Address="0x0002BBC8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="C1A61C00" PatchedBytes="4D7B1C00" />
-              <Patch Address="0x0006D3E0" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F717FA002305938DF80830012303932249204802AB009303AB06AA002495F7EAF8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7D6F90446002C0BDB01238DF8083002AB0949074800930123032295F7FEF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BE8DF060048320C0090320C0015990800BD980800FC8B1E00E5520700" />
-              <Patch Address="0x000C1048" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746CA" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F01CFB" PatchedBytes="6BF09CB9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.490">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="ACC23258B4B96209ADCFCC8183CEF12F5E93A0E6" HashPatched="4344BADBBA3D4BC61EEB2DC5F74DB974FA4F0F33">
-            <Patches>
-              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="17BE1C00" PatchedBytes="AB951C00" />
-              <Patch Address="0x000C1060" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x0007475E" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F066FB" PatchedBytes="6BF0E6B9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x0006D474" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060060320C0080320C0045990800ED980800888C1E0079530700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.527">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E1CDC15B381A874DBAA94BA734C78A6ED801F66A" HashPatched="9A69D3A34F39A5809B57CEA7547E7869D815C311">
-            <Patches>
-              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x0006D474" OriginalBytes="2DE93048" PatchedBytes="00207047" />
-              <Patch Address="0x000C0054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x0007475E" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F066FB" PatchedBytes="6BF0E6B9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x0006D478" OriginalBytes="0DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="78462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060054220C0074220C0045990800ED980800687C1E0079530700" />
-              <Patch Address="0x00000138" OriginalBytes="FA751C00" PatchedBytes="561D1C00" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E1CDC15B381A874DBAA94BA734C78A6ED801F66A" HashPatched="CF9F940D28BE4181998EF7D4B9AF5AE3AE63815B">
-                <Patches>
-                  <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-                  <Patch Address="0x00000138" OriginalBytes="FA751C00" PatchedBytes="2BE21B00" />
-                  <Patch Address="0x000C0054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-                  <Patch Address="0x0007475E" OriginalBytes="01D00348" PatchedBytes="F8F789BE" />
-                  <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-                  <Patch Address="0x0006D474" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060054220C0074220C0045990800ED980800687C1E0079530700" />
-                  <Patch Address="0x000020A8" OriginalBytes="72F066FB" PatchedBytes="6EF03AF0" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.530">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="528D1D9FA0371FEDD92548FC1E3695747BF637DB" HashPatched="DCE68DE966071F38A28C44D95AE66F2FADBB349D">
-            <Patches>
-              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x0006D474" OriginalBytes="2DE93048" PatchedBytes="00207047" />
-              <Patch Address="0x000C0054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x0007475E" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F066FB" PatchedBytes="6BF0E6B9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x0006D478" OriginalBytes="0DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="78462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060054220C0074220C0045990800ED980800687C1E0079530700" />
-              <Patch Address="0x00000138" OriginalBytes="409A1C00" PatchedBytes="9C411C00" />
-            </Patches>
-            <Obsolete>
-              <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="528D1D9FA0371FEDD92548FC1E3695747BF637DB" HashPatched="E5B736B0382AC3712C7BA3FF387A4055F2D5C09A">
-                <Patches>
-                  <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-                  <Patch Address="0x000C0054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-                  <Patch Address="0x0007475E" OriginalBytes="01D00348" PatchedBytes="F8F789BE" />
-                  <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-                  <Patch Address="0x0006D474" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060054220C0074220C0045990800ED980800687C1E0079530700" />
-                  <Patch Address="0x00000138" OriginalBytes="409A1C00" PatchedBytes="71061C00" />
-                  <Patch Address="0x000020A8" OriginalBytes="72F066FB" PatchedBytes="6EF03AF0" />
-                </Patches>
-                <Obsolete />
-              </TargetFile>
-            </Obsolete>
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.538">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="3045E7B081960E0615AC876E34AABF0A4A5CAC41" HashPatched="733758AF398852A31B9F07C65CCC2305C924F97F">
-            <Patches>
-              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
-              <Patch Address="0x000BFE54" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746D6" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F022FB" PatchedBytes="6BF0A2B9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x0006D3F0" OriginalBytes="0DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F711FA002305938DF80830012303932249204802AB009303AB06AA002495F7E4F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF70CFA0446002C0BDB01238DF8083002AB0949074800930123032295F7F8F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="78462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BF4DF060054220C0074220C00BD98080065980800687C1E00F1520700" />
-              <Patch Address="0x00000138" OriginalBytes="93731C00" PatchedBytes="BF171C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.541">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="F92F5A3E9379DB70CB7F20C751571A4AD53C746F" HashPatched="961376A7C671EEA02A2E9F348FB5A5D1A9348206">
-            <Patches>
-              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
-              <Patch Address="0x000BFE54" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746D6" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F022FB" PatchedBytes="6BF0A2B9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x0006D3F0" OriginalBytes="0DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F711FA002305938DF80830012303932249204802AB009303AB06AA002495F7E4F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF70CFA0446002C0BDB01238DF8083002AB0949074800930123032295F7F8F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="78462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BF4DF060054220C0074220C00BD98080065980800687C1E00F1520700" />
-              <Patch Address="0x00000138" OriginalBytes="07E31B00" PatchedBytes="32871C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.544">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E57366397EFF615272D5996BFCA68F89566032B6" HashPatched="2AACA16ADB000B8A80D24BBB4808423877DF5F36">
-            <Patches>
-              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
-              <Patch Address="0x000BFE54" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746D6" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F022FB" PatchedBytes="6BF0A2B9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x0006D3F0" OriginalBytes="0DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F711FA002305938DF80830012303932249204802AB009303AB06AA002495F7E4F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF70CFA0446002C0BDB01238DF8083002AB0949074800930123032295F7F8F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="78462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BF4DF060054220C0074220C00BD98080065980800687C1E00F1520700" />
-              <Patch Address="0x00000138" OriginalBytes="35111C00" PatchedBytes="60B51C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.547">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="31CF8F2ECBBB0FC4F5FA56919D7A13CAAA9A8C27" HashPatched="D6D520A854C8C448BF63509F558C9DD4A198165E">
-            <Patches>
-              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
-              <Patch Address="0x000BFE54" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x000746D6" OriginalBytes="01D0" PatchedBytes="01E0" />
-              <Patch Address="0x000020A8" OriginalBytes="72F022FB" PatchedBytes="6BF0A2B9" />
-              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
-              <Patch Address="0x0006D3F0" OriginalBytes="0DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F711FA002305938DF80830012303932249204802AB009303AB06AA002495F7E4F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF70CFA0446002C0BDB01238DF8083002AB0949074800930123032295F7F8F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="78462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BF4DF060054220C0074220C00BD98080065980800687C1E00F1520700" />
-              <Patch Address="0x00000138" OriginalBytes="E31B1C00" PatchedBytes="0FC01B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.603">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="D6D520A854C8C448BF63509F558C9DD4A198165E" HashPatched="B1AEF01E2CC9BDEC1FE187A04BFAB8FAC2CAC152">
-            <Patches>
-              <Patch Address="0x0002B89C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x000BBE10" OriginalBytes="42006F00" PatchedBytes="00207047" />
-              <Patch Address="0x00000000" OriginalBytes="4D5A90000300000004000000FFFF0000B8000000000000004000000000000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
-              <Patch Address="0x0000187A" OriginalBytes="02DB" PatchedBytes="00BF" />
-              <Patch Address="0x000746F0" OriginalBytes="2DE93C48" PatchedBytes="48F091BF" />
-              <Patch Address="0x00002040" OriginalBytes="2DE9FF48" PatchedBytes="01207047" />
-              <Patch Address="0x000BBE16" OriginalBytes="74004400650062007500670050006F006C006900630079004100700070006C00690065006400000000002E00620069006E002E007000370000005C004400650062007500670050006F006C00690063006900650073005C00000030003100320033003400350036003700380039004100420043004400450046005C00570069006E0064006F00770073005C00530079007300740065006D00330032005C0062006F006F0074005C00750069005C0062006F006F00" PatchedBytes="78462549A0EB010070B481B004464FF0000304EB0300214B04EB030103220023009343F2812604EB0605A8471C4904EB0105A8470646012E04D00120194904EB0105A847184804EB00010968D1F8AC500DA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460D4904EB0105A8470D4E04EB0605A8470C4E04EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B18E20B0074220C00BD98080065980800687C1E00F1520700F5520700" />
-              <Patch Address="0x00000138" OriginalBytes="0FC01B00" PatchedBytes="ABB31C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-    </TargetVersions>
-  </PatchDefinition>
-  <PatchDefinition Name="SecureBootHack-MainOS">
-    <TargetVersions>
-      <TargetVersion Description="8.10.12393.890">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="F2FCA692D0C19EC2959FB359F4E74C909C25B580" HashPatched="DE3CE0CDB56799CFE25E7CFE3BE88386692260E8">
-            <Patches>
-              <Patch Address="0x00031E08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="FF300C00" PatchedBytes="515F0C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="6CA9F655E5E915940CF5C2E77DE21E168546ABF9" HashPatched="50CA755BF3FDCC84E3733C0BA484692E3FA48D85">
-            <Patches>
-              <Patch Address="0x00017744" OriginalBytes="1BD1" PatchedBytes="1BE0" />
-              <Patch Address="0x00000160" OriginalBytes="F8310700" PatchedBytes="F8400700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.14226.359">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="CDF52B4E5B1AE19DB8F82E17FEC3103A96AABD68" HashPatched="06900D98165277F6E634D077EA471A3DF4035F7E">
-            <Patches>
-              <Patch Address="0x000179FC" OriginalBytes="1BD1" PatchedBytes="1BE0" />
-              <Patch Address="0x00000158" OriginalBytes="A8110700" PatchedBytes="A8200700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="645AF4B8ADD284B963CDA154952BA95FC7581756" HashPatched="4F9ADDC2CF919DDC9AB75358CC02D06006F2B2DB">
-            <Patches>
-              <Patch Address="0x00033154" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="01FB0B00" PatchedBytes="53290C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.12397.895">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="68561A15A7602E154118106B4F82E10347127108" HashPatched="7AF30A2016C373815D07107B3EA23E1DEAAECE83">
-            <Patches>
-              <Patch Address="0x00000160" OriginalBytes="C3660700" PatchedBytes="C3750700" />
-              <Patch Address="0x00017744" OriginalBytes="1BD1" PatchedBytes="1BE0" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="55CEF7353D552C5A00CAFF1222DCCF59E91E45AF" HashPatched="C96E318317B9DF27E31E23B843E65B586B28F7D9">
-            <Patches>
-              <Patch Address="0x00031E08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="27B80B00" PatchedBytes="79E60B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.14219.341">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="9B8893CD83395DF364C133F4C3A3F0E06EDACF71" HashPatched="BDAE68D1EDAF3A8858FAD2FA1754D715F5880A3A">
-            <Patches>
-              <Patch Address="0x00033154" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="9E090C00" PatchedBytes="F0370C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="58DF171931D400CBCBC39B882BA90DBBEA66AE0C" HashPatched="D707FE83A5E4125FA9F8EC0A383C1B7914B23C9D">
-            <Patches>
-              <Patch Address="0x000179FC" OriginalBytes="1BD1" PatchedBytes="1BE0" />
-              <Patch Address="0x00000158" OriginalBytes="AB8E0700" PatchedBytes="AB9D0700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.14234.375">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="7DCFEF1113E9D2C648B857FD125857EC35C8EFFE" HashPatched="02439F74011547EC219289565779DF362D912143">
-            <Patches>
-              <Patch Address="0x000331C4" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="6A550C00" PatchedBytes="BC830C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="7CA951F4A580C923D12FB09B2EEBD35E2F6BE8A5" HashPatched="F05FE96FB9952B57BC1C3079258202858578732D">
-            <Patches>
-              <Patch Address="0x000179FC" OriginalBytes="1BD1" PatchedBytes="1BE0" />
-              <Patch Address="0x00000158" OriginalBytes="3E6A0700" PatchedBytes="3E790700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.20.10512.11662">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="0E47E65A4637B42377B596BEA4CEDF6D4BF31759" HashPatched="05F1FE52B533919F7E75B7463F85ADDD3F18A43B">
-            <Patches>
-              <Patch Address="0x00037DF0" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="58F80D00" PatchedBytes="AA260E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="81BFEFAEF2C19AA7D2A6646CB28EB1EB4C2503B2" HashPatched="27D8291CE48BA7940353C39053729A913E439CB0">
-            <Patches>
-              <Patch Address="0x00023332" OriginalBytes="03D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000148" OriginalBytes="ADFC0700" PatchedBytes="AAEB0700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.15116.125">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="C89EF734F4F0311611213A29580C2A37B2593515" HashPatched="94F53D72CB5A8E034499C8409AE74D4161E42869">
-            <Patches>
-              <Patch Address="0x000331E4" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="67330C00" PatchedBytes="B9610C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="D794925B765F003A15B0E6CAEF8FF09D6EDDD4BF" HashPatched="12598F09227A9E7E84C387E95CDC45BAE33F557C">
-            <Patches>
-              <Patch Address="0x000179FC" OriginalBytes="1BD1" PatchedBytes="1BE0" />
-              <Patch Address="0x00000158" OriginalBytes="8FBA0700" PatchedBytes="90C90600" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.10.15148.160">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="B1E146072BEBA015F4E5B11D6E1AAE6FAAF5604D" HashPatched="CC60CA05DEC74A0A322611EF4D38E44845CC802D">
-            <Patches>
-              <Patch Address="0x000331E4" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="3CFA0B00" PatchedBytes="8E280C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="BEAFABF57D04BE378986A6BA571A61A70D5537EA" HashPatched="651E347F14D31BAAC1D355F462701E9814CD2868">
-            <Patches>
-              <Patch Address="0x000179FC" OriginalBytes="1BD1" PatchedBytes="1BE0" />
-              <Patch Address="0x00000158" OriginalBytes="A4BE0700" PatchedBytes="A5CD0600" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.20.10536.11738">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="232050781A534BF8319CF229A37B95F2C8EB6FBD" HashPatched="FC47972E284B4AFB300924AE472994693CA5C824">
-            <Patches>
-              <Patch Address="0x00037ED8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="4EFE0D00" PatchedBytes="A02C0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="1522F06B5EF3A7769615BB51A59EAD5540AFABAA" HashPatched="224F8ABEAA5E71EBDE8F18937A6F0E90526C1A0B">
-            <Patches>
-              <Patch Address="0x0002368A" OriginalBytes="03D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000148" OriginalBytes="5F8B0800" PatchedBytes="5C7A0800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="8.20.10549.11796">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="90B26672C9806DBFCCFCE0085B2C3D92A366B14E" HashPatched="0151806CF0314D8ED0577F941E33FEBC2358D188">
-            <Patches>
-              <Patch Address="0x000246C6" OriginalBytes="03D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000148" OriginalBytes="3E490800" PatchedBytes="3B380800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="AD0A224733F62E7F8F802137164B36EFB0068A4C" HashPatched="2D97E9B80B4BF141F4ABF8B5AE012BEF8F4E0913">
-            <Patches>
-              <Patch Address="0x0003806C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="982F0E00" PatchedBytes="EA5D0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10581.0">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="3FE684EDAD2AE989012FA3F8078F528F02529A9B" HashPatched="F44FE6563F4AC65D2EA438A54D5C0013A944DD68">
-            <Patches>
-              <Patch Address="0x00038238" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="DD400E00" PatchedBytes="2F6F0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="3EC8AB84C1638DF94C9146572C7D17CB9B55AE7D" HashPatched="FF3160175FF4DC7BF364AC5B48D35C48911C3762">
-            <Patches>
-              <Patch Address="0x000246D0" OriginalBytes="03D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000150" OriginalBytes="31360800" PatchedBytes="2E250800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.11">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="1CB8D4153A73587CC74E18B4D51DE3743279BC7C" HashPatched="4821BC03E71786C1B3EB4839AAF4F2580E30218E">
-            <Patches>
-              <Patch Address="0x000246D0" OriginalBytes="03D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000150" OriginalBytes="46030800" PatchedBytes="43F20700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="A8760251B988E6A6E0801F4DAEA146157BC5EDD9" HashPatched="60F428961F43B3FD4D4978AD3494091A05F415BE">
-            <Patches>
-              <Patch Address="0x00038238" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="5B600E00" PatchedBytes="AD8E0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.36">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="7E20DFB140AE76BA6E662951B69149882286CE82" HashPatched="85CB18F49D5A26B2BEDAD9B98406722AB73F0A38">
-            <Patches>
-              <Patch Address="0x00038238" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="23F50D00" PatchedBytes="75230E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="D69BF791B630B37A501195C0D31AAB53B6F780DF" HashPatched="D5A0364EBEF985497E0F7A8357244473B7F16B3F">
-            <Patches>
-              <Patch Address="0x000246D0" OriginalBytes="03D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000150" OriginalBytes="B0560800" PatchedBytes="AD450800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10240.16384">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="50100B83CB85A0AEEBD7B70F87360513C1B7E255" HashPatched="37B955E6FFDB685CC9176BE7BBF712C02BA2CF2B">
-            <Patches>
-              <Patch Address="0x00037E1C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="7C330E00" PatchedBytes="CE610E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="5738D592BDA3AB98FFB5F7C8018EA19CA2B644C3" HashPatched="4139D22AAAC3A8F66C377D0C022142E20DF60154">
-            <Patches>
-              <Patch Address="0x000244A4" OriginalBytes="14D1" PatchedBytes="14E0" />
-              <Patch Address="0x00000148" OriginalBytes="04AF0800" PatchedBytes="04BE0800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.107">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="4BFA0126D68CA3BBE7D20A32A7D0A1AE45858868" HashPatched="3A9372CF6E8220E8BAB859E3107AEB07D33FA7E6">
-            <Patches>
-              <Patch Address="0x00038240" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="19670E00" PatchedBytes="6B950E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="0070BBA39146E686F1199216BBBBDB94732180E5" HashPatched="FA09FC97CA4E69F688714C9FF1F10FA3AEA40998">
-            <Patches>
-              <Patch Address="0x000246D0" OriginalBytes="03D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000150" OriginalBytes="BE4E0800" PatchedBytes="BB3D0800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15063.0">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="20AD352146BF2A76BC40EF3A00FDD0916E92454E" HashPatched="4767EDA7A0F733884AD9C6C5F1BD298FD0D74C07">
-            <Patches>
-              <Patch Address="0x0003B840" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="29380F00" PatchedBytes="7C660E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="72FCAD1A65D45AD5EFD3D15A97C4E8DA6AAE08C4" HashPatched="7A572A445BA1DD9648AB5BB78DE95AF6CC37F9C0">
-            <Patches>
-              <Patch Address="0x0002778A" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="BAD50800" PatchedBytes="B5C40800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15063.297">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="DFEDABC8D3CF8B8CE8096D6B47D609D4E7CB656D" HashPatched="82AD59AADBD63B33F083F86DE69984E5CE883BF8">
-            <Patches>
-              <Patch Address="0x0003B840" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="E3BC0E00" PatchedBytes="35EB0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="3B122508AF22D8A3F9CDC41403829A97FD874D2E" HashPatched="F09BA795399EFA9CA089FD75A0ACBA3DCDDE99E9">
-            <Patches>
-              <Patch Address="0x000277A6" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="F4CE0800" PatchedBytes="EFBD0800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.318">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="366CA6871AB160235B8561DC982AECFF521D34CF" HashPatched="AE6C5D1FC79CB6AFAC7D2FC5616AC27A4DBA497A">
-            <Patches>
-              <Patch Address="0x000246D0" OriginalBytes="03D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000150" OriginalBytes="1EBA0800" PatchedBytes="1BA90800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="5788066FAC5392667EC5A8E811DD846D29C46E5C" HashPatched="53E704F18FD8EA9867B05D4584A20C377889B444">
-            <Patches>
-              <Patch Address="0x00038268" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="0F680E00" PatchedBytes="61960E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.10586.494">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="7DC34F6EB8853D6C297EA2A540A8FE976361ED61" HashPatched="142E95E4F75A3CBC92A7A34ABED2C987295F9A7C">
-            <Patches>
-              <Patch Address="0x000246D0" OriginalBytes="03D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000150" OriginalBytes="53D70700" PatchedBytes="50C60700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="6AAB5EAFAFB3A4E42F46088AFA49BFB1C536FF52" HashPatched="4DF7C792B74383DA588BF491CE5FBE55E79EE109">
-            <Patches>
-              <Patch Address="0x00038268" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="8AA10E00" PatchedBytes="DCCF0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.1">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="ECEAD0A4ADFB12E8D1F0EDA99D0123A1CAB30F13" HashPatched="5B24C7B04EF513F10B6BA640D48BF62572E7B46E">
-            <Patches>
-              <Patch Address="0x0003B864" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="E1D80E00" PatchedBytes="33070F00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="F53A6CB5A3AC514713698418477931BF026133FD" HashPatched="DEC1EB1D041FD5319F84C09110F497CCC0B913DF">
-            <Patches>
-              <Patch Address="0x000277A6" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="4E680800" PatchedBytes="49570800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.12">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="8E109BA37D4A75E485020887DEFF60E535636E72" HashPatched="94E202427D7C418B210A3C1FE28D6882ED986E1C">
-            <Patches>
-              <Patch Address="0x0003B864" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="80BF0E00" PatchedBytes="D2ED0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="58F006F79181E829776AABC4BEF14CD7D9CE0778" HashPatched="BE8D1C1335065DAD36DFA1127CF92CCADD680DF6">
-            <Patches>
-              <Patch Address="0x000277CA" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="F6D50800" PatchedBytes="F1C40800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.124">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="022CC98868AC37AA1FFD57C57F6C54EBB9C9CBFC" HashPatched="C2AC17AFAC3EBEAFFC7AFE387243513157DDD290">
-            <Patches>
-              <Patch Address="0x0003B864" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="8E870E00" PatchedBytes="E0B50E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="A8CCC8BB6F5CF5DC228255F7D749BC4192A3101D" HashPatched="57935FE74AF60B1B362DE3DF0DB9225713EFDCE7">
-            <Patches>
-              <Patch Address="0x000277CA" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="5AF10800" PatchedBytes="55E00800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.16">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="C9F2940FD1F33441044A28BE8FF1661A7B88CF3D" HashPatched="065AEFA9D6D38E212C324D81FA232558CD833B56">
-            <Patches>
-              <Patch Address="0x0003B8D4" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="F2940E00" PatchedBytes="44C30E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="7046EEB09404C9075D848F45B7A7B9FF4D7D638D" HashPatched="418694F43528598F22E91757AAF760E861E3046B">
-            <Patches>
-              <Patch Address="0x0002695E" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="F3820800" PatchedBytes="EE710800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="6.3.9651.0">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="15F1C59216D6FFD774DBE4D2AED12B7F0064754D" HashPatched="7CAD397F673550DB3CB77EBBC83206915BF49895">
-            <Patches>
-              <Patch Address="0x00031E08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="D3660C00" PatchedBytes="26950B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="741AE3C9B8F8A21E5CB6C492EF7C5592D6AEE22D" HashPatched="7B473C6EB6C09D2217AD778A7AD0F85268C6CDB9">
-            <Patches>
-              <Patch Address="0x0005662C" OriginalBytes="1BD1" PatchedBytes="1BE0" />
-              <Patch Address="0x00000168" OriginalBytes="672B0700" PatchedBytes="673A0700" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.158">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="90F8C735F50559139845D703AD5D40E66659DBFD" HashPatched="6A9573472E16498BDC73BE9A0A9F521F0A73545B">
-            <Patches>
-              <Patch Address="0x0003B864" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="98790E00" PatchedBytes="EAA70E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="226C3C32A82A389536337BF0BBB0AA56FCE2BE5C" HashPatched="4E5C350609DCB8E80EB509C3F0CAB9522D68FFD0">
-            <Patches>
-              <Patch Address="0x000277CA" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="91170900" PatchedBytes="8C060900" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.158 (dev)">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="3330E6E408BEAA64C33D750BD2512495B6DA15CB" HashPatched="28C1B016861A160B093F7CF9DFAECCC0F38415DD">
-            <Patches>
-              <Patch Address="0x0003B8D4" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="E37F0E00" PatchedBytes="35AE0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="5B900D4F9F5E714137893E71053BBDDD15195382" HashPatched="447A1976F168115CD42ADB41A2D1F52A67D015C1">
-            <Patches>
-              <Patch Address="0x0002695E" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="17220900" PatchedBytes="12110900" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="6.3.9600.16384 (RT)">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="8409A581AEEBE5C68267313DF5859EF2ED1960CC" HashPatched="0D9EDB8D207A4A40C0AAB42626CB57C8D9AE6AAD">
-            <Patches>
-              <Patch Address="0x00031DE0" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="7D8C0C00" PatchedBytes="D0BA0B00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="55AC3B7020CB67CB52768A8908AA0C95AAC65311" HashPatched="47915402E6FEFE0B9FCD28AC45862E98B74C3266">
-            <Patches>
-              <Patch Address="0x000148E0" OriginalBytes="1BD1" PatchedBytes="1BE0" />
-              <Patch Address="0x00000150" OriginalBytes="E9710600" PatchedBytes="E9800600" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15035.0 (RT)">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="E055A983FCCF4AB5BE7497908FC33CD1C0E490AD" HashPatched="BF8813252FB79AABDE92380913BCA8EC20E37680">
-            <Patches>
-              <Patch Address="0x0003B6C8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="EE000F00" PatchedBytes="402F0F00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="E65A425434CF37539CEE3FCB10FF71178493A0A5" HashPatched="3ACBDFE4FCDE80AAFF486E10F1DF20895412BB8F">
-            <Patches>
-              <Patch Address="0x0002660E" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="E9C30800" PatchedBytes="E4B20800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="6.3.9600.17031 (RT)">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="3AD6D6D32AC01839396114194E89828B5427CB99" HashPatched="D400FC6C1C3C7755A523DAD7BD7738C5DE7CA6BF">
-            <Patches>
-              <Patch Address="0x000330B0" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000138" OriginalBytes="3A0E0C00" PatchedBytes="8C3C0C00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="934BB7107C5F0AA7055698A401693525906F59C5" HashPatched="F9A561093A0B0827B01BD0D0035F33956B5D39C4">
-            <Patches>
-              <Patch Address="0x00014ED4" OriginalBytes="1BD1" PatchedBytes="1BE0" />
-              <Patch Address="0x00000148" OriginalBytes="B9930600" PatchedBytes="B9A20600" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.490">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="E21BE2AFB39FF036F82319DEDB3109AB5F7937B8" HashPatched="BF1ED3B8B7B69AB6C76230199439C7D3E59C6C7C">
-            <Patches>
-              <Patch Address="0x0003B9FC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="5C710E00" PatchedBytes="AE9F0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="82F35A23B89619BF68B2D5B097D7C9B7171F78C1" HashPatched="C754F181E4E5588B0C63A964738388863B4E6223">
-            <Patches>
-              <Patch Address="0x00027966" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="15C10800" PatchedBytes="10B00800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.14393.1066">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="D356F1ABB70C671485CCC4A549B9A44D6461766A" HashPatched="07CDFD98D4A081B0D3C86C93AD61C6A2B2C86B19">
-            <Patches>
-              <Patch Address="0x00039F98" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000130" OriginalBytes="D9100F00" PatchedBytes="2C3F0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="3D416616D9F52ABA4018BEE3E5186E74085DA4A2" HashPatched="D08858B580B9AFF901E035142DDF126B36DB0176">
-            <Patches>
-              <Patch Address="0x000289AA" OriginalBytes="03D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000150" OriginalBytes="956D0800" PatchedBytes="6B2C0800" />
-              <Patch Address="0x00028CB4" OriginalBytes="0ED1" PatchedBytes="00BF" />
-              <Patch Address="0x00028CBE" OriginalBytes="09D1" PatchedBytes="00BF" />
-              <Patch Address="0x00028CC6" OriginalBytes="05D1" PatchedBytes="00BF" />
-              <Patch Address="0x00028CCE" OriginalBytes="0BB9" PatchedBytes="00BF" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.527">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="6240D0E3856F58C4F4D09F98428917D242090295" HashPatched="A3D734FBD88BB58458306EB8D12C4EB1E7F70A8C">
-            <Patches>
-              <Patch Address="0x0003B9FC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="EC700E00" PatchedBytes="3E9F0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="9E39441EBF8EA45772996522D47CFDEBB084F4C6" HashPatched="11A1F703759D2745C04D5B49E77619C272C7D597">
-            <Patches>
-              <Patch Address="0x00027966" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="3D340900" PatchedBytes="38230900" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.530">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="02DE2622AC8BFEC9E04198F83A3CDCD9BD776A99" HashPatched="DA13484E5D4BBF905482F956C7CEA3004D9998CB">
-            <Patches>
-              <Patch Address="0x0003B9FC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="7D080F00" PatchedBytes="CF360F00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="0F5BE73F5127BE59E1EB5C6740D170D11C71845C" HashPatched="8C5A634336BA9FDB5DF6C969420893AACB2081BC">
-            <Patches>
-              <Patch Address="0x00027982" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="ED9D0800" PatchedBytes="E88C0800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.538">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="BCDB4CD1430EB2EBA8BFEF8B9AD1C73E28F8487D" HashPatched="C137023A2DD71ED4EF0E51DF6B21146A71F9B91C">
-            <Patches>
-              <Patch Address="0x0003B93C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="EA7C0E00" PatchedBytes="3CAB0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="A542346445706983172A39E7F949DB5A8B4FAAEB" HashPatched="74CA4E52D5C28E0BD125C95286563F1D7FE3A576">
-            <Patches>
-              <Patch Address="0x00027982" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="7C7F0800" PatchedBytes="776E0800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.541">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="86F7A8313F58817E3B2C514117305E0A420196DA" HashPatched="6F6864D6D723B59C2897416226BF4205CD714812">
-            <Patches>
-              <Patch Address="0x0003B93C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="E1D90E00" PatchedBytes="33080F00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="4E9EB0FEF44600FDF473613D97EBF50F7D7920BB" HashPatched="AC79636470563D6DAE2AF801D9E0BF4205A67F6C">
-            <Patches>
-              <Patch Address="0x00027982" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="18770800" PatchedBytes="13660800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.544">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="87D3A29ED9A1B39D56E117E39AB7657F14ACFBAD" HashPatched="052EDA9DB6CF15DCFD4180A697F229BA0A3BE19D">
-            <Patches>
-              <Patch Address="0x0003B93C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="98540F00" PatchedBytes="EB820E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="8FF484526D9787AB3A958CB27764F5BF1678AAC2" HashPatched="29A0B9C7EE90A70B36FD36ACAA37C4D3BB57C714">
-            <Patches>
-              <Patch Address="0x00027982" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="3A2B0900" PatchedBytes="351A0900" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.547">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="7852058D6ADE85637F9C839DEA3B5896570102A3" HashPatched="F048EB95F7C9CA17C3759ED0A546F528C3E90934">
-            <Patches>
-              <Patch Address="0x0003B93C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000148" OriginalBytes="925E0F00" PatchedBytes="E58C0E00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="35F07B2B604BCCE7C5A4D418F8A464971AFCB045" HashPatched="1710AFCF7A68CF4D9AB91A26E4C023454D2CEBD3">
-            <Patches>
-              <Patch Address="0x00027982" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="0D830800" PatchedBytes="08720800" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-      <TargetVersion Description="10.0.15254.603">
-        <TargetFiles>
-          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="1CE9F1CBB7005126A75BD71DF7A0C7E1815EAC95" HashPatched="3661779E6A719FE43BF23E31277465167846DAB5">
-            <Patches>
-              <Patch Address="0x0003B964" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
-              <Patch Address="0x00000140" OriginalBytes="55FF0E00" PatchedBytes="A72D0F00" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="2A6790613C64FBC5A1FE876DC35F272652E0228F" HashPatched="7F28E5B37EABA758D56865D334D0420D1C33A228">
-            <Patches>
-              <Patch Address="0x000279C2" OriginalBytes="05D0" PatchedBytes="00BF" />
-              <Patch Address="0x00000158" OriginalBytes="031E0900" PatchedBytes="FE0C0900" />
-            </Patches>
-            <Obsolete />
-          </TargetFile>
-        </TargetFiles>
-      </TargetVersion>
-    </TargetVersions>
-  </PatchDefinition>
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright(c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files(the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and / or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<PatchDefinitions>
+  <PatchDefinition Name="RootAccess-MainOS">
+    <TargetVersions>
+      <TargetVersion Description="8.10.12393.890">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="72AB4E2ABC6BD2E72C5F0C36DE290AA50A1359A3" HashPatched="71D3DC3185B91583137C9527013873ECD1415D3B">
+            <Patches>
+              <Patch Address="0x0023F0C4" OriginalBytes="33F0D1AA" PatchedBytes="F3F0D1BA" />
+              <Patch Address="0x00000160" OriginalBytes="9E3C5100" PatchedBytes="BFCD5000" />
+              <Patch Address="0x0002BCEA" OriginalBytes="01D1" PatchedBytes="00BF" />
+              <Patch Address="0x0002BD3C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+              <Patch Address="0x0002C28E" OriginalBytes="04D1" PatchedBytes="04E0" />
+              <Patch Address="0x0002C2B0" OriginalBytes="05D1" PatchedBytes="05E0" />
+              <Patch Address="0x0002C6E8" OriginalBytes="14B9" PatchedBytes="02E0" />
+              <Patch Address="0x0002C81A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+              <Patch Address="0x0002C8FE" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x0002C92E" OriginalBytes="08B9" PatchedBytes="01E0" />
+              <Patch Address="0x002D2248" OriginalBytes="22B9" PatchedBytes="04E0" />
+              <Patch Address="0x002D2710" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+              <Patch Address="0x002D2788" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+              <Patch Address="0x0018AEF0" OriginalBytes="EBB9" PatchedBytes="00BF" />
+              <Patch Address="0x00045C48" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+              <Patch Address="0x00222E44" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x00044C18" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x000C1470" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0014930C" OriginalBytes="BAF1" PatchedBytes="85E7" />
+              <Patch Address="0x001493BC" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00149440" OriginalBytes="BDD1" PatchedBytes="00BF" />
+              <Patch Address="0x0014947E" OriginalBytes="9ED1" PatchedBytes="00BF" />
+              <Patch Address="0x0014954E" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0014958A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+              <Patch Address="0x001495C8" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+              <Patch Address="0x0014921E" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+              <Patch Address="0x00046480" OriginalBytes="5CD1" PatchedBytes="00BF" />
+              <Patch Address="0x000464A0" OriginalBytes="4CD1" PatchedBytes="00BF" />
+              <Patch Address="0x000465A6" OriginalBytes="C9D1" PatchedBytes="00BF" />
+              <Patch Address="0x00103BE6" OriginalBytes="BEF1007F" PatchedBytes="42F764BC" />
+              <Patch Address="0x000464BA" OriginalBytes="40D0" PatchedBytes="00BF" />
+              <Patch Address="0x00046642" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+              <Patch Address="0x000467CA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+              <Patch Address="0x00123EC8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000C1516" OriginalBytes="22F0B6A4" PatchedBytes="AFF30080" />
+              <Patch Address="0x000C151C" OriginalBytes="22F0AAA4" PatchedBytes="AFF30080" />
+              <Patch Address="0x000C14A4" OriginalBytes="02D1" PatchedBytes="00BF" />
+              <Patch Address="0x00103C6A" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x00103C78" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x00103D16" OriginalBytes="02F4CCA3" PatchedBytes="42F7CCBB" />
+              <Patch Address="0x00123DD0" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x00123E2E" OriginalBytes="0BD0" PatchedBytes="11E0" />
+              <Patch Address="0x0023F1C6" OriginalBytes="D3D0" PatchedBytes="D3E7" />
+              <Patch Address="0x0023F1D0" OriginalBytes="73F0FAA9" PatchedBytes="AFF30080" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="72AB4E2ABC6BD2E72C5F0C36DE290AA50A1359A3" HashPatched="417E48E9334B0A62B7259786DF1F62B43C22C61C">
+                <Patches>
+                  <Patch Address="0x0023F0C4" OriginalBytes="33F0D1AA" PatchedBytes="F3F0D1BA" />
+                  <Patch Address="0x00000160" OriginalBytes="9E3C5100" PatchedBytes="3E835100" />
+                  <Patch Address="0x0002BCEA" OriginalBytes="01D1" PatchedBytes="00BF" />
+                  <Patch Address="0x0002BD3C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+                  <Patch Address="0x0002C28E" OriginalBytes="04D1" PatchedBytes="04E0" />
+                  <Patch Address="0x0002C2B0" OriginalBytes="05D1" PatchedBytes="05E0" />
+                  <Patch Address="0x0002C6E8" OriginalBytes="14B9" PatchedBytes="02E0" />
+                  <Patch Address="0x0002C81A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+                  <Patch Address="0x0002C8FE" OriginalBytes="02D1" PatchedBytes="02E0" />
+                  <Patch Address="0x0002C92E" OriginalBytes="08B9" PatchedBytes="01E0" />
+                  <Patch Address="0x002D2248" OriginalBytes="22B9" PatchedBytes="04E0" />
+                  <Patch Address="0x002D2710" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+                  <Patch Address="0x002D2788" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+                  <Patch Address="0x0018AEF0" OriginalBytes="EBB9" PatchedBytes="00BF" />
+                  <Patch Address="0x00045C48" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+                  <Patch Address="0x00222E44" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+                  <Patch Address="0x00044C18" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+                  <Patch Address="0x000C1470" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                  <Patch Address="0x0014930C" OriginalBytes="BAF1" PatchedBytes="85E7" />
+                  <Patch Address="0x001493BC" OriginalBytes="13B1" PatchedBytes="02E0" />
+                  <Patch Address="0x00149440" OriginalBytes="BDD1" PatchedBytes="00BF" />
+                  <Patch Address="0x0014947E" OriginalBytes="9ED1" PatchedBytes="00BF" />
+                  <Patch Address="0x0014954E" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0014958A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+                  <Patch Address="0x001495C8" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+                  <Patch Address="0x0014921E" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00046480" OriginalBytes="5CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x000464A0" OriginalBytes="4CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x000465A6" OriginalBytes="C9D1" PatchedBytes="00BF" />
+                  <Patch Address="0x00103BE6" OriginalBytes="BEF1007F" PatchedBytes="42F764BC" />
+                  <Patch Address="0x000464BA" OriginalBytes="40D0" PatchedBytes="00BF" />
+                  <Patch Address="0x00046642" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+                  <Patch Address="0x000467CA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+                  <Patch Address="0x00123EC8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+                  <Patch Address="0x000C1516" OriginalBytes="22F0B6A4" PatchedBytes="AFF30080" />
+                  <Patch Address="0x000C151C" OriginalBytes="22F0AAA4" PatchedBytes="AFF30080" />
+                  <Patch Address="0x000C14A4" OriginalBytes="02D1" PatchedBytes="00BF" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="F7491D2A8961309217D4DD81190EEE25FD602C6A" HashPatched="5847AFE9F6F1969BEECA9601D7DE676A09331AF5">
+            <Patches>
+              <Patch Address="0x0004E7E8" OriginalBytes="2DE970480DF10C0BEAF740FA" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000158" OriginalBytes="460C0E00" PatchedBytes="D47C0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="17DDDA5928707A6079A1810C4EAFA7CC44114D05" HashPatched="29203AEC49C64F92C3AC975DA680D513440956F0">
+            <Patches>
+              <Patch Address="0x0000A088" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
+              <Patch Address="0x00000148" OriginalBytes="36EF0100" PatchedBytes="BCB30100" />
+              <Patch Address="0x0000D9AC" OriginalBytes="2DE9F0480DF1100B" PatchedBytes="0121016000207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="DA8ADBD74C526143D96C45553B067214346F0105" HashPatched="234DCD4A8FE676CF9435C03766D02275671955AD">
+            <Patches>
+              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="DBFD0000" PatchedBytes="96B80000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="038F50F3055494D101BD06FA5A515F8EDB164167" HashPatched="A32BA14798874E598691A1CDD35C94087F779BAA">
+            <Patches>
+              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000148" OriginalBytes="45400600" PatchedBytes="986E0600" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="AB5B285A4ABCEB4C910ABF2EEEDDC25890D9EBE2" HashPatched="3F050CD938C91725E7A2794570E6AA01E6DAC92B">
+            <Patches>
+              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="F9050100" PatchedBytes="4B3B0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="F2B3CF6F0F5FBAF441FA8463B044E88F65B7F7E5" HashPatched="376261707CFE6ACA2FBF60B6FCAD53C670AC3EEE">
+            <Patches>
+              <Patch Address="0x00000140" OriginalBytes="B3C10300" PatchedBytes="88860300" />
+              <Patch Address="0x00000180" OriginalBytes="00100300282B0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.14226.359">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="3B894A8672A25F30BF3C892D343FA0D59994AFDA" HashPatched="6C79893BA4BD12687F4AABCADAB426625348E017">
+            <Patches>
+              <Patch Address="0x0000A088" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
+              <Patch Address="0x00000148" OriginalBytes="E95D0200" PatchedBytes="6F220200" />
+              <Patch Address="0x0000D9AC" OriginalBytes="2DE9F0480DF1100B" PatchedBytes="0121016000207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="527F8453C60C0A6A300CEB23569C89F0219CB10C" HashPatched="E326EC5AFAE7670CEB4079F17836272E7811EE44">
+            <Patches>
+              <Patch Address="0x0004F364" OriginalBytes="2DE970480DF10C0BEAF72AFC" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000148" OriginalBytes="A8B90D00" PatchedBytes="4C280E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="1DCFBEBACAA0B67670B4E1790A380889C039A7BD" HashPatched="EB83B4B906F6EF5D65E6E60FC6034AF1D3595875">
+            <Patches>
+              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="950D0100" PatchedBytes="50C80000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="29552EBAE856B4FF8457397E6B0D1356912005EA" HashPatched="321E73E78AB350B3D9C1110C64932AFB85E2684C">
+            <Patches>
+              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000148" OriginalBytes="047C0600" PatchedBytes="58AA0500" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="1D770DBFF87E94DA9F2F71642392094ADA77F69E" HashPatched="B253EB164F588648B0C482D1851D35D7E03D9270">
+            <Patches>
+              <Patch Address="0x00027F1A" OriginalBytes="01D1" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="2CEA4F00" PatchedBytes="CF795000" />
+              <Patch Address="0x00027F6C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+              <Patch Address="0x000284BE" OriginalBytes="04D1" PatchedBytes="04E0" />
+              <Patch Address="0x000284E0" OriginalBytes="05D1" PatchedBytes="05E0" />
+              <Patch Address="0x00028918" OriginalBytes="14B9" PatchedBytes="02E0" />
+              <Patch Address="0x00028A4A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+              <Patch Address="0x00028B2E" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x00028B5E" OriginalBytes="08B9" PatchedBytes="01E0" />
+              <Patch Address="0x002140FC" OriginalBytes="22B9" PatchedBytes="04E0" />
+              <Patch Address="0x002145C4" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+              <Patch Address="0x0021463C" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+              <Patch Address="0x001793EC" OriginalBytes="EBB9" PatchedBytes="00BF" />
+              <Patch Address="0x00058448" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+              <Patch Address="0x002306B8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x00226444" OriginalBytes="3AF0B7AB" PatchedBytes="FAF0B7BB" />
+              <Patch Address="0x0002C27C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00027744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00134C24" OriginalBytes="BAF1" PatchedBytes="85E7" />
+              <Patch Address="0x00134CD4" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00134D58" OriginalBytes="BDD1" PatchedBytes="00BF" />
+              <Patch Address="0x00134D96" OriginalBytes="9ED1" PatchedBytes="00BF" />
+              <Patch Address="0x00134E66" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x00134EA2" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+              <Patch Address="0x00134EE0" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+              <Patch Address="0x00134B36" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+              <Patch Address="0x00058C80" OriginalBytes="5CD1" PatchedBytes="00BF" />
+              <Patch Address="0x00058CA0" OriginalBytes="4CD1" PatchedBytes="00BF" />
+              <Patch Address="0x00058DA6" OriginalBytes="C9D1" PatchedBytes="00BF" />
+              <Patch Address="0x0010084E" OriginalBytes="BEF1007F" PatchedBytes="58F730BA" />
+              <Patch Address="0x00058CBA" OriginalBytes="40D0" PatchedBytes="00BF" />
+              <Patch Address="0x00058E42" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+              <Patch Address="0x00058FCA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+              <Patch Address="0x00110A84" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000B125A" OriginalBytes="1FF0F2A3" PatchedBytes="AFF30080" />
+              <Patch Address="0x000B1260" OriginalBytes="1FF0E6A3" PatchedBytes="AFF30080" />
+              <Patch Address="0x00027778" OriginalBytes="02D1" PatchedBytes="00BF" />
+              <Patch Address="0x001008D2" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x001008E0" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x0010097E" OriginalBytes="18F498A1" PatchedBytes="58F798B9" />
+              <Patch Address="0x00110ADC" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x00110B3A" OriginalBytes="0BD0" PatchedBytes="11E0" />
+              <Patch Address="0x00226546" OriginalBytes="D3D0" PatchedBytes="D3E7" />
+              <Patch Address="0x00226550" OriginalBytes="7AF0E0AA" PatchedBytes="AFF30080" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="1D770DBFF87E94DA9F2F71642392094ADA77F69E" HashPatched="382F1DE73BF710700CE6EE401E033FE05AB10B1E">
+                <Patches>
+                  <Patch Address="0x00027F1A" OriginalBytes="01D1" PatchedBytes="00BF" />
+                  <Patch Address="0x00000158" OriginalBytes="2CEA4F00" PatchedBytes="3C305000" />
+                  <Patch Address="0x00027F6C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+                  <Patch Address="0x000284BE" OriginalBytes="04D1" PatchedBytes="04E0" />
+                  <Patch Address="0x000284E0" OriginalBytes="05D1" PatchedBytes="05E0" />
+                  <Patch Address="0x00028918" OriginalBytes="14B9" PatchedBytes="02E0" />
+                  <Patch Address="0x00028A4A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+                  <Patch Address="0x00028B2E" OriginalBytes="02D1" PatchedBytes="02E0" />
+                  <Patch Address="0x00028B5E" OriginalBytes="08B9" PatchedBytes="01E0" />
+                  <Patch Address="0x002140FC" OriginalBytes="22B9" PatchedBytes="04E0" />
+                  <Patch Address="0x002145C4" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+                  <Patch Address="0x0021463C" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+                  <Patch Address="0x001793EC" OriginalBytes="EBB9" PatchedBytes="00BF" />
+                  <Patch Address="0x00058448" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+                  <Patch Address="0x002306B8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+                  <Patch Address="0x00226444" OriginalBytes="3AF0B7AB" PatchedBytes="FAF0B7BB" />
+                  <Patch Address="0x0002C27C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+                  <Patch Address="0x00027744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                  <Patch Address="0x00134C24" OriginalBytes="BAF1" PatchedBytes="85E7" />
+                  <Patch Address="0x00134CD4" OriginalBytes="13B1" PatchedBytes="02E0" />
+                  <Patch Address="0x00134D58" OriginalBytes="BDD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00134D96" OriginalBytes="9ED1" PatchedBytes="00BF" />
+                  <Patch Address="0x00134E66" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00134EA2" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+                  <Patch Address="0x00134EE0" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+                  <Patch Address="0x00134B36" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00058C80" OriginalBytes="5CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00058CA0" OriginalBytes="4CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00058DA6" OriginalBytes="C9D1" PatchedBytes="00BF" />
+                  <Patch Address="0x0010084E" OriginalBytes="BEF1007F" PatchedBytes="58F730BA" />
+                  <Patch Address="0x00058CBA" OriginalBytes="40D0" PatchedBytes="00BF" />
+                  <Patch Address="0x00058E42" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+                  <Patch Address="0x00058FCA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+                  <Patch Address="0x00110A84" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+                  <Patch Address="0x000B125A" OriginalBytes="1FF0F2A3" PatchedBytes="AFF30080" />
+                  <Patch Address="0x000B1260" OriginalBytes="1FF0E6A3" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00027778" OriginalBytes="02D1" PatchedBytes="00BF" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="49AD6BD8E1C2D60B64A6D81EA62DC7165F9C7503" HashPatched="CAC419935E83132508662191376FF0F40F9C63FF">
+            <Patches>
+              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="DCFB0000" PatchedBytes="2E310100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="4DD1B80DDF35512801B496D713E113492EC5F241" HashPatched="0F91AED1A4C7FF4AC1750543EF01318260154479">
+            <Patches>
+              <Patch Address="0x00000140" OriginalBytes="2A140400" PatchedBytes="17D90300" />
+              <Patch Address="0x00000180" OriginalBytes="00100300102B0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.12397.895">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="0ACB398B35B97CAA09FED9E2712F4112B56A92E0" HashPatched="9F2F8E61786B8D912EE91B0628E41A9AF473CDB9">
+            <Patches>
+              <Patch Address="0x0000A088" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
+              <Patch Address="0x00000148" OriginalBytes="8BC70100" PatchedBytes="118C0100" />
+              <Patch Address="0x0000D9AC" OriginalBytes="2DE9F0480DF1100B" PatchedBytes="0121016000207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="F7491D2A8961309217D4DD81190EEE25FD602C6A" HashPatched="5847AFE9F6F1969BEECA9601D7DE676A09331AF5">
+            <Patches>
+              <Patch Address="0x0004E7E8" OriginalBytes="2DE970480DF10C0BEAF740FA" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000158" OriginalBytes="460C0E00" PatchedBytes="D47C0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="DA8ADBD74C526143D96C45553B067214346F0105" HashPatched="234DCD4A8FE676CF9435C03766D02275671955AD">
+            <Patches>
+              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="DBFD0000" PatchedBytes="96B80000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="038F50F3055494D101BD06FA5A515F8EDB164167" HashPatched="A32BA14798874E598691A1CDD35C94087F779BAA">
+            <Patches>
+              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000148" OriginalBytes="45400600" PatchedBytes="986E0600" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="72AB4E2ABC6BD2E72C5F0C36DE290AA50A1359A3" HashPatched="71D3DC3185B91583137C9527013873ECD1415D3B">
+            <Patches>
+              <Patch Address="0x0023F0C4" OriginalBytes="33F0D1AA" PatchedBytes="F3F0D1BA" />
+              <Patch Address="0x00000160" OriginalBytes="9E3C5100" PatchedBytes="BFCD5000" />
+              <Patch Address="0x0002BCEA" OriginalBytes="01D1" PatchedBytes="00BF" />
+              <Patch Address="0x0002BD3C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+              <Patch Address="0x0002C28E" OriginalBytes="04D1" PatchedBytes="04E0" />
+              <Patch Address="0x0002C2B0" OriginalBytes="05D1" PatchedBytes="05E0" />
+              <Patch Address="0x0002C6E8" OriginalBytes="14B9" PatchedBytes="02E0" />
+              <Patch Address="0x0002C81A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+              <Patch Address="0x0002C8FE" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x0002C92E" OriginalBytes="08B9" PatchedBytes="01E0" />
+              <Patch Address="0x002D2248" OriginalBytes="22B9" PatchedBytes="04E0" />
+              <Patch Address="0x002D2710" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+              <Patch Address="0x002D2788" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+              <Patch Address="0x0018AEF0" OriginalBytes="EBB9" PatchedBytes="00BF" />
+              <Patch Address="0x00045C48" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+              <Patch Address="0x00222E44" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x00044C18" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x000C1470" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0014930C" OriginalBytes="BAF1" PatchedBytes="85E7" />
+              <Patch Address="0x001493BC" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00149440" OriginalBytes="BDD1" PatchedBytes="00BF" />
+              <Patch Address="0x0014947E" OriginalBytes="9ED1" PatchedBytes="00BF" />
+              <Patch Address="0x0014954E" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0014958A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+              <Patch Address="0x001495C8" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+              <Patch Address="0x0014921E" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+              <Patch Address="0x00046480" OriginalBytes="5CD1" PatchedBytes="00BF" />
+              <Patch Address="0x000464A0" OriginalBytes="4CD1" PatchedBytes="00BF" />
+              <Patch Address="0x000465A6" OriginalBytes="C9D1" PatchedBytes="00BF" />
+              <Patch Address="0x00103BE6" OriginalBytes="BEF1007F" PatchedBytes="42F764BC" />
+              <Patch Address="0x000464BA" OriginalBytes="40D0" PatchedBytes="00BF" />
+              <Patch Address="0x00046642" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+              <Patch Address="0x000467CA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+              <Patch Address="0x00123EC8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000C1516" OriginalBytes="22F0B6A4" PatchedBytes="AFF30080" />
+              <Patch Address="0x000C151C" OriginalBytes="22F0AAA4" PatchedBytes="AFF30080" />
+              <Patch Address="0x000C14A4" OriginalBytes="02D1" PatchedBytes="00BF" />
+              <Patch Address="0x00103C6A" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x00103C78" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x00103D16" OriginalBytes="02F4CCA3" PatchedBytes="42F7CCBB" />
+              <Patch Address="0x00123DD0" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x00123E2E" OriginalBytes="0BD0" PatchedBytes="11E0" />
+              <Patch Address="0x0023F1C6" OriginalBytes="D3D0" PatchedBytes="D3E7" />
+              <Patch Address="0x0023F1D0" OriginalBytes="73F0FAA9" PatchedBytes="AFF30080" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="72AB4E2ABC6BD2E72C5F0C36DE290AA50A1359A3" HashPatched="417E48E9334B0A62B7259786DF1F62B43C22C61C">
+                <Patches>
+                  <Patch Address="0x0023F0C4" OriginalBytes="33F0D1AA" PatchedBytes="F3F0D1BA" />
+                  <Patch Address="0x00000160" OriginalBytes="9E3C5100" PatchedBytes="3E835100" />
+                  <Patch Address="0x0002BCEA" OriginalBytes="01D1" PatchedBytes="00BF" />
+                  <Patch Address="0x0002BD3C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+                  <Patch Address="0x0002C28E" OriginalBytes="04D1" PatchedBytes="04E0" />
+                  <Patch Address="0x0002C2B0" OriginalBytes="05D1" PatchedBytes="05E0" />
+                  <Patch Address="0x0002C6E8" OriginalBytes="14B9" PatchedBytes="02E0" />
+                  <Patch Address="0x0002C81A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+                  <Patch Address="0x0002C8FE" OriginalBytes="02D1" PatchedBytes="02E0" />
+                  <Patch Address="0x0002C92E" OriginalBytes="08B9" PatchedBytes="01E0" />
+                  <Patch Address="0x002D2248" OriginalBytes="22B9" PatchedBytes="04E0" />
+                  <Patch Address="0x002D2710" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+                  <Patch Address="0x002D2788" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+                  <Patch Address="0x0018AEF0" OriginalBytes="EBB9" PatchedBytes="00BF" />
+                  <Patch Address="0x00045C48" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+                  <Patch Address="0x00222E44" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+                  <Patch Address="0x00044C18" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+                  <Patch Address="0x000C1470" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                  <Patch Address="0x0014930C" OriginalBytes="BAF1" PatchedBytes="85E7" />
+                  <Patch Address="0x001493BC" OriginalBytes="13B1" PatchedBytes="02E0" />
+                  <Patch Address="0x00149440" OriginalBytes="BDD1" PatchedBytes="00BF" />
+                  <Patch Address="0x0014947E" OriginalBytes="9ED1" PatchedBytes="00BF" />
+                  <Patch Address="0x0014954E" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0014958A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+                  <Patch Address="0x001495C8" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+                  <Patch Address="0x0014921E" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00046480" OriginalBytes="5CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x000464A0" OriginalBytes="4CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x000465A6" OriginalBytes="C9D1" PatchedBytes="00BF" />
+                  <Patch Address="0x00103BE6" OriginalBytes="BEF1007F" PatchedBytes="42F764BC" />
+                  <Patch Address="0x000464BA" OriginalBytes="40D0" PatchedBytes="00BF" />
+                  <Patch Address="0x00046642" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+                  <Patch Address="0x000467CA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+                  <Patch Address="0x00123EC8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+                  <Patch Address="0x000C1516" OriginalBytes="22F0B6A4" PatchedBytes="AFF30080" />
+                  <Patch Address="0x000C151C" OriginalBytes="22F0AAA4" PatchedBytes="AFF30080" />
+                  <Patch Address="0x000C14A4" OriginalBytes="02D1" PatchedBytes="00BF" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="AB5B285A4ABCEB4C910ABF2EEEDDC25890D9EBE2" HashPatched="3F050CD938C91725E7A2794570E6AA01E6DAC92B">
+            <Patches>
+              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="F9050100" PatchedBytes="4B3B0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="F2B3CF6F0F5FBAF441FA8463B044E88F65B7F7E5" HashPatched="376261707CFE6ACA2FBF60B6FCAD53C670AC3EEE">
+            <Patches>
+              <Patch Address="0x00000140" OriginalBytes="B3C10300" PatchedBytes="88860300" />
+              <Patch Address="0x00000180" OriginalBytes="00100300282B0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.14219.341">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="1DCFBEBACAA0B67670B4E1790A380889C039A7BD" HashPatched="EB83B4B906F6EF5D65E6E60FC6034AF1D3595875">
+            <Patches>
+              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="950D0100" PatchedBytes="50C80000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="29552EBAE856B4FF8457397E6B0D1356912005EA" HashPatched="321E73E78AB350B3D9C1110C64932AFB85E2684C">
+            <Patches>
+              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000148" OriginalBytes="047C0600" PatchedBytes="58AA0500" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="1D770DBFF87E94DA9F2F71642392094ADA77F69E" HashPatched="B253EB164F588648B0C482D1851D35D7E03D9270">
+            <Patches>
+              <Patch Address="0x00027F1A" OriginalBytes="01D1" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="2CEA4F00" PatchedBytes="CF795000" />
+              <Patch Address="0x00027F6C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+              <Patch Address="0x000284BE" OriginalBytes="04D1" PatchedBytes="04E0" />
+              <Patch Address="0x000284E0" OriginalBytes="05D1" PatchedBytes="05E0" />
+              <Patch Address="0x00028918" OriginalBytes="14B9" PatchedBytes="02E0" />
+              <Patch Address="0x00028A4A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+              <Patch Address="0x00028B2E" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x00028B5E" OriginalBytes="08B9" PatchedBytes="01E0" />
+              <Patch Address="0x002140FC" OriginalBytes="22B9" PatchedBytes="04E0" />
+              <Patch Address="0x002145C4" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+              <Patch Address="0x0021463C" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+              <Patch Address="0x001793EC" OriginalBytes="EBB9" PatchedBytes="00BF" />
+              <Patch Address="0x00058448" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+              <Patch Address="0x002306B8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x00226444" OriginalBytes="3AF0B7AB" PatchedBytes="FAF0B7BB" />
+              <Patch Address="0x0002C27C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00027744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00134C24" OriginalBytes="BAF1" PatchedBytes="85E7" />
+              <Patch Address="0x00134CD4" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00134D58" OriginalBytes="BDD1" PatchedBytes="00BF" />
+              <Patch Address="0x00134D96" OriginalBytes="9ED1" PatchedBytes="00BF" />
+              <Patch Address="0x00134E66" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x00134EA2" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+              <Patch Address="0x00134EE0" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+              <Patch Address="0x00134B36" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+              <Patch Address="0x00058C80" OriginalBytes="5CD1" PatchedBytes="00BF" />
+              <Patch Address="0x00058CA0" OriginalBytes="4CD1" PatchedBytes="00BF" />
+              <Patch Address="0x00058DA6" OriginalBytes="C9D1" PatchedBytes="00BF" />
+              <Patch Address="0x0010084E" OriginalBytes="BEF1007F" PatchedBytes="58F730BA" />
+              <Patch Address="0x00058CBA" OriginalBytes="40D0" PatchedBytes="00BF" />
+              <Patch Address="0x00058E42" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+              <Patch Address="0x00058FCA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+              <Patch Address="0x00110A84" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000B125A" OriginalBytes="1FF0F2A3" PatchedBytes="AFF30080" />
+              <Patch Address="0x000B1260" OriginalBytes="1FF0E6A3" PatchedBytes="AFF30080" />
+              <Patch Address="0x00027778" OriginalBytes="02D1" PatchedBytes="00BF" />
+              <Patch Address="0x001008D2" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x001008E0" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x0010097E" OriginalBytes="18F498A1" PatchedBytes="58F798B9" />
+              <Patch Address="0x00110ADC" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x00110B3A" OriginalBytes="0BD0" PatchedBytes="11E0" />
+              <Patch Address="0x00226546" OriginalBytes="D3D0" PatchedBytes="D3E7" />
+              <Patch Address="0x00226550" OriginalBytes="7AF0E0AA" PatchedBytes="AFF30080" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="1D770DBFF87E94DA9F2F71642392094ADA77F69E" HashPatched="382F1DE73BF710700CE6EE401E033FE05AB10B1E">
+                <Patches>
+                  <Patch Address="0x00027F1A" OriginalBytes="01D1" PatchedBytes="00BF" />
+                  <Patch Address="0x00000158" OriginalBytes="2CEA4F00" PatchedBytes="3C305000" />
+                  <Patch Address="0x00027F6C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+                  <Patch Address="0x000284BE" OriginalBytes="04D1" PatchedBytes="04E0" />
+                  <Patch Address="0x000284E0" OriginalBytes="05D1" PatchedBytes="05E0" />
+                  <Patch Address="0x00028918" OriginalBytes="14B9" PatchedBytes="02E0" />
+                  <Patch Address="0x00028A4A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+                  <Patch Address="0x00028B2E" OriginalBytes="02D1" PatchedBytes="02E0" />
+                  <Patch Address="0x00028B5E" OriginalBytes="08B9" PatchedBytes="01E0" />
+                  <Patch Address="0x002140FC" OriginalBytes="22B9" PatchedBytes="04E0" />
+                  <Patch Address="0x002145C4" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+                  <Patch Address="0x0021463C" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+                  <Patch Address="0x001793EC" OriginalBytes="EBB9" PatchedBytes="00BF" />
+                  <Patch Address="0x00058448" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+                  <Patch Address="0x002306B8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+                  <Patch Address="0x00226444" OriginalBytes="3AF0B7AB" PatchedBytes="FAF0B7BB" />
+                  <Patch Address="0x0002C27C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+                  <Patch Address="0x00027744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                  <Patch Address="0x00134C24" OriginalBytes="BAF1" PatchedBytes="85E7" />
+                  <Patch Address="0x00134CD4" OriginalBytes="13B1" PatchedBytes="02E0" />
+                  <Patch Address="0x00134D58" OriginalBytes="BDD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00134D96" OriginalBytes="9ED1" PatchedBytes="00BF" />
+                  <Patch Address="0x00134E66" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00134EA2" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+                  <Patch Address="0x00134EE0" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+                  <Patch Address="0x00134B36" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00058C80" OriginalBytes="5CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00058CA0" OriginalBytes="4CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00058DA6" OriginalBytes="C9D1" PatchedBytes="00BF" />
+                  <Patch Address="0x0010084E" OriginalBytes="BEF1007F" PatchedBytes="58F730BA" />
+                  <Patch Address="0x00058CBA" OriginalBytes="40D0" PatchedBytes="00BF" />
+                  <Patch Address="0x00058E42" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+                  <Patch Address="0x00058FCA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+                  <Patch Address="0x00110A84" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+                  <Patch Address="0x000B125A" OriginalBytes="1FF0F2A3" PatchedBytes="AFF30080" />
+                  <Patch Address="0x000B1260" OriginalBytes="1FF0E6A3" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00027778" OriginalBytes="02D1" PatchedBytes="00BF" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="49AD6BD8E1C2D60B64A6D81EA62DC7165F9C7503" HashPatched="CAC419935E83132508662191376FF0F40F9C63FF">
+            <Patches>
+              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="DCFB0000" PatchedBytes="2E310100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="D1CCB841D102FA5C6DFE7BFBB9A8737891AEE93F" HashPatched="959B75175AEFE49E4416FD4E6314313795CD88B3">
+            <Patches>
+              <Patch Address="0x0000A088" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
+              <Patch Address="0x00000148" OriginalBytes="8B8E0100" PatchedBytes="10530200" />
+              <Patch Address="0x0000D9AC" OriginalBytes="2DE9F0480DF1100B" PatchedBytes="0121016000207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="52F9139FDF275ACE9E6CA87ADA5F17BA3979271C" HashPatched="C0EC590B080ECF8218B145159495671C75DF4728">
+            <Patches>
+              <Patch Address="0x0004F364" OriginalBytes="2DE970480DF10C0BEAF72AFC" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000148" OriginalBytes="FDB40D00" PatchedBytes="A1230E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="4DD1B80DDF35512801B496D713E113492EC5F241" HashPatched="0F91AED1A4C7FF4AC1750543EF01318260154479">
+            <Patches>
+              <Patch Address="0x00000140" OriginalBytes="2A140400" PatchedBytes="17D90300" />
+              <Patch Address="0x00000180" OriginalBytes="00100300102B0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.14234.375">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="A322228BBD070049127621D35C7C94205E302D5D" HashPatched="7AD89113F0396623D7DC815591E4CA05B4B52211">
+            <Patches>
+              <Patch Address="0x0000A088" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
+              <Patch Address="0x00000148" OriginalBytes="7F820100" PatchedBytes="04470200" />
+              <Patch Address="0x0000D9AC" OriginalBytes="2DE9F0480DF1100B" PatchedBytes="0121016000207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="D599BD0D8D61CEE47720941EC7AD138DEB537F6E" HashPatched="8C1CA8E2500E5391D79EA800E68C117421991481">
+            <Patches>
+              <Patch Address="0x0004F364" OriginalBytes="2DE970480DF10C0BEAF72AFC" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000148" OriginalBytes="CDA10D00" PatchedBytes="71100E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="49370984AD49FFCB5E33D4D9481FB2A6459A5829" HashPatched="EE96B75904F2D638E3B3734584CCD9E9448E1B66">
+            <Patches>
+              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="E6C70000" PatchedBytes="A0820100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="9A4A52C9B66B508F8B5D29DC8F76DDA7426EA852" HashPatched="2B73B49869EB7C1E11C34FC00E4D5A7387BF1580">
+            <Patches>
+              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000148" OriginalBytes="33B00500" PatchedBytes="86DE0500" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="A3D49F5D2F46998B8CB500EC0705A91DA2E10B05" HashPatched="1439C3AB0C84AB93ECB77121744208497F9933A6">
+            <Patches>
+              <Patch Address="0x00027F1A" OriginalBytes="01D1" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="48515000" PatchedBytes="41315000" />
+              <Patch Address="0x00027F6C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+              <Patch Address="0x000284B8" OriginalBytes="1DD2" PatchedBytes="1DE0" />
+              <Patch Address="0x000284E0" OriginalBytes="05D1" PatchedBytes="05E0" />
+              <Patch Address="0x00028918" OriginalBytes="14B9" PatchedBytes="02E0" />
+              <Patch Address="0x00028A4A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+              <Patch Address="0x00028B2E" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x00028B5E" OriginalBytes="08B9" PatchedBytes="01E0" />
+              <Patch Address="0x002140FC" OriginalBytes="22B9" PatchedBytes="04E0" />
+              <Patch Address="0x002145C4" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+              <Patch Address="0x0021463C" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+              <Patch Address="0x001793EC" OriginalBytes="EBB9" PatchedBytes="00BF" />
+              <Patch Address="0x00058448" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+              <Patch Address="0x002306B8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x00226444" OriginalBytes="3AF061AB" PatchedBytes="FAF061BB" />
+              <Patch Address="0x0002C27C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00027744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00134C24" OriginalBytes="BAF1007F" PatchedBytes="FFF785BF" />
+              <Patch Address="0x00134CD4" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00134D58" OriginalBytes="BDD1" PatchedBytes="00BF" />
+              <Patch Address="0x00134D96" OriginalBytes="9ED1" PatchedBytes="00BF" />
+              <Patch Address="0x00134E66" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x00134EA2" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+              <Patch Address="0x00134EE0" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+              <Patch Address="0x00134B36" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+              <Patch Address="0x00058C80" OriginalBytes="5CD1" PatchedBytes="00BF" />
+              <Patch Address="0x00058CA0" OriginalBytes="4CD1" PatchedBytes="00BF" />
+              <Patch Address="0x00058DA6" OriginalBytes="C9D1" PatchedBytes="00BF" />
+              <Patch Address="0x0010084E" OriginalBytes="BEF1007F" PatchedBytes="58F730BA" />
+              <Patch Address="0x00058CBA" OriginalBytes="40D0" PatchedBytes="00BF" />
+              <Patch Address="0x00058E42" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+              <Patch Address="0x00058FCA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+              <Patch Address="0x00110A84" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000B125A" OriginalBytes="1FF0F2A3" PatchedBytes="AFF30080" />
+              <Patch Address="0x000B1260" OriginalBytes="1FF0E6A3" PatchedBytes="AFF30080" />
+              <Patch Address="0x00027778" OriginalBytes="02D1" PatchedBytes="00BF" />
+              <Patch Address="0x001008D2" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x001008E0" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x0010097E" OriginalBytes="18F498A1" PatchedBytes="58F798B9" />
+              <Patch Address="0x00110ADC" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x00110B3A" OriginalBytes="0BD0" PatchedBytes="11E0" />
+              <Patch Address="0x00226546" OriginalBytes="D3D0" PatchedBytes="D3E7" />
+              <Patch Address="0x00226550" OriginalBytes="7AF08AAA" PatchedBytes="AFF30080" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="A3D49F5D2F46998B8CB500EC0705A91DA2E10B05" HashPatched="BF75601D82A81D06741E305F6F8A693990F43250">
+                <Patches>
+                  <Patch Address="0x00027F1A" OriginalBytes="01D1" PatchedBytes="00BF" />
+                  <Patch Address="0x00000158" OriginalBytes="48515000" PatchedBytes="58E74F00" />
+                  <Patch Address="0x00027F6C" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+                  <Patch Address="0x000284B8" OriginalBytes="1DD2" PatchedBytes="1DE0" />
+                  <Patch Address="0x000284E0" OriginalBytes="05D1" PatchedBytes="05E0" />
+                  <Patch Address="0x00028918" OriginalBytes="14B9" PatchedBytes="02E0" />
+                  <Patch Address="0x00028A4A" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+                  <Patch Address="0x00028B2E" OriginalBytes="02D1" PatchedBytes="02E0" />
+                  <Patch Address="0x00028B5E" OriginalBytes="08B9" PatchedBytes="01E0" />
+                  <Patch Address="0x002140FC" OriginalBytes="22B9" PatchedBytes="04E0" />
+                  <Patch Address="0x002145C4" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+                  <Patch Address="0x0021463C" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+                  <Patch Address="0x001793EC" OriginalBytes="EBB9" PatchedBytes="00BF" />
+                  <Patch Address="0x00058448" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+                  <Patch Address="0x002306B8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+                  <Patch Address="0x00226444" OriginalBytes="3AF061AB" PatchedBytes="FAF061BB" />
+                  <Patch Address="0x0002C27C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+                  <Patch Address="0x00027744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                  <Patch Address="0x00134C24" OriginalBytes="BAF1007F" PatchedBytes="FFF785BF" />
+                  <Patch Address="0x00134CD4" OriginalBytes="13B1" PatchedBytes="02E0" />
+                  <Patch Address="0x00134D58" OriginalBytes="BDD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00134D96" OriginalBytes="9ED1" PatchedBytes="00BF" />
+                  <Patch Address="0x00134E66" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00134EA2" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+                  <Patch Address="0x00134EE0" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+                  <Patch Address="0x00134B36" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00058C80" OriginalBytes="5CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00058CA0" OriginalBytes="4CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00058DA6" OriginalBytes="C9D1" PatchedBytes="00BF" />
+                  <Patch Address="0x0010084E" OriginalBytes="BEF1007F" PatchedBytes="58F730BA" />
+                  <Patch Address="0x00058CBA" OriginalBytes="40D0" PatchedBytes="00BF" />
+                  <Patch Address="0x00058E42" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+                  <Patch Address="0x00058FCA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+                  <Patch Address="0x00110A84" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+                  <Patch Address="0x000B125A" OriginalBytes="1FF0F2A3" PatchedBytes="AFF30080" />
+                  <Patch Address="0x000B1260" OriginalBytes="1FF0E6A3" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00027778" OriginalBytes="02D1" PatchedBytes="00BF" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="5BB197356E69C87A489095C8192C810F5353D5F1" HashPatched="6B3BF6EF63E8A6CE2B492923865AC4C4B02619E3">
+            <Patches>
+              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="ED7E0100" PatchedBytes="3FB40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="A299FFCB35322EFE0944A1D938EC8F3F8F8B497B" HashPatched="A0BB16A9E7E3D391536F0C32AF2D5DEB0949AC2B">
+            <Patches>
+              <Patch Address="0x00000140" OriginalBytes="7F830300" PatchedBytes="6C480300" />
+              <Patch Address="0x00000180" OriginalBytes="00100300102B0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.20.10512.11662">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="A3A8F2ABA52ED101DF76E771A0F110701E8EBC4E" HashPatched="AF970597BAB1C7A45B0C1FD15EE44E7E5A95DC4B">
+            <Patches>
+              <Patch Address="0x00009B0C" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
+              <Patch Address="0x00000140" OriginalBytes="51A20100" PatchedBytes="5A670200" />
+              <Patch Address="0x0000DDE4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="86FB209AA9DF0E901CE220FFA768A1B30C992D48" HashPatched="D4A309D3605274997AA73DDB5FCB423453173AA2">
+            <Patches>
+              <Patch Address="0x000C1A3C" OriginalBytes="2DE970480DF10C0B8AF7ECFB" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000150" OriginalBytes="F2981000" PatchedBytes="35081000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="2A3B05327D5DCA02183D327A4DB43583FF67D9E7" HashPatched="C2C2F21C21F97340BF867AE44E81B93FACCCA368">
+            <Patches>
+              <Patch Address="0x000024AC" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000148" OriginalBytes="1EE40000" PatchedBytes="D99E0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="00F7EF0B7E8F72DBFFB901A1CFB3B8D462362152" HashPatched="76BED613846C9227420669EA4D66AEBF30A01F12">
+            <Patches>
+              <Patch Address="0x00002BF8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000150" OriginalBytes="ACAE0100" PatchedBytes="00DD0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="1CA73470017B88F0E487D6BDF19E7DF6A484C722" HashPatched="4444C3D0D3149FE143C5CF8A609A5944856D33B9">
+            <Patches>
+              <Patch Address="0x000D4EAE" OriginalBytes="6ED1" PatchedBytes="6EE0" />
+              <Patch Address="0x000D50F0" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000D510E" OriginalBytes="29B9" PatchedBytes="05E0" />
+              <Patch Address="0x000D55C4" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000D57AE" OriginalBytes="56D0" PatchedBytes="56E0" />
+              <Patch Address="0x000D5898" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000D58CA" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x002E0D10" OriginalBytes="E1B9" PatchedBytes="1CE0" />
+              <Patch Address="0x002E1220" OriginalBytes="09BB" PatchedBytes="21E0" />
+              <Patch Address="0x002E12A6" OriginalBytes="5BB3" PatchedBytes="2BE0" />
+              <Patch Address="0x001A37C0" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0006D7BC" OriginalBytes="00F01782" PatchedBytes="00F017BA" />
+              <Patch Address="0x0030681C" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x002B0A7C" OriginalBytes="40F0B180" PatchedBytes="AFF30080" />
+              <Patch Address="0x0006AE2C" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
+              <Patch Address="0x000D4344" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x001A3322" OriginalBytes="BAF1007F" PatchedBytes="FFF776BF" />
+              <Patch Address="0x001A33E0" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x001A3458" OriginalBytes="C3D1" PatchedBytes="00BF" />
+              <Patch Address="0x001A3496" OriginalBytes="A4D1" PatchedBytes="00BF" />
+              <Patch Address="0x001A355A" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x001A3598" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
+              <Patch Address="0x001A35D0" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
+              <Patch Address="0x001A3216" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0006E0E8" OriginalBytes="CDD1" PatchedBytes="00BF" />
+              <Patch Address="0x0006E16E" OriginalBytes="3FF443AF" PatchedBytes="FFF743BF" />
+              <Patch Address="0x0006E004" OriginalBytes="00F03C81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0012FD58" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000D4324" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0012FE2C" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x0012FE96" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x0012FCEE" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x00130686" OriginalBytes="BAF1007F" PatchedBytes="3DF7B7BC" />
+              <Patch Address="0x0039D270" OriginalBytes="13F40E85" PatchedBytes="13F70EBD" />
+              <Patch Address="0x0039D2A0" OriginalBytes="E8D1" PatchedBytes="00BF" />
+              <Patch Address="0x00000160" OriginalBytes="7F5D5700" PatchedBytes="A74C5700" />
+              <Patch Address="0x00130680" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x0006DFD2" OriginalBytes="40F0FB80" PatchedBytes="AFF30080" />
+              <Patch Address="0x0006DFE8" OriginalBytes="4DD1" PatchedBytes="00BF" />
+              <Patch Address="0x0006E0C4" OriginalBytes="40F0B580" PatchedBytes="AFF30080" />
+              <Patch Address="0x0006E0D2" OriginalBytes="68D0" PatchedBytes="00BF" />
+              <Patch Address="0x0013071C" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x0013072A" OriginalBytes="03D0" PatchedBytes="03E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="3C51D51D96EE92FA959623A31FE7DEEFDC67F23E" HashPatched="9811476088C18800F6597DB50A831B735879E53C">
+            <Patches>
+              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="9F060100" PatchedBytes="F13B0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ngccredprov.dll" HashOriginal="4F58E2BDD73A7B87502F769B9D55837ECF8DBB6B" HashPatched="1E0C6919094AF4F9645212C02A06A53C74903250">
+            <Patches>
+              <Patch Address="0x0001CBD0" OriginalBytes="31000980" PatchedBytes="FDFF0980" />
+              <Patch Address="0x00000160" OriginalBytes="767F0500" PatchedBytes="E07E0500" />
+              <Patch Address="0x0001DBAC" OriginalBytes="31000980" PatchedBytes="FEFF0980" />
+              <Patch Address="0x000248AC" OriginalBytes="31000980" PatchedBytes="FFFF0980" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\audiodg.exe" HashOriginal="9326BB43E990EA31A3A7627D2B8B4DC4932069DB" HashPatched="68B5B536BC86B9C538324B1B80E5540A41657B0A">
+            <Patches>
+              <Patch Address="0x00000140" OriginalBytes="767F0400" PatchedBytes="71340500" />
+              <Patch Address="0x00000180" OriginalBytes="00300400001B0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.15116.125">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="C88434E8DD80E0110C007CB08F5036E00CACABBB" HashPatched="6C21AB57C4EA359C76C556214C1F2B26E10E467A">
+            <Patches>
+              <Patch Address="0x0000A538" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
+              <Patch Address="0x00000140" OriginalBytes="5B9A0100" PatchedBytes="E05E0200" />
+              <Patch Address="0x0000E3C8" OriginalBytes="2DE9F0480DF1100B" PatchedBytes="0121016000207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="716712DC7AB1F0A201DED8ACCBF1C10B0D6212E9" HashPatched="8A30787A77FF73BB248BCA0BE408A9AE1A491274">
+            <Patches>
+              <Patch Address="0x0004F278" OriginalBytes="2DE970480DF10C0BEAF7B0FC" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000148" OriginalBytes="16820E00" PatchedBytes="35F00D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="5D8F27E308289917E4C81F14374B80B461A377C1" HashPatched="4416AA2CB08EC0BB7829EF66B8F1197B443AAFAF">
+            <Patches>
+              <Patch Address="0x0002C06E" OriginalBytes="01D1" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="0EB04F00" PatchedBytes="A6C24F00" />
+              <Patch Address="0x0002C0C0" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+              <Patch Address="0x0002C60C" OriginalBytes="1DD2" PatchedBytes="1DE0" />
+              <Patch Address="0x0002C634" OriginalBytes="05D1" PatchedBytes="05E0" />
+              <Patch Address="0x0002CA6C" OriginalBytes="14B9" PatchedBytes="02E0" />
+              <Patch Address="0x0002CB9E" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+              <Patch Address="0x0002CC82" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x0002CCB2" OriginalBytes="08B9" PatchedBytes="01E0" />
+              <Patch Address="0x002195A4" OriginalBytes="22B9" PatchedBytes="04E0" />
+              <Patch Address="0x00219A6C" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+              <Patch Address="0x00219AE4" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+              <Patch Address="0x00173634" OriginalBytes="EBB9" PatchedBytes="00BF" />
+              <Patch Address="0x00064E38" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+              <Patch Address="0x0025C3CC" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0022B8E8" OriginalBytes="30F011AE" PatchedBytes="F0F011BE" />
+              <Patch Address="0x0003039C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0002B898" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0012F6AC" OriginalBytes="BAF1007F" PatchedBytes="FFF785BF" />
+              <Patch Address="0x0012F75C" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0012F7E0" OriginalBytes="BDD1" PatchedBytes="00BF" />
+              <Patch Address="0x0012F81E" OriginalBytes="9ED1" PatchedBytes="00BF" />
+              <Patch Address="0x0012F8EE" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0012F92A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+              <Patch Address="0x0012F968" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+              <Patch Address="0x0012F5BE" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+              <Patch Address="0x00065670" OriginalBytes="5CD1" PatchedBytes="00BF" />
+              <Patch Address="0x00065690" OriginalBytes="4CD1" PatchedBytes="00BF" />
+              <Patch Address="0x00065796" OriginalBytes="C9D1" PatchedBytes="00BF" />
+              <Patch Address="0x0010045A" OriginalBytes="BEF1007F" PatchedBytes="65F722B9" />
+              <Patch Address="0x000656AA" OriginalBytes="40D0" PatchedBytes="00BF" />
+              <Patch Address="0x00065832" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+              <Patch Address="0x000659BA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+              <Patch Address="0x000F7A88" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x0002B03A" OriginalBytes="0CF004AD" PatchedBytes="AFF30080" />
+              <Patch Address="0x0002B040" OriginalBytes="0CF0F8AC" PatchedBytes="AFF30080" />
+              <Patch Address="0x0002B8BC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x001004DE" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x001004EC" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x0010058A" OriginalBytes="25F48AA0" PatchedBytes="65F78AB8" />
+              <Patch Address="0x000F7AE0" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x000F7B3E" OriginalBytes="0BD0" PatchedBytes="11E0" />
+              <Patch Address="0x0022B9EA" OriginalBytes="D3D0" PatchedBytes="D3E7" />
+              <Patch Address="0x0022B9F4" OriginalBytes="70F03AAD" PatchedBytes="AFF30080" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="5D8F27E308289917E4C81F14374B80B461A377C1" HashPatched="CE84ECBB9562BD1035030C67761439C9F892A460">
+                <Patches>
+                  <Patch Address="0x0002C06E" OriginalBytes="01D1" PatchedBytes="00BF" />
+                  <Patch Address="0x00000158" OriginalBytes="0EB04F00" PatchedBytes="637B4F00" />
+                  <Patch Address="0x0002C0C0" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+                  <Patch Address="0x0002C60C" OriginalBytes="1DD2" PatchedBytes="1DE0" />
+                  <Patch Address="0x0002C634" OriginalBytes="05D1" PatchedBytes="05E0" />
+                  <Patch Address="0x0002CA6C" OriginalBytes="14B9" PatchedBytes="02E0" />
+                  <Patch Address="0x0002CB9E" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+                  <Patch Address="0x0002CC82" OriginalBytes="02D1" PatchedBytes="02E0" />
+                  <Patch Address="0x0002CCB2" OriginalBytes="08B9" PatchedBytes="01E0" />
+                  <Patch Address="0x002195A4" OriginalBytes="22B9" PatchedBytes="04E0" />
+                  <Patch Address="0x00219A6C" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+                  <Patch Address="0x00219AE4" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+                  <Patch Address="0x00173634" OriginalBytes="EBB9" PatchedBytes="00BF" />
+                  <Patch Address="0x00064E38" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+                  <Patch Address="0x0025C3CC" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+                  <Patch Address="0x0022B8E8" OriginalBytes="30F011AE" PatchedBytes="F0F011BE" />
+                  <Patch Address="0x0003039C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+                  <Patch Address="0x0002B898" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                  <Patch Address="0x0012F6AC" OriginalBytes="BAF1007F" PatchedBytes="FFF785BF" />
+                  <Patch Address="0x0012F75C" OriginalBytes="13B1" PatchedBytes="02E0" />
+                  <Patch Address="0x0012F7E0" OriginalBytes="BDD1" PatchedBytes="00BF" />
+                  <Patch Address="0x0012F81E" OriginalBytes="9ED1" PatchedBytes="00BF" />
+                  <Patch Address="0x0012F8EE" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0012F92A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+                  <Patch Address="0x0012F968" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+                  <Patch Address="0x0012F5BE" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00065670" OriginalBytes="5CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00065690" OriginalBytes="4CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00065796" OriginalBytes="C9D1" PatchedBytes="00BF" />
+                  <Patch Address="0x0010045A" OriginalBytes="BEF1007F" PatchedBytes="65F722B9" />
+                  <Patch Address="0x000656AA" OriginalBytes="40D0" PatchedBytes="00BF" />
+                  <Patch Address="0x00065832" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+                  <Patch Address="0x000659BA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+                  <Patch Address="0x000F7A88" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+                  <Patch Address="0x0002B03A" OriginalBytes="0CF004AD" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0002B040" OriginalBytes="0CF0F8AC" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0002B8BC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="B47C67DAF5AB8AF922844A6E22A21E5D84BD89D7" HashPatched="18E95209DD0A11E046F8AFD7C126774EF97796EB">
+            <Patches>
+              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="FFF50000" PatchedBytes="BAB00000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="1A03E87113EDEC61926962CC37D6FC4F3EAE9C20" HashPatched="FCF347E5F519FEC9CB776A1E569C81295DBD02F7">
+            <Patches>
+              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000148" OriginalBytes="D0990500" PatchedBytes="23C80500" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="BAA998952EF35A0A04E6C2A8D163567382152E78" HashPatched="3A6F331764EE99CC63D2097C4F9E8C77201949F4">
+            <Patches>
+              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="5CB40100" PatchedBytes="AFE90000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="63B667C9211E5C21653F0CA0E8CAFAF94481E22C" HashPatched="8D71216491618086C25CA838264335D3755A4D5E">
+            <Patches>
+              <Patch Address="0x00000140" OriginalBytes="75260400" PatchedBytes="62EB0300" />
+              <Patch Address="0x00000180" OriginalBytes="00100300102B0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.15148.160">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="9666CC8237C04158E2343AB29104492ECB7D0259" HashPatched="9C68A00C127DC4106830EE67464D091D6A75AFCA">
+            <Patches>
+              <Patch Address="0x0000A5AC" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
+              <Patch Address="0x00000140" OriginalBytes="1F360200" PatchedBytes="29FB0100" />
+              <Patch Address="0x0000E540" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="C4EFB27306E07AF5DF33893518497042C1EB139E" HashPatched="02AA382FD4F11FEB1FD8A89EC83F20A8033AF4AF">
+            <Patches>
+              <Patch Address="0x0004F2AC" OriginalBytes="2DE970480DF10C0BEAF7A2FC" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000148" OriginalBytes="F1880E00" PatchedBytes="1EF70D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\SSPISRV.DLL" HashOriginal="E43F181B78A3CCFCD4DFF6DB968DE1938994522D" HashPatched="05DFF3B2445208EE04BD16A2D648CD2A6A485361">
+            <Patches>
+              <Patch Address="0x00002454" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="5D100100" PatchedBytes="18CB0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSV1_0.DLL" HashOriginal="C347C56C4A3E864C2C9D53222FC45D4E6DDB8431" HashPatched="2C0507FE762FA7869341EF493D5306B0C04D7EB3">
+            <Patches>
+              <Patch Address="0x000035A8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000148" OriginalBytes="A29A0500" PatchedBytes="F5C80500" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="71697CC9EC0211446CFF5E3C52D50DE1B99DCDA4" HashPatched="2F8F2A0D9FCCE929CAA238F8B4AEAABA2EA58AEB">
+            <Patches>
+              <Patch Address="0x0002C06E" OriginalBytes="01D1" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="DE974F00" PatchedBytes="76AA4F00" />
+              <Patch Address="0x0002C0C0" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+              <Patch Address="0x0002C60C" OriginalBytes="1DD2" PatchedBytes="1DE0" />
+              <Patch Address="0x0002C634" OriginalBytes="05D1" PatchedBytes="05E0" />
+              <Patch Address="0x0002CA6C" OriginalBytes="14B9" PatchedBytes="02E0" />
+              <Patch Address="0x0002CB9E" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+              <Patch Address="0x0002CC82" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x0002CCB2" OriginalBytes="08B9" PatchedBytes="01E0" />
+              <Patch Address="0x002195A4" OriginalBytes="22B9" PatchedBytes="04E0" />
+              <Patch Address="0x00219A6C" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+              <Patch Address="0x00219AE4" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+              <Patch Address="0x00173634" OriginalBytes="EBB9" PatchedBytes="00BF" />
+              <Patch Address="0x00064E38" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+              <Patch Address="0x0025C3CC" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0022B8E8" OriginalBytes="30F011AE" PatchedBytes="F0F011BE" />
+              <Patch Address="0x0003039C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0002B898" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0012F6AC" OriginalBytes="BAF1007F" PatchedBytes="FFF785BF" />
+              <Patch Address="0x0012F75C" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0012F7E0" OriginalBytes="BDD1" PatchedBytes="00BF" />
+              <Patch Address="0x0012F81E" OriginalBytes="9ED1" PatchedBytes="00BF" />
+              <Patch Address="0x0012F8EE" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0012F92A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+              <Patch Address="0x0012F968" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+              <Patch Address="0x0012F5BE" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+              <Patch Address="0x00065670" OriginalBytes="5CD1" PatchedBytes="00BF" />
+              <Patch Address="0x00065690" OriginalBytes="4CD1" PatchedBytes="00BF" />
+              <Patch Address="0x00065796" OriginalBytes="C9D1" PatchedBytes="00BF" />
+              <Patch Address="0x0010045A" OriginalBytes="BEF1007F" PatchedBytes="65F722B9" />
+              <Patch Address="0x000656AA" OriginalBytes="40D0" PatchedBytes="00BF" />
+              <Patch Address="0x00065832" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+              <Patch Address="0x000659BA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+              <Patch Address="0x000F7A88" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x0002B03A" OriginalBytes="0CF004AD" PatchedBytes="AFF30080" />
+              <Patch Address="0x0002B040" OriginalBytes="0CF0F8AC" PatchedBytes="AFF30080" />
+              <Patch Address="0x0002B8BC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x001004DE" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x001004EC" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x0010058A" OriginalBytes="25F48AA0" PatchedBytes="65F78AB8" />
+              <Patch Address="0x000F7AE0" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x000F7B3E" OriginalBytes="0BD0" PatchedBytes="11E0" />
+              <Patch Address="0x0022B9EA" OriginalBytes="D3D0" PatchedBytes="D3E7" />
+              <Patch Address="0x0022B9F4" OriginalBytes="70F03AAD" PatchedBytes="AFF30080" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\NTOSKRNL.EXE" HashOriginal="71697CC9EC0211446CFF5E3C52D50DE1B99DCDA4" HashPatched="7CF16FC1318C5D19C48F9ADA90C79B78DBFA8979">
+                <Patches>
+                  <Patch Address="0x0002C06E" OriginalBytes="01D1" PatchedBytes="00BF" />
+                  <Patch Address="0x00000158" OriginalBytes="DE974F00" PatchedBytes="33634F00" />
+                  <Patch Address="0x0002C0C0" OriginalBytes="F7D0" PatchedBytes="F7E7" />
+                  <Patch Address="0x0002C60C" OriginalBytes="1DD2" PatchedBytes="1DE0" />
+                  <Patch Address="0x0002C634" OriginalBytes="05D1" PatchedBytes="05E0" />
+                  <Patch Address="0x0002CA6C" OriginalBytes="14B9" PatchedBytes="02E0" />
+                  <Patch Address="0x0002CB9E" OriginalBytes="4FD0" PatchedBytes="4FE0" />
+                  <Patch Address="0x0002CC82" OriginalBytes="02D1" PatchedBytes="02E0" />
+                  <Patch Address="0x0002CCB2" OriginalBytes="08B9" PatchedBytes="01E0" />
+                  <Patch Address="0x002195A4" OriginalBytes="22B9" PatchedBytes="04E0" />
+                  <Patch Address="0x00219A6C" OriginalBytes="1AD1" PatchedBytes="1AE0" />
+                  <Patch Address="0x00219AE4" OriginalBytes="F3B1" PatchedBytes="1EE0" />
+                  <Patch Address="0x00173634" OriginalBytes="EBB9" PatchedBytes="00BF" />
+                  <Patch Address="0x00064E38" OriginalBytes="00F0D981" PatchedBytes="00F0D9B9" />
+                  <Patch Address="0x0025C3CC" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+                  <Patch Address="0x0022B8E8" OriginalBytes="30F011AE" PatchedBytes="F0F011BE" />
+                  <Patch Address="0x0003039C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+                  <Patch Address="0x0002B898" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                  <Patch Address="0x0012F6AC" OriginalBytes="BAF1007F" PatchedBytes="FFF785BF" />
+                  <Patch Address="0x0012F75C" OriginalBytes="13B1" PatchedBytes="02E0" />
+                  <Patch Address="0x0012F7E0" OriginalBytes="BDD1" PatchedBytes="00BF" />
+                  <Patch Address="0x0012F81E" OriginalBytes="9ED1" PatchedBytes="00BF" />
+                  <Patch Address="0x0012F8EE" OriginalBytes="7FF436AF" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0012F92A" OriginalBytes="3FF446AE" PatchedBytes="FFF746BE" />
+                  <Patch Address="0x0012F968" OriginalBytes="3FF427AE" PatchedBytes="FFF727BE" />
+                  <Patch Address="0x0012F5BE" OriginalBytes="00F0E581" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00065670" OriginalBytes="5CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00065690" OriginalBytes="4CD1" PatchedBytes="00BF" />
+                  <Patch Address="0x00065796" OriginalBytes="C9D1" PatchedBytes="00BF" />
+                  <Patch Address="0x0010045A" OriginalBytes="BEF1007F" PatchedBytes="65F722B9" />
+                  <Patch Address="0x000656AA" OriginalBytes="40D0" PatchedBytes="00BF" />
+                  <Patch Address="0x00065832" OriginalBytes="3FF434AF" PatchedBytes="FFF734BF" />
+                  <Patch Address="0x000659BA" OriginalBytes="3FF472AE" PatchedBytes="FFF772BE" />
+                  <Patch Address="0x000F7A88" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+                  <Patch Address="0x0002B03A" OriginalBytes="0CF004AD" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0002B040" OriginalBytes="0CF0F8AC" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0002B8BC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+          <TargetFile Path="Windows\System32\MSCOREE.DLL" HashOriginal="341094F2FD0619030ADAC3A125F959E60146A9C4" HashPatched="4E8DD35956D1EBB9E4983526A3F8AA89C61DBC00">
+            <Patches>
+              <Patch Address="0x0000579C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="73C90100" PatchedBytes="C6FE0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\AUDIODG.EXE" HashOriginal="C19E72CB6BF93D9F2BB5DE98A7AEA6CA3BA03D23" HashPatched="750FDFEB62A84E029F47BFB1AB6A0CD410B11504">
+            <Patches>
+              <Patch Address="0x00000140" OriginalBytes="AE5E0300" PatchedBytes="9A230400" />
+              <Patch Address="0x00000180" OriginalBytes="00100300102B0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.20.10536.11738">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="79AECA59296D6DE9C49684BD9FA5A15076DDC22D" HashPatched="6759F0A2841D3B5E6AD072B7F58E51860282A78A">
+            <Patches>
+              <Patch Address="0x000024AC" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000148" OriginalBytes="687B0100" PatchedBytes="23360100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="91FFC0914ED1EDB8F4E19329EBE0D0C2A1A6D9C7" HashPatched="B71952DC0F9896D0C7D1F8C7AD31F05685431A0D">
+            <Patches>
+              <Patch Address="0x00002C80" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000148" OriginalBytes="F7D00000" PatchedBytes="4AFF0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="8DE3974EE35EB1AF162FE954BAAC73248B9791F4" HashPatched="61663640C3BDEBC4DB6E638F716DD8ADD7E76A93">
+            <Patches>
+              <Patch Address="0x00009B0C" OriginalBytes="0FB42DE9F04F0DF1" PatchedBytes="0121196000207047" />
+              <Patch Address="0x00000140" OriginalBytes="01F80100" PatchedBytes="0BBD0100" />
+              <Patch Address="0x0000DEE4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="9BB18454FB221B25F7A18EDB037CAEE92541366A" HashPatched="46E053E7CB5C176B20CDDD9DC575B9C5CE59BD40">
+            <Patches>
+              <Patch Address="0x000C2B8C" OriginalBytes="2DE970480DF10C0B8CF7F0FF" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000150" OriginalBytes="8E1E1000" PatchedBytes="CA891000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1AE34A842C6885730954C0D734D28F58F7DDB858" HashPatched="F6F86F25C3E73AF922902891F3061788D5DAEF5D">
+            <Patches>
+              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="E50E0100" PatchedBytes="37440100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="252E1D5AE0DB9800DC7E5E6C0C16F5683BDECB19" HashPatched="9DC9A7142CBA9911EB9BBF4DEF833DC869F4EAE9">
+            <Patches>
+              <Patch Address="0x000BAF4A" OriginalBytes="6ED1" PatchedBytes="6EE0" />
+              <Patch Address="0x00000158" OriginalBytes="4BBD5700" PatchedBytes="C81C5700" />
+              <Patch Address="0x000BB18C" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000BB1AA" OriginalBytes="29B9" PatchedBytes="05E0" />
+              <Patch Address="0x000BB660" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000BB84A" OriginalBytes="56D0" PatchedBytes="56E0" />
+              <Patch Address="0x000BB934" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000BB966" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x002CD186" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x002CD66A" OriginalBytes="09BB" PatchedBytes="21E0" />
+              <Patch Address="0x002CD6F0" OriginalBytes="5BB3" PatchedBytes="2BE0" />
+              <Patch Address="0x001A5F50" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x00091FA0" OriginalBytes="00F00382" PatchedBytes="00F003BA" />
+              <Patch Address="0x002C8AE0" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x003793B4" OriginalBytes="47D1" PatchedBytes="00BF" />
+              <Patch Address="0x000B8E68" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
+              <Patch Address="0x000BC084" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x001A5AB2" OriginalBytes="BAF1" PatchedBytes="76E7" />
+              <Patch Address="0x001A5B70" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x001A5BE8" OriginalBytes="C3D1" PatchedBytes="00BF" />
+              <Patch Address="0x001A5C26" OriginalBytes="A4D1" PatchedBytes="00BF" />
+              <Patch Address="0x001A5CEA" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x001A5D28" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
+              <Patch Address="0x001A5D60" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
+              <Patch Address="0x001A59A6" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
+              <Patch Address="0x000927B6" OriginalBytes="4ED1" PatchedBytes="00BF" />
+              <Patch Address="0x000928B8" OriginalBytes="CDD1" PatchedBytes="00BF" />
+              <Patch Address="0x000928DA" OriginalBytes="3FF474AF" PatchedBytes="FFF774BF" />
+              <Patch Address="0x000927D2" OriginalBytes="00F04081" PatchedBytes="AFF30080" />
+              <Patch Address="0x00147C60" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000BC0A8" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00147D00" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x00147D5E" OriginalBytes="0BD0" PatchedBytes="11E0" />
+              <Patch Address="0x00147BF6" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0013C3E2" OriginalBytes="BAF1007F" PatchedBytes="56F7F0B9" />
+              <Patch Address="0x0013C45A" OriginalBytes="22D0" PatchedBytes="22E0" />
+              <Patch Address="0x00379486" OriginalBytes="47D1" PatchedBytes="00BF" />
+              <Patch Address="0x00379700" OriginalBytes="40F0BF80" PatchedBytes="AFF30080" />
+              <Patch Address="0x0013C3DC" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000927A6" OriginalBytes="40F0F280" PatchedBytes="AFF30080" />
+              <Patch Address="0x00092894" OriginalBytes="40F0B580" PatchedBytes="AFF30080" />
+              <Patch Address="0x000928A2" OriginalBytes="68D0" PatchedBytes="00BF" />
+              <Patch Address="0x0013C478" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x0013C486" OriginalBytes="03D0" PatchedBytes="03E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\audiodg.exe" HashOriginal="8F2D5873578F139C725668409B6C3B1B97546111" HashPatched="C48D64172026D40CE11D1F149C67F0B9F2D4037E">
+            <Patches>
+              <Patch Address="0x00000148" OriginalBytes="35460400" PatchedBytes="C13B0400" />
+              <Patch Address="0x00000188" OriginalBytes="00F00300701A0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.20.10549.11796">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="1477FED9E175AE16327410F0C45D724B9C02197B" HashPatched="6581A029260077E81907983E32F0F8F0D0D7368A">
+            <Patches>
+              <Patch Address="0x000024AC" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000148" OriginalBytes="76610100" PatchedBytes="311C0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="0638789326CD960B1D57A41EEA3730F875520289" HashPatched="7B39A1B0056E822BF3FEDBB8229269731FE26BEE">
+            <Patches>
+              <Patch Address="0x0000D360" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000150" OriginalBytes="122C0200" PatchedBytes="CDE60100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="B9239DFE7D2CCD7318879E6A53C0E51E924924F6" HashPatched="3C9DE9B46E9267728518E701CC4D0B4CB4D57A54">
+            <Patches>
+              <Patch Address="0x000C3138" OriginalBytes="2DE970480DF10C0B8CF758FC" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000158" OriginalBytes="27431000" PatchedBytes="FBB11000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="650F9CC5C18207E8BE944C99832DA5326EA7EDE7" HashPatched="FD81354831B4ED6197B98467BECC4E90BE1D887C">
+            <Patches>
+              <Patch Address="0x00002C98" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000150" OriginalBytes="44450100" PatchedBytes="97730100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1ECD920A30E074DE8DE9F605B2B662FCB8D1C741" HashPatched="D3C00A04693C4FF8A4EF5A93879D0F7B50F99BE3">
+            <Patches>
+              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="24E10100" PatchedBytes="77160100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="AC4E0B490CCECAF73226E505BAD544F4DAD4AED6" HashPatched="1D10F36AA886AEBFA2B1A4FA8BDA4D5100CA9ACF">
+            <Patches>
+              <Patch Address="0x000B4A1E" OriginalBytes="5DD1" PatchedBytes="5DE0" />
+              <Patch Address="0x00000160" OriginalBytes="F9465000" PatchedBytes="48E54F00" />
+              <Patch Address="0x000B4C3C" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000B4C58" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000B50A0" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000B51A2" OriginalBytes="5AD0" PatchedBytes="5AE0" />
+              <Patch Address="0x000B5294" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000B52C6" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x0029EB24" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x0029F00A" OriginalBytes="09BB" PatchedBytes="21E0" />
+              <Patch Address="0x0029F090" OriginalBytes="5BB3" PatchedBytes="2BE0" />
+              <Patch Address="0x0016AC94" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x000B63CC" OriginalBytes="00F00382" PatchedBytes="00F003BA" />
+              <Patch Address="0x00294F14" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0032D026" OriginalBytes="1CD1" PatchedBytes="00BF" />
+              <Patch Address="0x000B5A00" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
+              <Patch Address="0x000B592C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0016A7F6" OriginalBytes="BAF1007F" PatchedBytes="FFF776BF" />
+              <Patch Address="0x0016A8B4" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0016A92C" OriginalBytes="C3D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016A96A" OriginalBytes="A4D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016AA2E" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0016AA6C" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
+              <Patch Address="0x0016AAA4" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
+              <Patch Address="0x0016A6EA" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
+              <Patch Address="0x000B6BE2" OriginalBytes="4ED1" PatchedBytes="00BF" />
+              <Patch Address="0x000B6CE4" OriginalBytes="CDD1" PatchedBytes="00BF" />
+              <Patch Address="0x000B6D06" OriginalBytes="3FF474AF" PatchedBytes="FFF774BF" />
+              <Patch Address="0x000B6BFE" OriginalBytes="00F04081" PatchedBytes="AFF30080" />
+              <Patch Address="0x0011D870" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000B5950" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0011D75C" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x0011D7BA" OriginalBytes="0BD0" PatchedBytes="11E0" />
+              <Patch Address="0x0011D806" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0011D35A" OriginalBytes="BAF1007F" PatchedBytes="99F74ABC" />
+              <Patch Address="0x0011D3D2" OriginalBytes="22D0" PatchedBytes="22E0" />
+              <Patch Address="0x0032D09C" OriginalBytes="1CD1" PatchedBytes="00BF" />
+              <Patch Address="0x0032D278" OriginalBytes="69D1" PatchedBytes="00BF" />
+              <Patch Address="0x0011D354" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000B6BD2" OriginalBytes="40F0F280" PatchedBytes="AFF30080" />
+              <Patch Address="0x000B6CC0" OriginalBytes="40F0B580" PatchedBytes="AFF30080" />
+              <Patch Address="0x000B6CCE" OriginalBytes="68D0" PatchedBytes="00BF" />
+              <Patch Address="0x0011D3F0" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x0011D3FE" OriginalBytes="03D0" PatchedBytes="03E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\audiodg.exe" HashOriginal="5F58374B9D9A18DD4D14BD49D8DDDD4883FB86E0" HashPatched="0FAF3D5CC8CC12254D5B808E63A4148A7CEE9392">
+            <Patches>
+              <Patch Address="0x00000148" OriginalBytes="5E040500" PatchedBytes="EAF90400" />
+              <Patch Address="0x00000188" OriginalBytes="00F00300701A0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10581.0">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="040CF95B35AF689B496F611549F50A1E9B0E556B" HashPatched="63540E5D95737262E8B6E0333E821938515C46B7">
+            <Patches>
+              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="F86F0100" PatchedBytes="4AA50100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="DC2BE77A702DE6BBD401007C670C0EAB464CEB0B" HashPatched="C2FF8852DA6F1B9D57D0034B5854B1F1B7E55CA9">
+            <Patches>
+              <Patch Address="0x0000D7E4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000150" OriginalBytes="58C60100" PatchedBytes="13810100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="8A8EE6C3E38D1D42A76AA0C655FDD107235E6974" HashPatched="717FCEEE54323297DEC1FE120A950A5EE9C545BA">
+            <Patches>
+              <Patch Address="0x000C3454" OriginalBytes="2DE970480DF10C0B8CF77EFC" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000148" OriginalBytes="5B861000" PatchedBytes="09F51000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="E05F7D8F84B5611BB1311B1194CB849D606E3EEC" HashPatched="CE98A2EF3BE84B671F5F68694A11415E9BA3E90D">
+            <Patches>
+              <Patch Address="0x000023A4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000148" OriginalBytes="85480100" PatchedBytes="40030100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="98056F1246B1B34AC6DBCCE9D2B461CFA448D49B" HashPatched="899264FE51D2E31D50B258B836165FBA80D3A14C">
+            <Patches>
+              <Patch Address="0x00002CD0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="BC370100" PatchedBytes="0F660100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="2114F0FAD7099BE55719D84354F195376F55774D" HashPatched="8B27D643934D844F6A64D11497ED9EF4EE69203B">
+            <Patches>
+              <Patch Address="0x00000150" OriginalBytes="3E205200" PatchedBytes="15045200" />
+              <Patch Address="0x000B9836" OriginalBytes="5ED1" PatchedBytes="5EE0" />
+              <Patch Address="0x000B9A5E" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000B9A7A" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000B9EB6" OriginalBytes="09B9" PatchedBytes="01E0" />
+              <Patch Address="0x000B9FB2" OriginalBytes="5AD0" PatchedBytes="5AE0" />
+              <Patch Address="0x000BA0AA" OriginalBytes="1AB9" PatchedBytes="03E0" />
+              <Patch Address="0x000BA0DC" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x002A75E8" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x002A7ACE" OriginalBytes="09BB" PatchedBytes="21E0" />
+              <Patch Address="0x002A7B54" OriginalBytes="5BB3" PatchedBytes="2BE0" />
+              <Patch Address="0x0016F01C" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x000AB3E8" OriginalBytes="00F04682" PatchedBytes="00F046BA" />
+              <Patch Address="0x002A69F8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0029D6B0" OriginalBytes="6BD1" PatchedBytes="00BF" />
+              <Patch Address="0x0035746C" OriginalBytes="06F4DBA1" PatchedBytes="46F7DBB9" />
+              <Patch Address="0x0035747A" OriginalBytes="F9D1" PatchedBytes="00BF" />
+              <Patch Address="0x000BA8D8" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
+              <Patch Address="0x000BA7CC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0016EB7E" OriginalBytes="BAF1007F" PatchedBytes="FFF776BF" />
+              <Patch Address="0x0016EC3C" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0016ECB4" OriginalBytes="C3D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016ECF2" OriginalBytes="A4D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016EDB6" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0016EDF4" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
+              <Patch Address="0x0016EE2C" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
+              <Patch Address="0x0016EA72" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABC0E" OriginalBytes="40F0F480" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABCD6" OriginalBytes="40F0A880" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABCE6" OriginalBytes="7CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000ABC26" OriginalBytes="40F08180" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABCFC" OriginalBytes="16D1" PatchedBytes="00BF" />
+              <Patch Address="0x000ABDCA" OriginalBytes="3FF437AF" PatchedBytes="FFF737BF" />
+              <Patch Address="0x000ABC44" OriginalBytes="00F0C880" PatchedBytes="AFF30080" />
+              <Patch Address="0x0011FE44" OriginalBytes="02D0" PatchedBytes="02E0" />
+              <Patch Address="0x0011FE4C" OriginalBytes="B0F1007F" PatchedBytes="8BF7F6BE" />
+              <Patch Address="0x0011FEC0" OriginalBytes="24D0" PatchedBytes="24E0" />
+              <Patch Address="0x0011FEE0" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x0011FEEE" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x00105D48" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x00105CDE" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x000BA7F0" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00105DA0" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x00105DFE" OriginalBytes="0BD0" PatchedBytes="11E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\audiodg.exe" HashOriginal="0B8DEDC37638335E2B2A26DD243F48ACDDB7DD17" HashPatched="A9BA95085EC8DAA9F9F1B59EBF6EF236C347EB96">
+            <Patches>
+              <Patch Address="0x00000150" OriginalBytes="10D00400" PatchedBytes="4CA50400" />
+              <Patch Address="0x00000190" OriginalBytes="00100400C01A0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.11">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="47355EC0BFCC689C786A8D5AB044F175CBBE78AD" HashPatched="43DC792CBEC46E5FA38669174EBAB273764534B0">
+            <Patches>
+              <Patch Address="0x000C34C4" OriginalBytes="2DE970480DF10C0B8CF756FC" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000148" OriginalBytes="DF061100" PatchedBytes="B6751000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="88DE45A259A63ED6626AF8E20340C762EEFD3009" HashPatched="4447374DA2F857AC007D8D74FA50D8EB1D7DD765">
+            <Patches>
+              <Patch Address="0x000023A4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000148" OriginalBytes="064B0100" PatchedBytes="C1050100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="CF489D92C9352D425BC29846EDE862AC8AF0BEC5" HashPatched="2FACAA73B618A2EB5B0B9CE4A394E9972F9629E1">
+            <Patches>
+              <Patch Address="0x00002CD0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="6C330100" PatchedBytes="BF610100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="FA545908961B5C3C373A68EB185678C71D3C70A2" HashPatched="CE0AD5F5D026EC3D8AC0DAFF03736EF5B12425FA">
+            <Patches>
+              <Patch Address="0x00002CD0" OriginalBytes="00000000" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="5F250100" PatchedBytes="CF8C0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="291CF03466C44BB5556EEDE4EEE1060C15F6A6FE" HashPatched="D0CFE61DABE633DBA53C9D4BED7AECF37B9B92AE">
+            <Patches>
+              <Patch Address="0x000B988E" OriginalBytes="5ED1" PatchedBytes="5EE0" />
+              <Patch Address="0x00000150" OriginalBytes="33D95100" PatchedBytes="16BD5100" />
+              <Patch Address="0x000B9AB6" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000B9AD2" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000B9F0E" OriginalBytes="09B9" PatchedBytes="01E0" />
+              <Patch Address="0x000BA00A" OriginalBytes="5AD0" PatchedBytes="5AE0" />
+              <Patch Address="0x000BA102" OriginalBytes="1AB9" PatchedBytes="03E0" />
+              <Patch Address="0x000BA134" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x002A76B8" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x002A7B9E" OriginalBytes="09BB" PatchedBytes="21E0" />
+              <Patch Address="0x002A7C24" OriginalBytes="5BB3" PatchedBytes="2BE0" />
+              <Patch Address="0x0016F048" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x000AB434" OriginalBytes="00F04682" PatchedBytes="00F046BA" />
+              <Patch Address="0x002A6AC8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0029D67C" OriginalBytes="6BD1" PatchedBytes="00BF" />
+              <Patch Address="0x003574B0" OriginalBytes="06F49FA1" PatchedBytes="46F79FB9" />
+              <Patch Address="0x003574BE" OriginalBytes="F9D1" PatchedBytes="00BF" />
+              <Patch Address="0x000BA930" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
+              <Patch Address="0x000BA824" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0016EBAA" OriginalBytes="BAF1007F" PatchedBytes="FFF776BF" />
+              <Patch Address="0x0016EC68" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0016ECE0" OriginalBytes="C3D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016ED1E" OriginalBytes="A4D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016EDE2" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0016EE20" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
+              <Patch Address="0x0016EE58" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
+              <Patch Address="0x0016EA9E" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABC5A" OriginalBytes="40F0F480" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABD22" OriginalBytes="40F0A880" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABD32" OriginalBytes="7CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000ABC72" OriginalBytes="40F08180" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABD48" OriginalBytes="16D1" PatchedBytes="00BF" />
+              <Patch Address="0x000ABE16" OriginalBytes="3FF437AF" PatchedBytes="FFF737BF" />
+              <Patch Address="0x000ABC90" OriginalBytes="00F0C880" PatchedBytes="AFF30080" />
+              <Patch Address="0x0011FE78" OriginalBytes="02D0" PatchedBytes="02E0" />
+              <Patch Address="0x0011FE80" OriginalBytes="B0F1007F" PatchedBytes="8BF702BF" />
+              <Patch Address="0x0011FEF4" OriginalBytes="24D0" PatchedBytes="24E0" />
+              <Patch Address="0x0011FF14" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x0011FF22" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x00105D80" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x00105D16" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x000BA848" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00105DD8" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x00105E36" OriginalBytes="0BD0" PatchedBytes="11E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="187ABA56D8F0D4CD3EE8557064CDF754A93C7B37" HashPatched="C455F52BE0F1CE8875F888B4A3A598539EA1D037">
+            <Patches>
+              <Patch Address="0x0000D7E4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000150" OriginalBytes="0C260200" PatchedBytes="C7E00100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\audiodg.exe" HashOriginal="EBCE638B6A9D4811D6EAE232A4AE0AA4381A5DB3" HashPatched="1AE92E1B5C3B06F87CC6A2CE0FCD20F0BE8F1001">
+            <Patches>
+              <Patch Address="0x00000150" OriginalBytes="ADE20400" PatchedBytes="41A50400" />
+              <Patch Address="0x00000190" OriginalBytes="00100400682D0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.36">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\SecRuntime.dll" HashOriginal="2AA15BC515F723F2560728A3CBE4478BD074970E" HashPatched="C1605CB02F7C87561157D14E6249B0EB9B08CC0A">
+            <Patches>
+              <Patch Address="0x0000D7E4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000150" OriginalBytes="51280200" PatchedBytes="0CE30100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="92BF7CF25E8CC892B87091719479E1FA8D8A1A42" HashPatched="421B2E49B4690CBA05AF29D0D7DC3C1DBD483D54">
+            <Patches>
+              <Patch Address="0x000C34C4" OriginalBytes="2DE970480DF10C0B8CF756FC" PatchedBytes="0149016000207047FFFFFF7F" />
+              <Patch Address="0x00000148" OriginalBytes="B8AA1000" PatchedBytes="8E191100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="582A5B83320F5DB537F1CF49490C885ABAE9ECF4" HashPatched="AAFDE1104808523A0108B3F636E9C730EBC673C7">
+            <Patches>
+              <Patch Address="0x000023A4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000148" OriginalBytes="7AF30000" PatchedBytes="35AE0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="D72EFD5A413D3F227EA86F070117C0F1BB67FFA4" HashPatched="CE07E4B891EA4496111234F69F50F06258F11C6D">
+            <Patches>
+              <Patch Address="0x00002CD0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="99800100" PatchedBytes="ECAE0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="28E0126845681AA7B7FD124D404C03F3E150BA86" HashPatched="824AC25AE8D3E86DB3CFEA783271B6C449D81F3A">
+            <Patches>
+              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="14FD0000" PatchedBytes="66320100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\audiodg.exe" HashOriginal="73361D56C1115AF1DCF93F64B874EF751EFCBE55" HashPatched="86AAF66CA0010CF64F42992C6E967C5B88B778EE">
+            <Patches>
+              <Patch Address="0x00000150" OriginalBytes="32890400" PatchedBytes="C64B0400" />
+              <Patch Address="0x00000190" OriginalBytes="00100400682D0000" PatchedBytes="0000000000000000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="89E655120D2846F826166B7A8107D9B43E92C290" HashPatched="E028A15E5D52B5322170EE8E429B5CE9BB9C7D24">
+            <Patches>
+              <Patch Address="0x000B9992" OriginalBytes="5ED1" PatchedBytes="5EE0" />
+              <Patch Address="0x00000150" OriginalBytes="38925100" PatchedBytes="07255200" />
+              <Patch Address="0x000B9BBA" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000B9BD6" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000BA012" OriginalBytes="09B9" PatchedBytes="01E0" />
+              <Patch Address="0x000BA10E" OriginalBytes="5AD0" PatchedBytes="5AE0" />
+              <Patch Address="0x000BA206" OriginalBytes="1AB9" PatchedBytes="03E0" />
+              <Patch Address="0x000BA238" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x002A76B8" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x002A7B9E" OriginalBytes="09BB" PatchedBytes="21E0" />
+              <Patch Address="0x002A7C24" OriginalBytes="5BB3" PatchedBytes="2BE0" />
+              <Patch Address="0x0016F0B0" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x000AB544" OriginalBytes="00F04682" PatchedBytes="00F046BA" />
+              <Patch Address="0x002A6AC8" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0029D67C" OriginalBytes="6BD1" PatchedBytes="00BF" />
+              <Patch Address="0x003574CC" OriginalBytes="06F491A1" PatchedBytes="46F791B9" />
+              <Patch Address="0x003574DA" OriginalBytes="F9D1" PatchedBytes="00BF" />
+              <Patch Address="0x000BAA34" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
+              <Patch Address="0x000BA928" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0016EC16" OriginalBytes="28D1" PatchedBytes="74E7" />
+              <Patch Address="0x0016ECD0" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0016ED48" OriginalBytes="C3D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016ED86" OriginalBytes="A4D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016EE4A" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0016EE88" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
+              <Patch Address="0x0016EEC0" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
+              <Patch Address="0x0016EB06" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABD6A" OriginalBytes="40F0F480" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABE32" OriginalBytes="40F0A880" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABE42" OriginalBytes="7CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000ABD82" OriginalBytes="40F08180" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABE58" OriginalBytes="16D1" PatchedBytes="00BF" />
+              <Patch Address="0x000ABF26" OriginalBytes="3FF437AF" PatchedBytes="FFF737BF" />
+              <Patch Address="0x000ABDA0" OriginalBytes="00F0C880" PatchedBytes="AFF30080" />
+              <Patch Address="0x0011FECC" OriginalBytes="02D0" PatchedBytes="00BF" />
+              <Patch Address="0x0011FED4" OriginalBytes="B0F1007F" PatchedBytes="8BF760BF" />
+              <Patch Address="0x0011FF48" OriginalBytes="24D0" PatchedBytes="24E0" />
+              <Patch Address="0x0011FF68" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x0011FF76" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x00105DDC" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x00105D72" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x000BA94C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00105E34" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x00105E92" OriginalBytes="0BD0" PatchedBytes="11E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15063.0">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="9A1C677EED430AF150FD0148F2FA580453792C84" HashPatched="339E85FAD5077B4E5DD61B2F9759EF2D5A914B06">
+            <Patches>
+              <Patch Address="0x00002634" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="A22C0100" PatchedBytes="5DE70000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="5B01B46E277A05A742AE7D22E3CD4E0D6A368329" HashPatched="3449F5A9B22F5AF942377D7153DD4C749683EF2D">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="818E0100" PatchedBytes="D4BC0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="5AE0712C0511C34B9E91E460CD88CE4C793213A1" HashPatched="8293DB91D8F02436059BBF47A77F4AFBE9BD2079">
+            <Patches>
+              <Patch Address="0x0012DB10" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="507B1700" PatchedBytes="454F1700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="F5C8702BED7A681BFAF2F781493772BFCF62497B" HashPatched="D9562721B3C87F87521215F11EAD04E1A36C7967">
+            <Patches>
+              <Patch Address="0x00035830" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x00035A46" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x00035A66" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x00035EB8" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x00035F78" OriginalBytes="19F0" PatchedBytes="7DE0" />
+              <Patch Address="0x000360BA" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x000360EA" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x000360AA" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x00036098" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x002AB9FA" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x002ABEF4" OriginalBytes="27D1" PatchedBytes="27E0" />
+              <Patch Address="0x002ABF06" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x00179E4E" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0006E1C4" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x00251FF0" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0026D644" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x002E1FD4" OriginalBytes="0BF4C88B" PatchedBytes="8BF7C8BB" />
+              <Patch Address="0x002E1FF8" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x00034DE8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0006E734" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00179A10" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x00179A7C" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00179AFA" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x00179B38" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x00179BFC" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x00179C3E" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x00179C7E" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x001798C0" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0006EDA6" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x0006EE8A" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x0006EE9A" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x0006EDB6" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0006EEB0" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x0006EE30" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x0006EDCA" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E0644" OriginalBytes="BEF1000F" PatchedBytes="8EF7F5BB" />
+              <Patch Address="0x000E0782" OriginalBytes="0EF4568B" PatchedBytes="8EF756BB" />
+              <Patch Address="0x000E06B0" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000CEB7C" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000CEB12" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0006E630" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000CE92C" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000CE990" OriginalBytes="0AD0" PatchedBytes="10E0" />
+              <Patch Address="0x00000168" OriginalBytes="E4DB5300" PatchedBytes="82385400" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="2DFE0BD2E996008498D1FBCFE147A4331ABC0720" HashPatched="1A0AB26F7F42B65D282601A241E5EA727165C37E">
+            <Patches>
+              <Patch Address="0x000A884E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="62F91000" PatchedBytes="E91F1000" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="2DFE0BD2E996008498D1FBCFE147A4331ABC0720" HashPatched="5CC226BD63C22D3970A3380B363C2A048EADE9E6">
+                <Patches>
+                  <Patch Address="0x000A8784" OriginalBytes="2DE9F04B" PatchedBytes="00207047" />
+                  <Patch Address="0x00000148" OriginalBytes="62F91000" PatchedBytes="B52B1000" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15063.297">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="AFEF61703D8C42933BC4BB68F4DEA14BC4C32E58" HashPatched="C0A12ECB84BC2377752EED0F7BE1BB14C97E0BA0">
+            <Patches>
+              <Patch Address="0x00002634" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="FC2F0100" PatchedBytes="B7EA0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="992830FBE32A274EB40851AEC1FE0FC571EEA8AC" HashPatched="9B885860C99553C2655F308B5DEF16981EE7D97D">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="F4580100" PatchedBytes="47870100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="99A6323A0A0CF08288DDB0DEC3904EC7C8DF2AE6" HashPatched="AD80572B88332FB6CC2F5AA18C164D83543BEC4F">
+            <Patches>
+              <Patch Address="0x0012DB10" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="34811700" PatchedBytes="29551700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="156F11F19D3740CD885CA957511ECDE6F26981CE" HashPatched="21B4B8248106A14198ECBBDA70DE632BCB83B20E">
+            <Patches>
+              <Patch Address="0x00035830" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x00000168" OriginalBytes="A9925400" PatchedBytes="28405400" />
+              <Patch Address="0x00035A46" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x00035A66" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x00035EB8" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x00035F78" OriginalBytes="19F0" PatchedBytes="7DE0" />
+              <Patch Address="0x000360BA" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x000360EA" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x000360AA" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x00036098" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x002ABDEE" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x002AC2E6" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x002AC2FA" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x00179E7E" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0006E1C4" OriginalBytes="00F0" PatchedBytes="72E1" />
+              <Patch Address="0x002523E4" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0026DA38" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x002E232C" OriginalBytes="0BF4168C" PatchedBytes="8BF716BC" />
+              <Patch Address="0x002E2350" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x00034DE8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0006E734" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00179A40" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x00179AAC" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00179B2A" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x00179B68" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x00179C2C" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x00179C6E" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x00179CAE" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x001798F0" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0006EDA6" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x0006EE8A" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x0006EE9A" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x0006EDB6" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0006EEB0" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x0006EE30" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x0006EDCA" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E0626" OriginalBytes="C0F80CE0" PatchedBytes="8EF704BC" />
+              <Patch Address="0x000E0782" OriginalBytes="0EF4568B" PatchedBytes="8EF756BB" />
+              <Patch Address="0x000E06B0" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000CEB7C" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000CEB12" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0006E630" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000CE92C" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000CE990" OriginalBytes="0AD0" PatchedBytes="10E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="B971EFF98207F66475ED5688C4CD943FF3B3A6A3" HashPatched="DFD74A46BE69C92791A09164DE7382112882E591">
+            <Patches>
+              <Patch Address="0x000A884E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="89881000" PatchedBytes="0FAF1000" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="B971EFF98207F66475ED5688C4CD943FF3B3A6A3" HashPatched="1262C63E943B1E7505E0B0A26B8CBD84F4C40313">
+                <Patches>
+                  <Patch Address="0x000A8784" OriginalBytes="2DE9F04B" PatchedBytes="00207047" />
+                  <Patch Address="0x00000148" OriginalBytes="89881000" PatchedBytes="DBBA1000" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.318">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="CAB388D2F3FAFE13AD0C137299DD3FE1A8615384" HashPatched="AF9FFC8E71D67ECCD90E7A95BF10579300521025">
+            <Patches>
+              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="3B210100" PatchedBytes="8D560100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="B4DA203053428208B108BF96D450AB58D6F839AB" HashPatched="08A575DE048FF077332AA7ACF50E511F061C4209">
+            <Patches>
+              <Patch Address="0x000023A4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000148" OriginalBytes="C6160100" PatchedBytes="81D10000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="F4EED9633DD8BD02BDD996E0B3EE398EEFEAFC06" HashPatched="F797CFA297B36C74D39113D116FE117DDF0143C6">
+            <Patches>
+              <Patch Address="0x00002CD0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="C8E50000" PatchedBytes="1B140100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="1EB718CF1C64B74E554754F1346813A0EF247D70" HashPatched="EE17DFDAA7968BE18B6895647AC51451D51D3C35">
+            <Patches>
+              <Patch Address="0x000C3960" OriginalBytes="2DE970480DF10C0B8CF7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="031F1100" PatchedBytes="A0F21000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="8AB0D0C96039E96098DCECA08956C7737595B2F7" HashPatched="F88DA1325CC1AAA3B76973530F1CE6546E6C0006">
+            <Patches>
+              <Patch Address="0x000A1416" OriginalBytes="5ED1" PatchedBytes="5EE0" />
+              <Patch Address="0x00000150" OriginalBytes="876E5100" PatchedBytes="95215200" />
+              <Patch Address="0x000A163E" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000A165A" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000A1A96" OriginalBytes="09B9" PatchedBytes="01E0" />
+              <Patch Address="0x000A1B92" OriginalBytes="5AD0" PatchedBytes="5AE0" />
+              <Patch Address="0x000A1C8A" OriginalBytes="1AB9" PatchedBytes="03E0" />
+              <Patch Address="0x000A1CBC" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x0028F6B0" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x0028FB96" OriginalBytes="09BB" PatchedBytes="21E0" />
+              <Patch Address="0x0028FC1C" OriginalBytes="5BB3" PatchedBytes="2BE0" />
+              <Patch Address="0x0016F0B8" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x00092FC0" OriginalBytes="00F04682" PatchedBytes="00F046BA" />
+              <Patch Address="0x0028EAC0" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x00285670" OriginalBytes="6BD1" PatchedBytes="00BF" />
+              <Patch Address="0x00351338" OriginalBytes="34F45582" PatchedBytes="34F755BA" />
+              <Patch Address="0x00351346" OriginalBytes="F9D1" PatchedBytes="00BF" />
+              <Patch Address="0x000A24B8" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
+              <Patch Address="0x000A23AC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0016EC1A" OriginalBytes="BAF1" PatchedBytes="76E7" />
+              <Patch Address="0x0016ECD8" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0016ED50" OriginalBytes="C3D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016ED8E" OriginalBytes="A4D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016EE52" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0016EE90" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
+              <Patch Address="0x0016EEC8" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
+              <Patch Address="0x0016EB0E" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
+              <Patch Address="0x000937E6" OriginalBytes="40F0F480" PatchedBytes="AFF30080" />
+              <Patch Address="0x000938AE" OriginalBytes="40F0A880" PatchedBytes="AFF30080" />
+              <Patch Address="0x000938BE" OriginalBytes="7CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000937FE" OriginalBytes="40F08180" PatchedBytes="AFF30080" />
+              <Patch Address="0x000938D4" OriginalBytes="16D1" PatchedBytes="00BF" />
+              <Patch Address="0x000939A2" OriginalBytes="3FF437AF" PatchedBytes="FFF737BF" />
+              <Patch Address="0x0009381C" OriginalBytes="00F0C880" PatchedBytes="AFF30080" />
+              <Patch Address="0x0011890C" OriginalBytes="02D0" PatchedBytes="02E0" />
+              <Patch Address="0x00118914" OriginalBytes="B0F1007F" PatchedBytes="7AF77EBF" />
+              <Patch Address="0x00118988" OriginalBytes="24D0" PatchedBytes="24E0" />
+              <Patch Address="0x001189A8" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x001189B6" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x000FF394" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000FF32A" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x000A23D0" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000FF3EC" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x000FF44A" OriginalBytes="0BD0" PatchedBytes="11E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="287A550060C163F5E8CF5451515FCD2BDF5C53FA" HashPatched="C2979D6FDC4B43FD2314D8A43A81CC55D95A9349">
+            <Patches>
+              <Patch Address="0x00054AB6" OriginalBytes="6BB9" PatchedBytes="0DE0" />
+              <Patch Address="0x00000140" OriginalBytes="1E940A00" PatchedBytes="C0BA0A00" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="287A550060C163F5E8CF5451515FCD2BDF5C53FA" HashPatched="92D579CA1EDE2F343896559FF85E866B44417192">
+                <Patches>
+                  <Patch Address="0x000549EC" OriginalBytes="2DE9F04B" PatchedBytes="00207047" />
+                  <Patch Address="0x00000140" OriginalBytes="1E940A00" PatchedBytes="70C60A00" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.494">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="903CD4BC60BA9BFD2409266F783F6F8CCD382145" HashPatched="AAE13F70403EB3A18A04AC0D289519E5E937A74C">
+            <Patches>
+              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="00130100" PatchedBytes="52480100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="F4F271CB5A6FD6329FD0EEA1A608077F7B9FAE3B" HashPatched="AB1EA75BF535BB27DBD445CAE263CD700075939B">
+            <Patches>
+              <Patch Address="0x000023A4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000148" OriginalBytes="690A0100" PatchedBytes="24C50000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="90BB9DF8ACCF93BD2AD288B1E4E0976EC9303548" HashPatched="A2C27832E9B144A8124FD26348FD71132913674C">
+            <Patches>
+              <Patch Address="0x00002CD0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="DB080100" PatchedBytes="2E370100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="66223648145D210CB5208571C95AB4950C2FBFAE" HashPatched="E0A1EABF50769FDF1F32F2C8123F711A6F390DDA">
+            <Patches>
+              <Patch Address="0x000C3930" OriginalBytes="2DE970480DF10C0B8CF7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="679B1000" PatchedBytes="046F1000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="E8CE0EBC09DE39CCEA7BC0988850E08DBF5715A5" HashPatched="4DF82E2621C87FEEE593D3F38E7299E0BC95B4B7">
+            <Patches>
+              <Patch Address="0x00097822" OriginalBytes="5ED1" PatchedBytes="5EE0" />
+              <Patch Address="0x00000150" OriginalBytes="DB425200" PatchedBytes="31D65100" />
+              <Patch Address="0x00097A4A" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x00097A66" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x00097EA2" OriginalBytes="09B9" PatchedBytes="01E0" />
+              <Patch Address="0x00097F9E" OriginalBytes="5AD0" PatchedBytes="5AE0" />
+              <Patch Address="0x00098096" OriginalBytes="1AB9" PatchedBytes="03E0" />
+              <Patch Address="0x000980C8" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x002A6D14" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x002A71FA" OriginalBytes="09BB" PatchedBytes="21E0" />
+              <Patch Address="0x002A7280" OriginalBytes="5BB3" PatchedBytes="2BE0" />
+              <Patch Address="0x0016F124" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x000892BC" OriginalBytes="00F04682" PatchedBytes="00F046BA" />
+              <Patch Address="0x002A6124" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0029B59C" OriginalBytes="6BD1" PatchedBytes="00BF" />
+              <Patch Address="0x0035708C" OriginalBytes="04F441A3" PatchedBytes="44F741BB" />
+              <Patch Address="0x0035709A" OriginalBytes="F9D1" PatchedBytes="00BF" />
+              <Patch Address="0x000988C4" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
+              <Patch Address="0x000987B8" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0016EC86" OriginalBytes="BAF1" PatchedBytes="76E7" />
+              <Patch Address="0x0016ED44" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0016EDBC" OriginalBytes="C3D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016EDFA" OriginalBytes="A4D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016EEBE" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0016EEFC" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
+              <Patch Address="0x0016EF34" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
+              <Patch Address="0x0016EB7A" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
+              <Patch Address="0x00089AE2" OriginalBytes="40F0F480" PatchedBytes="AFF30080" />
+              <Patch Address="0x00089BAA" OriginalBytes="40F0A880" PatchedBytes="AFF30080" />
+              <Patch Address="0x00089BBA" OriginalBytes="7CD0" PatchedBytes="00BF" />
+              <Patch Address="0x00089AFA" OriginalBytes="40F08180" PatchedBytes="AFF30080" />
+              <Patch Address="0x00089BD0" OriginalBytes="16D1" PatchedBytes="00BF" />
+              <Patch Address="0x00089C9E" OriginalBytes="3FF437AF" PatchedBytes="FFF737BF" />
+              <Patch Address="0x00089B18" OriginalBytes="00F0C880" PatchedBytes="AFF30080" />
+              <Patch Address="0x00115BEC" OriginalBytes="02D0" PatchedBytes="02E0" />
+              <Patch Address="0x00115BF4" OriginalBytes="B0F1007F" PatchedBytes="73F78CBF" />
+              <Patch Address="0x00115C68" OriginalBytes="24D0" PatchedBytes="24E0" />
+              <Patch Address="0x00115C88" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x00115C96" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x000FD320" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000FD2B6" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x000987DC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000FD378" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x000FD3D6" OriginalBytes="0BD0" PatchedBytes="11E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="7E383C4792E425799C9691D0EC5B6D9880F394F4" HashPatched="AE778A7BA9427CB402645837A91EACAA350D1764">
+            <Patches>
+              <Patch Address="0x00054AB6" OriginalBytes="6BB9" PatchedBytes="0DE0" />
+              <Patch Address="0x00000140" OriginalBytes="66D30A00" PatchedBytes="08FA0A00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10240.16384">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="222E73E695D4016F85BBD40DA2A3524E71422D6F" HashPatched="659B23061601921F8C3DCD3A6823AE080ECD6146">
+            <Patches>
+              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="392F0100" PatchedBytes="8B640100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="6BF83EEBBB3BF0886473D8D09348D4C10AC28387" HashPatched="350A9F65701C113D198F8AD4F6684C95E5A97623">
+            <Patches>
+              <Patch Address="0x00002BF8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000150" OriginalBytes="9BC80000" PatchedBytes="EEF60000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="667673B16A4C2E95C9AA71E7398D066008A9845A" HashPatched="1B04DA3FB8CC5DE9656CAD256C00CE450E23A572">
+            <Patches>
+              <Patch Address="0x000C0FB4" OriginalBytes="2DE970480DF10C0B8AF7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000150" OriginalBytes="D3671000" PatchedBytes="723B1000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="EE5866A17A24CA80A3210131E1A378032E55A00C" HashPatched="59EB4839A13E38E53DE6791C6BF0BF0A54E19333">
+            <Patches>
+              <Patch Address="0x000024AC" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000148" OriginalBytes="FE9F0000" PatchedBytes="B85A0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="68FF93E1EAB6E263B7A65048C9385135759EF9FB" HashPatched="52C1400223D1FCA6862CDA22F145DA20F71005B7">
+            <Patches>
+              <Patch Address="0x00078EF6" OriginalBytes="6ED1" PatchedBytes="6EE0" />
+              <Patch Address="0x00000160" OriginalBytes="5B875800" PatchedBytes="0B515900" />
+              <Patch Address="0x00079138" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x00079156" OriginalBytes="29B9" PatchedBytes="05E0" />
+              <Patch Address="0x0007960C" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x00079824" OriginalBytes="0BD2" PatchedBytes="0BE0" />
+              <Patch Address="0x0029EC88" OriginalBytes="E1B9" PatchedBytes="1CE0" />
+              <Patch Address="0x0029F198" OriginalBytes="09BB" PatchedBytes="21E0" />
+              <Patch Address="0x0029F21E" OriginalBytes="5BB3" PatchedBytes="2BE0" />
+              <Patch Address="0x001A4648" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0007A548" OriginalBytes="00F01782" PatchedBytes="00F017BA" />
+              <Patch Address="0x00279EC0" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x002F1174" OriginalBytes="40F0B180" PatchedBytes="AFF30080" />
+              <Patch Address="0x003B6EB4" OriginalBytes="3AF46882" PatchedBytes="3AF768BA" />
+              <Patch Address="0x003B6EE4" OriginalBytes="E8D1" PatchedBytes="00BF" />
+              <Patch Address="0x0003A3E8" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
+              <Patch Address="0x0004AFC0" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x001A41AA" OriginalBytes="BAF1007F" PatchedBytes="FFF776BF" />
+              <Patch Address="0x001A4268" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x001A42E0" OriginalBytes="C3D1" PatchedBytes="00BF" />
+              <Patch Address="0x001A431E" OriginalBytes="A4D1" PatchedBytes="00BF" />
+              <Patch Address="0x001A43E2" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x001A4420" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
+              <Patch Address="0x001A4458" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
+              <Patch Address="0x001A409E" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0007AD5E" OriginalBytes="40F0FB80" PatchedBytes="AFF30080" />
+              <Patch Address="0x0007AE50" OriginalBytes="40F0B580" PatchedBytes="AFF30080" />
+              <Patch Address="0x0007AE5E" OriginalBytes="68D0" PatchedBytes="00BF" />
+              <Patch Address="0x0007AD74" OriginalBytes="4DD1" PatchedBytes="00BF" />
+              <Patch Address="0x0007AE74" OriginalBytes="CDD1" PatchedBytes="00BF" />
+              <Patch Address="0x0007AEFA" OriginalBytes="3FF443AF" PatchedBytes="FFF743BF" />
+              <Patch Address="0x0007AD90" OriginalBytes="00F03C81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0012DF4C" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x0012DF52" OriginalBytes="BAF1007F" PatchedBytes="4CF717BF" />
+              <Patch Address="0x0012DFCA" OriginalBytes="22D0" PatchedBytes="22E0" />
+              <Patch Address="0x0012DFE8" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x0012DFF6" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x0011D9CC" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x0011D962" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0004AFE4" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0011D8B8" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x0011D916" OriginalBytes="0BD0" PatchedBytes="11E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="4490A1AECF60876F27B53BFBA471890D4E0CAA9A" HashPatched="22242F327527CA42A88F200C0EB649B58EEDFC9B">
+            <Patches>
+              <Patch Address="0x0004F922" OriginalBytes="6BB9" PatchedBytes="0DE0" />
+              <Patch Address="0x00000150" OriginalBytes="D0AA0900" PatchedBytes="72D10900" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.107">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1EE98D02C45D89E9975664B9F2897E52DA797D0C" HashPatched="CB63BB55746E0B757992724FF2785968C06A91E0">
+            <Patches>
+              <Patch Address="0x00005F98" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="E56D0100" PatchedBytes="37A30100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="D8F9BF9E8B60078F564B817B2DE5B17327D87B09" HashPatched="C421C0398EA695EBE9D503CB264AA20829C940BD">
+            <Patches>
+              <Patch Address="0x00002CD0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="D75A0100" PatchedBytes="2A890100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="11894FA68CE4C718EC8AA80F716E72A9CDCE3650" HashPatched="4C84A789218F8B02F904955A11E333160A9B93C4">
+            <Patches>
+              <Patch Address="0x000C34C4" OriginalBytes="2DE970480DF10C0B8CF7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000148" OriginalBytes="236A1000" PatchedBytes="C03D1000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="C249DEFF718FA93F8163C6827DA1240DF90A4604" HashPatched="2187232F9F5FC59A39B44678E882E9C65C492D45">
+            <Patches>
+              <Patch Address="0x000023A4" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000148" OriginalBytes="59630100" PatchedBytes="141E0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="077146F9D9541AA5156FCC5E91FE7237B595CCA4" HashPatched="E76FC3445E73CB96ABF9B1AE14693E6C8DAE9AE6">
+            <Patches>
+              <Patch Address="0x000B99B4" OriginalBytes="7BB1" PatchedBytes="0FE0" />
+              <Patch Address="0x00000150" OriginalBytes="DB605100" PatchedBytes="7B485100" />
+              <Patch Address="0x000B9BBA" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000B9BD6" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000BA012" OriginalBytes="09B9" PatchedBytes="01E0" />
+              <Patch Address="0x000BA10E" OriginalBytes="5AD0" PatchedBytes="5AE0" />
+              <Patch Address="0x000BA206" OriginalBytes="1AB9" PatchedBytes="03E0" />
+              <Patch Address="0x000BA238" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x002A7790" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x002A7C76" OriginalBytes="09BB" PatchedBytes="21E0" />
+              <Patch Address="0x002A7CFC" OriginalBytes="5BB3" PatchedBytes="2BE0" />
+              <Patch Address="0x0016F0E0" OriginalBytes="E3B9" PatchedBytes="1CE0" />
+              <Patch Address="0x000AB544" OriginalBytes="00F04682" PatchedBytes="00F046BA" />
+              <Patch Address="0x002A6BA0" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0029D750" OriginalBytes="6BD1" PatchedBytes="00BF" />
+              <Patch Address="0x003575E8" OriginalBytes="06F46DA1" PatchedBytes="46F76DB9" />
+              <Patch Address="0x003575F6" OriginalBytes="F9D1" PatchedBytes="00BF" />
+              <Patch Address="0x000BAA34" OriginalBytes="2DE9FE4F" PatchedBytes="01207047" />
+              <Patch Address="0x000BA928" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0016EC42" OriginalBytes="BAF1" PatchedBytes="76E7" />
+              <Patch Address="0x0016ECAA" OriginalBytes="3FF442AF" PatchedBytes="FFF742BF" />
+              <Patch Address="0x0016ED00" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0016ED78" OriginalBytes="C3D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016EDB6" OriginalBytes="A4D1" PatchedBytes="00BF" />
+              <Patch Address="0x0016EE7A" OriginalBytes="7FF442AF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0016EEB8" OriginalBytes="3FF43BAE" PatchedBytes="FFF73BBE" />
+              <Patch Address="0x0016EEF0" OriginalBytes="3FF41FAE" PatchedBytes="FFF71FBE" />
+              <Patch Address="0x0016EB36" OriginalBytes="00F0EC81" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABD6A" OriginalBytes="40F0F480" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABE32" OriginalBytes="40F0A880" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABE42" OriginalBytes="7CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000ABD82" OriginalBytes="40F08180" PatchedBytes="AFF30080" />
+              <Patch Address="0x000ABE58" OriginalBytes="16D1" PatchedBytes="00BF" />
+              <Patch Address="0x000ABF26" OriginalBytes="3FF437AF" PatchedBytes="FFF737BF" />
+              <Patch Address="0x000ABDA0" OriginalBytes="00F0C880" PatchedBytes="AFF30080" />
+              <Patch Address="0x0011FEF0" OriginalBytes="02D0" PatchedBytes="02E0" />
+              <Patch Address="0x0011FEF8" OriginalBytes="B0F1007F" PatchedBytes="8BF74EBF" />
+              <Patch Address="0x0011FF6C" OriginalBytes="24D0" PatchedBytes="24E0" />
+              <Patch Address="0x0011FF8C" OriginalBytes="03D1" PatchedBytes="03E0" />
+              <Patch Address="0x0011FF9A" OriginalBytes="03D0" PatchedBytes="03E0" />
+              <Patch Address="0x00105DF8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x00105D8E" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x000BA94C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00105E50" OriginalBytes="11D0" PatchedBytes="09E0" />
+              <Patch Address="0x00105EAE" OriginalBytes="0BD0" PatchedBytes="11E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="079533A1183A1C86C4F1596EA3D76F183FA0450F" HashPatched="C9A42FC3F80E2983721617BAE41A80A9D143FD89">
+            <Patches>
+              <Patch Address="0x00054AB6" OriginalBytes="6BB9" PatchedBytes="0DE0" />
+              <Patch Address="0x00000140" OriginalBytes="D6780A00" PatchedBytes="789F0A00" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="079533A1183A1C86C4F1596EA3D76F183FA0450F" HashPatched="924443E69C1D80FE8CA297AE9689CB52EEB89E8C">
+                <Patches>
+                  <Patch Address="0x000549EC" OriginalBytes="2DE9F04B" PatchedBytes="00207047" />
+                  <Patch Address="0x00000140" OriginalBytes="D6780A00" PatchedBytes="28AB0A00" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.1">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="DA52084257CFB047CA81A87EBA7AC977C7228DD7" HashPatched="0633EBC4C62B3563893641047F33E06B03E43D0B">
+            <Patches>
+              <Patch Address="0x000A117C" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x00000168" OriginalBytes="33925400" PatchedBytes="055C5400" />
+              <Patch Address="0x000A1392" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000A13B2" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000A1804" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000A18C4" OriginalBytes="19F0" PatchedBytes="7DE0" />
+              <Patch Address="0x000A1A06" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x000A1A36" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x000A19F6" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000A19E4" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x0024E12A" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x0024E622" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x0024E636" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x0017A40A" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x000718DC" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x002A0774" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0027D878" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x002E71C4" OriginalBytes="16F4EA8B" PatchedBytes="96F7EABB" />
+              <Patch Address="0x002E71E8" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x000A0734" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00071E4C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00179FCC" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x0017A038" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0017A0B6" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x0017A0F4" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x0017A1B8" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0017A1FA" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x0017A23A" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00179E7C" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x000724BE" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x000725A2" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x000725B2" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x000724CE" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x000725C8" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x00072548" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x000724E2" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E51D0" OriginalBytes="BEF1000F" PatchedBytes="8DF7BBB9" />
+              <Patch Address="0x000E530E" OriginalBytes="0DF41C89" PatchedBytes="8DF71CB9" />
+              <Patch Address="0x000E523C" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F6AD4" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F6A6A" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x00071D48" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000F6884" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000F68E8" OriginalBytes="0AD0" PatchedBytes="10E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="01D1A2F1D7FEBA438F5B06541C2F45C4063AE777" HashPatched="071B9B3E701EC0DB1A118D6F81F3E9A5A8EA49B5">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="8C040100" PatchedBytes="DF320100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="63AEB8060D83670576E3D55DAC70B7A7C67A3CB5" HashPatched="0F8CAD7062B78E2877562315E3BDFBBAC4430A79">
+            <Patches>
+              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="7AAC1700" PatchedBytes="6F801700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="D50CDED0F9D54F16DCA4BAB35DFBB7C00F4BBE64" HashPatched="A961BB5533D171977B78A64DDFB269F650779D44">
+            <Patches>
+              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="1B900000" PatchedBytes="D54A0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="8B0E5EA8C0C100705C06ABBD3C252AFE09304CFC" HashPatched="F2484DF9E304DD30690856A432968F06CAAED619">
+            <Patches>
+              <Patch Address="0x000A882E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="3AFE1000" PatchedBytes="C1241000" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="8B0E5EA8C0C100705C06ABBD3C252AFE09304CFC" HashPatched="456A05A3D0020C6232D245A4773039E7ACB2F594">
+                <Patches>
+                  <Patch Address="0x000A8764" OriginalBytes="2DE9F04B" PatchedBytes="00207047" />
+                  <Patch Address="0x00000148" OriginalBytes="3AFE1000" PatchedBytes="8D301000" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.12">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="EB0C4F79F48FB0A98C497BEF59C15A3BA7E3F5CC" HashPatched="D764B4B4CE269F3EF5F7D97CB7C59A7B53363263">
+            <Patches>
+              <Patch Address="0x000A1120" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x00000168" OriginalBytes="E5B15400" PatchedBytes="B70B5400" />
+              <Patch Address="0x000A1336" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000A1356" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000A17A8" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000A1868" OriginalBytes="19F0" PatchedBytes="7DE0" />
+              <Patch Address="0x000A19AA" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x000A19DA" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x000A199A" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000A1988" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x0024E2A2" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x0024E79A" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x0024E7AE" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x0017A4BE" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x00071880" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x002A0C64" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0027D9F8" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x002E76A0" OriginalBytes="16F43C8A" PatchedBytes="96F73CBA" />
+              <Patch Address="0x002E76C4" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x000A06D8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00071DF0" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0017A080" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x0017A0EC" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0017A16A" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x0017A1A8" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x0017A26C" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0017A2AE" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x0017A2EE" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00179F30" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x00072462" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x00072546" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x00072556" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x00072472" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0007256C" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x000724EC" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x00072486" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E5168" OriginalBytes="BEF1007F" PatchedBytes="8DF7C1B9" />
+              <Patch Address="0x000E52B2" OriginalBytes="0DF41C89" PatchedBytes="8DF71CB9" />
+              <Patch Address="0x000E51E0" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F6A80" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F6A16" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x00071CEC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000F6830" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000F6894" OriginalBytes="0AD0" PatchedBytes="0AE0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="F3CD62EC78E067357C409529065D55FD232E4D4F" HashPatched="4A8D7D9F534CBCAACE7A1FB88B64AC3049C7E0B5">
+            <Patches>
+              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="AB900000" PatchedBytes="654B0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="DDDDA0628A91039BC704B39F0775D5118C60B51E" HashPatched="B836259771F1D6C53F5789F8AD42671F1568628D">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="C9230100" PatchedBytes="1C520100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="4FBC261278637DB6913DF9245BF79FF45214C312" HashPatched="A43A3515422204DA3F2FDAC98B1BDED525F219FE">
+            <Patches>
+              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="0AAD1700" PatchedBytes="FF801700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="D82628079D20752E2A96F1D00AC6A9D66C973FAF" HashPatched="947E010E59B8271140B108E8A93BEE06DA5F7AD8">
+            <Patches>
+              <Patch Address="0x000A882E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="659B1000" PatchedBytes="EBC11000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.124">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="9BFD87C00B7FCF5ED9354874B87D7518E4DFA8DF" HashPatched="E4ECF771710D11A494DCF8E75B303F5BC79503E5">
+            <Patches>
+              <Patch Address="0x000A1120" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x00000168" OriginalBytes="2D075400" PatchedBytes="FE605400" />
+              <Patch Address="0x000A1336" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000A1356" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000A17A8" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000A1868" OriginalBytes="19F0" PatchedBytes="7DE0" />
+              <Patch Address="0x000A19AA" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x000A19DA" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x000A199A" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000A1988" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x0024E2A2" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x0024E79A" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x0024E7AE" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x0017A4BE" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x00071880" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x002A0C64" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0027D9F8" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x002E76A0" OriginalBytes="16F43C8A" PatchedBytes="96F73CBA" />
+              <Patch Address="0x002E76C4" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x000A06D8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00071DF0" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0017A080" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x0017A0EC" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0017A16A" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x0017A1A8" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x0017A26C" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0017A2AE" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x0017A2EE" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00179F30" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x00072462" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x00072546" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x00072556" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x00072472" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0007256C" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x000724EC" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x00072486" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E5168" OriginalBytes="BEF1007F" PatchedBytes="8DF7C1B9" />
+              <Patch Address="0x000E52B2" OriginalBytes="0DF41C89" PatchedBytes="8DF71CB9" />
+              <Patch Address="0x000E51E0" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F6A80" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F6A16" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x00071CEC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000F6830" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000F6894" OriginalBytes="0AD0" PatchedBytes="0AE0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="2DA15B525F50219C171A890EAC7FC31DCA08F15C" HashPatched="5511FF2E4FE5351AE11A8604F821A81EF036034D">
+            <Patches>
+              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="01920000" PatchedBytes="BB4C0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="400DD1EDB960E1BB6FB5DDB3BBED4A2CD4D063AE" HashPatched="218B3521EFD536A0A77876C6953EC2028862CA83">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="F5130100" PatchedBytes="48420100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="D8F4D8051F4366ED6ADF20E7522C7C200FB5250E" HashPatched="94E57A074FB82F17C91EF8857F4EEFDEC0B65181">
+            <Patches>
+              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="60AE1700" PatchedBytes="55821700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="47FD84099380E017501669486CEE33A1B8635950" HashPatched="FC0ECB1C61464785B388EF116B00C790296DBA20">
+            <Patches>
+              <Patch Address="0x000A882E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="E0491000" PatchedBytes="66701000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.16">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="A60F1AF85D262B2C943BC570263F1BDF3CC179B7" HashPatched="BA3F4A1D2530C26C936686E896254522FD12FF4B">
+            <Patches>
+              <Patch Address="0x000A1120" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x00000168" OriginalBytes="78CC5300" PatchedBytes="49265400" />
+              <Patch Address="0x000A1336" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000A1356" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000A17A8" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000A1868" OriginalBytes="19F0" PatchedBytes="7DE0" />
+              <Patch Address="0x000A19AA" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x000A19DA" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x000A199A" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000A1988" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x0024E2A2" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x0024E79A" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x0024E7AE" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x0017A4BE" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x00071880" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x002A0C64" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x0027D9F8" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x002E76A0" OriginalBytes="16F43C8A" PatchedBytes="96F73CBA" />
+              <Patch Address="0x002E76C4" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x000A06D8" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00071DF0" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x0017A080" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x0017A0EC" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0017A16A" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x0017A1A8" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x0017A26C" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0017A2AE" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x0017A2EE" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00179F30" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x00072462" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x00072546" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x00072556" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x00072472" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0007256C" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x000724EC" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x00072486" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E5168" OriginalBytes="BEF1007F" PatchedBytes="8DF7C1B9" />
+              <Patch Address="0x000E52B2" OriginalBytes="0DF41C89" PatchedBytes="8DF71CB9" />
+              <Patch Address="0x000E51E0" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F6A80" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F6A16" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x00071CEC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000F6830" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000F6894" OriginalBytes="0AD0" PatchedBytes="0AE0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="2986CBE71ABA16498A20FA35A01A671BA2BEBEBE" HashPatched="534FCFD0A37B67B0427050E0813D9C74EE3706F1">
+            <Patches>
+              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="BB900000" PatchedBytes="754B0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="81FFCAF8204D4B5F57271050C0CD502ED95E387A" HashPatched="2A1ABC65B39075B45BC585585539724E72C2F4AA">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="3FA10100" PatchedBytes="93CF0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="5C60D463A889028B97D525B1B03ACBF304E5E627" HashPatched="F349186B3BE3CC2829CC6FA8FA4534F4FE29E51D">
+            <Patches>
+              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="1AAD1700" PatchedBytes="0F811700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="23D5559FC1631C21B02D19B73E982EA0EDBCE768" HashPatched="3DB556CB05042A83E3D30458EC874B44C5C98F86">
+            <Patches>
+              <Patch Address="0x000A882E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="BBC71000" PatchedBytes="41EE1000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.158">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="4A63C13C6A45B6EA7FEE66761982489F068F6C33" HashPatched="5422000B11036B408CC0B86E9D6782B563785BFE">
+            <Patches>
+              <Patch Address="0x000849B4" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x00000158" OriginalBytes="C4F05300" PatchedBytes="A8FD5300" />
+              <Patch Address="0x00084BCA" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x00084BEA" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x0008503C" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x00085104" OriginalBytes="1AD0" PatchedBytes="79E0" />
+              <Patch Address="0x0008523E" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x0008526E" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x0008522E" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x0008521C" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x002A2372" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x002A286A" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x002A287E" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x001785DE" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0005D688" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x00272468" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x00254E54" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x002DADBC" OriginalBytes="3AF4DCA0" PatchedBytes="7AF7DCB8" />
+              <Patch Address="0x002DADE0" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x00083F6C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0005DBF8" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x001781A0" OriginalBytes="B0F1007F" PatchedBytes="FFF754BF" />
+              <Patch Address="0x0017820C" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0017828A" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x001782C8" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x0017838C" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x001783CE" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x0017840E" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00178050" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005E26A" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005E34E" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005E35E" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x0005E27A" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005E374" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005E2F4" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005E28E" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E4A24" OriginalBytes="BEF1000F" PatchedBytes="79F767BC" />
+              <Patch Address="0x000E4B62" OriginalBytes="39F4C8A3" PatchedBytes="79F7C8BB" />
+              <Patch Address="0x000E4A90" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F6088" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F601E" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0005DAF4" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000EA6E0" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000EA744" OriginalBytes="0AD0" PatchedBytes="10E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="E74A89AFD1A1255473427AD6C75F4EC2EE88F3D4" HashPatched="D792DE6F4411858E9CA3647B5ABF1F05010D5EF7">
+            <Patches>
+              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="53920000" PatchedBytes="0D4D0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="8F980218223A101D37FD8099FD428F17F63405A4" HashPatched="D17BEC7B845BDE7AC4219E7498FF5C0F76CCDA9B">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="FF130100" PatchedBytes="52420100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="18A39C161EC40A8343C079994CF216EC25CB0350" HashPatched="6C737EC7D389C63EBBE0503FE00FE324D0E36318">
+            <Patches>
+              <Patch Address="0x0012DBE0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="026E1700" PatchedBytes="F7411700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="910B7DA8634F5B8A8255B93996DC6843BBBD7247" HashPatched="F22BBE17ED79C4E49C27B25B2AA2FE992A160659">
+            <Patches>
+              <Patch Address="0x000A88AE" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="4A2B1000" PatchedBytes="D0511000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.158 (dev)">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="9B9BEEF471900398B288C9BAEF33CE4D4A14F8B2" HashPatched="76C9CA9D006D20FD36848C19A7E427CE2E233B85">
+            <Patches>
+              <Patch Address="0x000849B4" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x00000158" OriginalBytes="79795400" PatchedBytes="5D865400" />
+              <Patch Address="0x00084BCA" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x00084BEA" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x0008503C" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x00085104" OriginalBytes="1AD0" PatchedBytes="79E0" />
+              <Patch Address="0x0008523E" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x0008526E" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x0008522E" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x0008521C" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x002A2372" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x002A286A" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x002A287E" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x001785DE" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0005D688" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x00272468" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x00254E54" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x002DADBC" OriginalBytes="3AF4DCA0" PatchedBytes="7AF7DCB8" />
+              <Patch Address="0x002DADE0" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x00083F6C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0005DBF8" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x001781A0" OriginalBytes="B0F1007F" PatchedBytes="FFF754BF" />
+              <Patch Address="0x0017820C" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x0017828A" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x001782C8" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x0017838C" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x001783CE" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x0017840E" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00178050" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005E26A" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005E34E" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005E35E" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x0005E27A" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005E374" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005E2F4" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005E28E" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E4A24" OriginalBytes="BEF1000F" PatchedBytes="79F767BC" />
+              <Patch Address="0x000E4B62" OriginalBytes="39F4C8A3" PatchedBytes="79F7C8BB" />
+              <Patch Address="0x000E4A90" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F6088" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F601E" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0005DAF4" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000EA6E0" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000EA744" OriginalBytes="0AD0" PatchedBytes="10E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="E74A89AFD1A1255473427AD6C75F4EC2EE88F3D4" HashPatched="D792DE6F4411858E9CA3647B5ABF1F05010D5EF7">
+            <Patches>
+              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="53920000" PatchedBytes="0D4D0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="658CFDDAC4F160DFBFB8B314EB4CDC24F860CA02" HashPatched="281CAB86446B1EC6F5F9922F20B4AD8A2FF4916E">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="B0630100" PatchedBytes="03920100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="18A39C161EC40A8343C079994CF216EC25CB0350" HashPatched="6C737EC7D389C63EBBE0503FE00FE324D0E36318">
+            <Patches>
+              <Patch Address="0x0012DBE0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="026E1700" PatchedBytes="F7411700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="5B13F0535BC4174A0C9C1D573469F76E22521705" HashPatched="185D77696E409B6A79F7F78AA2C6FCF7524275FF">
+            <Patches>
+              <Patch Address="0x000A88AE" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="72521000" PatchedBytes="F8781000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.490">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="35FE0D2429189720900FB2DA9793561647765C54" HashPatched="A69AFD759AA21216C004B6BA07C268FACFD61195">
+            <Patches>
+              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="9F5D1000" PatchedBytes="25841000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="AA31D5551495EB88B8384B0018FE9EA02A83DCF7" HashPatched="519E5C3F4E1727268AA011AF99EEF9F6291297FA">
+            <Patches>
+              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="8D171800" PatchedBytes="82EB1700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="C66F0A507B89A6AF07D52C2012138DA73F49F2E9" HashPatched="C8FF282DCB71CCFC1FEAACC652A8D017A9063AAD">
+            <Patches>
+              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="E9940000" PatchedBytes="A34F0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="AB17E4F9E5902C58871DF8502A81CF1C382E8931" HashPatched="E1DB44BDBF94B3EEF63E8E0F354533F2D1925131">
+            <Patches>
+              <Patch Address="0x00084A94" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x00000158" OriginalBytes="A1A45400" PatchedBytes="760E5400" />
+              <Patch Address="0x00084CAA" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x00084CCA" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x0008511C" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000851E6" OriginalBytes="3BB1" PatchedBytes="78E0" />
+              <Patch Address="0x0008531E" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x0008534E" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x0008530E" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000852FC" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x002A27D2" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x002A2CCA" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x002A2CDE" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x0017862A" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0005D69C" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x002724A0" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x00254E54" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x002DB234" OriginalBytes="39F4A0A6" PatchedBytes="79F7A0BE" />
+              <Patch Address="0x002DB258" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x0008404C" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0005DC0C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x001781EC" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x00178258" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x001782D6" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x00178314" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x001783D8" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x0017841A" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x0017845A" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x0017809C" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005E27E" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005E362" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005E372" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x0005E28E" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005E388" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005E308" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005E2A2" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E4C14" OriginalBytes="BEF1007F" PatchedBytes="79F779BB" />
+              <Patch Address="0x000E4D5E" OriginalBytes="39F4D4A2" PatchedBytes="79F7D4BA" />
+              <Patch Address="0x000E4C8C" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F6298" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F622E" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0005DB08" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000EA9F0" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000EAA54" OriginalBytes="0AD0" PatchedBytes="10E0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.14393.1066">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="7E66B7A9F314B3693218B5879FD964437D952EBE" HashPatched="3845691BC35B0FBC5DABC55330CB1F697A8173A0">
+            <Patches>
+              <Patch Address="0x0021706C" OriginalBytes="0BB9" PatchedBytes="00BF" />
+              <Patch Address="0x00000150" OriginalBytes="39375300" PatchedBytes="2E3D5300" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.527">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="D87E2A032814D2834B97AFA5F526234A777D0A4F" HashPatched="825A2694EBEDD98D32F5D2A6D8CD0E0C6CFF4BA0">
+            <Patches>
+              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="35950000" PatchedBytes="EF4F0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="9FD01D384868A3E1007255BABF3987DAC0115D9D" HashPatched="93D0E4BC56844F377F49E90DD52F75FBA86A1E09">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="35ED0000" PatchedBytes="881B0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="C937CA583AEA63597E142FC789B184AD5CED0CE5" HashPatched="97B372CA757444D8FBABE37989DE1969D4ACBE66">
+            <Patches>
+              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="D9171800" PatchedBytes="CEEB1700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="3B62EB09C37369A797D5215B4179B1E761F2D7FB" HashPatched="049A8A4E32907202A1B28A7F3B2E0C88795E5E9F">
+            <Patches>
+              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="75251000" PatchedBytes="FB4B1000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="AA03E34592A2B12AE1A7F6987165DC20090DCA76" HashPatched="BD0084827482CCA508FE2D849FAF06E5AC599E75">
+            <Patches>
+              <Patch Address="0x000AB4EC" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x000AB702" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000AB722" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000ABB74" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000ABC3C" OriginalBytes="1AD0" PatchedBytes="79E0" />
+              <Patch Address="0x000ABD76" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x000ABDA6" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x000ABD66" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000ABD54" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x002866E2" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x00286BDA" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x00286BEE" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x00178292" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0005F2D8" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x002AB85C" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x002DEE8C" OriginalBytes="01F48C8D" PatchedBytes="81F78CBD" />
+              <Patch Address="0x002DEEB0" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x00260884" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x000AAAA4" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0005F848" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00177E54" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x00177EC0" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00177F3E" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x00177F7C" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x00178040" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x00178082" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x001780C2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00177D04" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FEBA" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FF9E" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FFAE" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x0005FECA" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FFC4" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005FF44" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005FEDE" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E64D8" OriginalBytes="BEF1007F" PatchedBytes="79F735BD" />
+              <Patch Address="0x000E6622" OriginalBytes="39F490A4" PatchedBytes="79F790BC" />
+              <Patch Address="0x000E6550" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F2CB8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F2C4E" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0005F744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000F7254" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000F72B8" OriginalBytes="0AD0" PatchedBytes="10E0" />
+              <Patch Address="0x00000158" OriginalBytes="00FF5300" PatchedBytes="F2635400" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="AA03E34592A2B12AE1A7F6987165DC20090DCA76" HashPatched="3D5AB56C9DF9598DDA637298B5D0B15A8BBC045D">
+                <Patches>
+                  <Patch Address="0x000AB4EC" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+                  <Patch Address="0x00000158" OriginalBytes="00FF5300" PatchedBytes="93625400" />
+                  <Patch Address="0x000AB702" OriginalBytes="21B9" PatchedBytes="04E0" />
+                  <Patch Address="0x000AB722" OriginalBytes="31B9" PatchedBytes="06E0" />
+                  <Patch Address="0x000ABB74" OriginalBytes="12B9" PatchedBytes="02E0" />
+                  <Patch Address="0x000ABC46" OriginalBytes="74D1" PatchedBytes="74E0" />
+                  <Patch Address="0x000ABD76" OriginalBytes="02D1" PatchedBytes="02E0" />
+                  <Patch Address="0x000ABDA6" OriginalBytes="01D1" PatchedBytes="01E0" />
+                  <Patch Address="0x000ABD66" OriginalBytes="2CD0" PatchedBytes="00BF" />
+                  <Patch Address="0x000ABD54" OriginalBytes="37D0" PatchedBytes="00BF" />
+                  <Patch Address="0x002866E2" OriginalBytes="19B9" PatchedBytes="03E0" />
+                  <Patch Address="0x00286BDA" OriginalBytes="BA61" PatchedBytes="28E0" />
+                  <Patch Address="0x00286BEE" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+                  <Patch Address="0x00178292" OriginalBytes="E3B9" PatchedBytes="00BF" />
+                  <Patch Address="0x0005F2D8" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+                  <Patch Address="0x002AB85C" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+                  <Patch Address="0x00260884" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+                  <Patch Address="0x002DEE8C" OriginalBytes="01F48C8D" PatchedBytes="81F78CBD" />
+                  <Patch Address="0x002DEEB0" OriginalBytes="EED1" PatchedBytes="00BF" />
+                  <Patch Address="0x000AAAA4" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+                  <Patch Address="0x0005F848" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                  <Patch Address="0x00177E54" OriginalBytes="B0F1" PatchedBytes="54E7" />
+                  <Patch Address="0x00177EC0" OriginalBytes="13B1" PatchedBytes="02E0" />
+                  <Patch Address="0x00177F3E" OriginalBytes="C0D1" PatchedBytes="00BF" />
+                  <Patch Address="0x00177F7C" OriginalBytes="A1D1" PatchedBytes="00BF" />
+                  <Patch Address="0x00178040" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00178082" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+                  <Patch Address="0x001780C2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+                  <Patch Address="0x00177D04" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0005FEBA" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0005FF9E" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0005FFAE" OriginalBytes="5ED0" PatchedBytes="00BF" />
+                  <Patch Address="0x0005FECA" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0005FFC4" OriginalBytes="13D1" PatchedBytes="00BF" />
+                  <Patch Address="0x0005FF44" OriginalBytes="57D1" PatchedBytes="00BF" />
+                  <Patch Address="0x0005FEDE" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+                  <Patch Address="0x000E64D8" OriginalBytes="BEF1007F" PatchedBytes="79F735BD" />
+                  <Patch Address="0x000E6622" OriginalBytes="39F490A4" PatchedBytes="79F790BC" />
+                  <Patch Address="0x000E6550" OriginalBytes="3EB3" PatchedBytes="27E0" />
+                  <Patch Address="0x000F2CB8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+                  <Patch Address="0x000F2C4E" OriginalBytes="12D0" PatchedBytes="08E0" />
+                  <Patch Address="0x0005F744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                  <Patch Address="0x000F7254" OriginalBytes="13D0" PatchedBytes="0AE0" />
+                  <Patch Address="0x000F72B8" OriginalBytes="0AD0" PatchedBytes="10E0" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.530">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="6009127C44CCAFD3A8CA7A7FFB749CD46F0E1181" HashPatched="5F4B03DA614828667FCECAF793EF36186DDE6C67">
+            <Patches>
+              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="2F950000" PatchedBytes="E94F0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="0E88138BFE933F6930786B5D309B80DB7D378685" HashPatched="069EB7E0418B34ED25C32EE32C397A2552AA32E6">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="878A0100" PatchedBytes="DAB80100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="5DA7802C14A7EA1DD9C1DC30EFBD16EAC8AF8C17" HashPatched="D79632FB72CE2674B549B037965E90111BF3017C">
+            <Patches>
+              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="D3171800" PatchedBytes="C8EB1700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="B6B0EE55EF0F732796592AE333B842169E69CED3" HashPatched="CBCF30705ACC4E7F193A00B856466F06A70A1FD6">
+            <Patches>
+              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="A7E01000" PatchedBytes="2D071100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="AFC0567924C75DA621CE6422AB2E6620C649A21E" HashPatched="843F7527AB37B4B7EDDA3A3DC3AAEB57B3F3F1E3">
+            <Patches>
+              <Patch Address="0x000AB4EC" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x000AB702" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000AB722" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000ABB74" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000ABC3C" OriginalBytes="1AD0" PatchedBytes="79E0" />
+              <Patch Address="0x000ABD76" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x000ABDA6" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x000ABD66" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000ABD54" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x002866DE" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x00286BD6" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x00286BEA" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x00178292" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0005F2D8" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x002AB858" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x002DEE8C" OriginalBytes="01F4888D" PatchedBytes="81F788BD" />
+              <Patch Address="0x002DEEB0" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x0026087C" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x000AAAA4" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0005F848" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00177E54" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x00177EC0" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00177F3E" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x00177F7C" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x00178040" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x00178082" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x001780C2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00177D04" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FEBA" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FF9E" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FFAE" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x0005FECA" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FFC4" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005FF44" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005FEDE" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E64D8" OriginalBytes="BEF1007F" PatchedBytes="79F735BD" />
+              <Patch Address="0x000E6622" OriginalBytes="39F490A4" PatchedBytes="79F790BC" />
+              <Patch Address="0x000E6550" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F2CB8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F2C4E" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0005F744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000F7254" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000F72B8" OriginalBytes="0AD0" PatchedBytes="10E0" />
+              <Patch Address="0x00000158" OriginalBytes="B5DA5300" PatchedBytes="A73F5400" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="AFC0567924C75DA621CE6422AB2E6620C649A21E" HashPatched="F4C230DFB09013E7B0DC2E10F31FC6072BB8287D">
+                <Patches>
+                  <Patch Address="0x000AB4EC" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+                  <Patch Address="0x00000158" OriginalBytes="B5DA5300" PatchedBytes="478F5400" />
+                  <Patch Address="0x000AB702" OriginalBytes="21B9" PatchedBytes="04E0" />
+                  <Patch Address="0x000AB722" OriginalBytes="31B9" PatchedBytes="06E0" />
+                  <Patch Address="0x000ABB74" OriginalBytes="12B9" PatchedBytes="02E0" />
+                  <Patch Address="0x000ABC46" OriginalBytes="74D1" PatchedBytes="74E0" />
+                  <Patch Address="0x000ABD76" OriginalBytes="02D1" PatchedBytes="02E0" />
+                  <Patch Address="0x000ABDA6" OriginalBytes="01D1" PatchedBytes="01E0" />
+                  <Patch Address="0x000ABD66" OriginalBytes="2CD0" PatchedBytes="00BF" />
+                  <Patch Address="0x000ABD54" OriginalBytes="37D0" PatchedBytes="00BF" />
+                  <Patch Address="0x002866DE" OriginalBytes="19B9" PatchedBytes="03E0" />
+                  <Patch Address="0x00286BD6" OriginalBytes="BA61" PatchedBytes="28E0" />
+                  <Patch Address="0x00286BEA" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+                  <Patch Address="0x00178292" OriginalBytes="E3B9" PatchedBytes="00BF" />
+                  <Patch Address="0x0005F2D8" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+                  <Patch Address="0x002AB858" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+                  <Patch Address="0x0026087C" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+                  <Patch Address="0x002DEE8C" OriginalBytes="01F4888D" PatchedBytes="81F788BD" />
+                  <Patch Address="0x002DEEB0" OriginalBytes="EED1" PatchedBytes="00BF" />
+                  <Patch Address="0x000AAAA4" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+                  <Patch Address="0x0005F848" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                  <Patch Address="0x00177E54" OriginalBytes="B0F1007F" PatchedBytes="FFF754BF" />
+                  <Patch Address="0x00177EC0" OriginalBytes="13B1" PatchedBytes="02E0" />
+                  <Patch Address="0x00177F3E" OriginalBytes="C0D1" PatchedBytes="00BF" />
+                  <Patch Address="0x00177F7C" OriginalBytes="A1D1" PatchedBytes="00BF" />
+                  <Patch Address="0x00178040" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+                  <Patch Address="0x00178082" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+                  <Patch Address="0x001780C2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+                  <Patch Address="0x00177D04" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0005FEBA" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0005FF9E" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0005FFAE" OriginalBytes="5ED0" PatchedBytes="00BF" />
+                  <Patch Address="0x0005FECA" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+                  <Patch Address="0x0005FFC4" OriginalBytes="13D1" PatchedBytes="00BF" />
+                  <Patch Address="0x0005FF44" OriginalBytes="57D1" PatchedBytes="00BF" />
+                  <Patch Address="0x0005FEDE" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+                  <Patch Address="0x000E64D8" OriginalBytes="BEF1007F" PatchedBytes="79F735BD" />
+                  <Patch Address="0x000E6622" OriginalBytes="39F490A4" PatchedBytes="79F790BC" />
+                  <Patch Address="0x000E6550" OriginalBytes="3EB3" PatchedBytes="27E0" />
+                  <Patch Address="0x000F2CB8" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+                  <Patch Address="0x000F2C4E" OriginalBytes="12D0" PatchedBytes="08E0" />
+                  <Patch Address="0x0005F744" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+                  <Patch Address="0x000F7254" OriginalBytes="13D0" PatchedBytes="0AE0" />
+                  <Patch Address="0x000F72B8" OriginalBytes="0AD0" PatchedBytes="10E0" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.538">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="4D9B70757FC549BE74FD5467BF491A791C9F6464" HashPatched="500EDC8A40902D80B4735308FC7525954D9177DC">
+            <Patches>
+              <Patch Address="0x00002644" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="4F950000" PatchedBytes="09500100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="80484523DED7438976B57D42E55D7FB00A42ABF2" HashPatched="E3A8D3381FDE7D6C95A93828021388831E10A1F2">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="70300100" PatchedBytes="C35E0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="F891A9CC11794592E508F3AFF001456148C393DB" HashPatched="77D9633477E681A5E52B082C23865A801B7D064B">
+            <Patches>
+              <Patch Address="0x0012DBC0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="F3171800" PatchedBytes="E8EB1700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="0517DF554DA44436D12D9464034A0D2B781F419A" HashPatched="A873F7C314C96F123DEF09A90FACA437AF4D0EB5">
+            <Patches>
+              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="AB961000" PatchedBytes="31BD1000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="10A1BACA1D054ECD8D58BD40583614223F6841A6" HashPatched="B512C25958D731748281266D386F12F91FA70699">
+            <Patches>
+              <Patch Address="0x000AB428" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x000AB63E" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000AB65E" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000ABAB0" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000ABB78" OriginalBytes="1AD0" PatchedBytes="79E0" />
+              <Patch Address="0x000ABCB2" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x000ABCE2" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x000ABCA2" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000ABC90" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x002856AE" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x00285BA6" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x00285BBA" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x001781B2" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0005F1CC" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x002AA828" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x002DDE6C" OriginalBytes="01F4988D" PatchedBytes="81F798BD" />
+              <Patch Address="0x002DDE90" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x0025F87C" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x000AA9E0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0005F73C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00177D74" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x00177DE0" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00177E5E" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x00177E9C" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x00177F60" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x00177FA2" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x00177FE2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00177C24" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FDAE" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FE92" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FEA2" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x0005FDBE" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FEB8" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005FE38" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005FDD2" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E63FC" OriginalBytes="BEF1007F" PatchedBytes="79F71DBD" />
+              <Patch Address="0x000E6546" OriginalBytes="39F478A4" PatchedBytes="79F778BC" />
+              <Patch Address="0x000E6474" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F2B60" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F2AF6" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0005F638" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000F70FC" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000F7160" OriginalBytes="0AD0" PatchedBytes="10E0" />
+              <Patch Address="0x00000158" OriginalBytes="25785400" PatchedBytes="00DD5300" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.541">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="5AD3ACEB5209702C88FA65037D451CE6BEB504FF" HashPatched="1FCDF5C1D0D23A36F5E77A88C0605CB169010D19">
+            <Patches>
+              <Patch Address="0x00002654" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="8D140100" PatchedBytes="48CF0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="842DA3F9B37D9A6378BACFBB6F8C08A2B5FA4237" HashPatched="5171F7AAAC1D27E89D8CC18FF9EFF0A03F46913D">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="50F50000" PatchedBytes="A3230100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="780D4ADB7E33C020A1704006D219C497DBE628FF" HashPatched="A79477E5EADE7F8A2BF2CC34EE74CE7E9117DB88">
+            <Patches>
+              <Patch Address="0x0012DBD0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="1B4E1700" PatchedBytes="0F221800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="497DAA7F918F08882096249CB092F07B5F385041" HashPatched="D07F6DC614A15C4789B8E6D4BD0C4241DD3B0688">
+            <Patches>
+              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="0E151100" PatchedBytes="953B1000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="8DF1BD7621B47122E772B88AC748CC7080019E1E" HashPatched="5F6A7BE75D98C9E25EAFCB2653C01755E32F6F4D">
+            <Patches>
+              <Patch Address="0x000AB428" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x000AB63E" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000AB65E" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000ABAB0" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000ABB78" OriginalBytes="1AD0" PatchedBytes="79E0" />
+              <Patch Address="0x000ABCB2" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x000ABCE2" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x000ABCA2" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000ABC90" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x002856AE" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x00285BA6" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x00285BBA" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x001781B2" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0005F1CC" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x002AA82C" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x002DDE70" OriginalBytes="01F4968D" PatchedBytes="81F796BD" />
+              <Patch Address="0x002DDE94" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x0025F87C" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x000AA9E0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0005F73C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00177D74" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x00177DE0" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00177E5E" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x00177E9C" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x00177F60" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x00177FA2" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x00177FE2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00177C24" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FDAE" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FE92" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FEA2" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x0005FDBE" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FEB8" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005FE38" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005FDD2" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E63FC" OriginalBytes="BEF1007F" PatchedBytes="79F71DBD" />
+              <Patch Address="0x000E6546" OriginalBytes="39F478A4" PatchedBytes="79F778BC" />
+              <Patch Address="0x000E6474" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F2B60" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F2AF6" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0005F638" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000F70FC" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000F7160" OriginalBytes="0AD0" PatchedBytes="10E0" />
+              <Patch Address="0x00000158" OriginalBytes="1FBE5300" PatchedBytes="F9225400" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.544">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="6BD62429C21675AA46257C1393022BC405AA9737" HashPatched="43E7AAA5799DD6572B0A2EC98D7F5ADD7621F2B9">
+            <Patches>
+              <Patch Address="0x00002654" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="99140100" PatchedBytes="54CF0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="026F77F64F30B4CF2AEBCEF0C325D51EF745AA64" HashPatched="E606F9FF25BAAC357953D297C5531594A8D8B38A">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="FDBF0100" PatchedBytes="51EE0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="4F1F1140B5CCCA90620F1AD24AF4A85C1B8A098B" HashPatched="C2B976AA68DF8B80FA912A193DDE75DAD0E5119A">
+            <Patches>
+              <Patch Address="0x0012DBD0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="274E1700" PatchedBytes="1B221800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="D3A936A9B2B64EC7CA7BC471E7BF11C96991A387" HashPatched="21434CE22741629D5F123DBACCC99C5ACC194484">
+            <Patches>
+              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="4D321000" PatchedBytes="D3581000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="3463D4003998C171B8290D38ABF1F74FE919EACC" HashPatched="77A64FE1A7C717670BC2DABD1D03A78957669BA6">
+            <Patches>
+              <Patch Address="0x000AB428" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x000AB63E" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000AB65E" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000ABAB0" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000ABB78" OriginalBytes="1AD0" PatchedBytes="79E0" />
+              <Patch Address="0x000ABCB2" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x000ABCE2" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x000ABCA2" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000ABC90" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x002856AE" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x00285BA6" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x00285BBA" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x001781B2" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0005F1CC" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x002AA82C" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x002DDE70" OriginalBytes="01F4968D" PatchedBytes="81F796BD" />
+              <Patch Address="0x002DDE94" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x0025F87C" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x000AA9E0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0005F73C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00177D74" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x00177DE0" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00177E5E" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x00177E9C" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x00177F60" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x00177FA2" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x00177FE2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00177C24" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FDAE" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FE92" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FEA2" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x0005FDBE" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FEB8" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005FE38" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005FDD2" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E63FC" OriginalBytes="BEF1007F" PatchedBytes="79F71DBD" />
+              <Patch Address="0x000E6546" OriginalBytes="39F478A4" PatchedBytes="79F778BC" />
+              <Patch Address="0x000E6474" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F2B60" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F2AF6" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0005F638" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000F70FC" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000F7160" OriginalBytes="0AD0" PatchedBytes="10E0" />
+              <Patch Address="0x00000158" OriginalBytes="35F45300" PatchedBytes="0F595400" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.547">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="6A4777FDB5F8DD48A2A25BB9E582AD69E99C0779" HashPatched="8C2BAF6BDFCB088D22B696E64D7A15AE6B0EB159">
+            <Patches>
+              <Patch Address="0x00002654" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="A5140100" PatchedBytes="60CF0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="CF0726B86F3FCA8007AE36CCA0AFB7CB3C195A08" HashPatched="127B7E1B8B07D46C3C502410D4EE1743E4856A8F">
+            <Patches>
+              <Patch Address="0x00002FB0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="4C3E0100" PatchedBytes="9F6C0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="608A76E57FA789D0DE44FBCA467193FD03429303" HashPatched="76A445FE9E99BE8AE57BCB713E2B1EAD02BA7E60">
+            <Patches>
+              <Patch Address="0x0012DBD0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="334E1700" PatchedBytes="27221800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="76D7C9D7AE8804BA64ACF90B08DCA88965CAACB7" HashPatched="253D426EF045AC9B22DA5069BE84E0A76101E98D">
+            <Patches>
+              <Patch Address="0x000A883E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="1DFB1000" PatchedBytes="A4211000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="3AEFB34CC5B7230FDD50E1629738872FF944A0CE" HashPatched="B14D1D8170102A1AF8792D5D32AC58F23B6AE822">
+            <Patches>
+              <Patch Address="0x000AB428" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x000AB63E" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000AB65E" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x000ABAB0" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x000ABB78" OriginalBytes="1AD0" PatchedBytes="79E0" />
+              <Patch Address="0x000ABCB2" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x000ABCE2" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x000ABCA2" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x000ABC90" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x00285726" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x00285C1E" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x00285C32" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x001781B2" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x0005F1CC" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x002AA8A4" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x002DDE34" OriginalBytes="01F4F28D" PatchedBytes="81F7F2BD" />
+              <Patch Address="0x002DDE58" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x0025F8F8" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x000AA9E0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x0005F73C" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00177D74" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x00177DE0" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00177E5E" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x00177E9C" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x00177F60" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x00177FA2" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x00177FE2" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00177C24" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FDAE" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FE92" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FEA2" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x0005FDBE" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x0005FEB8" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005FE38" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x0005FDD2" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E63FC" OriginalBytes="BEF1007F" PatchedBytes="79F71DBD" />
+              <Patch Address="0x000E6546" OriginalBytes="39F478A4" PatchedBytes="79F778BC" />
+              <Patch Address="0x000E6474" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F2B60" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F2AF6" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x0005F638" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000F70FC" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000F7160" OriginalBytes="0AD0" PatchedBytes="10E0" />
+              <Patch Address="0x00000158" OriginalBytes="A56D5400" PatchedBytes="80D25300" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.603">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\sspisrv.dll" HashOriginal="E40AE0607C8BDBE2BDE4D3C66007EB868505C2E6" HashPatched="AE85CDF9C03F1FA66160EE522E8877F1AAEFABCB">
+            <Patches>
+              <Patch Address="0x00002654" OriginalBytes="2DE970480DF10C0B" PatchedBytes="0121016000207047" />
+              <Patch Address="0x00000140" OriginalBytes="07150100" PatchedBytes="C2CF0000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\NtlmShared.dll" HashOriginal="21A7BAB4E97E73A6D9DADAEAD29F76FCF7802442" HashPatched="9087D3D1635EA2695861118825D0FC7C5560A3FB">
+            <Patches>
+              <Patch Address="0x00002FC0" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x00000140" OriginalBytes="314F0100" PatchedBytes="847D0100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\pacmanserver.dll" HashOriginal="B003FA8BD05369162FED68695B49CFBB55519DAA" HashPatched="FE7FDAD1B3AB6DF191F3745B29DDD6C261811DBF">
+            <Patches>
+              <Patch Address="0x0012DBE0" OriginalBytes="2DE930480DF1080B78F7" PatchedBytes="6FF00041016000207047" />
+              <Patch Address="0x00000158" OriginalBytes="781B1800" PatchedBytes="6DEF1700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\mscoree.dll" HashOriginal="1171EC89856229ED91EA3826CA4541836FD20AD3" HashPatched="822A0DD74A664E01A6DE865DBD37B0BEAF427CB2">
+            <Patches>
+              <Patch Address="0x0000602C" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="F59E0100" PatchedBytes="47D40100" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\DeploymentExt.dll" HashOriginal="265ACD651DA9126D0FE545703FC6BD7CF4D8DB10" HashPatched="8F055F9BBEEB2BFBAAF088E9A2ADBE0E59B81279">
+            <Patches>
+              <Patch Address="0x000A884E" OriginalBytes="8BB9" PatchedBytes="11E0" />
+              <Patch Address="0x00000148" OriginalBytes="7A6F1000" PatchedBytes="00961000" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ntoskrnl.exe" HashOriginal="611BDC087C34E5F626EC2889F4C2B8CBB7DB5582" HashPatched="90D0402F2FB4EE7F17495288079C7160BB9FB497">
+            <Patches>
+              <Patch Address="0x000307A8" OriginalBytes="5FD1" PatchedBytes="5FE0" />
+              <Patch Address="0x000309BE" OriginalBytes="21B9" PatchedBytes="04E0" />
+              <Patch Address="0x000309DE" OriginalBytes="31B9" PatchedBytes="06E0" />
+              <Patch Address="0x00030E30" OriginalBytes="12B9" PatchedBytes="02E0" />
+              <Patch Address="0x00030EF8" OriginalBytes="1AD0" PatchedBytes="79E0" />
+              <Patch Address="0x00031032" OriginalBytes="02D1" PatchedBytes="02E0" />
+              <Patch Address="0x00031062" OriginalBytes="01D1" PatchedBytes="01E0" />
+              <Patch Address="0x00031022" OriginalBytes="2CD0" PatchedBytes="00BF" />
+              <Patch Address="0x00031010" OriginalBytes="37D0" PatchedBytes="00BF" />
+              <Patch Address="0x002B310A" OriginalBytes="19B9" PatchedBytes="03E0" />
+              <Patch Address="0x002B3602" OriginalBytes="BA61" PatchedBytes="28E0" />
+              <Patch Address="0x002B3616" OriginalBytes="DFF8F428" PatchedBytes="4FF00002" />
+              <Patch Address="0x00177FB6" OriginalBytes="E3B9" PatchedBytes="00BF" />
+              <Patch Address="0x00064E5C" OriginalBytes="00F07281" PatchedBytes="00F072B9" />
+              <Patch Address="0x0025343C" OriginalBytes="0FB42DE9" PatchedBytes="01207047" />
+              <Patch Address="0x002E3460" OriginalBytes="0EF49E88" PatchedBytes="8EF79EB8" />
+              <Patch Address="0x002E3484" OriginalBytes="EED1" PatchedBytes="00BF" />
+              <Patch Address="0x0027147C" OriginalBytes="40F0B680" PatchedBytes="AFF30080" />
+              <Patch Address="0x0002FD60" OriginalBytes="2DE9F04F" PatchedBytes="01207047" />
+              <Patch Address="0x000653CC" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x00177B78" OriginalBytes="B0F1" PatchedBytes="54E7" />
+              <Patch Address="0x00177BE4" OriginalBytes="13B1" PatchedBytes="02E0" />
+              <Patch Address="0x00177C62" OriginalBytes="C0D1" PatchedBytes="00BF" />
+              <Patch Address="0x00177CA0" OriginalBytes="A1D1" PatchedBytes="00BF" />
+              <Patch Address="0x00177D64" OriginalBytes="7FF43FAF" PatchedBytes="AFF30080" />
+              <Patch Address="0x00177DA6" OriginalBytes="3FF43DAE" PatchedBytes="FFF73DBE" />
+              <Patch Address="0x00177DE6" OriginalBytes="3FF41DAE" PatchedBytes="FFF71DBE" />
+              <Patch Address="0x00177A28" OriginalBytes="00F0EF81" PatchedBytes="AFF30080" />
+              <Patch Address="0x00065A3E" OriginalBytes="40F0E380" PatchedBytes="AFF30080" />
+              <Patch Address="0x00065B22" OriginalBytes="40F09980" PatchedBytes="AFF30080" />
+              <Patch Address="0x00065B32" OriginalBytes="5ED0" PatchedBytes="00BF" />
+              <Patch Address="0x00065A4E" OriginalBytes="40F09080" PatchedBytes="AFF30080" />
+              <Patch Address="0x00065B48" OriginalBytes="13D1" PatchedBytes="00BF" />
+              <Patch Address="0x00065AC8" OriginalBytes="57D1" PatchedBytes="00BF" />
+              <Patch Address="0x00065A62" OriginalBytes="00F08E80" PatchedBytes="AFF30080" />
+              <Patch Address="0x000E7AB4" OriginalBytes="BEF1007F" PatchedBytes="7EF709B8" />
+              <Patch Address="0x000E7BFE" OriginalBytes="3DF464A7" PatchedBytes="7DF764BF" />
+              <Patch Address="0x000E7B2C" OriginalBytes="3EB3" PatchedBytes="27E0" />
+              <Patch Address="0x000F5A04" OriginalBytes="0FD0" PatchedBytes="0BE0" />
+              <Patch Address="0x000F599A" OriginalBytes="12D0" PatchedBytes="08E0" />
+              <Patch Address="0x000652C8" OriginalBytes="2DE90048" PatchedBytes="00207047" />
+              <Patch Address="0x000D9144" OriginalBytes="13D0" PatchedBytes="0AE0" />
+              <Patch Address="0x000D91A8" OriginalBytes="0AD0" PatchedBytes="10E0" />
+              <Patch Address="0x00000158" OriginalBytes="9E585400" PatchedBytes="6AB85300" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+    </TargetVersions>
+  </PatchDefinition>
+  <PatchDefinition Name="SecureBootHack-V1-EFIESP">
+    <TargetVersions>
+      <TargetVersion Description="8.10.12393.890">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="EEFA96DD8A4DC60CF8FF3D1E1FA14F018C812A60" HashPatched="44C0B18252F021559701D8C8161238DE69CD1403">
+            <Patches>
+              <Patch Address="0x0003C200" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="01610C00" PatchedBytes="548F0B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="40941860A7B7CED19BEAF25E76227AAFDFED689B" HashPatched="10AF6CB6948346DDE22D1519D7BA156C3AC7888F">
+            <Patches>
+              <Patch Address="0x00025AE8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="B3900A00" PatchedBytes="05BF0A00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.14226.359">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="501652BBAB34CE5CB283231D77EBBDDD90864F1D" HashPatched="0262E3064BA0D2B2729B347616F007C1357AA841">
+            <Patches>
+              <Patch Address="0x0003FC20" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="9EC20B00" PatchedBytes="F0F00B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="2461A5E125973057FF7446E47C5A4CA91797E359" HashPatched="F849B9F54B503E57531B9D154099B2D370169954">
+            <Patches>
+              <Patch Address="0x00026BEC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="897F0B00" PatchedBytes="DBAD0B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.12397.895">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="EEFA96DD8A4DC60CF8FF3D1E1FA14F018C812A60" HashPatched="44C0B18252F021559701D8C8161238DE69CD1403">
+            <Patches>
+              <Patch Address="0x0003C200" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="01610C00" PatchedBytes="548F0B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="1A14708817F9C5A4FC1E1E35474B794DC47D807B" HashPatched="C631135707CE9F6D13C403CF193CEEF62CD00979">
+            <Patches>
+              <Patch Address="0x00025AE8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="E45F0B00" PatchedBytes="378E0A00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.14219.341">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="501652BBAB34CE5CB283231D77EBBDDD90864F1D" HashPatched="0262E3064BA0D2B2729B347616F007C1357AA841">
+            <Patches>
+              <Patch Address="0x0003FC20" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="9EC20B00" PatchedBytes="F0F00B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="D528133F6F6E88FCD1FD7151BF5F041EAF8665AA" HashPatched="9484FFF0F0E22EF3FB555C6D63D579DD2D8B3B47">
+            <Patches>
+              <Patch Address="0x00026BEC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="70B70B00" PatchedBytes="C3E50A00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.14234.375">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="501652BBAB34CE5CB283231D77EBBDDD90864F1D" HashPatched="0262E3064BA0D2B2729B347616F007C1357AA841">
+            <Patches>
+              <Patch Address="0x0003FC20" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="9EC20B00" PatchedBytes="F0F00B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="20EDDF16CF5C28F170365332290ACDBA8C2CD4C8" HashPatched="403C494ECB1540CF7E86B4213015C7514D907765">
+            <Patches>
+              <Patch Address="0x00026BEC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="FD6C0B00" PatchedBytes="4F9B0B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.20.10512.11662">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="DC6F06F3FB84841722963AF9A9D6D370C9CE6658" HashPatched="B29975C8814BFBB97C00F2C3A6D678B8A6C05C70">
+            <Patches>
+              <Patch Address="0x00045318" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="E8C10D00" PatchedBytes="3AF00D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="366C1275EE4359BCCB5CCD0F2F27B4CA4092B348" HashPatched="C209DFBEE3D5A2EE131F6475F4EA8EF6194C6D25">
+            <Patches>
+              <Patch Address="0x000285B4" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="E9EC0B00" PatchedBytes="3B1B0C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.15116.125">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="0051AB13FE4BDB76E75614187B10E1DF50626883" HashPatched="4E0A941D506D139FFC9697ABD94032F7EB27E059">
+            <Patches>
+              <Patch Address="0x0003FC30" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="8EDB0B00" PatchedBytes="E0090C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="1BEB29917B69077FDB2EB21FA0766C7D69D44513" HashPatched="FCCE5AEFEC691E3BFCA5C7CFA26C678BB1E496C4">
+            <Patches>
+              <Patch Address="0x00026C0C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="C4120B00" PatchedBytes="16410B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.15148.160">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="446381C857DE5CC0DE17F558FC21F69DF193BF80" HashPatched="C21523A82C7637DE3C0A2078F729553C407CD5B9">
+            <Patches>
+              <Patch Address="0x0003FD18" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1A080C00" PatchedBytes="6C360C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="0407FA2C115FD152FB15DF1A6B40A2792563C433" HashPatched="5047FA8051DF7E3279388FEEC12881812CEE7D7D">
+            <Patches>
+              <Patch Address="0x00026C0C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000150" OriginalBytes="45640B00" PatchedBytes="97920B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.20.10536.11738">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="D46D4E0F78255D5EC6051EB0DCF4B483FC0B4D14" HashPatched="D96FA12ED65D07986D77FA279740226B8721A8F9">
+            <Patches>
+              <Patch Address="0x000462C0" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="A8920E00" PatchedBytes="FAC00E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="1A2D5E69C42A2F233F83757FD0A31D332090EC1C" HashPatched="63AE71B59C53236FBE78DDB52B3086F817F469C4">
+            <Patches>
+              <Patch Address="0x000285CC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="06AD0C00" PatchedBytes="58DB0C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.20.10549.11796">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="6EFD1F955C6E7BAA7A68BFD5B5BB7181E3EE9A44" HashPatched="A9C62DBCFB034583C374DFD1BF235F5110A939EC">
+            <Patches>
+              <Patch Address="0x0009EA74" OriginalBytes="0FB42DE9" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="D0BA1300" PatchedBytes="03851300" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="2BB0AF2C666421B3CE771E23C44BEE6032796228" HashPatched="289BBB83036CD5C94E1DB076ABE2F189B3A89AD1">
+            <Patches>
+              <Patch Address="0x000285FC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="C5630C00" PatchedBytes="17920C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10581.0">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="4DBD72B081023419654F712B4A611E44C52A8C15" HashPatched="AC5E100C17F47B624B049AF541C473A811A60F75">
+            <Patches>
+              <Patch Address="0x00044C80" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="A8A00D00" PatchedBytes="FACE0D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="99F4D5DBA68AF51B3797E102153D490F90E46CB5" HashPatched="7F122B066913566DC189AA468252617CFBE88797">
+            <Patches>
+              <Patch Address="0x00028A04" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="9D290D00" PatchedBytes="EF570D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.11">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="4DBD72B081023419654F712B4A611E44C52A8C15" HashPatched="AC5E100C17F47B624B049AF541C473A811A60F75">
+            <Patches>
+              <Patch Address="0x00044C80" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="A8A00D00" PatchedBytes="FACE0D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B5730E477D68F8E83FC13748198B7AA42A4FBD9F" HashPatched="BE75BC099969DE25F666534F90F10ABFA29F09DC">
+            <Patches>
+              <Patch Address="0x00028A04" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="71E90C00" PatchedBytes="C3170D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.36">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="4DBD72B081023419654F712B4A611E44C52A8C15" HashPatched="AC5E100C17F47B624B049AF541C473A811A60F75">
+            <Patches>
+              <Patch Address="0x00044C80" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="A8A00D00" PatchedBytes="FACE0D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="0038C204F5C9866A23198C3253C44C3ABFC8D5DE" HashPatched="8996626E999230DB1239125AD420940C82C31CF7">
+            <Patches>
+              <Patch Address="0x00028A04" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="592C0D00" PatchedBytes="AB5A0D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10240.16384">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="DC6F06F3FB84841722963AF9A9D6D370C9CE6658" HashPatched="B29975C8814BFBB97C00F2C3A6D678B8A6C05C70">
+            <Patches>
+              <Patch Address="0x00045318" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="E8C10D00" PatchedBytes="3AF00D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="240B7F0B6BC5CD923CBEAEE85DBBA1F240C96C3B" HashPatched="632C2C27A5791CE5A1D1F3C1A7641F057919DCE8">
+            <Patches>
+              <Patch Address="0x000285F8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="E5280C00" PatchedBytes="37570C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.107">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="4DBD72B081023419654F712B4A611E44C52A8C15" HashPatched="AC5E100C17F47B624B049AF541C473A811A60F75">
+            <Patches>
+              <Patch Address="0x00044C80" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="A8A00D00" PatchedBytes="FACE0D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B758EE117AEF2E6ED3DC6C0F07BC65CBCF944D6A" HashPatched="38F7D8508781FEEB36BDB43A9A17CCD5F5B0CD11">
+            <Patches>
+              <Patch Address="0x00028A04" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="178C0C00" PatchedBytes="69BA0C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.318">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="4DBD72B081023419654F712B4A611E44C52A8C15" HashPatched="AC5E100C17F47B624B049AF541C473A811A60F75">
+            <Patches>
+              <Patch Address="0x00044C80" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="A8A00D00" PatchedBytes="FACE0D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="8E71D1F0255E8C71BDE6F8D3780C4827C244375B" HashPatched="348C48C617F6114F88B61E0AD3FC1C06CE716FCB">
+            <Patches>
+              <Patch Address="0x00028A2C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="DABE0C00" PatchedBytes="2CED0C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.494">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="4DBD72B081023419654F712B4A611E44C52A8C15" HashPatched="AC5E100C17F47B624B049AF541C473A811A60F75">
+            <Patches>
+              <Patch Address="0x00044C80" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="A8A00D00" PatchedBytes="FACE0D00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B03EA0984975D4025960C87527E8760B58C504F3" HashPatched="E84977E96462FDC41596A6D4DB80FB1CF5A64528">
+            <Patches>
+              <Patch Address="0x00028A2C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="21730C00" PatchedBytes="73A10C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15063.0">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="1B6436EC18CB0FDF541CB382DA2CCD615E4379A6" HashPatched="CFB1560E6F215C198443C4AC09F08DB24E6F87F5">
+            <Patches>
+              <Patch Address="0x0002BC08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="EFA81C00" PatchedBytes="42D71B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15063.297">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E62882C993FAFEAF0E76622612FE9DCC70192C96" HashPatched="2DA62DC2BF9F278E2E7829A57A5BBEC504D774AF">
+            <Patches>
+              <Patch Address="0x0002BC08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="8F591C00" PatchedBytes="E1871C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.1">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="F27A93F8E597B8C270E0308F4ED59245A0FAD534" HashPatched="738916C95AF85B5C4087470121ED4D8A9D05A6E2">
+            <Patches>
+              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="F0181C00" PatchedBytes="42471C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.12">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="5A9B06CB5E49D8D8E062DDD3D7E3492144E85BB2" HashPatched="5F431432AB61B977F01F454A8F93EC08001EF1BF">
+            <Patches>
+              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="A2171C00" PatchedBytes="F4451C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.124">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="8FDA31B9DE443ED718280CC190641EF33C2677B1" HashPatched="6D00622A1CDC43134D04886E86E98B9F78045B8A">
+            <Patches>
+              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="9FB41C00" PatchedBytes="F2E21B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.16">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="05598D2CCE248D56DC61175F97D64849F82AE09D" HashPatched="CC9DA8EEFD21B0B7882DC7125A7C385126B784CD">
+            <Patches>
+              <Patch Address="0x0002BBC8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="904C1C00" PatchedBytes="E27A1C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.158">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="AAFE7C3D97921BDA6C48C4AEDA4FFA966EFFE1FA" HashPatched="5838197485F84CBDA40040E7A5F0A877BF2EDFB2">
+            <Patches>
+              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="E34D1C00" PatchedBytes="357C1C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.158 (dev)">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E832131801F6BCEED764098B73A5DA7F53AAEBA1" HashPatched="C4E99F0DB736037373C114DD8B139F79E7A38EB7">
+            <Patches>
+              <Patch Address="0x0002BBC8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="C1A61C00" PatchedBytes="14D51B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.490">
+        <TargetFiles>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="ACC23258B4B96209ADCFCC8183CEF12F5E93A0E6" HashPatched="93480ACD9FDA7A7B33E433C9297AA90968F5ADBC">
+            <Patches>
+              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="17BE1C00" PatchedBytes="6AEC1B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.527">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E1CDC15B381A874DBAA94BA734C78A6ED801F66A" HashPatched="37A4ADDBB7FE997699F2E8670C3CB2CCFDF7C05D">
+            <Patches>
+              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x0006D474" OriginalBytes="2DE93048" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="FA751C00" PatchedBytes="5FDA1B00" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E1CDC15B381A874DBAA94BA734C78A6ED801F66A" HashPatched="E001FB4B6C4B4A119D76A625AEFDD3DE041A6E6D">
+                <Patches>
+                  <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+                  <Patch Address="0x00000138" OriginalBytes="FA751C00" PatchedBytes="4CA41C00" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.530">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="528D1D9FA0371FEDD92548FC1E3695747BF637DB" HashPatched="C80088788F4C4B6762BD834126624958470D4273">
+            <Patches>
+              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x0006D474" OriginalBytes="2DE93048" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="409A1C00" PatchedBytes="A5FE1B00" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="528D1D9FA0371FEDD92548FC1E3695747BF637DB" HashPatched="194D04F6AAFBB9E06FA476911D0EB3A768AB7831">
+                <Patches>
+                  <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+                  <Patch Address="0x00000138" OriginalBytes="409A1C00" PatchedBytes="93C81B00" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.538">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="3045E7B081960E0615AC876E34AABF0A4A5CAC41" HashPatched="964C762F86630E7E2467921E1F51FF08A1E359D9">
+            <Patches>
+              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="93731C00" PatchedBytes="F8D71B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.541">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="F92F5A3E9379DB70CB7F20C751571A4AD53C746F" HashPatched="C17472D8A2046AF09ED4C75250FD307903D19C83">
+            <Patches>
+              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="07E31B00" PatchedBytes="6B471C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.544">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E57366397EFF615272D5996BFCA68F89566032B6" HashPatched="8AFB66E6BD9172923917E9711EE7C332CB994C66">
+            <Patches>
+              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="35111C00" PatchedBytes="99751C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.547">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="31CF8F2ECBBB0FC4F5FA56919D7A13CAAA9A8C27" HashPatched="085A195FE48527E22E556133849F5DBE1C4D6764">
+            <Patches>
+              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="E31B1C00" PatchedBytes="47801C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.603">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="D6D520A854C8C448BF63509F558C9DD4A198165E" HashPatched="1642DBB634A7AF82EB1D5DABF035FBB66D966632">
+            <Patches>
+              <Patch Address="0x0002B89C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000BBE10" OriginalBytes="42006F00" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="0FC01B00" PatchedBytes="20551C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="efi\boot\bootarm.efi" HashOriginal="1B4F62080167244382E64572B21095775BFC1EDD" HashPatched="FCD26A767FAFE90002FE7CC721B7B55556A3AE71">
+            <Patches>
+              <Patch Address="0x0003890C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="1F430E00" PatchedBytes="71710E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+    </TargetVersions>
+  </PatchDefinition>
+  <PatchDefinition Name="SecureBootHack-V1.1-EFIESP">
+    <TargetVersions>
+      <TargetVersion Description="10.0.10240.16384">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="240B7F0B6BC5CD923CBEAEE85DBBA1F240C96C3B" HashPatched="14EE38E1229C8D770493A09A8CDC6B044A694720">
+            <Patches>
+              <Patch Address="0x00065514" OriginalBytes="2DE930480DF1080B9BF7B6FAADF50B7D0023039304932C4B0DF1220040F206221B8800210024ADF820309CF76DF900238DF80830012305932149204802AB009305AB06AA9DF7A6F9002805DB059B012B02D19DF8083053BB08A800F037F80446002C24DB03AA04A908A800F097F80446039D002C04DA134B9C4214D1002412E0049B0095C6F794FA0446002C0BDB01238DF8083002AB0A4908480093012303229DF7BCF9044615B12846CFF74FF820460DF50B7D9BF76CFA" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2315604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C72604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B1C61060098E30A00847F0A00BD2E0800652E0800A47B0E0081D40600" />
+              <Patch Address="0x00000138" OriginalBytes="E5280C00" PatchedBytes="41FE0C00" />
+              <Patch Address="0x000733D8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x000285F8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000AC198" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x00001EBC" OriginalBytes="03D1" PatchedBytes="00BF" />
+              <Patch Address="0x00001EC2" OriginalBytes="6AF0DDFC" PatchedBytes="63F029BB" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10011.16384">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="240B7F0B6BC5CD923CBEAEE85DBBA1F240C96C3B" HashPatched="14EE38E1229C8D770493A09A8CDC6B044A694720">
+            <Patches>
+              <Patch Address="0x00065514" OriginalBytes="2DE930480DF1080B9BF7B6FAADF50B7D0023039304932C4B0DF1220040F206221B8800210024ADF820309CF76DF900238DF80830012305932149204802AB009305AB06AA9DF7A6F9002805DB059B012B02D19DF8083053BB08A800F037F80446002C24DB03AA04A908A800F097F80446039D002C04DA134B9C4214D1002412E0049B0095C6F794FA0446002C0BDB01238DF8083002AB0A4908480093012303229DF7BCF9044615B12846CFF74FF820460DF50B7D9BF76CFA" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2315604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C72604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B1C61060098E30A00847F0A00BD2E0800652E0800A47B0E0081D40600" />
+              <Patch Address="0x00000138" OriginalBytes="E5280C00" PatchedBytes="41FE0C00" />
+              <Patch Address="0x000733D8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x000285F8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000AC198" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x00001EBC" OriginalBytes="03D1" PatchedBytes="00BF" />
+              <Patch Address="0x00001EC2" OriginalBytes="6AF0DDFC" PatchedBytes="63F029BB" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.107">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B758EE117AEF2E6ED3DC6C0F07BC65CBCF944D6A" HashPatched="85CEB6E5D5258C1312E809BB73B3ACFA14CCA4EB">
+            <Patches>
+              <Patch Address="0x00068188" OriginalBytes="2DE930480DF1080BADF50A7D002303932D4B0DF1220040F206221B880021ADF8203099F737FB002304938DF80830012305932249204802AB009305AB06AA00249AF76CFB002805DB059B012B02D19DF8083063BB08A800F039F80446002C26DB03AA04A908A800F093F80446039D002C04DA144B9C4216D1002414E01048049B03220095C4F730F90446002C0BDB01238DF8083002AB094907480093012303229AF780FB044615B12846CEF7EDF820460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F22D5604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C12604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B908D060028120B0048120B00A187070049870700C4CF0E001DFF0600" />
+              <Patch Address="0x000710D4" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00028A04" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000AF828" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x00001EB6" OriginalBytes="03D1" PatchedBytes="00BF" />
+              <Patch Address="0x00001EBC" OriginalBytes="6DF02EFA" PatchedBytes="66F066B9" />
+              <Patch Address="0x00000138" OriginalBytes="178C0C00" PatchedBytes="67850C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15063.0">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\mobilestartup.efi" HashOriginal="1B6436EC18CB0FDF541CB382DA2CCD615E4379A6" HashPatched="456E632E8FA39D3820169E485573F221A2663FCE">
+            <Patches>
+              <Patch Address="0x0006D374" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F74DFA002305938DF80830012303932249204802AB009303AB06AA002495F720F9002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF732FA0446002C0BDB01238DF8083002AB0949074800930123032295F734F9044615B12846CCF7E1FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CDF06003C320C0084320C0045980800ED970800488C1E0079520700" />
+              <Patch Address="0x00000138" OriginalBytes="EFA81C00" PatchedBytes="C9791C00" />
+              <Patch Address="0x0002BC08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000C0E3C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x0007465E" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F0E6FA" PatchedBytes="6BF066B9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15063.297">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\mobilestartup.efi" HashOriginal="1B6436EC18CB0FDF541CB382DA2CCD615E4379A6" HashPatched="456E632E8FA39D3820169E485573F221A2663FCE">
+            <Patches>
+              <Patch Address="0x0002BC08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="EFA81C00" PatchedBytes="C9791C00" />
+              <Patch Address="0x000C0E3C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x0007465E" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F0E6FA" PatchedBytes="6BF066B9" />
+              <Patch Address="0x0006D374" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F74DFA002305938DF80830012303932249204802AB009303AB06AA002495F720F9002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF732FA0446002C0BDB01238DF8083002AB0949074800930123032295F734F9044615B12846CCF7E1FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CDF06003C320C0084320C0045980800ED970800488C1E0079520700" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.318">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="8E71D1F0255E8C71BDE6F8D3780C4827C244375B" HashPatched="619484E25618AFE34A651741921430520CF51DDD">
+            <Patches>
+              <Patch Address="0x000681A8" OriginalBytes="2DE930480DF1080BADF50A7D002303932D4B0DF1220040F206221B880021ADF8203099F727FB002304938DF80830012305932249204802AB009305AB06AA00249AF75CFB002805DB059B012B02D19DF8083063BB08A800F039F80446002C26DB03AA04A908A800F095F80446039D002C04DA144B9C4216D1002414E01048049B03220095C4F71AF90446002C0BDB01238DF8083002AB094907480093012303229AF770FB044615B12846CEF7EDF820460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F22D5604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C12604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BB08D060028120B0048120B00C58707006D870700C4CF0E0041FF0600" />
+              <Patch Address="0x00000138" OriginalBytes="DABE0C00" PatchedBytes="F8B80C00" />
+              <Patch Address="0x000710F8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00028A2C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000AF828" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x00001EB6" OriginalBytes="03D1" PatchedBytes="00BF" />
+              <Patch Address="0x00001EBC" OriginalBytes="6DF040FA" PatchedBytes="66F076B9" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.494">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B03EA0984975D4025960C87527E8760B58C504F3" HashPatched="ED4CE6DD96EF4FA440B6898EFD4AE9EB1025D10A">
+            <Patches>
+              <Patch Address="0x000681A8" OriginalBytes="2DE930480DF1080BADF50A7D002303932D4B0DF1220040F206221B880021ADF8203099F727FB002304938DF80830012305932249204802AB009305AB06AA00249AF75CFB002805DB059B012B02D19DF8083063BB08A800F039F80446002C26DB03AA04A908A800F095F80446039D002C04DA144B9C4216D1002414E01048049B03220095C4F71AF90446002C0BDB01238DF8083002AB094907480093012303229AF770FB044615B12846CEF7EDF820460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F22D5604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C12604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BB08D060028120B0048120B00C58707006D870700C4CF0E0041FF0600" />
+              <Patch Address="0x00000138" OriginalBytes="21730C00" PatchedBytes="3F6D0C00" />
+              <Patch Address="0x000710F8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00028A2C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000AF828" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x00001EB6" OriginalBytes="03D1" PatchedBytes="00BF" />
+              <Patch Address="0x00001EBC" OriginalBytes="6DF040FA" PatchedBytes="66F076B9" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.1">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\mobilestartup.efi" HashOriginal="F27A93F8E597B8C270E0308F4ED59245A0FAD534" HashPatched="034E15A4E8553337E617D167440EE7DD7E633467">
+            <Patches>
+              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="F0181C00" PatchedBytes="E0ED1B00" />
+              <Patch Address="0x000C1054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
+              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E0060054320C0074320C00D998080081980800488C1E000D530700" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.12">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="5A9B06CB5E49D8D8E062DDD3D7E3492144E85BB2" HashPatched="54BFB9319C2937FF6DB5BEAA3F7831DEB119B06B">
+            <Patches>
+              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000C1054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
+              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E0060054320C0074320C00D998080081980800488C1E000D530700" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x00000138" OriginalBytes="A2171C00" PatchedBytes="92EC1B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.124">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="8FDA31B9DE443ED718280CC190641EF33C2677B1" HashPatched="8B99B3E8219B96DA87C09AE745A5448E9E85CEFF">
+            <Patches>
+              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000C1054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
+              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E0060054320C0074320C00D998080081980800488C1E000D530700" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x00000138" OriginalBytes="9FB41C00" PatchedBytes="8F891C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.16">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="05598D2CCE248D56DC61175F97D64849F82AE09D" HashPatched="AB679BC7D8A2944587CE552100CF3CADFD5CD93A">
+            <Patches>
+              <Patch Address="0x0002BBC8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="904C1C00" PatchedBytes="50211C00" />
+              <Patch Address="0x000C103C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746CA" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F01CFB" PatchedBytes="6BF09CB9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x0006D3E0" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F717FA002305938DF80830012303932249204802AB009303AB06AA002495F7EAF8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7D6F90446002C0BDB01238DF8083002AB0949074800930123032295F7FEF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BE8DF06003C320C0084320C0015990800BD980800488C1E00E5520700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.158">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="AAFE7C3D97921BDA6C48C4AEDA4FFA966EFFE1FA" HashPatched="1B9860D14CAD17957B9E853F5E67660C4B521D77">
+            <Patches>
+              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="E34D1C00" PatchedBytes="CB221C00" />
+              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E006003C320C0084320C00D998080081980800488C1E000D530700" />
+              <Patch Address="0x000C103C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.158 (dev)">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E832131801F6BCEED764098B73A5DA7F53AAEBA1" HashPatched="40C1CC59F2DA738501E6373AAA430F085C5B9DD6">
+            <Patches>
+              <Patch Address="0x0002BBC8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="C1A61C00" PatchedBytes="4D7B1C00" />
+              <Patch Address="0x0006D3E0" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F717FA002305938DF80830012303932249204802AB009303AB06AA002495F7EAF8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7D6F90446002C0BDB01238DF8083002AB0949074800930123032295F7FEF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BE8DF060048320C0090320C0015990800BD980800FC8B1E00E5520700" />
+              <Patch Address="0x000C1048" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746CA" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F01CFB" PatchedBytes="6BF09CB9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.490">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="ACC23258B4B96209ADCFCC8183CEF12F5E93A0E6" HashPatched="4344BADBBA3D4BC61EEB2DC5F74DB974FA4F0F33">
+            <Patches>
+              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="17BE1C00" PatchedBytes="AB951C00" />
+              <Patch Address="0x000C1060" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x0007475E" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F066FB" PatchedBytes="6BF0E6B9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x0006D474" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060060320C0080320C0045990800ED980800888C1E0079530700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.527">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E1CDC15B381A874DBAA94BA734C78A6ED801F66A" HashPatched="69E58EFA38729C4086A58FF76E0D0F6355A923AC">
+            <Patches>
+              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="FA751C00" PatchedBytes="5BED1B00" />
+              <Patch Address="0x000C0054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x0007475E" OriginalBytes="01D00348" PatchedBytes="F8F789BE" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x0006D474" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060054220C0074220C0045990800ED980800687C1E0079530700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.530">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="528D1D9FA0371FEDD92548FC1E3695747BF637DB" HashPatched="552F56CB428A32063C292785B7EFA711D0AD1EC4">
+            <Patches>
+              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000C0054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x0007475E" OriginalBytes="01D00348" PatchedBytes="F8F789BE" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x0006D474" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060054220C0074220C0045990800ED980800687C1E0079530700" />
+              <Patch Address="0x00000138" OriginalBytes="409A1C00" PatchedBytes="A1111C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+    </TargetVersions>
+  </PatchDefinition>
+  <PatchDefinition Name="SecureBootHack-V2-EFIESP">
+    <TargetVersions>
+      <TargetVersion Description="10.0.10240.16384">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="240B7F0B6BC5CD923CBEAEE85DBBA1F240C96C3B" HashPatched="14EE38E1229C8D770493A09A8CDC6B044A694720">
+            <Patches>
+              <Patch Address="0x00065514" OriginalBytes="2DE930480DF1080B9BF7B6FAADF50B7D0023039304932C4B0DF1220040F206221B8800210024ADF820309CF76DF900238DF80830012305932149204802AB009305AB06AA9DF7A6F9002805DB059B012B02D19DF8083053BB08A800F037F80446002C24DB03AA04A908A800F097F80446039D002C04DA134B9C4214D1002412E0049B0095C6F794FA0446002C0BDB01238DF8083002AB0A4908480093012303229DF7BCF9044615B12846CFF74FF820460DF50B7D9BF76CFA" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2315604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C72604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B1C61060098E30A00847F0A00BD2E0800652E0800A47B0E0081D40600" />
+              <Patch Address="0x00000138" OriginalBytes="E5280C00" PatchedBytes="41FE0C00" />
+              <Patch Address="0x000733D8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x000285F8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000AC198" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x00001EBC" OriginalBytes="03D1" PatchedBytes="00BF" />
+              <Patch Address="0x00001EC2" OriginalBytes="6AF0DDFC" PatchedBytes="63F029BB" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10011.16384">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="240B7F0B6BC5CD923CBEAEE85DBBA1F240C96C3B" HashPatched="14EE38E1229C8D770493A09A8CDC6B044A694720">
+            <Patches>
+              <Patch Address="0x00065514" OriginalBytes="2DE930480DF1080B9BF7B6FAADF50B7D0023039304932C4B0DF1220040F206221B8800210024ADF820309CF76DF900238DF80830012305932149204802AB009305AB06AA9DF7A6F9002805DB059B012B02D19DF8083053BB08A800F037F80446002C24DB03AA04A908A800F097F80446039D002C04DA134B9C4214D1002412E0049B0095C6F794FA0446002C0BDB01238DF8083002AB0A4908480093012303229DF7BCF9044615B12846CFF74FF820460DF50B7D9BF76CFA" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2315604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C72604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B1C61060098E30A00847F0A00BD2E0800652E0800A47B0E0081D40600" />
+              <Patch Address="0x00000138" OriginalBytes="E5280C00" PatchedBytes="41FE0C00" />
+              <Patch Address="0x000733D8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x000285F8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000AC198" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x00001EBC" OriginalBytes="03D1" PatchedBytes="00BF" />
+              <Patch Address="0x00001EC2" OriginalBytes="6AF0DDFC" PatchedBytes="63F029BB" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.107">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B758EE117AEF2E6ED3DC6C0F07BC65CBCF944D6A" HashPatched="85CEB6E5D5258C1312E809BB73B3ACFA14CCA4EB">
+            <Patches>
+              <Patch Address="0x00068188" OriginalBytes="2DE930480DF1080BADF50A7D002303932D4B0DF1220040F206221B880021ADF8203099F737FB002304938DF80830012305932249204802AB009305AB06AA00249AF76CFB002805DB059B012B02D19DF8083063BB08A800F039F80446002C26DB03AA04A908A800F093F80446039D002C04DA144B9C4216D1002414E01048049B03220095C4F730F90446002C0BDB01238DF8083002AB094907480093012303229AF780FB044615B12846CEF7EDF820460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F22D5604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C12604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B908D060028120B0048120B00A187070049870700C4CF0E001DFF0600" />
+              <Patch Address="0x000710D4" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00028A04" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000AF828" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x00001EB6" OriginalBytes="03D1" PatchedBytes="00BF" />
+              <Patch Address="0x00001EBC" OriginalBytes="6DF02EFA" PatchedBytes="66F066B9" />
+              <Patch Address="0x00000138" OriginalBytes="178C0C00" PatchedBytes="67850C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15063.0">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\mobilestartup.efi" HashOriginal="1B6436EC18CB0FDF541CB382DA2CCD615E4379A6" HashPatched="456E632E8FA39D3820169E485573F221A2663FCE">
+            <Patches>
+              <Patch Address="0x0006D374" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F74DFA002305938DF80830012303932249204802AB009303AB06AA002495F720F9002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF732FA0446002C0BDB01238DF8083002AB0949074800930123032295F734F9044615B12846CCF7E1FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CDF06003C320C0084320C0045980800ED970800488C1E0079520700" />
+              <Patch Address="0x00000138" OriginalBytes="EFA81C00" PatchedBytes="C9791C00" />
+              <Patch Address="0x0002BC08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000C0E3C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x0007465E" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F0E6FA" PatchedBytes="6BF066B9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15063.297">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\mobilestartup.efi" HashOriginal="1B6436EC18CB0FDF541CB382DA2CCD615E4379A6" HashPatched="456E632E8FA39D3820169E485573F221A2663FCE">
+            <Patches>
+              <Patch Address="0x0002BC08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="EFA81C00" PatchedBytes="C9791C00" />
+              <Patch Address="0x000C0E3C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x0007465E" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F0E6FA" PatchedBytes="6BF066B9" />
+              <Patch Address="0x0006D374" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F74DFA002305938DF80830012303932249204802AB009303AB06AA002495F720F9002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF732FA0446002C0BDB01238DF8083002AB0949074800930123032295F734F9044615B12846CCF7E1FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CDF06003C320C0084320C0045980800ED970800488C1E0079520700" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.318">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="8E71D1F0255E8C71BDE6F8D3780C4827C244375B" HashPatched="619484E25618AFE34A651741921430520CF51DDD">
+            <Patches>
+              <Patch Address="0x000681A8" OriginalBytes="2DE930480DF1080BADF50A7D002303932D4B0DF1220040F206221B880021ADF8203099F727FB002304938DF80830012305932249204802AB009305AB06AA00249AF75CFB002805DB059B012B02D19DF8083063BB08A800F039F80446002C26DB03AA04A908A800F095F80446039D002C04DA144B9C4216D1002414E01048049B03220095C4F71AF90446002C0BDB01238DF8083002AB094907480093012303229AF770FB044615B12846CEF7EDF820460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F22D5604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C12604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BB08D060028120B0048120B00C58707006D870700C4CF0E0041FF0600" />
+              <Patch Address="0x00000138" OriginalBytes="DABE0C00" PatchedBytes="F8B80C00" />
+              <Patch Address="0x000710F8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00028A2C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000AF828" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x00001EB6" OriginalBytes="03D1" PatchedBytes="00BF" />
+              <Patch Address="0x00001EBC" OriginalBytes="6DF040FA" PatchedBytes="66F076B9" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.494">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="B03EA0984975D4025960C87527E8760B58C504F3" HashPatched="ED4CE6DD96EF4FA440B6898EFD4AE9EB1025D10A">
+            <Patches>
+              <Patch Address="0x000681A8" OriginalBytes="2DE930480DF1080BADF50A7D002303932D4B0DF1220040F206221B880021ADF8203099F727FB002304938DF80830012305932249204802AB009305AB06AA00249AF75CFB002805DB059B012B02D19DF8083063BB08A800F039F80446002C26DB03AA04A908A800F095F80446039D002C04DA144B9C4216D1002414E01048049B03220095C4F71AF90446002C0BDB01238DF8083002AB094907480093012303229AF770FB044615B12846CEF7EDF820460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F22D5604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6C12604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BB08D060028120B0048120B00C58707006D870700C4CF0E0041FF0600" />
+              <Patch Address="0x00000138" OriginalBytes="21730C00" PatchedBytes="3F6D0C00" />
+              <Patch Address="0x000710F8" OriginalBytes="2DE9F048" PatchedBytes="00207047" />
+              <Patch Address="0x00028A2C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000AF828" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x00001EB6" OriginalBytes="03D1" PatchedBytes="00BF" />
+              <Patch Address="0x00001EBC" OriginalBytes="6DF040FA" PatchedBytes="66F076B9" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.1">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\mobilestartup.efi" HashOriginal="F27A93F8E597B8C270E0308F4ED59245A0FAD534" HashPatched="034E15A4E8553337E617D167440EE7DD7E633467">
+            <Patches>
+              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="F0181C00" PatchedBytes="E0ED1B00" />
+              <Patch Address="0x000C1054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
+              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E0060054320C0074320C00D998080081980800488C1E000D530700" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.12">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="5A9B06CB5E49D8D8E062DDD3D7E3492144E85BB2" HashPatched="54BFB9319C2937FF6DB5BEAA3F7831DEB119B06B">
+            <Patches>
+              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000C1054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
+              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E0060054320C0074320C00D998080081980800488C1E000D530700" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x00000138" OriginalBytes="A2171C00" PatchedBytes="92EC1B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.124">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="8FDA31B9DE443ED718280CC190641EF33C2677B1" HashPatched="8B99B3E8219B96DA87C09AE745A5448E9E85CEFF">
+            <Patches>
+              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000C1054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
+              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E0060054320C0074320C00D998080081980800488C1E000D530700" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x00000138" OriginalBytes="9FB41C00" PatchedBytes="8F891C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.16">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="05598D2CCE248D56DC61175F97D64849F82AE09D" HashPatched="AB679BC7D8A2944587CE552100CF3CADFD5CD93A">
+            <Patches>
+              <Patch Address="0x0002BBC8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="904C1C00" PatchedBytes="50211C00" />
+              <Patch Address="0x000C103C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746CA" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F01CFB" PatchedBytes="6BF09CB9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x0006D3E0" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F717FA002305938DF80830012303932249204802AB009303AB06AA002495F7EAF8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7D6F90446002C0BDB01238DF8083002AB0949074800930123032295F7FEF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BE8DF06003C320C0084320C0015990800BD980800488C1E00E5520700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.158">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="AAFE7C3D97921BDA6C48C4AEDA4FFA966EFFE1FA" HashPatched="1B9860D14CAD17957B9E853F5E67660C4B521D77">
+            <Patches>
+              <Patch Address="0x0002BBBC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="E34D1C00" PatchedBytes="CB221C00" />
+              <Patch Address="0x0006D408" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F703FA002305938DF80830012303932249204802AB009303AB06AA002495F7D6F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C2F90446002C0BDB01238DF8083002AB0949074800930123032295F7EAF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B10E006003C320C0084320C00D998080081980800488C1E000D530700" />
+              <Patch Address="0x000C103C" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746F2" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F030FB" PatchedBytes="6BF0B0B9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.158 (dev)">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E832131801F6BCEED764098B73A5DA7F53AAEBA1" HashPatched="40C1CC59F2DA738501E6373AAA430F085C5B9DD6">
+            <Patches>
+              <Patch Address="0x0002BBC8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="C1A61C00" PatchedBytes="4D7B1C00" />
+              <Patch Address="0x0006D3E0" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F717FA002305938DF80830012303932249204802AB009303AB06AA002495F7EAF8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7D6F90446002C0BDB01238DF8083002AB0949074800930123032295F7FEF8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BE8DF060048320C0090320C0015990800BD980800FC8B1E00E5520700" />
+              <Patch Address="0x000C1048" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746CA" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F01CFB" PatchedBytes="6BF09CB9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.490">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="ACC23258B4B96209ADCFCC8183CEF12F5E93A0E6" HashPatched="4344BADBBA3D4BC61EEB2DC5F74DB974FA4F0F33">
+            <Patches>
+              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="17BE1C00" PatchedBytes="AB951C00" />
+              <Patch Address="0x000C1060" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x0007475E" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F066FB" PatchedBytes="6BF0E6B9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x0006D474" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060060320C0080320C0045990800ED980800888C1E0079530700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.527">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E1CDC15B381A874DBAA94BA734C78A6ED801F66A" HashPatched="9A69D3A34F39A5809B57CEA7547E7869D815C311">
+            <Patches>
+              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x0006D474" OriginalBytes="2DE93048" PatchedBytes="00207047" />
+              <Patch Address="0x000C0054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x0007475E" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F066FB" PatchedBytes="6BF0E6B9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x0006D478" OriginalBytes="0DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="78462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060054220C0074220C0045990800ED980800687C1E0079530700" />
+              <Patch Address="0x00000138" OriginalBytes="FA751C00" PatchedBytes="561D1C00" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E1CDC15B381A874DBAA94BA734C78A6ED801F66A" HashPatched="CF9F940D28BE4181998EF7D4B9AF5AE3AE63815B">
+                <Patches>
+                  <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+                  <Patch Address="0x00000138" OriginalBytes="FA751C00" PatchedBytes="2BE21B00" />
+                  <Patch Address="0x000C0054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+                  <Patch Address="0x0007475E" OriginalBytes="01D00348" PatchedBytes="F8F789BE" />
+                  <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+                  <Patch Address="0x0006D474" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060054220C0074220C0045990800ED980800687C1E0079530700" />
+                  <Patch Address="0x000020A8" OriginalBytes="72F066FB" PatchedBytes="6EF03AF0" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.530">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="528D1D9FA0371FEDD92548FC1E3695747BF637DB" HashPatched="DCE68DE966071F38A28C44D95AE66F2FADBB349D">
+            <Patches>
+              <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x0006D474" OriginalBytes="2DE93048" PatchedBytes="00207047" />
+              <Patch Address="0x000C0054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x0007475E" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F066FB" PatchedBytes="6BF0E6B9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x0006D478" OriginalBytes="0DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="78462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060054220C0074220C0045990800ED980800687C1E0079530700" />
+              <Patch Address="0x00000138" OriginalBytes="409A1C00" PatchedBytes="9C411C00" />
+            </Patches>
+            <Obsolete>
+              <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="528D1D9FA0371FEDD92548FC1E3695747BF637DB" HashPatched="E5B736B0382AC3712C7BA3FF387A4055F2D5C09A">
+                <Patches>
+                  <Patch Address="0x0002BC28" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+                  <Patch Address="0x000C0054" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+                  <Patch Address="0x0007475E" OriginalBytes="01D00348" PatchedBytes="F8F789BE" />
+                  <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+                  <Patch Address="0x0006D474" OriginalBytes="2DE930480DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F7CDF9002305938DF80830012303932249204802AB009303AB06AA002495F7A0F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF7C8F90446002C0BDB01238DF8083002AB0949074800930123032295F7B4F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="0020704778462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B7CE0060054220C0074220C0045990800ED980800687C1E0079530700" />
+                  <Patch Address="0x00000138" OriginalBytes="409A1C00" PatchedBytes="71061C00" />
+                  <Patch Address="0x000020A8" OriginalBytes="72F066FB" PatchedBytes="6EF03AF0" />
+                </Patches>
+                <Obsolete />
+              </TargetFile>
+            </Obsolete>
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.538">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="3045E7B081960E0615AC876E34AABF0A4A5CAC41" HashPatched="733758AF398852A31B9F07C65CCC2305C924F97F">
+            <Patches>
+              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
+              <Patch Address="0x000BFE54" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746D6" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F022FB" PatchedBytes="6BF0A2B9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x0006D3F0" OriginalBytes="0DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F711FA002305938DF80830012303932249204802AB009303AB06AA002495F7E4F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF70CFA0446002C0BDB01238DF8083002AB0949074800930123032295F7F8F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="78462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BF4DF060054220C0074220C00BD98080065980800687C1E00F1520700" />
+              <Patch Address="0x00000138" OriginalBytes="93731C00" PatchedBytes="BF171C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.541">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="F92F5A3E9379DB70CB7F20C751571A4AD53C746F" HashPatched="961376A7C671EEA02A2E9F348FB5A5D1A9348206">
+            <Patches>
+              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
+              <Patch Address="0x000BFE54" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746D6" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F022FB" PatchedBytes="6BF0A2B9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x0006D3F0" OriginalBytes="0DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F711FA002305938DF80830012303932249204802AB009303AB06AA002495F7E4F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF70CFA0446002C0BDB01238DF8083002AB0949074800930123032295F7F8F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="78462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BF4DF060054220C0074220C00BD98080065980800687C1E00F1520700" />
+              <Patch Address="0x00000138" OriginalBytes="07E31B00" PatchedBytes="32871C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.544">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="E57366397EFF615272D5996BFCA68F89566032B6" HashPatched="2AACA16ADB000B8A80D24BBB4808423877DF5F36">
+            <Patches>
+              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
+              <Patch Address="0x000BFE54" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746D6" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F022FB" PatchedBytes="6BF0A2B9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x0006D3F0" OriginalBytes="0DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F711FA002305938DF80830012303932249204802AB009303AB06AA002495F7E4F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF70CFA0446002C0BDB01238DF8083002AB0949074800930123032295F7F8F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="78462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BF4DF060054220C0074220C00BD98080065980800687C1E00F1520700" />
+              <Patch Address="0x00000138" OriginalBytes="35111C00" PatchedBytes="60B51C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.547">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="31CF8F2ECBBB0FC4F5FA56919D7A13CAAA9A8C27" HashPatched="D6D520A854C8C448BF63509F558C9DD4A198165E">
+            <Patches>
+              <Patch Address="0x0002BB7C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x0006D3EC" OriginalBytes="2DE93048" PatchedBytes="00207047" />
+              <Patch Address="0x000BFE54" OriginalBytes="4D00610073007300530074006F00720061006700650046006C00610067000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x000746D6" OriginalBytes="01D0" PatchedBytes="01E0" />
+              <Patch Address="0x000020A8" OriginalBytes="72F022FB" PatchedBytes="6BF0A2B9" />
+              <Patch Address="0x000020C4" OriginalBytes="2DE91848" PatchedBytes="01207047" />
+              <Patch Address="0x0006D3F0" OriginalBytes="0DF1080BADF50A7D002304932D4B0DF1220040F206221B880021ADF8203094F711FA002305938DF80830012303932249204802AB009303AB06AA002495F7E4F8002805DB039B012B02D19DF8083063BB08A800F039F80446002C26DB04AA05A908A800F08BF80446049D002C04DA144B9C4216D1002414E01048059B03220095BCF70CFA0446002C0BDB01238DF8083002AB0949074800930123032295F7F8F8044615B12846CCF771FB20460DF50A7DBDE83088" PatchedBytes="78462549A0EB010070B481B00446234B04EB0300224B04EB030103220023009343F2812604EB0605A8471E4904EB0105A8470646012E04D001201B4904EB0105A8471A4804EB00010968D1F8AC500EA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460F4904EB0105A8470F4E04EB0605A84742F6AD4604EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784BF4DF060054220C0074220C00BD98080065980800687C1E00F1520700" />
+              <Patch Address="0x00000138" OriginalBytes="E31B1C00" PatchedBytes="0FC01B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.603">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\mobilestartup.efi" HashOriginal="D6D520A854C8C448BF63509F558C9DD4A198165E" HashPatched="B1AEF01E2CC9BDEC1FE187A04BFAB8FAC2CAC152">
+            <Patches>
+              <Patch Address="0x0002B89C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x000BBE10" OriginalBytes="42006F00" PatchedBytes="00207047" />
+              <Patch Address="0x00000000" OriginalBytes="4D5A90000300000004000000FFFF0000B8000000000000004000000000000000" PatchedBytes="4800650061007400680063006C00690066006600370034004D0053004D000000" />
+              <Patch Address="0x0000187A" OriginalBytes="02DB" PatchedBytes="00BF" />
+              <Patch Address="0x000746F0" OriginalBytes="2DE93C48" PatchedBytes="48F091BF" />
+              <Patch Address="0x00002040" OriginalBytes="2DE9FF48" PatchedBytes="01207047" />
+              <Patch Address="0x000BBE16" OriginalBytes="74004400650062007500670050006F006C006900630079004100700070006C00690065006400000000002E00620069006E002E007000370000005C004400650062007500670050006F006C00690063006900650073005C00000030003100320033003400350036003700380039004100420043004400450046005C00570069006E0064006F00770073005C00530079007300740065006D00330032005C0062006F006F0074005C00750069005C0062006F006F00" PatchedBytes="78462549A0EB010070B481B004464FF0000304EB0300214B04EB030103220023009343F2812604EB0605A8471C4904EB0105A8470646012E04D00120194904EB0105A847184804EB00010968D1F8AC500DA000216A46A847009D6D68002D01D1009DAD68A847012E04D030460D4904EB0105A8470D4E04EB0605A8470C4E04EB060001B070BC00479D5B08F90493FB408FE04AEE3B1A784B18E20B0074220C00BD98080065980800687C1E00F1520700F5520700" />
+              <Patch Address="0x00000138" OriginalBytes="0FC01B00" PatchedBytes="ABB31C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+    </TargetVersions>
+  </PatchDefinition>
+  <PatchDefinition Name="SecureBootHack-MainOS">
+    <TargetVersions>
+      <TargetVersion Description="8.10.12393.890">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="F2FCA692D0C19EC2959FB359F4E74C909C25B580" HashPatched="DE3CE0CDB56799CFE25E7CFE3BE88386692260E8">
+            <Patches>
+              <Patch Address="0x00031E08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="FF300C00" PatchedBytes="515F0C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="6CA9F655E5E915940CF5C2E77DE21E168546ABF9" HashPatched="50CA755BF3FDCC84E3733C0BA484692E3FA48D85">
+            <Patches>
+              <Patch Address="0x00017744" OriginalBytes="1BD1" PatchedBytes="1BE0" />
+              <Patch Address="0x00000160" OriginalBytes="F8310700" PatchedBytes="F8400700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.14226.359">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="CDF52B4E5B1AE19DB8F82E17FEC3103A96AABD68" HashPatched="06900D98165277F6E634D077EA471A3DF4035F7E">
+            <Patches>
+              <Patch Address="0x000179FC" OriginalBytes="1BD1" PatchedBytes="1BE0" />
+              <Patch Address="0x00000158" OriginalBytes="A8110700" PatchedBytes="A8200700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="645AF4B8ADD284B963CDA154952BA95FC7581756" HashPatched="4F9ADDC2CF919DDC9AB75358CC02D06006F2B2DB">
+            <Patches>
+              <Patch Address="0x00033154" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="01FB0B00" PatchedBytes="53290C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.12397.895">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="68561A15A7602E154118106B4F82E10347127108" HashPatched="7AF30A2016C373815D07107B3EA23E1DEAAECE83">
+            <Patches>
+              <Patch Address="0x00000160" OriginalBytes="C3660700" PatchedBytes="C3750700" />
+              <Patch Address="0x00017744" OriginalBytes="1BD1" PatchedBytes="1BE0" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="55CEF7353D552C5A00CAFF1222DCCF59E91E45AF" HashPatched="C96E318317B9DF27E31E23B843E65B586B28F7D9">
+            <Patches>
+              <Patch Address="0x00031E08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="27B80B00" PatchedBytes="79E60B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.14219.341">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="9B8893CD83395DF364C133F4C3A3F0E06EDACF71" HashPatched="BDAE68D1EDAF3A8858FAD2FA1754D715F5880A3A">
+            <Patches>
+              <Patch Address="0x00033154" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="9E090C00" PatchedBytes="F0370C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="58DF171931D400CBCBC39B882BA90DBBEA66AE0C" HashPatched="D707FE83A5E4125FA9F8EC0A383C1B7914B23C9D">
+            <Patches>
+              <Patch Address="0x000179FC" OriginalBytes="1BD1" PatchedBytes="1BE0" />
+              <Patch Address="0x00000158" OriginalBytes="AB8E0700" PatchedBytes="AB9D0700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.14234.375">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="7DCFEF1113E9D2C648B857FD125857EC35C8EFFE" HashPatched="02439F74011547EC219289565779DF362D912143">
+            <Patches>
+              <Patch Address="0x000331C4" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="6A550C00" PatchedBytes="BC830C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="7CA951F4A580C923D12FB09B2EEBD35E2F6BE8A5" HashPatched="F05FE96FB9952B57BC1C3079258202858578732D">
+            <Patches>
+              <Patch Address="0x000179FC" OriginalBytes="1BD1" PatchedBytes="1BE0" />
+              <Patch Address="0x00000158" OriginalBytes="3E6A0700" PatchedBytes="3E790700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.20.10512.11662">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="0E47E65A4637B42377B596BEA4CEDF6D4BF31759" HashPatched="05F1FE52B533919F7E75B7463F85ADDD3F18A43B">
+            <Patches>
+              <Patch Address="0x00037DF0" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="58F80D00" PatchedBytes="AA260E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="81BFEFAEF2C19AA7D2A6646CB28EB1EB4C2503B2" HashPatched="27D8291CE48BA7940353C39053729A913E439CB0">
+            <Patches>
+              <Patch Address="0x00023332" OriginalBytes="03D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000148" OriginalBytes="ADFC0700" PatchedBytes="AAEB0700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.15116.125">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="C89EF734F4F0311611213A29580C2A37B2593515" HashPatched="94F53D72CB5A8E034499C8409AE74D4161E42869">
+            <Patches>
+              <Patch Address="0x000331E4" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="67330C00" PatchedBytes="B9610C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="D794925B765F003A15B0E6CAEF8FF09D6EDDD4BF" HashPatched="12598F09227A9E7E84C387E95CDC45BAE33F557C">
+            <Patches>
+              <Patch Address="0x000179FC" OriginalBytes="1BD1" PatchedBytes="1BE0" />
+              <Patch Address="0x00000158" OriginalBytes="8FBA0700" PatchedBytes="90C90600" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.10.15148.160">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="B1E146072BEBA015F4E5B11D6E1AAE6FAAF5604D" HashPatched="CC60CA05DEC74A0A322611EF4D38E44845CC802D">
+            <Patches>
+              <Patch Address="0x000331E4" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="3CFA0B00" PatchedBytes="8E280C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="BEAFABF57D04BE378986A6BA571A61A70D5537EA" HashPatched="651E347F14D31BAAC1D355F462701E9814CD2868">
+            <Patches>
+              <Patch Address="0x000179FC" OriginalBytes="1BD1" PatchedBytes="1BE0" />
+              <Patch Address="0x00000158" OriginalBytes="A4BE0700" PatchedBytes="A5CD0600" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.20.10536.11738">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="232050781A534BF8319CF229A37B95F2C8EB6FBD" HashPatched="FC47972E284B4AFB300924AE472994693CA5C824">
+            <Patches>
+              <Patch Address="0x00037ED8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="4EFE0D00" PatchedBytes="A02C0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="1522F06B5EF3A7769615BB51A59EAD5540AFABAA" HashPatched="224F8ABEAA5E71EBDE8F18937A6F0E90526C1A0B">
+            <Patches>
+              <Patch Address="0x0002368A" OriginalBytes="03D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000148" OriginalBytes="5F8B0800" PatchedBytes="5C7A0800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="8.20.10549.11796">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="90B26672C9806DBFCCFCE0085B2C3D92A366B14E" HashPatched="0151806CF0314D8ED0577F941E33FEBC2358D188">
+            <Patches>
+              <Patch Address="0x000246C6" OriginalBytes="03D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000148" OriginalBytes="3E490800" PatchedBytes="3B380800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="AD0A224733F62E7F8F802137164B36EFB0068A4C" HashPatched="2D97E9B80B4BF141F4ABF8B5AE012BEF8F4E0913">
+            <Patches>
+              <Patch Address="0x0003806C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="982F0E00" PatchedBytes="EA5D0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10581.0">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="3FE684EDAD2AE989012FA3F8078F528F02529A9B" HashPatched="F44FE6563F4AC65D2EA438A54D5C0013A944DD68">
+            <Patches>
+              <Patch Address="0x00038238" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="DD400E00" PatchedBytes="2F6F0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="3EC8AB84C1638DF94C9146572C7D17CB9B55AE7D" HashPatched="FF3160175FF4DC7BF364AC5B48D35C48911C3762">
+            <Patches>
+              <Patch Address="0x000246D0" OriginalBytes="03D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000150" OriginalBytes="31360800" PatchedBytes="2E250800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.11">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="1CB8D4153A73587CC74E18B4D51DE3743279BC7C" HashPatched="4821BC03E71786C1B3EB4839AAF4F2580E30218E">
+            <Patches>
+              <Patch Address="0x000246D0" OriginalBytes="03D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000150" OriginalBytes="46030800" PatchedBytes="43F20700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="A8760251B988E6A6E0801F4DAEA146157BC5EDD9" HashPatched="60F428961F43B3FD4D4978AD3494091A05F415BE">
+            <Patches>
+              <Patch Address="0x00038238" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="5B600E00" PatchedBytes="AD8E0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.36">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="7E20DFB140AE76BA6E662951B69149882286CE82" HashPatched="85CB18F49D5A26B2BEDAD9B98406722AB73F0A38">
+            <Patches>
+              <Patch Address="0x00038238" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="23F50D00" PatchedBytes="75230E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="D69BF791B630B37A501195C0D31AAB53B6F780DF" HashPatched="D5A0364EBEF985497E0F7A8357244473B7F16B3F">
+            <Patches>
+              <Patch Address="0x000246D0" OriginalBytes="03D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000150" OriginalBytes="B0560800" PatchedBytes="AD450800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10240.16384">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="50100B83CB85A0AEEBD7B70F87360513C1B7E255" HashPatched="37B955E6FFDB685CC9176BE7BBF712C02BA2CF2B">
+            <Patches>
+              <Patch Address="0x00037E1C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="7C330E00" PatchedBytes="CE610E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="5738D592BDA3AB98FFB5F7C8018EA19CA2B644C3" HashPatched="4139D22AAAC3A8F66C377D0C022142E20DF60154">
+            <Patches>
+              <Patch Address="0x000244A4" OriginalBytes="14D1" PatchedBytes="14E0" />
+              <Patch Address="0x00000148" OriginalBytes="04AF0800" PatchedBytes="04BE0800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.107">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="4BFA0126D68CA3BBE7D20A32A7D0A1AE45858868" HashPatched="3A9372CF6E8220E8BAB859E3107AEB07D33FA7E6">
+            <Patches>
+              <Patch Address="0x00038240" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="19670E00" PatchedBytes="6B950E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="0070BBA39146E686F1199216BBBBDB94732180E5" HashPatched="FA09FC97CA4E69F688714C9FF1F10FA3AEA40998">
+            <Patches>
+              <Patch Address="0x000246D0" OriginalBytes="03D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000150" OriginalBytes="BE4E0800" PatchedBytes="BB3D0800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15063.0">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="20AD352146BF2A76BC40EF3A00FDD0916E92454E" HashPatched="4767EDA7A0F733884AD9C6C5F1BD298FD0D74C07">
+            <Patches>
+              <Patch Address="0x0003B840" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="29380F00" PatchedBytes="7C660E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="72FCAD1A65D45AD5EFD3D15A97C4E8DA6AAE08C4" HashPatched="7A572A445BA1DD9648AB5BB78DE95AF6CC37F9C0">
+            <Patches>
+              <Patch Address="0x0002778A" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="BAD50800" PatchedBytes="B5C40800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15063.297">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="DFEDABC8D3CF8B8CE8096D6B47D609D4E7CB656D" HashPatched="82AD59AADBD63B33F083F86DE69984E5CE883BF8">
+            <Patches>
+              <Patch Address="0x0003B840" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="E3BC0E00" PatchedBytes="35EB0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="3B122508AF22D8A3F9CDC41403829A97FD874D2E" HashPatched="F09BA795399EFA9CA089FD75A0ACBA3DCDDE99E9">
+            <Patches>
+              <Patch Address="0x000277A6" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="F4CE0800" PatchedBytes="EFBD0800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.318">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="366CA6871AB160235B8561DC982AECFF521D34CF" HashPatched="AE6C5D1FC79CB6AFAC7D2FC5616AC27A4DBA497A">
+            <Patches>
+              <Patch Address="0x000246D0" OriginalBytes="03D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000150" OriginalBytes="1EBA0800" PatchedBytes="1BA90800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="5788066FAC5392667EC5A8E811DD846D29C46E5C" HashPatched="53E704F18FD8EA9867B05D4584A20C377889B444">
+            <Patches>
+              <Patch Address="0x00038268" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="0F680E00" PatchedBytes="61960E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.10586.494">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="7DC34F6EB8853D6C297EA2A540A8FE976361ED61" HashPatched="142E95E4F75A3CBC92A7A34ABED2C987295F9A7C">
+            <Patches>
+              <Patch Address="0x000246D0" OriginalBytes="03D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000150" OriginalBytes="53D70700" PatchedBytes="50C60700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="6AAB5EAFAFB3A4E42F46088AFA49BFB1C536FF52" HashPatched="4DF7C792B74383DA588BF491CE5FBE55E79EE109">
+            <Patches>
+              <Patch Address="0x00038268" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="8AA10E00" PatchedBytes="DCCF0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.1">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="ECEAD0A4ADFB12E8D1F0EDA99D0123A1CAB30F13" HashPatched="5B24C7B04EF513F10B6BA640D48BF62572E7B46E">
+            <Patches>
+              <Patch Address="0x0003B864" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="E1D80E00" PatchedBytes="33070F00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="F53A6CB5A3AC514713698418477931BF026133FD" HashPatched="DEC1EB1D041FD5319F84C09110F497CCC0B913DF">
+            <Patches>
+              <Patch Address="0x000277A6" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="4E680800" PatchedBytes="49570800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.12">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="8E109BA37D4A75E485020887DEFF60E535636E72" HashPatched="94E202427D7C418B210A3C1FE28D6882ED986E1C">
+            <Patches>
+              <Patch Address="0x0003B864" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="80BF0E00" PatchedBytes="D2ED0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="58F006F79181E829776AABC4BEF14CD7D9CE0778" HashPatched="BE8D1C1335065DAD36DFA1127CF92CCADD680DF6">
+            <Patches>
+              <Patch Address="0x000277CA" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="F6D50800" PatchedBytes="F1C40800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.124">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="022CC98868AC37AA1FFD57C57F6C54EBB9C9CBFC" HashPatched="C2AC17AFAC3EBEAFFC7AFE387243513157DDD290">
+            <Patches>
+              <Patch Address="0x0003B864" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="8E870E00" PatchedBytes="E0B50E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="A8CCC8BB6F5CF5DC228255F7D749BC4192A3101D" HashPatched="57935FE74AF60B1B362DE3DF0DB9225713EFDCE7">
+            <Patches>
+              <Patch Address="0x000277CA" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="5AF10800" PatchedBytes="55E00800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.16">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="C9F2940FD1F33441044A28BE8FF1661A7B88CF3D" HashPatched="065AEFA9D6D38E212C324D81FA232558CD833B56">
+            <Patches>
+              <Patch Address="0x0003B8D4" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="F2940E00" PatchedBytes="44C30E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="7046EEB09404C9075D848F45B7A7B9FF4D7D638D" HashPatched="418694F43528598F22E91757AAF760E861E3046B">
+            <Patches>
+              <Patch Address="0x0002695E" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="F3820800" PatchedBytes="EE710800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="6.3.9651.0">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="15F1C59216D6FFD774DBE4D2AED12B7F0064754D" HashPatched="7CAD397F673550DB3CB77EBBC83206915BF49895">
+            <Patches>
+              <Patch Address="0x00031E08" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="D3660C00" PatchedBytes="26950B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="741AE3C9B8F8A21E5CB6C492EF7C5592D6AEE22D" HashPatched="7B473C6EB6C09D2217AD778A7AD0F85268C6CDB9">
+            <Patches>
+              <Patch Address="0x0005662C" OriginalBytes="1BD1" PatchedBytes="1BE0" />
+              <Patch Address="0x00000168" OriginalBytes="672B0700" PatchedBytes="673A0700" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.158">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="90F8C735F50559139845D703AD5D40E66659DBFD" HashPatched="6A9573472E16498BDC73BE9A0A9F521F0A73545B">
+            <Patches>
+              <Patch Address="0x0003B864" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="98790E00" PatchedBytes="EAA70E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="226C3C32A82A389536337BF0BBB0AA56FCE2BE5C" HashPatched="4E5C350609DCB8E80EB509C3F0CAB9522D68FFD0">
+            <Patches>
+              <Patch Address="0x000277CA" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="91170900" PatchedBytes="8C060900" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.158 (dev)">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="3330E6E408BEAA64C33D750BD2512495B6DA15CB" HashPatched="28C1B016861A160B093F7CF9DFAECCC0F38415DD">
+            <Patches>
+              <Patch Address="0x0003B8D4" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="E37F0E00" PatchedBytes="35AE0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="5B900D4F9F5E714137893E71053BBDDD15195382" HashPatched="447A1976F168115CD42ADB41A2D1F52A67D015C1">
+            <Patches>
+              <Patch Address="0x0002695E" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="17220900" PatchedBytes="12110900" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="6.3.9600.16384 (RT)">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="8409A581AEEBE5C68267313DF5859EF2ED1960CC" HashPatched="0D9EDB8D207A4A40C0AAB42626CB57C8D9AE6AAD">
+            <Patches>
+              <Patch Address="0x00031DE0" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="7D8C0C00" PatchedBytes="D0BA0B00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="55AC3B7020CB67CB52768A8908AA0C95AAC65311" HashPatched="47915402E6FEFE0B9FCD28AC45862E98B74C3266">
+            <Patches>
+              <Patch Address="0x000148E0" OriginalBytes="1BD1" PatchedBytes="1BE0" />
+              <Patch Address="0x00000150" OriginalBytes="E9710600" PatchedBytes="E9800600" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15035.0 (RT)">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="E055A983FCCF4AB5BE7497908FC33CD1C0E490AD" HashPatched="BF8813252FB79AABDE92380913BCA8EC20E37680">
+            <Patches>
+              <Patch Address="0x0003B6C8" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="EE000F00" PatchedBytes="402F0F00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="E65A425434CF37539CEE3FCB10FF71178493A0A5" HashPatched="3ACBDFE4FCDE80AAFF486E10F1DF20895412BB8F">
+            <Patches>
+              <Patch Address="0x0002660E" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="E9C30800" PatchedBytes="E4B20800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="6.3.9600.17031 (RT)">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\Boot\winload.efi" HashOriginal="3AD6D6D32AC01839396114194E89828B5427CB99" HashPatched="D400FC6C1C3C7755A523DAD7BD7738C5DE7CA6BF">
+            <Patches>
+              <Patch Address="0x000330B0" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000138" OriginalBytes="3A0E0C00" PatchedBytes="8C3C0C00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="934BB7107C5F0AA7055698A401693525906F59C5" HashPatched="F9A561093A0B0827B01BD0D0035F33956B5D39C4">
+            <Patches>
+              <Patch Address="0x00014ED4" OriginalBytes="1BD1" PatchedBytes="1BE0" />
+              <Patch Address="0x00000148" OriginalBytes="B9930600" PatchedBytes="B9A20600" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.490">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="E21BE2AFB39FF036F82319DEDB3109AB5F7937B8" HashPatched="BF1ED3B8B7B69AB6C76230199439C7D3E59C6C7C">
+            <Patches>
+              <Patch Address="0x0003B9FC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="5C710E00" PatchedBytes="AE9F0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="82F35A23B89619BF68B2D5B097D7C9B7171F78C1" HashPatched="C754F181E4E5588B0C63A964738388863B4E6223">
+            <Patches>
+              <Patch Address="0x00027966" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="15C10800" PatchedBytes="10B00800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.14393.1066">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\boot\winload.efi" HashOriginal="D356F1ABB70C671485CCC4A549B9A44D6461766A" HashPatched="07CDFD98D4A081B0D3C86C93AD61C6A2B2C86B19">
+            <Patches>
+              <Patch Address="0x00039F98" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000130" OriginalBytes="D9100F00" PatchedBytes="2C3F0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="3D416616D9F52ABA4018BEE3E5186E74085DA4A2" HashPatched="D08858B580B9AFF901E035142DDF126B36DB0176">
+            <Patches>
+              <Patch Address="0x000289AA" OriginalBytes="03D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000150" OriginalBytes="956D0800" PatchedBytes="6B2C0800" />
+              <Patch Address="0x00028CB4" OriginalBytes="0ED1" PatchedBytes="00BF" />
+              <Patch Address="0x00028CBE" OriginalBytes="09D1" PatchedBytes="00BF" />
+              <Patch Address="0x00028CC6" OriginalBytes="05D1" PatchedBytes="00BF" />
+              <Patch Address="0x00028CCE" OriginalBytes="0BB9" PatchedBytes="00BF" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.527">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="6240D0E3856F58C4F4D09F98428917D242090295" HashPatched="A3D734FBD88BB58458306EB8D12C4EB1E7F70A8C">
+            <Patches>
+              <Patch Address="0x0003B9FC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="EC700E00" PatchedBytes="3E9F0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="9E39441EBF8EA45772996522D47CFDEBB084F4C6" HashPatched="11A1F703759D2745C04D5B49E77619C272C7D597">
+            <Patches>
+              <Patch Address="0x00027966" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="3D340900" PatchedBytes="38230900" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.530">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="02DE2622AC8BFEC9E04198F83A3CDCD9BD776A99" HashPatched="DA13484E5D4BBF905482F956C7CEA3004D9998CB">
+            <Patches>
+              <Patch Address="0x0003B9FC" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="7D080F00" PatchedBytes="CF360F00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="0F5BE73F5127BE59E1EB5C6740D170D11C71845C" HashPatched="8C5A634336BA9FDB5DF6C969420893AACB2081BC">
+            <Patches>
+              <Patch Address="0x00027982" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="ED9D0800" PatchedBytes="E88C0800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.538">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="BCDB4CD1430EB2EBA8BFEF8B9AD1C73E28F8487D" HashPatched="C137023A2DD71ED4EF0E51DF6B21146A71F9B91C">
+            <Patches>
+              <Patch Address="0x0003B93C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="EA7C0E00" PatchedBytes="3CAB0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="A542346445706983172A39E7F949DB5A8B4FAAEB" HashPatched="74CA4E52D5C28E0BD125C95286563F1D7FE3A576">
+            <Patches>
+              <Patch Address="0x00027982" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="7C7F0800" PatchedBytes="776E0800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.541">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="86F7A8313F58817E3B2C514117305E0A420196DA" HashPatched="6F6864D6D723B59C2897416226BF4205CD714812">
+            <Patches>
+              <Patch Address="0x0003B93C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="E1D90E00" PatchedBytes="33080F00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="4E9EB0FEF44600FDF473613D97EBF50F7D7920BB" HashPatched="AC79636470563D6DAE2AF801D9E0BF4205A67F6C">
+            <Patches>
+              <Patch Address="0x00027982" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="18770800" PatchedBytes="13660800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.544">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="87D3A29ED9A1B39D56E117E39AB7657F14ACFBAD" HashPatched="052EDA9DB6CF15DCFD4180A697F229BA0A3BE19D">
+            <Patches>
+              <Patch Address="0x0003B93C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="98540F00" PatchedBytes="EB820E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="8FF484526D9787AB3A958CB27764F5BF1678AAC2" HashPatched="29A0B9C7EE90A70B36FD36ACAA37C4D3BB57C714">
+            <Patches>
+              <Patch Address="0x00027982" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="3A2B0900" PatchedBytes="351A0900" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.547">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="7852058D6ADE85637F9C839DEA3B5896570102A3" HashPatched="F048EB95F7C9CA17C3759ED0A546F528C3E90934">
+            <Patches>
+              <Patch Address="0x0003B93C" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000148" OriginalBytes="925E0F00" PatchedBytes="E58C0E00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="35F07B2B604BCCE7C5A4D418F8A464971AFCB045" HashPatched="1710AFCF7A68CF4D9AB91A26E4C023454D2CEBD3">
+            <Patches>
+              <Patch Address="0x00027982" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="0D830800" PatchedBytes="08720800" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+      <TargetVersion Description="10.0.15254.603">
+        <TargetFiles>
+          <TargetFile Path="Windows\System32\BOOT\winload.efi" HashOriginal="1CE9F1CBB7005126A75BD71DF7A0C7E1815EAC95" HashPatched="3661779E6A719FE43BF23E31277465167846DAB5">
+            <Patches>
+              <Patch Address="0x0003B964" OriginalBytes="2DE9F04F" PatchedBytes="00207047" />
+              <Patch Address="0x00000140" OriginalBytes="55FF0E00" PatchedBytes="A72D0F00" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+          <TargetFile Path="Windows\System32\ci.dll" HashOriginal="2A6790613C64FBC5A1FE876DC35F272652E0228F" HashPatched="7F28E5B37EABA758D56865D334D0420D1C33A228">
+            <Patches>
+              <Patch Address="0x000279C2" OriginalBytes="05D0" PatchedBytes="00BF" />
+              <Patch Address="0x00000158" OriginalBytes="031E0900" PatchedBytes="FE0C0900" />
+            </Patches>
+            <Obsolete />
+          </TargetFile>
+        </TargetFiles>
+      </TargetVersion>
+    </TargetVersions>
+  </PatchDefinition>
 </PatchDefinitions>
\ No newline at end of file
diff --git a/PhoneReboot.png b/WPinternals/PhoneReboot.png
similarity index 100%
rename from PhoneReboot.png
rename to WPinternals/PhoneReboot.png
diff --git a/Properties/AssemblyInfo.cs b/WPinternals/Properties/AssemblyInfo.cs
similarity index 97%
rename from Properties/AssemblyInfo.cs
rename to WPinternals/Properties/AssemblyInfo.cs
index 1b1ecdf..15fce91 100644
--- a/Properties/AssemblyInfo.cs
+++ b/WPinternals/Properties/AssemblyInfo.cs
@@ -1,51 +1,51 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("WPinternals")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WPinternals")]
-[assembly: AssemblyCopyright("Copyright ©  2018-2019")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-                                     //(used if a resource is not found in the page, 
-                                     // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-                                              //(used if a resource is not found in the page, 
-                                              // app, or any theme specific resource dictionaries)
-)]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.9.*")]
-// [assembly: AssemblyFileVersion("1.0.0.0")]
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("WPinternals")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("WPinternals")]
+[assembly: AssemblyCopyright("Copyright ©  2018-2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page, 
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page, 
+                                              // app, or any theme specific resource dictionaries)
+)]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("2.9.*")]
+// [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/WPinternals/Properties/PublishProfiles/FolderProfile.pubxml.user
similarity index 100%
rename from Properties/PublishProfiles/FolderProfile.pubxml.user
rename to WPinternals/Properties/PublishProfiles/FolderProfile.pubxml.user
diff --git a/Properties/Resources.Designer.cs b/WPinternals/Properties/Resources.Designer.cs
similarity index 97%
rename from Properties/Resources.Designer.cs
rename to WPinternals/Properties/Resources.Designer.cs
index f03dbb4..53a9b4a 100644
--- a/Properties/Resources.Designer.cs
+++ b/WPinternals/Properties/Resources.Designer.cs
@@ -1,63 +1,63 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace WPinternals.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WPinternals.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WPinternals.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WPinternals.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/Properties/Resources.resx b/WPinternals/Properties/Resources.resx
similarity index 97%
rename from Properties/Resources.resx
rename to WPinternals/Properties/Resources.resx
index ffecec8..af7dbeb 100644
--- a/Properties/Resources.resx
+++ b/WPinternals/Properties/Resources.resx
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
 </root>
\ No newline at end of file
diff --git a/Properties/Settings.Designer.cs b/WPinternals/Properties/Settings.Designer.cs
similarity index 97%
rename from Properties/Settings.Designer.cs
rename to WPinternals/Properties/Settings.Designer.cs
index 9c0c94f..d01fe5c 100644
--- a/Properties/Settings.Designer.cs
+++ b/WPinternals/Properties/Settings.Designer.cs
@@ -1,26 +1,26 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace WPinternals.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace WPinternals.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/Properties/Settings.settings b/WPinternals/Properties/Settings.settings
similarity index 97%
rename from Properties/Settings.settings
rename to WPinternals/Properties/Settings.settings
index 8f2fd95..033d7a5 100644
--- a/Properties/Settings.settings
+++ b/WPinternals/Properties/Settings.settings
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
 </SettingsFile>
\ No newline at end of file
diff --git a/SB b/WPinternals/SB
similarity index 100%
rename from SB
rename to WPinternals/SB
diff --git a/SBA b/WPinternals/SBA
similarity index 100%
rename from SBA
rename to WPinternals/SBA
diff --git a/SBMSM b/WPinternals/SBMSM
similarity index 100%
rename from SBMSM
rename to WPinternals/SBMSM
diff --git a/Terminal.cs b/WPinternals/Terminal.cs
similarity index 97%
rename from Terminal.cs
rename to WPinternals/Terminal.cs
index 79b51cf..df55734 100644
--- a/Terminal.cs
+++ b/WPinternals/Terminal.cs
@@ -1,68 +1,68 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-
-namespace WPinternals
-{
-    internal static class Terminal
-    {
-        public static TerminalResponse Parse(byte[] Buffer, int Offset)
-        {
-            TerminalResponse Response = new();
-
-            // Get root node
-            if (Buffer.Length >= (Offset + 8))
-            {
-                int NodeNumber = BitConverter.ToInt32(Buffer, Offset);
-                int NodeSize = BitConverter.ToInt32(Buffer, Offset + 4);
-                int End = NodeSize + Offset + 8;
-                int Index = Offset + 8;
-                if ((NodeNumber == 0x10000) && (End <= Buffer.Length))
-                {
-                    // Get subnodes
-                    while (Index < End)
-                    {
-                        NodeNumber = BitConverter.ToInt32(Buffer, Index);
-                        NodeSize = BitConverter.ToInt32(Buffer, Index + 4);
-                        byte[] Raw = new byte[NodeSize];
-                        Array.Copy(Buffer, Index + 8, Raw, 0, NodeSize);
-                        Response.RawEntries.Add(NodeNumber, Raw);
-                        Index += NodeSize + 8;
-                    }
-                }
-            }
-
-            // Parse subnodes
-            Response.RawEntries.TryGetValue(3, out Response.PublicId);
-            Response.RawEntries.TryGetValue(7, out Response.RootKeyHash);
-
-            return Response;
-        }
-    }
-
-    internal class TerminalResponse
-    {
-        public Dictionary<int, byte[]> RawEntries = new();
-        public byte[] PublicId = null;
-        public byte[] RootKeyHash = null;
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+
+namespace WPinternals
+{
+    internal static class Terminal
+    {
+        public static TerminalResponse Parse(byte[] Buffer, int Offset)
+        {
+            TerminalResponse Response = new();
+
+            // Get root node
+            if (Buffer.Length >= (Offset + 8))
+            {
+                int NodeNumber = BitConverter.ToInt32(Buffer, Offset);
+                int NodeSize = BitConverter.ToInt32(Buffer, Offset + 4);
+                int End = NodeSize + Offset + 8;
+                int Index = Offset + 8;
+                if ((NodeNumber == 0x10000) && (End <= Buffer.Length))
+                {
+                    // Get subnodes
+                    while (Index < End)
+                    {
+                        NodeNumber = BitConverter.ToInt32(Buffer, Index);
+                        NodeSize = BitConverter.ToInt32(Buffer, Index + 4);
+                        byte[] Raw = new byte[NodeSize];
+                        Array.Copy(Buffer, Index + 8, Raw, 0, NodeSize);
+                        Response.RawEntries.Add(NodeNumber, Raw);
+                        Index += NodeSize + 8;
+                    }
+                }
+            }
+
+            // Parse subnodes
+            Response.RawEntries.TryGetValue(3, out Response.PublicId);
+            Response.RawEntries.TryGetValue(7, out Response.RootKeyHash);
+
+            return Response;
+        }
+    }
+
+    internal class TerminalResponse
+    {
+        public Dictionary<int, byte[]> RawEntries = new();
+        public byte[] PublicId = null;
+        public byte[] RootKeyHash = null;
+    }
+}
diff --git a/TestCode.cs b/WPinternals/TestCode.cs
similarity index 97%
rename from TestCode.cs
rename to WPinternals/TestCode.cs
index ca19b23..44fd6b4 100644
--- a/TestCode.cs
+++ b/WPinternals/TestCode.cs
@@ -1,295 +1,295 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WPinternals
-{
-    internal static class TestCode
-    {
-        internal static async Task Test(System.Threading.SynchronizationContext UIContext)
-        {
-            // To avoid warnings when there is no code here.
-            await Task.Run(() => { });
-
-            // PhoneNotifierViewModel Notifier = new PhoneNotifierViewModel();
-            // Notifier.Start();
-            // await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
-            // MassStorage MassStorage = (MassStorage)Notifier.CurrentModel;
-        }
-
-        internal static async Task RecoverBadGPT(string GPTPath, string LoadersPath)
-        {
-            byte[] GPT = File.ReadAllBytes(GPTPath);
-
-            PhoneNotifierViewModel PhoneNotifier = new();
-            PhoneNotifier.Start();
-            await SwitchModeViewModel.SwitchTo(PhoneNotifier, PhoneInterfaces.Qualcomm_Download);
-
-            byte[] RootKeyHash = null;
-            if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
-            {
-                QualcommDownload Download2 = new((QualcommSerial)PhoneNotifier.CurrentModel);
-                RootKeyHash = Download2.GetRKH();
-            }
-
-            List<QualcommPartition> PossibleLoaders = null;
-            if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
-            {
-                try
-                {
-                    PossibleLoaders = QualcommLoaders.GetPossibleLoadersForRootKeyHash(LoadersPath, RootKeyHash);
-                    if (PossibleLoaders.Count == 0)
-                    {
-                        throw new Exception("Error: No matching loaders found for RootKeyHash.");
-                    }
-                }
-                catch (Exception Ex)
-                {
-                    LogFile.LogException(Ex);
-                    throw new Exception("Error: Unexpected error during scanning for loaders.");
-                }
-            }
-
-            QualcommSerial Serial = (QualcommSerial)PhoneNotifier.CurrentModel;
-            QualcommDownload Download = new(Serial);
-            if (Download.IsAlive())
-            {
-                int Attempt = 1;
-                bool Result = false;
-                foreach (QualcommPartition Loader in PossibleLoaders)
-                {
-                    LogFile.Log("Attempt " + Attempt.ToString(), LogType.ConsoleOnly);
-
-                    try
-                    {
-                        Download.SendToPhoneMemory(0x2A000000, Loader.Binary);
-                        Download.StartBootloader(0x2A000000);
-                        Result = true;
-                        LogFile.Log("Loader sent successfully", LogType.ConsoleOnly);
-                    }
-                    catch { }
-
-                    if (Result)
-                    {
-                        break;
-                    }
-
-                    Attempt++;
-                }
-                Serial.Close();
-
-                if (!Result)
-                {
-                    LogFile.Log("Loader failed", LogType.ConsoleOnly);
-                }
-            }
-            else
-            {
-                LogFile.Log("Failed to communicate to Qualcomm Emergency Download mode", LogType.ConsoleOnly);
-                throw new BadConnectionException();
-            }
-
-            if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
-            {
-                await PhoneNotifier.WaitForArrival();
-            }
-
-            if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
-            {
-                throw new WPinternalsException("Phone failed to switch to emergency flash mode.");
-            }
-
-            // Flash bootloader
-            QualcommSerial Serial2 = (QualcommSerial)PhoneNotifier.CurrentModel;
-            Serial2.EncodeCommands = false;
-
-            QualcommFlasher Flasher = new(Serial2);
-
-            Flasher.Hello();
-            Flasher.SetSecurityMode(0);
-            Flasher.OpenPartition(0x21);
-
-            LogFile.Log("Partition opened.", LogType.ConsoleOnly);
-
-            LogFile.Log("Flash GPT at 0x" + ((UInt32)0x200).ToString("X8"), LogType.ConsoleOnly);
-            Flasher.Flash(0x200, GPT, 0, 0x41FF); // Bad bounds-check in the flash-loader prohibits to write the last byte.
-
-            Flasher.ClosePartition();
-
-            LogFile.Log("Partition closed. Flashing ready. Rebooting.");
-
-            Flasher.Reboot();
-
-            Flasher.CloseSerial();
-        }
-
-        internal static async Task RewriteGPT(string GPTPath)
-        {
-            PhoneNotifierViewModel Notifier = new();
-            Notifier.Start();
-            await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
-            MassStorage MassStorage = (MassStorage)Notifier.CurrentModel;
-
-            LogFile.Log("Writing GPT to the device.", LogType.ConsoleOnly);
-            MassStorage.WriteSectors(1, GPTPath);
-        }
-
-        internal static async Task RewriteMBRGPT()
-        {
-            FFU FFU = new(@"E:\Device Backups\Alpha\9200_1230.0025.9200.9825\RX100_9825.ffu");
-            const string GPTPath = @"E:\Device Backups\Alpha\9200_1230.0025.9200.9825\CorrectGPT.bin";
-
-            PhoneNotifierViewModel Notifier = new();
-            Notifier.Start();
-            await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
-            MassStorage MassStorage = (MassStorage)Notifier.CurrentModel;
-
-            byte[] MBR = FFU.GetSectors(0, 1);
-            LogFile.Log("Writing MBR to the device.", LogType.ConsoleOnly);
-            MassStorage.WriteSectors(0, MBR);
-
-            LogFile.Log("Writing GPT to the device.", LogType.ConsoleOnly);
-            MassStorage.WriteSectors(1, GPTPath);
-        }
-
-        internal static async Task RewriteParts(string PartPath)
-        {
-            PhoneNotifierViewModel Notifier = new();
-            Notifier.Start();
-            await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
-            MassStorage MassStorage = (MassStorage)Notifier.CurrentModel;
-
-            foreach (var part in Directory.EnumerateFiles(PartPath))
-            {
-                var partname = part.Split('\\').Last().Replace(".img", "");
-                try
-                {
-                    LogFile.Log($"Writing {partname} to the device.", LogType.ConsoleOnly);
-
-                    LogFile.Log("", LogType.ConsoleOnly);
-
-                    MassStorage.RestorePartition(part, partname, (v, t) => LogFile.Log("Progress: " + v + "%", LogType.ConsoleOnly));
-                    LogFile.Log("", LogType.ConsoleOnly);
-                }
-                catch
-                {
-                    LogFile.Log("", LogType.ConsoleOnly);
-                    LogFile.Log($"Failed writing {partname} to the device.", LogType.ConsoleOnly);
-                }
-            }
-        }
-
-        internal static void PatchImg(string dump)
-        {
-            using var fil = File.Open(dump, FileMode.Open);
-            byte[] gptbuffer = new byte[0x4200];
-
-            fil.Seek(0x200, SeekOrigin.Begin);
-            fil.Read(gptbuffer, 0, 0x4200);
-
-            uint BackupLBA = ByteOperations.ReadUInt32(gptbuffer, 0x20);
-            uint LastUsableLBA = ByteOperations.ReadUInt32(gptbuffer, 0x30);
-
-            LogFile.Log("Previous BackupLBA: " + BackupLBA, LogType.ConsoleOnly);
-            LogFile.Log("Previous LastUsableLBA: " + LastUsableLBA, LogType.ConsoleOnly);
-
-            const uint NewBackupLBA = 62078975u;
-            const uint NewLastUsableLBA = 62078942u;
-
-            ByteOperations.WriteUInt32(gptbuffer, 0x20, NewBackupLBA);
-            ByteOperations.WriteUInt32(gptbuffer, 0x30, NewLastUsableLBA);
-
-            uint HeaderSize = ByteOperations.ReadUInt32(gptbuffer, 0x0C);
-            uint PrevCRC = ByteOperations.ReadUInt32(gptbuffer, 0x10);
-
-            LogFile.Log("Previous CRC: " + PrevCRC, LogType.ConsoleOnly);
-
-            ByteOperations.WriteUInt32(gptbuffer, 0x10, 0);
-            uint NewCRC = ByteOperations.CRC32(gptbuffer, 0, HeaderSize);
-
-            LogFile.Log("New CRC: " + NewCRC, LogType.ConsoleOnly);
-
-            ByteOperations.WriteUInt32(gptbuffer, 0x10, NewCRC);
-
-            LogFile.Log("Writing", LogType.ConsoleOnly);
-
-            fil.Seek(0x200, SeekOrigin.Begin);
-            fil.Write(gptbuffer, 0, 0x4200);
-
-            LogFile.Log("Done!", LogType.ConsoleOnly);
-        }
-
-        internal static async Task TestProgrammer(System.Threading.SynchronizationContext UIContext, string ProgrammerPath)
-        {
-            LogFile.BeginAction("TestProgrammer");
-            try
-            {
-                LogFile.Log("Starting Firehose Test", LogType.FileAndConsole);
-
-                PhoneNotifierViewModel Notifier = new();
-                UIContext.Send(s => Notifier.Start(), null);
-                if (Notifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
-                {
-                    LogFile.Log("Phone found in emergency mode", LogType.FileAndConsole);
-                }
-                else
-                {
-                    LogFile.Log("Phone needs to be switched to emergency mode.", LogType.FileAndConsole);
-                    await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-                    PhoneInfo Info = ((NokiaFlashModel)Notifier.CurrentModel).ReadPhoneInfo();
-                    Info.Log(LogType.ConsoleOnly);
-                    await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Qualcomm_Download);
-                    if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Download)
-                    {
-                        throw new WPinternalsException("Switching mode failed.", "Could not switch the phone to Qualcomm Emergency 9008.");
-                    }
-
-                    LogFile.Log("Phone is in emergency mode.", LogType.FileAndConsole);
-                }
-
-                // Send and start programmer
-                QualcommSerial Serial = (QualcommSerial)Notifier.CurrentModel;
-                QualcommSahara Sahara = new(Serial);
-
-                if (await Sahara.Reset(ProgrammerPath))
-                {
-                    LogFile.Log("Emergency programmer test succeeded", LogType.FileAndConsole);
-                }
-                else
-                {
-                    LogFile.Log("Emergency programmer test failed", LogType.FileAndConsole);
-                }
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex);
-            }
-            finally
-            {
-                LogFile.EndAction("TestProgrammer");
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace WPinternals
+{
+    internal static class TestCode
+    {
+        internal static async Task Test(System.Threading.SynchronizationContext UIContext)
+        {
+            // To avoid warnings when there is no code here.
+            await Task.Run(() => { });
+
+            // PhoneNotifierViewModel Notifier = new PhoneNotifierViewModel();
+            // Notifier.Start();
+            // await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
+            // MassStorage MassStorage = (MassStorage)Notifier.CurrentModel;
+        }
+
+        internal static async Task RecoverBadGPT(string GPTPath, string LoadersPath)
+        {
+            byte[] GPT = File.ReadAllBytes(GPTPath);
+
+            PhoneNotifierViewModel PhoneNotifier = new();
+            PhoneNotifier.Start();
+            await SwitchModeViewModel.SwitchTo(PhoneNotifier, PhoneInterfaces.Qualcomm_Download);
+
+            byte[] RootKeyHash = null;
+            if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
+            {
+                QualcommDownload Download2 = new((QualcommSerial)PhoneNotifier.CurrentModel);
+                RootKeyHash = Download2.GetRKH();
+            }
+
+            List<QualcommPartition> PossibleLoaders = null;
+            if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
+            {
+                try
+                {
+                    PossibleLoaders = QualcommLoaders.GetPossibleLoadersForRootKeyHash(LoadersPath, RootKeyHash);
+                    if (PossibleLoaders.Count == 0)
+                    {
+                        throw new Exception("Error: No matching loaders found for RootKeyHash.");
+                    }
+                }
+                catch (Exception Ex)
+                {
+                    LogFile.LogException(Ex);
+                    throw new Exception("Error: Unexpected error during scanning for loaders.");
+                }
+            }
+
+            QualcommSerial Serial = (QualcommSerial)PhoneNotifier.CurrentModel;
+            QualcommDownload Download = new(Serial);
+            if (Download.IsAlive())
+            {
+                int Attempt = 1;
+                bool Result = false;
+                foreach (QualcommPartition Loader in PossibleLoaders)
+                {
+                    LogFile.Log("Attempt " + Attempt.ToString(), LogType.ConsoleOnly);
+
+                    try
+                    {
+                        Download.SendToPhoneMemory(0x2A000000, Loader.Binary);
+                        Download.StartBootloader(0x2A000000);
+                        Result = true;
+                        LogFile.Log("Loader sent successfully", LogType.ConsoleOnly);
+                    }
+                    catch { }
+
+                    if (Result)
+                    {
+                        break;
+                    }
+
+                    Attempt++;
+                }
+                Serial.Close();
+
+                if (!Result)
+                {
+                    LogFile.Log("Loader failed", LogType.ConsoleOnly);
+                }
+            }
+            else
+            {
+                LogFile.Log("Failed to communicate to Qualcomm Emergency Download mode", LogType.ConsoleOnly);
+                throw new BadConnectionException();
+            }
+
+            if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
+            {
+                await PhoneNotifier.WaitForArrival();
+            }
+
+            if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
+            {
+                throw new WPinternalsException("Phone failed to switch to emergency flash mode.");
+            }
+
+            // Flash bootloader
+            QualcommSerial Serial2 = (QualcommSerial)PhoneNotifier.CurrentModel;
+            Serial2.EncodeCommands = false;
+
+            QualcommFlasher Flasher = new(Serial2);
+
+            Flasher.Hello();
+            Flasher.SetSecurityMode(0);
+            Flasher.OpenPartition(0x21);
+
+            LogFile.Log("Partition opened.", LogType.ConsoleOnly);
+
+            LogFile.Log("Flash GPT at 0x" + ((UInt32)0x200).ToString("X8"), LogType.ConsoleOnly);
+            Flasher.Flash(0x200, GPT, 0, 0x41FF); // Bad bounds-check in the flash-loader prohibits to write the last byte.
+
+            Flasher.ClosePartition();
+
+            LogFile.Log("Partition closed. Flashing ready. Rebooting.");
+
+            Flasher.Reboot();
+
+            Flasher.CloseSerial();
+        }
+
+        internal static async Task RewriteGPT(string GPTPath)
+        {
+            PhoneNotifierViewModel Notifier = new();
+            Notifier.Start();
+            await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
+            MassStorage MassStorage = (MassStorage)Notifier.CurrentModel;
+
+            LogFile.Log("Writing GPT to the device.", LogType.ConsoleOnly);
+            MassStorage.WriteSectors(1, GPTPath);
+        }
+
+        internal static async Task RewriteMBRGPT()
+        {
+            FFU FFU = new(@"E:\Device Backups\Alpha\9200_1230.0025.9200.9825\RX100_9825.ffu");
+            const string GPTPath = @"E:\Device Backups\Alpha\9200_1230.0025.9200.9825\CorrectGPT.bin";
+
+            PhoneNotifierViewModel Notifier = new();
+            Notifier.Start();
+            await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
+            MassStorage MassStorage = (MassStorage)Notifier.CurrentModel;
+
+            byte[] MBR = FFU.GetSectors(0, 1);
+            LogFile.Log("Writing MBR to the device.", LogType.ConsoleOnly);
+            MassStorage.WriteSectors(0, MBR);
+
+            LogFile.Log("Writing GPT to the device.", LogType.ConsoleOnly);
+            MassStorage.WriteSectors(1, GPTPath);
+        }
+
+        internal static async Task RewriteParts(string PartPath)
+        {
+            PhoneNotifierViewModel Notifier = new();
+            Notifier.Start();
+            await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
+            MassStorage MassStorage = (MassStorage)Notifier.CurrentModel;
+
+            foreach (var part in Directory.EnumerateFiles(PartPath))
+            {
+                var partname = part.Split('\\').Last().Replace(".img", "");
+                try
+                {
+                    LogFile.Log($"Writing {partname} to the device.", LogType.ConsoleOnly);
+
+                    LogFile.Log("", LogType.ConsoleOnly);
+
+                    MassStorage.RestorePartition(part, partname, (v, t) => LogFile.Log("Progress: " + v + "%", LogType.ConsoleOnly));
+                    LogFile.Log("", LogType.ConsoleOnly);
+                }
+                catch
+                {
+                    LogFile.Log("", LogType.ConsoleOnly);
+                    LogFile.Log($"Failed writing {partname} to the device.", LogType.ConsoleOnly);
+                }
+            }
+        }
+
+        internal static void PatchImg(string dump)
+        {
+            using var fil = File.Open(dump, FileMode.Open);
+            byte[] gptbuffer = new byte[0x4200];
+
+            fil.Seek(0x200, SeekOrigin.Begin);
+            fil.Read(gptbuffer, 0, 0x4200);
+
+            uint BackupLBA = ByteOperations.ReadUInt32(gptbuffer, 0x20);
+            uint LastUsableLBA = ByteOperations.ReadUInt32(gptbuffer, 0x30);
+
+            LogFile.Log("Previous BackupLBA: " + BackupLBA, LogType.ConsoleOnly);
+            LogFile.Log("Previous LastUsableLBA: " + LastUsableLBA, LogType.ConsoleOnly);
+
+            const uint NewBackupLBA = 62078975u;
+            const uint NewLastUsableLBA = 62078942u;
+
+            ByteOperations.WriteUInt32(gptbuffer, 0x20, NewBackupLBA);
+            ByteOperations.WriteUInt32(gptbuffer, 0x30, NewLastUsableLBA);
+
+            uint HeaderSize = ByteOperations.ReadUInt32(gptbuffer, 0x0C);
+            uint PrevCRC = ByteOperations.ReadUInt32(gptbuffer, 0x10);
+
+            LogFile.Log("Previous CRC: " + PrevCRC, LogType.ConsoleOnly);
+
+            ByteOperations.WriteUInt32(gptbuffer, 0x10, 0);
+            uint NewCRC = ByteOperations.CRC32(gptbuffer, 0, HeaderSize);
+
+            LogFile.Log("New CRC: " + NewCRC, LogType.ConsoleOnly);
+
+            ByteOperations.WriteUInt32(gptbuffer, 0x10, NewCRC);
+
+            LogFile.Log("Writing", LogType.ConsoleOnly);
+
+            fil.Seek(0x200, SeekOrigin.Begin);
+            fil.Write(gptbuffer, 0, 0x4200);
+
+            LogFile.Log("Done!", LogType.ConsoleOnly);
+        }
+
+        internal static async Task TestProgrammer(System.Threading.SynchronizationContext UIContext, string ProgrammerPath)
+        {
+            LogFile.BeginAction("TestProgrammer");
+            try
+            {
+                LogFile.Log("Starting Firehose Test", LogType.FileAndConsole);
+
+                PhoneNotifierViewModel Notifier = new();
+                UIContext.Send(s => Notifier.Start(), null);
+                if (Notifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
+                {
+                    LogFile.Log("Phone found in emergency mode", LogType.FileAndConsole);
+                }
+                else
+                {
+                    LogFile.Log("Phone needs to be switched to emergency mode.", LogType.FileAndConsole);
+                    await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+                    PhoneInfo Info = ((NokiaFlashModel)Notifier.CurrentModel).ReadPhoneInfo();
+                    Info.Log(LogType.ConsoleOnly);
+                    await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Qualcomm_Download);
+                    if (Notifier.CurrentInterface != PhoneInterfaces.Qualcomm_Download)
+                    {
+                        throw new WPinternalsException("Switching mode failed.", "Could not switch the phone to Qualcomm Emergency 9008.");
+                    }
+
+                    LogFile.Log("Phone is in emergency mode.", LogType.FileAndConsole);
+                }
+
+                // Send and start programmer
+                QualcommSerial Serial = (QualcommSerial)Notifier.CurrentModel;
+                QualcommSahara Sahara = new(Serial);
+
+                if (await Sahara.Reset(ProgrammerPath))
+                {
+                    LogFile.Log("Emergency programmer test succeeded", LogType.FileAndConsole);
+                }
+                else
+                {
+                    LogFile.Log("Emergency programmer test failed", LogType.FileAndConsole);
+                }
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex);
+            }
+            finally
+            {
+                LogFile.EndAction("TestProgrammer");
+            }
+        }
+    }
+}
diff --git a/ViewModels/AboutViewModel.cs b/WPinternals/ViewModels/AboutViewModel.cs
similarity index 97%
rename from ViewModels/AboutViewModel.cs
rename to WPinternals/ViewModels/AboutViewModel.cs
index 0d50faa..fdfedb6 100644
--- a/ViewModels/AboutViewModel.cs
+++ b/WPinternals/ViewModels/AboutViewModel.cs
@@ -1,43 +1,43 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-namespace WPinternals
-{
-    internal class AboutViewModel : ContextViewModel
-    {
-        internal AboutViewModel() : base() { }
-
-        public int MajorVersion
-        {
-            get
-            {
-                return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Major;
-            }
-        }
-
-        public int MinorVersion
-        {
-            get
-            {
-                return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Minor;
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+namespace WPinternals
+{
+    internal class AboutViewModel : ContextViewModel
+    {
+        internal AboutViewModel() : base() { }
+
+        public int MajorVersion
+        {
+            get
+            {
+                return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Major;
+            }
+        }
+
+        public int MinorVersion
+        {
+            get
+            {
+                return System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.Minor;
+            }
+        }
+    }
+}
diff --git a/ViewModels/BackupTargetSelectionViewModel.cs b/WPinternals/ViewModels/BackupTargetSelectionViewModel.cs
similarity index 97%
rename from ViewModels/BackupTargetSelectionViewModel.cs
rename to WPinternals/ViewModels/BackupTargetSelectionViewModel.cs
index 8840e32..fe65957 100644
--- a/ViewModels/BackupTargetSelectionViewModel.cs
+++ b/WPinternals/ViewModels/BackupTargetSelectionViewModel.cs
@@ -1,237 +1,237 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal class BackupTargetSelectionViewModel : ContextViewModel
-    {
-        private readonly PhoneNotifierViewModel PhoneNotifier;
-        private readonly Action<string, string, string> BackupCallback;
-        private readonly Action<string> BackupArchiveCallback;
-        private readonly Action<string> BackupArchiveProvisioningCallback;
-        internal Action SwitchToUnlockBoot;
-
-        internal BackupTargetSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action<string> BackupArchiveCallback, Action<string, string, string> BackupCallback, Action<string> BackupArchiveProvisioningCallback)
-            : base()
-        {
-            this.PhoneNotifier = PhoneNotifier;
-            this.BackupCallback = BackupCallback;
-            this.BackupArchiveCallback = BackupArchiveCallback;
-            this.BackupArchiveProvisioningCallback = BackupArchiveProvisioningCallback;
-            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
-
-            this.PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-            this.PhoneNotifier.DeviceRemoved += DeviceRemoved;
-
-            new Thread(() => EvaluateViewState()).Start();
-        }
-
-        private string _ArchivePath;
-        public string ArchivePath
-        {
-            get
-            {
-                return _ArchivePath;
-            }
-            set
-            {
-                if (value != _ArchivePath)
-                {
-                    _ArchivePath = value;
-                    OnPropertyChanged(nameof(ArchivePath));
-                }
-            }
-        }
-
-        private string _EFIESPPath;
-        public string EFIESPPath
-        {
-            get
-            {
-                return _EFIESPPath;
-            }
-            set
-            {
-                if (value != _EFIESPPath)
-                {
-                    _EFIESPPath = value;
-                    OnPropertyChanged(nameof(EFIESPPath));
-                }
-            }
-        }
-
-        private string _MainOSPath;
-        public string MainOSPath
-        {
-            get
-            {
-                return _MainOSPath;
-            }
-            set
-            {
-                if (value != _MainOSPath)
-                {
-                    _MainOSPath = value;
-                    OnPropertyChanged(nameof(MainOSPath));
-                }
-            }
-        }
-
-        private string _DataPath;
-        public string DataPath
-        {
-            get
-            {
-                return _DataPath;
-            }
-            set
-            {
-                if (value != _DataPath)
-                {
-                    _DataPath = value;
-                    OnPropertyChanged(nameof(DataPath));
-                }
-            }
-        }
-
-        private string _ArchiveProvisioningPath;
-        public string ArchiveProvisioningPath
-        {
-            get
-            {
-                return _ArchiveProvisioningPath;
-            }
-            set
-            {
-                if (value != _ArchiveProvisioningPath)
-                {
-                    _ArchiveProvisioningPath = value;
-                    OnPropertyChanged(nameof(ArchiveProvisioningPath));
-                }
-            }
-        }
-
-        private bool _IsPhoneDisconnected;
-        public bool IsPhoneDisconnected
-        {
-            get
-            {
-                return _IsPhoneDisconnected;
-            }
-            set
-            {
-                if (value != _IsPhoneDisconnected)
-                {
-                    _IsPhoneDisconnected = value;
-                    OnPropertyChanged(nameof(IsPhoneDisconnected));
-                }
-            }
-        }
-
-        private bool _IsPhoneInMassStorage;
-        public bool IsPhoneInMassStorage
-        {
-            get
-            {
-                return _IsPhoneInMassStorage;
-            }
-            set
-            {
-                if (value != _IsPhoneInMassStorage)
-                {
-                    _IsPhoneInMassStorage = value;
-                    OnPropertyChanged(nameof(IsPhoneInMassStorage));
-                }
-            }
-        }
-
-        private bool _IsPhoneInOtherMode;
-        public bool IsPhoneInOtherMode
-        {
-            get
-            {
-                return _IsPhoneInOtherMode;
-            }
-            set
-            {
-                if (value != _IsPhoneInOtherMode)
-                {
-                    _IsPhoneInOtherMode = value;
-                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
-                }
-            }
-        }
-
-        private DelegateCommand _BackupArchiveCommand;
-        public DelegateCommand BackupArchiveCommand
-        {
-            get
-            {
-                return _BackupArchiveCommand ??= new DelegateCommand(() => BackupArchiveCallback(ArchivePath), () => (ArchivePath != null) && (PhoneNotifier.CurrentInterface != null));
-            }
-        }
-
-        private DelegateCommand _BackupCommand;
-        public DelegateCommand BackupCommand
-        {
-            get
-            {
-                return _BackupCommand ??= new DelegateCommand(() => BackupCallback(EFIESPPath, MainOSPath, DataPath), () => ((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)) && (PhoneNotifier.CurrentInterface != null));
-            }
-        }
-
-        private DelegateCommand _BackupArchiveProvisioningCommand;
-        public DelegateCommand BackupArchiveProvisioningCommand
-        {
-            get
-            {
-                return _BackupArchiveProvisioningCommand ??= new DelegateCommand(() => BackupArchiveProvisioningCallback(ArchiveProvisioningPath), () => (ArchiveProvisioningPath != null) && (PhoneNotifier.CurrentInterface != null));
-            }
-        }
-
-        ~BackupTargetSelectionViewModel()
-        {
-            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
-        }
-
-        private void NewDeviceArrived(ArrivalEventArgs Args)
-        {
-            new Thread(() => EvaluateViewState()).Start();
-        }
-
-        private void DeviceRemoved()
-        {
-            new Thread(() => EvaluateViewState()).Start();
-        }
-
-        internal override void EvaluateViewState()
-        {
-            IsPhoneDisconnected = PhoneNotifier.CurrentInterface == null;
-            IsPhoneInMassStorage = PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_MassStorage;
-            IsPhoneInOtherMode = !IsPhoneDisconnected && !IsPhoneInMassStorage;
-            BackupCommand.RaiseCanExecuteChanged();
-            BackupArchiveCommand.RaiseCanExecuteChanged();
-            BackupArchiveProvisioningCommand.RaiseCanExecuteChanged();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal class BackupTargetSelectionViewModel : ContextViewModel
+    {
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action<string, string, string> BackupCallback;
+        private readonly Action<string> BackupArchiveCallback;
+        private readonly Action<string> BackupArchiveProvisioningCallback;
+        internal Action SwitchToUnlockBoot;
+
+        internal BackupTargetSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action<string> BackupArchiveCallback, Action<string, string, string> BackupCallback, Action<string> BackupArchiveProvisioningCallback)
+            : base()
+        {
+            this.PhoneNotifier = PhoneNotifier;
+            this.BackupCallback = BackupCallback;
+            this.BackupArchiveCallback = BackupArchiveCallback;
+            this.BackupArchiveProvisioningCallback = BackupArchiveProvisioningCallback;
+            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
+
+            this.PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+            this.PhoneNotifier.DeviceRemoved += DeviceRemoved;
+
+            new Thread(() => EvaluateViewState()).Start();
+        }
+
+        private string _ArchivePath;
+        public string ArchivePath
+        {
+            get
+            {
+                return _ArchivePath;
+            }
+            set
+            {
+                if (value != _ArchivePath)
+                {
+                    _ArchivePath = value;
+                    OnPropertyChanged(nameof(ArchivePath));
+                }
+            }
+        }
+
+        private string _EFIESPPath;
+        public string EFIESPPath
+        {
+            get
+            {
+                return _EFIESPPath;
+            }
+            set
+            {
+                if (value != _EFIESPPath)
+                {
+                    _EFIESPPath = value;
+                    OnPropertyChanged(nameof(EFIESPPath));
+                }
+            }
+        }
+
+        private string _MainOSPath;
+        public string MainOSPath
+        {
+            get
+            {
+                return _MainOSPath;
+            }
+            set
+            {
+                if (value != _MainOSPath)
+                {
+                    _MainOSPath = value;
+                    OnPropertyChanged(nameof(MainOSPath));
+                }
+            }
+        }
+
+        private string _DataPath;
+        public string DataPath
+        {
+            get
+            {
+                return _DataPath;
+            }
+            set
+            {
+                if (value != _DataPath)
+                {
+                    _DataPath = value;
+                    OnPropertyChanged(nameof(DataPath));
+                }
+            }
+        }
+
+        private string _ArchiveProvisioningPath;
+        public string ArchiveProvisioningPath
+        {
+            get
+            {
+                return _ArchiveProvisioningPath;
+            }
+            set
+            {
+                if (value != _ArchiveProvisioningPath)
+                {
+                    _ArchiveProvisioningPath = value;
+                    OnPropertyChanged(nameof(ArchiveProvisioningPath));
+                }
+            }
+        }
+
+        private bool _IsPhoneDisconnected;
+        public bool IsPhoneDisconnected
+        {
+            get
+            {
+                return _IsPhoneDisconnected;
+            }
+            set
+            {
+                if (value != _IsPhoneDisconnected)
+                {
+                    _IsPhoneDisconnected = value;
+                    OnPropertyChanged(nameof(IsPhoneDisconnected));
+                }
+            }
+        }
+
+        private bool _IsPhoneInMassStorage;
+        public bool IsPhoneInMassStorage
+        {
+            get
+            {
+                return _IsPhoneInMassStorage;
+            }
+            set
+            {
+                if (value != _IsPhoneInMassStorage)
+                {
+                    _IsPhoneInMassStorage = value;
+                    OnPropertyChanged(nameof(IsPhoneInMassStorage));
+                }
+            }
+        }
+
+        private bool _IsPhoneInOtherMode;
+        public bool IsPhoneInOtherMode
+        {
+            get
+            {
+                return _IsPhoneInOtherMode;
+            }
+            set
+            {
+                if (value != _IsPhoneInOtherMode)
+                {
+                    _IsPhoneInOtherMode = value;
+                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
+                }
+            }
+        }
+
+        private DelegateCommand _BackupArchiveCommand;
+        public DelegateCommand BackupArchiveCommand
+        {
+            get
+            {
+                return _BackupArchiveCommand ??= new DelegateCommand(() => BackupArchiveCallback(ArchivePath), () => (ArchivePath != null) && (PhoneNotifier.CurrentInterface != null));
+            }
+        }
+
+        private DelegateCommand _BackupCommand;
+        public DelegateCommand BackupCommand
+        {
+            get
+            {
+                return _BackupCommand ??= new DelegateCommand(() => BackupCallback(EFIESPPath, MainOSPath, DataPath), () => ((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)) && (PhoneNotifier.CurrentInterface != null));
+            }
+        }
+
+        private DelegateCommand _BackupArchiveProvisioningCommand;
+        public DelegateCommand BackupArchiveProvisioningCommand
+        {
+            get
+            {
+                return _BackupArchiveProvisioningCommand ??= new DelegateCommand(() => BackupArchiveProvisioningCallback(ArchiveProvisioningPath), () => (ArchiveProvisioningPath != null) && (PhoneNotifier.CurrentInterface != null));
+            }
+        }
+
+        ~BackupTargetSelectionViewModel()
+        {
+            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
+        }
+
+        private void NewDeviceArrived(ArrivalEventArgs Args)
+        {
+            new Thread(() => EvaluateViewState()).Start();
+        }
+
+        private void DeviceRemoved()
+        {
+            new Thread(() => EvaluateViewState()).Start();
+        }
+
+        internal override void EvaluateViewState()
+        {
+            IsPhoneDisconnected = PhoneNotifier.CurrentInterface == null;
+            IsPhoneInMassStorage = PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_MassStorage;
+            IsPhoneInOtherMode = !IsPhoneDisconnected && !IsPhoneInMassStorage;
+            BackupCommand.RaiseCanExecuteChanged();
+            BackupArchiveCommand.RaiseCanExecuteChanged();
+            BackupArchiveProvisioningCommand.RaiseCanExecuteChanged();
+        }
+    }
+}
diff --git a/ViewModels/BackupViewModel.cs b/WPinternals/ViewModels/BackupViewModel.cs
similarity index 97%
rename from ViewModels/BackupViewModel.cs
rename to WPinternals/ViewModels/BackupViewModel.cs
index 117cdbc..c747840 100644
--- a/ViewModels/BackupViewModel.cs
+++ b/WPinternals/ViewModels/BackupViewModel.cs
@@ -1,490 +1,490 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal class BackupViewModel : ContextViewModel
-    {
-        private readonly PhoneNotifierViewModel PhoneNotifier;
-        private readonly Action Callback;
-        private readonly Action SwitchToUnlockBoot;
-
-        internal BackupViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action Callback)
-            : base()
-        {
-            IsFlashModeOperation = true;
-
-            this.PhoneNotifier = PhoneNotifier;
-            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
-            this.Callback = Callback;
-        }
-
-        internal override void EvaluateViewState()
-        {
-            if (!IsActive)
-            {
-                return;
-            }
-
-            if (SubContextViewModel == null)
-            {
-                ActivateSubContext(new BackupTargetSelectionViewModel(PhoneNotifier, SwitchToUnlockBoot, DoBackupArchive, DoBackup, DoBackupArchiveProvisioning));
-                IsSwitchingInterface = false;
-            }
-
-            if (SubContextViewModel is BackupTargetSelectionViewModel)
-            {
-                ((BackupTargetSelectionViewModel)SubContextViewModel).EvaluateViewState();
-            }
-        }
-
-        internal async void DoBackup(string EFIESPPath, string MainOSPath, string DataPath)
-        {
-            try
-            {
-                IsSwitchingInterface = true;
-                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_MassStorage,
-                    (msg, sub) => ActivateSubContext(new BusyViewModel(msg, sub)));
-                BackupTask(EFIESPPath, MainOSPath, DataPath);
-            }
-            catch (Exception Ex)
-            {
-                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
-            }
-        }
-
-        internal async void DoBackupArchive(string ArchivePath)
-        {
-            try
-            {
-                IsSwitchingInterface = true;
-                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_MassStorage,
-                    (msg, sub) => ActivateSubContext(new BusyViewModel(msg, sub)));
-                BackupArchiveTask(ArchivePath);
-            }
-            catch (Exception Ex)
-            {
-                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
-            }
-        }
-
-        internal async void DoBackupArchiveProvisioning(string ArchiveProvisioningPath)
-        {
-            try
-            {
-                IsSwitchingInterface = true;
-                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_MassStorage,
-                    (msg, sub) => ActivateSubContext(new BusyViewModel(msg, sub)));
-                BackupArchiveProvisioningTask(ArchiveProvisioningPath);
-            }
-            catch (Exception Ex)
-            {
-                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
-            }
-        }
-
-        internal void BackupTask(string EFIESPPath, string MainOSPath, string DataPath)
-        {
-            IsSwitchingInterface = false;
-            new Thread(() =>
-                {
-                    bool Result = true;
-
-                    ActivateSubContext(new BusyViewModel("Initializing backup..."));
-
-                    ulong TotalSizeSectors = 0;
-                    int PartitionCount = 0;
-
-                    MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
-
-                    Phone.OpenVolume(false);
-                    byte[] GPTBuffer = Phone.ReadSectors(1, 33);
-                    GPT GPT = new(GPTBuffer);
-                    Partition Partition;
-                    try
-                    {
-                        if (EFIESPPath != null)
-                        {
-                            Partition = GPT.Partitions.First(p => p.Name == "EFIESP");
-                            TotalSizeSectors += Partition.SizeInSectors;
-                            PartitionCount++;
-                        }
-
-                        if (MainOSPath != null)
-                        {
-                            Partition = GPT.Partitions.First(p => p.Name == "MainOS");
-                            TotalSizeSectors += Partition.SizeInSectors;
-                            PartitionCount++;
-                        }
-
-                        if (DataPath != null)
-                        {
-                            Partition = GPT.Partitions.First(p => p.Name == "Data");
-                            TotalSizeSectors += Partition.SizeInSectors;
-                            PartitionCount++;
-                        }
-                    }
-                    catch (Exception Ex)
-                    {
-                        LogFile.LogException(Ex);
-                        Result = false;
-                    }
-
-                    BusyViewModel Busy = new("Create backup...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
-                    ProgressUpdater Updater = Busy.ProgressUpdater;
-                    ActivateSubContext(Busy);
-
-                    int i = 0;
-                    if (Result)
-                    {
-                        try
-                        {
-                            if (EFIESPPath != null)
-                            {
-                                i++;
-                                Busy.Message = "Create backup of partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                Phone.BackupPartition("EFIESP", EFIESPPath, Updater);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                    }
-
-                    if (Result)
-                    {
-                        try
-                        {
-                            if (MainOSPath != null)
-                            {
-                                i++;
-                                Busy.Message = "Create backup of partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                Phone.BackupPartition("MainOS", MainOSPath, Updater);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                    }
-
-                    if (Result)
-                    {
-                        try
-                        {
-                            if (DataPath != null)
-                            {
-                                i++;
-                                Busy.Message = "Create backup of partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                Phone.BackupPartition("Data", DataPath, Updater);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                    }
-
-                    Phone.CloseVolume();
-
-                    if (!Result)
-                    {
-                        ActivateSubContext(new MessageViewModel("Failed to create backup!", Exit));
-                        return;
-                    }
-
-                    ActivateSubContext(new MessageViewModel("Successfully created a backup!", Exit));
-                }).Start();
-        }
-
-        internal void BackupArchiveTask(string ArchivePath)
-        {
-            IsSwitchingInterface = false;
-            new Thread(() =>
-            {
-                bool Result = true;
-
-                ActivateSubContext(new BusyViewModel("Initializing backup..."));
-
-                ulong TotalSizeSectors = 0;
-                const int PartitionCount = 3;
-
-                MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
-
-                try
-                {
-                    Phone.OpenVolume(false);
-                    byte[] GPTBuffer = Phone.ReadSectors(1, 33);
-                    GPT GPT = new(GPTBuffer);
-
-                    Partition Partition;
-
-                    try
-                    {
-                        Partition = GPT.Partitions.First(p => p.Name == "EFIESP");
-                        TotalSizeSectors += Partition.SizeInSectors;
-
-                        Partition = GPT.Partitions.First(p => p.Name == "MainOS");
-                        TotalSizeSectors += Partition.SizeInSectors;
-
-                        Partition = GPT.Partitions.First(p => p.Name == "Data");
-                        TotalSizeSectors += Partition.SizeInSectors;
-                    }
-                    catch (Exception Ex)
-                    {
-                        LogFile.LogException(Ex);
-                        Result = false;
-                    }
-
-                    BusyViewModel Busy = new("Create backup...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
-                    ProgressUpdater Updater = Busy.ProgressUpdater;
-                    ActivateSubContext(Busy);
-                    ZipArchiveEntry Entry;
-                    Stream EntryStream = null;
-
-                    using FileStream FileStream = new(ArchivePath, FileMode.Create);
-                    using ZipArchive Archive = new(FileStream, ZipArchiveMode.Create);
-                    int i = 0;
-
-                    if (Result)
-                    {
-                        try
-                        {
-                            Entry = Archive.CreateEntry("EFIESP.bin", CompressionLevel.Optimal);
-                            EntryStream = Entry.Open();
-                            i++;
-                            Busy.Message = "Create backup of partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                            Phone.BackupPartition("EFIESP", EntryStream, Updater);
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                        finally
-                        {
-                            EntryStream?.Close();
-                            EntryStream = null;
-                        }
-                    }
-
-                    if (Result)
-                    {
-                        try
-                        {
-                            Entry = Archive.CreateEntry("MainOS.bin", CompressionLevel.Optimal);
-                            EntryStream = Entry.Open();
-                            i++;
-                            Busy.Message = "Create backup of partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                            Phone.BackupPartition("MainOS", EntryStream, Updater);
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                        finally
-                        {
-                            EntryStream?.Close();
-                            EntryStream = null;
-                        }
-                    }
-
-                    if (Result)
-                    {
-                        try
-                        {
-                            Entry = Archive.CreateEntry("Data.bin", CompressionLevel.Optimal);
-                            EntryStream = Entry.Open();
-                            i++;
-                            Busy.Message = "Create backup of partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                            Phone.BackupPartition("Data", EntryStream, Updater);
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                        finally
-                        {
-                            EntryStream?.Close();
-                            EntryStream = null;
-                        }
-                    }
-                }
-                catch { }
-                finally
-                {
-                    Phone.CloseVolume();
-                }
-
-                if (!Result)
-                {
-                    ActivateSubContext(new MessageViewModel("Failed to create backup!", Exit));
-                    return;
-                }
-
-                ActivateSubContext(new MessageViewModel("Successfully created a backup!", Exit));
-            }).Start();
-        }
-
-        private readonly static string[] ProvisioningPartitions = new string[]
-        {
-            "DPP",
-            "MODEM_FSG",
-            "MODEM_FS1",
-            "MODEM_FS2",
-            "MODEM_FSC",
-            "DDR",
-            "SEC",
-            "APDP",
-            "MSADP",
-            "DPO",
-            "SSD",
-            "DBI",
-            "UEFI_BS_NV",
-            "UEFI_NV",
-            "UEFI_RT_NV",
-            "UEFI_RT_NV_RPMB",
-            "BOOTMODE",
-            "LIMITS"
-        };
-
-        internal void BackupArchiveProvisioningTask(string ArchiveProvisioningPath)
-        {
-            IsSwitchingInterface = false;
-            new Thread(() =>
-            {
-                bool Result = true;
-
-                ActivateSubContext(new BusyViewModel("Initializing backup..."));
-
-                ulong TotalSizeSectors = 0;
-                int PartitionCount = 0;
-
-                MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
-
-                try
-                {
-                    Phone.OpenVolume(false);
-                    byte[] GPTBuffer = Phone.ReadSectors(1, 33);
-                    GPT GPT = new(GPTBuffer);
-
-                    Partition Partition;
-
-                    try
-                    {
-                        foreach (string PartitionName in ProvisioningPartitions)
-                        {
-                            if (GPT.Partitions.Any(p => p.Name == PartitionName))
-                            {
-                                Partition = GPT.Partitions.First(p => p.Name == PartitionName);
-                                if (PartitionName == "UEFI_BS_NV" && GPT.Partitions.Any(p => p.Name == "BACKUP_BS_NV"))
-                                {
-                                    Partition = GPT.Partitions.First(p => p.Name == "BACKUP_BS_NV");
-                                }
-
-                                TotalSizeSectors += Partition.SizeInSectors;
-                                PartitionCount++;
-                            }
-                        }
-                    }
-                    catch (Exception Ex)
-                    {
-                        LogFile.LogException(Ex);
-                        Result = false;
-                    }
-
-                    BusyViewModel Busy = new("Create backup...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
-                    ProgressUpdater Updater = Busy.ProgressUpdater;
-                    ActivateSubContext(Busy);
-                    ZipArchiveEntry Entry;
-                    Stream EntryStream = null;
-
-                    using FileStream FileStream = new(ArchiveProvisioningPath, FileMode.Create);
-                    using ZipArchive Archive = new(FileStream, ZipArchiveMode.Create);
-                    int i = 0;
-
-                    foreach (string PartitionName in ProvisioningPartitions)
-                    {
-                        if (GPT.Partitions.Any(p => p.Name == PartitionName) && Result)
-                        {
-                            try
-                            {
-                                Entry = Archive.CreateEntry(PartitionName + ".bin", CompressionLevel.Optimal);
-                                EntryStream = Entry.Open();
-                                i++;
-                                Busy.Message = "Create backup of partition " + PartitionName + " (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                if (PartitionName == "UEFI_BS_NV" && GPT.Partitions.Any(p => p.Name == "BACKUP_BS_NV"))
-                                {
-                                    Phone.BackupPartition("BACKUP_BS_NV", EntryStream, Updater);
-                                }
-                                else
-                                {
-                                    Phone.BackupPartition(PartitionName, EntryStream, Updater);
-                                }
-                            }
-                            catch (Exception Ex)
-                            {
-                                LogFile.LogException(Ex);
-                                Result = false;
-                            }
-                            finally
-                            {
-                                EntryStream?.Close();
-                                EntryStream = null;
-                            }
-                        }
-                    }
-                }
-                catch { }
-                finally
-                {
-                    Phone.CloseVolume();
-                }
-
-                if (!Result)
-                {
-                    ActivateSubContext(new MessageViewModel("Failed to create backup!", Exit));
-                    return;
-                }
-
-                ActivateSubContext(new MessageViewModel("Successfully created a backup!", Exit));
-            }).Start();
-        }
-
-        private void Exit()
-        {
-            IsSwitchingInterface = false;
-            ActivateSubContext(null);
-            Callback();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal class BackupViewModel : ContextViewModel
+    {
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action Callback;
+        private readonly Action SwitchToUnlockBoot;
+
+        internal BackupViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action Callback)
+            : base()
+        {
+            IsFlashModeOperation = true;
+
+            this.PhoneNotifier = PhoneNotifier;
+            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
+            this.Callback = Callback;
+        }
+
+        internal override void EvaluateViewState()
+        {
+            if (!IsActive)
+            {
+                return;
+            }
+
+            if (SubContextViewModel == null)
+            {
+                ActivateSubContext(new BackupTargetSelectionViewModel(PhoneNotifier, SwitchToUnlockBoot, DoBackupArchive, DoBackup, DoBackupArchiveProvisioning));
+                IsSwitchingInterface = false;
+            }
+
+            if (SubContextViewModel is BackupTargetSelectionViewModel)
+            {
+                ((BackupTargetSelectionViewModel)SubContextViewModel).EvaluateViewState();
+            }
+        }
+
+        internal async void DoBackup(string EFIESPPath, string MainOSPath, string DataPath)
+        {
+            try
+            {
+                IsSwitchingInterface = true;
+                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_MassStorage,
+                    (msg, sub) => ActivateSubContext(new BusyViewModel(msg, sub)));
+                BackupTask(EFIESPPath, MainOSPath, DataPath);
+            }
+            catch (Exception Ex)
+            {
+                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
+            }
+        }
+
+        internal async void DoBackupArchive(string ArchivePath)
+        {
+            try
+            {
+                IsSwitchingInterface = true;
+                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_MassStorage,
+                    (msg, sub) => ActivateSubContext(new BusyViewModel(msg, sub)));
+                BackupArchiveTask(ArchivePath);
+            }
+            catch (Exception Ex)
+            {
+                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
+            }
+        }
+
+        internal async void DoBackupArchiveProvisioning(string ArchiveProvisioningPath)
+        {
+            try
+            {
+                IsSwitchingInterface = true;
+                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_MassStorage,
+                    (msg, sub) => ActivateSubContext(new BusyViewModel(msg, sub)));
+                BackupArchiveProvisioningTask(ArchiveProvisioningPath);
+            }
+            catch (Exception Ex)
+            {
+                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
+            }
+        }
+
+        internal void BackupTask(string EFIESPPath, string MainOSPath, string DataPath)
+        {
+            IsSwitchingInterface = false;
+            new Thread(() =>
+                {
+                    bool Result = true;
+
+                    ActivateSubContext(new BusyViewModel("Initializing backup..."));
+
+                    ulong TotalSizeSectors = 0;
+                    int PartitionCount = 0;
+
+                    MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
+
+                    Phone.OpenVolume(false);
+                    byte[] GPTBuffer = Phone.ReadSectors(1, 33);
+                    GPT GPT = new(GPTBuffer);
+                    Partition Partition;
+                    try
+                    {
+                        if (EFIESPPath != null)
+                        {
+                            Partition = GPT.Partitions.First(p => p.Name == "EFIESP");
+                            TotalSizeSectors += Partition.SizeInSectors;
+                            PartitionCount++;
+                        }
+
+                        if (MainOSPath != null)
+                        {
+                            Partition = GPT.Partitions.First(p => p.Name == "MainOS");
+                            TotalSizeSectors += Partition.SizeInSectors;
+                            PartitionCount++;
+                        }
+
+                        if (DataPath != null)
+                        {
+                            Partition = GPT.Partitions.First(p => p.Name == "Data");
+                            TotalSizeSectors += Partition.SizeInSectors;
+                            PartitionCount++;
+                        }
+                    }
+                    catch (Exception Ex)
+                    {
+                        LogFile.LogException(Ex);
+                        Result = false;
+                    }
+
+                    BusyViewModel Busy = new("Create backup...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                    ProgressUpdater Updater = Busy.ProgressUpdater;
+                    ActivateSubContext(Busy);
+
+                    int i = 0;
+                    if (Result)
+                    {
+                        try
+                        {
+                            if (EFIESPPath != null)
+                            {
+                                i++;
+                                Busy.Message = "Create backup of partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                Phone.BackupPartition("EFIESP", EFIESPPath, Updater);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                    }
+
+                    if (Result)
+                    {
+                        try
+                        {
+                            if (MainOSPath != null)
+                            {
+                                i++;
+                                Busy.Message = "Create backup of partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                Phone.BackupPartition("MainOS", MainOSPath, Updater);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                    }
+
+                    if (Result)
+                    {
+                        try
+                        {
+                            if (DataPath != null)
+                            {
+                                i++;
+                                Busy.Message = "Create backup of partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                Phone.BackupPartition("Data", DataPath, Updater);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                    }
+
+                    Phone.CloseVolume();
+
+                    if (!Result)
+                    {
+                        ActivateSubContext(new MessageViewModel("Failed to create backup!", Exit));
+                        return;
+                    }
+
+                    ActivateSubContext(new MessageViewModel("Successfully created a backup!", Exit));
+                }).Start();
+        }
+
+        internal void BackupArchiveTask(string ArchivePath)
+        {
+            IsSwitchingInterface = false;
+            new Thread(() =>
+            {
+                bool Result = true;
+
+                ActivateSubContext(new BusyViewModel("Initializing backup..."));
+
+                ulong TotalSizeSectors = 0;
+                const int PartitionCount = 3;
+
+                MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
+
+                try
+                {
+                    Phone.OpenVolume(false);
+                    byte[] GPTBuffer = Phone.ReadSectors(1, 33);
+                    GPT GPT = new(GPTBuffer);
+
+                    Partition Partition;
+
+                    try
+                    {
+                        Partition = GPT.Partitions.First(p => p.Name == "EFIESP");
+                        TotalSizeSectors += Partition.SizeInSectors;
+
+                        Partition = GPT.Partitions.First(p => p.Name == "MainOS");
+                        TotalSizeSectors += Partition.SizeInSectors;
+
+                        Partition = GPT.Partitions.First(p => p.Name == "Data");
+                        TotalSizeSectors += Partition.SizeInSectors;
+                    }
+                    catch (Exception Ex)
+                    {
+                        LogFile.LogException(Ex);
+                        Result = false;
+                    }
+
+                    BusyViewModel Busy = new("Create backup...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                    ProgressUpdater Updater = Busy.ProgressUpdater;
+                    ActivateSubContext(Busy);
+                    ZipArchiveEntry Entry;
+                    Stream EntryStream = null;
+
+                    using FileStream FileStream = new(ArchivePath, FileMode.Create);
+                    using ZipArchive Archive = new(FileStream, ZipArchiveMode.Create);
+                    int i = 0;
+
+                    if (Result)
+                    {
+                        try
+                        {
+                            Entry = Archive.CreateEntry("EFIESP.bin", CompressionLevel.Optimal);
+                            EntryStream = Entry.Open();
+                            i++;
+                            Busy.Message = "Create backup of partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                            Phone.BackupPartition("EFIESP", EntryStream, Updater);
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                        finally
+                        {
+                            EntryStream?.Close();
+                            EntryStream = null;
+                        }
+                    }
+
+                    if (Result)
+                    {
+                        try
+                        {
+                            Entry = Archive.CreateEntry("MainOS.bin", CompressionLevel.Optimal);
+                            EntryStream = Entry.Open();
+                            i++;
+                            Busy.Message = "Create backup of partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                            Phone.BackupPartition("MainOS", EntryStream, Updater);
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                        finally
+                        {
+                            EntryStream?.Close();
+                            EntryStream = null;
+                        }
+                    }
+
+                    if (Result)
+                    {
+                        try
+                        {
+                            Entry = Archive.CreateEntry("Data.bin", CompressionLevel.Optimal);
+                            EntryStream = Entry.Open();
+                            i++;
+                            Busy.Message = "Create backup of partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                            Phone.BackupPartition("Data", EntryStream, Updater);
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                        finally
+                        {
+                            EntryStream?.Close();
+                            EntryStream = null;
+                        }
+                    }
+                }
+                catch { }
+                finally
+                {
+                    Phone.CloseVolume();
+                }
+
+                if (!Result)
+                {
+                    ActivateSubContext(new MessageViewModel("Failed to create backup!", Exit));
+                    return;
+                }
+
+                ActivateSubContext(new MessageViewModel("Successfully created a backup!", Exit));
+            }).Start();
+        }
+
+        private readonly static string[] ProvisioningPartitions = new string[]
+        {
+            "DPP",
+            "MODEM_FSG",
+            "MODEM_FS1",
+            "MODEM_FS2",
+            "MODEM_FSC",
+            "DDR",
+            "SEC",
+            "APDP",
+            "MSADP",
+            "DPO",
+            "SSD",
+            "DBI",
+            "UEFI_BS_NV",
+            "UEFI_NV",
+            "UEFI_RT_NV",
+            "UEFI_RT_NV_RPMB",
+            "BOOTMODE",
+            "LIMITS"
+        };
+
+        internal void BackupArchiveProvisioningTask(string ArchiveProvisioningPath)
+        {
+            IsSwitchingInterface = false;
+            new Thread(() =>
+            {
+                bool Result = true;
+
+                ActivateSubContext(new BusyViewModel("Initializing backup..."));
+
+                ulong TotalSizeSectors = 0;
+                int PartitionCount = 0;
+
+                MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
+
+                try
+                {
+                    Phone.OpenVolume(false);
+                    byte[] GPTBuffer = Phone.ReadSectors(1, 33);
+                    GPT GPT = new(GPTBuffer);
+
+                    Partition Partition;
+
+                    try
+                    {
+                        foreach (string PartitionName in ProvisioningPartitions)
+                        {
+                            if (GPT.Partitions.Any(p => p.Name == PartitionName))
+                            {
+                                Partition = GPT.Partitions.First(p => p.Name == PartitionName);
+                                if (PartitionName == "UEFI_BS_NV" && GPT.Partitions.Any(p => p.Name == "BACKUP_BS_NV"))
+                                {
+                                    Partition = GPT.Partitions.First(p => p.Name == "BACKUP_BS_NV");
+                                }
+
+                                TotalSizeSectors += Partition.SizeInSectors;
+                                PartitionCount++;
+                            }
+                        }
+                    }
+                    catch (Exception Ex)
+                    {
+                        LogFile.LogException(Ex);
+                        Result = false;
+                    }
+
+                    BusyViewModel Busy = new("Create backup...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                    ProgressUpdater Updater = Busy.ProgressUpdater;
+                    ActivateSubContext(Busy);
+                    ZipArchiveEntry Entry;
+                    Stream EntryStream = null;
+
+                    using FileStream FileStream = new(ArchiveProvisioningPath, FileMode.Create);
+                    using ZipArchive Archive = new(FileStream, ZipArchiveMode.Create);
+                    int i = 0;
+
+                    foreach (string PartitionName in ProvisioningPartitions)
+                    {
+                        if (GPT.Partitions.Any(p => p.Name == PartitionName) && Result)
+                        {
+                            try
+                            {
+                                Entry = Archive.CreateEntry(PartitionName + ".bin", CompressionLevel.Optimal);
+                                EntryStream = Entry.Open();
+                                i++;
+                                Busy.Message = "Create backup of partition " + PartitionName + " (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                if (PartitionName == "UEFI_BS_NV" && GPT.Partitions.Any(p => p.Name == "BACKUP_BS_NV"))
+                                {
+                                    Phone.BackupPartition("BACKUP_BS_NV", EntryStream, Updater);
+                                }
+                                else
+                                {
+                                    Phone.BackupPartition(PartitionName, EntryStream, Updater);
+                                }
+                            }
+                            catch (Exception Ex)
+                            {
+                                LogFile.LogException(Ex);
+                                Result = false;
+                            }
+                            finally
+                            {
+                                EntryStream?.Close();
+                                EntryStream = null;
+                            }
+                        }
+                    }
+                }
+                catch { }
+                finally
+                {
+                    Phone.CloseVolume();
+                }
+
+                if (!Result)
+                {
+                    ActivateSubContext(new MessageViewModel("Failed to create backup!", Exit));
+                    return;
+                }
+
+                ActivateSubContext(new MessageViewModel("Successfully created a backup!", Exit));
+            }).Start();
+        }
+
+        private void Exit()
+        {
+            IsSwitchingInterface = false;
+            ActivateSubContext(null);
+            Callback();
+        }
+    }
+}
diff --git a/ViewModels/BusyViewModel.cs b/WPinternals/ViewModels/BusyViewModel.cs
similarity index 96%
rename from ViewModels/BusyViewModel.cs
rename to WPinternals/ViewModels/BusyViewModel.cs
index 6b2af22..2bae9eb 100644
--- a/ViewModels/BusyViewModel.cs
+++ b/WPinternals/ViewModels/BusyViewModel.cs
@@ -1,217 +1,217 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal class BusyViewModel : ContextViewModel
-    {
-        private readonly ulong MaxProgressValue = 0;
-        internal ProgressUpdater ProgressUpdater = null;
-
-        // UIContext can be passed to BusyViewModel, when it needs to update progress-controls and it is created on a worker-thread.
-        internal BusyViewModel(string Message, string SubMessage = null, ulong? MaxProgressValue = null, SynchronizationContext UIContext = null, bool ShowAnimation = true, bool ShowRebootHelp = false)
-        {
-            LogFile.Log(Message);
-
-            this.UIContext = UIContext ?? SynchronizationContext.Current;
-
-            this.Message = Message;
-            this.SubMessage = SubMessage;
-            this.ShowAnimation = ShowAnimation;
-            this.ShowRebootHelp = ShowRebootHelp;
-            if (MaxProgressValue != null)
-            {
-                ProgressPercentage = 0;
-                this.MaxProgressValue = (ulong)MaxProgressValue;
-                ProgressUpdater = new ProgressUpdater((ulong)MaxProgressValue, (p, t) =>
-                {
-                    if ((this.UIContext == null) || (this.UIContext == SynchronizationContext.Current))
-                    {
-                        ProgressPercentage = p;
-                        TimeRemaining = t;
-                    }
-                    else
-                    {
-                        this.UIContext.Post((s) =>
-                            {
-                                ProgressPercentage = p;
-                                TimeRemaining = t;
-                            }, null);
-                    }
-                });
-            }
-        }
-
-        internal void SetShowRebootHelp(bool Value)
-        {
-            ShowRebootHelp = Value;
-        }
-
-        internal void SetProgress(ulong Value)
-        {
-            if (ProgressUpdater != null)
-            {
-                UIContext.Post((s) => ProgressUpdater.SetProgress(Value), null);
-            }
-        }
-
-        private string _Message = null;
-        public string Message
-        {
-            get
-            {
-                return _Message;
-            }
-            set
-            {
-                _Message = value;
-                OnPropertyChanged(nameof(Message));
-            }
-        }
-
-        private string _SubMessage = null;
-        public string SubMessage
-        {
-            get
-            {
-                return _SubMessage;
-            }
-            set
-            {
-                _SubMessage = value;
-                OnPropertyChanged(nameof(SubMessage));
-            }
-        }
-
-        private int? _ProgressPercentage = null;
-        public int? ProgressPercentage
-        {
-            get
-            {
-                return _ProgressPercentage;
-            }
-            set
-            {
-                if (_ProgressPercentage != value)
-                {
-                    _ProgressPercentage = value;
-                    OnPropertyChanged(nameof(ProgressPercentage));
-                    OnPropertyChanged(nameof(ShowAnimation));
-                    UpdateProgressText();
-                }
-            }
-        }
-
-        private TimeSpan? _TimeRemaining = null;
-        public TimeSpan? TimeRemaining
-        {
-            get
-            {
-                return _TimeRemaining;
-            }
-            set
-            {
-                if (_TimeRemaining != value)
-                {
-                    _TimeRemaining = value;
-                    OnPropertyChanged(nameof(TimeRemaining));
-                    UpdateProgressText();
-                }
-            }
-        }
-
-        private void UpdateProgressText()
-        {
-            string NewText = null;
-            if (ProgressPercentage != null)
-            {
-                NewText = "Progress: " + ((int)ProgressPercentage).ToString() + "%";
-            }
-            if (TimeRemaining != null)
-            {
-                if (NewText == null)
-                {
-                    NewText = "";
-                }
-                else
-                {
-                    NewText += " - ";
-                }
-
-                NewText += "Estimated time remaining: " + ((TimeSpan)TimeRemaining).ToString(@"h\:mm\:ss");
-            }
-            ProgressText = NewText;
-        }
-
-        private string _ProgressText = null;
-        public string ProgressText
-        {
-            get
-            {
-                return _ProgressText;
-            }
-            set
-            {
-                if (_ProgressText != value)
-                {
-                    _ProgressText = value;
-                    OnPropertyChanged(nameof(ProgressText));
-                }
-            }
-        }
-
-        private bool _ShowAnimation = true;
-        public bool ShowAnimation
-        {
-            get
-            {
-                return (_ProgressPercentage == null) && _ShowAnimation;
-            }
-            set
-            {
-                if (_ShowAnimation != value)
-                {
-                    _ShowAnimation = value;
-                    OnPropertyChanged(nameof(ShowAnimation));
-                }
-            }
-        }
-
-        private bool _ShowRebootHelp = false;
-        public bool ShowRebootHelp
-        {
-            get
-            {
-                return _ShowRebootHelp;
-            }
-            set
-            {
-                if (_ShowRebootHelp != value)
-                {
-                    _ShowRebootHelp = value;
-                    OnPropertyChanged(nameof(ShowRebootHelp));
-                }
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal class BusyViewModel : ContextViewModel
+    {
+        private readonly ulong MaxProgressValue = 0;
+        internal ProgressUpdater ProgressUpdater = null;
+
+        // UIContext can be passed to BusyViewModel, when it needs to update progress-controls and it is created on a worker-thread.
+        internal BusyViewModel(string Message, string SubMessage = null, ulong? MaxProgressValue = null, SynchronizationContext UIContext = null, bool ShowAnimation = true, bool ShowRebootHelp = false)
+        {
+            LogFile.Log(Message);
+
+            this.UIContext = UIContext ?? SynchronizationContext.Current;
+
+            this.Message = Message;
+            this.SubMessage = SubMessage;
+            this.ShowAnimation = ShowAnimation;
+            this.ShowRebootHelp = ShowRebootHelp;
+            if (MaxProgressValue != null)
+            {
+                ProgressPercentage = 0;
+                this.MaxProgressValue = (ulong)MaxProgressValue;
+                ProgressUpdater = new ProgressUpdater((ulong)MaxProgressValue, (p, t) =>
+                {
+                    if ((this.UIContext == null) || (this.UIContext == SynchronizationContext.Current))
+                    {
+                        ProgressPercentage = p;
+                        TimeRemaining = t;
+                    }
+                    else
+                    {
+                        this.UIContext.Post((s) =>
+                            {
+                                ProgressPercentage = p;
+                                TimeRemaining = t;
+                            }, null);
+                    }
+                });
+            }
+        }
+
+        internal void SetShowRebootHelp(bool Value)
+        {
+            ShowRebootHelp = Value;
+        }
+
+        internal void SetProgress(ulong Value)
+        {
+            if (ProgressUpdater != null)
+            {
+                UIContext.Post((s) => ProgressUpdater.SetProgress(Value), null);
+            }
+        }
+
+        private string _Message = null;
+        public string Message
+        {
+            get
+            {
+                return _Message;
+            }
+            set
+            {
+                _Message = value;
+                OnPropertyChanged(nameof(Message));
+            }
+        }
+
+        private string _SubMessage = null;
+        public string SubMessage
+        {
+            get
+            {
+                return _SubMessage;
+            }
+            set
+            {
+                _SubMessage = value;
+                OnPropertyChanged(nameof(SubMessage));
+            }
+        }
+
+        private int? _ProgressPercentage = null;
+        public int? ProgressPercentage
+        {
+            get
+            {
+                return _ProgressPercentage;
+            }
+            set
+            {
+                if (_ProgressPercentage != value)
+                {
+                    _ProgressPercentage = value;
+                    OnPropertyChanged(nameof(ProgressPercentage));
+                    OnPropertyChanged(nameof(ShowAnimation));
+                    UpdateProgressText();
+                }
+            }
+        }
+
+        private TimeSpan? _TimeRemaining = null;
+        public TimeSpan? TimeRemaining
+        {
+            get
+            {
+                return _TimeRemaining;
+            }
+            set
+            {
+                if (_TimeRemaining != value)
+                {
+                    _TimeRemaining = value;
+                    OnPropertyChanged(nameof(TimeRemaining));
+                    UpdateProgressText();
+                }
+            }
+        }
+
+        private void UpdateProgressText()
+        {
+            string NewText = null;
+            if (ProgressPercentage != null)
+            {
+                NewText = "Progress: " + ((int)ProgressPercentage).ToString() + "%";
+            }
+            if (TimeRemaining != null)
+            {
+                if (NewText == null)
+                {
+                    NewText = "";
+                }
+                else
+                {
+                    NewText += " - ";
+                }
+
+                NewText += "Estimated time remaining: " + ((TimeSpan)TimeRemaining).ToString(@"h\:mm\:ss");
+            }
+            ProgressText = NewText;
+        }
+
+        private string _ProgressText = null;
+        public string ProgressText
+        {
+            get
+            {
+                return _ProgressText;
+            }
+            set
+            {
+                if (_ProgressText != value)
+                {
+                    _ProgressText = value;
+                    OnPropertyChanged(nameof(ProgressText));
+                }
+            }
+        }
+
+        private bool _ShowAnimation = true;
+        public bool ShowAnimation
+        {
+            get
+            {
+                return (_ProgressPercentage == null) && _ShowAnimation;
+            }
+            set
+            {
+                if (_ShowAnimation != value)
+                {
+                    _ShowAnimation = value;
+                    OnPropertyChanged(nameof(ShowAnimation));
+                }
+            }
+        }
+
+        private bool _ShowRebootHelp = false;
+        public bool ShowRebootHelp
+        {
+            get
+            {
+                return _ShowRebootHelp;
+            }
+            set
+            {
+                if (_ShowRebootHelp != value)
+                {
+                    _ShowRebootHelp = value;
+                    OnPropertyChanged(nameof(ShowRebootHelp));
+                }
+            }
+        }
+    }
+}
diff --git a/ViewModels/ContextViewModel.cs b/WPinternals/ViewModels/ContextViewModel.cs
similarity index 97%
rename from ViewModels/ContextViewModel.cs
rename to WPinternals/ViewModels/ContextViewModel.cs
index 635cf65..493ee77 100644
--- a/ViewModels/ContextViewModel.cs
+++ b/WPinternals/ViewModels/ContextViewModel.cs
@@ -1,157 +1,157 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.ComponentModel;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal class ContextViewModel : INotifyPropertyChanged
-    {
-        protected SynchronizationContext UIContext;
-
-        public bool IsSwitchingInterface = false;
-        public bool IsFlashModeOperation = false;
-
-        public event PropertyChangedEventHandler PropertyChanged = delegate { };
-
-        protected void OnPropertyChanged(string propertyName)
-        {
-            if ((UIContext == null) && (SynchronizationContext.Current != null))
-            {
-                UIContext = SynchronizationContext.Current;
-            }
-
-            if (this.PropertyChanged != null)
-            {
-                if (SynchronizationContext.Current == UIContext)
-                {
-                    PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-                }
-                else
-                {
-                    UIContext.Post((s) => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
-                }
-            }
-        }
-
-        private ContextViewModel _SubContextViewModel;
-        public ContextViewModel SubContextViewModel
-        {
-            get
-            {
-                return _SubContextViewModel;
-            }
-            private set
-            {
-                if (_SubContextViewModel != null)
-                {
-                    _SubContextViewModel.IsActive = false;
-                }
-
-                _SubContextViewModel = value;
-                if (_SubContextViewModel != null)
-                {
-                    _SubContextViewModel.IsActive = IsActive;
-                }
-
-                OnPropertyChanged(nameof(SubContextViewModel));
-            }
-        }
-
-        internal ContextViewModel()
-        {
-            UIContext = SynchronizationContext.Current;
-        }
-
-        internal ContextViewModel(MainViewModel Main) : this()
-        {
-        }
-
-        internal ContextViewModel(MainViewModel Main, ContextViewModel SubContext) : this(Main)
-        {
-            SubContextViewModel = SubContext;
-        }
-
-        internal bool IsActive { get; set; } = false;
-
-        internal virtual void EvaluateViewState()
-        {
-        }
-
-        internal void Activate()
-        {
-            IsActive = true;
-            EvaluateViewState();
-            SubContextViewModel?.Activate();
-        }
-
-        internal void ActivateSubContext(ContextViewModel NewSubContext)
-        {
-            if (_SubContextViewModel != null)
-            {
-                _SubContextViewModel.IsActive = false;
-            }
-
-            if (NewSubContext != null)
-            {
-                if (IsActive)
-                {
-                    NewSubContext.Activate();
-                }
-                else
-                {
-                    NewSubContext.IsActive = false;
-                }
-            }
-            SubContextViewModel = NewSubContext;
-        }
-
-        internal void SetWorkingStatus(string Message, string SubMessage, ulong? MaxProgressValue, bool ShowAnimation = true, WPinternalsStatus Status = WPinternalsStatus.Undefined)
-        {
-            ActivateSubContext(new BusyViewModel(Message, SubMessage, MaxProgressValue, UIContext: UIContext, ShowAnimation: ShowAnimation, ShowRebootHelp: Status == WPinternalsStatus.WaitingForManualReset));
-        }
-
-        internal void UpdateWorkingStatus(string Message, string SubMessage, ulong? CurrentProgressValue, WPinternalsStatus Status = WPinternalsStatus.Undefined)
-        {
-            if (SubContextViewModel is BusyViewModel Busy)
-            {
-                if (Message != null)
-                {
-                    Busy.Message = Message;
-                    Busy.SubMessage = SubMessage;
-                }
-                if ((CurrentProgressValue != null) && (Busy.ProgressUpdater != null))
-                {
-                    try
-                    {
-                        Busy.ProgressUpdater.SetProgress((ulong)CurrentProgressValue);
-                    }
-                    catch (Exception Ex)
-                    {
-                        LogFile.LogException(Ex);
-                    }
-                }
-                Busy.SetShowRebootHelp(Status == WPinternalsStatus.WaitingForManualReset);
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.ComponentModel;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal class ContextViewModel : INotifyPropertyChanged
+    {
+        protected SynchronizationContext UIContext;
+
+        public bool IsSwitchingInterface = false;
+        public bool IsFlashModeOperation = false;
+
+        public event PropertyChangedEventHandler PropertyChanged = delegate { };
+
+        protected void OnPropertyChanged(string propertyName)
+        {
+            if ((UIContext == null) && (SynchronizationContext.Current != null))
+            {
+                UIContext = SynchronizationContext.Current;
+            }
+
+            if (this.PropertyChanged != null)
+            {
+                if (SynchronizationContext.Current == UIContext)
+                {
+                    PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
+                else
+                {
+                    UIContext.Post((s) => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
+                }
+            }
+        }
+
+        private ContextViewModel _SubContextViewModel;
+        public ContextViewModel SubContextViewModel
+        {
+            get
+            {
+                return _SubContextViewModel;
+            }
+            private set
+            {
+                if (_SubContextViewModel != null)
+                {
+                    _SubContextViewModel.IsActive = false;
+                }
+
+                _SubContextViewModel = value;
+                if (_SubContextViewModel != null)
+                {
+                    _SubContextViewModel.IsActive = IsActive;
+                }
+
+                OnPropertyChanged(nameof(SubContextViewModel));
+            }
+        }
+
+        internal ContextViewModel()
+        {
+            UIContext = SynchronizationContext.Current;
+        }
+
+        internal ContextViewModel(MainViewModel Main) : this()
+        {
+        }
+
+        internal ContextViewModel(MainViewModel Main, ContextViewModel SubContext) : this(Main)
+        {
+            SubContextViewModel = SubContext;
+        }
+
+        internal bool IsActive { get; set; } = false;
+
+        internal virtual void EvaluateViewState()
+        {
+        }
+
+        internal void Activate()
+        {
+            IsActive = true;
+            EvaluateViewState();
+            SubContextViewModel?.Activate();
+        }
+
+        internal void ActivateSubContext(ContextViewModel NewSubContext)
+        {
+            if (_SubContextViewModel != null)
+            {
+                _SubContextViewModel.IsActive = false;
+            }
+
+            if (NewSubContext != null)
+            {
+                if (IsActive)
+                {
+                    NewSubContext.Activate();
+                }
+                else
+                {
+                    NewSubContext.IsActive = false;
+                }
+            }
+            SubContextViewModel = NewSubContext;
+        }
+
+        internal void SetWorkingStatus(string Message, string SubMessage, ulong? MaxProgressValue, bool ShowAnimation = true, WPinternalsStatus Status = WPinternalsStatus.Undefined)
+        {
+            ActivateSubContext(new BusyViewModel(Message, SubMessage, MaxProgressValue, UIContext: UIContext, ShowAnimation: ShowAnimation, ShowRebootHelp: Status == WPinternalsStatus.WaitingForManualReset));
+        }
+
+        internal void UpdateWorkingStatus(string Message, string SubMessage, ulong? CurrentProgressValue, WPinternalsStatus Status = WPinternalsStatus.Undefined)
+        {
+            if (SubContextViewModel is BusyViewModel Busy)
+            {
+                if (Message != null)
+                {
+                    Busy.Message = Message;
+                    Busy.SubMessage = SubMessage;
+                }
+                if ((CurrentProgressValue != null) && (Busy.ProgressUpdater != null))
+                {
+                    try
+                    {
+                        Busy.ProgressUpdater.SetProgress((ulong)CurrentProgressValue);
+                    }
+                    catch (Exception Ex)
+                    {
+                        LogFile.LogException(Ex);
+                    }
+                }
+                Busy.SetShowRebootHelp(Status == WPinternalsStatus.WaitingForManualReset);
+            }
+        }
+    }
+}
diff --git a/ViewModels/DisclaimerAndNdaViewModel.cs b/WPinternals/ViewModels/DisclaimerAndNdaViewModel.cs
similarity index 97%
rename from ViewModels/DisclaimerAndNdaViewModel.cs
rename to WPinternals/ViewModels/DisclaimerAndNdaViewModel.cs
index 344e0d3..c78b0cc 100644
--- a/ViewModels/DisclaimerAndNdaViewModel.cs
+++ b/WPinternals/ViewModels/DisclaimerAndNdaViewModel.cs
@@ -1,60 +1,60 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using Microsoft.Win32;
-using System;
-using System.Windows;
-
-namespace WPinternals
-{
-    internal class DisclaimerAndNdaViewModel : ContextViewModel
-    {
-        private readonly Action Accepted;
-
-        internal DisclaimerAndNdaViewModel(Action Accepted)
-            : base()
-        {
-            this.Accepted = Accepted;
-        }
-
-        private DelegateCommand _ExitCommand = null;
-        public DelegateCommand ExitCommand
-        {
-            get
-            {
-                return _ExitCommand ??= new DelegateCommand(() => Application.Current.Shutdown());
-            }
-        }
-
-        private DelegateCommand _ContinueCommand = null;
-        public DelegateCommand ContinueCommand
-        {
-            get
-            {
-                return _ContinueCommand ??= new DelegateCommand(() =>
-                    {
-                        Registry.CurrentUser.OpenSubKey("Software\\WPInternals", true).SetValue("DisclaimerAccepted", 1, RegistryValueKind.DWord);
-                        Registry.CurrentUser.OpenSubKey("Software\\WPInternals", true).SetValue("NdaAccepted", 1, RegistryValueKind.DWord);
-                        Accepted();
-                    });
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using Microsoft.Win32;
+using System;
+using System.Windows;
+
+namespace WPinternals
+{
+    internal class DisclaimerAndNdaViewModel : ContextViewModel
+    {
+        private readonly Action Accepted;
+
+        internal DisclaimerAndNdaViewModel(Action Accepted)
+            : base()
+        {
+            this.Accepted = Accepted;
+        }
+
+        private DelegateCommand _ExitCommand = null;
+        public DelegateCommand ExitCommand
+        {
+            get
+            {
+                return _ExitCommand ??= new DelegateCommand(() => Application.Current.Shutdown());
+            }
+        }
+
+        private DelegateCommand _ContinueCommand = null;
+        public DelegateCommand ContinueCommand
+        {
+            get
+            {
+                return _ContinueCommand ??= new DelegateCommand(() =>
+                    {
+                        Registry.CurrentUser.OpenSubKey("Software\\WPInternals", true).SetValue("DisclaimerAccepted", 1, RegistryValueKind.DWord);
+                        Registry.CurrentUser.OpenSubKey("Software\\WPInternals", true).SetValue("NdaAccepted", 1, RegistryValueKind.DWord);
+                        Accepted();
+                    });
+            }
+        }
+    }
+}
diff --git a/ViewModels/DisclaimerViewModel.cs b/WPinternals/ViewModels/DisclaimerViewModel.cs
similarity index 97%
rename from ViewModels/DisclaimerViewModel.cs
rename to WPinternals/ViewModels/DisclaimerViewModel.cs
index 1ecc3b7..f460bfd 100644
--- a/ViewModels/DisclaimerViewModel.cs
+++ b/WPinternals/ViewModels/DisclaimerViewModel.cs
@@ -1,61 +1,61 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using Microsoft.Win32;
-using System;
-using System.Windows;
-
-namespace WPinternals
-{
-    internal delegate void DisclaimerAcceptedHandler();
-
-    internal class DisclaimerViewModel : ContextViewModel
-    {
-        private readonly Action Accepted;
-
-        internal DisclaimerViewModel(Action Accepted)
-            : base()
-        {
-            this.Accepted = Accepted;
-        }
-
-        private DelegateCommand _ExitCommand = null;
-        public DelegateCommand ExitCommand
-        {
-            get
-            {
-                return _ExitCommand ??= new DelegateCommand(() => Application.Current.Shutdown());
-            }
-        }
-
-        private DelegateCommand _ContinueCommand = null;
-        public DelegateCommand ContinueCommand
-        {
-            get
-            {
-                return _ContinueCommand ??= new DelegateCommand(() =>
-                    {
-                        Registry.CurrentUser.OpenSubKey("Software\\WPInternals", true).SetValue("DisclaimerAccepted", 1, RegistryValueKind.DWord);
-                        Accepted();
-                    });
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using Microsoft.Win32;
+using System;
+using System.Windows;
+
+namespace WPinternals
+{
+    internal delegate void DisclaimerAcceptedHandler();
+
+    internal class DisclaimerViewModel : ContextViewModel
+    {
+        private readonly Action Accepted;
+
+        internal DisclaimerViewModel(Action Accepted)
+            : base()
+        {
+            this.Accepted = Accepted;
+        }
+
+        private DelegateCommand _ExitCommand = null;
+        public DelegateCommand ExitCommand
+        {
+            get
+            {
+                return _ExitCommand ??= new DelegateCommand(() => Application.Current.Shutdown());
+            }
+        }
+
+        private DelegateCommand _ContinueCommand = null;
+        public DelegateCommand ContinueCommand
+        {
+            get
+            {
+                return _ContinueCommand ??= new DelegateCommand(() =>
+                    {
+                        Registry.CurrentUser.OpenSubKey("Software\\WPInternals", true).SetValue("DisclaimerAccepted", 1, RegistryValueKind.DWord);
+                        Accepted();
+                    });
+            }
+        }
+    }
+}
diff --git a/ViewModels/DownloadsViewModel.cs b/WPinternals/ViewModels/DownloadsViewModel.cs
similarity index 97%
rename from ViewModels/DownloadsViewModel.cs
rename to WPinternals/ViewModels/DownloadsViewModel.cs
index f4897e0..9d5b002 100644
--- a/ViewModels/DownloadsViewModel.cs
+++ b/WPinternals/ViewModels/DownloadsViewModel.cs
@@ -1,965 +1,965 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace WPinternals
-{
-    internal class DownloadsViewModel : ContextViewModel
-    {
-        private readonly PhoneNotifierViewModel Notifier;
-        private readonly Timer SpeedTimer;
-        private bool IsSearching = false;
-
-        internal DownloadsViewModel(PhoneNotifierViewModel Notifier)
-        {
-            IsSwitchingInterface = false;
-            IsFlashModeOperation = false;
-            this.Notifier = Notifier;
-            Notifier.NewDeviceArrived += Notifier_NewDeviceArrived;
-
-            RegistryKey Key = Registry.CurrentUser.OpenSubKey(@"Software\WPInternals", true) ?? Registry.CurrentUser.CreateSubKey(@"Software\WPInternals");
-
-            DownloadFolder = (string)Key.GetValue("DownloadFolder", @"C:\ProgramData\WPinternals\Repository");
-            Key.Close();
-
-            SpeedTimer = new Timer(TimerCallback, this, TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1));
-
-            AddFFUCommand = new DelegateCommand(() =>
-            {
-                string FFUPath = null;
-
-                OpenFileDialog dlg = new();
-                dlg.DefaultExt = ".ffu"; // Default file extension
-                dlg.Filter = "ROM images (.ffu)|*.ffu"; // Filter files by extension 
-
-                bool? result = dlg.ShowDialog();
-
-                if (result == true)
-                {
-                    FFUPath = dlg.FileName;
-                    string FFUFile = Path.GetFileName(FFUPath);
-
-                    try
-                    {
-                        App.Config.AddFfuToRepository(FFUPath);
-                        App.Config.WriteConfig();
-                        LastStatusText = "File \"" + FFUFile + "\" was added to the repository.";
-                    }
-                    catch (WPinternalsException Ex)
-                    {
-                        LastStatusText = "Error: " + Ex.Message + ". File \"" + FFUFile + "\" was not added.";
-                    }
-                    catch
-                    {
-                        LastStatusText = "Error: File \"" + FFUFile + "\" was not added.";
-                    }
-                }
-                else
-                {
-                    LastStatusText = null;
-                }
-            });
-        }
-
-        private string _LastStatusText = null;
-        public string LastStatusText
-        {
-            get
-            {
-                return _LastStatusText;
-            }
-            set
-            {
-                _LastStatusText = value;
-                OnPropertyChanged(nameof(LastStatusText));
-            }
-        }
-
-        internal static void TimerCallback(object State)
-        {
-            foreach (DownloadEntry Entry in App.DownloadManager.DownloadList)
-            {
-                if (Entry.SpeedIndex >= 0)
-                {
-                    int ArrayIndex = (int)(Entry.SpeedIndex % 10);
-                    Entry.Speeds[ArrayIndex] = Entry.BytesReceived - Entry.LastBytesReceived;
-                    int Count = (int)((Entry.SpeedIndex + 1) > 10 ? 10 : (Entry.SpeedIndex + 1));
-                    long Sum = 0;
-                    for (int i = 0; i < Count; i++)
-                    {
-                        Sum += Entry.Speeds[i];
-                    }
-
-                    Entry.Speed = Sum / Count;
-                    Entry.TimeLeft = Entry.Speed < 1000 ? Timeout.InfiniteTimeSpan : TimeSpan.FromSeconds((Entry.Size - Entry.BytesReceived) / Entry.Speed);
-                }
-                Entry.LastBytesReceived = Entry.BytesReceived;
-                Entry.SpeedIndex++;
-            }
-        }
-
-        private void Notifier_NewDeviceArrived(ArrivalEventArgs Args)
-        {
-            EvaluateViewState();
-        }
-
-        internal static long GetFileLengthFromURL(string URL)
-        {
-            long Length = 0;
-            HttpWebRequest req = (HttpWebRequest)WebRequest.Create(URL);
-            req.Method = "HEAD";
-            req.ServicePoint.ConnectionLimit = 10;
-            using (WebResponse resp = req.GetResponse())
-            {
-                long.TryParse(resp.Headers.Get("Content-Length"), out Length);
-            }
-            return Length;
-        }
-
-        internal static string GetFileNameFromURL(string URL)
-        {
-            string FileName = Path.GetFileName(URL);
-            int End = FileName.IndexOf('?');
-            if (End >= 0)
-            {
-                FileName = FileName.Substring(0, End);
-            }
-
-            return FileName;
-        }
-
-        private void Search()
-        {
-            if (IsSearching)
-            {
-                return;
-            }
-
-            IsSearching = true;
-
-            SynchronizationContext UIContext = SynchronizationContext.Current;
-            SearchResultList.Clear();
-
-            new Thread(() =>
-            {
-                string FFUURL = null;
-                string[] EmergencyURLs = null;
-                try
-                {
-                    string TempProductType = ProductType.ToUpper();
-                    if ((TempProductType?.StartsWith("RM") == true) && !TempProductType.StartsWith("RM-"))
-                    {
-                        TempProductType = "RM-" + TempProductType[2..];
-                    }
-
-                    ProductType = TempProductType;
-                    FFUURL = LumiaDownloadModel.SearchFFU(ProductType, ProductCode, OperatorCode, out TempProductType);
-                    if (TempProductType != null)
-                    {
-                        ProductType = TempProductType;
-                    }
-
-                    if (ProductType != null)
-                    {
-                        EmergencyURLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
-                    }
-                }
-                catch { }
-
-                UIContext.Post(s =>
-                {
-                    if (FFUURL != null)
-                    {
-                        SearchResultList.Add(new SearchResult(FFUURL, ProductType, FFUDownloaded, null));
-                    }
-
-                    if (EmergencyURLs != null)
-                    {
-                        SearchResultList.Add(new SearchResult(ProductType + " emergency-files", EmergencyURLs, ProductType, EmergencyDownloaded, ProductType));
-                    }
-                }, null);
-
-                IsSearching = false;
-            }).Start();
-        }
-
-        internal void Download(string URL, string Category, Action<string[], object> Callback, object State = null)
-        {
-            string Folder = Category == null ? DownloadFolder : Path.Combine(DownloadFolder, Category);
-            DownloadList.Add(new DownloadEntry(URL, Folder, null, Callback, State));
-        }
-
-        internal void Download(string[] URLs, string Category, Action<string[], object> Callback, object State = null)
-        {
-            string Folder = Category == null ? DownloadFolder : Path.Combine(DownloadFolder, Category);
-            foreach (string URL in URLs)
-            {
-                DownloadList.Add(new DownloadEntry(URL, Folder, URLs, Callback, State));
-            }
-        }
-
-        private void DownloadAll()
-        {
-            SynchronizationContext UIContext = SynchronizationContext.Current;
-
-            new Thread(() =>
-            {
-                string FFUURL = null;
-                string[] EmergencyURLs = null;
-                try
-                {
-                    string TempProductType = ProductType.ToUpper();
-                    if ((TempProductType?.StartsWith("RM") == true) && !TempProductType.StartsWith("RM-"))
-                    {
-                        TempProductType = "RM-" + TempProductType[2..];
-                    }
-
-                    ProductType = TempProductType;
-                    FFUURL = LumiaDownloadModel.SearchFFU(ProductType, ProductCode, OperatorCode, out TempProductType);
-                    if (TempProductType != null)
-                    {
-                        ProductType = TempProductType;
-                    }
-
-                    if (ProductType != null)
-                    {
-                        EmergencyURLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
-                    }
-                }
-                catch { }
-
-                UIContext.Post(s =>
-                {
-                    if (FFUURL != null)
-                    {
-                        Download(FFUURL, ProductType, FFUDownloadedAndCheckSupported, null);
-                    }
-
-                    if (EmergencyURLs != null)
-                    {
-                        Download(EmergencyURLs, ProductType, EmergencyDownloaded, ProductType);
-                    }
-                }, null);
-            }).Start();
-        }
-
-        private void DownloadSelected()
-        {
-            foreach (SearchResult Result in SearchResultList.Where(r => r.IsSelected))
-            {
-                App.DownloadManager.Download(Result.URLs, Result.Category, Result.Callback, Result.State);
-            }
-        }
-
-        private void FFUDownloaded(string[] Files, object State)
-        {
-            App.Config.AddFfuToRepository(Files[0]);
-        }
-
-        private void FFUDownloadedAndCheckSupported(string[] Files, object State)
-        {
-            App.Config.AddFfuToRepository(Files[0]);
-
-            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
-            {
-                const string ProductType2 = "RM-1085";
-                string URL = LumiaDownloadModel.SearchFFU(ProductType2, null, null);
-                Download(URL, ProductType2, FFUDownloaded, null);
-            }
-        }
-
-        private void EmergencyDownloaded(string[] Files, object State)
-        {
-            string Type = (string)State;
-            string ProgrammerPath = null;
-            string PayloadPath = null;
-
-            for (int i = 0; i < Files.Length; i++)
-            {
-                if (Files[i].EndsWith(".ede", StringComparison.OrdinalIgnoreCase))
-                {
-                    ProgrammerPath = Files[i];
-                }
-
-                if (Files[i].EndsWith(".edp", StringComparison.OrdinalIgnoreCase))
-                {
-                    PayloadPath = Files[i];
-                }
-            }
-
-            if ((Type != null) && (ProgrammerPath != null) && (PayloadPath != null))
-            {
-                App.Config.AddEmergencyToRepository(Type, ProgrammerPath, PayloadPath);
-            }
-        }
-        public ObservableCollection<DownloadEntry> DownloadList { get; } = new();
-        public ObservableCollection<SearchResult> SearchResultList { get; } = new();
-
-        private DelegateCommand _DownloadSelectedCommand = null;
-        public DelegateCommand DownloadSelectedCommand
-        {
-            get
-            {
-                return _DownloadSelectedCommand ??= new DelegateCommand(() => DownloadSelected());
-            }
-        }
-
-        private DelegateCommand _SearchCommand = null;
-        public DelegateCommand SearchCommand
-        {
-            get
-            {
-                return _SearchCommand ??= new DelegateCommand(() => Search());
-            }
-        }
-
-        private DelegateCommand _DownloadAllCommand = null;
-        public DelegateCommand DownloadAllCommand
-        {
-            get
-            {
-                return _DownloadAllCommand ??= new DelegateCommand(() => DownloadAll());
-            }
-        }
-
-        private string _DownloadFolder = null;
-        public string DownloadFolder
-        {
-            get
-            {
-                return _DownloadFolder;
-            }
-            set
-            {
-                if (_DownloadFolder != value)
-                {
-                    _DownloadFolder = value;
-
-                    try
-                    {
-                        Directory.CreateDirectory(_DownloadFolder);
-                    }
-                    catch { }
-                    if (!Directory.Exists(_DownloadFolder))
-                    {
-                        _DownloadFolder = @"C:\ProgramData\WPinternals\Repository";
-                        Directory.CreateDirectory(_DownloadFolder);
-                    }
-
-                    RegistryKey Key = Registry.CurrentUser.OpenSubKey(@"Software\WPInternals", true);
-
-                    if (_DownloadFolder == null)
-                    {
-                        if (Key.GetValue("DownloadFolder") != null)
-                        {
-                            Key.DeleteValue("DownloadFolder");
-                        }
-                    }
-                    else
-                    {
-                        Key.SetValue("DownloadFolder", _DownloadFolder);
-                    }
-
-                    Key.Close();
-
-                    OnPropertyChanged(nameof(DownloadFolder));
-                }
-            }
-        }
-
-        private string _ProductCode = null;
-        public string ProductCode
-        {
-            get
-            {
-                return _ProductCode;
-            }
-            set
-            {
-                if (_ProductCode != value)
-                {
-                    _ProductCode = value;
-
-                    OnPropertyChanged(nameof(ProductCode));
-                }
-            }
-        }
-
-        private string _ProductType = null;
-        public string ProductType
-        {
-            get
-            {
-                return _ProductType;
-            }
-            set
-            {
-                if (_ProductType != value)
-                {
-                    _ProductType = value;
-
-                    OnPropertyChanged(nameof(ProductType));
-                }
-            }
-        }
-
-        private string _OperatorCode = null;
-        public string OperatorCode
-        {
-            get
-            {
-                return _OperatorCode;
-            }
-            set
-            {
-                if (_OperatorCode != value)
-                {
-                    _OperatorCode = value;
-
-                    OnPropertyChanged(nameof(OperatorCode));
-                }
-            }
-        }
-
-        internal override void EvaluateViewState()
-        {
-            if (!IsActive)
-            {
-                return;
-            }
-
-            if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash)
-            {
-                NokiaFlashModel LumiaFlashModel = (NokiaFlashModel)Notifier.CurrentModel;
-                PhoneInfo Info = LumiaFlashModel.ReadPhoneInfo();
-                ProductType = Info.Type;
-                OperatorCode = "";
-                ProductCode = Info.ProductCode;
-            }
-            else if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Normal)
-            {
-                NokiaPhoneModel LumiaNormalModel = (NokiaPhoneModel)Notifier.CurrentModel;
-                OperatorCode = LumiaNormalModel.ExecuteJsonMethodAsString("ReadOperatorName", "OperatorName"); // Example: 000-NL
-                string TempProductType = LumiaNormalModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName"); // RM-821_eu_denmark_251
-                if (TempProductType.Contains('_'))
-                {
-                    TempProductType = TempProductType.Substring(0, TempProductType.IndexOf('_'));
-                }
-
-                ProductType = TempProductType;
-                ProductCode = LumiaNormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode"); // 059Q9D7
-            }
-        }
-        public DelegateCommand AddFFUCommand { get; } = null;
-    }
-
-    internal enum DownloadStatus
-    {
-        Downloading,
-        Ready,
-        Failed
-    };
-
-    internal class DownloadEntry : INotifyPropertyChanged
-    {
-        private readonly SynchronizationContext UIContext;
-        public event PropertyChangedEventHandler PropertyChanged = delegate { };
-        internal Action<string[], object> Callback;
-        internal object State;
-        internal string URL;
-        internal string[] URLCollection;
-        internal string Folder;
-        internal HttpClient Client;
-        internal long SpeedIndex = -1;
-        internal long[] Speeds = new long[10];
-        internal long LastBytesReceived;
-        internal long BytesReceived;
-
-        internal DownloadEntry(string URL, string Folder, string[] URLCollection, Action<string[], object> Callback, object State)
-        {
-            UIContext = SynchronizationContext.Current;
-            this.URL = URL;
-            this.Callback = Callback;
-            this.State = State;
-            this.URLCollection = URLCollection;
-            this.Folder = Folder;
-            Directory.CreateDirectory(Folder);
-            Name = DownloadsViewModel.GetFileNameFromURL(URL);
-            Uri Uri = new(URL);
-            Status = DownloadStatus.Downloading;
-            new Thread(() =>
-            {
-                Size = DownloadsViewModel.GetFileLengthFromURL(URL);
-
-                Client = new HttpClient();
-                _ = Client.DownloadFileAsync(Uri, Path.Combine(Folder, DownloadsViewModel.GetFileNameFromURL(Uri.LocalPath)), Client_DownloadProgressChanged, Client_DownloadFileCompleted);
-            }).Start();
-        }
-
-        private void Client_DownloadFileCompleted(bool Error)
-        {
-            void Finish()
-            {
-                Status = Error ? DownloadStatus.Failed : DownloadStatus.Ready;
-                App.DownloadManager.DownloadList.Remove(this);
-                if (Status == DownloadStatus.Ready)
-                {
-                    if (URLCollection?.Any(c => App.DownloadManager.DownloadList.Any(d => d.URL == c)) != true) // if there are no files left to download from this collection, then call the callback-function.
-                    {
-                        string[] Files;
-                        if (URLCollection == null)
-                        {
-                            Files = new string[1];
-                            Files[0] = Path.Combine(Folder, DownloadsViewModel.GetFileNameFromURL(URL));
-                        }
-                        else
-                        {
-                            Files = new string[URLCollection.Length];
-                            for (int i = 0; i < URLCollection.Length; i++)
-                            {
-                                Files[i] = Path.Combine(Folder, DownloadsViewModel.GetFileNameFromURL(URLCollection[i]));
-                            }
-                        }
-
-                        Callback(Files, State);
-                    }
-                }
-            }
-
-            UIContext?.Post(d => Finish(), null);
-        }
-
-        private void Client_DownloadProgressChanged(HttpClientDownloadProgress e)
-        {
-            BytesReceived = e.BytesReceived;
-            Progress = e.ProgressPercentage;
-        }
-
-        protected void OnPropertyChanged(string propertyName)
-        {
-            if (this.PropertyChanged != null)
-            {
-                if (SynchronizationContext.Current == UIContext)
-                {
-                    PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-                }
-                else
-                {
-                    UIContext.Post((s) => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
-                }
-            }
-        }
-
-        private DownloadStatus _Status;
-        public DownloadStatus Status
-        {
-            get
-            {
-                return _Status;
-            }
-            set
-            {
-                if (_Status != value)
-                {
-                    _Status = value;
-                    OnPropertyChanged(nameof(Status));
-                }
-            }
-        }
-
-        private string _Name;
-        public string Name
-        {
-            get
-            {
-                return _Name;
-            }
-            set
-            {
-                if (_Name != value)
-                {
-                    _Name = value;
-                    OnPropertyChanged(nameof(Name));
-                }
-            }
-        }
-
-        private long _Size;
-        public long Size
-        {
-            get
-            {
-                return _Size;
-            }
-            set
-            {
-                if (_Size != value)
-                {
-                    _Size = value;
-                    OnPropertyChanged(nameof(Size));
-                }
-            }
-        }
-
-        private TimeSpan _TimeLeft;
-        public TimeSpan TimeLeft
-        {
-            get
-            {
-                return _TimeLeft;
-            }
-            set
-            {
-                if (_TimeLeft != value)
-                {
-                    _TimeLeft = value;
-                    OnPropertyChanged(nameof(TimeLeft));
-                }
-            }
-        }
-
-        private double _Speed;
-        public double Speed
-        {
-            get
-            {
-                return _Speed;
-            }
-            set
-            {
-                if (_Speed != value)
-                {
-                    _Speed = value;
-                    OnPropertyChanged(nameof(Speed));
-                }
-            }
-        }
-
-        private int _Progress;
-        public int Progress
-        {
-            get
-            {
-                return _Progress;
-            }
-            set
-            {
-                if (_Progress != value)
-                {
-                    _Progress = value;
-                    OnPropertyChanged(nameof(Progress));
-                }
-            }
-        }
-    }
-
-    internal class SearchResult : INotifyPropertyChanged
-    {
-        private readonly SynchronizationContext UIContext;
-        public event PropertyChangedEventHandler PropertyChanged;
-        internal string[] URLs;
-        internal Action<string[], object> Callback;
-        internal object State;
-        internal string Category;
-
-        internal SearchResult(string URL, string Category, Action<string[], object> Callback, object State)
-        {
-            UIContext = SynchronizationContext.Current;
-            URLs = new string[1];
-            URLs[0] = URL;
-            Name = DownloadsViewModel.GetFileNameFromURL(URL);
-            this.Callback = Callback;
-            this.State = State;
-            this.Category = Category;
-            GetSize();
-        }
-
-        internal SearchResult(string Name, string[] URLs, string Category, Action<string[], object> Callback, object State)
-        {
-            UIContext = SynchronizationContext.Current;
-            this.URLs = URLs;
-            this.Name = Name;
-            this.Callback = Callback;
-            this.State = State;
-            this.Category = Category;
-            GetSize();
-        }
-
-        private void GetSize()
-        {
-            new Thread(() =>
-            {
-                long CalcSize = 0;
-                foreach (string URL in URLs)
-                {
-                    CalcSize += DownloadsViewModel.GetFileLengthFromURL(URL);
-                }
-                Size = CalcSize;
-            }).Start();
-        }
-
-        protected void OnPropertyChanged(string propertyName)
-        {
-            if (this.PropertyChanged != null)
-            {
-                if (SynchronizationContext.Current == UIContext)
-                {
-                    PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-                }
-                else
-                {
-                    UIContext.Post((s) => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
-                }
-            }
-        }
-
-        private string _Name;
-        public string Name
-        {
-            get
-            {
-                return _Name;
-            }
-            set
-            {
-                if (_Name != value)
-                {
-                    _Name = value;
-                    OnPropertyChanged(nameof(Name));
-                }
-            }
-        }
-
-        private long _Size;
-        public long Size
-        {
-            get
-            {
-                return _Size;
-            }
-            set
-            {
-                if (_Size != value)
-                {
-                    _Size = value;
-                    OnPropertyChanged(nameof(Size));
-                }
-            }
-        }
-
-        private bool _IsSelected;
-        public bool IsSelected
-        {
-            get
-            {
-                return _IsSelected;
-            }
-            set
-            {
-                if (_IsSelected != value)
-                {
-                    _IsSelected = value;
-                    OnPropertyChanged(nameof(IsSelected));
-                }
-            }
-        }
-    }
-
-    public class HttpClientDownloadProgress
-    {
-        //
-        // Summary:
-        //     Gets the asynchronous task progress percentage.
-        //
-        // Returns:
-        //     A percentage value indicating the asynchronous task progress.
-        public int ProgressPercentage { get; }
-
-        //
-        // Summary:
-        //     Gets the number of bytes received.
-        //
-        // Returns:
-        //     An System.Int64 value that indicates the number of bytes received.
-        public long BytesReceived { get; }
-
-        //
-        // Summary:
-        //     Gets the total number of bytes in a System.Net.WebClient data download operation.
-        //
-        // Returns:
-        //     An System.Int64 value that indicates the number of bytes that will be received.
-        public long TotalBytesToReceive { get; }
-
-        internal HttpClientDownloadProgress(long BytesReceived, long TotalBytesToReceive)
-        {
-            this.TotalBytesToReceive = TotalBytesToReceive;
-            this.BytesReceived = BytesReceived;
-            ProgressPercentage = (int)Math.Round((float)BytesReceived / TotalBytesToReceive * 100f);
-        }
-    }
-
-    public static class HttpClientProgressExtensions
-    {
-        public static async Task DownloadFileAsync(this HttpClient client, Uri address, string fileName, Action<HttpClientDownloadProgress> progress = null, Action<bool> completed = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            try
-            {
-                using FileStream destination = File.Create(fileName);
-                using HttpResponseMessage response = await client.GetAsync(address, HttpCompletionOption.ResponseHeadersRead);
-                long? contentLength = response.Content.Headers.ContentLength;
-                using Stream download = await response.Content.ReadAsStreamAsync();
-
-                if (progress is null || !contentLength.HasValue)
-                {
-                    await download.CopyToAsync(destination);
-                    if (completed != null)
-                        completed(true);
-                    return;
-                }
-
-                Progress<long> progressWrapper = new Progress<long>(totalBytes => progress(new HttpClientDownloadProgress(totalBytes, contentLength.Value)));
-                await download.CopyToAsync(destination, 81920, progressWrapper, cancellationToken);
-
-                if (completed != null)
-                    completed(true);
-            }
-            catch
-            {
-                if (completed != null)
-                    completed(false);
-            }
-        }
-
-        private static async Task CopyToAsync(this Stream source, Stream destination, int bufferSize, IProgress<long> progress = null, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            if (bufferSize < 0)
-                throw new ArgumentOutOfRangeException(nameof(bufferSize));
-            if (source is null)
-                throw new ArgumentNullException(nameof(source));
-            if (!source.CanRead)
-                throw new InvalidOperationException($"'{nameof(source)}' is not readable.");
-            if (destination == null)
-                throw new ArgumentNullException(nameof(destination));
-            if (!destination.CanWrite)
-                throw new InvalidOperationException($"'{nameof(destination)}' is not writable.");
-
-            byte[] buffer = new byte[bufferSize];
-            long totalBytesRead = 0;
-            int bytesRead;
-            while ((bytesRead = await source.ReadAsync(buffer, 0, buffer.Length, cancellationToken).ConfigureAwait(false)) != 0)
-            {
-                await destination.WriteAsync(buffer, 0, bytesRead, cancellationToken).ConfigureAwait(false);
-                totalBytesRead += bytesRead;
-                progress?.Report(totalBytesRead);
-            }
-        }
-    }
-
-    public class DownloaderNameConvertor : IValueConverter
-    {
-        public object Convert(object value, Type targetType,
-                              object parameter, CultureInfo culture)
-        {
-            return Path.GetFileNameWithoutExtension((string)value);
-        }
-
-        public object ConvertBack(object value, Type targetType,
-                                  object parameter, CultureInfo culture)
-        {
-            return Binding.DoNothing;
-        }
-    }
-
-    public class DownloaderSizeConvertor : IValueConverter
-    {
-        public object Convert(object value, Type targetType,
-                              object parameter, CultureInfo culture)
-        {
-            long? Size = value as long?;
-            if (Size < 1024)
-            {
-                return Size + " B";
-            }
-
-            if (Size < (1024 * 1024))
-            {
-                return Math.Round((double)Size / 1024, 0) + " KB";
-            }
-
-            return Math.Round((double)Size / 1024 / 1024, 0) + " MB";
-        }
-
-        public object ConvertBack(object value, Type targetType,
-                                  object parameter, CultureInfo culture)
-        {
-            return Binding.DoNothing;
-        }
-    }
-
-    public class DownloaderSpeedConvertor : IValueConverter
-    {
-        public object Convert(object value, Type targetType,
-                              object parameter, CultureInfo culture)
-        {
-            return ((int)((double)value / 1024)).ToString() + " KB/s";
-        }
-
-        public object ConvertBack(object value, Type targetType,
-                                  object parameter, CultureInfo culture)
-        {
-            return Binding.DoNothing;
-        }
-    }
-
-    public class DownloaderTimeRemainingConvertor : IValueConverter
-    {
-        public object Convert(object value, Type targetType,
-                              object parameter, CultureInfo culture)
-        {
-            TimeSpan TimeLeft = (TimeSpan)value;
-            if (TimeLeft == Timeout.InfiniteTimeSpan)
-            {
-                return "";
-            }
-
-            return TimeLeft.ToString(@"h\:mm\:ss");
-        }
-
-        public object ConvertBack(object value, Type targetType,
-                                  object parameter, CultureInfo culture)
-        {
-            return Binding.DoNothing;
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace WPinternals
+{
+    internal class DownloadsViewModel : ContextViewModel
+    {
+        private readonly PhoneNotifierViewModel Notifier;
+        private readonly Timer SpeedTimer;
+        private bool IsSearching = false;
+
+        internal DownloadsViewModel(PhoneNotifierViewModel Notifier)
+        {
+            IsSwitchingInterface = false;
+            IsFlashModeOperation = false;
+            this.Notifier = Notifier;
+            Notifier.NewDeviceArrived += Notifier_NewDeviceArrived;
+
+            RegistryKey Key = Registry.CurrentUser.OpenSubKey(@"Software\WPInternals", true) ?? Registry.CurrentUser.CreateSubKey(@"Software\WPInternals");
+
+            DownloadFolder = (string)Key.GetValue("DownloadFolder", @"C:\ProgramData\WPinternals\Repository");
+            Key.Close();
+
+            SpeedTimer = new Timer(TimerCallback, this, TimeSpan.FromSeconds(1), TimeSpan.FromSeconds(1));
+
+            AddFFUCommand = new DelegateCommand(() =>
+            {
+                string FFUPath = null;
+
+                OpenFileDialog dlg = new();
+                dlg.DefaultExt = ".ffu"; // Default file extension
+                dlg.Filter = "ROM images (.ffu)|*.ffu"; // Filter files by extension 
+
+                bool? result = dlg.ShowDialog();
+
+                if (result == true)
+                {
+                    FFUPath = dlg.FileName;
+                    string FFUFile = Path.GetFileName(FFUPath);
+
+                    try
+                    {
+                        App.Config.AddFfuToRepository(FFUPath);
+                        App.Config.WriteConfig();
+                        LastStatusText = "File \"" + FFUFile + "\" was added to the repository.";
+                    }
+                    catch (WPinternalsException Ex)
+                    {
+                        LastStatusText = "Error: " + Ex.Message + ". File \"" + FFUFile + "\" was not added.";
+                    }
+                    catch
+                    {
+                        LastStatusText = "Error: File \"" + FFUFile + "\" was not added.";
+                    }
+                }
+                else
+                {
+                    LastStatusText = null;
+                }
+            });
+        }
+
+        private string _LastStatusText = null;
+        public string LastStatusText
+        {
+            get
+            {
+                return _LastStatusText;
+            }
+            set
+            {
+                _LastStatusText = value;
+                OnPropertyChanged(nameof(LastStatusText));
+            }
+        }
+
+        internal static void TimerCallback(object State)
+        {
+            foreach (DownloadEntry Entry in App.DownloadManager.DownloadList)
+            {
+                if (Entry.SpeedIndex >= 0)
+                {
+                    int ArrayIndex = (int)(Entry.SpeedIndex % 10);
+                    Entry.Speeds[ArrayIndex] = Entry.BytesReceived - Entry.LastBytesReceived;
+                    int Count = (int)((Entry.SpeedIndex + 1) > 10 ? 10 : (Entry.SpeedIndex + 1));
+                    long Sum = 0;
+                    for (int i = 0; i < Count; i++)
+                    {
+                        Sum += Entry.Speeds[i];
+                    }
+
+                    Entry.Speed = Sum / Count;
+                    Entry.TimeLeft = Entry.Speed < 1000 ? Timeout.InfiniteTimeSpan : TimeSpan.FromSeconds((Entry.Size - Entry.BytesReceived) / Entry.Speed);
+                }
+                Entry.LastBytesReceived = Entry.BytesReceived;
+                Entry.SpeedIndex++;
+            }
+        }
+
+        private void Notifier_NewDeviceArrived(ArrivalEventArgs Args)
+        {
+            EvaluateViewState();
+        }
+
+        internal static long GetFileLengthFromURL(string URL)
+        {
+            long Length = 0;
+            HttpWebRequest req = (HttpWebRequest)WebRequest.Create(URL);
+            req.Method = "HEAD";
+            req.ServicePoint.ConnectionLimit = 10;
+            using (WebResponse resp = req.GetResponse())
+            {
+                long.TryParse(resp.Headers.Get("Content-Length"), out Length);
+            }
+            return Length;
+        }
+
+        internal static string GetFileNameFromURL(string URL)
+        {
+            string FileName = Path.GetFileName(URL);
+            int End = FileName.IndexOf('?');
+            if (End >= 0)
+            {
+                FileName = FileName.Substring(0, End);
+            }
+
+            return FileName;
+        }
+
+        private void Search()
+        {
+            if (IsSearching)
+            {
+                return;
+            }
+
+            IsSearching = true;
+
+            SynchronizationContext UIContext = SynchronizationContext.Current;
+            SearchResultList.Clear();
+
+            new Thread(() =>
+            {
+                string FFUURL = null;
+                string[] EmergencyURLs = null;
+                try
+                {
+                    string TempProductType = ProductType.ToUpper();
+                    if ((TempProductType?.StartsWith("RM") == true) && !TempProductType.StartsWith("RM-"))
+                    {
+                        TempProductType = "RM-" + TempProductType[2..];
+                    }
+
+                    ProductType = TempProductType;
+                    FFUURL = LumiaDownloadModel.SearchFFU(ProductType, ProductCode, OperatorCode, out TempProductType);
+                    if (TempProductType != null)
+                    {
+                        ProductType = TempProductType;
+                    }
+
+                    if (ProductType != null)
+                    {
+                        EmergencyURLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
+                    }
+                }
+                catch { }
+
+                UIContext.Post(s =>
+                {
+                    if (FFUURL != null)
+                    {
+                        SearchResultList.Add(new SearchResult(FFUURL, ProductType, FFUDownloaded, null));
+                    }
+
+                    if (EmergencyURLs != null)
+                    {
+                        SearchResultList.Add(new SearchResult(ProductType + " emergency-files", EmergencyURLs, ProductType, EmergencyDownloaded, ProductType));
+                    }
+                }, null);
+
+                IsSearching = false;
+            }).Start();
+        }
+
+        internal void Download(string URL, string Category, Action<string[], object> Callback, object State = null)
+        {
+            string Folder = Category == null ? DownloadFolder : Path.Combine(DownloadFolder, Category);
+            DownloadList.Add(new DownloadEntry(URL, Folder, null, Callback, State));
+        }
+
+        internal void Download(string[] URLs, string Category, Action<string[], object> Callback, object State = null)
+        {
+            string Folder = Category == null ? DownloadFolder : Path.Combine(DownloadFolder, Category);
+            foreach (string URL in URLs)
+            {
+                DownloadList.Add(new DownloadEntry(URL, Folder, URLs, Callback, State));
+            }
+        }
+
+        private void DownloadAll()
+        {
+            SynchronizationContext UIContext = SynchronizationContext.Current;
+
+            new Thread(() =>
+            {
+                string FFUURL = null;
+                string[] EmergencyURLs = null;
+                try
+                {
+                    string TempProductType = ProductType.ToUpper();
+                    if ((TempProductType?.StartsWith("RM") == true) && !TempProductType.StartsWith("RM-"))
+                    {
+                        TempProductType = "RM-" + TempProductType[2..];
+                    }
+
+                    ProductType = TempProductType;
+                    FFUURL = LumiaDownloadModel.SearchFFU(ProductType, ProductCode, OperatorCode, out TempProductType);
+                    if (TempProductType != null)
+                    {
+                        ProductType = TempProductType;
+                    }
+
+                    if (ProductType != null)
+                    {
+                        EmergencyURLs = LumiaDownloadModel.SearchEmergencyFiles(ProductType);
+                    }
+                }
+                catch { }
+
+                UIContext.Post(s =>
+                {
+                    if (FFUURL != null)
+                    {
+                        Download(FFUURL, ProductType, FFUDownloadedAndCheckSupported, null);
+                    }
+
+                    if (EmergencyURLs != null)
+                    {
+                        Download(EmergencyURLs, ProductType, EmergencyDownloaded, ProductType);
+                    }
+                }, null);
+            }).Start();
+        }
+
+        private void DownloadSelected()
+        {
+            foreach (SearchResult Result in SearchResultList.Where(r => r.IsSelected))
+            {
+                App.DownloadManager.Download(Result.URLs, Result.Category, Result.Callback, Result.State);
+            }
+        }
+
+        private void FFUDownloaded(string[] Files, object State)
+        {
+            App.Config.AddFfuToRepository(Files[0]);
+        }
+
+        private void FFUDownloadedAndCheckSupported(string[] Files, object State)
+        {
+            App.Config.AddFfuToRepository(Files[0]);
+
+            if (!App.Config.FFURepository.Any(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+            {
+                const string ProductType2 = "RM-1085";
+                string URL = LumiaDownloadModel.SearchFFU(ProductType2, null, null);
+                Download(URL, ProductType2, FFUDownloaded, null);
+            }
+        }
+
+        private void EmergencyDownloaded(string[] Files, object State)
+        {
+            string Type = (string)State;
+            string ProgrammerPath = null;
+            string PayloadPath = null;
+
+            for (int i = 0; i < Files.Length; i++)
+            {
+                if (Files[i].EndsWith(".ede", StringComparison.OrdinalIgnoreCase))
+                {
+                    ProgrammerPath = Files[i];
+                }
+
+                if (Files[i].EndsWith(".edp", StringComparison.OrdinalIgnoreCase))
+                {
+                    PayloadPath = Files[i];
+                }
+            }
+
+            if ((Type != null) && (ProgrammerPath != null) && (PayloadPath != null))
+            {
+                App.Config.AddEmergencyToRepository(Type, ProgrammerPath, PayloadPath);
+            }
+        }
+        public ObservableCollection<DownloadEntry> DownloadList { get; } = new();
+        public ObservableCollection<SearchResult> SearchResultList { get; } = new();
+
+        private DelegateCommand _DownloadSelectedCommand = null;
+        public DelegateCommand DownloadSelectedCommand
+        {
+            get
+            {
+                return _DownloadSelectedCommand ??= new DelegateCommand(() => DownloadSelected());
+            }
+        }
+
+        private DelegateCommand _SearchCommand = null;
+        public DelegateCommand SearchCommand
+        {
+            get
+            {
+                return _SearchCommand ??= new DelegateCommand(() => Search());
+            }
+        }
+
+        private DelegateCommand _DownloadAllCommand = null;
+        public DelegateCommand DownloadAllCommand
+        {
+            get
+            {
+                return _DownloadAllCommand ??= new DelegateCommand(() => DownloadAll());
+            }
+        }
+
+        private string _DownloadFolder = null;
+        public string DownloadFolder
+        {
+            get
+            {
+                return _DownloadFolder;
+            }
+            set
+            {
+                if (_DownloadFolder != value)
+                {
+                    _DownloadFolder = value;
+
+                    try
+                    {
+                        Directory.CreateDirectory(_DownloadFolder);
+                    }
+                    catch { }
+                    if (!Directory.Exists(_DownloadFolder))
+                    {
+                        _DownloadFolder = @"C:\ProgramData\WPinternals\Repository";
+                        Directory.CreateDirectory(_DownloadFolder);
+                    }
+
+                    RegistryKey Key = Registry.CurrentUser.OpenSubKey(@"Software\WPInternals", true);
+
+                    if (_DownloadFolder == null)
+                    {
+                        if (Key.GetValue("DownloadFolder") != null)
+                        {
+                            Key.DeleteValue("DownloadFolder");
+                        }
+                    }
+                    else
+                    {
+                        Key.SetValue("DownloadFolder", _DownloadFolder);
+                    }
+
+                    Key.Close();
+
+                    OnPropertyChanged(nameof(DownloadFolder));
+                }
+            }
+        }
+
+        private string _ProductCode = null;
+        public string ProductCode
+        {
+            get
+            {
+                return _ProductCode;
+            }
+            set
+            {
+                if (_ProductCode != value)
+                {
+                    _ProductCode = value;
+
+                    OnPropertyChanged(nameof(ProductCode));
+                }
+            }
+        }
+
+        private string _ProductType = null;
+        public string ProductType
+        {
+            get
+            {
+                return _ProductType;
+            }
+            set
+            {
+                if (_ProductType != value)
+                {
+                    _ProductType = value;
+
+                    OnPropertyChanged(nameof(ProductType));
+                }
+            }
+        }
+
+        private string _OperatorCode = null;
+        public string OperatorCode
+        {
+            get
+            {
+                return _OperatorCode;
+            }
+            set
+            {
+                if (_OperatorCode != value)
+                {
+                    _OperatorCode = value;
+
+                    OnPropertyChanged(nameof(OperatorCode));
+                }
+            }
+        }
+
+        internal override void EvaluateViewState()
+        {
+            if (!IsActive)
+            {
+                return;
+            }
+
+            if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Flash)
+            {
+                NokiaFlashModel LumiaFlashModel = (NokiaFlashModel)Notifier.CurrentModel;
+                PhoneInfo Info = LumiaFlashModel.ReadPhoneInfo();
+                ProductType = Info.Type;
+                OperatorCode = "";
+                ProductCode = Info.ProductCode;
+            }
+            else if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_Normal)
+            {
+                NokiaPhoneModel LumiaNormalModel = (NokiaPhoneModel)Notifier.CurrentModel;
+                OperatorCode = LumiaNormalModel.ExecuteJsonMethodAsString("ReadOperatorName", "OperatorName"); // Example: 000-NL
+                string TempProductType = LumiaNormalModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName"); // RM-821_eu_denmark_251
+                if (TempProductType.Contains('_'))
+                {
+                    TempProductType = TempProductType.Substring(0, TempProductType.IndexOf('_'));
+                }
+
+                ProductType = TempProductType;
+                ProductCode = LumiaNormalModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode"); // 059Q9D7
+            }
+        }
+        public DelegateCommand AddFFUCommand { get; } = null;
+    }
+
+    internal enum DownloadStatus
+    {
+        Downloading,
+        Ready,
+        Failed
+    };
+
+    internal class DownloadEntry : INotifyPropertyChanged
+    {
+        private readonly SynchronizationContext UIContext;
+        public event PropertyChangedEventHandler PropertyChanged = delegate { };
+        internal Action<string[], object> Callback;
+        internal object State;
+        internal string URL;
+        internal string[] URLCollection;
+        internal string Folder;
+        internal HttpClient Client;
+        internal long SpeedIndex = -1;
+        internal long[] Speeds = new long[10];
+        internal long LastBytesReceived;
+        internal long BytesReceived;
+
+        internal DownloadEntry(string URL, string Folder, string[] URLCollection, Action<string[], object> Callback, object State)
+        {
+            UIContext = SynchronizationContext.Current;
+            this.URL = URL;
+            this.Callback = Callback;
+            this.State = State;
+            this.URLCollection = URLCollection;
+            this.Folder = Folder;
+            Directory.CreateDirectory(Folder);
+            Name = DownloadsViewModel.GetFileNameFromURL(URL);
+            Uri Uri = new(URL);
+            Status = DownloadStatus.Downloading;
+            new Thread(() =>
+            {
+                Size = DownloadsViewModel.GetFileLengthFromURL(URL);
+
+                Client = new HttpClient();
+                _ = Client.DownloadFileAsync(Uri, Path.Combine(Folder, DownloadsViewModel.GetFileNameFromURL(Uri.LocalPath)), Client_DownloadProgressChanged, Client_DownloadFileCompleted);
+            }).Start();
+        }
+
+        private void Client_DownloadFileCompleted(bool Error)
+        {
+            void Finish()
+            {
+                Status = Error ? DownloadStatus.Failed : DownloadStatus.Ready;
+                App.DownloadManager.DownloadList.Remove(this);
+                if (Status == DownloadStatus.Ready)
+                {
+                    if (URLCollection?.Any(c => App.DownloadManager.DownloadList.Any(d => d.URL == c)) != true) // if there are no files left to download from this collection, then call the callback-function.
+                    {
+                        string[] Files;
+                        if (URLCollection == null)
+                        {
+                            Files = new string[1];
+                            Files[0] = Path.Combine(Folder, DownloadsViewModel.GetFileNameFromURL(URL));
+                        }
+                        else
+                        {
+                            Files = new string[URLCollection.Length];
+                            for (int i = 0; i < URLCollection.Length; i++)
+                            {
+                                Files[i] = Path.Combine(Folder, DownloadsViewModel.GetFileNameFromURL(URLCollection[i]));
+                            }
+                        }
+
+                        Callback(Files, State);
+                    }
+                }
+            }
+
+            UIContext?.Post(d => Finish(), null);
+        }
+
+        private void Client_DownloadProgressChanged(HttpClientDownloadProgress e)
+        {
+            BytesReceived = e.BytesReceived;
+            Progress = e.ProgressPercentage;
+        }
+
+        protected void OnPropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+            {
+                if (SynchronizationContext.Current == UIContext)
+                {
+                    PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
+                else
+                {
+                    UIContext.Post((s) => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
+                }
+            }
+        }
+
+        private DownloadStatus _Status;
+        public DownloadStatus Status
+        {
+            get
+            {
+                return _Status;
+            }
+            set
+            {
+                if (_Status != value)
+                {
+                    _Status = value;
+                    OnPropertyChanged(nameof(Status));
+                }
+            }
+        }
+
+        private string _Name;
+        public string Name
+        {
+            get
+            {
+                return _Name;
+            }
+            set
+            {
+                if (_Name != value)
+                {
+                    _Name = value;
+                    OnPropertyChanged(nameof(Name));
+                }
+            }
+        }
+
+        private long _Size;
+        public long Size
+        {
+            get
+            {
+                return _Size;
+            }
+            set
+            {
+                if (_Size != value)
+                {
+                    _Size = value;
+                    OnPropertyChanged(nameof(Size));
+                }
+            }
+        }
+
+        private TimeSpan _TimeLeft;
+        public TimeSpan TimeLeft
+        {
+            get
+            {
+                return _TimeLeft;
+            }
+            set
+            {
+                if (_TimeLeft != value)
+                {
+                    _TimeLeft = value;
+                    OnPropertyChanged(nameof(TimeLeft));
+                }
+            }
+        }
+
+        private double _Speed;
+        public double Speed
+        {
+            get
+            {
+                return _Speed;
+            }
+            set
+            {
+                if (_Speed != value)
+                {
+                    _Speed = value;
+                    OnPropertyChanged(nameof(Speed));
+                }
+            }
+        }
+
+        private int _Progress;
+        public int Progress
+        {
+            get
+            {
+                return _Progress;
+            }
+            set
+            {
+                if (_Progress != value)
+                {
+                    _Progress = value;
+                    OnPropertyChanged(nameof(Progress));
+                }
+            }
+        }
+    }
+
+    internal class SearchResult : INotifyPropertyChanged
+    {
+        private readonly SynchronizationContext UIContext;
+        public event PropertyChangedEventHandler PropertyChanged;
+        internal string[] URLs;
+        internal Action<string[], object> Callback;
+        internal object State;
+        internal string Category;
+
+        internal SearchResult(string URL, string Category, Action<string[], object> Callback, object State)
+        {
+            UIContext = SynchronizationContext.Current;
+            URLs = new string[1];
+            URLs[0] = URL;
+            Name = DownloadsViewModel.GetFileNameFromURL(URL);
+            this.Callback = Callback;
+            this.State = State;
+            this.Category = Category;
+            GetSize();
+        }
+
+        internal SearchResult(string Name, string[] URLs, string Category, Action<string[], object> Callback, object State)
+        {
+            UIContext = SynchronizationContext.Current;
+            this.URLs = URLs;
+            this.Name = Name;
+            this.Callback = Callback;
+            this.State = State;
+            this.Category = Category;
+            GetSize();
+        }
+
+        private void GetSize()
+        {
+            new Thread(() =>
+            {
+                long CalcSize = 0;
+                foreach (string URL in URLs)
+                {
+                    CalcSize += DownloadsViewModel.GetFileLengthFromURL(URL);
+                }
+                Size = CalcSize;
+            }).Start();
+        }
+
+        protected void OnPropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+            {
+                if (SynchronizationContext.Current == UIContext)
+                {
+                    PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
+                else
+                {
+                    UIContext.Post((s) => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
+                }
+            }
+        }
+
+        private string _Name;
+        public string Name
+        {
+            get
+            {
+                return _Name;
+            }
+            set
+            {
+                if (_Name != value)
+                {
+                    _Name = value;
+                    OnPropertyChanged(nameof(Name));
+                }
+            }
+        }
+
+        private long _Size;
+        public long Size
+        {
+            get
+            {
+                return _Size;
+            }
+            set
+            {
+                if (_Size != value)
+                {
+                    _Size = value;
+                    OnPropertyChanged(nameof(Size));
+                }
+            }
+        }
+
+        private bool _IsSelected;
+        public bool IsSelected
+        {
+            get
+            {
+                return _IsSelected;
+            }
+            set
+            {
+                if (_IsSelected != value)
+                {
+                    _IsSelected = value;
+                    OnPropertyChanged(nameof(IsSelected));
+                }
+            }
+        }
+    }
+
+    public class HttpClientDownloadProgress
+    {
+        //
+        // Summary:
+        //     Gets the asynchronous task progress percentage.
+        //
+        // Returns:
+        //     A percentage value indicating the asynchronous task progress.
+        public int ProgressPercentage { get; }
+
+        //
+        // Summary:
+        //     Gets the number of bytes received.
+        //
+        // Returns:
+        //     An System.Int64 value that indicates the number of bytes received.
+        public long BytesReceived { get; }
+
+        //
+        // Summary:
+        //     Gets the total number of bytes in a System.Net.WebClient data download operation.
+        //
+        // Returns:
+        //     An System.Int64 value that indicates the number of bytes that will be received.
+        public long TotalBytesToReceive { get; }
+
+        internal HttpClientDownloadProgress(long BytesReceived, long TotalBytesToReceive)
+        {
+            this.TotalBytesToReceive = TotalBytesToReceive;
+            this.BytesReceived = BytesReceived;
+            ProgressPercentage = (int)Math.Round((float)BytesReceived / TotalBytesToReceive * 100f);
+        }
+    }
+
+    public static class HttpClientProgressExtensions
+    {
+        public static async Task DownloadFileAsync(this HttpClient client, Uri address, string fileName, Action<HttpClientDownloadProgress> progress = null, Action<bool> completed = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            try
+            {
+                using FileStream destination = File.Create(fileName);
+                using HttpResponseMessage response = await client.GetAsync(address, HttpCompletionOption.ResponseHeadersRead);
+                long? contentLength = response.Content.Headers.ContentLength;
+                using Stream download = await response.Content.ReadAsStreamAsync();
+
+                if (progress is null || !contentLength.HasValue)
+                {
+                    await download.CopyToAsync(destination);
+                    if (completed != null)
+                        completed(true);
+                    return;
+                }
+
+                Progress<long> progressWrapper = new Progress<long>(totalBytes => progress(new HttpClientDownloadProgress(totalBytes, contentLength.Value)));
+                await download.CopyToAsync(destination, 81920, progressWrapper, cancellationToken);
+
+                if (completed != null)
+                    completed(true);
+            }
+            catch
+            {
+                if (completed != null)
+                    completed(false);
+            }
+        }
+
+        private static async Task CopyToAsync(this Stream source, Stream destination, int bufferSize, IProgress<long> progress = null, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (bufferSize < 0)
+                throw new ArgumentOutOfRangeException(nameof(bufferSize));
+            if (source is null)
+                throw new ArgumentNullException(nameof(source));
+            if (!source.CanRead)
+                throw new InvalidOperationException($"'{nameof(source)}' is not readable.");
+            if (destination == null)
+                throw new ArgumentNullException(nameof(destination));
+            if (!destination.CanWrite)
+                throw new InvalidOperationException($"'{nameof(destination)}' is not writable.");
+
+            byte[] buffer = new byte[bufferSize];
+            long totalBytesRead = 0;
+            int bytesRead;
+            while ((bytesRead = await source.ReadAsync(buffer, 0, buffer.Length, cancellationToken).ConfigureAwait(false)) != 0)
+            {
+                await destination.WriteAsync(buffer, 0, bytesRead, cancellationToken).ConfigureAwait(false);
+                totalBytesRead += bytesRead;
+                progress?.Report(totalBytesRead);
+            }
+        }
+    }
+
+    public class DownloaderNameConvertor : IValueConverter
+    {
+        public object Convert(object value, Type targetType,
+                              object parameter, CultureInfo culture)
+        {
+            return Path.GetFileNameWithoutExtension((string)value);
+        }
+
+        public object ConvertBack(object value, Type targetType,
+                                  object parameter, CultureInfo culture)
+        {
+            return Binding.DoNothing;
+        }
+    }
+
+    public class DownloaderSizeConvertor : IValueConverter
+    {
+        public object Convert(object value, Type targetType,
+                              object parameter, CultureInfo culture)
+        {
+            long? Size = value as long?;
+            if (Size < 1024)
+            {
+                return Size + " B";
+            }
+
+            if (Size < (1024 * 1024))
+            {
+                return Math.Round((double)Size / 1024, 0) + " KB";
+            }
+
+            return Math.Round((double)Size / 1024 / 1024, 0) + " MB";
+        }
+
+        public object ConvertBack(object value, Type targetType,
+                                  object parameter, CultureInfo culture)
+        {
+            return Binding.DoNothing;
+        }
+    }
+
+    public class DownloaderSpeedConvertor : IValueConverter
+    {
+        public object Convert(object value, Type targetType,
+                              object parameter, CultureInfo culture)
+        {
+            return ((int)((double)value / 1024)).ToString() + " KB/s";
+        }
+
+        public object ConvertBack(object value, Type targetType,
+                                  object parameter, CultureInfo culture)
+        {
+            return Binding.DoNothing;
+        }
+    }
+
+    public class DownloaderTimeRemainingConvertor : IValueConverter
+    {
+        public object Convert(object value, Type targetType,
+                              object parameter, CultureInfo culture)
+        {
+            TimeSpan TimeLeft = (TimeSpan)value;
+            if (TimeLeft == Timeout.InfiniteTimeSpan)
+            {
+                return "";
+            }
+
+            return TimeLeft.ToString(@"h\:mm\:ss");
+        }
+
+        public object ConvertBack(object value, Type targetType,
+                                  object parameter, CultureInfo culture)
+        {
+            return Binding.DoNothing;
+        }
+    }
+}
diff --git a/ViewModels/DumpRomTargetSelectionViewModel.cs b/WPinternals/ViewModels/DumpRomTargetSelectionViewModel.cs
similarity index 96%
rename from ViewModels/DumpRomTargetSelectionViewModel.cs
rename to WPinternals/ViewModels/DumpRomTargetSelectionViewModel.cs
index 6a8d960..aa0a0c5 100644
--- a/ViewModels/DumpRomTargetSelectionViewModel.cs
+++ b/WPinternals/ViewModels/DumpRomTargetSelectionViewModel.cs
@@ -1,228 +1,228 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal class DumpRomTargetSelectionViewModel : ContextViewModel
-    {
-        private readonly Action<string, string, bool, string, bool, string, bool> DumpCallback;
-        internal Action SwitchToUnlockBoot;
-        internal Action SwitchToUnlockRoot;
-        internal Action SwitchToFlashRom;
-
-        internal DumpRomTargetSelectionViewModel(Action SwitchToUnlockBoot, Action SwitchToUnlockRoot, Action SwitchToFlashRom, Action<string, string, bool, string, bool, string, bool> DumpCallback)
-            : base()
-        {
-            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
-            this.SwitchToUnlockRoot = SwitchToUnlockRoot;
-            this.SwitchToFlashRom = SwitchToFlashRom;
-            this.DumpCallback = DumpCallback;
-
-            new Thread(() => EvaluateViewState()).Start();
-        }
-
-        private string _FFUPath;
-        public string FFUPath
-        {
-            get
-            {
-                return _FFUPath;
-            }
-            set
-            {
-                if (value != _FFUPath)
-                {
-                    _FFUPath = value;
-                    OnPropertyChanged(nameof(FFUPath));
-                }
-            }
-        }
-
-        private string _EFIESPPath;
-        public string EFIESPPath
-        {
-            get
-            {
-                return _EFIESPPath;
-            }
-            set
-            {
-                if (value != _EFIESPPath)
-                {
-                    _EFIESPPath = value;
-                    OnPropertyChanged(nameof(EFIESPPath));
-                }
-            }
-        }
-
-        private bool _CompressEFIESP;
-        public bool CompressEFIESP
-        {
-            get
-            {
-                return _CompressEFIESP;
-            }
-            set
-            {
-                if (value != _CompressEFIESP)
-                {
-                    _CompressEFIESP = value;
-                    OnPropertyChanged(nameof(CompressEFIESP));
-                }
-            }
-        }
-
-        private string _MainOSPath;
-        public string MainOSPath
-        {
-            get
-            {
-                return _MainOSPath;
-            }
-            set
-            {
-                if (value != _MainOSPath)
-                {
-                    _MainOSPath = value;
-                    OnPropertyChanged(nameof(MainOSPath));
-                }
-            }
-        }
-
-        private bool _CompressMainOS;
-        public bool CompressMainOS
-        {
-            get
-            {
-                return _CompressMainOS;
-            }
-            set
-            {
-                if (value != _CompressMainOS)
-                {
-                    _CompressMainOS = value;
-                    OnPropertyChanged(nameof(CompressMainOS));
-                }
-            }
-        }
-
-        private string _DataPath;
-        public string DataPath
-        {
-            get
-            {
-                return _DataPath;
-            }
-            set
-            {
-                if (value != _DataPath)
-                {
-                    _DataPath = value;
-                    OnPropertyChanged(nameof(DataPath));
-                }
-            }
-        }
-
-        private bool _CompressData = true;
-        public bool CompressData
-        {
-            get
-            {
-                return _CompressData;
-            }
-            set
-            {
-                if (value != _CompressData)
-                {
-                    _CompressData = value;
-                    OnPropertyChanged(nameof(CompressData));
-                }
-            }
-        }
-
-        private bool _IsPhoneDisconnected;
-        public bool IsPhoneDisconnected
-        {
-            get
-            {
-                return _IsPhoneDisconnected;
-            }
-            set
-            {
-                if (value != _IsPhoneDisconnected)
-                {
-                    _IsPhoneDisconnected = value;
-                    OnPropertyChanged(nameof(IsPhoneDisconnected));
-                }
-            }
-        }
-
-        private bool _IsPhoneInMassStorage;
-        public bool IsPhoneInMassStorage
-        {
-            get
-            {
-                return _IsPhoneInMassStorage;
-            }
-            set
-            {
-                if (value != _IsPhoneInMassStorage)
-                {
-                    _IsPhoneInMassStorage = value;
-                    OnPropertyChanged(nameof(IsPhoneInMassStorage));
-                }
-            }
-        }
-
-        private bool _IsPhoneInOtherMode;
-        public bool IsPhoneInOtherMode
-        {
-            get
-            {
-                return _IsPhoneInOtherMode;
-            }
-            set
-            {
-                if (value != _IsPhoneInOtherMode)
-                {
-                    _IsPhoneInOtherMode = value;
-                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
-                }
-            }
-        }
-
-        private DelegateCommand _DumpCommand;
-        public DelegateCommand DumpCommand
-        {
-            get
-            {
-                return _DumpCommand ??= new DelegateCommand(() => DumpCallback(FFUPath, EFIESPPath, CompressEFIESP, MainOSPath, CompressMainOS, DataPath, CompressData), () => (FFUPath != null) && ((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)));
-            }
-        }
-
-        internal override void EvaluateViewState()
-        {
-            DumpCommand.RaiseCanExecuteChanged();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal class DumpRomTargetSelectionViewModel : ContextViewModel
+    {
+        private readonly Action<string, string, bool, string, bool, string, bool> DumpCallback;
+        internal Action SwitchToUnlockBoot;
+        internal Action SwitchToUnlockRoot;
+        internal Action SwitchToFlashRom;
+
+        internal DumpRomTargetSelectionViewModel(Action SwitchToUnlockBoot, Action SwitchToUnlockRoot, Action SwitchToFlashRom, Action<string, string, bool, string, bool, string, bool> DumpCallback)
+            : base()
+        {
+            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
+            this.SwitchToUnlockRoot = SwitchToUnlockRoot;
+            this.SwitchToFlashRom = SwitchToFlashRom;
+            this.DumpCallback = DumpCallback;
+
+            new Thread(() => EvaluateViewState()).Start();
+        }
+
+        private string _FFUPath;
+        public string FFUPath
+        {
+            get
+            {
+                return _FFUPath;
+            }
+            set
+            {
+                if (value != _FFUPath)
+                {
+                    _FFUPath = value;
+                    OnPropertyChanged(nameof(FFUPath));
+                }
+            }
+        }
+
+        private string _EFIESPPath;
+        public string EFIESPPath
+        {
+            get
+            {
+                return _EFIESPPath;
+            }
+            set
+            {
+                if (value != _EFIESPPath)
+                {
+                    _EFIESPPath = value;
+                    OnPropertyChanged(nameof(EFIESPPath));
+                }
+            }
+        }
+
+        private bool _CompressEFIESP;
+        public bool CompressEFIESP
+        {
+            get
+            {
+                return _CompressEFIESP;
+            }
+            set
+            {
+                if (value != _CompressEFIESP)
+                {
+                    _CompressEFIESP = value;
+                    OnPropertyChanged(nameof(CompressEFIESP));
+                }
+            }
+        }
+
+        private string _MainOSPath;
+        public string MainOSPath
+        {
+            get
+            {
+                return _MainOSPath;
+            }
+            set
+            {
+                if (value != _MainOSPath)
+                {
+                    _MainOSPath = value;
+                    OnPropertyChanged(nameof(MainOSPath));
+                }
+            }
+        }
+
+        private bool _CompressMainOS;
+        public bool CompressMainOS
+        {
+            get
+            {
+                return _CompressMainOS;
+            }
+            set
+            {
+                if (value != _CompressMainOS)
+                {
+                    _CompressMainOS = value;
+                    OnPropertyChanged(nameof(CompressMainOS));
+                }
+            }
+        }
+
+        private string _DataPath;
+        public string DataPath
+        {
+            get
+            {
+                return _DataPath;
+            }
+            set
+            {
+                if (value != _DataPath)
+                {
+                    _DataPath = value;
+                    OnPropertyChanged(nameof(DataPath));
+                }
+            }
+        }
+
+        private bool _CompressData = true;
+        public bool CompressData
+        {
+            get
+            {
+                return _CompressData;
+            }
+            set
+            {
+                if (value != _CompressData)
+                {
+                    _CompressData = value;
+                    OnPropertyChanged(nameof(CompressData));
+                }
+            }
+        }
+
+        private bool _IsPhoneDisconnected;
+        public bool IsPhoneDisconnected
+        {
+            get
+            {
+                return _IsPhoneDisconnected;
+            }
+            set
+            {
+                if (value != _IsPhoneDisconnected)
+                {
+                    _IsPhoneDisconnected = value;
+                    OnPropertyChanged(nameof(IsPhoneDisconnected));
+                }
+            }
+        }
+
+        private bool _IsPhoneInMassStorage;
+        public bool IsPhoneInMassStorage
+        {
+            get
+            {
+                return _IsPhoneInMassStorage;
+            }
+            set
+            {
+                if (value != _IsPhoneInMassStorage)
+                {
+                    _IsPhoneInMassStorage = value;
+                    OnPropertyChanged(nameof(IsPhoneInMassStorage));
+                }
+            }
+        }
+
+        private bool _IsPhoneInOtherMode;
+        public bool IsPhoneInOtherMode
+        {
+            get
+            {
+                return _IsPhoneInOtherMode;
+            }
+            set
+            {
+                if (value != _IsPhoneInOtherMode)
+                {
+                    _IsPhoneInOtherMode = value;
+                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
+                }
+            }
+        }
+
+        private DelegateCommand _DumpCommand;
+        public DelegateCommand DumpCommand
+        {
+            get
+            {
+                return _DumpCommand ??= new DelegateCommand(() => DumpCallback(FFUPath, EFIESPPath, CompressEFIESP, MainOSPath, CompressMainOS, DataPath, CompressData), () => (FFUPath != null) && ((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)));
+            }
+        }
+
+        internal override void EvaluateViewState()
+        {
+            DumpCommand.RaiseCanExecuteChanged();
+        }
+    }
+}
diff --git a/ViewModels/DumpRomViewModel.cs b/WPinternals/ViewModels/DumpRomViewModel.cs
similarity index 97%
rename from ViewModels/DumpRomViewModel.cs
rename to WPinternals/ViewModels/DumpRomViewModel.cs
index d4319bd..7ba6c40 100644
--- a/ViewModels/DumpRomViewModel.cs
+++ b/WPinternals/ViewModels/DumpRomViewModel.cs
@@ -1,173 +1,173 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Linq;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal class DumpRomViewModel : ContextViewModel
-    {
-        private readonly Action SwitchToUnlockBoot;
-        private readonly Action SwitchToUnlockRoot;
-        private readonly Action SwitchToFlashRom;
-
-        internal DumpRomViewModel(Action SwitchToUnlockBoot, Action SwitchToUnlockRoot, Action SwitchToFlashRom)
-            : base()
-        {
-            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
-            this.SwitchToUnlockRoot = SwitchToUnlockRoot;
-            this.SwitchToFlashRom = SwitchToFlashRom;
-        }
-
-        internal override void EvaluateViewState()
-        {
-            if (!IsActive)
-            {
-                return;
-            }
-
-            if (SubContextViewModel == null)
-            {
-                ActivateSubContext(new DumpRomTargetSelectionViewModel(SwitchToUnlockBoot, SwitchToUnlockRoot, SwitchToFlashRom, DoDumpRom));
-            }
-        }
-
-        internal void DoDumpRom(string FFUPath, string EFIESPPath, bool CompressEFIESP, string MainOSPath, bool CompressMainOS, string DataPath, bool CompressData)
-        {
-            new Thread(() =>
-                {
-                    bool Result = true;
-
-                    ActivateSubContext(new BusyViewModel("Initializing ROM dump..."));
-
-                    ulong TotalSizeSectors = 0;
-                    int PartitionCount = 0;
-                    Partition Partition;
-                    FFU FFU = null;
-                    try
-                    {
-                        FFU = new FFU(FFUPath);
-
-                        if (EFIESPPath != null)
-                        {
-                            Partition = FFU.GPT.Partitions.First(p => p.Name == "EFIESP");
-                            TotalSizeSectors += Partition.SizeInSectors;
-                            PartitionCount++;
-                        }
-
-                        if (MainOSPath != null)
-                        {
-                            Partition = FFU.GPT.Partitions.First(p => p.Name == "MainOS");
-                            TotalSizeSectors += Partition.SizeInSectors;
-                            PartitionCount++;
-                        }
-
-                        if (DataPath != null)
-                        {
-                            Partition = FFU.GPT.Partitions.First(p => p.Name == "Data");
-                            TotalSizeSectors += Partition.SizeInSectors;
-                            PartitionCount++;
-                        }
-                    }
-                    catch (Exception Ex)
-                    {
-                        LogFile.LogException(Ex);
-                        Result = false;
-                    }
-
-                    // We are on a worker thread!
-                    // So we must pass the SynchronizationContext of the UI thread
-                    BusyViewModel Busy = new("Dumping ROM...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
-                    ProgressUpdater Updater = Busy.ProgressUpdater;
-                    ActivateSubContext(Busy);
-
-                    int i = 0;
-                    if (Result)
-                    {
-                        try
-                        {
-                            if (EFIESPPath != null)
-                            {
-                                i++;
-                                Busy.Message = "Dumping partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                FFU.WritePartition("EFIESP", EFIESPPath, Updater, CompressEFIESP);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                    }
-
-                    if (Result)
-                    {
-                        try
-                        {
-                            if (MainOSPath != null)
-                            {
-                                i++;
-                                Busy.Message = "Dumping partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                FFU.WritePartition("MainOS", MainOSPath, Updater, CompressMainOS);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                    }
-
-                    if (Result)
-                    {
-                        try
-                        {
-                            if (DataPath != null)
-                            {
-                                i++;
-                                Busy.Message = "Dumping partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                FFU.WritePartition("Data", DataPath, Updater, CompressData);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                    }
-
-                    if (!Result)
-                    {
-                        ActivateSubContext(new MessageViewModel("Failed to dump ROM partitions!", Restart));
-                        return;
-                    }
-
-                    ActivateSubContext(new MessageViewModel("Successfully dumped ROM partitions!", Restart));
-                }).Start();
-        }
-
-        internal void Restart()
-        {
-            ActivateSubContext(new DumpRomTargetSelectionViewModel(SwitchToUnlockBoot, SwitchToUnlockRoot, SwitchToFlashRom, DoDumpRom));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal class DumpRomViewModel : ContextViewModel
+    {
+        private readonly Action SwitchToUnlockBoot;
+        private readonly Action SwitchToUnlockRoot;
+        private readonly Action SwitchToFlashRom;
+
+        internal DumpRomViewModel(Action SwitchToUnlockBoot, Action SwitchToUnlockRoot, Action SwitchToFlashRom)
+            : base()
+        {
+            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
+            this.SwitchToUnlockRoot = SwitchToUnlockRoot;
+            this.SwitchToFlashRom = SwitchToFlashRom;
+        }
+
+        internal override void EvaluateViewState()
+        {
+            if (!IsActive)
+            {
+                return;
+            }
+
+            if (SubContextViewModel == null)
+            {
+                ActivateSubContext(new DumpRomTargetSelectionViewModel(SwitchToUnlockBoot, SwitchToUnlockRoot, SwitchToFlashRom, DoDumpRom));
+            }
+        }
+
+        internal void DoDumpRom(string FFUPath, string EFIESPPath, bool CompressEFIESP, string MainOSPath, bool CompressMainOS, string DataPath, bool CompressData)
+        {
+            new Thread(() =>
+                {
+                    bool Result = true;
+
+                    ActivateSubContext(new BusyViewModel("Initializing ROM dump..."));
+
+                    ulong TotalSizeSectors = 0;
+                    int PartitionCount = 0;
+                    Partition Partition;
+                    FFU FFU = null;
+                    try
+                    {
+                        FFU = new FFU(FFUPath);
+
+                        if (EFIESPPath != null)
+                        {
+                            Partition = FFU.GPT.Partitions.First(p => p.Name == "EFIESP");
+                            TotalSizeSectors += Partition.SizeInSectors;
+                            PartitionCount++;
+                        }
+
+                        if (MainOSPath != null)
+                        {
+                            Partition = FFU.GPT.Partitions.First(p => p.Name == "MainOS");
+                            TotalSizeSectors += Partition.SizeInSectors;
+                            PartitionCount++;
+                        }
+
+                        if (DataPath != null)
+                        {
+                            Partition = FFU.GPT.Partitions.First(p => p.Name == "Data");
+                            TotalSizeSectors += Partition.SizeInSectors;
+                            PartitionCount++;
+                        }
+                    }
+                    catch (Exception Ex)
+                    {
+                        LogFile.LogException(Ex);
+                        Result = false;
+                    }
+
+                    // We are on a worker thread!
+                    // So we must pass the SynchronizationContext of the UI thread
+                    BusyViewModel Busy = new("Dumping ROM...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                    ProgressUpdater Updater = Busy.ProgressUpdater;
+                    ActivateSubContext(Busy);
+
+                    int i = 0;
+                    if (Result)
+                    {
+                        try
+                        {
+                            if (EFIESPPath != null)
+                            {
+                                i++;
+                                Busy.Message = "Dumping partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                FFU.WritePartition("EFIESP", EFIESPPath, Updater, CompressEFIESP);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                    }
+
+                    if (Result)
+                    {
+                        try
+                        {
+                            if (MainOSPath != null)
+                            {
+                                i++;
+                                Busy.Message = "Dumping partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                FFU.WritePartition("MainOS", MainOSPath, Updater, CompressMainOS);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                    }
+
+                    if (Result)
+                    {
+                        try
+                        {
+                            if (DataPath != null)
+                            {
+                                i++;
+                                Busy.Message = "Dumping partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                FFU.WritePartition("Data", DataPath, Updater, CompressData);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                    }
+
+                    if (!Result)
+                    {
+                        ActivateSubContext(new MessageViewModel("Failed to dump ROM partitions!", Restart));
+                        return;
+                    }
+
+                    ActivateSubContext(new MessageViewModel("Successfully dumped ROM partitions!", Restart));
+                }).Start();
+        }
+
+        internal void Restart()
+        {
+            ActivateSubContext(new DumpRomTargetSelectionViewModel(SwitchToUnlockBoot, SwitchToUnlockRoot, SwitchToFlashRom, DoDumpRom));
+        }
+    }
+}
diff --git a/ViewModels/GettingStartedViewModel.cs b/WPinternals/ViewModels/GettingStartedViewModel.cs
similarity index 97%
rename from ViewModels/GettingStartedViewModel.cs
rename to WPinternals/ViewModels/GettingStartedViewModel.cs
index 2d94676..5843d44 100644
--- a/ViewModels/GettingStartedViewModel.cs
+++ b/WPinternals/ViewModels/GettingStartedViewModel.cs
@@ -1,47 +1,47 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace WPinternals
-{
-    internal class GettingStartedViewModel : ContextViewModel
-    {
-        internal Action ShowDisclaimer;
-        internal Action SwitchToUnlockBoot;
-        internal Action SwitchToUnlockRoot;
-        internal Action SwitchToBackup;
-        internal Action SwitchToDumpRom;
-        internal Action SwitchToFlashRom;
-        internal Action SwitchToDownload;
-
-        internal GettingStartedViewModel(Action ShowDisclaimer, Action SwitchToUnlockBoot, Action SwitchToUnlockRoot, Action SwitchToBackup, Action SwitchToDumpRom, Action SwitchToFlashRom, Action SwitchToDownload)
-            : base()
-        {
-            this.ShowDisclaimer = ShowDisclaimer;
-            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
-            this.SwitchToUnlockRoot = SwitchToUnlockRoot;
-            this.SwitchToBackup = SwitchToBackup;
-            this.SwitchToFlashRom = SwitchToFlashRom;
-            this.SwitchToDumpRom = SwitchToDumpRom;
-            this.SwitchToDownload = SwitchToDownload;
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+
+namespace WPinternals
+{
+    internal class GettingStartedViewModel : ContextViewModel
+    {
+        internal Action ShowDisclaimer;
+        internal Action SwitchToUnlockBoot;
+        internal Action SwitchToUnlockRoot;
+        internal Action SwitchToBackup;
+        internal Action SwitchToDumpRom;
+        internal Action SwitchToFlashRom;
+        internal Action SwitchToDownload;
+
+        internal GettingStartedViewModel(Action ShowDisclaimer, Action SwitchToUnlockBoot, Action SwitchToUnlockRoot, Action SwitchToBackup, Action SwitchToDumpRom, Action SwitchToFlashRom, Action SwitchToDownload)
+            : base()
+        {
+            this.ShowDisclaimer = ShowDisclaimer;
+            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
+            this.SwitchToUnlockRoot = SwitchToUnlockRoot;
+            this.SwitchToBackup = SwitchToBackup;
+            this.SwitchToFlashRom = SwitchToFlashRom;
+            this.SwitchToDumpRom = SwitchToDumpRom;
+            this.SwitchToDownload = SwitchToDownload;
+        }
+    }
+}
diff --git a/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs b/WPinternals/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs
similarity index 97%
rename from ViewModels/LumiaFlashRomSourceSelectionViewModel.cs
rename to WPinternals/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs
index 27ec86c..d544a28 100644
--- a/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs
+++ b/WPinternals/ViewModels/LumiaFlashRomSourceSelectionViewModel.cs
@@ -1,279 +1,279 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal class LumiaFlashRomSourceSelectionViewModel : ContextViewModel
-    {
-        private readonly PhoneNotifierViewModel PhoneNotifier;
-        private readonly Action<string, string, string> FlashPartitionsCallback;
-        private readonly Action<string> FlashFFUCallback;
-        private readonly Action<string> FlashMMOSCallback;
-        private readonly Action<string> FlashArchiveCallback;
-        internal Action SwitchToUnlockBoot;
-        internal Action SwitchToUnlockRoot;
-        internal Action SwitchToDumpFFU;
-        internal Action SwitchToBackup;
-
-        internal LumiaFlashRomSourceSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToUnlockRoot, Action SwitchToDumpFFU, Action SwitchToBackup, Action<string, string, string> FlashPartitionsCallback, Action<string> FlashArchiveCallback, Action<string> FlashFFUCallback, Action<string> FlashMMOSCallback)
-            : base()
-        {
-            this.PhoneNotifier = PhoneNotifier;
-            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
-            this.SwitchToUnlockRoot = SwitchToUnlockRoot;
-            this.SwitchToDumpFFU = SwitchToDumpFFU;
-            this.SwitchToBackup = SwitchToBackup;
-            this.FlashPartitionsCallback = FlashPartitionsCallback;
-            this.FlashArchiveCallback = FlashArchiveCallback;
-            this.FlashFFUCallback = FlashFFUCallback;
-            this.FlashMMOSCallback = FlashMMOSCallback;
-
-            this.PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-            this.PhoneNotifier.DeviceRemoved += DeviceRemoved;
-
-            new Thread(() => EvaluateViewState()).Start();
-        }
-
-        private string _EFIESPPath;
-        public string EFIESPPath
-        {
-            get
-            {
-                return _EFIESPPath;
-            }
-            set
-            {
-                if (value != _EFIESPPath)
-                {
-                    _EFIESPPath = value;
-                    OnPropertyChanged(nameof(EFIESPPath));
-                }
-            }
-        }
-
-        private string _MainOSPath;
-        public string MainOSPath
-        {
-            get
-            {
-                return _MainOSPath;
-            }
-            set
-            {
-                if (value != _MainOSPath)
-                {
-                    _MainOSPath = value;
-                    OnPropertyChanged(nameof(MainOSPath));
-                }
-            }
-        }
-
-        private string _DataPath;
-        public string DataPath
-        {
-            get
-            {
-                return _DataPath;
-            }
-            set
-            {
-                if (value != _DataPath)
-                {
-                    _DataPath = value;
-                    OnPropertyChanged(nameof(DataPath));
-                }
-            }
-        }
-
-        private string _ArchivePath;
-        public string ArchivePath
-        {
-            get
-            {
-                return _ArchivePath;
-            }
-            set
-            {
-                if (value != _ArchivePath)
-                {
-                    _ArchivePath = value;
-                    OnPropertyChanged(nameof(ArchivePath));
-                }
-            }
-        }
-
-        private string _FFUPath;
-        public string FFUPath
-        {
-            get
-            {
-                return _FFUPath;
-            }
-            set
-            {
-                if (value != _FFUPath)
-                {
-                    _FFUPath = value;
-                    OnPropertyChanged(nameof(FFUPath));
-                }
-            }
-        }
-
-        private string _MMOSPath;
-        public string MMOSPath
-        {
-            get
-            {
-                return _MMOSPath;
-            }
-            set
-            {
-                if (value != _MMOSPath)
-                {
-                    _MMOSPath = value;
-                    OnPropertyChanged(nameof(MMOSPath));
-                }
-            }
-        }
-
-        private bool _IsPhoneDisconnected;
-        public bool IsPhoneDisconnected
-        {
-            get
-            {
-                return _IsPhoneDisconnected;
-            }
-            set
-            {
-                if (value != _IsPhoneDisconnected)
-                {
-                    _IsPhoneDisconnected = value;
-                    OnPropertyChanged(nameof(IsPhoneDisconnected));
-                }
-            }
-        }
-
-        private bool _IsPhoneInFlashMode;
-        public bool IsPhoneInFlashMode
-        {
-            get
-            {
-                return _IsPhoneInFlashMode;
-            }
-            set
-            {
-                if (value != _IsPhoneInFlashMode)
-                {
-                    _IsPhoneInFlashMode = value;
-                    OnPropertyChanged(nameof(IsPhoneInFlashMode));
-                }
-            }
-        }
-
-        private bool _IsPhoneInOtherMode;
-        public bool IsPhoneInOtherMode
-        {
-            get
-            {
-                return _IsPhoneInOtherMode;
-            }
-            set
-            {
-                if (value != _IsPhoneInOtherMode)
-                {
-                    _IsPhoneInOtherMode = value;
-                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
-                }
-            }
-        }
-
-        private DelegateCommand _FlashPartitionsCommand;
-        public DelegateCommand FlashPartitionsCommand
-        {
-            get
-            {
-                return _FlashPartitionsCommand ??= new DelegateCommand(() => FlashPartitionsCallback(EFIESPPath, MainOSPath, DataPath), () => ((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)) && (PhoneNotifier.CurrentInterface != null));
-            }
-        }
-
-        private DelegateCommand _FlashFFUCommand;
-        public DelegateCommand FlashFFUCommand
-        {
-            get
-            {
-                return _FlashFFUCommand ??= new DelegateCommand(() => FlashFFUCallback(FFUPath), () => (FFUPath != null) && (PhoneNotifier.CurrentInterface != null));
-            }
-        }
-
-        private DelegateCommand _FlashMMOSCommand;
-        public DelegateCommand FlashMMOSCommand
-        {
-            get
-            {
-                return _FlashMMOSCommand ??= new DelegateCommand(() => FlashMMOSCallback(MMOSPath), () => (MMOSPath != null) && (PhoneNotifier.CurrentInterface != null));
-            }
-        }
-
-        private DelegateCommand _FlashArchiveCommand;
-        public DelegateCommand FlashArchiveCommand
-        {
-            get
-            {
-                return _FlashArchiveCommand ??= new DelegateCommand(() => FlashArchiveCallback(ArchivePath), () => (ArchivePath != null) && (PhoneNotifier.CurrentInterface != null));
-            }
-        }
-
-        ~LumiaFlashRomSourceSelectionViewModel()
-        {
-            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
-        }
-
-        private void NewDeviceArrived(ArrivalEventArgs Args)
-        {
-            new Thread(() =>
-                {
-                    try
-                    {
-                        EvaluateViewState();
-                    }
-                    catch { }
-                }).Start();
-        }
-
-        private void DeviceRemoved()
-        {
-            new Thread(() => EvaluateViewState()).Start();
-        }
-
-        internal override void EvaluateViewState()
-        {
-            IsPhoneDisconnected = PhoneNotifier.CurrentInterface == null;
-            IsPhoneInFlashMode = PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Flash;
-            IsPhoneInOtherMode = !IsPhoneDisconnected && !IsPhoneInFlashMode;
-            FlashPartitionsCommand.RaiseCanExecuteChanged();
-            FlashArchiveCommand.RaiseCanExecuteChanged();
-            FlashFFUCommand.RaiseCanExecuteChanged();
-            FlashMMOSCommand.RaiseCanExecuteChanged();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal class LumiaFlashRomSourceSelectionViewModel : ContextViewModel
+    {
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action<string, string, string> FlashPartitionsCallback;
+        private readonly Action<string> FlashFFUCallback;
+        private readonly Action<string> FlashMMOSCallback;
+        private readonly Action<string> FlashArchiveCallback;
+        internal Action SwitchToUnlockBoot;
+        internal Action SwitchToUnlockRoot;
+        internal Action SwitchToDumpFFU;
+        internal Action SwitchToBackup;
+
+        internal LumiaFlashRomSourceSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToUnlockRoot, Action SwitchToDumpFFU, Action SwitchToBackup, Action<string, string, string> FlashPartitionsCallback, Action<string> FlashArchiveCallback, Action<string> FlashFFUCallback, Action<string> FlashMMOSCallback)
+            : base()
+        {
+            this.PhoneNotifier = PhoneNotifier;
+            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
+            this.SwitchToUnlockRoot = SwitchToUnlockRoot;
+            this.SwitchToDumpFFU = SwitchToDumpFFU;
+            this.SwitchToBackup = SwitchToBackup;
+            this.FlashPartitionsCallback = FlashPartitionsCallback;
+            this.FlashArchiveCallback = FlashArchiveCallback;
+            this.FlashFFUCallback = FlashFFUCallback;
+            this.FlashMMOSCallback = FlashMMOSCallback;
+
+            this.PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+            this.PhoneNotifier.DeviceRemoved += DeviceRemoved;
+
+            new Thread(() => EvaluateViewState()).Start();
+        }
+
+        private string _EFIESPPath;
+        public string EFIESPPath
+        {
+            get
+            {
+                return _EFIESPPath;
+            }
+            set
+            {
+                if (value != _EFIESPPath)
+                {
+                    _EFIESPPath = value;
+                    OnPropertyChanged(nameof(EFIESPPath));
+                }
+            }
+        }
+
+        private string _MainOSPath;
+        public string MainOSPath
+        {
+            get
+            {
+                return _MainOSPath;
+            }
+            set
+            {
+                if (value != _MainOSPath)
+                {
+                    _MainOSPath = value;
+                    OnPropertyChanged(nameof(MainOSPath));
+                }
+            }
+        }
+
+        private string _DataPath;
+        public string DataPath
+        {
+            get
+            {
+                return _DataPath;
+            }
+            set
+            {
+                if (value != _DataPath)
+                {
+                    _DataPath = value;
+                    OnPropertyChanged(nameof(DataPath));
+                }
+            }
+        }
+
+        private string _ArchivePath;
+        public string ArchivePath
+        {
+            get
+            {
+                return _ArchivePath;
+            }
+            set
+            {
+                if (value != _ArchivePath)
+                {
+                    _ArchivePath = value;
+                    OnPropertyChanged(nameof(ArchivePath));
+                }
+            }
+        }
+
+        private string _FFUPath;
+        public string FFUPath
+        {
+            get
+            {
+                return _FFUPath;
+            }
+            set
+            {
+                if (value != _FFUPath)
+                {
+                    _FFUPath = value;
+                    OnPropertyChanged(nameof(FFUPath));
+                }
+            }
+        }
+
+        private string _MMOSPath;
+        public string MMOSPath
+        {
+            get
+            {
+                return _MMOSPath;
+            }
+            set
+            {
+                if (value != _MMOSPath)
+                {
+                    _MMOSPath = value;
+                    OnPropertyChanged(nameof(MMOSPath));
+                }
+            }
+        }
+
+        private bool _IsPhoneDisconnected;
+        public bool IsPhoneDisconnected
+        {
+            get
+            {
+                return _IsPhoneDisconnected;
+            }
+            set
+            {
+                if (value != _IsPhoneDisconnected)
+                {
+                    _IsPhoneDisconnected = value;
+                    OnPropertyChanged(nameof(IsPhoneDisconnected));
+                }
+            }
+        }
+
+        private bool _IsPhoneInFlashMode;
+        public bool IsPhoneInFlashMode
+        {
+            get
+            {
+                return _IsPhoneInFlashMode;
+            }
+            set
+            {
+                if (value != _IsPhoneInFlashMode)
+                {
+                    _IsPhoneInFlashMode = value;
+                    OnPropertyChanged(nameof(IsPhoneInFlashMode));
+                }
+            }
+        }
+
+        private bool _IsPhoneInOtherMode;
+        public bool IsPhoneInOtherMode
+        {
+            get
+            {
+                return _IsPhoneInOtherMode;
+            }
+            set
+            {
+                if (value != _IsPhoneInOtherMode)
+                {
+                    _IsPhoneInOtherMode = value;
+                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
+                }
+            }
+        }
+
+        private DelegateCommand _FlashPartitionsCommand;
+        public DelegateCommand FlashPartitionsCommand
+        {
+            get
+            {
+                return _FlashPartitionsCommand ??= new DelegateCommand(() => FlashPartitionsCallback(EFIESPPath, MainOSPath, DataPath), () => ((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)) && (PhoneNotifier.CurrentInterface != null));
+            }
+        }
+
+        private DelegateCommand _FlashFFUCommand;
+        public DelegateCommand FlashFFUCommand
+        {
+            get
+            {
+                return _FlashFFUCommand ??= new DelegateCommand(() => FlashFFUCallback(FFUPath), () => (FFUPath != null) && (PhoneNotifier.CurrentInterface != null));
+            }
+        }
+
+        private DelegateCommand _FlashMMOSCommand;
+        public DelegateCommand FlashMMOSCommand
+        {
+            get
+            {
+                return _FlashMMOSCommand ??= new DelegateCommand(() => FlashMMOSCallback(MMOSPath), () => (MMOSPath != null) && (PhoneNotifier.CurrentInterface != null));
+            }
+        }
+
+        private DelegateCommand _FlashArchiveCommand;
+        public DelegateCommand FlashArchiveCommand
+        {
+            get
+            {
+                return _FlashArchiveCommand ??= new DelegateCommand(() => FlashArchiveCallback(ArchivePath), () => (ArchivePath != null) && (PhoneNotifier.CurrentInterface != null));
+            }
+        }
+
+        ~LumiaFlashRomSourceSelectionViewModel()
+        {
+            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
+        }
+
+        private void NewDeviceArrived(ArrivalEventArgs Args)
+        {
+            new Thread(() =>
+                {
+                    try
+                    {
+                        EvaluateViewState();
+                    }
+                    catch { }
+                }).Start();
+        }
+
+        private void DeviceRemoved()
+        {
+            new Thread(() => EvaluateViewState()).Start();
+        }
+
+        internal override void EvaluateViewState()
+        {
+            IsPhoneDisconnected = PhoneNotifier.CurrentInterface == null;
+            IsPhoneInFlashMode = PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Flash;
+            IsPhoneInOtherMode = !IsPhoneDisconnected && !IsPhoneInFlashMode;
+            FlashPartitionsCommand.RaiseCanExecuteChanged();
+            FlashArchiveCommand.RaiseCanExecuteChanged();
+            FlashFFUCommand.RaiseCanExecuteChanged();
+            FlashMMOSCommand.RaiseCanExecuteChanged();
+        }
+    }
+}
diff --git a/ViewModels/LumiaFlashRomViewModel.cs b/WPinternals/ViewModels/LumiaFlashRomViewModel.cs
similarity index 97%
rename from ViewModels/LumiaFlashRomViewModel.cs
rename to WPinternals/ViewModels/LumiaFlashRomViewModel.cs
index faa3f15..e64ae27 100644
--- a/ViewModels/LumiaFlashRomViewModel.cs
+++ b/WPinternals/ViewModels/LumiaFlashRomViewModel.cs
@@ -1,773 +1,773 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace WPinternals
-{
-    internal class LumiaFlashRomViewModel : ContextViewModel
-    {
-        private readonly PhoneNotifierViewModel PhoneNotifier;
-        internal Action SwitchToUnlockBoot;
-        internal Action SwitchToUnlockRoot;
-        internal Action SwitchToDumpFFU;
-        internal Action SwitchToBackup;
-        private readonly Action Callback;
-
-        internal LumiaFlashRomViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToUnlockRoot, Action SwitchToDumpFFU, Action SwitchToBackup, Action Callback)
-            : base()
-        {
-            IsSwitchingInterface = false;
-            IsFlashModeOperation = true;
-
-            this.PhoneNotifier = PhoneNotifier;
-            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
-            this.SwitchToUnlockRoot = SwitchToUnlockRoot;
-            this.SwitchToDumpFFU = SwitchToDumpFFU;
-            this.SwitchToBackup = SwitchToBackup;
-            this.Callback = Callback;
-        }
-
-        internal override void EvaluateViewState()
-        {
-            if (!IsActive)
-            {
-                return;
-            }
-
-            if (SubContextViewModel == null)
-            {
-                ActivateSubContext(new LumiaFlashRomSourceSelectionViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToUnlockRoot, SwitchToDumpFFU, SwitchToBackup, FlashPartitions, FlashArchive, FlashFFU, FlashMMOS));
-            }
-        }
-
-        // Called from an event-handler. So, "async void" is valid here.
-        internal async void FlashPartitions(string EFIESPPath, string MainOSPath, string DataPath)
-        {
-            IsSwitchingInterface = true; // Prevents that a device is forced to Flash mode on this screen which is meant for flashing
-            try
-            {
-                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Flash,
-                    (msg, sub) =>
-                        ActivateSubContext(new BusyViewModel(msg, sub)));
-                if (((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadPhoneInfo(ExtendedInfo: false).FlashAppProtocolVersionMajor < 2)
-                {
-                    FlashPartitionsTask(EFIESPPath, MainOSPath, DataPath);
-                }
-                else
-                {
-                    await Task.Run(async () => await LumiaV2UnlockBootViewModel.LumiaV2FlashPartitions(PhoneNotifier, EFIESPPath, MainOSPath, DataPath, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure));
-                }
-            }
-            catch (Exception Ex)
-            {
-                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
-            }
-        }
-
-        internal void FlashPartitionsTask(string EFIESPPath, string MainOSPath, string DataPath)
-        {
-            new Thread(() =>
-                {
-                    bool Result = true;
-
-                    ActivateSubContext(new BusyViewModel("Initializing flash..."));
-
-                    NokiaFlashModel Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
-
-                    GPT GPT = Phone.ReadGPT();
-
-                    ulong TotalSizeSectors = 0;
-                    int PartitionCount = 0;
-                    ulong MainOSOldSectorCount = 0;
-                    ulong MainOSNewSectorCount = 0;
-                    ulong DataOldSectorCount = 0;
-                    ulong DataNewSectorCount = 0;
-                    ulong FirstMainOSSector = 0;
-
-                    try
-                    {
-                        if (EFIESPPath != null)
-                        {
-                            using Stream Stream = new DecompressedStream(File.Open(EFIESPPath, FileMode.Open));
-                            ulong StreamLengthInSectors = (ulong)Stream.Length / 0x200;
-                            TotalSizeSectors += StreamLengthInSectors;
-                            PartitionCount++;
-                            Partition Partition = GPT.Partitions.Find(p => string.Equals(p.Name, "EFIESP", StringComparison.CurrentCultureIgnoreCase));
-                            if (StreamLengthInSectors > Partition.SizeInSectors)
-                            {
-                                LogFile.Log("Flash failed! Size of partition 'EFIESP' is too big.");
-                                ExitFailure("Flash failed!", "Size of partition 'EFIESP' is too big.");
-                                return;
-                            }
-                        }
-
-                        if (MainOSPath != null)
-                        {
-                            using Stream Stream = new DecompressedStream(File.Open(MainOSPath, FileMode.Open));
-                            ulong StreamLengthInSectors = (ulong)Stream.Length / 0x200;
-                            TotalSizeSectors += StreamLengthInSectors;
-                            PartitionCount++;
-                            Partition Partition = GPT.Partitions.Find(p => string.Equals(p.Name, "MainOS", StringComparison.CurrentCultureIgnoreCase));
-                            MainOSOldSectorCount = Partition.SizeInSectors;
-                            MainOSNewSectorCount = StreamLengthInSectors;
-                            FirstMainOSSector = Partition.FirstSector;
-                        }
-
-                        if (DataPath != null)
-                        {
-                            using Stream Stream = new DecompressedStream(File.Open(DataPath, FileMode.Open));
-                            ulong StreamLengthInSectors = (ulong)Stream.Length / 0x200;
-                            TotalSizeSectors += StreamLengthInSectors;
-                            PartitionCount++;
-                            Partition Partition = GPT.Partitions.Find(p => string.Equals(p.Name, "Data", StringComparison.CurrentCultureIgnoreCase));
-                            DataOldSectorCount = Partition.SizeInSectors;
-                            DataNewSectorCount = StreamLengthInSectors;
-                        }
-                    }
-                    catch (Exception Ex)
-                    {
-                        LogFile.LogException(Ex);
-                        Result = false;
-                    }
-
-                    if ((MainOSNewSectorCount > 0) && (DataNewSectorCount > 0))
-                    {
-                        if ((MainOSNewSectorCount > MainOSOldSectorCount) || (DataNewSectorCount > DataOldSectorCount))
-                        {
-                            UInt64 OSSpace = GPT.LastUsableSector - FirstMainOSSector + 1;
-                            if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
-                            {
-                                // MainOS and Data partitions need to be re-aligned!
-                                Partition MainOSPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "MainOS", StringComparison.CurrentCultureIgnoreCase));
-                                Partition DataPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "Data", StringComparison.CurrentCultureIgnoreCase));
-                                MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
-                                DataPartition.FirstSector = MainOSPartition.LastSector + 1;
-                                DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
-                                Phone.WriteGPT(GPT);
-                            }
-                            else
-                            {
-                                LogFile.Log("Flash failed! Size of partitions 'MainOS' and 'Data' together are too big.");
-                                ExitFailure("Flash failed!", "Sizes of partitions 'MainOS' and 'Data' together are too big.");
-                                return;
-                            }
-                        }
-                    }
-                    else if ((MainOSNewSectorCount > 0) && (MainOSNewSectorCount > MainOSOldSectorCount))
-                    {
-                        LogFile.Log("Flash failed! Size of partition 'MainOS' is too big.");
-                        ExitFailure("Flash failed!", "Size of partition 'MainOS' is too big.");
-                        return;
-                    }
-                    else if ((DataNewSectorCount > 0) && (DataNewSectorCount > DataOldSectorCount))
-                    {
-                        LogFile.Log("Flash failed! Size of partition 'Data' is too big.");
-                        ExitFailure("Flash failed!", "Size of partition 'Data' together is too big.");
-                        return;
-                    }
-
-                    BusyViewModel Busy = new("Flashing...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
-                    ProgressUpdater Updater = Busy.ProgressUpdater;
-                    ActivateSubContext(Busy);
-
-                    int i = 0;
-                    if (Result)
-                    {
-                        try
-                        {
-                            if (EFIESPPath != null)
-                            {
-                                i++;
-                                Busy.Message = "Flashing partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                Phone.FlashRawPartition(EFIESPPath, "EFIESP", Updater);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                    }
-
-                    if (Result)
-                    {
-                        try
-                        {
-                            if (MainOSPath != null)
-                            {
-                                i++;
-                                Busy.Message = "Flashing partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                Phone.FlashRawPartition(MainOSPath, "MainOS", Updater);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                    }
-
-                    if (Result)
-                    {
-                        try
-                        {
-                            if (DataPath != null)
-                            {
-                                i++;
-                                Busy.Message = "Flashing partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                Phone.FlashRawPartition(DataPath, "Data", Updater);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                    }
-
-                    if (!Result)
-                    {
-                        ExitFailure("Flash failed!", null);
-                        return;
-                    }
-
-                    ExitSuccess("Flash successful! Make sure you disable Windows Update on the phone!", null);
-                }).Start();
-        }
-
-        // Called from an event-handler. So, "async void" is valid here.
-        internal async void FlashArchive(string ArchivePath)
-        {
-            IsSwitchingInterface = true; // Prevents that a device is forced to Flash mode on this screen which is meant for flashing
-            try
-            {
-                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Flash,
-                    (msg, sub) =>
-                        ActivateSubContext(new BusyViewModel(msg, sub)));
-                if (((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadPhoneInfo(ExtendedInfo: false).FlashAppProtocolVersionMajor < 2)
-                {
-                    FlashArchiveTask(ArchivePath);
-                }
-                else
-                {
-                    await Task.Run(async () => await LumiaV2UnlockBootViewModel.LumiaV2FlashArchive(PhoneNotifier, ArchivePath, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure));
-                }
-            }
-            catch (Exception Ex)
-            {
-                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
-            }
-        }
-
-        internal void FlashArchiveTask(string ArchivePath)
-        {
-            new Thread(() =>
-            {
-                ActivateSubContext(new BusyViewModel("Initializing flash..."));
-
-                NokiaFlashModel Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
-
-                ulong TotalSizeSectors = 0;
-                int PartitionCount = 0;
-                ulong MainOSOldSectorCount = 0;
-                ulong MainOSNewSectorCount = 0;
-                ulong DataOldSectorCount = 0;
-                ulong DataNewSectorCount = 0;
-                ulong FirstMainOSSector = 0;
-                bool GPTChanged = false;
-
-                try
-                {
-                    GPT GPT = Phone.ReadGPT();
-
-                    using FileStream FileStream = new(ArchivePath, FileMode.Open);
-                    using ZipArchive Archive = new(FileStream, ZipArchiveMode.Read);
-                    foreach (ZipArchiveEntry Entry in Archive.Entries)
-                    {
-                        // Determine if there is a partition layout present
-                        ZipArchiveEntry PartitionEntry = Archive.GetEntry("Partitions.xml");
-                        if (PartitionEntry == null)
-                        {
-                            GPT.MergePartitions(null, false, Archive);
-                            GPTChanged |= GPT.HasChanged;
-                        }
-                        else
-                        {
-                            using Stream ZipStream = PartitionEntry.Open();
-                            using StreamReader ZipReader = new(ZipStream);
-                            string PartitionXml = ZipReader.ReadToEnd();
-                            GPT.MergePartitions(PartitionXml, false, Archive);
-                            GPTChanged |= GPT.HasChanged;
-                        }
-
-                        // First determine if we need a new GPT!
-                        if (!Entry.FullName.Contains("/")) // No subfolders
-                        {
-                            string PartitionName = Path.GetFileNameWithoutExtension(Entry.Name);
-                            int P = PartitionName.IndexOf('.');
-                            if (P >= 0)
-                            {
-                                PartitionName = PartitionName.Substring(0, P); // Example: Data.bin.gz -> Data
-                            }
-
-                            Partition Partition = GPT.Partitions.Find(p => string.Equals(p.Name, PartitionName, StringComparison.CurrentCultureIgnoreCase));
-                            if (Partition != null)
-                            {
-                                DecompressedStream DecompressedStream = new(Entry.Open());
-                                ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
-                                try
-                                {
-                                    StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
-                                }
-                                catch { }
-
-                                TotalSizeSectors += StreamLengthInSectors;
-                                PartitionCount++;
-
-                                if (string.Equals(PartitionName, "MainOS", StringComparison.CurrentCultureIgnoreCase))
-                                {
-                                    MainOSOldSectorCount = Partition.SizeInSectors;
-                                    MainOSNewSectorCount = StreamLengthInSectors;
-                                    FirstMainOSSector = Partition.FirstSector;
-                                }
-                                else if (string.Equals(PartitionName, "Data", StringComparison.CurrentCultureIgnoreCase))
-                                {
-                                    DataOldSectorCount = Partition.SizeInSectors;
-                                    DataNewSectorCount = StreamLengthInSectors;
-                                }
-                                else if (StreamLengthInSectors > Partition.SizeInSectors)
-                                {
-                                    LogFile.Log("Flash failed! Size of partition '" + PartitionName + "' is too big.");
-                                    ExitFailure("Flash failed!", "Size of partition '" + PartitionName + "' is too big.");
-                                    return;
-                                }
-                            }
-                        }
-                    }
-
-                    if ((MainOSNewSectorCount > 0) && (DataNewSectorCount > 0))
-                    {
-                        if ((MainOSNewSectorCount > MainOSOldSectorCount) || (DataNewSectorCount > DataOldSectorCount))
-                        {
-                            UInt64 OSSpace = GPT.LastUsableSector - FirstMainOSSector + 1;
-                            if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
-                            {
-                                // MainOS and Data partitions need to be re-aligned!
-                                Partition MainOSPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "MainOS", StringComparison.CurrentCultureIgnoreCase));
-                                Partition DataPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "Data", StringComparison.CurrentCultureIgnoreCase));
-                                MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
-                                DataPartition.FirstSector = MainOSPartition.LastSector + 1;
-                                DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
-
-                                GPTChanged = true;
-                            }
-                            else
-                            {
-                                LogFile.Log("Flash failed! Size of partitions 'MainOS' and 'Data' together are too big.");
-                                ExitFailure("Flash failed!", "Sizes of partitions 'MainOS' and 'Data' together are too big.");
-                                return;
-                            }
-                        }
-                    }
-                    else if ((MainOSNewSectorCount > 0) && (MainOSNewSectorCount > MainOSOldSectorCount))
-                    {
-                        LogFile.Log("Flash failed! Size of partition 'MainOS' is too big.");
-                        ExitFailure("Flash failed!", "Size of partition 'MainOS' is too big.");
-                        return;
-                    }
-                    else if ((DataNewSectorCount > 0) && (DataNewSectorCount > DataOldSectorCount))
-                    {
-                        LogFile.Log("Flash failed! Size of partition 'Data' is too big.");
-                        ExitFailure("Flash failed!", "Size of partition 'Data' is too big.");
-                        return;
-                    }
-
-                    if (GPTChanged)
-                    {
-                        Phone.WriteGPT(GPT);
-                    }
-
-                    if (PartitionCount > 0)
-                    {
-                        BusyViewModel Busy = new("Flashing...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
-                        ProgressUpdater Updater = Busy.ProgressUpdater;
-                        ActivateSubContext(Busy);
-
-                        int i = 0;
-
-                        foreach (ZipArchiveEntry Entry in Archive.Entries)
-                        {
-                            // "MainOS.bin.gz" => "MainOS"
-                            string PartitionName = Entry.Name;
-                            int Pos = PartitionName.IndexOf('.');
-                            if (Pos >= 0)
-                            {
-                                PartitionName = PartitionName.Substring(0, Pos);
-                            }
-
-                            Partition Partition = GPT.Partitions.Find(p => string.Equals(p.Name, PartitionName, StringComparison.CurrentCultureIgnoreCase));
-                            if (Partition != null)
-                            {
-                                Stream DecompressedStream = new DecompressedStream(Entry.Open());
-                                ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
-                                try
-                                {
-                                    StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
-                                }
-                                catch { }
-
-                                if (StreamLengthInSectors <= Partition.SizeInSectors)
-                                {
-                                    i++;
-                                    Busy.Message = "Flashing partition " + Partition.Name + " (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                    Phone.FlashRawPartition(DecompressedStream, Partition.Name, Updater);
-                                }
-                                DecompressedStream.Close();
-                            }
-                        }
-                    }
-                    else
-                    {
-                        LogFile.Log("Flash failed! No valid partitions found in the archive.");
-                        ExitFailure("Flash failed!", "No valid partitions found in the archive");
-                        return;
-                    }
-                }
-                catch (Exception Ex)
-                {
-                    LogFile.LogException(Ex);
-                    if (Ex is WPinternalsException)
-                    {
-                        ExitFailure("Flash failed!", ((WPinternalsException)Ex).SubMessage);
-                    }
-                    else
-                    {
-                        ExitFailure("Flash failed!", null);
-                    }
-
-                    return;
-                }
-
-                ExitSuccess("Flash successful! Make sure you disable Windows Update on the phone!", null);
-            }).Start();
-        }
-
-        // Called from an event-handler. So, "async void" is valid here.
-        internal async void FlashFFU(string FFUPath)
-        {
-            IsSwitchingInterface = true; // Prevents that a device is forced to Flash mode on this screen which is meant for flashing
-            try
-            {
-                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Flash,
-                    (msg, sub) =>
-                        ActivateSubContext(new BusyViewModel(msg, sub)));
-                FlashFFUTask(FFUPath);
-            }
-            catch (Exception Ex)
-            {
-                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
-            }
-        }
-
-        internal void FlashFFUTask(string FFUPath)
-        {
-            new Thread(() =>
-            {
-                bool Result = true;
-
-                NokiaFlashModel Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
-                PhoneInfo Info = Phone.ReadPhoneInfo(false);
-
-                #region Remove bootloader changes
-
-                // If necessary remove bootloader changes
-                // In case the NV vars were redirected, and a stock FFU is flashed, then the IsFlashing flag will be cleared in the redirected NV vars
-                // And after a reboot the original NV vars are active again, but the IsFlashing flag is still set from when the bootloader was unlocked
-                // So we will first restore the GPT, so the original vars are active again.
-                // Then IsFlashing is true and the phone boots forcibly to FlashApp again.
-                // Then we start normal FFU flasing and at the end the IsFlashing flag is cleared in the original vars.
-
-                if (Info.FlashAppProtocolVersionMajor >= 2)
-                {
-                    byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(Phone, 0x20000); // TODO: Get proper profile FFU and get ChunkSizeInBytes
-                    GPT GPT = new(GPTChunk);
-                    FlashPart Part;
-                    List<FlashPart> FlashParts = new();
-
-                    Partition NvBackupPartition = GPT.GetPartition("BACKUP_BS_NV");
-                    if (NvBackupPartition != null)
-                    {
-                        // This must be a left over of a half unlocked bootloader
-                        Partition NvPartition = GPT.GetPartition("UEFI_BS_NV");
-                        NvBackupPartition.Name = "UEFI_BS_NV";
-                        NvBackupPartition.PartitionGuid = NvPartition.PartitionGuid;
-                        NvBackupPartition.PartitionTypeGuid = NvPartition.PartitionTypeGuid;
-                        GPT.Partitions.Remove(NvPartition);
-
-                        GPT.Rebuild();
-                        Part = new FlashPart
-                        {
-                            StartSector = 0,
-                            Stream = new MemoryStream(GPTChunk)
-                        };
-                        FlashParts.Add(Part);
-                    }
-
-                    bool ClearFlashingStatus = true;
-
-                    // We should only clear NV if there was no backup NV to be restored and the current NV contains the SB unlock.
-                    if ((NvBackupPartition == null) && !Info.UefiSecureBootEnabled)
-                    {
-                        // ClearNV
-                        Part = new FlashPart();
-                        Partition Target = GPT.GetPartition("UEFI_BS_NV");
-                        Part.StartSector = (UInt32)Target.FirstSector;
-                        Part.Stream = new MemoryStream(new byte[0x40000]);
-                        FlashParts.Add(Part);
-
-                        ClearFlashingStatus = false;
-                    }
-
-                    if (FlashParts.Count > 0)
-                    {
-                        ActivateSubContext(new BusyViewModel("Restoring bootloader..."));
-                        WPinternalsStatus LastStatus = WPinternalsStatus.Undefined;
-                        LumiaV2UnlockBootViewModel.LumiaV2CustomFlash(PhoneNotifier, FFUPath, false, false, FlashParts, true, ClearFlashingStatusAtEnd: ClearFlashingStatus,
-                            SetWorkingStatus: (m, s, v, a, st) =>
-                            {
-                                if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
-                                {
-                                    SetWorkingStatus(m, s, v, a, st);
-                                }
-                                else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
-                                {
-                                    SetWorkingStatus("Restoring bootloader...", null, null, Status: WPinternalsStatus.Flashing);
-                                }
-
-                                LastStatus = st;
-                            },
-                            UpdateWorkingStatus: (m, s, v, st) =>
-                            {
-                                if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
-                                {
-                                    UpdateWorkingStatus(m, s, v, st);
-                                }
-                                else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
-                                {
-                                    SetWorkingStatus("Restoring bootloader...", null, null, Status: WPinternalsStatus.Flashing);
-                                }
-
-                                LastStatus = st;
-                            }
-                        ).Wait();
-
-                        if ((PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Flash))
-                        {
-                            PhoneNotifier.WaitForArrival().Wait();
-                        }
-
-                        if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
-                        {
-                            ((NokiaFlashModel)PhoneNotifier.CurrentModel).SwitchToFlashAppContext();
-                        }
-                    }
-                }
-
-                #endregion
-
-                Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
-
-                ActivateSubContext(new BusyViewModel("Initializing flash..."));
-
-                string ErrorSubMessage = null;
-
-                try
-                {
-                    FFU FFU = new(FFUPath);
-                    BusyViewModel Busy = new("Flashing original FFU...", MaxProgressValue: FFU.TotalChunkCount, UIContext: UIContext);
-                    ActivateSubContext(Busy);
-                    byte Options = 0;
-                    if (!Info.IsBootloaderSecure)
-                    {
-                        Options = (byte)((FlashOptions)Options | FlashOptions.SkipSignatureCheck);
-                    }
-
-                    Phone.FlashFFU(FFU, Busy.ProgressUpdater, true, Options);
-                }
-                catch (Exception Ex)
-                {
-                    LogFile.LogException(Ex);
-                    if (Ex is WPinternalsException)
-                    {
-                        ErrorSubMessage = ((WPinternalsException)Ex).SubMessage;
-                    }
-
-                    Result = false;
-                }
-
-                if (!Result)
-                {
-                    ExitFailure("Flash failed!", ErrorSubMessage);
-                    return;
-                }
-
-                ExitSuccess("Flash successful!", null);
-            }).Start();
-        }
-
-        // Called from an event-handler. So, "async void" is valid here.
-        internal async void FlashMMOS(string MMOSPath)
-        {
-            IsSwitchingInterface = true; // Prevents that a device is forced to Flash mode on this screen which is meant for flashing
-            try
-            {
-                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Flash,
-                    (msg, sub) =>
-                        ActivateSubContext(new BusyViewModel(msg, sub)));
-                FlashMMOSTask(MMOSPath);
-            }
-            catch (Exception Ex)
-            {
-                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
-            }
-        }
-
-        internal void FlashMMOSTask(string MMOSPath)
-        {
-            NokiaFlashModel Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
-            if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
-            {
-                Phone.SwitchToFlashAppContext();
-            }
-
-            new Thread(() =>
-            {
-                bool Result = true;
-
-                ActivateSubContext(new BusyViewModel("Initializing flash..."));
-
-                string ErrorSubMessage = null;
-
-                try
-                {
-                    FileInfo info = new(MMOSPath);
-                    uint length = uint.Parse(info.Length.ToString());
-                    const int maximumbuffersize = 0x00240000;
-                    uint totalcounts = (uint)Math.Truncate((decimal)length / maximumbuffersize);
-                    BusyViewModel Busy = new("Flashing Test Mode package...", MaxProgressValue: totalcounts, UIContext: UIContext);
-                    ActivateSubContext(Busy);
-
-                    Phone.FlashMMOS(MMOSPath, Busy.ProgressUpdater);
-
-                    ActivateSubContext(new BusyViewModel("And now booting phone to MMOS...", "If the phone stays on the lightning cog screen for a while, you may need to unplug and replug the phone to continue the boot process."));
-
-                    PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                }
-                catch (Exception Ex)
-                {
-                    LogFile.LogException(Ex);
-                    if (Ex is WPinternalsException)
-                    {
-                        ErrorSubMessage = ((WPinternalsException)Ex).SubMessage;
-                    }
-
-                    Result = false;
-                }
-
-                if (!Result)
-                {
-                    ExitFailure("Flash failed!", ErrorSubMessage);
-                    return;
-                }
-            }).Start();
-        }
-
-        private void NewDeviceArrived(ArrivalEventArgs Args)
-        {
-            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
-
-            if (Args.NewInterface != PhoneInterfaces.Lumia_Label)
-            {
-                ExitFailure("Flash failed!", "Phone unexpectedly switched mode while booting MMOS image.");
-                return;
-            }
-            else
-            {
-                ExitSuccess("Flash successful!", null);
-                return;
-            }
-        }
-
-        // Called from an event-handler. So, "async void" is valid here.
-        internal async void Exit()
-        {
-            try
-            {
-                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Normal,
-                    (msg, sub) =>
-                        ActivateSubContext(new BusyViewModel(msg, sub)));
-                IsSwitchingInterface = false;
-                Callback();
-                ActivateSubContext(null);
-            }
-            catch (Exception Ex)
-            {
-                ActivateSubContext(new MessageViewModel(Ex.Message, () =>
-                {
-                    IsSwitchingInterface = false;
-                    Callback();
-                    ActivateSubContext(null);
-                }));
-            }
-        }
-
-        internal void ExitSuccess(string Message, string SubMessage)
-        {
-            MessageViewModel SuccessMessageViewModel = new(Message, () =>
-            {
-                // No need to call Exit() to go to normal mode, because it already switches to normal mode automatically.
-                IsSwitchingInterface = false; // From here on a device will be forced to Flash mode again on this screen which is meant for flashing
-                Callback();
-                ActivateSubContext(null);
-            });
-            SuccessMessageViewModel.SubMessage = SubMessage;
-            ActivateSubContext(SuccessMessageViewModel);
-        }
-
-        internal void ExitFailure(string Message, string SubMessage)
-        {
-            MessageViewModel ErrorMessageViewModel = new(Message, () =>
-            {
-                IsSwitchingInterface = false;
-                Callback();
-                ActivateSubContext(null);
-            });
-            ErrorMessageViewModel.SubMessage = SubMessage;
-            ActivateSubContext(ErrorMessageViewModel);
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace WPinternals
+{
+    internal class LumiaFlashRomViewModel : ContextViewModel
+    {
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        internal Action SwitchToUnlockBoot;
+        internal Action SwitchToUnlockRoot;
+        internal Action SwitchToDumpFFU;
+        internal Action SwitchToBackup;
+        private readonly Action Callback;
+
+        internal LumiaFlashRomViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToUnlockRoot, Action SwitchToDumpFFU, Action SwitchToBackup, Action Callback)
+            : base()
+        {
+            IsSwitchingInterface = false;
+            IsFlashModeOperation = true;
+
+            this.PhoneNotifier = PhoneNotifier;
+            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
+            this.SwitchToUnlockRoot = SwitchToUnlockRoot;
+            this.SwitchToDumpFFU = SwitchToDumpFFU;
+            this.SwitchToBackup = SwitchToBackup;
+            this.Callback = Callback;
+        }
+
+        internal override void EvaluateViewState()
+        {
+            if (!IsActive)
+            {
+                return;
+            }
+
+            if (SubContextViewModel == null)
+            {
+                ActivateSubContext(new LumiaFlashRomSourceSelectionViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToUnlockRoot, SwitchToDumpFFU, SwitchToBackup, FlashPartitions, FlashArchive, FlashFFU, FlashMMOS));
+            }
+        }
+
+        // Called from an event-handler. So, "async void" is valid here.
+        internal async void FlashPartitions(string EFIESPPath, string MainOSPath, string DataPath)
+        {
+            IsSwitchingInterface = true; // Prevents that a device is forced to Flash mode on this screen which is meant for flashing
+            try
+            {
+                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Flash,
+                    (msg, sub) =>
+                        ActivateSubContext(new BusyViewModel(msg, sub)));
+                if (((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadPhoneInfo(ExtendedInfo: false).FlashAppProtocolVersionMajor < 2)
+                {
+                    FlashPartitionsTask(EFIESPPath, MainOSPath, DataPath);
+                }
+                else
+                {
+                    await Task.Run(async () => await LumiaV2UnlockBootViewModel.LumiaV2FlashPartitions(PhoneNotifier, EFIESPPath, MainOSPath, DataPath, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure));
+                }
+            }
+            catch (Exception Ex)
+            {
+                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
+            }
+        }
+
+        internal void FlashPartitionsTask(string EFIESPPath, string MainOSPath, string DataPath)
+        {
+            new Thread(() =>
+                {
+                    bool Result = true;
+
+                    ActivateSubContext(new BusyViewModel("Initializing flash..."));
+
+                    NokiaFlashModel Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
+
+                    GPT GPT = Phone.ReadGPT();
+
+                    ulong TotalSizeSectors = 0;
+                    int PartitionCount = 0;
+                    ulong MainOSOldSectorCount = 0;
+                    ulong MainOSNewSectorCount = 0;
+                    ulong DataOldSectorCount = 0;
+                    ulong DataNewSectorCount = 0;
+                    ulong FirstMainOSSector = 0;
+
+                    try
+                    {
+                        if (EFIESPPath != null)
+                        {
+                            using Stream Stream = new DecompressedStream(File.Open(EFIESPPath, FileMode.Open));
+                            ulong StreamLengthInSectors = (ulong)Stream.Length / 0x200;
+                            TotalSizeSectors += StreamLengthInSectors;
+                            PartitionCount++;
+                            Partition Partition = GPT.Partitions.Find(p => string.Equals(p.Name, "EFIESP", StringComparison.CurrentCultureIgnoreCase));
+                            if (StreamLengthInSectors > Partition.SizeInSectors)
+                            {
+                                LogFile.Log("Flash failed! Size of partition 'EFIESP' is too big.");
+                                ExitFailure("Flash failed!", "Size of partition 'EFIESP' is too big.");
+                                return;
+                            }
+                        }
+
+                        if (MainOSPath != null)
+                        {
+                            using Stream Stream = new DecompressedStream(File.Open(MainOSPath, FileMode.Open));
+                            ulong StreamLengthInSectors = (ulong)Stream.Length / 0x200;
+                            TotalSizeSectors += StreamLengthInSectors;
+                            PartitionCount++;
+                            Partition Partition = GPT.Partitions.Find(p => string.Equals(p.Name, "MainOS", StringComparison.CurrentCultureIgnoreCase));
+                            MainOSOldSectorCount = Partition.SizeInSectors;
+                            MainOSNewSectorCount = StreamLengthInSectors;
+                            FirstMainOSSector = Partition.FirstSector;
+                        }
+
+                        if (DataPath != null)
+                        {
+                            using Stream Stream = new DecompressedStream(File.Open(DataPath, FileMode.Open));
+                            ulong StreamLengthInSectors = (ulong)Stream.Length / 0x200;
+                            TotalSizeSectors += StreamLengthInSectors;
+                            PartitionCount++;
+                            Partition Partition = GPT.Partitions.Find(p => string.Equals(p.Name, "Data", StringComparison.CurrentCultureIgnoreCase));
+                            DataOldSectorCount = Partition.SizeInSectors;
+                            DataNewSectorCount = StreamLengthInSectors;
+                        }
+                    }
+                    catch (Exception Ex)
+                    {
+                        LogFile.LogException(Ex);
+                        Result = false;
+                    }
+
+                    if ((MainOSNewSectorCount > 0) && (DataNewSectorCount > 0))
+                    {
+                        if ((MainOSNewSectorCount > MainOSOldSectorCount) || (DataNewSectorCount > DataOldSectorCount))
+                        {
+                            UInt64 OSSpace = GPT.LastUsableSector - FirstMainOSSector + 1;
+                            if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
+                            {
+                                // MainOS and Data partitions need to be re-aligned!
+                                Partition MainOSPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "MainOS", StringComparison.CurrentCultureIgnoreCase));
+                                Partition DataPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "Data", StringComparison.CurrentCultureIgnoreCase));
+                                MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
+                                DataPartition.FirstSector = MainOSPartition.LastSector + 1;
+                                DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
+                                Phone.WriteGPT(GPT);
+                            }
+                            else
+                            {
+                                LogFile.Log("Flash failed! Size of partitions 'MainOS' and 'Data' together are too big.");
+                                ExitFailure("Flash failed!", "Sizes of partitions 'MainOS' and 'Data' together are too big.");
+                                return;
+                            }
+                        }
+                    }
+                    else if ((MainOSNewSectorCount > 0) && (MainOSNewSectorCount > MainOSOldSectorCount))
+                    {
+                        LogFile.Log("Flash failed! Size of partition 'MainOS' is too big.");
+                        ExitFailure("Flash failed!", "Size of partition 'MainOS' is too big.");
+                        return;
+                    }
+                    else if ((DataNewSectorCount > 0) && (DataNewSectorCount > DataOldSectorCount))
+                    {
+                        LogFile.Log("Flash failed! Size of partition 'Data' is too big.");
+                        ExitFailure("Flash failed!", "Size of partition 'Data' together is too big.");
+                        return;
+                    }
+
+                    BusyViewModel Busy = new("Flashing...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                    ProgressUpdater Updater = Busy.ProgressUpdater;
+                    ActivateSubContext(Busy);
+
+                    int i = 0;
+                    if (Result)
+                    {
+                        try
+                        {
+                            if (EFIESPPath != null)
+                            {
+                                i++;
+                                Busy.Message = "Flashing partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                Phone.FlashRawPartition(EFIESPPath, "EFIESP", Updater);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                    }
+
+                    if (Result)
+                    {
+                        try
+                        {
+                            if (MainOSPath != null)
+                            {
+                                i++;
+                                Busy.Message = "Flashing partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                Phone.FlashRawPartition(MainOSPath, "MainOS", Updater);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                    }
+
+                    if (Result)
+                    {
+                        try
+                        {
+                            if (DataPath != null)
+                            {
+                                i++;
+                                Busy.Message = "Flashing partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                Phone.FlashRawPartition(DataPath, "Data", Updater);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                    }
+
+                    if (!Result)
+                    {
+                        ExitFailure("Flash failed!", null);
+                        return;
+                    }
+
+                    ExitSuccess("Flash successful! Make sure you disable Windows Update on the phone!", null);
+                }).Start();
+        }
+
+        // Called from an event-handler. So, "async void" is valid here.
+        internal async void FlashArchive(string ArchivePath)
+        {
+            IsSwitchingInterface = true; // Prevents that a device is forced to Flash mode on this screen which is meant for flashing
+            try
+            {
+                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Flash,
+                    (msg, sub) =>
+                        ActivateSubContext(new BusyViewModel(msg, sub)));
+                if (((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadPhoneInfo(ExtendedInfo: false).FlashAppProtocolVersionMajor < 2)
+                {
+                    FlashArchiveTask(ArchivePath);
+                }
+                else
+                {
+                    await Task.Run(async () => await LumiaV2UnlockBootViewModel.LumiaV2FlashArchive(PhoneNotifier, ArchivePath, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure));
+                }
+            }
+            catch (Exception Ex)
+            {
+                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
+            }
+        }
+
+        internal void FlashArchiveTask(string ArchivePath)
+        {
+            new Thread(() =>
+            {
+                ActivateSubContext(new BusyViewModel("Initializing flash..."));
+
+                NokiaFlashModel Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
+
+                ulong TotalSizeSectors = 0;
+                int PartitionCount = 0;
+                ulong MainOSOldSectorCount = 0;
+                ulong MainOSNewSectorCount = 0;
+                ulong DataOldSectorCount = 0;
+                ulong DataNewSectorCount = 0;
+                ulong FirstMainOSSector = 0;
+                bool GPTChanged = false;
+
+                try
+                {
+                    GPT GPT = Phone.ReadGPT();
+
+                    using FileStream FileStream = new(ArchivePath, FileMode.Open);
+                    using ZipArchive Archive = new(FileStream, ZipArchiveMode.Read);
+                    foreach (ZipArchiveEntry Entry in Archive.Entries)
+                    {
+                        // Determine if there is a partition layout present
+                        ZipArchiveEntry PartitionEntry = Archive.GetEntry("Partitions.xml");
+                        if (PartitionEntry == null)
+                        {
+                            GPT.MergePartitions(null, false, Archive);
+                            GPTChanged |= GPT.HasChanged;
+                        }
+                        else
+                        {
+                            using Stream ZipStream = PartitionEntry.Open();
+                            using StreamReader ZipReader = new(ZipStream);
+                            string PartitionXml = ZipReader.ReadToEnd();
+                            GPT.MergePartitions(PartitionXml, false, Archive);
+                            GPTChanged |= GPT.HasChanged;
+                        }
+
+                        // First determine if we need a new GPT!
+                        if (!Entry.FullName.Contains("/")) // No subfolders
+                        {
+                            string PartitionName = Path.GetFileNameWithoutExtension(Entry.Name);
+                            int P = PartitionName.IndexOf('.');
+                            if (P >= 0)
+                            {
+                                PartitionName = PartitionName.Substring(0, P); // Example: Data.bin.gz -> Data
+                            }
+
+                            Partition Partition = GPT.Partitions.Find(p => string.Equals(p.Name, PartitionName, StringComparison.CurrentCultureIgnoreCase));
+                            if (Partition != null)
+                            {
+                                DecompressedStream DecompressedStream = new(Entry.Open());
+                                ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
+                                try
+                                {
+                                    StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
+                                }
+                                catch { }
+
+                                TotalSizeSectors += StreamLengthInSectors;
+                                PartitionCount++;
+
+                                if (string.Equals(PartitionName, "MainOS", StringComparison.CurrentCultureIgnoreCase))
+                                {
+                                    MainOSOldSectorCount = Partition.SizeInSectors;
+                                    MainOSNewSectorCount = StreamLengthInSectors;
+                                    FirstMainOSSector = Partition.FirstSector;
+                                }
+                                else if (string.Equals(PartitionName, "Data", StringComparison.CurrentCultureIgnoreCase))
+                                {
+                                    DataOldSectorCount = Partition.SizeInSectors;
+                                    DataNewSectorCount = StreamLengthInSectors;
+                                }
+                                else if (StreamLengthInSectors > Partition.SizeInSectors)
+                                {
+                                    LogFile.Log("Flash failed! Size of partition '" + PartitionName + "' is too big.");
+                                    ExitFailure("Flash failed!", "Size of partition '" + PartitionName + "' is too big.");
+                                    return;
+                                }
+                            }
+                        }
+                    }
+
+                    if ((MainOSNewSectorCount > 0) && (DataNewSectorCount > 0))
+                    {
+                        if ((MainOSNewSectorCount > MainOSOldSectorCount) || (DataNewSectorCount > DataOldSectorCount))
+                        {
+                            UInt64 OSSpace = GPT.LastUsableSector - FirstMainOSSector + 1;
+                            if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
+                            {
+                                // MainOS and Data partitions need to be re-aligned!
+                                Partition MainOSPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "MainOS", StringComparison.CurrentCultureIgnoreCase));
+                                Partition DataPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "Data", StringComparison.CurrentCultureIgnoreCase));
+                                MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
+                                DataPartition.FirstSector = MainOSPartition.LastSector + 1;
+                                DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
+
+                                GPTChanged = true;
+                            }
+                            else
+                            {
+                                LogFile.Log("Flash failed! Size of partitions 'MainOS' and 'Data' together are too big.");
+                                ExitFailure("Flash failed!", "Sizes of partitions 'MainOS' and 'Data' together are too big.");
+                                return;
+                            }
+                        }
+                    }
+                    else if ((MainOSNewSectorCount > 0) && (MainOSNewSectorCount > MainOSOldSectorCount))
+                    {
+                        LogFile.Log("Flash failed! Size of partition 'MainOS' is too big.");
+                        ExitFailure("Flash failed!", "Size of partition 'MainOS' is too big.");
+                        return;
+                    }
+                    else if ((DataNewSectorCount > 0) && (DataNewSectorCount > DataOldSectorCount))
+                    {
+                        LogFile.Log("Flash failed! Size of partition 'Data' is too big.");
+                        ExitFailure("Flash failed!", "Size of partition 'Data' is too big.");
+                        return;
+                    }
+
+                    if (GPTChanged)
+                    {
+                        Phone.WriteGPT(GPT);
+                    }
+
+                    if (PartitionCount > 0)
+                    {
+                        BusyViewModel Busy = new("Flashing...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                        ProgressUpdater Updater = Busy.ProgressUpdater;
+                        ActivateSubContext(Busy);
+
+                        int i = 0;
+
+                        foreach (ZipArchiveEntry Entry in Archive.Entries)
+                        {
+                            // "MainOS.bin.gz" => "MainOS"
+                            string PartitionName = Entry.Name;
+                            int Pos = PartitionName.IndexOf('.');
+                            if (Pos >= 0)
+                            {
+                                PartitionName = PartitionName.Substring(0, Pos);
+                            }
+
+                            Partition Partition = GPT.Partitions.Find(p => string.Equals(p.Name, PartitionName, StringComparison.CurrentCultureIgnoreCase));
+                            if (Partition != null)
+                            {
+                                Stream DecompressedStream = new DecompressedStream(Entry.Open());
+                                ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
+                                try
+                                {
+                                    StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
+                                }
+                                catch { }
+
+                                if (StreamLengthInSectors <= Partition.SizeInSectors)
+                                {
+                                    i++;
+                                    Busy.Message = "Flashing partition " + Partition.Name + " (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                    Phone.FlashRawPartition(DecompressedStream, Partition.Name, Updater);
+                                }
+                                DecompressedStream.Close();
+                            }
+                        }
+                    }
+                    else
+                    {
+                        LogFile.Log("Flash failed! No valid partitions found in the archive.");
+                        ExitFailure("Flash failed!", "No valid partitions found in the archive");
+                        return;
+                    }
+                }
+                catch (Exception Ex)
+                {
+                    LogFile.LogException(Ex);
+                    if (Ex is WPinternalsException)
+                    {
+                        ExitFailure("Flash failed!", ((WPinternalsException)Ex).SubMessage);
+                    }
+                    else
+                    {
+                        ExitFailure("Flash failed!", null);
+                    }
+
+                    return;
+                }
+
+                ExitSuccess("Flash successful! Make sure you disable Windows Update on the phone!", null);
+            }).Start();
+        }
+
+        // Called from an event-handler. So, "async void" is valid here.
+        internal async void FlashFFU(string FFUPath)
+        {
+            IsSwitchingInterface = true; // Prevents that a device is forced to Flash mode on this screen which is meant for flashing
+            try
+            {
+                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Flash,
+                    (msg, sub) =>
+                        ActivateSubContext(new BusyViewModel(msg, sub)));
+                FlashFFUTask(FFUPath);
+            }
+            catch (Exception Ex)
+            {
+                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
+            }
+        }
+
+        internal void FlashFFUTask(string FFUPath)
+        {
+            new Thread(() =>
+            {
+                bool Result = true;
+
+                NokiaFlashModel Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
+                PhoneInfo Info = Phone.ReadPhoneInfo(false);
+
+                #region Remove bootloader changes
+
+                // If necessary remove bootloader changes
+                // In case the NV vars were redirected, and a stock FFU is flashed, then the IsFlashing flag will be cleared in the redirected NV vars
+                // And after a reboot the original NV vars are active again, but the IsFlashing flag is still set from when the bootloader was unlocked
+                // So we will first restore the GPT, so the original vars are active again.
+                // Then IsFlashing is true and the phone boots forcibly to FlashApp again.
+                // Then we start normal FFU flasing and at the end the IsFlashing flag is cleared in the original vars.
+
+                if (Info.FlashAppProtocolVersionMajor >= 2)
+                {
+                    byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(Phone, 0x20000); // TODO: Get proper profile FFU and get ChunkSizeInBytes
+                    GPT GPT = new(GPTChunk);
+                    FlashPart Part;
+                    List<FlashPart> FlashParts = new();
+
+                    Partition NvBackupPartition = GPT.GetPartition("BACKUP_BS_NV");
+                    if (NvBackupPartition != null)
+                    {
+                        // This must be a left over of a half unlocked bootloader
+                        Partition NvPartition = GPT.GetPartition("UEFI_BS_NV");
+                        NvBackupPartition.Name = "UEFI_BS_NV";
+                        NvBackupPartition.PartitionGuid = NvPartition.PartitionGuid;
+                        NvBackupPartition.PartitionTypeGuid = NvPartition.PartitionTypeGuid;
+                        GPT.Partitions.Remove(NvPartition);
+
+                        GPT.Rebuild();
+                        Part = new FlashPart
+                        {
+                            StartSector = 0,
+                            Stream = new MemoryStream(GPTChunk)
+                        };
+                        FlashParts.Add(Part);
+                    }
+
+                    bool ClearFlashingStatus = true;
+
+                    // We should only clear NV if there was no backup NV to be restored and the current NV contains the SB unlock.
+                    if ((NvBackupPartition == null) && !Info.UefiSecureBootEnabled)
+                    {
+                        // ClearNV
+                        Part = new FlashPart();
+                        Partition Target = GPT.GetPartition("UEFI_BS_NV");
+                        Part.StartSector = (UInt32)Target.FirstSector;
+                        Part.Stream = new MemoryStream(new byte[0x40000]);
+                        FlashParts.Add(Part);
+
+                        ClearFlashingStatus = false;
+                    }
+
+                    if (FlashParts.Count > 0)
+                    {
+                        ActivateSubContext(new BusyViewModel("Restoring bootloader..."));
+                        WPinternalsStatus LastStatus = WPinternalsStatus.Undefined;
+                        LumiaV2UnlockBootViewModel.LumiaV2CustomFlash(PhoneNotifier, FFUPath, false, false, FlashParts, true, ClearFlashingStatusAtEnd: ClearFlashingStatus,
+                            SetWorkingStatus: (m, s, v, a, st) =>
+                            {
+                                if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
+                                {
+                                    SetWorkingStatus(m, s, v, a, st);
+                                }
+                                else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
+                                {
+                                    SetWorkingStatus("Restoring bootloader...", null, null, Status: WPinternalsStatus.Flashing);
+                                }
+
+                                LastStatus = st;
+                            },
+                            UpdateWorkingStatus: (m, s, v, st) =>
+                            {
+                                if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
+                                {
+                                    UpdateWorkingStatus(m, s, v, st);
+                                }
+                                else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
+                                {
+                                    SetWorkingStatus("Restoring bootloader...", null, null, Status: WPinternalsStatus.Flashing);
+                                }
+
+                                LastStatus = st;
+                            }
+                        ).Wait();
+
+                        if ((PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Flash))
+                        {
+                            PhoneNotifier.WaitForArrival().Wait();
+                        }
+
+                        if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+                        {
+                            ((NokiaFlashModel)PhoneNotifier.CurrentModel).SwitchToFlashAppContext();
+                        }
+                    }
+                }
+
+                #endregion
+
+                Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
+
+                ActivateSubContext(new BusyViewModel("Initializing flash..."));
+
+                string ErrorSubMessage = null;
+
+                try
+                {
+                    FFU FFU = new(FFUPath);
+                    BusyViewModel Busy = new("Flashing original FFU...", MaxProgressValue: FFU.TotalChunkCount, UIContext: UIContext);
+                    ActivateSubContext(Busy);
+                    byte Options = 0;
+                    if (!Info.IsBootloaderSecure)
+                    {
+                        Options = (byte)((FlashOptions)Options | FlashOptions.SkipSignatureCheck);
+                    }
+
+                    Phone.FlashFFU(FFU, Busy.ProgressUpdater, true, Options);
+                }
+                catch (Exception Ex)
+                {
+                    LogFile.LogException(Ex);
+                    if (Ex is WPinternalsException)
+                    {
+                        ErrorSubMessage = ((WPinternalsException)Ex).SubMessage;
+                    }
+
+                    Result = false;
+                }
+
+                if (!Result)
+                {
+                    ExitFailure("Flash failed!", ErrorSubMessage);
+                    return;
+                }
+
+                ExitSuccess("Flash successful!", null);
+            }).Start();
+        }
+
+        // Called from an event-handler. So, "async void" is valid here.
+        internal async void FlashMMOS(string MMOSPath)
+        {
+            IsSwitchingInterface = true; // Prevents that a device is forced to Flash mode on this screen which is meant for flashing
+            try
+            {
+                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Flash,
+                    (msg, sub) =>
+                        ActivateSubContext(new BusyViewModel(msg, sub)));
+                FlashMMOSTask(MMOSPath);
+            }
+            catch (Exception Ex)
+            {
+                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
+            }
+        }
+
+        internal void FlashMMOSTask(string MMOSPath)
+        {
+            NokiaFlashModel Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
+            if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+            {
+                Phone.SwitchToFlashAppContext();
+            }
+
+            new Thread(() =>
+            {
+                bool Result = true;
+
+                ActivateSubContext(new BusyViewModel("Initializing flash..."));
+
+                string ErrorSubMessage = null;
+
+                try
+                {
+                    FileInfo info = new(MMOSPath);
+                    uint length = uint.Parse(info.Length.ToString());
+                    const int maximumbuffersize = 0x00240000;
+                    uint totalcounts = (uint)Math.Truncate((decimal)length / maximumbuffersize);
+                    BusyViewModel Busy = new("Flashing Test Mode package...", MaxProgressValue: totalcounts, UIContext: UIContext);
+                    ActivateSubContext(Busy);
+
+                    Phone.FlashMMOS(MMOSPath, Busy.ProgressUpdater);
+
+                    ActivateSubContext(new BusyViewModel("And now booting phone to MMOS...", "If the phone stays on the lightning cog screen for a while, you may need to unplug and replug the phone to continue the boot process."));
+
+                    PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                }
+                catch (Exception Ex)
+                {
+                    LogFile.LogException(Ex);
+                    if (Ex is WPinternalsException)
+                    {
+                        ErrorSubMessage = ((WPinternalsException)Ex).SubMessage;
+                    }
+
+                    Result = false;
+                }
+
+                if (!Result)
+                {
+                    ExitFailure("Flash failed!", ErrorSubMessage);
+                    return;
+                }
+            }).Start();
+        }
+
+        private void NewDeviceArrived(ArrivalEventArgs Args)
+        {
+            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
+
+            if (Args.NewInterface != PhoneInterfaces.Lumia_Label)
+            {
+                ExitFailure("Flash failed!", "Phone unexpectedly switched mode while booting MMOS image.");
+                return;
+            }
+            else
+            {
+                ExitSuccess("Flash successful!", null);
+                return;
+            }
+        }
+
+        // Called from an event-handler. So, "async void" is valid here.
+        internal async void Exit()
+        {
+            try
+            {
+                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Normal,
+                    (msg, sub) =>
+                        ActivateSubContext(new BusyViewModel(msg, sub)));
+                IsSwitchingInterface = false;
+                Callback();
+                ActivateSubContext(null);
+            }
+            catch (Exception Ex)
+            {
+                ActivateSubContext(new MessageViewModel(Ex.Message, () =>
+                {
+                    IsSwitchingInterface = false;
+                    Callback();
+                    ActivateSubContext(null);
+                }));
+            }
+        }
+
+        internal void ExitSuccess(string Message, string SubMessage)
+        {
+            MessageViewModel SuccessMessageViewModel = new(Message, () =>
+            {
+                // No need to call Exit() to go to normal mode, because it already switches to normal mode automatically.
+                IsSwitchingInterface = false; // From here on a device will be forced to Flash mode again on this screen which is meant for flashing
+                Callback();
+                ActivateSubContext(null);
+            });
+            SuccessMessageViewModel.SubMessage = SubMessage;
+            ActivateSubContext(SuccessMessageViewModel);
+        }
+
+        internal void ExitFailure(string Message, string SubMessage)
+        {
+            MessageViewModel ErrorMessageViewModel = new(Message, () =>
+            {
+                IsSwitchingInterface = false;
+                Callback();
+                ActivateSubContext(null);
+            });
+            ErrorMessageViewModel.SubMessage = SubMessage;
+            ActivateSubContext(ErrorMessageViewModel);
+        }
+    }
+}
diff --git a/ViewModels/LumiaInfoViewModel.cs b/WPinternals/ViewModels/LumiaInfoViewModel.cs
similarity index 97%
rename from ViewModels/LumiaInfoViewModel.cs
rename to WPinternals/ViewModels/LumiaInfoViewModel.cs
index 179158e..b0db205 100644
--- a/ViewModels/LumiaInfoViewModel.cs
+++ b/WPinternals/ViewModels/LumiaInfoViewModel.cs
@@ -1,88 +1,88 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace WPinternals
-{
-    internal class LumiaInfoViewModel : ContextViewModel
-    {
-        internal PhoneInterfaces? CurrentInterface;
-        internal IDisposable CurrentModel;
-        internal PhoneNotifierViewModel PhoneNotifier;
-        private readonly Action<PhoneInterfaces> ModeSwitchRequestCallback;
-        private readonly Action SwitchToGettingStarted;
-
-        internal LumiaInfoViewModel(PhoneNotifierViewModel PhoneNotifier, Action<PhoneInterfaces> ModeSwitchRequestCallback, Action SwitchToGettingStarted)
-            : base()
-        {
-            this.PhoneNotifier = PhoneNotifier;
-            this.ModeSwitchRequestCallback = ModeSwitchRequestCallback;
-            this.SwitchToGettingStarted = SwitchToGettingStarted;
-
-            CurrentInterface = PhoneNotifier.CurrentInterface;
-            CurrentModel = PhoneNotifier.CurrentModel;
-
-            PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-            PhoneNotifier.DeviceRemoved += DeviceRemoved;
-        }
-
-        ~LumiaInfoViewModel()
-        {
-            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
-            PhoneNotifier.DeviceRemoved -= DeviceRemoved;
-        }
-
-        private void DeviceRemoved()
-        {
-            CurrentInterface = null;
-            CurrentModel = null;
-            ActivateSubContext(null);
-        }
-
-        private void NewDeviceArrived(ArrivalEventArgs Args)
-        {
-            CurrentInterface = Args.NewInterface;
-            CurrentModel = Args.NewModel;
-
-            // Determine SubcontextViewModel
-            switch (CurrentInterface)
-            {
-                case null:
-                case PhoneInterfaces.Lumia_Bootloader:
-                    ActivateSubContext(null);
-                    //ActivateSubContext(new NokiaBootloaderViewModel((NokiaFlashModel)CurrentModel, ModeSwitchRequestCallback, SwitchToGettingStarted));
-                    break;
-                case PhoneInterfaces.Lumia_Normal:
-                    ActivateSubContext(new NokiaNormalViewModel((NokiaPhoneModel)CurrentModel, ModeSwitchRequestCallback));
-                    break;
-                case PhoneInterfaces.Lumia_Flash:
-                    ActivateSubContext(new NokiaFlashViewModel((NokiaFlashModel)CurrentModel, ModeSwitchRequestCallback, SwitchToGettingStarted));
-                    break;
-                case PhoneInterfaces.Lumia_Label:
-                    ActivateSubContext(new NokiaLabelViewModel((NokiaPhoneModel)CurrentModel, ModeSwitchRequestCallback));
-                    break;
-                case PhoneInterfaces.Lumia_MassStorage:
-                    ActivateSubContext(new NokiaMassStorageViewModel((MassStorage)CurrentModel));
-                    break;
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+
+namespace WPinternals
+{
+    internal class LumiaInfoViewModel : ContextViewModel
+    {
+        internal PhoneInterfaces? CurrentInterface;
+        internal IDisposable CurrentModel;
+        internal PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action<PhoneInterfaces> ModeSwitchRequestCallback;
+        private readonly Action SwitchToGettingStarted;
+
+        internal LumiaInfoViewModel(PhoneNotifierViewModel PhoneNotifier, Action<PhoneInterfaces> ModeSwitchRequestCallback, Action SwitchToGettingStarted)
+            : base()
+        {
+            this.PhoneNotifier = PhoneNotifier;
+            this.ModeSwitchRequestCallback = ModeSwitchRequestCallback;
+            this.SwitchToGettingStarted = SwitchToGettingStarted;
+
+            CurrentInterface = PhoneNotifier.CurrentInterface;
+            CurrentModel = PhoneNotifier.CurrentModel;
+
+            PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+            PhoneNotifier.DeviceRemoved += DeviceRemoved;
+        }
+
+        ~LumiaInfoViewModel()
+        {
+            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
+            PhoneNotifier.DeviceRemoved -= DeviceRemoved;
+        }
+
+        private void DeviceRemoved()
+        {
+            CurrentInterface = null;
+            CurrentModel = null;
+            ActivateSubContext(null);
+        }
+
+        private void NewDeviceArrived(ArrivalEventArgs Args)
+        {
+            CurrentInterface = Args.NewInterface;
+            CurrentModel = Args.NewModel;
+
+            // Determine SubcontextViewModel
+            switch (CurrentInterface)
+            {
+                case null:
+                case PhoneInterfaces.Lumia_Bootloader:
+                    ActivateSubContext(null);
+                    //ActivateSubContext(new NokiaBootloaderViewModel((NokiaFlashModel)CurrentModel, ModeSwitchRequestCallback, SwitchToGettingStarted));
+                    break;
+                case PhoneInterfaces.Lumia_Normal:
+                    ActivateSubContext(new NokiaNormalViewModel((NokiaPhoneModel)CurrentModel, ModeSwitchRequestCallback));
+                    break;
+                case PhoneInterfaces.Lumia_Flash:
+                    ActivateSubContext(new NokiaFlashViewModel((NokiaFlashModel)CurrentModel, ModeSwitchRequestCallback, SwitchToGettingStarted));
+                    break;
+                case PhoneInterfaces.Lumia_Label:
+                    ActivateSubContext(new NokiaLabelViewModel((NokiaPhoneModel)CurrentModel, ModeSwitchRequestCallback));
+                    break;
+                case PhoneInterfaces.Lumia_MassStorage:
+                    ActivateSubContext(new NokiaMassStorageViewModel((MassStorage)CurrentModel));
+                    break;
+            }
+        }
+    }
+}
diff --git a/ViewModels/LumiaModeViewModel.cs b/WPinternals/ViewModels/LumiaModeViewModel.cs
similarity index 97%
rename from ViewModels/LumiaModeViewModel.cs
rename to WPinternals/ViewModels/LumiaModeViewModel.cs
index c6fa9ad..fe4b035 100644
--- a/ViewModels/LumiaModeViewModel.cs
+++ b/WPinternals/ViewModels/LumiaModeViewModel.cs
@@ -1,132 +1,132 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace WPinternals
-{
-    internal class LumiaModeViewModel : ContextViewModel
-    {
-        internal PhoneInterfaces? CurrentInterface;
-        internal IDisposable CurrentModel;
-        internal PhoneNotifierViewModel PhoneNotifier;
-        private readonly Action Callback;
-
-        internal LumiaModeViewModel(PhoneNotifierViewModel PhoneNotifier, Action Callback)
-            : base()
-        {
-            this.PhoneNotifier = PhoneNotifier;
-            this.Callback = Callback;
-
-            CurrentInterface = PhoneNotifier.CurrentInterface;
-            CurrentModel = PhoneNotifier.CurrentModel;
-
-            PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-            PhoneNotifier.DeviceRemoved += DeviceRemoved;
-        }
-
-        ~LumiaModeViewModel()
-        {
-            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
-            PhoneNotifier.DeviceRemoved -= DeviceRemoved;
-        }
-
-        private void DeviceRemoved()
-        {
-            CurrentInterface = null;
-            CurrentModel = null;
-
-            if (!IsSwitchingInterface)
-            {
-                ActivateSubContext(null);
-            }
-        }
-
-        private void NewDeviceArrived(ArrivalEventArgs Args)
-        {
-            CurrentInterface = Args.NewInterface;
-            CurrentModel = Args.NewModel;
-
-            if (!IsSwitchingInterface && IsActive)
-            {
-                Refresh();
-            }
-        }
-
-        internal override void EvaluateViewState()
-        {
-            if (!IsSwitchingInterface && IsActive)
-            {
-                Refresh();
-            }
-        }
-
-        private void Refresh()
-        {
-            // Determine SubcontextViewModel
-            switch (CurrentInterface)
-            {
-                case null:
-                    ActivateSubContext(null);
-                    break;
-                case PhoneInterfaces.Lumia_Bootloader:
-                    ActivateSubContext(null);
-                    //ActivateSubContext(new NokiaModeBootloaderViewModel((NokiaFlashModel)CurrentModel, OnModeSwitchRequested));
-                    break;
-                case PhoneInterfaces.Lumia_Normal:
-                    ActivateSubContext(new NokiaModeNormalViewModel((NokiaPhoneModel)CurrentModel, OnModeSwitchRequested));
-                    break;
-                case PhoneInterfaces.Lumia_Flash:
-                    ActivateSubContext(new NokiaModeFlashViewModel((NokiaFlashModel)CurrentModel, OnModeSwitchRequested));
-                    break;
-                case PhoneInterfaces.Lumia_Label:
-                    ActivateSubContext(new NokiaModeLabelViewModel((NokiaPhoneModel)CurrentModel, OnModeSwitchRequested));
-                    break;
-                case PhoneInterfaces.Lumia_MassStorage:
-                    ActivateSubContext(new NokiaModeMassStorageViewModel((MassStorage)CurrentModel, OnModeSwitchRequested));
-                    break;
-            }
-        }
-
-        // Called from eventhandler, so "async void" is valid here.
-        internal async void OnModeSwitchRequested(PhoneInterfaces? TargetInterface)
-        {
-            IsSwitchingInterface = true;
-
-            try
-            {
-                await SwitchModeViewModel.SwitchToWithStatus(PhoneNotifier, TargetInterface, SetWorkingStatus, UpdateWorkingStatus, null); // This is a manual switch. We don't care about which volume arrives.
-
-                IsSwitchingInterface = false;
-                Callback();
-                Refresh();
-            }
-            catch (Exception Ex)
-            {
-                IsSwitchingInterface = false;
-                ActivateSubContext(new MessageViewModel(Ex.Message, () =>
-                {
-                    Callback();
-                    Refresh();
-                }));
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+
+namespace WPinternals
+{
+    internal class LumiaModeViewModel : ContextViewModel
+    {
+        internal PhoneInterfaces? CurrentInterface;
+        internal IDisposable CurrentModel;
+        internal PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action Callback;
+
+        internal LumiaModeViewModel(PhoneNotifierViewModel PhoneNotifier, Action Callback)
+            : base()
+        {
+            this.PhoneNotifier = PhoneNotifier;
+            this.Callback = Callback;
+
+            CurrentInterface = PhoneNotifier.CurrentInterface;
+            CurrentModel = PhoneNotifier.CurrentModel;
+
+            PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+            PhoneNotifier.DeviceRemoved += DeviceRemoved;
+        }
+
+        ~LumiaModeViewModel()
+        {
+            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
+            PhoneNotifier.DeviceRemoved -= DeviceRemoved;
+        }
+
+        private void DeviceRemoved()
+        {
+            CurrentInterface = null;
+            CurrentModel = null;
+
+            if (!IsSwitchingInterface)
+            {
+                ActivateSubContext(null);
+            }
+        }
+
+        private void NewDeviceArrived(ArrivalEventArgs Args)
+        {
+            CurrentInterface = Args.NewInterface;
+            CurrentModel = Args.NewModel;
+
+            if (!IsSwitchingInterface && IsActive)
+            {
+                Refresh();
+            }
+        }
+
+        internal override void EvaluateViewState()
+        {
+            if (!IsSwitchingInterface && IsActive)
+            {
+                Refresh();
+            }
+        }
+
+        private void Refresh()
+        {
+            // Determine SubcontextViewModel
+            switch (CurrentInterface)
+            {
+                case null:
+                    ActivateSubContext(null);
+                    break;
+                case PhoneInterfaces.Lumia_Bootloader:
+                    ActivateSubContext(null);
+                    //ActivateSubContext(new NokiaModeBootloaderViewModel((NokiaFlashModel)CurrentModel, OnModeSwitchRequested));
+                    break;
+                case PhoneInterfaces.Lumia_Normal:
+                    ActivateSubContext(new NokiaModeNormalViewModel((NokiaPhoneModel)CurrentModel, OnModeSwitchRequested));
+                    break;
+                case PhoneInterfaces.Lumia_Flash:
+                    ActivateSubContext(new NokiaModeFlashViewModel((NokiaFlashModel)CurrentModel, OnModeSwitchRequested));
+                    break;
+                case PhoneInterfaces.Lumia_Label:
+                    ActivateSubContext(new NokiaModeLabelViewModel((NokiaPhoneModel)CurrentModel, OnModeSwitchRequested));
+                    break;
+                case PhoneInterfaces.Lumia_MassStorage:
+                    ActivateSubContext(new NokiaModeMassStorageViewModel((MassStorage)CurrentModel, OnModeSwitchRequested));
+                    break;
+            }
+        }
+
+        // Called from eventhandler, so "async void" is valid here.
+        internal async void OnModeSwitchRequested(PhoneInterfaces? TargetInterface)
+        {
+            IsSwitchingInterface = true;
+
+            try
+            {
+                await SwitchModeViewModel.SwitchToWithStatus(PhoneNotifier, TargetInterface, SetWorkingStatus, UpdateWorkingStatus, null); // This is a manual switch. We don't care about which volume arrives.
+
+                IsSwitchingInterface = false;
+                Callback();
+                Refresh();
+            }
+            catch (Exception Ex)
+            {
+                IsSwitchingInterface = false;
+                ActivateSubContext(new MessageViewModel(Ex.Message, () =>
+                {
+                    Callback();
+                    Refresh();
+                }));
+            }
+        }
+    }
+}
diff --git a/ViewModels/LumiaUnlockBootViewModel.cs b/WPinternals/ViewModels/LumiaUnlockBootViewModel.cs
similarity index 97%
rename from ViewModels/LumiaUnlockBootViewModel.cs
rename to WPinternals/ViewModels/LumiaUnlockBootViewModel.cs
index 1b1c709..4268a08 100644
--- a/ViewModels/LumiaUnlockBootViewModel.cs
+++ b/WPinternals/ViewModels/LumiaUnlockBootViewModel.cs
@@ -1,1105 +1,1105 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using Microsoft.Win32;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WPinternals
-{
-    // Create this class on the UI thread, after the main-window of the application is initialized.
-    // It is necessary to create the object on the UI thread, because notification events to the View need to be fired on that thread.
-    // The Model for this ViewModel communicates over USB and for that it uses the hWnd of the main window.
-    // Therefore the main window must be created before the ViewModel is created.
-
-    internal enum MachineState
-    {
-        Default,
-        LumiaUnlockBoot
-    };
-
-    internal class LumiaUnlockBootViewModel : ContextViewModel
-    {
-        private readonly PhoneNotifierViewModel PhoneNotifier;
-        private readonly Action Callback;
-        private string FFUPath;
-        private string LoadersPath;
-        private string SBL3Path;
-        private string ProfileFFUPath;
-        private string EDEPath;
-        private string SupportedFFUPath;
-        private bool IsBootLoaderUnlocked;
-        private byte[] RootKeyHash = null;
-        private readonly Action SwitchToFlashRom;
-        private readonly Action SwitchToUndoRoot;
-        private readonly Action SwitchToDownload;
-        private readonly bool DoUnlock;
-        private MachineState State;
-        private readonly object EvaluateViewStateLockObject = new();
-
-        internal LumiaUnlockBootViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToFlashRom, Action SwitchToUndoRoot, Action SwitchToDownload, bool DoUnlock, Action Callback)
-            : base()
-        {
-            IsSwitchingInterface = false;
-            IsFlashModeOperation = true;
-
-            this.PhoneNotifier = PhoneNotifier;
-            this.SwitchToFlashRom = SwitchToFlashRom;
-            this.SwitchToUndoRoot = SwitchToUndoRoot;
-            this.SwitchToDownload = SwitchToDownload;
-            this.DoUnlock = DoUnlock;
-            this.Callback = Callback;
-
-            State = MachineState.Default;
-
-            this.PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-
-            // ViewState will be evaluated as soon as this object is set as DataContext
-        }
-
-        ~LumiaUnlockBootViewModel()
-        {
-            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
-        }
-
-        // Potentially blocking UI. Threadsafe.
-        internal override void EvaluateViewState()
-        {
-            if (!IsActive)
-            {
-                return;
-            }
-
-            if (State == MachineState.LumiaUnlockBoot)
-            {
-                return;
-            }
-
-            lock (EvaluateViewStateLockObject)
-            {
-                switch (PhoneNotifier.CurrentInterface)
-                {
-                    case PhoneInterfaces.Lumia_Normal:
-                    case PhoneInterfaces.Lumia_Label:
-                        IsSwitchingInterface = false;
-                        if (DoUnlock)
-                        {
-                            // Display View to switch to Flash mode
-                            LogFile.Log("Start unlock. Phone needs to switch to Flash-mode");
-                            ActivateSubContext(new MessageViewModel("In order to start unlocking the bootloader, the phone needs to be switched to Flash-mode.", SwitchToFlashMode, Exit));
-                        }
-                        else
-                        {
-                            // Display View to switch to Flash mode
-                            LogFile.Log("Start boot restore. Phone needs to switch to Flash-mode");
-                            ActivateSubContext(new MessageViewModel("In order to start restoring the bootloader, the phone needs to be switched to Flash-mode.", SwitchToFlashMode, Exit));
-                        }
-                        break;
-                    case PhoneInterfaces.Lumia_Flash:
-                        // Display View with device info and request for resources
-                        // Click on "Continue" will start processing all resources
-                        // Processing may fail with error message
-                        // Or processing will succeed and user will again be asked to continue with Bricking-procedure (to switch to emergency mode)
-
-                        // This code is not always invoked by OnArrival event.
-                        // So this is not always in a thread from the threadpool.
-                        // So we need to avoid UI blocking code here.
-
-                        IsSwitchingInterface = false;
-
-                        int TestPos = 0;
-
-                        try // In case phone reboots during the time that status is being read
-                        {
-                            // Some phones, like Lumia 928 verizon, do not support the Terminal interface!
-                            // To read the RootKeyHash we use ReadParam("RRKH"), instead of GetTerminalResponse().RootKeyHash.
-                            RootKeyHash = ((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadParam("RRKH");
-
-                            TestPos = 1;
-
-                            UefiSecurityStatusResponse SecurityStatus = ((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadSecurityStatus();
-                            if (SecurityStatus != null)
-                            {
-                                IsBootLoaderUnlocked = SecurityStatus.AuthenticationStatus || SecurityStatus.RdcStatus || !SecurityStatus.SecureFfuEfuseStatus;
-                            }
-
-                            TestPos = 2;
-
-                            PhoneInfo Info = ((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadPhoneInfo();
-                            if (SecurityStatus == null)
-                            {
-                                IsBootLoaderUnlocked = !Info.IsBootloaderSecure;
-                            }
-
-                            if (RootKeyHash == null)
-                            {
-                                RootKeyHash = Info.RKH ?? (new byte[32]);
-                            }
-
-                            TestPos = 3;
-
-                            if (Info.FlashAppProtocolVersionMajor < 2)
-                            {
-                                // This action is executed after the resources are selected by the user.
-                                void ReturnFunction(string FFUPath, string LoadersPath, string SBL3Path, string ProfileFFUPath, string EDEPath, string SupportedFFUPath, bool DoFixBoot)
-                                {
-                                    // Stop responding to device arrival here, because all connections are handled by subfunctions, not here.
-                                    IsSwitchingInterface = true;
-                                    State = MachineState.LumiaUnlockBoot;
-
-                                    // This is a callback on the UI thread
-                                    // Resources are confirmed by user
-                                    this.FFUPath = FFUPath;
-                                    this.LoadersPath = LoadersPath;
-                                    this.SBL3Path = SBL3Path;
-                                    this.SupportedFFUPath = SupportedFFUPath;
-                                    StorePaths();
-
-                                    LogFile.Log("Processing resources:");
-                                    LogFile.Log("FFU: " + FFUPath);
-                                    LogFile.Log("Loaders: " + LoadersPath);
-                                    if (SBL3Path == null)
-                                    {
-                                        LogFile.Log("No SBL3 specified");
-                                    }
-                                    else
-                                    {
-                                        LogFile.Log("SBL3: " + SBL3Path);
-                                    }
-
-                                    ActivateSubContext(new BusyViewModel("Processing resources..."));
-
-                                    if (DoUnlock)
-                                    {
-                                        Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1UnlockFirmware(PhoneNotifier, FFUPath, LoadersPath, SBL3Path, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
-                                    }
-                                    else
-                                    {
-                                        Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1RelockFirmware(PhoneNotifier, FFUPath, LoadersPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
-                                    }
-                                }
-
-                                if (DoUnlock)
-                                {
-                                    ActivateSubContext(new BootUnlockResourcesViewModel("Lumia Flash mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunction, Abort, IsBootLoaderUnlocked, false));
-                                }
-                                else
-                                {
-                                    ActivateSubContext(new BootRestoreResourcesViewModel("Lumia Flash mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunction, Abort, IsBootLoaderUnlocked, false));
-                                }
-                            }
-                            else
-                            {
-                                bool AlreadyUnlocked = false;
-                                if (DoUnlock)
-                                {
-                                    NokiaFlashModel FlashModel = (NokiaFlashModel)PhoneNotifier.CurrentModel;
-                                    GPT GPT = FlashModel.ReadGPT();
-                                    if ((GPT.GetPartition("IS_UNLOCKED") != null) || (GPT.GetPartition("BACKUP_EFIESP") != null))
-                                    {
-                                        //ExitMessage("Phone is already unlocked", null);
-                                        //return;
-                                        AlreadyUnlocked = true;
-                                    }
-                                }
-
-                                TestPos = 4;
-
-                                // Stop responding to device arrival here, because all connections are handled by subfunctions, not here.
-                                IsSwitchingInterface = true;
-
-                                // This action is executed after the resources are selected by the user.
-                                void ReturnFunction(string FFUPath, string LoadersPath, string SBL3Path, string ProfileFFUPath, string EDEPath, string SupportedFFUPath, bool DoFixBoot)
-                                {
-                                    IsSwitchingInterface = true;
-                                    State = MachineState.LumiaUnlockBoot;
-                                    if (DoUnlock)
-                                    {
-                                        // This is a callback on the UI thread
-                                        // Resources are confirmed by user
-                                        this.ProfileFFUPath = ProfileFFUPath;
-                                        this.EDEPath = EDEPath;
-                                        this.SupportedFFUPath = SupportedFFUPath;
-                                        StorePaths();
-
-                                        if (DoFixBoot)
-                                        {
-                                            LogFile.Log("Fix Boot");
-                                        }
-                                        else
-                                        {
-                                            LogFile.Log("Unlock Bootloader");
-                                        }
-
-                                        LogFile.Log("Processing resources:");
-                                        LogFile.Log("Profile FFU: " + ProfileFFUPath);
-                                        LogFile.Log("EDE file: " + EDEPath);
-                                        if (SupportedFFUPath != null)
-                                        {
-                                            LogFile.Log("Donor-FFU with supported OS version: " + SupportedFFUPath);
-                                        }
-
-                                        Task.Run(async () =>
-                                            {
-                                                if (DoFixBoot)
-                                                {
-                                                    await LumiaV2UnlockBootViewModel.LumiaV2FixBoot(PhoneNotifier, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
-                                                }
-                                                else if (!AlreadyUnlocked)
-                                                {
-                                                    await LumiaUnlockBootloaderViewModel.LumiaV2UnlockUEFI(PhoneNotifier, ProfileFFUPath, EDEPath, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
-                                                }
-                                                else
-                                                {
-                                                    await LumiaUnlockBootloaderViewModel.LumiaV2UnlockUEFI(PhoneNotifier, ProfileFFUPath, EDEPath, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage, true);
-                                                }
-                                            });
-                                    }
-                                    else
-                                    {
-                                        Task.Run(async () =>
-                                        {
-                                            FFU ProfileFFU = null;
-
-                                            List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => Info.PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists()).ToList();
-                                            ProfileFFU = FFUs.Count > 0
-                                                ? new FFU(FFUs[0].Path)
-                                                : throw new WPinternalsException("Profile FFU missing", "No profile FFU has been found in the repository for your device. You can add a profile FFU within the download section of the tool or by using the command line.");
-
-                                            LogFile.Log("Profile FFU: " + ProfileFFU.Path);
-
-                                            await LumiaUnlockBootloaderViewModel.LumiaV2RelockUEFI(PhoneNotifier, ProfileFFU.Path, true, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
-                                        });
-                                    }
-                                }
-
-                                TestPos = 5;
-
-                                if (DoUnlock)
-                                {
-                                    ActivateSubContext(new BootUnlockResourcesViewModel("Lumia Flash mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunction, Abort, IsBootLoaderUnlocked, true, Info.PlatformID, Info.Type));
-                                }
-                                else
-                                {
-                                    ActivateSubContext(new BootRestoreResourcesViewModel("Lumia Flash mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunction, Abort, IsBootLoaderUnlocked, true, Info.PlatformID, Info.Type));
-                                }
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex, LogType.FileAndConsole, TestPos.ToString());
-                        }
-                        break;
-                    case PhoneInterfaces.Qualcomm_Download:
-                        IsSwitchingInterface = false;
-
-                        // If resources are not confirmed yet, then display view with device info and request for resources.
-                        QualcommDownload Download = new((QualcommSerial)PhoneNotifier.CurrentModel);
-                        byte[] QualcommRootKeyHash;
-
-                        try
-                        {
-                            QualcommRootKeyHash = Download.GetRKH();
-                        }
-                        catch (BadConnectionException)
-                        {
-                            // This is a Spec B device
-                            break;
-                        }
-
-                        if (RootKeyHash == null)
-                        {
-                            RootKeyHash = QualcommRootKeyHash;
-                        }
-                        else if (!StructuralComparisons.StructuralEqualityComparer.Equals(RootKeyHash, QualcommRootKeyHash))
-                        {
-                            LogFile.Log("Error: Root Key Hash in Qualcomm Emergency mode does not match!");
-                            ActivateSubContext(new MessageViewModel("Error: Root Key Hash in Qualcomm Emergency mode does not match!", Callback));
-                            return;
-                        }
-
-                        // This action is executed after the user selected the resources.
-                        Action<string, string, string, string, string, string, bool> ReturnFunctionD = (FFUPath, LoadersPath, SBL3Path, ProfileFFUPath, EDEPath, SupportedFFUPath, DoFixBoot) =>
-                        {
-                            IsSwitchingInterface = true;
-                            State = MachineState.LumiaUnlockBoot;
-                            // This is a callback on the UI thread
-                            // Resources are confirmed by user
-                            this.FFUPath = FFUPath;
-                            this.LoadersPath = LoadersPath;
-                            this.SBL3Path = SBL3Path;
-                            StorePaths();
-
-                            LogFile.Log("Processing resources:");
-                            LogFile.Log("FFU: " + FFUPath);
-                            LogFile.Log("Loaders: " + LoadersPath);
-                            if (SBL3Path == null)
-                            {
-                                LogFile.Log("No SBL3 specified");
-                            }
-                            else
-                            {
-                                LogFile.Log("SBL3: " + SBL3Path);
-                            }
-
-                            ActivateSubContext(new BusyViewModel("Processing resources..."));
-
-                            if (DoUnlock)
-                            {
-                                Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1UnlockFirmware(PhoneNotifier, FFUPath, LoadersPath, SBL3Path, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
-                            }
-                            else
-                            {
-                                Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1RelockFirmware(PhoneNotifier, FFUPath, LoadersPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
-                            }
-                        };
-
-                        if (DoUnlock)
-                        {
-                            ActivateSubContext(new BootUnlockResourcesViewModel("Qualcomm Emergency Download mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunctionD, Abort, IsBootLoaderUnlocked, false));
-                        }
-                        else
-                        {
-                            ActivateSubContext(new BootRestoreResourcesViewModel("Qualcomm Emergency Download mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunctionD, Abort, IsBootLoaderUnlocked, false));
-                        }
-
-                        break;
-                    case PhoneInterfaces.Qualcomm_Flash:
-                        {
-                            IsSwitchingInterface = true;
-                            State = MachineState.LumiaUnlockBoot;
-                            ActivateSubContext(new BusyViewModel("Recovering resources..."));
-
-                            LogFile.Log("Phone was unexpectedly detected in this mode while resources were not loaded yet.");
-                            LogFile.Log("WPInternals tool probably crashed in previous session.");
-                            LogFile.Log("Trying to recover resources from the registry.");
-
-                            FFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "FFUPath", null);
-                            SupportedFFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SupportedFFUPath", null);
-                            LoadersPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "LoadersPath", null);
-                            SBL3Path = DoUnlock ? (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SBL3Path", null) : null;
-
-                            if (DoUnlock)
-                            {
-                                Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1UnlockFirmware(PhoneNotifier, FFUPath, LoadersPath, SBL3Path, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
-                            }
-                            else
-                            {
-                                Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1RelockFirmware(PhoneNotifier, FFUPath, LoadersPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
-                            }
-                            break;
-                        }
-                    default:
-                        // Show View "Waiting for connection"
-                        IsSwitchingInterface = false;
-                        ActivateSubContext(null);
-                        break;
-                }
-            }
-        }
-
-        private void SwitchToFlashMode()
-        {
-            // SwitchModeViewModel must be created on the UI thread
-            IsSwitchingInterface = true;
-            UIContext.Post(async (t) =>
-                {
-                    LogFile.Log("Switching to Flash-mode");
-
-                    try
-                    {
-                        await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Flash,
-                            (msg, sub) =>
-                                ActivateSubContext(new BusyViewModel(msg, sub)));
-                    }
-                    catch (Exception Ex)
-                    {
-                        ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
-                    }
-                }, null);
-        }
-
-        private void Abort()
-        {
-            // SwitchModeViewModel must be created on the UI thread
-            IsSwitchingInterface = false;
-            UIContext.Post((t) =>
-                {
-                    StorePaths();
-                    LogFile.Log("Aborting.");
-                    Exit();
-                }, null);
-        }
-
-        private void StorePaths()
-        {
-            RegistryKey Key = Registry.CurrentUser.OpenSubKey(@"Software\WPInternals", true) ?? Registry.CurrentUser.CreateSubKey(@"Software\WPInternals");
-
-            if (FFUPath == null)
-            {
-                if (Key.GetValue("FFUPath") != null)
-                {
-                    Key.DeleteValue("FFUPath");
-                }
-            }
-            else
-            {
-                Key.SetValue("FFUPath", FFUPath);
-            }
-
-            if (LoadersPath == null)
-            {
-                if (Key.GetValue("LoadersPath") != null)
-                {
-                    Key.DeleteValue("LoadersPath");
-                }
-            }
-            else
-            {
-                Key.SetValue("LoadersPath", LoadersPath);
-            }
-
-            if (DoUnlock)
-            {
-                if (SBL3Path == null)
-                {
-                    if (Key.GetValue("SBL3Path") != null)
-                    {
-                        Key.DeleteValue("SBL3Path");
-                    }
-                }
-                else
-                {
-                    Key.SetValue("SBL3Path", SBL3Path);
-                }
-            }
-
-            if (ProfileFFUPath == null)
-            {
-                if (Key.GetValue("ProfileFFUPath") != null)
-                {
-                    Key.DeleteValue("ProfileFFUPath");
-                }
-            }
-            else
-            {
-                Key.SetValue("ProfileFFUPath", ProfileFFUPath);
-
-                App.Config.AddFfuToRepository(ProfileFFUPath);
-            }
-
-            if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Qualcomm_Download && PhoneNotifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
-            {
-                NokiaFlashModel Model = (NokiaFlashModel)PhoneNotifier.CurrentModel;
-                PhoneInfo Info = Model.ReadPhoneInfo();
-
-                if (EDEPath == null)
-                {
-                    if (Key.GetValue("EDEPath") != null)
-                    {
-                        Key.DeleteValue("EDEPath");
-                    }
-                }
-                else
-                {
-                    Key.SetValue("EDEPath", EDEPath);
-
-                    App.Config.AddEmergencyToRepository(Info.Type, EDEPath, null);
-                }
-            }
-
-            if (SupportedFFUPath != null)
-            {
-                Key.SetValue("SupportedFFUPath", SupportedFFUPath);
-
-                App.Config.AddFfuToRepository(SupportedFFUPath);
-            }
-
-            Key.Close();
-        }
-
-        private void Exit()
-        {
-            IsSwitchingInterface = false; // From here on a device will be forced to Flash mode again on this screen which is meant for flashing
-
-            FFUPath = null;
-            LoadersPath = null;
-            SBL3Path = null;
-
-            Callback();
-            ActivateSubContext(null);
-        }
-
-        internal void ExitMessage(string Message, string SubMessage)
-        {
-            // SecureBoot Unlock v2 is done. Reactivate phone arrival events.
-            MessageViewModel SuccessMessageViewModel = new(Message, () =>
-            {
-                State = MachineState.Default;
-                Exit();
-            });
-            SuccessMessageViewModel.SubMessage = SubMessage;
-            ActivateSubContext(SuccessMessageViewModel);
-        }
-
-        private void NewDeviceArrived(ArrivalEventArgs Args)
-        {
-            // Do not start on a new thread, because EvaluateViewState will also create new ViewModels and those should be created on the UI thread.
-            EvaluateViewState();
-        }
-    }
-
-    internal class BootUnlockResourcesViewModel : FlashResourcesViewModel
-    {
-        internal BootUnlockResourcesViewModel(string CurrentMode, byte[] RootKeyHash, Action SwitchToFlashRom, Action SwitchToUndoRoot, Action SwitchToDownload, Action<string, string, string, string, string, string, bool> Result, Action Abort, bool IsBootLoaderUnlocked, bool TargetHasNewFlashProtocol, string PlatformID = null, string ProductType = null)
-            : base(CurrentMode, RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, Result, Abort, IsBootLoaderUnlocked, TargetHasNewFlashProtocol, PlatformID, ProductType)
-        {
-            SBL3Path = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SBL3Path", null);
-        }
-    }
-
-    internal class BootRestoreResourcesViewModel : FlashResourcesViewModel
-    {
-        internal BootRestoreResourcesViewModel(string CurrentMode, byte[] RootKeyHash, Action SwitchToFlashRom, Action SwitchToUndoRoot, Action SwitchToDownload, Action<string, string, string, string, string, string, bool> Result, Action Abort, bool IsBootLoaderUnlocked, bool TargetHasNewFlashProtocol, string PlatformID = null, string ProductType = null)
-            : base(CurrentMode, RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, Result, Abort, IsBootLoaderUnlocked, TargetHasNewFlashProtocol, PlatformID, ProductType)
-        {
-            SBL3Path = null;
-        }
-    }
-
-    internal class FlashResourcesViewModel : ContextViewModel
-    {
-        internal Action SwitchToFlashRom;
-        internal Action SwitchToUndoRoot;
-        internal Action SwitchToDownload;
-        private readonly string PlatformID;
-        private readonly string ProductType;
-        private string ValidatedSupportedFfuPath = null;
-
-        internal FlashResourcesViewModel(string CurrentMode, byte[] RootKeyHash, Action SwitchToFlashRom, Action SwitchToUndoRoot, Action SwitchToDownload, Action<string, string, string, string, string, string, bool> Result, Action Abort, bool IsBootLoaderUnlocked, bool TargetHasNewFlashProtocol, string PlatformID = null, string ProductType = null) : base()
-        {
-            IsSwitchingInterface = true;
-            this.CurrentMode = CurrentMode;
-            this.RootKeyHash = RootKeyHash;
-            this.PlatformID = PlatformID;
-            this.ProductType = ProductType;
-            this.SwitchToFlashRom = SwitchToFlashRom;
-            this.SwitchToUndoRoot = SwitchToUndoRoot;
-            this.SwitchToDownload = SwitchToDownload;
-            this.IsBootLoaderUnlocked = IsBootLoaderUnlocked;
-            OkCommand = new DelegateCommand(() => Result(FFUPath, LoadersPath, SBL3Path, ProfileFFUPath, EDEPath, IsSupportedFfuNeeded ? SupportedFFUPath : null, false),
-                () => (!TargetHasNewFlashProtocol && (!IsSupportedFfuNeeded || (IsSupportedFfuValid && (SupportedFFUPath != null)))) || ((ProfileFFUPath != null) && (!IsSupportedFfuNeeded || (IsSupportedFfuValid && (SupportedFFUPath != null)))));
-            FixCommand = new DelegateCommand(() => Result(null, null, null, null, null, null, true));
-            CancelCommand = new DelegateCommand(Abort);
-            this.TargetHasNewFlashProtocol = TargetHasNewFlashProtocol;
-
-            if (TargetHasNewFlashProtocol)
-            {
-                SetProfileFFUPath();
-                SetEDEPath();
-            }
-            else
-            {
-                FFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "FFUPath", null);
-                SupportedFFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SupportedFFUPath", null);
-                LoadersPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "LoadersPath", null);
-            }
-        }
-
-        private void SetProfileFFUPath()
-        {
-            FFU ProfileFFU;
-
-            try
-            {
-                if (_ProfileFFUPath != null)
-                {
-                    ProfileFFU = new FFU(_ProfileFFUPath);
-                    if (PlatformID.StartsWith(ProfileFFU.PlatformID, StringComparison.OrdinalIgnoreCase))
-                    {
-                        IsProfileFfuValid = true;
-                        return;
-                    }
-                }
-            }
-            catch { }
-
-            try
-            {
-                string TempProfileFFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "ProfileFFUPath", null);
-                if (TempProfileFFUPath != null)
-                {
-                    ProfileFFU = new FFU(TempProfileFFUPath);
-                    if (PlatformID.StartsWith(ProfileFFU.PlatformID, StringComparison.OrdinalIgnoreCase))
-                    {
-                        ProfileFFUPath = TempProfileFFUPath;
-                        IsProfileFfuValid = true;
-                        return;
-                    }
-                }
-            }
-            catch { }
-
-            List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists()).ToList();
-            if (FFUs.Count > 0)
-            {
-                IsProfileFfuValid = true;
-                ProfileFFUPath = FFUs[0].Path;
-            }
-            else
-            {
-                IsProfileFfuValid = false;
-            }
-        }
-
-        private void SetEDEPath()
-        {
-            QualcommPartition Programmer;
-            string TempEDEPath;
-
-            try
-            {
-                if (_EDEPath != null)
-                {
-                    Programmer = new QualcommPartition(_EDEPath);
-                    if (ByteOperations.Compare(Programmer.RootKeyHash, RootKeyHash))
-                    {
-                        return;
-                    }
-                }
-            }
-            catch { }
-
-            try
-            {
-                TempEDEPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "EDEPath", null);
-                if (TempEDEPath != null)
-                {
-                    Programmer = new QualcommPartition(TempEDEPath);
-                    if (ByteOperations.Compare(Programmer.RootKeyHash, RootKeyHash))
-                    {
-                        EDEPath = TempEDEPath;
-                        return;
-                    }
-                }
-            }
-            catch { }
-
-            TempEDEPath = LumiaV2UnlockBootViewModel.GetProgrammerPath(RootKeyHash, ProductType);
-            if (TempEDEPath != null)
-            {
-                Programmer = new QualcommPartition(TempEDEPath);
-                if (ByteOperations.Compare(Programmer.RootKeyHash, RootKeyHash))
-                {
-                    EDEPath = TempEDEPath;
-                    return;
-                }
-            }
-        }
-
-        private void SetSupportedFFUPath()
-        {
-            if (!TargetHasNewFlashProtocol)
-            {
-                if (this is BootRestoreResourcesViewModel)
-                {
-                    IsSupportedFfuNeeded = false;
-                    return;
-                }
-
-                try
-                {
-                    FFU FFU = new(_FFUPath);
-                    IsSupportedFfuNeeded = !App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == FFU.GetOSVersion());
-                }
-                catch
-                {
-                    IsSupportedFfuNeeded = false;
-                    return;
-                }
-
-                if (IsSupportedFfuNeeded)
-                {
-                    FFU SupportedFFU;
-
-                    try
-                    {
-                        if (_SupportedFFUPath != null)
-                        {
-                            SupportedFFU = new FFU(_SupportedFFUPath);
-                            if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
-                            {
-                                return;
-                            }
-                        }
-                    }
-                    catch { }
-
-                    try
-                    {
-                        string TempSupportedFFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SupportedFFUPath", null);
-                        if (TempSupportedFFUPath != null)
-                        {
-                            SupportedFFU = new FFU(TempSupportedFFUPath);
-                            if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
-                            {
-                                ValidatedSupportedFfuPath = TempSupportedFFUPath;
-                                SupportedFFUPath = TempSupportedFFUPath;
-                                IsSupportedFfuValid = true;
-                                return;
-                            }
-                        }
-                    }
-                    catch { }
-
-                    List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)).ToList();
-                    if (FFUs.Count > 0)
-                    {
-                        ValidatedSupportedFfuPath = FFUs[0].Path;
-                        SupportedFFUPath = FFUs[0].Path;
-                        IsSupportedFfuValid = true;
-                    }
-                }
-            }
-            else
-            {
-                if ((this is BootRestoreResourcesViewModel) || (_ProfileFFUPath == null))
-                {
-                    IsSupportedFfuNeeded = false;
-                    return;
-                }
-
-                try
-                {
-                    FFU ProfileFFU = new(_ProfileFFUPath);
-                    IsSupportedFfuNeeded = !App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == ProfileFFU.GetOSVersion());
-                }
-                catch
-                {
-                    IsSupportedFfuNeeded = false;
-                    return;
-                }
-
-                if (IsSupportedFfuNeeded)
-                {
-                    FFU SupportedFFU;
-
-                    try
-                    {
-                        if (_SupportedFFUPath != null)
-                        {
-                            SupportedFFU = new FFU(_SupportedFFUPath);
-                            if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
-                            {
-                                return;
-                            }
-                        }
-                    }
-                    catch { }
-
-                    try
-                    {
-                        string TempSupportedFFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SupportedFFUPath", null);
-                        if (TempSupportedFFUPath != null)
-                        {
-                            SupportedFFU = new FFU(TempSupportedFFUPath);
-                            if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
-                            {
-                                ValidatedSupportedFfuPath = TempSupportedFFUPath;
-                                SupportedFFUPath = TempSupportedFFUPath;
-                                IsSupportedFfuValid = true;
-                                return;
-                            }
-                        }
-                    }
-                    catch { }
-
-                    List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)).ToList();
-                    if (FFUs.Count > 0)
-                    {
-                        ValidatedSupportedFfuPath = FFUs[0].Path;
-                        SupportedFFUPath = FFUs[0].Path;
-                        IsSupportedFfuValid = true;
-                    }
-                }
-            }
-        }
-
-        private void ValidateSupportedFfuPath()
-        {
-            try
-            {
-                if (IsSupportedFfuNeeded)
-                {
-                    if (SupportedFFUPath == null)
-                    {
-                        IsSupportedFfuValid = true; // No visible warning when there is no SupportedFFU selected yet.
-                    }
-                    else
-                    {
-                        if (!TargetHasNewFlashProtocol)
-                        {
-                            if (App.Config.FFURepository.Any(e => (e.Path == SupportedFFUPath) && App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
-                            {
-                                IsSupportedFfuValid = true;
-                            }
-                            else
-                            {
-                                FFU SupportedFFU = new(SupportedFFUPath);
-                                IsSupportedFfuValid = App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion());
-                            }
-                        }
-                        else
-                        {
-                            if (App.Config.FFURepository.Any(e => (e.Path == SupportedFFUPath) && App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
-                            {
-                                IsSupportedFfuValid = true;
-                            }
-                            else
-                            {
-                                FFU SupportedFFU = new(SupportedFFUPath);
-                                IsSupportedFfuValid = App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion());
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    IsSupportedFfuValid = true;
-                }
-
-                if (IsSupportedFfuValid && (SupportedFFUPath != null))
-                {
-                    ValidatedSupportedFfuPath = SupportedFFUPath;
-                }
-            }
-            catch
-            {
-                IsSupportedFfuValid = false;
-            }
-        }
-
-        private bool _IsSupportedFfuNeeded = false;
-        public bool IsSupportedFfuNeeded
-        {
-            get
-            {
-                return _IsSupportedFfuNeeded;
-            }
-            set
-            {
-                _IsSupportedFfuNeeded = value;
-                OnPropertyChanged(nameof(IsSupportedFfuNeeded));
-                OkCommand.RaiseCanExecuteChanged();
-            }
-        }
-
-        private bool _IsSupportedFfuValid = true;
-        public bool IsSupportedFfuValid
-        {
-            get
-            {
-                return _IsSupportedFfuValid;
-            }
-            set
-            {
-                _IsSupportedFfuValid = value;
-                OnPropertyChanged(nameof(IsSupportedFfuValid));
-                OkCommand.RaiseCanExecuteChanged();
-            }
-        }
-
-        private bool _IsProfileFfuValid = true;
-        public bool IsProfileFfuValid
-        {
-            get
-            {
-                return _IsProfileFfuValid;
-            }
-            set
-            {
-                _IsProfileFfuValid = value;
-                OnPropertyChanged(nameof(IsProfileFfuValid));
-            }
-        }
-
-        private bool _TargetHasNewFlashProtocol = false;
-        public bool TargetHasNewFlashProtocol
-        {
-            get
-            {
-                return _TargetHasNewFlashProtocol;
-            }
-            set
-            {
-                _TargetHasNewFlashProtocol = value;
-                OnPropertyChanged(nameof(TargetHasNewFlashProtocol));
-                OkCommand.RaiseCanExecuteChanged();
-            }
-        }
-
-        private bool _IsBootLoaderUnlocked = false;
-        public bool IsBootLoaderUnlocked
-        {
-            get
-            {
-                return _IsBootLoaderUnlocked;
-            }
-            set
-            {
-                _IsBootLoaderUnlocked = value;
-                OnPropertyChanged(nameof(IsBootLoaderUnlocked));
-            }
-        }
-
-        private string _FFUPath = null;
-        public string FFUPath
-        {
-            get
-            {
-                return _FFUPath;
-            }
-            set
-            {
-                _FFUPath = value;
-                OnPropertyChanged(nameof(FFUPath));
-                SetSupportedFFUPath();
-                OkCommand.RaiseCanExecuteChanged();
-            }
-        }
-
-        private string _ProfileFFUPath = null;
-        public string ProfileFFUPath
-        {
-            get
-            {
-                return _ProfileFFUPath;
-            }
-            set
-            {
-                if (_ProfileFFUPath != value)
-                {
-                    _ProfileFFUPath = value;
-                    OnPropertyChanged(nameof(ProfileFFUPath));
-                    SetSupportedFFUPath();
-                    OkCommand.RaiseCanExecuteChanged();
-                }
-            }
-        }
-
-        private string _SupportedFFUPath = null;
-        public string SupportedFFUPath
-        {
-            get
-            {
-                return _SupportedFFUPath;
-            }
-            set
-            {
-                if (_SupportedFFUPath != value)
-                {
-                    _SupportedFFUPath = value;
-                    OnPropertyChanged(nameof(SupportedFFUPath));
-
-                    if (value != ValidatedSupportedFfuPath)
-                    {
-                        ValidateSupportedFfuPath();
-                    }
-                }
-            }
-        }
-
-        private string _LoadersPath = null;
-        public string LoadersPath
-        {
-            get
-            {
-                return _LoadersPath;
-            }
-            set
-            {
-                _LoadersPath = value;
-                OnPropertyChanged(nameof(LoadersPath));
-            }
-        }
-
-        private string _EDEPath = null;
-        public string EDEPath
-        {
-            get
-            {
-                return _EDEPath;
-            }
-            set
-            {
-                _EDEPath = value;
-                OnPropertyChanged(nameof(EDEPath));
-            }
-        }
-
-        private string _SBL3Path = null;
-        public string SBL3Path
-        {
-            get
-            {
-                return _SBL3Path;
-            }
-            set
-            {
-                _SBL3Path = value;
-                OnPropertyChanged(nameof(SBL3Path));
-            }
-        }
-
-        private string _CurrentMode = null;
-        public string CurrentMode
-        {
-            get
-            {
-                return _CurrentMode;
-            }
-            set
-            {
-                _CurrentMode = value;
-                OnPropertyChanged(nameof(CurrentMode));
-            }
-        }
-
-        private byte[] _RootKeyHash = null;
-        public byte[] RootKeyHash
-        {
-            get
-            {
-                return _RootKeyHash;
-            }
-            set
-            {
-                _RootKeyHash = value;
-                OnPropertyChanged(nameof(RootKeyHash));
-            }
-        }
-        public DelegateCommand OkCommand { get; } = null;
-        public DelegateCommand CancelCommand { get; } = null;
-        public DelegateCommand FixCommand { get; } = null;
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using Microsoft.Win32;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace WPinternals
+{
+    // Create this class on the UI thread, after the main-window of the application is initialized.
+    // It is necessary to create the object on the UI thread, because notification events to the View need to be fired on that thread.
+    // The Model for this ViewModel communicates over USB and for that it uses the hWnd of the main window.
+    // Therefore the main window must be created before the ViewModel is created.
+
+    internal enum MachineState
+    {
+        Default,
+        LumiaUnlockBoot
+    };
+
+    internal class LumiaUnlockBootViewModel : ContextViewModel
+    {
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action Callback;
+        private string FFUPath;
+        private string LoadersPath;
+        private string SBL3Path;
+        private string ProfileFFUPath;
+        private string EDEPath;
+        private string SupportedFFUPath;
+        private bool IsBootLoaderUnlocked;
+        private byte[] RootKeyHash = null;
+        private readonly Action SwitchToFlashRom;
+        private readonly Action SwitchToUndoRoot;
+        private readonly Action SwitchToDownload;
+        private readonly bool DoUnlock;
+        private MachineState State;
+        private readonly object EvaluateViewStateLockObject = new();
+
+        internal LumiaUnlockBootViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToFlashRom, Action SwitchToUndoRoot, Action SwitchToDownload, bool DoUnlock, Action Callback)
+            : base()
+        {
+            IsSwitchingInterface = false;
+            IsFlashModeOperation = true;
+
+            this.PhoneNotifier = PhoneNotifier;
+            this.SwitchToFlashRom = SwitchToFlashRom;
+            this.SwitchToUndoRoot = SwitchToUndoRoot;
+            this.SwitchToDownload = SwitchToDownload;
+            this.DoUnlock = DoUnlock;
+            this.Callback = Callback;
+
+            State = MachineState.Default;
+
+            this.PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+
+            // ViewState will be evaluated as soon as this object is set as DataContext
+        }
+
+        ~LumiaUnlockBootViewModel()
+        {
+            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
+        }
+
+        // Potentially blocking UI. Threadsafe.
+        internal override void EvaluateViewState()
+        {
+            if (!IsActive)
+            {
+                return;
+            }
+
+            if (State == MachineState.LumiaUnlockBoot)
+            {
+                return;
+            }
+
+            lock (EvaluateViewStateLockObject)
+            {
+                switch (PhoneNotifier.CurrentInterface)
+                {
+                    case PhoneInterfaces.Lumia_Normal:
+                    case PhoneInterfaces.Lumia_Label:
+                        IsSwitchingInterface = false;
+                        if (DoUnlock)
+                        {
+                            // Display View to switch to Flash mode
+                            LogFile.Log("Start unlock. Phone needs to switch to Flash-mode");
+                            ActivateSubContext(new MessageViewModel("In order to start unlocking the bootloader, the phone needs to be switched to Flash-mode.", SwitchToFlashMode, Exit));
+                        }
+                        else
+                        {
+                            // Display View to switch to Flash mode
+                            LogFile.Log("Start boot restore. Phone needs to switch to Flash-mode");
+                            ActivateSubContext(new MessageViewModel("In order to start restoring the bootloader, the phone needs to be switched to Flash-mode.", SwitchToFlashMode, Exit));
+                        }
+                        break;
+                    case PhoneInterfaces.Lumia_Flash:
+                        // Display View with device info and request for resources
+                        // Click on "Continue" will start processing all resources
+                        // Processing may fail with error message
+                        // Or processing will succeed and user will again be asked to continue with Bricking-procedure (to switch to emergency mode)
+
+                        // This code is not always invoked by OnArrival event.
+                        // So this is not always in a thread from the threadpool.
+                        // So we need to avoid UI blocking code here.
+
+                        IsSwitchingInterface = false;
+
+                        int TestPos = 0;
+
+                        try // In case phone reboots during the time that status is being read
+                        {
+                            // Some phones, like Lumia 928 verizon, do not support the Terminal interface!
+                            // To read the RootKeyHash we use ReadParam("RRKH"), instead of GetTerminalResponse().RootKeyHash.
+                            RootKeyHash = ((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadParam("RRKH");
+
+                            TestPos = 1;
+
+                            UefiSecurityStatusResponse SecurityStatus = ((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadSecurityStatus();
+                            if (SecurityStatus != null)
+                            {
+                                IsBootLoaderUnlocked = SecurityStatus.AuthenticationStatus || SecurityStatus.RdcStatus || !SecurityStatus.SecureFfuEfuseStatus;
+                            }
+
+                            TestPos = 2;
+
+                            PhoneInfo Info = ((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadPhoneInfo();
+                            if (SecurityStatus == null)
+                            {
+                                IsBootLoaderUnlocked = !Info.IsBootloaderSecure;
+                            }
+
+                            if (RootKeyHash == null)
+                            {
+                                RootKeyHash = Info.RKH ?? (new byte[32]);
+                            }
+
+                            TestPos = 3;
+
+                            if (Info.FlashAppProtocolVersionMajor < 2)
+                            {
+                                // This action is executed after the resources are selected by the user.
+                                void ReturnFunction(string FFUPath, string LoadersPath, string SBL3Path, string ProfileFFUPath, string EDEPath, string SupportedFFUPath, bool DoFixBoot)
+                                {
+                                    // Stop responding to device arrival here, because all connections are handled by subfunctions, not here.
+                                    IsSwitchingInterface = true;
+                                    State = MachineState.LumiaUnlockBoot;
+
+                                    // This is a callback on the UI thread
+                                    // Resources are confirmed by user
+                                    this.FFUPath = FFUPath;
+                                    this.LoadersPath = LoadersPath;
+                                    this.SBL3Path = SBL3Path;
+                                    this.SupportedFFUPath = SupportedFFUPath;
+                                    StorePaths();
+
+                                    LogFile.Log("Processing resources:");
+                                    LogFile.Log("FFU: " + FFUPath);
+                                    LogFile.Log("Loaders: " + LoadersPath);
+                                    if (SBL3Path == null)
+                                    {
+                                        LogFile.Log("No SBL3 specified");
+                                    }
+                                    else
+                                    {
+                                        LogFile.Log("SBL3: " + SBL3Path);
+                                    }
+
+                                    ActivateSubContext(new BusyViewModel("Processing resources..."));
+
+                                    if (DoUnlock)
+                                    {
+                                        Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1UnlockFirmware(PhoneNotifier, FFUPath, LoadersPath, SBL3Path, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
+                                    }
+                                    else
+                                    {
+                                        Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1RelockFirmware(PhoneNotifier, FFUPath, LoadersPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
+                                    }
+                                }
+
+                                if (DoUnlock)
+                                {
+                                    ActivateSubContext(new BootUnlockResourcesViewModel("Lumia Flash mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunction, Abort, IsBootLoaderUnlocked, false));
+                                }
+                                else
+                                {
+                                    ActivateSubContext(new BootRestoreResourcesViewModel("Lumia Flash mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunction, Abort, IsBootLoaderUnlocked, false));
+                                }
+                            }
+                            else
+                            {
+                                bool AlreadyUnlocked = false;
+                                if (DoUnlock)
+                                {
+                                    NokiaFlashModel FlashModel = (NokiaFlashModel)PhoneNotifier.CurrentModel;
+                                    GPT GPT = FlashModel.ReadGPT();
+                                    if ((GPT.GetPartition("IS_UNLOCKED") != null) || (GPT.GetPartition("BACKUP_EFIESP") != null))
+                                    {
+                                        //ExitMessage("Phone is already unlocked", null);
+                                        //return;
+                                        AlreadyUnlocked = true;
+                                    }
+                                }
+
+                                TestPos = 4;
+
+                                // Stop responding to device arrival here, because all connections are handled by subfunctions, not here.
+                                IsSwitchingInterface = true;
+
+                                // This action is executed after the resources are selected by the user.
+                                void ReturnFunction(string FFUPath, string LoadersPath, string SBL3Path, string ProfileFFUPath, string EDEPath, string SupportedFFUPath, bool DoFixBoot)
+                                {
+                                    IsSwitchingInterface = true;
+                                    State = MachineState.LumiaUnlockBoot;
+                                    if (DoUnlock)
+                                    {
+                                        // This is a callback on the UI thread
+                                        // Resources are confirmed by user
+                                        this.ProfileFFUPath = ProfileFFUPath;
+                                        this.EDEPath = EDEPath;
+                                        this.SupportedFFUPath = SupportedFFUPath;
+                                        StorePaths();
+
+                                        if (DoFixBoot)
+                                        {
+                                            LogFile.Log("Fix Boot");
+                                        }
+                                        else
+                                        {
+                                            LogFile.Log("Unlock Bootloader");
+                                        }
+
+                                        LogFile.Log("Processing resources:");
+                                        LogFile.Log("Profile FFU: " + ProfileFFUPath);
+                                        LogFile.Log("EDE file: " + EDEPath);
+                                        if (SupportedFFUPath != null)
+                                        {
+                                            LogFile.Log("Donor-FFU with supported OS version: " + SupportedFFUPath);
+                                        }
+
+                                        Task.Run(async () =>
+                                            {
+                                                if (DoFixBoot)
+                                                {
+                                                    await LumiaV2UnlockBootViewModel.LumiaV2FixBoot(PhoneNotifier, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
+                                                }
+                                                else if (!AlreadyUnlocked)
+                                                {
+                                                    await LumiaUnlockBootloaderViewModel.LumiaV2UnlockUEFI(PhoneNotifier, ProfileFFUPath, EDEPath, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
+                                                }
+                                                else
+                                                {
+                                                    await LumiaUnlockBootloaderViewModel.LumiaV2UnlockUEFI(PhoneNotifier, ProfileFFUPath, EDEPath, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage, true);
+                                                }
+                                            });
+                                    }
+                                    else
+                                    {
+                                        Task.Run(async () =>
+                                        {
+                                            FFU ProfileFFU = null;
+
+                                            List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => Info.PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists()).ToList();
+                                            ProfileFFU = FFUs.Count > 0
+                                                ? new FFU(FFUs[0].Path)
+                                                : throw new WPinternalsException("Profile FFU missing", "No profile FFU has been found in the repository for your device. You can add a profile FFU within the download section of the tool or by using the command line.");
+
+                                            LogFile.Log("Profile FFU: " + ProfileFFU.Path);
+
+                                            await LumiaUnlockBootloaderViewModel.LumiaV2RelockUEFI(PhoneNotifier, ProfileFFU.Path, true, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage);
+                                        });
+                                    }
+                                }
+
+                                TestPos = 5;
+
+                                if (DoUnlock)
+                                {
+                                    ActivateSubContext(new BootUnlockResourcesViewModel("Lumia Flash mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunction, Abort, IsBootLoaderUnlocked, true, Info.PlatformID, Info.Type));
+                                }
+                                else
+                                {
+                                    ActivateSubContext(new BootRestoreResourcesViewModel("Lumia Flash mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunction, Abort, IsBootLoaderUnlocked, true, Info.PlatformID, Info.Type));
+                                }
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex, LogType.FileAndConsole, TestPos.ToString());
+                        }
+                        break;
+                    case PhoneInterfaces.Qualcomm_Download:
+                        IsSwitchingInterface = false;
+
+                        // If resources are not confirmed yet, then display view with device info and request for resources.
+                        QualcommDownload Download = new((QualcommSerial)PhoneNotifier.CurrentModel);
+                        byte[] QualcommRootKeyHash;
+
+                        try
+                        {
+                            QualcommRootKeyHash = Download.GetRKH();
+                        }
+                        catch (BadConnectionException)
+                        {
+                            // This is a Spec B device
+                            break;
+                        }
+
+                        if (RootKeyHash == null)
+                        {
+                            RootKeyHash = QualcommRootKeyHash;
+                        }
+                        else if (!StructuralComparisons.StructuralEqualityComparer.Equals(RootKeyHash, QualcommRootKeyHash))
+                        {
+                            LogFile.Log("Error: Root Key Hash in Qualcomm Emergency mode does not match!");
+                            ActivateSubContext(new MessageViewModel("Error: Root Key Hash in Qualcomm Emergency mode does not match!", Callback));
+                            return;
+                        }
+
+                        // This action is executed after the user selected the resources.
+                        Action<string, string, string, string, string, string, bool> ReturnFunctionD = (FFUPath, LoadersPath, SBL3Path, ProfileFFUPath, EDEPath, SupportedFFUPath, DoFixBoot) =>
+                        {
+                            IsSwitchingInterface = true;
+                            State = MachineState.LumiaUnlockBoot;
+                            // This is a callback on the UI thread
+                            // Resources are confirmed by user
+                            this.FFUPath = FFUPath;
+                            this.LoadersPath = LoadersPath;
+                            this.SBL3Path = SBL3Path;
+                            StorePaths();
+
+                            LogFile.Log("Processing resources:");
+                            LogFile.Log("FFU: " + FFUPath);
+                            LogFile.Log("Loaders: " + LoadersPath);
+                            if (SBL3Path == null)
+                            {
+                                LogFile.Log("No SBL3 specified");
+                            }
+                            else
+                            {
+                                LogFile.Log("SBL3: " + SBL3Path);
+                            }
+
+                            ActivateSubContext(new BusyViewModel("Processing resources..."));
+
+                            if (DoUnlock)
+                            {
+                                Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1UnlockFirmware(PhoneNotifier, FFUPath, LoadersPath, SBL3Path, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
+                            }
+                            else
+                            {
+                                Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1RelockFirmware(PhoneNotifier, FFUPath, LoadersPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
+                            }
+                        };
+
+                        if (DoUnlock)
+                        {
+                            ActivateSubContext(new BootUnlockResourcesViewModel("Qualcomm Emergency Download mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunctionD, Abort, IsBootLoaderUnlocked, false));
+                        }
+                        else
+                        {
+                            ActivateSubContext(new BootRestoreResourcesViewModel("Qualcomm Emergency Download mode", RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, ReturnFunctionD, Abort, IsBootLoaderUnlocked, false));
+                        }
+
+                        break;
+                    case PhoneInterfaces.Qualcomm_Flash:
+                        {
+                            IsSwitchingInterface = true;
+                            State = MachineState.LumiaUnlockBoot;
+                            ActivateSubContext(new BusyViewModel("Recovering resources..."));
+
+                            LogFile.Log("Phone was unexpectedly detected in this mode while resources were not loaded yet.");
+                            LogFile.Log("WPInternals tool probably crashed in previous session.");
+                            LogFile.Log("Trying to recover resources from the registry.");
+
+                            FFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "FFUPath", null);
+                            SupportedFFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SupportedFFUPath", null);
+                            LoadersPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "LoadersPath", null);
+                            SBL3Path = DoUnlock ? (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SBL3Path", null) : null;
+
+                            if (DoUnlock)
+                            {
+                                Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1UnlockFirmware(PhoneNotifier, FFUPath, LoadersPath, SBL3Path, SupportedFFUPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
+                            }
+                            else
+                            {
+                                Task.Run(async () => await LumiaUnlockBootloaderViewModel.LumiaV1RelockFirmware(PhoneNotifier, FFUPath, LoadersPath, SetWorkingStatus, UpdateWorkingStatus, ExitMessage, ExitMessage));
+                            }
+                            break;
+                        }
+                    default:
+                        // Show View "Waiting for connection"
+                        IsSwitchingInterface = false;
+                        ActivateSubContext(null);
+                        break;
+                }
+            }
+        }
+
+        private void SwitchToFlashMode()
+        {
+            // SwitchModeViewModel must be created on the UI thread
+            IsSwitchingInterface = true;
+            UIContext.Post(async (t) =>
+                {
+                    LogFile.Log("Switching to Flash-mode");
+
+                    try
+                    {
+                        await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Flash,
+                            (msg, sub) =>
+                                ActivateSubContext(new BusyViewModel(msg, sub)));
+                    }
+                    catch (Exception Ex)
+                    {
+                        ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
+                    }
+                }, null);
+        }
+
+        private void Abort()
+        {
+            // SwitchModeViewModel must be created on the UI thread
+            IsSwitchingInterface = false;
+            UIContext.Post((t) =>
+                {
+                    StorePaths();
+                    LogFile.Log("Aborting.");
+                    Exit();
+                }, null);
+        }
+
+        private void StorePaths()
+        {
+            RegistryKey Key = Registry.CurrentUser.OpenSubKey(@"Software\WPInternals", true) ?? Registry.CurrentUser.CreateSubKey(@"Software\WPInternals");
+
+            if (FFUPath == null)
+            {
+                if (Key.GetValue("FFUPath") != null)
+                {
+                    Key.DeleteValue("FFUPath");
+                }
+            }
+            else
+            {
+                Key.SetValue("FFUPath", FFUPath);
+            }
+
+            if (LoadersPath == null)
+            {
+                if (Key.GetValue("LoadersPath") != null)
+                {
+                    Key.DeleteValue("LoadersPath");
+                }
+            }
+            else
+            {
+                Key.SetValue("LoadersPath", LoadersPath);
+            }
+
+            if (DoUnlock)
+            {
+                if (SBL3Path == null)
+                {
+                    if (Key.GetValue("SBL3Path") != null)
+                    {
+                        Key.DeleteValue("SBL3Path");
+                    }
+                }
+                else
+                {
+                    Key.SetValue("SBL3Path", SBL3Path);
+                }
+            }
+
+            if (ProfileFFUPath == null)
+            {
+                if (Key.GetValue("ProfileFFUPath") != null)
+                {
+                    Key.DeleteValue("ProfileFFUPath");
+                }
+            }
+            else
+            {
+                Key.SetValue("ProfileFFUPath", ProfileFFUPath);
+
+                App.Config.AddFfuToRepository(ProfileFFUPath);
+            }
+
+            if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Qualcomm_Download && PhoneNotifier.CurrentInterface != PhoneInterfaces.Qualcomm_Flash)
+            {
+                NokiaFlashModel Model = (NokiaFlashModel)PhoneNotifier.CurrentModel;
+                PhoneInfo Info = Model.ReadPhoneInfo();
+
+                if (EDEPath == null)
+                {
+                    if (Key.GetValue("EDEPath") != null)
+                    {
+                        Key.DeleteValue("EDEPath");
+                    }
+                }
+                else
+                {
+                    Key.SetValue("EDEPath", EDEPath);
+
+                    App.Config.AddEmergencyToRepository(Info.Type, EDEPath, null);
+                }
+            }
+
+            if (SupportedFFUPath != null)
+            {
+                Key.SetValue("SupportedFFUPath", SupportedFFUPath);
+
+                App.Config.AddFfuToRepository(SupportedFFUPath);
+            }
+
+            Key.Close();
+        }
+
+        private void Exit()
+        {
+            IsSwitchingInterface = false; // From here on a device will be forced to Flash mode again on this screen which is meant for flashing
+
+            FFUPath = null;
+            LoadersPath = null;
+            SBL3Path = null;
+
+            Callback();
+            ActivateSubContext(null);
+        }
+
+        internal void ExitMessage(string Message, string SubMessage)
+        {
+            // SecureBoot Unlock v2 is done. Reactivate phone arrival events.
+            MessageViewModel SuccessMessageViewModel = new(Message, () =>
+            {
+                State = MachineState.Default;
+                Exit();
+            });
+            SuccessMessageViewModel.SubMessage = SubMessage;
+            ActivateSubContext(SuccessMessageViewModel);
+        }
+
+        private void NewDeviceArrived(ArrivalEventArgs Args)
+        {
+            // Do not start on a new thread, because EvaluateViewState will also create new ViewModels and those should be created on the UI thread.
+            EvaluateViewState();
+        }
+    }
+
+    internal class BootUnlockResourcesViewModel : FlashResourcesViewModel
+    {
+        internal BootUnlockResourcesViewModel(string CurrentMode, byte[] RootKeyHash, Action SwitchToFlashRom, Action SwitchToUndoRoot, Action SwitchToDownload, Action<string, string, string, string, string, string, bool> Result, Action Abort, bool IsBootLoaderUnlocked, bool TargetHasNewFlashProtocol, string PlatformID = null, string ProductType = null)
+            : base(CurrentMode, RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, Result, Abort, IsBootLoaderUnlocked, TargetHasNewFlashProtocol, PlatformID, ProductType)
+        {
+            SBL3Path = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SBL3Path", null);
+        }
+    }
+
+    internal class BootRestoreResourcesViewModel : FlashResourcesViewModel
+    {
+        internal BootRestoreResourcesViewModel(string CurrentMode, byte[] RootKeyHash, Action SwitchToFlashRom, Action SwitchToUndoRoot, Action SwitchToDownload, Action<string, string, string, string, string, string, bool> Result, Action Abort, bool IsBootLoaderUnlocked, bool TargetHasNewFlashProtocol, string PlatformID = null, string ProductType = null)
+            : base(CurrentMode, RootKeyHash, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, Result, Abort, IsBootLoaderUnlocked, TargetHasNewFlashProtocol, PlatformID, ProductType)
+        {
+            SBL3Path = null;
+        }
+    }
+
+    internal class FlashResourcesViewModel : ContextViewModel
+    {
+        internal Action SwitchToFlashRom;
+        internal Action SwitchToUndoRoot;
+        internal Action SwitchToDownload;
+        private readonly string PlatformID;
+        private readonly string ProductType;
+        private string ValidatedSupportedFfuPath = null;
+
+        internal FlashResourcesViewModel(string CurrentMode, byte[] RootKeyHash, Action SwitchToFlashRom, Action SwitchToUndoRoot, Action SwitchToDownload, Action<string, string, string, string, string, string, bool> Result, Action Abort, bool IsBootLoaderUnlocked, bool TargetHasNewFlashProtocol, string PlatformID = null, string ProductType = null) : base()
+        {
+            IsSwitchingInterface = true;
+            this.CurrentMode = CurrentMode;
+            this.RootKeyHash = RootKeyHash;
+            this.PlatformID = PlatformID;
+            this.ProductType = ProductType;
+            this.SwitchToFlashRom = SwitchToFlashRom;
+            this.SwitchToUndoRoot = SwitchToUndoRoot;
+            this.SwitchToDownload = SwitchToDownload;
+            this.IsBootLoaderUnlocked = IsBootLoaderUnlocked;
+            OkCommand = new DelegateCommand(() => Result(FFUPath, LoadersPath, SBL3Path, ProfileFFUPath, EDEPath, IsSupportedFfuNeeded ? SupportedFFUPath : null, false),
+                () => (!TargetHasNewFlashProtocol && (!IsSupportedFfuNeeded || (IsSupportedFfuValid && (SupportedFFUPath != null)))) || ((ProfileFFUPath != null) && (!IsSupportedFfuNeeded || (IsSupportedFfuValid && (SupportedFFUPath != null)))));
+            FixCommand = new DelegateCommand(() => Result(null, null, null, null, null, null, true));
+            CancelCommand = new DelegateCommand(Abort);
+            this.TargetHasNewFlashProtocol = TargetHasNewFlashProtocol;
+
+            if (TargetHasNewFlashProtocol)
+            {
+                SetProfileFFUPath();
+                SetEDEPath();
+            }
+            else
+            {
+                FFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "FFUPath", null);
+                SupportedFFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SupportedFFUPath", null);
+                LoadersPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "LoadersPath", null);
+            }
+        }
+
+        private void SetProfileFFUPath()
+        {
+            FFU ProfileFFU;
+
+            try
+            {
+                if (_ProfileFFUPath != null)
+                {
+                    ProfileFFU = new FFU(_ProfileFFUPath);
+                    if (PlatformID.StartsWith(ProfileFFU.PlatformID, StringComparison.OrdinalIgnoreCase))
+                    {
+                        IsProfileFfuValid = true;
+                        return;
+                    }
+                }
+            }
+            catch { }
+
+            try
+            {
+                string TempProfileFFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "ProfileFFUPath", null);
+                if (TempProfileFFUPath != null)
+                {
+                    ProfileFFU = new FFU(TempProfileFFUPath);
+                    if (PlatformID.StartsWith(ProfileFFU.PlatformID, StringComparison.OrdinalIgnoreCase))
+                    {
+                        ProfileFFUPath = TempProfileFFUPath;
+                        IsProfileFfuValid = true;
+                        return;
+                    }
+                }
+            }
+            catch { }
+
+            List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists()).ToList();
+            if (FFUs.Count > 0)
+            {
+                IsProfileFfuValid = true;
+                ProfileFFUPath = FFUs[0].Path;
+            }
+            else
+            {
+                IsProfileFfuValid = false;
+            }
+        }
+
+        private void SetEDEPath()
+        {
+            QualcommPartition Programmer;
+            string TempEDEPath;
+
+            try
+            {
+                if (_EDEPath != null)
+                {
+                    Programmer = new QualcommPartition(_EDEPath);
+                    if (ByteOperations.Compare(Programmer.RootKeyHash, RootKeyHash))
+                    {
+                        return;
+                    }
+                }
+            }
+            catch { }
+
+            try
+            {
+                TempEDEPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "EDEPath", null);
+                if (TempEDEPath != null)
+                {
+                    Programmer = new QualcommPartition(TempEDEPath);
+                    if (ByteOperations.Compare(Programmer.RootKeyHash, RootKeyHash))
+                    {
+                        EDEPath = TempEDEPath;
+                        return;
+                    }
+                }
+            }
+            catch { }
+
+            TempEDEPath = LumiaV2UnlockBootViewModel.GetProgrammerPath(RootKeyHash, ProductType);
+            if (TempEDEPath != null)
+            {
+                Programmer = new QualcommPartition(TempEDEPath);
+                if (ByteOperations.Compare(Programmer.RootKeyHash, RootKeyHash))
+                {
+                    EDEPath = TempEDEPath;
+                    return;
+                }
+            }
+        }
+
+        private void SetSupportedFFUPath()
+        {
+            if (!TargetHasNewFlashProtocol)
+            {
+                if (this is BootRestoreResourcesViewModel)
+                {
+                    IsSupportedFfuNeeded = false;
+                    return;
+                }
+
+                try
+                {
+                    FFU FFU = new(_FFUPath);
+                    IsSupportedFfuNeeded = !App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == FFU.GetOSVersion());
+                }
+                catch
+                {
+                    IsSupportedFfuNeeded = false;
+                    return;
+                }
+
+                if (IsSupportedFfuNeeded)
+                {
+                    FFU SupportedFFU;
+
+                    try
+                    {
+                        if (_SupportedFFUPath != null)
+                        {
+                            SupportedFFU = new FFU(_SupportedFFUPath);
+                            if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                            {
+                                return;
+                            }
+                        }
+                    }
+                    catch { }
+
+                    try
+                    {
+                        string TempSupportedFFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SupportedFFUPath", null);
+                        if (TempSupportedFFUPath != null)
+                        {
+                            SupportedFFU = new FFU(TempSupportedFFUPath);
+                            if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                            {
+                                ValidatedSupportedFfuPath = TempSupportedFFUPath;
+                                SupportedFFUPath = TempSupportedFFUPath;
+                                IsSupportedFfuValid = true;
+                                return;
+                            }
+                        }
+                    }
+                    catch { }
+
+                    List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)).ToList();
+                    if (FFUs.Count > 0)
+                    {
+                        ValidatedSupportedFfuPath = FFUs[0].Path;
+                        SupportedFFUPath = FFUs[0].Path;
+                        IsSupportedFfuValid = true;
+                    }
+                }
+            }
+            else
+            {
+                if ((this is BootRestoreResourcesViewModel) || (_ProfileFFUPath == null))
+                {
+                    IsSupportedFfuNeeded = false;
+                    return;
+                }
+
+                try
+                {
+                    FFU ProfileFFU = new(_ProfileFFUPath);
+                    IsSupportedFfuNeeded = !App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == ProfileFFU.GetOSVersion());
+                }
+                catch
+                {
+                    IsSupportedFfuNeeded = false;
+                    return;
+                }
+
+                if (IsSupportedFfuNeeded)
+                {
+                    FFU SupportedFFU;
+
+                    try
+                    {
+                        if (_SupportedFFUPath != null)
+                        {
+                            SupportedFFU = new FFU(_SupportedFFUPath);
+                            if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                            {
+                                return;
+                            }
+                        }
+                    }
+                    catch { }
+
+                    try
+                    {
+                        string TempSupportedFFUPath = (string)Registry.GetValue(@"HKEY_CURRENT_USER\Software\WPInternals", "SupportedFFUPath", null);
+                        if (TempSupportedFFUPath != null)
+                        {
+                            SupportedFFU = new FFU(TempSupportedFFUPath);
+                            if (App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion()))
+                            {
+                                ValidatedSupportedFfuPath = TempSupportedFFUPath;
+                                SupportedFFUPath = TempSupportedFFUPath;
+                                IsSupportedFfuValid = true;
+                                return;
+                            }
+                        }
+                    }
+                    catch { }
+
+                    List<FFUEntry> FFUs = App.Config.FFURepository.Where(e => App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)).ToList();
+                    if (FFUs.Count > 0)
+                    {
+                        ValidatedSupportedFfuPath = FFUs[0].Path;
+                        SupportedFFUPath = FFUs[0].Path;
+                        IsSupportedFfuValid = true;
+                    }
+                }
+            }
+        }
+
+        private void ValidateSupportedFfuPath()
+        {
+            try
+            {
+                if (IsSupportedFfuNeeded)
+                {
+                    if (SupportedFFUPath == null)
+                    {
+                        IsSupportedFfuValid = true; // No visible warning when there is no SupportedFFU selected yet.
+                    }
+                    else
+                    {
+                        if (!TargetHasNewFlashProtocol)
+                        {
+                            if (App.Config.FFURepository.Any(e => (e.Path == SupportedFFUPath) && App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                            {
+                                IsSupportedFfuValid = true;
+                            }
+                            else
+                            {
+                                FFU SupportedFFU = new(SupportedFFUPath);
+                                IsSupportedFfuValid = App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V1.1-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion());
+                            }
+                        }
+                        else
+                        {
+                            if (App.Config.FFURepository.Any(e => (e.Path == SupportedFFUPath) && App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == e.OSVersion)))
+                            {
+                                IsSupportedFfuValid = true;
+                            }
+                            else
+                            {
+                                FFU SupportedFFU = new(SupportedFFUPath);
+                                IsSupportedFfuValid = App.PatchEngine.PatchDefinitions.First(p => p.Name == "SecureBootHack-V2-EFIESP").TargetVersions.Any(v => v.Description == SupportedFFU.GetOSVersion());
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    IsSupportedFfuValid = true;
+                }
+
+                if (IsSupportedFfuValid && (SupportedFFUPath != null))
+                {
+                    ValidatedSupportedFfuPath = SupportedFFUPath;
+                }
+            }
+            catch
+            {
+                IsSupportedFfuValid = false;
+            }
+        }
+
+        private bool _IsSupportedFfuNeeded = false;
+        public bool IsSupportedFfuNeeded
+        {
+            get
+            {
+                return _IsSupportedFfuNeeded;
+            }
+            set
+            {
+                _IsSupportedFfuNeeded = value;
+                OnPropertyChanged(nameof(IsSupportedFfuNeeded));
+                OkCommand.RaiseCanExecuteChanged();
+            }
+        }
+
+        private bool _IsSupportedFfuValid = true;
+        public bool IsSupportedFfuValid
+        {
+            get
+            {
+                return _IsSupportedFfuValid;
+            }
+            set
+            {
+                _IsSupportedFfuValid = value;
+                OnPropertyChanged(nameof(IsSupportedFfuValid));
+                OkCommand.RaiseCanExecuteChanged();
+            }
+        }
+
+        private bool _IsProfileFfuValid = true;
+        public bool IsProfileFfuValid
+        {
+            get
+            {
+                return _IsProfileFfuValid;
+            }
+            set
+            {
+                _IsProfileFfuValid = value;
+                OnPropertyChanged(nameof(IsProfileFfuValid));
+            }
+        }
+
+        private bool _TargetHasNewFlashProtocol = false;
+        public bool TargetHasNewFlashProtocol
+        {
+            get
+            {
+                return _TargetHasNewFlashProtocol;
+            }
+            set
+            {
+                _TargetHasNewFlashProtocol = value;
+                OnPropertyChanged(nameof(TargetHasNewFlashProtocol));
+                OkCommand.RaiseCanExecuteChanged();
+            }
+        }
+
+        private bool _IsBootLoaderUnlocked = false;
+        public bool IsBootLoaderUnlocked
+        {
+            get
+            {
+                return _IsBootLoaderUnlocked;
+            }
+            set
+            {
+                _IsBootLoaderUnlocked = value;
+                OnPropertyChanged(nameof(IsBootLoaderUnlocked));
+            }
+        }
+
+        private string _FFUPath = null;
+        public string FFUPath
+        {
+            get
+            {
+                return _FFUPath;
+            }
+            set
+            {
+                _FFUPath = value;
+                OnPropertyChanged(nameof(FFUPath));
+                SetSupportedFFUPath();
+                OkCommand.RaiseCanExecuteChanged();
+            }
+        }
+
+        private string _ProfileFFUPath = null;
+        public string ProfileFFUPath
+        {
+            get
+            {
+                return _ProfileFFUPath;
+            }
+            set
+            {
+                if (_ProfileFFUPath != value)
+                {
+                    _ProfileFFUPath = value;
+                    OnPropertyChanged(nameof(ProfileFFUPath));
+                    SetSupportedFFUPath();
+                    OkCommand.RaiseCanExecuteChanged();
+                }
+            }
+        }
+
+        private string _SupportedFFUPath = null;
+        public string SupportedFFUPath
+        {
+            get
+            {
+                return _SupportedFFUPath;
+            }
+            set
+            {
+                if (_SupportedFFUPath != value)
+                {
+                    _SupportedFFUPath = value;
+                    OnPropertyChanged(nameof(SupportedFFUPath));
+
+                    if (value != ValidatedSupportedFfuPath)
+                    {
+                        ValidateSupportedFfuPath();
+                    }
+                }
+            }
+        }
+
+        private string _LoadersPath = null;
+        public string LoadersPath
+        {
+            get
+            {
+                return _LoadersPath;
+            }
+            set
+            {
+                _LoadersPath = value;
+                OnPropertyChanged(nameof(LoadersPath));
+            }
+        }
+
+        private string _EDEPath = null;
+        public string EDEPath
+        {
+            get
+            {
+                return _EDEPath;
+            }
+            set
+            {
+                _EDEPath = value;
+                OnPropertyChanged(nameof(EDEPath));
+            }
+        }
+
+        private string _SBL3Path = null;
+        public string SBL3Path
+        {
+            get
+            {
+                return _SBL3Path;
+            }
+            set
+            {
+                _SBL3Path = value;
+                OnPropertyChanged(nameof(SBL3Path));
+            }
+        }
+
+        private string _CurrentMode = null;
+        public string CurrentMode
+        {
+            get
+            {
+                return _CurrentMode;
+            }
+            set
+            {
+                _CurrentMode = value;
+                OnPropertyChanged(nameof(CurrentMode));
+            }
+        }
+
+        private byte[] _RootKeyHash = null;
+        public byte[] RootKeyHash
+        {
+            get
+            {
+                return _RootKeyHash;
+            }
+            set
+            {
+                _RootKeyHash = value;
+                OnPropertyChanged(nameof(RootKeyHash));
+            }
+        }
+        public DelegateCommand OkCommand { get; } = null;
+        public DelegateCommand CancelCommand { get; } = null;
+        public DelegateCommand FixCommand { get; } = null;
+    }
+}
diff --git a/ViewModels/LumiaUnlockBootloaderViewModel.cs b/WPinternals/ViewModels/LumiaUnlockBootloaderViewModel.cs
similarity index 100%
rename from ViewModels/LumiaUnlockBootloaderViewModel.cs
rename to WPinternals/ViewModels/LumiaUnlockBootloaderViewModel.cs
diff --git a/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs b/WPinternals/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs
similarity index 97%
rename from ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs
rename to WPinternals/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs
index 868af9a..f3fae6f 100644
--- a/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs
+++ b/WPinternals/ViewModels/LumiaUnlockRootTargetSelectionViewModel.cs
@@ -1,190 +1,190 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal class LumiaUnlockRootTargetSelectionViewModel : LumiaRootAccessTargetSelectionViewModel
-    {
-        public LumiaUnlockRootTargetSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToDumpRom, Action SwitchToFlashRom, Action UnlockPhoneCallback, Action<string, string> UnlockImageCallback)
-            : base(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpRom, SwitchToFlashRom, UnlockPhoneCallback, UnlockImageCallback) { }
-    }
-
-    internal class LumiaUndoRootTargetSelectionViewModel : LumiaRootAccessTargetSelectionViewModel
-    {
-        public LumiaUndoRootTargetSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToDumpRom, Action SwitchToFlashRom, Action UnlockPhoneCallback, Action<string, string> UnlockImageCallback)
-            : base(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpRom, SwitchToFlashRom, UnlockPhoneCallback, UnlockImageCallback) { }
-    }
-
-    internal class LumiaRootAccessTargetSelectionViewModel : ContextViewModel
-    {
-        private readonly PhoneNotifierViewModel PhoneNotifier;
-        internal Action SwitchToUnlockBoot;
-        internal Action SwitchToDumpRom;
-        internal Action SwitchToFlashRom;
-        private readonly Action UnlockPhoneCallback;
-        private readonly Action<string, string> UnlockImageCallback;
-
-        internal LumiaRootAccessTargetSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToDumpRom, Action SwitchToFlashRom, Action UnlockPhoneCallback, Action<string, string> UnlockImageCallback)
-            : base()
-        {
-            this.PhoneNotifier = PhoneNotifier;
-            this.SwitchToDumpRom = SwitchToDumpRom;
-            this.SwitchToFlashRom = SwitchToFlashRom;
-            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
-            this.UnlockPhoneCallback = UnlockPhoneCallback;
-            this.UnlockImageCallback = UnlockImageCallback;
-
-            this.PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-            this.PhoneNotifier.DeviceRemoved += DeviceRemoved;
-
-            new Thread(() => EvaluateViewState()).Start();
-        }
-
-        private string _EFIESPMountPoint;
-        public string EFIESPMountPoint
-        {
-            get
-            {
-                return _EFIESPMountPoint;
-            }
-            set
-            {
-                if (value != _EFIESPMountPoint)
-                {
-                    _EFIESPMountPoint = value;
-                    OnPropertyChanged(nameof(EFIESPMountPoint));
-                }
-            }
-        }
-
-        private string _MainOSMountPoint;
-        public string MainOSMountPoint
-        {
-            get
-            {
-                return _MainOSMountPoint;
-            }
-            set
-            {
-                if (value != _MainOSMountPoint)
-                {
-                    _MainOSMountPoint = value;
-                    OnPropertyChanged(nameof(MainOSMountPoint));
-                }
-            }
-        }
-
-        private bool _IsPhoneDisconnected;
-        public bool IsPhoneDisconnected
-        {
-            get
-            {
-                return _IsPhoneDisconnected;
-            }
-            set
-            {
-                if (value != _IsPhoneDisconnected)
-                {
-                    _IsPhoneDisconnected = value;
-                    OnPropertyChanged(nameof(IsPhoneDisconnected));
-                }
-            }
-        }
-
-        private bool _IsPhoneInMassStorage;
-        public bool IsPhoneInMassStorage
-        {
-            get
-            {
-                return _IsPhoneInMassStorage;
-            }
-            set
-            {
-                if (value != _IsPhoneInMassStorage)
-                {
-                    _IsPhoneInMassStorage = value;
-                    OnPropertyChanged(nameof(IsPhoneInMassStorage));
-                }
-            }
-        }
-
-        private bool _IsPhoneInOtherMode;
-        public bool IsPhoneInOtherMode
-        {
-            get
-            {
-                return _IsPhoneInOtherMode;
-            }
-            set
-            {
-                if (value != _IsPhoneInOtherMode)
-                {
-                    _IsPhoneInOtherMode = value;
-                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
-                }
-            }
-        }
-
-        private DelegateCommand _UnlockPhoneCommand;
-        public DelegateCommand UnlockPhoneCommand
-        {
-            get
-            {
-                return _UnlockPhoneCommand ??= new DelegateCommand(() => UnlockPhoneCallback(), () => !IsPhoneDisconnected);
-            }
-        }
-
-        private DelegateCommand _UnlockImageCommand;
-        public DelegateCommand UnlockImageCommand
-        {
-            get
-            {
-                return _UnlockImageCommand ??= new DelegateCommand(() => UnlockImageCallback(EFIESPMountPoint, MainOSMountPoint), () => (EFIESPMountPoint != null) || (MainOSMountPoint != null));
-            }
-        }
-
-        ~LumiaRootAccessTargetSelectionViewModel()
-        {
-            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
-        }
-
-        private void NewDeviceArrived(ArrivalEventArgs Args)
-        {
-            new Thread(() => EvaluateViewState()).Start();
-        }
-
-        private void DeviceRemoved()
-        {
-            new Thread(() => EvaluateViewState()).Start();
-        }
-
-        internal override void EvaluateViewState()
-        {
-            IsPhoneDisconnected = PhoneNotifier.CurrentInterface == null;
-            IsPhoneInMassStorage = PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_MassStorage;
-            IsPhoneInOtherMode = !IsPhoneDisconnected && !IsPhoneInMassStorage;
-            UnlockPhoneCommand.RaiseCanExecuteChanged();
-            UnlockImageCommand.RaiseCanExecuteChanged();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal class LumiaUnlockRootTargetSelectionViewModel : LumiaRootAccessTargetSelectionViewModel
+    {
+        public LumiaUnlockRootTargetSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToDumpRom, Action SwitchToFlashRom, Action UnlockPhoneCallback, Action<string, string> UnlockImageCallback)
+            : base(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpRom, SwitchToFlashRom, UnlockPhoneCallback, UnlockImageCallback) { }
+    }
+
+    internal class LumiaUndoRootTargetSelectionViewModel : LumiaRootAccessTargetSelectionViewModel
+    {
+        public LumiaUndoRootTargetSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToDumpRom, Action SwitchToFlashRom, Action UnlockPhoneCallback, Action<string, string> UnlockImageCallback)
+            : base(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpRom, SwitchToFlashRom, UnlockPhoneCallback, UnlockImageCallback) { }
+    }
+
+    internal class LumiaRootAccessTargetSelectionViewModel : ContextViewModel
+    {
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        internal Action SwitchToUnlockBoot;
+        internal Action SwitchToDumpRom;
+        internal Action SwitchToFlashRom;
+        private readonly Action UnlockPhoneCallback;
+        private readonly Action<string, string> UnlockImageCallback;
+
+        internal LumiaRootAccessTargetSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToDumpRom, Action SwitchToFlashRom, Action UnlockPhoneCallback, Action<string, string> UnlockImageCallback)
+            : base()
+        {
+            this.PhoneNotifier = PhoneNotifier;
+            this.SwitchToDumpRom = SwitchToDumpRom;
+            this.SwitchToFlashRom = SwitchToFlashRom;
+            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
+            this.UnlockPhoneCallback = UnlockPhoneCallback;
+            this.UnlockImageCallback = UnlockImageCallback;
+
+            this.PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+            this.PhoneNotifier.DeviceRemoved += DeviceRemoved;
+
+            new Thread(() => EvaluateViewState()).Start();
+        }
+
+        private string _EFIESPMountPoint;
+        public string EFIESPMountPoint
+        {
+            get
+            {
+                return _EFIESPMountPoint;
+            }
+            set
+            {
+                if (value != _EFIESPMountPoint)
+                {
+                    _EFIESPMountPoint = value;
+                    OnPropertyChanged(nameof(EFIESPMountPoint));
+                }
+            }
+        }
+
+        private string _MainOSMountPoint;
+        public string MainOSMountPoint
+        {
+            get
+            {
+                return _MainOSMountPoint;
+            }
+            set
+            {
+                if (value != _MainOSMountPoint)
+                {
+                    _MainOSMountPoint = value;
+                    OnPropertyChanged(nameof(MainOSMountPoint));
+                }
+            }
+        }
+
+        private bool _IsPhoneDisconnected;
+        public bool IsPhoneDisconnected
+        {
+            get
+            {
+                return _IsPhoneDisconnected;
+            }
+            set
+            {
+                if (value != _IsPhoneDisconnected)
+                {
+                    _IsPhoneDisconnected = value;
+                    OnPropertyChanged(nameof(IsPhoneDisconnected));
+                }
+            }
+        }
+
+        private bool _IsPhoneInMassStorage;
+        public bool IsPhoneInMassStorage
+        {
+            get
+            {
+                return _IsPhoneInMassStorage;
+            }
+            set
+            {
+                if (value != _IsPhoneInMassStorage)
+                {
+                    _IsPhoneInMassStorage = value;
+                    OnPropertyChanged(nameof(IsPhoneInMassStorage));
+                }
+            }
+        }
+
+        private bool _IsPhoneInOtherMode;
+        public bool IsPhoneInOtherMode
+        {
+            get
+            {
+                return _IsPhoneInOtherMode;
+            }
+            set
+            {
+                if (value != _IsPhoneInOtherMode)
+                {
+                    _IsPhoneInOtherMode = value;
+                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
+                }
+            }
+        }
+
+        private DelegateCommand _UnlockPhoneCommand;
+        public DelegateCommand UnlockPhoneCommand
+        {
+            get
+            {
+                return _UnlockPhoneCommand ??= new DelegateCommand(() => UnlockPhoneCallback(), () => !IsPhoneDisconnected);
+            }
+        }
+
+        private DelegateCommand _UnlockImageCommand;
+        public DelegateCommand UnlockImageCommand
+        {
+            get
+            {
+                return _UnlockImageCommand ??= new DelegateCommand(() => UnlockImageCallback(EFIESPMountPoint, MainOSMountPoint), () => (EFIESPMountPoint != null) || (MainOSMountPoint != null));
+            }
+        }
+
+        ~LumiaRootAccessTargetSelectionViewModel()
+        {
+            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
+        }
+
+        private void NewDeviceArrived(ArrivalEventArgs Args)
+        {
+            new Thread(() => EvaluateViewState()).Start();
+        }
+
+        private void DeviceRemoved()
+        {
+            new Thread(() => EvaluateViewState()).Start();
+        }
+
+        internal override void EvaluateViewState()
+        {
+            IsPhoneDisconnected = PhoneNotifier.CurrentInterface == null;
+            IsPhoneInMassStorage = PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_MassStorage;
+            IsPhoneInOtherMode = !IsPhoneDisconnected && !IsPhoneInMassStorage;
+            UnlockPhoneCommand.RaiseCanExecuteChanged();
+            UnlockImageCommand.RaiseCanExecuteChanged();
+        }
+    }
+}
diff --git a/ViewModels/LumiaUnlockRootViewModel.cs b/WPinternals/ViewModels/LumiaUnlockRootViewModel.cs
similarity index 97%
rename from ViewModels/LumiaUnlockRootViewModel.cs
rename to WPinternals/ViewModels/LumiaUnlockRootViewModel.cs
index f62b97b..082d434 100644
--- a/ViewModels/LumiaUnlockRootViewModel.cs
+++ b/WPinternals/ViewModels/LumiaUnlockRootViewModel.cs
@@ -1,290 +1,290 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Linq;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal class LumiaUnlockRootViewModel : ContextViewModel
-    {
-        private readonly PhoneNotifierViewModel PhoneNotifier;
-        private readonly Action SwitchToUnlockBoot;
-        private readonly Action SwitchToDumpRom;
-        private readonly Action SwitchToFlashRom;
-        private readonly Action Callback;
-        private readonly bool DoUnlock;
-
-        internal LumiaUnlockRootViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToDumpRom, Action SwitchToFlashRom, bool DoUnlock, Action Callback)
-            : base()
-        {
-            IsSwitchingInterface = false;
-            IsFlashModeOperation = true;
-
-            this.PhoneNotifier = PhoneNotifier;
-            this.SwitchToDumpRom = SwitchToDumpRom;
-            this.SwitchToFlashRom = SwitchToFlashRom;
-            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
-            this.DoUnlock = DoUnlock;
-            this.Callback = Callback;
-        }
-
-        internal override void EvaluateViewState()
-        {
-            if (!IsActive)
-            {
-                return;
-            }
-
-            if (DoUnlock)
-            {
-                if ((SubContextViewModel == null) || (SubContextViewModel is LumiaUndoRootTargetSelectionViewModel))
-                {
-                    ActivateSubContext(new LumiaUnlockRootTargetSelectionViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpRom, SwitchToFlashRom, DoUnlockPhone, DoUnlockImage));
-                }
-            }
-            else
-            {
-                if ((SubContextViewModel == null) || (SubContextViewModel is LumiaUnlockRootTargetSelectionViewModel))
-                {
-                    ActivateSubContext(new LumiaUndoRootTargetSelectionViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpRom, SwitchToFlashRom, DoUnlockPhone, DoUnlockImage));
-                }
-            }
-        }
-
-        internal async void DoUnlockPhone()
-        {
-            try
-            {
-                IsSwitchingInterface = true;
-                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_MassStorage,
-                    (msg, sub) =>
-                        ActivateSubContext(new BusyViewModel(msg, sub)));
-                bool HasNewBootloader = HasNewBootloaderFromMassStorage();
-                string EFIESPPath = HasNewBootloader ? null : ((MassStorage)PhoneNotifier.CurrentModel).Drive + @"\EFIESP\";
-                string MainOSPath = ((MassStorage)PhoneNotifier.CurrentModel).Drive + @"\";
-
-                bool HasV11Patches = HasV11PatchesFromMassStorage();
-
-                StartPatch(EFIESPPath, MainOSPath, HasNewBootloader, HasV11Patches);
-            }
-            catch (Exception Ex)
-            {
-                ActivateSubContext(new MessageViewModel(Ex.Message, () =>
-                {
-                    Callback();
-                    ActivateSubContext(null);
-                }));
-            }
-        }
-
-        internal void DoUnlockImage(string EFIESPMountPoint, string MainOSMountPoint)
-        {
-            StartPatch(EFIESPMountPoint, MainOSMountPoint, false, false); // Unlock image is only supported for Lumia's with bootloader Spec A. Due to complexity of Spec B bootloader hack, it cannot be applied on a mounted image.
-        }
-
-        // Magic!
-        // Apply patches for Root Access
-        private void StartPatch(string EFIESP, string MainOS, bool HasNewBootloader, bool HasV11Patches)
-        {
-            IsSwitchingInterface = false;
-            new Thread(() =>
-                {
-                    if (DoUnlock)
-                    {
-                        LogFile.BeginAction("EnableRootAccess");
-                    }
-                    else
-                    {
-                        LogFile.BeginAction("DisableRootAccess");
-                    }
-
-                    bool Result = false;
-
-                    if (EFIESP != null && !HasV11Patches)
-                    {
-                        if (DoUnlock)
-                        {
-                            ActivateSubContext(new BusyViewModel("Enable Root Access on EFIESP..."));
-                        }
-                        else
-                        {
-                            ActivateSubContext(new BusyViewModel("Disable Root Access on EFIESP..."));
-                        }
-
-                        try
-                        {
-                            App.PatchEngine.TargetPath = EFIESP;
-                            if (DoUnlock)
-                            {
-                                Result = App.PatchEngine.Patch("SecureBootHack-V1-EFIESP");
-
-                                if (!Result)
-                                {
-                                    ActivateSubContext(new MessageViewModel("Failed to enable Root Access on EFIESP! Check the OS version on the phone and verify the compatibility-list in the \"Getting started\" section.", Exit));
-                                    return;
-                                }
-                            }
-                            else
-                            {
-                                App.PatchEngine.Restore("SecureBootHack-V1-EFIESP");
-                                Result = true;
-                            }
-                        }
-                        catch (UnauthorizedAccessException Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            ActivateSubContext(new MessageViewModel("Failed to enable Root Access on EFIESP! Not enough privileges to perform action. Try to logon to Windows with an administrator account.", Exit));
-                            return;
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-
-                        if (!Result)
-                        {
-                            ActivateSubContext(new MessageViewModel("Failed to enable Root Access on EFIESP!", Exit));
-                            return;
-                        }
-                    }
-
-                    if (MainOS != null)
-                    {
-                        if (DoUnlock)
-                        {
-                            ActivateSubContext(new BusyViewModel("Enable Root Access on MainOS..."));
-                        }
-                        else
-                        {
-                            ActivateSubContext(new BusyViewModel("Disable Root Access on MainOS..."));
-                        }
-
-                        try
-                        {
-                            App.PatchEngine.TargetPath = MainOS;
-                            if (DoUnlock)
-                            {
-                                Result = App.PatchEngine.Patch("RootAccess-MainOS");
-
-                                if (Result)
-                                {
-                                    Result = App.PatchEngine.Patch("SecureBootHack-MainOS");
-                                }
-
-                                if (!Result)
-                                {
-                                    ActivateSubContext(new MessageViewModel("Failed to enable Root Access on MainOS! Check the OS version on the phone and verify the compatibility-list in the \"Getting started\" section.", Exit));
-                                    return;
-                                }
-                            }
-                            else
-                            {
-                                App.PatchEngine.Restore("RootAccess-MainOS");
-
-                                if (!HasNewBootloader)
-                                {
-                                    App.PatchEngine.Restore("SecureBootHack-MainOS");
-                                }
-
-                                Result = true;
-                            }
-                        }
-                        catch (UnauthorizedAccessException Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            ActivateSubContext(new MessageViewModel("Failed to enable Root Access on MainOS! Not enough privileges to perform action. Try to logon to Windows with an administrator account.", Exit));
-                            Result = false;
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-
-                        if (!Result)
-                        {
-                            ActivateSubContext(new MessageViewModel("Failed to enable Root Access on MainOS!", Exit));
-                        }
-                        else
-                        {
-                            if (DoUnlock)
-                            {
-                                ActivateSubContext(new MessageViewModel("Root Access successfully enabled!", Exit));
-                            }
-                            else
-                            {
-                                ActivateSubContext(new MessageViewModel("Root Access successfully disabled!", Exit));
-                            }
-                        }
-                    }
-
-                    if (DoUnlock)
-                    {
-                        LogFile.EndAction("EnableRootAccess");
-                    }
-                    else
-                    {
-                        LogFile.EndAction("DisableRootAccess");
-                    }
-                }).Start();
-        }
-
-        private void Exit()
-        {
-            IsSwitchingInterface = false;
-            Callback();
-            ActivateSubContext(null);
-        }
-
-        private bool HasNewBootloaderFromMassStorage()
-        {
-            bool Result = false;
-            MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
-            Phone.OpenVolume(false);
-            byte[] GPTBuffer = Phone.ReadSectors(1, 33);
-            GPT GPT = new(GPTBuffer);
-            Partition Partition = GPT.GetPartition("UEFI");
-            byte[] UefiBuffer = Phone.ReadSectors(Partition.FirstSector, Partition.LastSector - Partition.FirstSector + 1);
-            UEFI UEFI = new(UefiBuffer);
-            string BootMgrName = UEFI.EFIs.First(efi => (efi.Name != null) && (efi.Name.Contains("BootMgrApp") || efi.Name.Contains("FlashApp"))).Name;
-            byte[] BootMgr = UEFI.GetFile(BootMgrName);
-            // "Header V2"
-            Result = ByteOperations.FindAscii(BootMgr, "Header V2") != null;
-            Phone.CloseVolume();
-            return Result;
-        }
-
-        private bool HasV11PatchesFromMassStorage()
-        {
-            bool Result = false;
-            MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
-            Phone.OpenVolume(false);
-            byte[] GPTBuffer = Phone.ReadSectors(1, 33);
-            GPT GPT = new(GPTBuffer);
-            Partition Partition = GPT.GetPartition("BACKUP_BS_NV");
-            Result = Partition != null;
-            Phone.CloseVolume();
-            return Result;
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Linq;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal class LumiaUnlockRootViewModel : ContextViewModel
+    {
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action SwitchToUnlockBoot;
+        private readonly Action SwitchToDumpRom;
+        private readonly Action SwitchToFlashRom;
+        private readonly Action Callback;
+        private readonly bool DoUnlock;
+
+        internal LumiaUnlockRootViewModel(PhoneNotifierViewModel PhoneNotifier, Action SwitchToUnlockBoot, Action SwitchToDumpRom, Action SwitchToFlashRom, bool DoUnlock, Action Callback)
+            : base()
+        {
+            IsSwitchingInterface = false;
+            IsFlashModeOperation = true;
+
+            this.PhoneNotifier = PhoneNotifier;
+            this.SwitchToDumpRom = SwitchToDumpRom;
+            this.SwitchToFlashRom = SwitchToFlashRom;
+            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
+            this.DoUnlock = DoUnlock;
+            this.Callback = Callback;
+        }
+
+        internal override void EvaluateViewState()
+        {
+            if (!IsActive)
+            {
+                return;
+            }
+
+            if (DoUnlock)
+            {
+                if ((SubContextViewModel == null) || (SubContextViewModel is LumiaUndoRootTargetSelectionViewModel))
+                {
+                    ActivateSubContext(new LumiaUnlockRootTargetSelectionViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpRom, SwitchToFlashRom, DoUnlockPhone, DoUnlockImage));
+                }
+            }
+            else
+            {
+                if ((SubContextViewModel == null) || (SubContextViewModel is LumiaUnlockRootTargetSelectionViewModel))
+                {
+                    ActivateSubContext(new LumiaUndoRootTargetSelectionViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpRom, SwitchToFlashRom, DoUnlockPhone, DoUnlockImage));
+                }
+            }
+        }
+
+        internal async void DoUnlockPhone()
+        {
+            try
+            {
+                IsSwitchingInterface = true;
+                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_MassStorage,
+                    (msg, sub) =>
+                        ActivateSubContext(new BusyViewModel(msg, sub)));
+                bool HasNewBootloader = HasNewBootloaderFromMassStorage();
+                string EFIESPPath = HasNewBootloader ? null : ((MassStorage)PhoneNotifier.CurrentModel).Drive + @"\EFIESP\";
+                string MainOSPath = ((MassStorage)PhoneNotifier.CurrentModel).Drive + @"\";
+
+                bool HasV11Patches = HasV11PatchesFromMassStorage();
+
+                StartPatch(EFIESPPath, MainOSPath, HasNewBootloader, HasV11Patches);
+            }
+            catch (Exception Ex)
+            {
+                ActivateSubContext(new MessageViewModel(Ex.Message, () =>
+                {
+                    Callback();
+                    ActivateSubContext(null);
+                }));
+            }
+        }
+
+        internal void DoUnlockImage(string EFIESPMountPoint, string MainOSMountPoint)
+        {
+            StartPatch(EFIESPMountPoint, MainOSMountPoint, false, false); // Unlock image is only supported for Lumia's with bootloader Spec A. Due to complexity of Spec B bootloader hack, it cannot be applied on a mounted image.
+        }
+
+        // Magic!
+        // Apply patches for Root Access
+        private void StartPatch(string EFIESP, string MainOS, bool HasNewBootloader, bool HasV11Patches)
+        {
+            IsSwitchingInterface = false;
+            new Thread(() =>
+                {
+                    if (DoUnlock)
+                    {
+                        LogFile.BeginAction("EnableRootAccess");
+                    }
+                    else
+                    {
+                        LogFile.BeginAction("DisableRootAccess");
+                    }
+
+                    bool Result = false;
+
+                    if (EFIESP != null && !HasV11Patches)
+                    {
+                        if (DoUnlock)
+                        {
+                            ActivateSubContext(new BusyViewModel("Enable Root Access on EFIESP..."));
+                        }
+                        else
+                        {
+                            ActivateSubContext(new BusyViewModel("Disable Root Access on EFIESP..."));
+                        }
+
+                        try
+                        {
+                            App.PatchEngine.TargetPath = EFIESP;
+                            if (DoUnlock)
+                            {
+                                Result = App.PatchEngine.Patch("SecureBootHack-V1-EFIESP");
+
+                                if (!Result)
+                                {
+                                    ActivateSubContext(new MessageViewModel("Failed to enable Root Access on EFIESP! Check the OS version on the phone and verify the compatibility-list in the \"Getting started\" section.", Exit));
+                                    return;
+                                }
+                            }
+                            else
+                            {
+                                App.PatchEngine.Restore("SecureBootHack-V1-EFIESP");
+                                Result = true;
+                            }
+                        }
+                        catch (UnauthorizedAccessException Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            ActivateSubContext(new MessageViewModel("Failed to enable Root Access on EFIESP! Not enough privileges to perform action. Try to logon to Windows with an administrator account.", Exit));
+                            return;
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+
+                        if (!Result)
+                        {
+                            ActivateSubContext(new MessageViewModel("Failed to enable Root Access on EFIESP!", Exit));
+                            return;
+                        }
+                    }
+
+                    if (MainOS != null)
+                    {
+                        if (DoUnlock)
+                        {
+                            ActivateSubContext(new BusyViewModel("Enable Root Access on MainOS..."));
+                        }
+                        else
+                        {
+                            ActivateSubContext(new BusyViewModel("Disable Root Access on MainOS..."));
+                        }
+
+                        try
+                        {
+                            App.PatchEngine.TargetPath = MainOS;
+                            if (DoUnlock)
+                            {
+                                Result = App.PatchEngine.Patch("RootAccess-MainOS");
+
+                                if (Result)
+                                {
+                                    Result = App.PatchEngine.Patch("SecureBootHack-MainOS");
+                                }
+
+                                if (!Result)
+                                {
+                                    ActivateSubContext(new MessageViewModel("Failed to enable Root Access on MainOS! Check the OS version on the phone and verify the compatibility-list in the \"Getting started\" section.", Exit));
+                                    return;
+                                }
+                            }
+                            else
+                            {
+                                App.PatchEngine.Restore("RootAccess-MainOS");
+
+                                if (!HasNewBootloader)
+                                {
+                                    App.PatchEngine.Restore("SecureBootHack-MainOS");
+                                }
+
+                                Result = true;
+                            }
+                        }
+                        catch (UnauthorizedAccessException Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            ActivateSubContext(new MessageViewModel("Failed to enable Root Access on MainOS! Not enough privileges to perform action. Try to logon to Windows with an administrator account.", Exit));
+                            Result = false;
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+
+                        if (!Result)
+                        {
+                            ActivateSubContext(new MessageViewModel("Failed to enable Root Access on MainOS!", Exit));
+                        }
+                        else
+                        {
+                            if (DoUnlock)
+                            {
+                                ActivateSubContext(new MessageViewModel("Root Access successfully enabled!", Exit));
+                            }
+                            else
+                            {
+                                ActivateSubContext(new MessageViewModel("Root Access successfully disabled!", Exit));
+                            }
+                        }
+                    }
+
+                    if (DoUnlock)
+                    {
+                        LogFile.EndAction("EnableRootAccess");
+                    }
+                    else
+                    {
+                        LogFile.EndAction("DisableRootAccess");
+                    }
+                }).Start();
+        }
+
+        private void Exit()
+        {
+            IsSwitchingInterface = false;
+            Callback();
+            ActivateSubContext(null);
+        }
+
+        private bool HasNewBootloaderFromMassStorage()
+        {
+            bool Result = false;
+            MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
+            Phone.OpenVolume(false);
+            byte[] GPTBuffer = Phone.ReadSectors(1, 33);
+            GPT GPT = new(GPTBuffer);
+            Partition Partition = GPT.GetPartition("UEFI");
+            byte[] UefiBuffer = Phone.ReadSectors(Partition.FirstSector, Partition.LastSector - Partition.FirstSector + 1);
+            UEFI UEFI = new(UefiBuffer);
+            string BootMgrName = UEFI.EFIs.First(efi => (efi.Name != null) && (efi.Name.Contains("BootMgrApp") || efi.Name.Contains("FlashApp"))).Name;
+            byte[] BootMgr = UEFI.GetFile(BootMgrName);
+            // "Header V2"
+            Result = ByteOperations.FindAscii(BootMgr, "Header V2") != null;
+            Phone.CloseVolume();
+            return Result;
+        }
+
+        private bool HasV11PatchesFromMassStorage()
+        {
+            bool Result = false;
+            MassStorage Phone = (MassStorage)PhoneNotifier.CurrentModel;
+            Phone.OpenVolume(false);
+            byte[] GPTBuffer = Phone.ReadSectors(1, 33);
+            GPT GPT = new(GPTBuffer);
+            Partition Partition = GPT.GetPartition("BACKUP_BS_NV");
+            Result = Partition != null;
+            Phone.CloseVolume();
+            return Result;
+        }
+    }
+}
diff --git a/ViewModels/LumiaV2UnlockBootViewModel.cs b/WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs
similarity index 98%
rename from ViewModels/LumiaV2UnlockBootViewModel.cs
rename to WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs
index a6b2cce..a8aea6a 100644
--- a/ViewModels/LumiaV2UnlockBootViewModel.cs
+++ b/WPinternals/ViewModels/LumiaV2UnlockBootViewModel.cs
@@ -1,3004 +1,3004 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.IO.Compression;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace WPinternals
-{
-    internal class LumiaV2UnlockBootViewModel : ContextViewModel
-    {
-        internal static async Task LumiaV2FindFlashingProfile(PhoneNotifierViewModel Notifier, string FFUPath, bool DoResetFirst = true, bool Experimental = false, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null)
-        {
-            if (SetWorkingStatus == null)
-            {
-                SetWorkingStatus = (m, s, v, a, st) => { };
-            }
-
-            if (UpdateWorkingStatus == null)
-            {
-                UpdateWorkingStatus = (m, s, v, st) => { };
-            }
-
-            if (ExitSuccess == null)
-            {
-                ExitSuccess = (m, s) => { };
-            }
-
-            if (ExitFailure == null)
-            {
-                ExitFailure = (m, s) => { };
-            }
-
-            LogFile.BeginAction("FindFlashingProfile");
-            try
-            {
-                LogFile.Log("Find Flashing Profile", LogType.FileAndConsole);
-
-                NokiaFlashModel FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-
-                PhoneInfo Info;
-                if (DoResetFirst)
-                {
-                    // The phone will be reset before flashing, so we have the opportunity to get some more info from the phone
-                    Info = FlashModel.ReadPhoneInfo();
-                    Info.Log(LogType.ConsoleOnly);
-
-                    string FfuFirmware = null;
-                    if (FFUPath != null)
-                    {
-                        FFU FFU = new(FFUPath);
-                        FfuFirmware = FFU.GetFirmwareVersion();
-                    }
-                    FlashProfile Profile = App.Config.GetProfile(Info.PlatformID, Info.Firmware, FfuFirmware);
-
-                    if (Profile != null)
-                    {
-                        LogFile.Log("Flashing Profile already present for this phone", LogType.FileAndConsole);
-                        return;
-                    }
-                }
-                else
-                {
-                    Info = FlashModel.ReadPhoneInfo(ExtendedInfo: false);
-                }
-
-                SetWorkingStatus("Scanning for flashing-profile", "Your phone may appear to be in a reboot-loop. This is expected behavior. Don't interfere this process.", null, Status: WPinternalsStatus.Scanning);
-
-                await LumiaV2CustomFlash(Notifier, FFUPath, false, !Info.IsBootloaderSecure, null, DoResetFirst, Experimental: Experimental, SetWorkingStatus:
-                    (m, s, v, a, st) =>
-                    {
-                        if (st == WPinternalsStatus.SwitchingMode)
-                        {
-                            SetWorkingStatus(m, s, v, a, st);
-                        }
-                    },
-                    UpdateWorkingStatus:
-                    (m, s, v, st) =>
-                    {
-                        if (st == WPinternalsStatus.SwitchingMode)
-                        {
-                            UpdateWorkingStatus(m, s, v, st);
-                        }
-                    },
-                    ExitSuccess: ExitSuccess, ExitFailure: ExitFailure);
-
-                LogFile.Log("Flashing profile found!", LogType.FileAndConsole);
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex);
-            }
-            finally
-            {
-                LogFile.EndAction("FindFlashingProfile");
-            }
-        }
-
-        internal static async Task LumiaV2EnableTestSigning(System.Threading.SynchronizationContext UIContext, string FFUPath, bool DoResetFirst = true)
-        {
-            LogFile.BeginAction("EnableTestSigning");
-            try
-            {
-                LogFile.Log("Command: Enable testsigning", LogType.FileAndConsole);
-                PhoneNotifierViewModel Notifier = new();
-                UIContext.Send(s => Notifier.Start(), null);
-                NokiaFlashModel FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-
-                List<FlashPart> Parts = new();
-                FlashPart Part;
-
-                // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
-                // We need the fist sector if we want to write back the GPT.
-                byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
-                GPT GPT = new(GPTChunk);
-                bool GPTChanged = false;
-
-                Partition BACKUP_BS_NV = GPT.GetPartition("BACKUP_BS_NV");
-                Partition UEFI_BS_NV;
-                if (BACKUP_BS_NV == null)
-                {
-                    BACKUP_BS_NV = GPT.GetPartition("UEFI_BS_NV");
-                    Guid OriginalPartitionTypeGuid = BACKUP_BS_NV.PartitionTypeGuid;
-                    Guid OriginalPartitionGuid = BACKUP_BS_NV.PartitionGuid;
-                    BACKUP_BS_NV.Name = "BACKUP_BS_NV";
-                    BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
-                    BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
-                    UEFI_BS_NV = new Partition
-                    {
-                        Name = "UEFI_BS_NV",
-                        Attributes = BACKUP_BS_NV.Attributes,
-                        PartitionGuid = OriginalPartitionGuid,
-                        PartitionTypeGuid = OriginalPartitionTypeGuid,
-                        FirstSector = BACKUP_BS_NV.LastSector + 1
-                    };
-                    UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
-                    GPT.Partitions.Add(UEFI_BS_NV);
-                    GPTChanged = true;
-                }
-                if (GPTChanged)
-                {
-                    GPT.Rebuild();
-                    Part = new FlashPart
-                    {
-                        StartSector = 0,
-                        Stream = new MemoryStream(GPTChunk)
-                    };
-                    Parts.Add(Part);
-                }
-
-                // This code was used to compress the partition to an embedded resource:
-                //
-                // byte[] sbpart = System.IO.File.ReadAllBytes(@"C:\Windows Phone 8\Sources\WPInternals\SB.Original.bin");
-                // System.IO.FileStream s = new System.IO.FileStream(@"C:\Windows Phone 8\Sources\WPInternals\SB", System.IO.FileMode.Create, System.IO.FileAccess.Write);
-                // CompressedStream Out = new CompressedStream(s, (ulong)sbpart.Length);
-                // Out.Write(sbpart, 0, sbpart.Length);
-                // Out.Close();
-                // s.Close();
-
-                Part = new FlashPart();
-                Partition TargetPartition = GPT.GetPartition("UEFI_BS_NV");
-                Part.StartSector = (UInt32)TargetPartition.FirstSector; // GPT is prepared for 64-bit sector-offset, but flash app isn't.
-                Part.Stream = new SeekableStream(() =>
-                {
-                    var assembly = System.Reflection.Assembly.GetExecutingAssembly();
-
-                    // Magic!
-                    // The SB resource is a compressed version of a raw NV-variable-partition.
-                    // In this partition the SecureBoot variable is disabled.
-                    // It overwrites the variable in a different NV-partition than where this variable is stored usually.
-                    // This normally leads to endless-loops when the NV-variables are enumerated.
-                    // But the partition contains an extra hack to break out the endless loops.
-                    var stream = assembly.GetManifestResourceStream("WPinternals.SB");
-
-                    return new DecompressedStream(stream);
-                });
-                Parts.Add(Part);
-
-                await LumiaV2CustomFlash(Notifier, FFUPath, false, false, Parts, DoResetFirst, ClearFlashingStatusAtEnd: false);
-
-                Notifier.Stop();
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex);
-            }
-            finally
-            {
-                LogFile.EndAction("EnableTestSigning");
-            }
-        }
-
-        internal static async Task<string> LumiaV2SwitchToMassStorageMode(PhoneNotifierViewModel Notifier, string FFUPath, bool DoResetFirst = true)
-        {
-            // If there is no phone connected yet, we wait here for the phone to connect.
-            // Because it could be connecting in mass storage mode.
-            // So we dont want to let SwitchTo() wait for it, because it might already be trying to switch to flash mode, which is not possible and not necessary at that point.
-            if (Notifier.CurrentInterface == null)
-            {
-                LogFile.Log("Waiting for phone to connect...", LogType.FileAndConsole);
-                await Notifier.WaitForArrival();
-            }
-
-            if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_MassStorage)
-            {
-                LogFile.Log("Phone is already in Mass Storage Mode", LogType.FileAndConsole);
-                return ((MassStorage)Notifier.CurrentModel).Drive;
-            }
-
-            NokiaFlashModel FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-            if (DoResetFirst)
-            {
-                // The phone will be reset before flashing, so we have the opportunity to get some more info from the phone
-                PhoneInfo Info = FlashModel.ReadPhoneInfo();
-                Info.Log(LogType.ConsoleOnly);
-            }
-
-            await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
-
-            MassStorage Storage = null;
-            if (Notifier.CurrentModel is MassStorage)
-            {
-                Storage = (MassStorage)Notifier.CurrentModel;
-            }
-
-            if (Storage == null)
-            {
-                throw new WPinternalsException("Failed to switch to Mass Storage Mode");
-            }
-
-            return Storage.Drive;
-        }
-
-        internal static async Task LumiaV2ClearNV(System.Threading.SynchronizationContext UIContext, string FFUPath, bool DoResetFirst = true)
-        {
-            LogFile.BeginAction("ClearNV");
-            try
-            {
-                LogFile.Log("Command: Clear NV", LogType.FileAndConsole);
-                PhoneNotifierViewModel Notifier = new();
-                UIContext.Send(s => Notifier.Start(), null);
-                NokiaFlashModel FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-                List<FlashPart> Parts = new();
-
-                // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
-                // We need the fist sector if we want to write back the GPT.
-                byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
-                GPT GPT = new(GPTChunk);
-                bool GPTChanged = false;
-                Partition BACKUP_BS_NV = GPT.GetPartition("BACKUP_BS_NV");
-                Partition UEFI_BS_NV;
-                if (BACKUP_BS_NV == null)
-                {
-                    BACKUP_BS_NV = GPT.GetPartition("UEFI_BS_NV");
-                    Guid OriginalPartitionTypeGuid = BACKUP_BS_NV.PartitionTypeGuid;
-                    Guid OriginalPartitionGuid = BACKUP_BS_NV.PartitionGuid;
-                    BACKUP_BS_NV.Name = "BACKUP_BS_NV";
-                    BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
-                    BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
-                    UEFI_BS_NV = new Partition
-                    {
-                        Name = "UEFI_BS_NV",
-                        Attributes = BACKUP_BS_NV.Attributes,
-                        PartitionGuid = OriginalPartitionGuid,
-                        PartitionTypeGuid = OriginalPartitionTypeGuid,
-                        FirstSector = BACKUP_BS_NV.LastSector + 1
-                    };
-                    UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
-                    GPT.Partitions.Add(UEFI_BS_NV);
-                    GPTChanged = true;
-                }
-                if (GPTChanged)
-                {
-                    GPT.Rebuild();
-                    FlashPart Part = new();
-                    Part.StartSector = 0;
-                    Part.Stream = new MemoryStream(GPTChunk);
-                    Parts.Add(Part);
-                }
-
-                using (MemoryStream Space = new(new byte[0x40000]))
-                {
-                    Partition Target = GPT.GetPartition("UEFI_BS_NV");
-                    Parts.Add(new FlashPart() { StartSector = (uint)Target.FirstSector, Stream = Space });
-
-                    await LumiaV2CustomFlash(Notifier, FFUPath, false, false, Parts, DoResetFirst, ClearFlashingStatusAtEnd: false);
-                }
-
-                LogFile.Log("NV successfully cleared!", LogType.FileAndConsole);
-                Notifier.Stop();
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex);
-            }
-            finally
-            {
-                LogFile.EndAction("ClearNV");
-            }
-        }
-
-        internal static async Task LumiaV2FlashPartition(System.Threading.SynchronizationContext UIContext, string FFUPath, string PartitionName, string PartitionPath, bool DoResetFirst = true)
-        {
-            LogFile.BeginAction("FlashPartition");
-            try
-            {
-                LogFile.Log("Command: Flash Partition", LogType.FileAndConsole);
-                LogFile.Log("Partition name: " + PartitionName, LogType.FileAndConsole);
-                LogFile.Log("Partition file: " + PartitionPath, LogType.FileAndConsole);
-                if (FFUPath != null)
-                {
-                    LogFile.Log("Profile FFU file: " + FFUPath, LogType.FileAndConsole);
-                }
-
-                PhoneNotifierViewModel Notifier = new();
-                UIContext.Send(s => Notifier.Start(), null);
-
-                NokiaFlashModel FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-
-                PhoneInfo Info = FlashModel.ReadPhoneInfo();
-
-                // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
-                // We need the fist sector if we want to write back the GPT.
-                byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
-                GPT GPT = new(GPTChunk);
-
-                Partition TargetPartition = GPT.GetPartition(PartitionName);
-                if (TargetPartition == null)
-                {
-                    throw new WPinternalsException("Target partition not found!", "Couldn't find \"" + PartitionName + "\" from the device GPT.");
-                }
-
-                LogFile.Log("Target-partition found at sector: 0x" + TargetPartition.FirstSector.ToString("X8") + " - 0x" + TargetPartition.LastSector.ToString("X8"), LogType.FileAndConsole);
-
-                bool IsUnlocked = false;
-                bool GPTChanged = false;
-                List<FlashPart> Parts = new();
-                FlashPart Part;
-                if (string.Equals(PartitionName, "EFIESP", StringComparison.CurrentCultureIgnoreCase))
-                {
-                    byte[] EfiespBinary = File.ReadAllBytes(PartitionPath);
-                    IsUnlocked = (ByteOperations.ReadUInt32(EfiespBinary, 0x20) == (EfiespBinary.Length / 0x200 / 2)) && ByteOperations.ReadAsciiString(EfiespBinary, (UInt32)(EfiespBinary.Length / 2) + 3, 8) == "MSDOS5.0";
-
-                    if (IsUnlocked)
-                    {
-                        Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
-                        if (IsUnlockedFlag == null)
-                        {
-                            IsUnlockedFlag = new Partition
-                            {
-                                Name = "IS_UNLOCKED",
-                                Attributes = 0,
-                                PartitionGuid = Guid.NewGuid(),
-                                PartitionTypeGuid = Guid.NewGuid(),
-                                FirstSector = 0x40,
-                                LastSector = 0x40
-                            };
-                            GPT.Partitions.Add(IsUnlockedFlag);
-                            GPTChanged = true;
-                        }
-                    }
-                    else
-                    {
-                        Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
-                        if (IsUnlockedFlag != null)
-                        {
-                            GPT.Partitions.Remove(IsUnlockedFlag);
-                            GPTChanged = true;
-                        }
-                    }
-
-                    if (GPTChanged)
-                    {
-                        GPT.Rebuild();
-                        Part = new FlashPart
-                        {
-                            StartSector = 0,
-                            Stream = new MemoryStream(GPTChunk)
-                        };
-                        Parts.Add(Part);
-                    }
-                }
-
-                using (FileStream Stream = new(PartitionPath, FileMode.Open))
-                {
-                    if ((UInt64)Stream.Length != (TargetPartition.SizeInSectors * 0x200))
-                    {
-                        throw new WPinternalsException("Raw partition has wrong size. Size = 0x" + Stream.Length.ToString("X8") + ". Expected size = 0x" + (TargetPartition.SizeInSectors * 0x200).ToString("X8"));
-                    }
-
-                    Part = new FlashPart
-                    {
-                        StartSector = (UInt32)TargetPartition.FirstSector,
-                        Stream = Stream
-                    };
-                    Parts.Add(Part);
-                    await LumiaV2CustomFlash(Notifier, FFUPath, false, false, Parts, DoResetFirst, !string.Equals(PartitionName, "UEFI_BS_NV", StringComparison.CurrentCultureIgnoreCase));
-                }
-                Notifier.Stop();
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex);
-            }
-            finally
-            {
-                LogFile.EndAction("FlashPartition");
-            }
-        }
-
-        internal static async Task LumiaV2FlashRaw(System.Threading.SynchronizationContext UIContext, UInt64 StartSector, string DataPath, string FFUPath, bool DoResetFirst = true)
-        {
-            LogFile.BeginAction("FlashRaw");
-            try
-            {
-                LogFile.Log("Command: Flash Raw", LogType.FileAndConsole);
-                LogFile.Log("Start sector: 0x" + StartSector.ToString("X16"), LogType.FileAndConsole);
-                LogFile.Log("Data file: " + DataPath, LogType.FileAndConsole);
-                if (FFUPath != null)
-                {
-                    LogFile.Log("FFU file: " + FFUPath, LogType.FileAndConsole);
-                }
-
-                PhoneNotifierViewModel Notifier = new();
-                UIContext.Send(s => Notifier.Start(), null);
-
-                NokiaFlashModel FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
-
-                PhoneInfo Info = FlashModel.ReadPhoneInfo();
-
-                byte[] Data = File.ReadAllBytes(DataPath);
-
-                await LumiaV2CustomFlash(Notifier, FFUPath, false, false, (UInt32)StartSector, Data, DoResetFirst);
-                Notifier.Stop();
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex);
-            }
-            finally
-            {
-                LogFile.EndAction("FlashRaw");
-            }
-        }
-
-        internal async static Task LumiaV2CustomFlash(PhoneNotifierViewModel Notifier, string FFUPath, bool PerformFullFlashFirst, bool SkipWrite, UInt32 StartSector, byte[] Data, bool DoResetFirst = true, bool ClearFlashingStatusAtEnd = true, bool CheckSectorAlignment = true, bool ShowProgress = true, bool Experimental = false) //, string LoaderPath = null)
-        {
-            using MemoryStream Stream = new(Data);
-            FlashPart Part = new() { StartSector = StartSector, Stream = Stream };
-            List<FlashPart> Parts = new();
-            Parts.Add(Part);
-            await LumiaV2CustomFlash(Notifier, FFUPath, PerformFullFlashFirst, SkipWrite, Parts, DoResetFirst, ClearFlashingStatusAtEnd, CheckSectorAlignment, ShowProgress, Experimental);
-        }
-
-        internal async static Task LumiaV2CustomFlash(PhoneNotifierViewModel Notifier, string FFUPath, bool PerformFullFlashFirst, bool SkipWrite, UInt32 StartSector, Stream Data, bool DoResetFirst = true, bool ClearFlashingStatusAtEnd = true, bool CheckSectorAlignment = true, bool ShowProgress = true, bool Experimental = false) //, string LoaderPath = null)
-        {
-            FlashPart Part = new() { StartSector = StartSector, Stream = Data };
-            List<FlashPart> Parts = new();
-            Parts.Add(Part);
-            await LumiaV2CustomFlash(Notifier, FFUPath, PerformFullFlashFirst, SkipWrite, Parts, DoResetFirst, ClearFlashingStatusAtEnd, CheckSectorAlignment, ShowProgress, Experimental);
-        }
-
-        internal async static Task LumiaV2CustomFlash(PhoneNotifierViewModel Notifier, string FFUPath, bool PerformFullFlashFirst, bool SkipWrite, List<FlashPart> FlashParts, bool DoResetFirst = true, bool ClearFlashingStatusAtEnd = true, bool CheckSectorAlignment = true, bool ShowProgress = true, bool Experimental = false, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null, string ProgrammerPath = null)
-        {
-            NokiaFlashModel Model = (NokiaFlashModel)Notifier.CurrentModel;
-            PhoneInfo Info = Model.ReadPhoneInfo();
-
-            byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(Model, 131072u);
-
-            GPT GPT = new(GPTChunk);
-
-            Partition UefiBSNV = GPT.GetPartition("UEFI_BS_NV");
-
-            bool UseOlderExploit = Info.UefiSecureBootEnabled;
-
-            if (!UseOlderExploit && ClearFlashingStatusAtEnd)
-            {
-                if (FlashParts == null)
-                {
-                    UseOlderExploit = true;
-                }
-                else
-                {
-                    foreach (var part in FlashParts)
-                    {
-                        if (part.StartSector >= UefiBSNV.FirstSector && part.StartSector <= UefiBSNV.LastSector)
-                        {
-                            UseOlderExploit = true;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (UseOlderExploit || !ClearFlashingStatusAtEnd)
-            {
-                await LumiaV2CustomFlashInternal(Notifier, FFUPath, PerformFullFlashFirst, SkipWrite, FlashParts, DoResetFirst, ClearFlashingStatusAtEnd, CheckSectorAlignment, ShowProgress, Experimental, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure, ProgrammerPath);
-            }
-            else
-            {
-                await LumiaV3FlashRomViewModel.LumiaV3CustomFlash(Notifier, FlashParts, CheckSectorAlignment, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure);
-            }
-        }
-
-        // Magic!
-        internal async static Task LumiaV2CustomFlashInternal(PhoneNotifierViewModel Notifier, string FFUPath, bool PerformFullFlashFirst, bool SkipWrite, List<FlashPart> FlashParts, bool DoResetFirst = true, bool ClearFlashingStatusAtEnd = true, bool CheckSectorAlignment = true, bool ShowProgress = true, bool Experimental = false, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null, string ProgrammerPath = null) //, string LoaderPath = null)
-        {
-            // Both SecurityHeader and StoreHeader need to be modified.
-            // Those should both not fall in a memory-gap to allow modification.
-            // The partial FFU header must be allocated in front of those headers, so the size of the partial header must be at least the size of the the SecurityHeader.
-            // Hashes take more space than descriptors, so the SecurityHeader will always be the biggest.
-
-            bool AutoEmergencyReset = true;
-            bool Timeout;
-
-            if (SetWorkingStatus == null)
-            {
-                SetWorkingStatus = (m, s, v, a, st) => { };
-            }
-
-            if (UpdateWorkingStatus == null)
-            {
-                UpdateWorkingStatus = (m, s, v, st) => { };
-            }
-
-            if (ExitSuccess == null)
-            {
-                ExitSuccess = (m, s) => { };
-            }
-
-            if (ExitFailure == null)
-            {
-                ExitFailure = (m, s) => { };
-            }
-
-            NokiaFlashModel Model = (NokiaFlashModel)Notifier.CurrentModel;
-            PhoneInfo Info = Model.ReadPhoneInfo();
-
-            string Type = Info.Type;
-            if (ProgrammerPath == null)
-            {
-                ProgrammerPath = GetProgrammerPath(Info.RKH, Type);
-                if (ProgrammerPath == null)
-                {
-                    LogFile.Log("WARNING: No emergency programmer file found. Finding flash profile and rebooting phone may take a long time!", LogType.FileAndConsole);
-                }
-            }
-            List<FFUEntry> FFUs = null;
-            FlashProfile Profile;
-            if (FFUPath == null)
-            {
-                // Try to find an FFU from the repository for which there is also a known flashing profile
-                FFUs = App.Config.FFURepository.Where(e => Info.PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists()).ToList();
-                foreach (FFUEntry CurrentEntry in FFUs)
-                {
-                    Profile = App.Config.GetProfile(Info.PlatformID, Info.Firmware, CurrentEntry.FirmwareVersion);
-                    if (Profile != null)
-                    {
-                        FFUPath = CurrentEntry.Path;
-                        break;
-                    }
-                }
-            }
-
-            if (FFUPath == null)
-            {
-                // Try to find any FFU with matching PlatformID in the repository
-                if (FFUs.Count > 0)
-                {
-                    FFUPath = FFUs[0].Path;
-                }
-            }
-
-            if (FFUPath == null)
-            {
-                throw new WPinternalsException("No valid profile FFU found in repository", "You can download necessary files in the &quot;Download&quot; section");
-            }
-
-            FFU FFU = new(FFUPath);
-            UInt32 UpdateType = ByteOperations.ReadUInt32(FFU.StoreHeader, 0);
-            if (UpdateType != 0)
-            {
-                throw new WPinternalsException("Only Full Flash images supported", "The provided FFU file reports that it doesn't support Full Flash updates, but may support something else such as Partial Flash updates. This is not supported.");
-            }
-
-            if (FlashParts != null)
-            {
-                foreach (FlashPart Part in FlashParts)
-                {
-                    if (Part.Stream == null)
-                    {
-                        throw new ArgumentException("Stream is null");
-                    }
-
-                    if (!Part.Stream.CanSeek)
-                    {
-                        throw new ArgumentException("Streams must be seekable");
-                    }
-
-                    if ((Part.StartSector * 0x200 % FFU.ChunkSize) != 0)
-                    {
-                        throw new ArgumentException("Invalid StartSector alignment");
-                    }
-
-                    if (CheckSectorAlignment && (Part.Stream.Length % FFU.ChunkSize) != 0)
-                    {
-                        throw new ArgumentException("Invalid Data length");
-                    }
-                }
-            }
-
-            if ((Info.SecureFfuSupportedProtocolMask & ((ushort)FfuProtocol.ProtocolSyncV2)) == 0) // Exploit needs protocol v2 -> This check is not conclusive, because old phones also report support for this protocol, although it is really not supported.
-            {
-                throw new WPinternalsException("Flash failed!", "Protocols not supported. The phone reports that it does not support the Protocol Sync V2.");
-            }
-
-            if (Info.FlashAppProtocolVersionMajor < 2) // Old phones do not support the hack. These phones have Flash protocol 1.x.
-            {
-                throw new WPinternalsException("Flash failed!", "Protocols not supported. The phone reports that Flash App communication protocol is lower than 2. Reported version by the phone: " + Info.FlashAppProtocolVersionMajor + ".");
-            }
-
-            UEFI UEFI = new(FFU.GetPartition("UEFI"));
-            string BootMgrName = UEFI.EFIs.First(efi => efi.Name?.Contains("BootMgrApp") == true).Name;
-            UInt32 EstimatedSizeOfMemGap = (UInt32)UEFI.GetFile(BootMgrName).Length;
-            byte Options = 0;
-            if (SkipWrite)
-            {
-                Options = (byte)FlashOptions.SkipWrite;
-            }
-
-            if (!Info.IsBootloaderSecure)
-            {
-                Options = (byte)((FlashOptions)Options | FlashOptions.SkipSignatureCheck);
-            }
-
-            // Gap fill calculation:
-            // About 0x18000 of the gap is used for other purposes.
-            // Then round down to fill up the rest of the space, to make sure the memory for the headers is not allocated in a gap.
-            UInt32 EstimatedGapFill = FFU.RoundDownToChunks(EstimatedSizeOfMemGap - 0x18000);
-
-            UInt32 MaximumGapFill;
-            int MaximumAttempts;
-
-            if (!Experimental)
-            {
-                MaximumGapFill = FFU.RoundUpToChunks(2 * EstimatedSizeOfMemGap);
-                MaximumAttempts = (int)(((MaximumGapFill / FFU.ChunkSize) + 1) * 4);
-            }
-            else
-            {
-                MaximumGapFill = FFU.RoundUpToChunks(4 * EstimatedSizeOfMemGap);
-                MaximumAttempts = (int)(((MaximumGapFill / FFU.ChunkSize) + 1) * 8);
-            }
-
-            byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(Model, (UInt32)FFU.ChunkSize);
-
-            // Start with a reset
-            if (DoResetFirst)
-            {
-                SetWorkingStatus("Initializing flash...", "Rebooting phone", null, Status: WPinternalsStatus.Initializing);
-
-                // When in flash mode, it is not possible to reboot straight to flash.
-                // Reboot and catch the phone in bootloader mode and then switch to flash context
-                Model.ResetPhone();
-
-                #region Properly recover from reset - many phones respond differently
-
-                Timeout = false;
-                try
-                {
-                    await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
-                }
-                catch (TimeoutException)
-                {
-                    Timeout = true;
-                }
-                if ((Notifier.CurrentInterface == null) && (!AutoEmergencyReset || Timeout))
-                {
-                    AutoEmergencyReset = false;
-
-                    if (Timeout)
-                    {
-                        LogFile.Log("The phone is not responding", LogType.ConsoleOnly);
-                        LogFile.Log("It might be in emergency mode, while you have no matching driver installed", LogType.ConsoleOnly);
-                    }
-                    LogFile.Log("To continue the unlock-sequence, the phone needs to be rebooted", LogType.ConsoleOnly);
-                    LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
-                    LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
-                    LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
-                    LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
-
-                    SetWorkingStatus("You need to manually reset your phone now!", (Timeout ? "The phone is not responding. It might be in emergency mode, while you have no matching driver installed. " : "") + "To continue the unlock-sequence, the phone needs to be rebooted. Keep the phone connected to the PC. The unlock-sequence will resume automatically.", null, false, WPinternalsStatus.WaitingForManualReset);
-
-                    await Notifier.WaitForRemoval();
-
-                    UpdateWorkingStatus("Initializing flash...", null, null);
-
-                    await Notifier.WaitForArrival();
-                }
-                if (Notifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
-                {
-                    bool FailedToStartProgrammer = false;
-                    if (ProgrammerPath != null)
-                    {
-                        QualcommSahara Sahara = new((QualcommSerial)Notifier.CurrentModel);
-                        try
-                        {
-                            await Sahara.Reset(ProgrammerPath);
-                            await Notifier.WaitForArrival();
-                        }
-                        catch (BadConnectionException)
-                        {
-                            FailedToStartProgrammer = true;
-                        }
-                        catch (Exception ex)
-                        {
-                            LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
-                            LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
-                            FailedToStartProgrammer = true;
-                        }
-                    }
-
-                    if (ProgrammerPath == null || FailedToStartProgrammer)
-                    {
-                        ((QualcommSerial)Notifier.CurrentModel).Close(); // Prevent "Resource in use";
-
-                        Timeout = false;
-                        if (AutoEmergencyReset)
-                        {
-                            try
-                            {
-                                await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
-                            }
-                            catch (TimeoutException)
-                            {
-                                Timeout = true;
-                            }
-                            catch (Exception ex)
-                            {
-                                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
-                                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
-                                FailedToStartProgrammer = true;
-                            }
-                        }
-                        if (!AutoEmergencyReset || Timeout)
-                        {
-                            AutoEmergencyReset = false;
-
-                            if (!FailedToStartProgrammer)
-                            {
-                                LogFile.Log("The phone is in emergency mode and you didn't provide an emergency programmer", LogType.ConsoleOnly);
-                                LogFile.Log("This phone also doesn't seem to reboot after a timeout, so you got to help a bit", LogType.ConsoleOnly);
-                                LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
-                                LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
-                                LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
-                                LogFile.Log("To prevent this, provide an emergency programmer next time you will unlock a bootloader", LogType.ConsoleOnly);
-                                LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
-
-                                SetWorkingStatus("You need to manually reset your phone now!",
-                                    "The phone is in emergency mode and you didn't provide an emergency programmer." +
-                                    " This phone also doesn't seem to reboot after a timeout, so you got to help a bit." +
-                                    " Keep the phone connected to the PC." +
-                                    " The unlock-sequence will resume automatically. To prevent this, provide an emergency programmer next time you will unlock a bootloader.",
-                                    null, false, WPinternalsStatus.WaitingForManualReset);
-                            }
-                            else
-                            {
-                                LogFile.Log("The phone is in emergency mode and we couldn't start the emergency programmer", LogType.ConsoleOnly);
-                                LogFile.Log("This phone also doesn't seem to reboot after a timeout, so you got to help a bit", LogType.ConsoleOnly);
-                                LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
-                                LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
-                                LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
-                                LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
-
-                                SetWorkingStatus("You need to manually reset your phone now!",
-                                    "The phone is in emergency mode and we couldn't start the emergency programmer." +
-                                    " This phone also doesn't seem to reboot after a timeout, so you got to help a bit." +
-                                    " Keep the phone connected to the PC." +
-                                    " The unlock-sequence will resume automatically.",
-                                    null, false, WPinternalsStatus.WaitingForManualReset);
-                            }
-                            await Notifier.WaitForRemoval();
-
-                            UpdateWorkingStatus("Initializing flash...", null, null);
-
-                            await Notifier.WaitForArrival();
-                        }
-                    }
-                }
-
-                #endregion
-
-                if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader))
-                {
-                    throw new WPinternalsException("Phone is in wrong mode", "The phone should have been detected in bootloader or flash mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
-                }
-
-                Model = (NokiaFlashModel)Notifier.CurrentModel;
-                UpdateWorkingStatus("Initializing flash...", null, null);
-            }
-
-            try
-            {
-                // This will succeed on new models
-                Model.SwitchToFlashAppContext();
-                Model.DisableRebootTimeOut();
-            }
-            catch
-            {
-                // This will succeed on old models
-                Model.ResetPhoneToFlashMode();
-                await Notifier.WaitForArrival();
-                Model = (NokiaFlashModel)Notifier.CurrentModel;
-            }
-
-            // The payloads must be ordered by the number of locations
-            //
-            // FlashApp processes payloads like this:
-            // - First payloads which are with one location, those can be sent in bulk
-            // - Then payloads with more than one location, those should not be sent in bulk
-            //
-            // If you do not order payloads like this, you will get an error, most likely hash mismatch
-            //
-            FlashingPayload[] payloads = Array.Empty<FlashingPayload>();
-            if (FlashParts != null)
-            {
-                payloads = GetNonOptimizedPayloads(FlashParts, FFU.ChunkSize, (uint)(Info.WriteBufferSize / FFU.ChunkSize), SetWorkingStatus, UpdateWorkingStatus).OrderBy(x => x.TargetLocations.Length).ToArray();
-            }
-
-            bool AssumeImageHeaderFallsInGap = true;
-            bool AllocateAsyncBuffersOnPhone = true;
-            bool AllocateBackupBuffersOnPhone = false;
-            UInt32 CurrentGapFill = EstimatedGapFill;
-            UInt32 OldGapFill;
-            bool Success = false;
-            bool Abort = false;
-            bool PhoneNeedsReset = false;
-            bool WaitForReset = false;
-            int AttemptCount = 0;
-            UInt32 ExploitHeaderAllocationSize = 0;
-            UInt32 LastHeaderV2Size = 0;
-            byte[] PartialHeader;
-            byte[] FfuHeader;
-            UInt64 CombinedFFUHeaderSize;
-            Allocation SecurityHeaderAllocation = null;
-            Allocation ImageHeaderAllocation = null;
-            Allocation StoreHeaderAllocation = null;
-            Allocation PartialHeaderAllocation = null;
-            UInt32 HeaderOffset = 0;
-            bool Scanning = false;
-            bool ResetScanning = false;
-
-            Profile = App.Config.GetProfile(Info.PlatformID, Info.Firmware, FFU.GetFirmwareVersion());
-            if (Profile == null)
-            {
-                LogFile.Log("No flashing profile found", LogType.FileAndConsole);
-            }
-            else
-            {
-                if (ShowProgress)
-                {
-                    LogFile.Log("Flashing profile loaded", LogType.FileAndConsole);
-                }
-
-                CurrentGapFill = Profile.FillSize;
-                ExploitHeaderAllocationSize = Profile.HeaderSize;
-                AllocateAsyncBuffersOnPhone = Profile.AllocateAsyncBuffersOnPhone;
-                AssumeImageHeaderFallsInGap = Profile.AssumeImageHeaderFallsInGap;
-            }
-
-            do
-            {
-                AttemptCount++;
-                if ((Profile == null) || (AttemptCount > 1))
-                {
-                    LogFile.Log("Custom flash attempt: " + AttemptCount + " of " + MaximumAttempts, LogType.FileAndConsole);
-
-                    if (!Scanning)
-                    {
-                        SetWorkingStatus("Scanning for flashing-profile - attempt " + AttemptCount.ToString() + " of " + MaximumAttempts.ToString(), "Your phone may appear to be in a reboot-loop. This is expected behavior. Don't interfere this process.", (uint)MaximumAttempts, Status: WPinternalsStatus.Scanning);
-                    }
-
-                    Scanning = true;
-                    UpdateWorkingStatus("Scanning for flashing-profile - attempt " + AttemptCount.ToString() + " of " + MaximumAttempts.ToString(), "Your phone may appear to be in a reboot-loop. This is expected behavior. Don't interfere this process.", (uint)AttemptCount, Status: WPinternalsStatus.Scanning);
-
-                    ExploitHeaderAllocationSize = CurrentGapFill + (UInt32)FFU.ChunkSize;
-                }
-
-                // Initialize flash attempts
-                // Make sure async buffers are allocated on the phone before overflow attempts,
-                // or else failed attempts may cause more memory-gaps and allocation becomes more unpredictable.
-                // The phone is rebooted after each attempt (to avoid memory-corruption).
-                // And it seems that that normally all allocations are in a big memory-gap, which was created before BootMgr was loaded.
-                // And there is still memory allocated in a lower range.
-                // And by allocating USB buffers, it could cause more memory-scattering.
-                // On Lumia 950 2 USB buffers are allocated and on Lumia 930 there is only one USB buffer allocated.
-                // StartAsyncFlash() is needed on 950 and 640. But not needed on 930!
-                // In any case, the allocation of the async-buffers should not be simulated in the Uefi Memory Simulator,
-                // because that would create a gap in the Simulator, instead of avoiding a gap on the phone.
-                //
-                if (AllocateAsyncBuffersOnPhone)
-                {
-                    Model.StartAsyncFlash();
-                    Model.EndAsyncFlash(); // Ending Async flashing is not necessary for Lumia 950, but it is necessary for Lumia 640!
-                }
-
-                if (AllocateBackupBuffersOnPhone)
-                {
-                    Model.BackupPartitionToRam("MODEM_FSG");
-                    Model.BackupPartitionToRam("MODEM_FS1");
-                    Model.BackupPartitionToRam("MODEM_FS2");
-                    Model.BackupPartitionToRam("SSD");
-                    Model.BackupPartitionToRam("DPP");
-                }
-
-                HeaderOffset = 0;
-                SecurityHeaderAllocation = null;
-                ImageHeaderAllocation = null;
-                StoreHeaderAllocation = null;
-                PartialHeaderAllocation = null;
-                UInt32 DestinationChunkIndex = 0;
-
-                // Create memory map
-                UefiMemorySim.Reset();
-                SecurityHeaderAllocation = UefiMemorySim.AllocatePool((uint)FFU.SecurityHeader.Length);
-                SecurityHeaderAllocation.CopyToThisAllocation(FFU.SecurityHeader, 0, (uint)FFU.SecurityHeader.Length, 0);
-                if (!AssumeImageHeaderFallsInGap)
-                {
-                    ImageHeaderAllocation = UefiMemorySim.AllocatePool((uint)FFU.ImageHeader.Length);
-                    ImageHeaderAllocation.CopyToThisAllocation(FFU.ImageHeader, 0, (uint)FFU.ImageHeader.Length, 0);
-                }
-                StoreHeaderAllocation = UefiMemorySim.AllocatePool((uint)FFU.StoreHeader.Length);
-                StoreHeaderAllocation.CopyToThisAllocation(FFU.StoreHeader, 0, (uint)FFU.StoreHeader.Length, 0);
-
-                // Simulate sending partial header
-                PartialHeaderAllocation = UefiMemorySim.AllocatePool(ExploitHeaderAllocationSize);
-
-                CombinedFFUHeaderSize = FFU.HeaderSize;
-                FfuHeader = new byte[CombinedFFUHeaderSize];
-                UInt32 TotalPayloadCount = (uint)payloads.Length;
-                bool HeadersFull;
-                int FlashingPhase = 0;
-                UInt32 FlashingPhaseStartPayloadIndex = 0;
-                UInt32 FlashingPhasePayloadCount = 0;
-                bool FlashInProgress = false;
-                byte[] Buffer = new byte[FFU.ChunkSize];
-                LastHeaderV2Size = 0;
-                do
-                {
-                    HeadersFull = false;
-
-                    // On every flashing phase we must fill the memory gap first, before sending the header.
-                    if (CurrentGapFill > UefiMemorySim.PageSize)
-                    {
-                        if (FlashingPhase > 0)
-                        {
-                            // Avoid Error 0x0010 "Invalid sub block length".
-                            // Headersize must increase compared to last time a header was sent, to avoid processing the header.
-                            // Offset must be 0, to reset buffers.
-                            // Previous data + new data must fit in new headersize.
-                            // We can send an extra byte, because last memory buffer was sent including the tail.
-                            // And there is always extra space in the memoryspace after the tail.
-                            Model.SendFfuHeaderV2(LastHeaderV2Size + 1, 0, new byte[1], Options);
-                        }
-
-                        // CurrentGapFill is the amount of data we want to be allocated on the phone
-                        // But we send less data, so the header won't be processed yet.
-                        PartialHeader = new byte[UefiMemorySim.PageSize];
-                        Model.SendFfuHeaderV2(CurrentGapFill, 0, PartialHeader, Options); // Fill memory gap -> This will fail on phones with Flash Protocol v1.x !! On Lumia 640 this will hang on receiving the response when EndAsyncFlash was not called.
-                    }
-
-                    using (FileStream FfuFile = new(FFU.Path, FileMode.Open, FileAccess.Read))
-                    {
-                        // On every flashing phase we need to send the full header again to reset all the counters.
-                        FfuFile.Read(FfuHeader, 0, (int)CombinedFFUHeaderSize);
-                        Model.SendFfuHeaderV1(FfuHeader, Options);
-
-                        if (PerformFullFlashFirst && (FlashingPhase == 0))
-                        {
-                            // If we flash the stock ROM at this point, the header is in memory is not overwritten yet.
-                            // This means that after the last chunk was written, the flashing-status is written to NV (and also flushed).
-                            // But this doesn't matter, because even when we want to overwrite NV, this happens later.
-                            // When the header is successfully overwritten in memory, the next chunk of custom data will be allowed to be written.
-
-                            LogFile.Log("Starting custom flash attempt by doing a full flash.", LogType.FileAndConsole);
-
-                            UInt64 Position = CombinedFFUHeaderSize;
-                            byte[] FlashPayload;
-                            int ChunkIndex = 0;
-                            UInt32 TotalChunkCount = (UInt32)FFU.TotalChunkCount;
-
-                            // Protocol v2
-                            FlashPayload = new byte[Info.WriteBufferSize];
-
-                            while (Position < (UInt64)FfuFile.Length)
-                            {
-                                UInt32 CommonFlashPayloadSize = Info.WriteBufferSize;
-                                if (((UInt64)FfuFile.Length - Position) < CommonFlashPayloadSize)
-                                {
-                                    CommonFlashPayloadSize = (UInt32)((UInt64)FfuFile.Length - Position);
-                                    FlashPayload = new byte[CommonFlashPayloadSize];
-                                }
-
-                                FfuFile.Read(FlashPayload, 0, (int)CommonFlashPayloadSize);
-                                ChunkIndex += (int)(CommonFlashPayloadSize / FFU.ChunkSize);
-                                Model.SendFfuPayloadV2(FlashPayload, ShowProgress ? (int)((double)(ChunkIndex + 1) * 100 / TotalChunkCount) : 0, 0);
-                                Position += CommonFlashPayloadSize;
-                            }
-                        }
-                    }
-
-                    UInt32 NewWriteDescriptorOffset = 0xF8;
-                    UInt32 CatalogSize = ByteOperations.ReadUInt32(UefiMemorySim.Buffer, SecurityHeaderAllocation.ContentStart + 0x18);
-                    UInt32 NewHashOffset = 0x20 + CatalogSize;
-
-                    UInt32 WriteDescriptorLength = 0;
-                    UInt32 WriteDescriptorCount = 0;
-                    UInt32 HashTableSize = 0;
-
-                    if (PerformFullFlashFirst && (FlashingPhase == 0))
-                    {
-                        // Set offset for new descriptor to end of descriptor-table
-                        WriteDescriptorLength = ByteOperations.ReadUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xD4);
-                        NewWriteDescriptorOffset += WriteDescriptorLength;
-
-                        // Get descriptor-count of the FFU
-                        WriteDescriptorCount = ByteOperations.ReadUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xD0);
-
-                        // Set offset for new hash to end of hash-table
-                        HashTableSize = ByteOperations.ReadUInt32(UefiMemorySim.Buffer, SecurityHeaderAllocation.ContentStart + 0x1C);
-                        NewHashOffset += HashTableSize; // Skip to the end of the original hash-table.
-                    }
-                    else
-                    {
-                        // From start of hash-table skip the first hashes for Image- and StoreHeaders.
-                        HashTableSize = (UInt32)((FFU.ImageHeader.Length + FFU.StoreHeader.Length) / FFU.ChunkSize * 0x20);
-                        NewHashOffset += HashTableSize;
-                    }
-
-                    // Determine available space and number of payloads to send for this phase
-                    UInt32 HashSpace = (UInt32)(FFU.SecurityHeader.Length - NewHashOffset);
-                    UInt32 DescriptorSpace = (UInt32)(FFU.StoreHeader.Length - NewWriteDescriptorOffset);
-
-                    FlashingPhasePayloadCount = 0;
-
-                    // Always flash one extra chunk on the GPT (for purpose of testing and for making sure that first chunk does not contain all zero's).
-                    UInt32 SecurityHeaderSize = FlashInProgress ? 0 : 0x20u;
-                    UInt32 StoreHeaderSize = FlashInProgress ? 0 : 0x10u;
-                    for (UInt32 i = FlashingPhaseStartPayloadIndex; i < payloads.Length; i++)
-                    {
-                        UInt32 NewSecurityHeaderSize = SecurityHeaderSize + payloads[i].GetSecurityHeaderSize();
-                        UInt32 NewStoreHeaderSize = StoreHeaderSize + payloads[i].GetStoreHeaderSize();
-
-                        if (NewSecurityHeaderSize > HashSpace || NewStoreHeaderSize > DescriptorSpace)
-                        {
-                            HeadersFull = true;
-                            break;
-                        }
-
-                        FlashingPhasePayloadCount++;
-                        SecurityHeaderSize = NewSecurityHeaderSize;
-                        StoreHeaderSize = NewStoreHeaderSize;
-                    }
-
-                    HashTableSize += SecurityHeaderSize;
-                    WriteDescriptorCount += FlashingPhasePayloadCount + (FlashInProgress ? 0 : 1u);
-                    WriteDescriptorLength += StoreHeaderSize;
-
-                    if (!ClearFlashingStatusAtEnd || HeadersFull)
-                    {
-                        WriteDescriptorCount++;
-                    }
-
-                    // Write back new header values.
-                    ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xD4, WriteDescriptorLength);
-                    ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xD0, WriteDescriptorCount);
-                    ByteOperations.WriteUInt32(UefiMemorySim.Buffer, SecurityHeaderAllocation.ContentStart + 0x1C, HashTableSize);
-                    ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xEC, 0); // FlashOnlyTableLength - Make flash progress bar white immediately.
-                    ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xE8, 1); // FlashOnlyTableCount
-
-                    // Write new descriptors
-                    // First write descriptor and hash for the first GPT chunk
-                    if (!FlashInProgress) // We only send the first GPT chunk when flash is not in progress yet.
-                    {
-                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x00, 0x00000001); // Location count
-                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x04, 0x00000001); // Chunk count
-                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x08, 0x00000000); // Disk access method (0 = Begin, 2 = End)
-                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x0C, 0x00000000); // Chunk index = GPT
-                        NewWriteDescriptorOffset += 0x10;
-                        byte[] GPTHashValue = System.Security.Cryptography.SHA256.Create().ComputeHash(GPTChunk, 0, FFU.ChunkSize); // Hash is 0x20 bytes
-                        System.Buffer.BlockCopy(GPTHashValue, 0, UefiMemorySim.Buffer, (int)(SecurityHeaderAllocation.ContentStart + NewHashOffset), 0x20);
-                        NewHashOffset += 0x20;
-                    }
-
-                    for (UInt32 i = 0; i < FlashingPhasePayloadCount; i++)
-                    {
-                        FlashingPayload payload = payloads[FlashingPhaseStartPayloadIndex + i];
-
-                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x00, (UInt32)payload.TargetLocations.Length); // Location count
-                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x04, payload.ChunkCount);                      // Chunk count
-                        NewWriteDescriptorOffset += 0x08;
-
-                        foreach (UInt32 location in payload.TargetLocations)
-                        {
-                            ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x00, 0x00000000);                          // Disk access method (0 = Begin, 2 = End)
-                            ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x04, location);                            // Chunk index
-                            NewWriteDescriptorOffset += 0x08;
-                        }
-
-                        foreach (byte[] hashValue in payload.ChunkHashes)
-                        {
-                            // Write new hash
-                            System.Buffer.BlockCopy(hashValue, 0, UefiMemorySim.Buffer, (Int32)(SecurityHeaderAllocation.ContentStart + NewHashOffset), 0x20);
-                            NewHashOffset += 0x20;
-                        }
-                    }
-
-                    Stream CurrentStream = null;
-                    int StreamIndex = 0;
-                    int Step = 0;
-                    try
-                    {
-                        // Send a small portion of header v2 at offset 0
-                        // The payload is smaller than the total headersize, so that it won't start processing the header now.
-                        // This will allocate new memory at the bottom of the memory-pool, but it will not reset the previously imported ffu header.
-                        Step = 1;
-                        PartialHeader = new byte[UefiMemorySim.PageSize];
-                        Model.SendFfuHeaderV2(ExploitHeaderAllocationSize, 0, PartialHeader, Options); // SkipWrite = 1 (only works on engineering phones)
-
-                        // Now we will send the rest of the exploit header, but we will increase the total size even higher, so that it still won't start processing the headers.
-                        // We've send only a small first part of the header. The allocated header was bigger: ExploitHeaderAllocationSize.
-                        // But we HAVE to send the whole header. We can't skip a part.
-                        Step = 2;
-                        UInt32 ExploitHeaderRemaining = SecurityHeaderAllocation.TailEnd + 1 - PartialHeaderAllocation.ContentStart - (UInt32)PartialHeader.Length;
-                        HeaderOffset = (UInt32)PartialHeader.Length;
-                        while (ExploitHeaderRemaining > 0)
-                        {
-                            UInt32 CurrentFill = ExploitHeaderRemaining;
-                            if (CurrentFill > Info.WriteBufferSize)
-                            {
-                                CurrentFill = Info.WriteBufferSize;
-                            }
-
-                            PartialHeader = new byte[CurrentFill];
-                            PartialHeaderAllocation.CopyFromThisAllocation(HeaderOffset, CurrentFill, PartialHeader, 0);
-                            Model.SendFfuHeaderV2(HeaderOffset + CurrentFill + 1, HeaderOffset, PartialHeader, Options); // Phone may crash here. USB write is done. USB read might fail due to crash. Happens on my own Lumia 650.
-                            LastHeaderV2Size = HeaderOffset + CurrentFill + 1;
-                            ExploitHeaderRemaining -= CurrentFill;
-                            HeaderOffset += CurrentFill;
-                        }
-
-                        // Send custom payload
-                        Step = 3;
-                        Int32 payloadCount = 0;
-                        byte[] payloadBuffer = new byte[Info.WriteBufferSize];
-                        bool sendPayload = false;
-                        for (Int32 i = FlashInProgress ? 0 : -1; i < FlashingPhasePayloadCount; i++)
-                        {
-                            string NewProgressText = "Flashing resources...";
-                            if (!FlashInProgress)
-                            {
-                                // First send the GPT chunk
-                                Step = 4;
-                                System.Buffer.BlockCopy(GPTChunk, 0, Buffer, 0, FFU.ChunkSize);
-
-                                Step = 8;
-                                // This may fail. Normally with WPinternalsException for Invalid Hash or Data not aligned.
-                                // Or it may fail with a BadConnectionException when the phone crashes and drops the connection.
-                                Model.SendFfuPayloadV1(Buffer, 0);
-                                if (!FlashInProgress)
-                                {
-                                    Step = 9;
-                                    if (ShowProgress)
-                                    {
-                                        LogFile.Log("Flashing in progress!", LogType.FileAndConsole);
-                                    }
-
-                                    FlashInProgress = true;
-                                    Scanning = false;
-                                    SetWorkingStatus(null, null, (UInt64?)payloads.Length, Status: WPinternalsStatus.Flashing);
-                                }
-                            }
-                            else
-                            {
-                                Step = 5;
-
-                                FlashingPayload payload = payloads[FlashingPhaseStartPayloadIndex + i];
-
-                                if (payloadCount == ((Info.WriteBufferSize / FFU.ChunkSize) - 1))
-                                {
-                                    sendPayload = true;
-                                }
-
-                                if (FlashingPhaseStartPayloadIndex + i + 1 >= FlashingPhasePayloadCount)
-                                {
-                                    sendPayload = true;
-                                    byte[] tmpBuffer = new byte[(payloadCount + 1) * FFU.ChunkSize];
-                                    System.Buffer.BlockCopy(payloadBuffer, 0, tmpBuffer, 0, payloadCount * FFU.ChunkSize);
-                                    payloadBuffer = tmpBuffer;
-                                }
-
-                                // Check if the next payload contains more than one chunk
-                                if (!sendPayload && FlashingPhaseStartPayloadIndex + i + 1 < FlashingPhasePayloadCount && (payloads[FlashingPhaseStartPayloadIndex + i + 1].ChunkCount != 1 || payloads[FlashingPhaseStartPayloadIndex + i + 1].TargetLocations.Length != 1))
-                                {
-                                    sendPayload = true;
-                                    byte[] tmpBuffer = new byte[(payloadCount + 1) * FFU.ChunkSize];
-                                    System.Buffer.BlockCopy(payloadBuffer, 0, tmpBuffer, 0, payloadCount * FFU.ChunkSize);
-                                    payloadBuffer = tmpBuffer;
-                                }
-
-                                // We prepare the buffer setup above with all consecutive chunks we have to send in
-                                // We can't send a single chunk otherwise we would get 0x1007: Payload data does not contain all data
-                                if (payload.ChunkCount != 1)
-                                {
-                                    NewProgressText = "Flashing common resources...";
-                                    payloadBuffer = new byte[payload.ChunkCount * FFU.ChunkSize];
-                                    for (uint j = 0; j < payload.ChunkCount; j++)
-                                    {
-                                        StreamIndex = (Int32)payload.StreamIndexes[j];
-                                        FlashPart flashPart = FlashParts[StreamIndex];
-                                        CurrentStream = flashPart.Stream;
-                                        CurrentStream.Seek(payload.StreamLocations[j], SeekOrigin.Begin);
-
-                                        Step = 6;
-                                        Array.Clear(payloadBuffer, (Int32)(FFU.ChunkSize * j), FFU.ChunkSize); // Not really needed anymore?
-
-                                        Step = 7;
-                                        CurrentStream.Read(payloadBuffer, (Int32)(FFU.ChunkSize * j), FFU.ChunkSize);
-                                    }
-                                }
-
-                                if (payload.TargetLocations.Length != 1)
-                                {
-                                    NewProgressText = "Flashing common resources...";
-                                    payloadBuffer = new byte[FFU.ChunkSize];
-                                }
-
-                                if (payload.ChunkCount == 1)
-                                {
-                                    StreamIndex = (Int32)payload.StreamIndexes[0];
-                                    FlashPart flashPart = FlashParts[StreamIndex];
-                                    CurrentStream = flashPart.Stream;
-                                    CurrentStream.Seek(payload.StreamLocations[0], SeekOrigin.Begin);
-
-                                    if (payload.TargetLocations.Length == 1 && !string.IsNullOrEmpty(flashPart.ProgressText))
-                                    {
-                                        NewProgressText = flashPart.ProgressText;
-                                    }
-
-                                    CurrentStream.Read(payloadBuffer, FFU.ChunkSize * payloadCount, FFU.ChunkSize);
-                                }
-
-                                Step = 8;
-                                // This may fail. Normally with WPinternalsException for Invalid Hash or Data not aligned.
-                                // Or it may fail with a BadConnectionException when the phone crashes and drops the connection.
-
-                                payloadCount++;
-                            }
-
-                            UpdateWorkingStatus(NewProgressText, null, (UInt64?)(FlashingPhaseStartPayloadIndex + i + 1), WPinternalsStatus.Flashing);
-
-                            if (i != -1 && sendPayload)
-                            {
-                                // This fails when sending multiple chunks per payload with 0x1003: Hash mismatch
-                                Model.SendFfuPayloadV2(payloadBuffer, ShowProgress ? (Int32)((FlashingPhaseStartPayloadIndex + i + 1) * 100 / payloads.Length) : 0);
-                                sendPayload = false;
-                                payloadCount = 0;
-                                payloadBuffer = new byte[Info.WriteBufferSize];
-                            }
-
-                            DestinationChunkIndex++;
-                        }
-
-                        Step = 10;
-                        FlashingPhaseStartPayloadIndex += FlashingPhasePayloadCount;
-
-                        Step = 11;
-                        if (!HeadersFull)
-                        {
-                            Step = 12;
-                            App.Config.SetProfile(Info.Type, Info.PlatformID, Info.ProductCode, Info.Firmware, FFU.GetFirmwareVersion(), CurrentGapFill, ExploitHeaderAllocationSize, AssumeImageHeaderFallsInGap, AllocateAsyncBuffersOnPhone);
-                            if (ShowProgress)
-                            {
-                                LogFile.Log("Custom flash succeeded!", LogType.FileAndConsole);
-                            }
-
-                            Success = true;
-                        }
-                        else
-                        {
-                            // At this point we're missing a few payloads, so we need to start again.
-                            LogFile.Log("Reinitilizing a new flashing attempt because headers were full and we're not quite done yet!");
-                        }
-                    }
-                    catch (BadConnectionException)
-                    {
-                        LogFile.Log("Connection to phone is lost - " +
-                            Step.ToString() + " " +
-                            StreamIndex.ToString() + " " +
-                            (CurrentStream == null ? "0" : CurrentStream.Position.ToString()) + " " +
-                            FlashingPhase.ToString() + " " +
-                            FlashingPhaseStartPayloadIndex.ToString() + " " +
-                            DestinationChunkIndex.ToString());
-                        LogFile.Log("Expect phone to reboot", LogType.FileAndConsole);
-                        WaitForReset = true;
-                    }
-                    catch (Exception Ex)
-                    {
-                        if (FlashInProgress)
-                        {
-                            // Normally, when we end up here, we were not in process of flashing yet.
-                            // It would be a flash attempt which failed.
-                            // But if we were already flashing, then something else is wrong.
-                            // We need more info and stop flashing.
-                            LogFile.Log("Custom flash failed", LogType.FileAndConsole);
-                            LogFile.LogException(Ex, LogType.FileOnly,
-                                Step.ToString() + " " +
-                                StreamIndex.ToString() + " " +
-                                (CurrentStream == null ? "0" : CurrentStream.Position.ToString()) + " " +
-                                FlashingPhase.ToString() + " " +
-                                FlashingPhaseStartPayloadIndex.ToString() + " " +
-                                DestinationChunkIndex.ToString());
-                            Abort = true;
-                        }
-                        else
-                        {
-                            LogFile.Log("Custom flash attempt failed", LogType.FileAndConsole);
-                            LogFile.LogException(Ex, LogType.FileOnly,
-                                Step.ToString() + " " +
-                                StreamIndex.ToString() + " " +
-                                (CurrentStream == null ? "0" : CurrentStream.Position.ToString()) + " " +
-                                FlashingPhase.ToString() + " " +
-                                FlashingPhaseStartPayloadIndex.ToString() + " " +
-                                DestinationChunkIndex.ToString());
-                        }
-
-                        PhoneNeedsReset = true;
-                    }
-
-                    if (FlashInProgress)
-                    {
-                        FlashingPhase++;
-                    }
-                }
-                while (HeadersFull && FlashInProgress && !Abort);
-
-                if (!Success)
-                {
-                    if ((Profile != null) && !Abort)
-                    {
-                        LogFile.Log("Flashing profile was loaded, but it is not working", LogType.FileAndConsole);
-                        LogFile.Log("Attempting to find a working profile", LogType.FileAndConsole);
-                        ResetScanning = true;
-                    }
-
-                    if (PhoneNeedsReset)
-                    {
-                        Model.ResetPhone();
-                        WaitForReset = true;
-                    }
-
-                    if (WaitForReset)
-                    {
-                        #region Properly recover from reset between flash attempts - many phones respond differently
-
-                        Timeout = false;
-                        try
-                        {
-                            await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
-                        }
-                        catch (TimeoutException)
-                        {
-                            Timeout = true;
-                        }
-                        if ((Notifier.CurrentInterface == null) && (!AutoEmergencyReset || Timeout))
-                        {
-                            AutoEmergencyReset = false;
-
-                            if (Timeout)
-                            {
-                                LogFile.Log("The phone is not responding", LogType.ConsoleOnly);
-                                LogFile.Log("It might be in emergency mode, while you have no matching driver installed", LogType.ConsoleOnly);
-                            }
-                            LogFile.Log("To continue the unlock-sequence, the phone needs to be rebooted", LogType.ConsoleOnly);
-                            LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
-                            LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
-                            LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
-                            LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
-
-                            UpdateWorkingStatus("You need to manually reset your phone now!", (Timeout ? "The phone is not responding. It might be in emergency mode, while you have no matching driver installed. " : "") + "To continue the unlock-sequence, the phone needs to be rebooted. Keep the phone connected to the PC. The unlock-sequence will resume automatically.", null, WPinternalsStatus.WaitingForManualReset);
-
-                            await Notifier.WaitForRemoval();
-
-                            UpdateWorkingStatus("Scanning for flashing-profile - attempt " + AttemptCount.ToString() + " of " + MaximumAttempts.ToString(), "Your phone may appear to be in a reboot-loop. This is expected behavior. Don't interfere this process.", (uint)AttemptCount, Status: WPinternalsStatus.Scanning);
-
-                            await Notifier.WaitForArrival();
-                        }
-                        if (Notifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
-                        {
-                            bool FailedToStartProgrammer = false;
-                            if (ProgrammerPath != null)
-                            {
-                                QualcommSahara Sahara = new((QualcommSerial)Notifier.CurrentModel);
-                                try
-                                {
-                                    await Sahara.Reset(ProgrammerPath);
-                                    await Notifier.WaitForArrival();
-                                }
-                                catch (BadConnectionException)
-                                {
-                                    FailedToStartProgrammer = true;
-                                }
-                            }
-
-                            if (ProgrammerPath == null || FailedToStartProgrammer)
-                            {
-                                ((QualcommSerial)Notifier.CurrentModel).Close(); // Prevent "Resource in use";
-
-                                Timeout = false;
-                                if (AutoEmergencyReset)
-                                {
-                                    try
-                                    {
-                                        await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
-                                    }
-                                    catch (TimeoutException)
-                                    {
-                                        Timeout = true;
-                                    }
-                                    catch (Exception ex)
-                                    {
-                                        LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
-                                        LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
-                                        FailedToStartProgrammer = true;
-                                    }
-                                }
-                                if (!AutoEmergencyReset || Timeout)
-                                {
-                                    AutoEmergencyReset = false;
-                                    if (!FailedToStartProgrammer)
-                                    {
-                                        LogFile.Log("The phone is in emergency mode and you didn't provide an emergency programmer", LogType.ConsoleOnly);
-                                        LogFile.Log("This phone also doesn't seem to reboot after a timeout, so you got to help a bit", LogType.ConsoleOnly);
-                                        LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
-                                        LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
-                                        LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
-                                        LogFile.Log("To prevent this, provide an emergency programmer next time you will unlock a bootloader", LogType.ConsoleOnly);
-                                        LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
-
-                                        SetWorkingStatus("You need to manually reset your phone now!",
-                                            "The phone is in emergency mode and you didn't provide an emergency programmer." +
-                                            " This phone also doesn't seem to reboot after a timeout, so you got to help a bit." +
-                                            " Keep the phone connected to the PC." +
-                                            " The unlock-sequence will resume automatically. To prevent this, provide an emergency programmer next time you will unlock a bootloader.",
-                                            null, false, WPinternalsStatus.WaitingForManualReset);
-                                    }
-                                    else
-                                    {
-                                        LogFile.Log("The phone is in emergency mode and we couldn't start the emergency programmer", LogType.ConsoleOnly);
-                                        LogFile.Log("This phone also doesn't seem to reboot after a timeout, so you got to help a bit", LogType.ConsoleOnly);
-                                        LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
-                                        LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
-                                        LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
-                                        LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
-
-                                        SetWorkingStatus("You need to manually reset your phone now!",
-                                            "The phone is in emergency mode and we couldn't start the emergency programmer." +
-                                            " This phone also doesn't seem to reboot after a timeout, so you got to help a bit." +
-                                            " Keep the phone connected to the PC." +
-                                            " The unlock-sequence will resume automatically.",
-                                            null, false, WPinternalsStatus.WaitingForManualReset);
-                                    }
-
-                                    await Notifier.WaitForRemoval();
-
-                                    UpdateWorkingStatus("Scanning for flashing-profile - attempt " + AttemptCount.ToString() + " of " + MaximumAttempts.ToString(), "Your phone may appear to be in a reboot-loop. This is expected behavior. Don't interfere this process.", (uint)AttemptCount, Status: WPinternalsStatus.Scanning);
-
-                                    await Notifier.WaitForArrival();
-                                }
-                            }
-                        }
-
-                        #endregion
-
-                        // Sanity check: must be in flash mode
-                        if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader))
-                        {
-                            break;
-                        }
-
-                        Model = (NokiaFlashModel)Notifier.CurrentModel;
-
-                        // In case we are on an Engineering phone which isn't stuck in flashmode and booted to BootMgrApp
-                        Model.SwitchToFlashAppContext();
-                        Model.DisableRebootTimeOut();
-                    }
-
-                    PhoneNeedsReset = false;
-                    WaitForReset = false;
-
-                    // Calculate variables for next attempt
-                    if (ResetScanning)
-                    {
-                        AssumeImageHeaderFallsInGap = true;
-                        AllocateAsyncBuffersOnPhone = true;
-                        AllocateBackupBuffersOnPhone = false;
-                        CurrentGapFill = EstimatedGapFill;
-                        Profile = null;
-                        ResetScanning = false;
-                    }
-                    else if (Experimental && !AllocateBackupBuffersOnPhone)
-                    {
-                        AllocateBackupBuffersOnPhone = true;
-                    }
-                    else
-                    {
-                        AllocateBackupBuffersOnPhone = false;
-                        if (AllocateAsyncBuffersOnPhone)
-                        {
-                            AllocateAsyncBuffersOnPhone = false;
-                        }
-                        else
-                        {
-                            AllocateAsyncBuffersOnPhone = true;
-                            OldGapFill = CurrentGapFill;
-                            if (OldGapFill <= EstimatedGapFill)
-                            {
-                                CurrentGapFill = EstimatedGapFill + (EstimatedGapFill - OldGapFill) + (UInt32)FFU.ChunkSize;
-                                if (CurrentGapFill > MaximumGapFill)
-                                {
-                                    if (OldGapFill > 0)
-                                    {
-                                        CurrentGapFill = OldGapFill - (UInt32)FFU.ChunkSize;
-                                    }
-                                    else if (AssumeImageHeaderFallsInGap)
-                                    {
-                                        AssumeImageHeaderFallsInGap = false;
-                                        CurrentGapFill = EstimatedGapFill;
-                                    }
-                                    else
-                                    {
-                                        break;
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                if (OldGapFill <= (EstimatedGapFill * 2))
-                                {
-                                    CurrentGapFill = EstimatedGapFill - (OldGapFill - EstimatedGapFill);
-                                }
-                                else
-                                {
-                                    CurrentGapFill = OldGapFill + (UInt32)FFU.ChunkSize;
-                                    if (CurrentGapFill > MaximumGapFill)
-                                    {
-                                        if (AssumeImageHeaderFallsInGap)
-                                        {
-                                            AssumeImageHeaderFallsInGap = false;
-                                            CurrentGapFill = EstimatedGapFill;
-                                        }
-                                        else
-                                        {
-                                            break;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            while (!Success && !Abort);
-
-            // Now we will first try to create a memory corruption in the phone, before we reset the phone.
-            // The memory corruption will cause the phone to abort the shutdown-sequence and switch to emergency mode immediately.
-            // We already avoided that the FlashingStatus was written to NV.
-            // But we also need to avoid that the BootFlag is written to NV when the phone is properly shut down, because that will overwrite the NV vars we wrote earlier.
-            if (Success && !ClearFlashingStatusAtEnd)
-            {
-                // Make the phone crash here!
-                // This will actually make the phone crash when it frees memory during shutdown or reboot of the phone
-
-                ByteOperations.WriteUInt32(UefiMemorySim.Buffer, SecurityHeaderAllocation.HeadStart + 4, 0); // Set allocation size to 0 in allocationhead
-                ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.HeadStart + 4, 0); // Set allocation size to 0 in allocationhead
-                if (CurrentGapFill > UefiMemorySim.PageSize)
-                {
-                    Model.SendFfuHeaderV2(LastHeaderV2Size + 1, 0, new byte[1], Options);
-                    PartialHeader = new byte[UefiMemorySim.PageSize];
-                    Model.SendFfuHeaderV2(CurrentGapFill, 0, PartialHeader, Options); // Fill memory gap
-                }
-                using (FileStream FfuFile = new(FFU.Path, FileMode.Open, FileAccess.Read))
-                {
-                    // On every flashing phase we need to send the full header again, because this triggers ffu_import_invalidate(), which is necessary to reset all the counters.
-                    FfuFile.Read(FfuHeader, 0, (int)CombinedFFUHeaderSize);
-                    Model.SendFfuHeaderV1(FfuHeader, Options);
-                }
-                PartialHeader = new byte[UefiMemorySim.PageSize];
-                Model.SendFfuHeaderV2(ExploitHeaderAllocationSize, 0, PartialHeader, Options); // SkipWrite = 1 (only works on engineering phones)
-                UInt32 ExploitHeaderRemaining = SecurityHeaderAllocation.TailEnd + 1 - PartialHeaderAllocation.ContentStart - (UInt32)PartialHeader.Length;
-                HeaderOffset = (UInt32)PartialHeader.Length;
-                while (ExploitHeaderRemaining > 0)
-                {
-                    UInt32 CurrentFill = ExploitHeaderRemaining;
-                    if (CurrentFill > Info.WriteBufferSize)
-                    {
-                        CurrentFill = Info.WriteBufferSize;
-                    }
-
-                    PartialHeader = new byte[CurrentFill];
-                    PartialHeaderAllocation.CopyFromThisAllocation(HeaderOffset, CurrentFill, PartialHeader, 0);
-                    Model.SendFfuHeaderV2(HeaderOffset + CurrentFill + 1, HeaderOffset, PartialHeader, Options);
-                    LastHeaderV2Size = HeaderOffset + CurrentFill + 1;
-                    ExploitHeaderRemaining -= CurrentFill;
-                    HeaderOffset += CurrentFill;
-                }
-
-                // Do the actual reset, which will result in a crash while cleaning up memory
-                ((NokiaFlashModel)Notifier.CurrentModel).ResetPhone();
-
-                LogFile.Log("Phone performs hard exit", LogType.FileAndConsole);
-
-                #region Properly recover from reset at the end of custom flash - many phones respond differently
-
-                // Wait for the phone to boot to emergency mode
-                // Emergency mode is always triggered on purpose to avoid writing NV vars
-                // We also wait for emergency mode when no valid programmer is present, or else caller-code will not know at which stage the phone is rebooting
-
-                // Possibilities here:
-                // - Lumia 950 or 950 XL which does not crash to emergency mode, switching to mass storage mode, but not assigning a drive-letter -> Bootmgr, Nothing
-                // - Lumia 950 or 950 XL which does not crash to emergency mode, switching to mass storage mode, and assigning a drive-letter -> Bootmgr, MSM
-                // - Other Lumia's, switching to mass storage mode, but not assigning a drive-letter -> Bootmgr, Nothing
-
-                Timeout = false;
-                try
-                {
-                    await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
-                }
-                catch (TimeoutException)
-                {
-                    Timeout = true;
-                }
-                if ((Notifier.CurrentInterface == null) && (!AutoEmergencyReset || Timeout))
-                {
-                    AutoEmergencyReset = false;
-
-                    if (Timeout)
-                    {
-                        LogFile.Log("The phone is not responding", LogType.ConsoleOnly);
-                        LogFile.Log("It might be in emergency mode, while you have no matching driver installed", LogType.ConsoleOnly);
-                    }
-                    LogFile.Log("To continue the unlock-sequence, the phone needs to be rebooted", LogType.ConsoleOnly);
-                    LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
-                    LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
-                    LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
-                    LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
-
-                    SetWorkingStatus("You need to manually reset your phone now!", (Timeout ? "The phone is not responding. It might be in emergency mode, while you have no matching driver installed. " : "") + "To continue the unlock-sequence, the phone needs to be rebooted. Keep the phone connected to the PC. The unlock-sequence will resume automatically.", null, false, WPinternalsStatus.WaitingForManualReset);
-
-                    await Notifier.WaitForRemoval();
-
-                    SetWorkingStatus("Rebooting phone...");
-                }
-                if (Notifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
-                {
-                    bool FailedToStartProgrammer = false;
-                    if (ProgrammerPath != null)
-                    {
-                        QualcommSahara Sahara = new((QualcommSerial)Notifier.CurrentModel);
-                        try
-                        {
-                            await Sahara.Reset(ProgrammerPath);
-                            await Notifier.WaitForArrival();
-                        }
-                        catch (BadConnectionException)
-                        {
-                            FailedToStartProgrammer = true;
-                        }
-                    }
-
-                    if (ProgrammerPath == null || FailedToStartProgrammer)
-                    {
-                        ((QualcommSerial)Notifier.CurrentModel).Close(); // Prevent "Resource in use";
-
-                        Timeout = false;
-                        if (AutoEmergencyReset)
-                        {
-                            try
-                            {
-                                await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
-                            }
-                            catch (TimeoutException)
-                            {
-                                Timeout = true;
-                            }
-                            catch (Exception ex)
-                            {
-                                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
-                                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
-                                FailedToStartProgrammer = true;
-                            }
-                        }
-                        if (!AutoEmergencyReset || Timeout)
-                        {
-                            AutoEmergencyReset = false;
-
-                            if (!FailedToStartProgrammer)
-                            {
-                                LogFile.Log("The phone is in emergency mode and you didn't provide an emergency programmer", LogType.ConsoleOnly);
-                                LogFile.Log("This phone also doesn't seem to reboot after a timeout, so you got to help a bit", LogType.ConsoleOnly);
-                                LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
-                                LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
-                                LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
-                                LogFile.Log("To prevent this, provide an emergency programmer next time you will unlock a bootloader", LogType.ConsoleOnly);
-                                LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
-
-                                SetWorkingStatus("You need to manually reset your phone now!",
-                                    "The phone is in emergency mode and you didn't provide an emergency programmer." +
-                                    " This phone also doesn't seem to reboot after a timeout, so you got to help a bit." +
-                                    " Keep the phone connected to the PC." +
-                                    " The unlock-sequence will resume automatically. To prevent this, provide an emergency programmer next time you will unlock a bootloader.",
-                                    null, false, WPinternalsStatus.WaitingForManualReset);
-                            }
-                            else
-                            {
-                                LogFile.Log("The phone is in emergency mode and we couldn't start the emergency programmer", LogType.ConsoleOnly);
-                                LogFile.Log("This phone also doesn't seem to reboot after a timeout, so you got to help a bit", LogType.ConsoleOnly);
-                                LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
-                                LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
-                                LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
-                                LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
-
-                                SetWorkingStatus("You need to manually reset your phone now!",
-                                    "The phone is in emergency mode and we couldn't start the emergency programmer." +
-                                    " This phone also doesn't seem to reboot after a timeout, so you got to help a bit." +
-                                    " Keep the phone connected to the PC." +
-                                    " The unlock-sequence will resume automatically.",
-                                    null, false, WPinternalsStatus.WaitingForManualReset);
-                            }
-
-                            await Notifier.WaitForRemoval();
-
-                            SetWorkingStatus("Rebooting phone...");
-
-                            // await Notifier.WaitForArrival(); // Function will exit while phone is rebooting
-                        }
-                    }
-                }
-
-                #endregion
-            }
-            else
-            {
-                // If we didn't do a hard exit, we need to do a normal reboot
-                ((NokiaFlashModel)Notifier.CurrentModel).ResetPhone();
-            }
-
-            if (Success)
-            {
-                ExitSuccess("Flash succeeded!", null);
-            }
-            else
-            {
-                throw new WPinternalsException("Custom flash failed");
-            }
-        }
-
-        internal class FlashingPayload
-        {
-            public UInt32 ChunkCount;
-            public byte[][] ChunkHashes;
-            public UInt32[] TargetLocations;
-            public UInt32[] StreamIndexes;
-            public Int64[] StreamLocations;
-
-            public FlashingPayload(UInt32 ChunkCount, byte[][] ChunkHashes, UInt32[] TargetLocations, UInt32[] StreamIndexes, Int64[] StreamLocations)
-            {
-                this.ChunkCount = ChunkCount;
-                this.ChunkHashes = ChunkHashes;
-                this.TargetLocations = TargetLocations;
-                this.StreamIndexes = StreamIndexes;
-                this.StreamLocations = StreamLocations;
-            }
-
-            public UInt32 GetSecurityHeaderSize()
-            {
-                return 0x20 * (UInt32)ChunkHashes.Length;
-            }
-
-            public UInt32 GetStoreHeaderSize()
-            {
-                return 0x08 * ((UInt32)TargetLocations.Length + 1);
-            }
-        }
-
-        //
-        // Function to fall back into the legacy implementation of custom flash, to test the modifications done in the custom flash function
-        // in LumiaV2UnlockBootViewModel
-        //
-        internal static FlashingPayload[] GetNonOptimizedPayloads(List<FlashPart> flashParts, Int32 chunkSize, UInt32 MaximumChunkCount, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null)
-        {
-            long TotalProcess1 = 0;
-            for (Int32 j = 0; j < flashParts.Count; j++)
-            {
-                FlashPart flashPart = flashParts[j];
-                TotalProcess1 += flashPart.Stream.Length / chunkSize;
-            }
-
-            ulong CurrentProcess1 = 0;
-            SetWorkingStatus("Hashing resources...", "Initializing flash...", (UInt64)TotalProcess1, Status: WPinternalsStatus.Initializing);
-
-            var crypto = System.Security.Cryptography.SHA256.Create();
-            List<FlashingPayload> flashingPayloads = new();
-            if (flashParts == null)
-            {
-                return flashingPayloads.ToArray();
-            }
-
-            for (UInt32 j = 0; j < flashParts.Count; j++)
-            {
-                FlashPart flashPart = flashParts[(Int32)j];
-                flashPart.Stream.Seek(0, SeekOrigin.Begin);
-                var totalChunkCount = flashPart.Stream.Length / chunkSize;
-                for (UInt32 i = 0; i < totalChunkCount; i++)
-                {
-                    UpdateWorkingStatus("Hashing resources...", "Initializing flash...", CurrentProcess1, WPinternalsStatus.Initializing);
-                    byte[] buffer = new byte[chunkSize];
-                    Int64 position = flashPart.Stream.Position;
-                    flashPart.Stream.Read(buffer, 0, chunkSize);
-                    flashingPayloads.Add(new FlashingPayload(1, new byte[][] { crypto.ComputeHash(buffer) }, new UInt32[] { (flashPart.StartSector * 0x200 / (UInt32)chunkSize) + i }, new UInt32[] { j }, new Int64[] { position }));
-                    CurrentProcess1++;
-                }
-            }
-
-            return flashingPayloads.ToArray();
-        }
-
-        //
-        // This function finds in an optimized way the number of duplicate chunks in a given stream, and returns
-        // a list of elements, defining a chunk occurence in said stream and the chunk precomputed SHA256 hash.
-        //
-        internal static FlashingPayload[] GetOptimizedPayloads(List<FlashPart> flashParts, Int32 chunkSize, UInt32 MaximumChunkCount, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null)
-        {
-            List<FlashingPayload> flashingPayloads = new();
-            if (flashParts == null)
-            {
-                return flashingPayloads.ToArray();
-            }
-
-            long TotalProcess1 = 0;
-            for (Int32 j = 0; j < flashParts.Count; j++)
-            {
-                FlashPart flashPart = flashParts[j];
-                TotalProcess1 += flashPart.Stream.Length / chunkSize;
-            }
-
-            ulong CurrentProcess1 = 0;
-            SetWorkingStatus("Hashing resources...", "Initializing flash...", (UInt64)TotalProcess1, Status: WPinternalsStatus.Initializing);
-
-            using (System.Security.Cryptography.SHA256 crypto = System.Security.Cryptography.SHA256.Create())
-            {
-                for (UInt32 j = 0; j < flashParts.Count; j++)
-                {
-                    FlashPart flashPart = flashParts[(Int32)j];
-                    flashPart.Stream.Seek(0, SeekOrigin.Begin);
-                    var totalChunkCount = flashPart.Stream.Length / chunkSize;
-                    for (UInt32 i = 0; i < totalChunkCount; i++)
-                    {
-                        UpdateWorkingStatus("Hashing resources...", "Initializing flash...", CurrentProcess1, WPinternalsStatus.Initializing);
-                        byte[] buffer = new byte[chunkSize];
-                        Int64 position = flashPart.Stream.Position;
-                        flashPart.Stream.Read(buffer, 0, chunkSize);
-                        var hash = crypto.ComputeHash(buffer);
-
-                        if (flashingPayloads.Any(x => ByteOperations.Compare(x.ChunkHashes[0], hash)))
-                        {
-                            var payloadIndex = flashingPayloads.FindIndex(x => ByteOperations.Compare(x.ChunkHashes[0], hash));
-                            var locationList = flashingPayloads[payloadIndex].TargetLocations.ToList();
-                            locationList.Add((flashPart.StartSector * 0x200 / (UInt32)chunkSize) + i);
-                            flashingPayloads[payloadIndex].TargetLocations = locationList.ToArray();
-                        }
-                        else
-                        {
-                            flashingPayloads.Add(new FlashingPayload(1, new byte[][] { hash }, new UInt32[] { (flashPart.StartSector * 0x200 / (UInt32)chunkSize) + i }, new UInt32[] { j }, new Int64[] { position }));
-                        }
-
-                        CurrentProcess1++;
-                    }
-                }
-            }
-
-            return flashingPayloads.ToArray();
-        }
-
-        internal static string GetProgrammerPath(byte[] RKH, string Type)
-        {
-            IEnumerable<EmergencyFileEntry> RKHEntries = App.Config.EmergencyRepository.Where(e => StructuralComparisons.StructuralEqualityComparer.Equals(e.RKH, RKH) && e.ProgrammerExists());
-            if (RKHEntries.Any())
-            {
-                if (RKHEntries.Count() == 1)
-                {
-                    return RKHEntries.First().ProgrammerPath;
-                }
-                else
-                {
-                    EmergencyFileEntry RKHEntry = RKHEntries.FirstOrDefault(e => string.Equals(e.Type, Type, StringComparison.CurrentCulture));
-                    if (RKHEntry != null)
-                    {
-                        return RKHEntry.ProgrammerPath;
-                    }
-                    else
-                    {
-                        return RKHEntries.First().ProgrammerPath; // Cannot be sure this is the right one!!
-                    }
-                }
-            }
-            else
-            {
-                EmergencyFileEntry TypeEntry = App.Config.EmergencyRepository.Find(e => string.Equals(e.Type, Type, StringComparison.CurrentCulture) && e.ProgrammerExists());
-                if (TypeEntry != null)
-                {
-                    return TypeEntry.ProgrammerPath;
-                }
-                else
-                {
-                    return null;
-                }
-            }
-        }
-
-        // Assumes phone with Flash protocol v2
-        // Assumes phone is in flash mode
-        internal async static Task LumiaV2FlashArchive(PhoneNotifierViewModel Notifier, string ArchivePath, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null)
-        {
-            LogFile.BeginAction("FlashCustomROM");
-
-            NokiaFlashModel FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
-
-            // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
-            // We need the fist sector if we want to write back the GPT.
-            byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
-            GPT GPT = new(GPTChunk);
-
-            Partition Target;
-            FlashPart Part;
-            List<FlashPart> Parts = new();
-            ulong MainOSOldSectorCount = 0;
-            ulong MainOSNewSectorCount = 0;
-            ulong DataOldSectorCount = 0;
-            ulong DataNewSectorCount = 0;
-            ulong FirstMainOSSector = 0;
-            int PartitionCount = 0;
-            ulong TotalSizeSectors = 0;
-            bool IsUnlocked = false;
-            bool GPTChanged = false;
-
-            bool ClearFlashingStatus = true;
-
-            if (SetWorkingStatus == null)
-            {
-                SetWorkingStatus = (m, s, v, a, st) => { };
-            }
-
-            if (UpdateWorkingStatus == null)
-            {
-                UpdateWorkingStatus = (m, s, v, st) => { };
-            }
-
-            if (ExitSuccess == null)
-            {
-                ExitSuccess = (m, s) => { };
-            }
-
-            if (ExitSuccess == null)
-            {
-                ExitSuccess = (m, s) => { };
-            }
-
-            SetWorkingStatus("Initializing flash...", null, null, Status: WPinternalsStatus.Initializing);
-
-            try
-            {
-                using FileStream FileStream = new(ArchivePath, FileMode.Open);
-                using ZipArchive Archive = new(FileStream, ZipArchiveMode.Read);
-                // Determine if there is a partition layout present
-                ZipArchiveEntry PartitionEntry = Archive.GetEntry("Partitions.xml");
-                if (PartitionEntry == null)
-                {
-                    GPT.MergePartitions(null, true, Archive);
-                    GPTChanged |= GPT.HasChanged;
-                }
-                else
-                {
-                    using Stream ZipStream = PartitionEntry.Open();
-                    using StreamReader ZipReader = new(ZipStream);
-                    string PartitionXml = ZipReader.ReadToEnd();
-                    GPT.MergePartitions(PartitionXml, true, Archive);
-                    GPTChanged |= GPT.HasChanged;
-                }
-
-                // First determine if we need a new GPT!
-                foreach (ZipArchiveEntry Entry in Archive.Entries)
-                {
-                    if (!Entry.FullName.Contains("/")) // No subfolders
-                    {
-                        string PartitionName = Entry.Name;
-                        int Pos = PartitionName.IndexOf('.');
-                        if (Pos >= 0)
-                        {
-                            PartitionName = PartitionName.Substring(0, Pos);
-                        }
-
-                        Partition Partition = GPT.Partitions.Find(p => string.Equals(p.Name, PartitionName, StringComparison.CurrentCultureIgnoreCase));
-                        if (Partition != null)
-                        {
-                            using DecompressedStream DecompressedStream = new(Entry.Open());
-                            ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
-                            try
-                            {
-                                StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
-                            }
-                            catch { }
-
-                            TotalSizeSectors += StreamLengthInSectors;
-                            PartitionCount++;
-
-                            if (string.Equals(PartitionName, "MainOS", StringComparison.CurrentCultureIgnoreCase))
-                            {
-                                MainOSOldSectorCount = Partition.SizeInSectors;
-                                MainOSNewSectorCount = StreamLengthInSectors;
-                                FirstMainOSSector = Partition.FirstSector;
-                            }
-                            else if (string.Equals(PartitionName, "Data", StringComparison.CurrentCultureIgnoreCase))
-                            {
-                                DataOldSectorCount = Partition.SizeInSectors;
-                                DataNewSectorCount = StreamLengthInSectors;
-                            }
-                            else if (StreamLengthInSectors > Partition.SizeInSectors)
-                            {
-                                LogFile.Log("Flash failed! Size of partition '" + PartitionName + "' is too big.", LogType.FileAndConsole);
-                                ExitFailure("Flash failed!", "Size of partition '" + PartitionName + "' is too big.");
-                                return;
-                            }
-                            else if (string.Equals(PartitionName, "EFIESP", StringComparison.CurrentCultureIgnoreCase))
-                            {
-                                ulong EfiespLength = StreamLengthInSectors * 0x200;
-                                byte[] EfiespBinary = new byte[EfiespLength];
-                                DecompressedStream.Read(EfiespBinary, 0, (int)EfiespLength);
-                                IsUnlocked = (ByteOperations.ReadUInt32(EfiespBinary, 0x20) == (EfiespBinary.Length / 0x200 / 2)) && ByteOperations.ReadAsciiString(EfiespBinary, (UInt32)(EfiespBinary.Length / 2) + 3, 8) == "MSDOS5.0";
-                                if (IsUnlocked)
-                                {
-                                    Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
-                                    if (IsUnlockedFlag == null)
-                                    {
-                                        IsUnlockedFlag = new Partition
-                                        {
-                                            Name = "IS_UNLOCKED",
-                                            Attributes = 0,
-                                            PartitionGuid = Guid.NewGuid(),
-                                            PartitionTypeGuid = Guid.NewGuid(),
-                                            FirstSector = 0x40,
-                                            LastSector = 0x40
-                                        };
-                                        GPT.Partitions.Add(IsUnlockedFlag);
-                                        GPTChanged = true;
-                                        ClearFlashingStatus = false;
-                                    }
-                                }
-                                else
-                                {
-                                    Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
-                                    if (IsUnlockedFlag != null)
-                                    {
-                                        GPT.Partitions.Remove(IsUnlockedFlag);
-                                        GPTChanged = true;
-                                        ClearFlashingStatus = false;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if ((MainOSNewSectorCount > 0) && (DataNewSectorCount > 0))
-                {
-                    if ((MainOSNewSectorCount > MainOSOldSectorCount) || (DataNewSectorCount > DataOldSectorCount))
-                    {
-                        UInt64 OSSpace = GPT.LastUsableSector - FirstMainOSSector + 1;
-                        if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
-                        {
-                            // MainOS and Data partitions need to be re-aligned!
-                            Partition MainOSPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "MainOS", StringComparison.CurrentCultureIgnoreCase));
-                            Partition DataPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "Data", StringComparison.CurrentCultureIgnoreCase));
-                            MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
-                            DataPartition.FirstSector = MainOSPartition.LastSector + 1;
-                            if ((DataPartition.FirstSector % 0x100) > 0)
-                            {
-                                DataPartition.FirstSector = (DataPartition.FirstSector + 0x100) / 0x100 * 0x100;
-                            }
-
-                            DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
-
-                            GPTChanged = true;
-                        }
-                        else
-                        {
-                            LogFile.Log("Flash failed! Sizes of partitions 'MainOS' and 'Data' together are too big.", LogType.FileAndConsole);
-                            ExitFailure("Flash failed!", "Sizes of partitions 'MainOS' and 'Data' together are too big.");
-                            return;
-                        }
-                    }
-                }
-                else if ((MainOSNewSectorCount > 0) && (MainOSNewSectorCount > MainOSOldSectorCount))
-                {
-                    LogFile.Log("Flash failed! Size of partition 'MainOS' is too big.", LogType.FileAndConsole);
-                    ExitFailure("Flash failed!", "Size of partition 'MainOS' is too big.");
-                    return;
-                }
-                else if ((DataNewSectorCount > 0) && (DataNewSectorCount > DataOldSectorCount))
-                {
-                    LogFile.Log("Flash failed! Size of partition 'Data' is too big.", LogType.FileAndConsole);
-                    ExitFailure("Flash failed!", "Size of partition 'Data' is too big.");
-                    return;
-                }
-
-                if (!ClearFlashingStatus)
-                {
-                    if (!IsUnlocked)
-                    {
-                        // Undo secure boot exploit
-                        Partition NvBackupPartition = GPT.GetPartition("BACKUP_BS_NV");
-                        if (NvBackupPartition != null)
-                        {
-                            // This must be a left over of a half unlocked bootloader
-                            Partition NvPartition = GPT.GetPartition("UEFI_BS_NV");
-                            NvBackupPartition.Name = "UEFI_BS_NV";
-                            NvBackupPartition.PartitionGuid = NvPartition.PartitionGuid;
-                            NvBackupPartition.PartitionTypeGuid = NvPartition.PartitionTypeGuid;
-                            GPT.Partitions.Remove(NvPartition);
-                            GPTChanged = true;
-                        }
-
-                        PhoneInfo Info = FlashModel.ReadPhoneInfo(false);
-
-                        // We should only clear NV if there was no backup NV to be restored and the current NV contains the SB unlock.
-                        if ((NvBackupPartition == null) && !Info.UefiSecureBootEnabled)
-                        {
-                            // ClearNV
-                            Part = new FlashPart();
-                            Partition Target2 = GPT.GetPartition("UEFI_BS_NV");
-                            Part.StartSector = (UInt32)Target2.FirstSector;
-                            Part.Stream = new MemoryStream(new byte[0x40000]);
-                            Parts.Add(Part);
-                        }
-                    }
-                    else
-                    {
-                        // Now add NV partition
-                        Partition BACKUP_BS_NV = GPT.GetPartition("BACKUP_BS_NV");
-                        Partition UEFI_BS_NV;
-                        if (BACKUP_BS_NV == null)
-                        {
-                            BACKUP_BS_NV = GPT.GetPartition("UEFI_BS_NV");
-                            Guid OriginalPartitionTypeGuid = BACKUP_BS_NV.PartitionTypeGuid;
-                            Guid OriginalPartitionGuid = BACKUP_BS_NV.PartitionGuid;
-                            BACKUP_BS_NV.Name = "BACKUP_BS_NV";
-                            BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
-                            BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
-                            UEFI_BS_NV = new Partition
-                            {
-                                Name = "UEFI_BS_NV",
-                                Attributes = BACKUP_BS_NV.Attributes,
-                                PartitionGuid = OriginalPartitionGuid,
-                                PartitionTypeGuid = OriginalPartitionTypeGuid,
-                                FirstSector = BACKUP_BS_NV.LastSector + 1
-                            };
-                            UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
-                            GPT.Partitions.Add(UEFI_BS_NV);
-                            GPTChanged = true;
-                        }
-
-                        Part = new FlashPart();
-                        Target = GPT.GetPartition("UEFI_BS_NV");
-                        Part.StartSector = (UInt32)Target.FirstSector; // GPT is prepared for 64-bit sector-offset, but flash app isn't.
-                        Part.Stream = new SeekableStream(() =>
-                        {
-                            var assembly = System.Reflection.Assembly.GetExecutingAssembly();
-
-                                    // Magic!
-                                    // The SB resource is a compressed version of a raw NV-variable-partition.
-                                    // In this partition the SecureBoot variable is disabled.
-                                    // It overwrites the variable in a different NV-partition than where this variable is stored usually.
-                                    // This normally leads to endless-loops when the NV-variables are enumerated.
-                                    // But the partition contains an extra hack to break out the endless loops.
-                                    var stream = assembly.GetManifestResourceStream("WPinternals.SB");
-
-                            return new DecompressedStream(stream);
-                        });
-                        Parts.Add(Part);
-                    }
-                }
-
-                if (GPTChanged)
-                {
-                    GPT.Rebuild();
-                    Part = new FlashPart
-                    {
-                        StartSector = 0,
-                        Stream = new MemoryStream(GPTChunk)
-                    };
-                    Parts.Add(Part);
-                }
-
-                // And then add the partitions from the archive
-                if (PartitionCount > 0)
-                {
-                    foreach (ZipArchiveEntry Entry in Archive.Entries)
-                    {
-                        if (!Entry.FullName.Contains("/")) // No subfolders
-                        {
-                            // "MainOS.bin.gz" => "MainOS"
-                            string PartitionName = Entry.Name;
-                            int Pos = PartitionName.IndexOf('.');
-                            if (Pos >= 0)
-                            {
-                                PartitionName = PartitionName.Substring(0, Pos);
-                            }
-
-                            Target = GPT.Partitions.Find(p => string.Equals(p.Name, PartitionName, StringComparison.CurrentCultureIgnoreCase));
-                            if (Target != null)
-                            {
-                                Part = new FlashPart
-                                {
-                                    StartSector = (UInt32)Target.FirstSector,
-                                    Stream = new SeekableStream(() => new DecompressedStream(Entry.Open()), Entry.Length),
-                                    ProgressText = "Flashing partition " + Target.Name
-                                };
-                                Parts.Add(Part);
-                                LogFile.Log("Partition name=" + PartitionName + ", startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Entry.Length / 0x200).ToString("X8"), LogType.FileOnly);
-                            }
-                        }
-                    }
-
-                    Parts = Parts.OrderBy(p => p.StartSector).ToList();
-                    int Count = 1;
-                    Parts.Where(p => p.ProgressText?.StartsWith("Flashing partition ") == true).ToList().ForEach((p) =>
-                    {
-                        p.ProgressText += " (" + Count.ToString() + "/" + PartitionCount.ToString() + ")";
-                        Count++;
-                    });
-
-                    // Do actual flashing!
-                    await LumiaV2CustomFlash(Notifier, null, false, false, Parts, true, ClearFlashingStatus, false, true, false, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure);
-                }
-                else
-                {
-                    LogFile.Log("Flash failed! No valid partitions found in the archive.", LogType.FileAndConsole);
-                    ExitFailure("Flash failed!", "No valid partitions found in the archive");
-                    return;
-                }
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex);
-                ExitFailure(Ex.Message, Ex is WPinternalsException ? ((WPinternalsException)Ex).SubMessage : null);
-            }
-
-            LogFile.EndAction("FlashCustomROM");
-        }
-
-        internal async static Task LumiaV2FixBoot(PhoneNotifierViewModel Notifier, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null)
-        {
-            LogFile.BeginAction("FixBoot");
-
-            LogFile.Log("Command: Fix boot after unlocking bootloader", LogType.FileAndConsole);
-            NokiaFlashModel FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
-
-            if (SetWorkingStatus == null)
-            {
-                SetWorkingStatus = (m, s, v, a, st) => { };
-            }
-
-            if (UpdateWorkingStatus == null)
-            {
-                UpdateWorkingStatus = (m, s, v, st) => { };
-            }
-
-            if (ExitSuccess == null)
-            {
-                ExitSuccess = (m, s) => { };
-            }
-
-            if (ExitFailure == null)
-            {
-                ExitFailure = (m, s) => { };
-            }
-
-            try
-            {
-                await SwitchModeViewModel.SwitchToWithProgress(Notifier, PhoneInterfaces.Lumia_MassStorage, (msg, sub) => SetWorkingStatus(msg, sub, null, Status: WPinternalsStatus.SwitchingMode));
-                SetWorkingStatus("Applying patches...", null, null, Status: WPinternalsStatus.Patching);
-                App.PatchEngine.TargetPath = ((MassStorage)Notifier.CurrentModel).Drive + "\\";
-                bool PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
-                if (!PatchResult)
-                {
-                    throw new WPinternalsException("Patch failed", "An error occured while patching Operating System files on the MainOS partition of your phone. Make sure your phone runs a supported Operating System version.");
-                }
-
-                LogFile.Log("Fixed bootloader", LogType.FileAndConsole);
-                LogFile.Log("The phone is left in Mass Storage mode", LogType.FileAndConsole);
-                LogFile.Log("Press and hold the power-button of the phone for at least 10 seconds to reset the phone", LogType.FileAndConsole);
-                ExitSuccess("Fixed bootloader!", "The phone is left in Mass Storage mode. Press and hold the power-button of the phone for at least 10 seconds to reset the phone.");
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex);
-                ExitFailure(Ex.Message, Ex is WPinternalsException ? ((WPinternalsException)Ex).SubMessage : null);
-            }
-
-            LogFile.EndAction("FixBoot");
-        }
-
-        // Assumes phone with Flash protocol v2
-        // Assumes phone is in flash mode
-        internal async static Task LumiaV2FlashPartitions(PhoneNotifierViewModel Notifier, string EFIESPPath, string MainOSPath, string DataPath, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null)
-        {
-            NokiaFlashModel FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
-
-            // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
-            // We need the fist sector if we want to write back the GPT.
-            byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
-            GPT GPT = new(GPTChunk);
-
-            Partition Target;
-            FlashPart Part;
-            List<FlashPart> Parts = new();
-            ulong MainOSOldSectorCount = 0;
-            ulong MainOSNewSectorCount = 0;
-            ulong DataOldSectorCount = 0;
-            ulong DataNewSectorCount = 0;
-            ulong FirstMainOSSector = 0;
-            int PartitionCount = 0;
-            ulong LengthInSectors;
-            FileInfo FileInfo;
-            Partition Partition;
-            bool IsUnlocked = false;
-            bool GPTChanged = false;
-            bool ClearFlashingStatus = true;
-
-            if (SetWorkingStatus == null)
-            {
-                SetWorkingStatus = (m, s, v, a, st) => { };
-            }
-
-            if (UpdateWorkingStatus == null)
-            {
-                UpdateWorkingStatus = (m, s, v, st) => { };
-            }
-
-            if (ExitSuccess == null)
-            {
-                ExitSuccess = (m, s) => { };
-            }
-
-            if (ExitFailure == null)
-            {
-                ExitFailure = (m, s) => { };
-            }
-
-            SetWorkingStatus("Initializing flash...", null, null, Status: WPinternalsStatus.Initializing);
-
-            try
-            {
-                if (EFIESPPath != null)
-                {
-                    FileInfo = new FileInfo(EFIESPPath);
-                    LengthInSectors = (ulong)FileInfo.Length / 0x200;
-                    Partition = GPT.GetPartition("EFIESP");
-                    if (Partition.SizeInSectors < LengthInSectors)
-                    {
-                        LogFile.Log("Flash failed! Size of partition 'EFIESP' is too big.", LogType.FileAndConsole);
-                        ExitFailure("Flash failed!", "Size of partition 'EFIESP' is too big.");
-                        return;
-                    }
-                    PartitionCount++;
-
-                    byte[] EfiespBinary = File.ReadAllBytes(EFIESPPath);
-                    IsUnlocked = (ByteOperations.ReadUInt32(EfiespBinary, 0x20) == (EfiespBinary.Length / 0x200 / 2)) && ByteOperations.ReadAsciiString(EfiespBinary, (UInt32)(EfiespBinary.Length / 2) + 3, 8) == "MSDOS5.0";
-                    if (IsUnlocked)
-                    {
-                        Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
-                        if (IsUnlockedFlag == null)
-                        {
-                            IsUnlockedFlag = new Partition
-                            {
-                                Name = "IS_UNLOCKED",
-                                Attributes = 0,
-                                PartitionGuid = Guid.NewGuid(),
-                                PartitionTypeGuid = Guid.NewGuid(),
-                                FirstSector = 0x40,
-                                LastSector = 0x40
-                            };
-                            GPT.Partitions.Add(IsUnlockedFlag);
-                            GPTChanged = true;
-                            ClearFlashingStatus = false;
-                        }
-                    }
-                    else
-                    {
-                        Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
-                        if (IsUnlockedFlag != null)
-                        {
-                            GPT.Partitions.Remove(IsUnlockedFlag);
-                            GPTChanged = true;
-                            ClearFlashingStatus = false;
-                        }
-                    }
-                }
-
-                if (MainOSPath != null)
-                {
-                    FileInfo = new FileInfo(MainOSPath);
-                    LengthInSectors = (ulong)FileInfo.Length / 0x200;
-                    Partition = GPT.GetPartition("MainOS");
-                    MainOSOldSectorCount = Partition.SizeInSectors;
-                    MainOSNewSectorCount = LengthInSectors;
-                    FirstMainOSSector = Partition.FirstSector;
-                    PartitionCount++;
-                }
-
-                if (DataPath != null)
-                {
-                    FileInfo = new FileInfo(DataPath);
-                    LengthInSectors = (ulong)FileInfo.Length / 0x200;
-                    Partition = GPT.GetPartition("Data");
-                    DataOldSectorCount = Partition.SizeInSectors;
-                    DataNewSectorCount = LengthInSectors;
-                    PartitionCount++;
-                }
-
-                if (PartitionCount > 0)
-                {
-                    if ((MainOSNewSectorCount > 0) && (DataNewSectorCount > 0))
-                    {
-                        if ((MainOSNewSectorCount > MainOSOldSectorCount) || (DataNewSectorCount > DataOldSectorCount))
-                        {
-                            UInt64 OSSpace = GPT.LastUsableSector - FirstMainOSSector + 1;
-                            if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
-                            {
-                                // MainOS and Data partitions need to be re-aligned!
-                                Partition MainOSPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "MainOS", StringComparison.CurrentCultureIgnoreCase));
-                                Partition DataPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "Data", StringComparison.CurrentCultureIgnoreCase));
-                                MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
-                                DataPartition.FirstSector = MainOSPartition.LastSector + 1;
-                                if ((DataPartition.FirstSector % 0x100) > 0)
-                                {
-                                    DataPartition.FirstSector = (DataPartition.FirstSector + 0x100) / 0x100 * 0x100;
-                                }
-
-                                DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
-
-                                GPTChanged = true;
-                            }
-                            else
-                            {
-                                LogFile.Log("Flash failed! Sizes of partitions 'MainOS' and 'Data' together are too big.", LogType.FileAndConsole);
-                                ExitFailure("Flash failed!", "Sizes of partitions 'MainOS' and 'Data' together are too big.");
-                                return;
-                            }
-                        }
-                    }
-                    else if ((MainOSNewSectorCount > 0) && (MainOSNewSectorCount > MainOSOldSectorCount))
-                    {
-                        LogFile.Log("Flash failed! Size of partition 'MainOS' is too big.", LogType.FileAndConsole);
-                        ExitFailure("Flash failed!", "Size of partition 'MainOS' is too big.");
-                        return;
-                    }
-                    else if ((DataNewSectorCount > 0) && (DataNewSectorCount > DataOldSectorCount))
-                    {
-                        LogFile.Log("Flash failed! Size of partition 'Data' is too big.", LogType.FileAndConsole);
-                        ExitFailure("Flash failed!", "Size of partition 'Data' is too big.");
-                        return;
-                    }
-
-                    if (!ClearFlashingStatus)
-                    {
-                        if (!IsUnlocked)
-                        {
-                            // Undo secure boot exploit
-                            Partition NvBackupPartition = GPT.GetPartition("BACKUP_BS_NV");
-                            if (NvBackupPartition != null)
-                            {
-                                // This must be a left over of a half unlocked bootloader
-                                Partition NvPartition = GPT.GetPartition("UEFI_BS_NV");
-                                NvBackupPartition.Name = "UEFI_BS_NV";
-                                NvBackupPartition.PartitionGuid = NvPartition.PartitionGuid;
-                                NvBackupPartition.PartitionTypeGuid = NvPartition.PartitionTypeGuid;
-                                GPT.Partitions.Remove(NvPartition);
-                                GPTChanged = true;
-                            }
-
-                            PhoneInfo Info = FlashModel.ReadPhoneInfo(false);
-
-                            // We should only clear NV if there was no backup NV to be restored and the current NV contains the SB unlock.
-                            if ((NvBackupPartition == null) && !Info.UefiSecureBootEnabled)
-                            {
-                                // ClearNV
-                                Part = new FlashPart();
-                                Partition Target2 = GPT.GetPartition("UEFI_BS_NV");
-                                Part.StartSector = (UInt32)Target2.FirstSector;
-                                Part.Stream = new MemoryStream(new byte[0x40000]);
-                                Parts.Add(Part);
-                            }
-                        }
-                        else
-                        {
-                            // Now add NV partition
-                            Partition BACKUP_BS_NV = GPT.GetPartition("BACKUP_BS_NV");
-                            Partition UEFI_BS_NV;
-                            if (BACKUP_BS_NV == null)
-                            {
-                                BACKUP_BS_NV = GPT.GetPartition("UEFI_BS_NV");
-                                Guid OriginalPartitionTypeGuid = BACKUP_BS_NV.PartitionTypeGuid;
-                                Guid OriginalPartitionGuid = BACKUP_BS_NV.PartitionGuid;
-                                BACKUP_BS_NV.Name = "BACKUP_BS_NV";
-                                BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
-                                BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
-                                UEFI_BS_NV = new Partition
-                                {
-                                    Name = "UEFI_BS_NV",
-                                    Attributes = BACKUP_BS_NV.Attributes,
-                                    PartitionGuid = OriginalPartitionGuid,
-                                    PartitionTypeGuid = OriginalPartitionTypeGuid,
-                                    FirstSector = BACKUP_BS_NV.LastSector + 1
-                                };
-                                UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
-                                GPT.Partitions.Add(UEFI_BS_NV);
-                                GPTChanged = true;
-                            }
-
-                            Part = new FlashPart();
-                            Target = GPT.GetPartition("UEFI_BS_NV");
-                            Part.StartSector = (UInt32)Target.FirstSector; // GPT is prepared for 64-bit sector-offset, but flash app isn't.
-                            Part.Stream = new SeekableStream(() =>
-                            {
-                                var assembly = System.Reflection.Assembly.GetExecutingAssembly();
-
-                                // Magic!
-                                // The SB resource is a compressed version of a raw NV-variable-partition.
-                                // In this partition the SecureBoot variable is disabled.
-                                // It overwrites the variable in a different NV-partition than where this variable is stored usually.
-                                // This normally leads to endless-loops when the NV-variables are enumerated.
-                                // But the partition contains an extra hack to break out the endless loops.
-                                var stream = assembly.GetManifestResourceStream("WPinternals.SB");
-
-                                return new DecompressedStream(stream);
-                            });
-                            Parts.Add(Part);
-                        }
-                    }
-
-                    if (GPTChanged)
-                    {
-                        GPT.Rebuild();
-                        Part = new FlashPart
-                        {
-                            StartSector = 0,
-                            Stream = new MemoryStream(GPTChunk)
-                        };
-                        Parts.Add(Part);
-                    }
-
-                    int Count = 0;
-
-                    Target = GPT.Partitions.Find(p => string.Equals(p.Name, "EFIESP", StringComparison.CurrentCultureIgnoreCase));
-                    if ((EFIESPPath != null) && (Target != null))
-                    {
-                        Count++;
-                        Part = new FlashPart
-                        {
-                            StartSector = (UInt32)Target.FirstSector,
-                            Stream = new FileStream(EFIESPPath, FileMode.Open),
-                            ProgressText = "Flashing partition EFIESP (" + Count.ToString() + " / " + PartitionCount.ToString() + ")"
-                        };
-                        Parts.Add(Part);
-                        LogFile.Log("Partition name=EFIESP, startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Part.Stream.Length / 0x200).ToString("X8"), LogType.FileOnly);
-                    }
-
-                    Target = GPT.Partitions.Find(p => string.Equals(p.Name, "MainOS", StringComparison.CurrentCultureIgnoreCase));
-                    if ((MainOSPath != null) && (Target != null))
-                    {
-                        Count++;
-                        Part = new FlashPart
-                        {
-                            StartSector = (UInt32)Target.FirstSector,
-                            Stream = new FileStream(MainOSPath, FileMode.Open),
-                            ProgressText = "Flashing partition MainOS (" + Count.ToString() + " / " + PartitionCount.ToString() + ")"
-                        };
-                        Parts.Add(Part);
-                        LogFile.Log("Partition name=MainOS, startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Part.Stream.Length / 0x200).ToString("X8"), LogType.FileOnly);
-                    }
-
-                    Target = GPT.Partitions.Find(p => string.Equals(p.Name, "Data", StringComparison.CurrentCultureIgnoreCase));
-                    if ((DataPath != null) && (Target != null))
-                    {
-                        Count++;
-                        Part = new FlashPart
-                        {
-                            StartSector = (UInt32)Target.FirstSector,
-                            Stream = new FileStream(DataPath, FileMode.Open),
-                            ProgressText = "Flashing partition Data (" + Count.ToString() + " / " + PartitionCount.ToString() + ")"
-                        };
-                        Parts.Add(Part);
-                        LogFile.Log("Partition name=Data, startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Part.Stream.Length / 0x200).ToString("X8"), LogType.FileOnly);
-                    }
-
-                    // Do actual flashing!
-                    await LumiaV2CustomFlash(Notifier, null, false, false, Parts, true, ClearFlashingStatus, false, true, false, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure);
-                }
-                else
-                {
-                    LogFile.Log("Flash failed! No valid partitions found in the archive.", LogType.FileAndConsole);
-                    ExitFailure("Flash failed!", "No valid partitions found in the archive");
-                    return;
-                }
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex);
-                ExitFailure(Ex.Message, Ex is WPinternalsException ? ((WPinternalsException)Ex).SubMessage : null);
-                return;
-            }
-        }
-    }
-
-    internal static class UefiMemorySim
-    {
-        internal const UInt32 PageSize = 0x1000;
-
-        private static UInt32 CurrentBufferSize = 0;
-        public static byte[] Buffer;
-        private static readonly List<Allocation> Allocations = new();
-        private static readonly List<FreeMemRange> FreeMemRanges = new();
-
-        public static UInt32 RoundUpToPages(UInt32 Size)
-        {
-            UInt32 Result = Size + 0x18;
-            if ((Size % PageSize) != 0)
-            {
-                Size = ((Size / PageSize) + 1) * PageSize;
-            }
-
-            return Result;
-        }
-
-        public static void Reset()
-        {
-            CurrentBufferSize = 0;
-            Buffer = null;
-            Allocations.Clear();
-            FreeMemRanges.Clear();
-        }
-
-        private static void ExtendBuffer(UInt32 Size)
-        {
-            byte[] NewBuffer = new byte[CurrentBufferSize + Size];
-            if (CurrentBufferSize > 0)
-            {
-                System.Buffer.BlockCopy(Buffer, 0, NewBuffer, (int)Size, (int)CurrentBufferSize);
-            }
-
-            foreach (Allocation CurrentAllocation in Allocations)
-            {
-                CurrentAllocation.TotalStart += Size;
-                CurrentAllocation.TotalEnd += Size;
-                CurrentAllocation.HeadStart += Size;
-                CurrentAllocation.HeadEnd += Size;
-                CurrentAllocation.ContentStart += Size;
-                CurrentAllocation.ContentEnd += Size;
-                CurrentAllocation.TailStart += Size;
-                CurrentAllocation.TailEnd += Size;
-            }
-            foreach (FreeMemRange CurrentRange in FreeMemRanges)
-            {
-                CurrentRange.Start += Size;
-                CurrentRange.End += Size;
-            }
-            CurrentBufferSize += Size;
-            Buffer = NewBuffer;
-        }
-
-        internal static Allocation AllocatePages(UInt32 Size)
-        {
-            Allocation NewAllocation = null;
-
-            UInt32 TotalSize = Size;
-
-            if ((TotalSize % PageSize) != 0)
-            {
-                throw new NotSupportedException("Wrong allocation size");
-            }
-            else
-            {
-                for (int i = FreeMemRanges.Count - 1; i >= 0; i--)
-                {
-                    if (FreeMemRanges[i].Size >= TotalSize)
-                    {
-                        NewAllocation = new Allocation
-                        {
-                            TotalStart = FreeMemRanges[i].End - TotalSize + 1
-                        };
-
-                        if (FreeMemRanges[i].Size == TotalSize)
-                        {
-                            FreeMemRanges.RemoveAt(i);
-                        }
-                        else
-                        {
-                            FreeMemRanges[i].End -= TotalSize;
-                        }
-
-                        break;
-                    }
-                }
-
-                if (NewAllocation == null)
-                {
-                    uint FreeBuffer = Allocations.Count > 0 ? Allocations[0].TotalStart : CurrentBufferSize;
-                    if (FreeBuffer < TotalSize)
-                    {
-                        ExtendBuffer(TotalSize - FreeBuffer);
-                    }
-
-                    NewAllocation = new Allocation();
-
-                    if (Allocations.Count > 0)
-                    {
-                        NewAllocation.TotalStart = Allocations[0].TotalStart - TotalSize;
-                    }
-                    else
-                    {
-                        FreeBuffer = CurrentBufferSize - TotalSize;
-                    }
-                }
-
-                bool Added = false;
-                for (int i = 0; i < Allocations.Count; i++)
-                {
-                    if (NewAllocation.TotalStart < Allocations[i].TotalStart)
-                    {
-                        Allocations.Insert(i, NewAllocation);
-                        Added = true;
-                        break;
-                    }
-                }
-                if (!Added)
-                {
-                    Allocations.Add(NewAllocation);
-                }
-            }
-
-            return NewAllocation;
-        }
-
-        internal static Allocation AllocatePool(UInt32 Size)
-        {
-            Allocation NewAllocation = null;
-
-            UInt32 TotalSize = Size + 24;
-
-            if (TotalSize < PageSize)
-            {
-                throw new NotSupportedException("Allocation of small memory area's is not supported by this UEFI memory management simulator");
-            }
-            else
-            {
-                if ((TotalSize % PageSize) != 0)
-                {
-                    TotalSize = ((TotalSize / PageSize) + 1) * PageSize;
-                }
-
-                for (int i = FreeMemRanges.Count - 1; i >= 0; i--)
-                {
-                    if (FreeMemRanges[i].Size >= TotalSize)
-                    {
-                        NewAllocation = new Allocation
-                        {
-                            TotalStart = FreeMemRanges[i].End - TotalSize + 1
-                        };
-
-                        if (FreeMemRanges[i].Size == TotalSize)
-                        {
-                            FreeMemRanges.RemoveAt(i);
-                        }
-                        else
-                        {
-                            FreeMemRanges[i].End -= TotalSize;
-                        }
-
-                        break;
-                    }
-                }
-
-                if (NewAllocation == null)
-                {
-                    uint FreeBuffer = Allocations.Count > 0 ? Allocations[0].TotalStart : CurrentBufferSize;
-                    if (FreeBuffer < TotalSize)
-                    {
-                        ExtendBuffer(TotalSize - FreeBuffer);
-                    }
-
-                    NewAllocation = new Allocation();
-
-                    if (Allocations.Count > 0)
-                    {
-                        NewAllocation.TotalStart = Allocations[0].TotalStart - TotalSize;
-                    }
-                    else
-                    {
-                        FreeBuffer = CurrentBufferSize - TotalSize;
-                    }
-                }
-
-                NewAllocation.TotalEnd = NewAllocation.TotalStart + TotalSize - 1;
-                NewAllocation.HeadStart = NewAllocation.TotalStart;
-                NewAllocation.HeadEnd = NewAllocation.HeadStart + 16 - 1;
-                NewAllocation.ContentStart = NewAllocation.HeadEnd + 1;
-                NewAllocation.ContentEnd = NewAllocation.ContentStart + Size - 1;
-                NewAllocation.TailStart = NewAllocation.ContentEnd + 1;
-                NewAllocation.TailEnd = NewAllocation.TailStart + 8 - 1;
-
-                ByteOperations.WriteAsciiString(Buffer, NewAllocation.HeadStart + 0x00, "phd0");
-
-                // Correct value here is: Size + 24
-                // Wrong value is: TotalSize
-                // Having correct value avoids memory errors and phone can reboot normally, but NV vars might be written (and that will overwrite the NV vars we wrote ourselves).
-                // Wrong value will make phone reboot to emergency boot and it makes the phone crash when you want to flash in multiple phases, but it will avoid writing NV vars.
-                ByteOperations.WriteUInt32(Buffer, NewAllocation.HeadStart + 0x04, Size + 24);
-
-                ByteOperations.WriteUInt32(Buffer, NewAllocation.HeadStart + 0x08, 0x04); // EfiBootServicesData = 0x04
-                ByteOperations.WriteUInt32(Buffer, NewAllocation.HeadStart + 0x0C, 0x00); // Reserved
-
-                ByteOperations.WriteAsciiString(Buffer, NewAllocation.TailStart + 0x00, "ptal");
-
-                // Correct value here is: Size + 24
-                // Wrong value is: TotalSize
-                // Having correct value avoids memory errors and phone can reboot normally, but NV vars might be written (and that will overwrite the NV vars we wrote ourselves).
-                // Wrong value will make phone reboot to emergency boot and it makes the phone crash when you want to flash in multiple phases, but it will avoid writing NV vars.
-                ByteOperations.WriteUInt32(Buffer, NewAllocation.TailStart + 0x04, Size + 24);
-
-                bool Added = false;
-                for (int i = 0; i < Allocations.Count; i++)
-                {
-                    if (NewAllocation.TotalStart < Allocations[i].TotalStart)
-                    {
-                        Allocations.Insert(i, NewAllocation);
-                        Added = true;
-                        break;
-                    }
-                }
-                if (!Added)
-                {
-                    Allocations.Add(NewAllocation);
-                }
-            }
-
-            return NewAllocation;
-        }
-
-        internal static void FreePool(Allocation Allocation)
-        {
-            if (Allocations.Contains(Allocation))
-            {
-                Allocations.Remove(Allocation);
-
-                if (Allocations.Count == 0)
-                {
-                    FreeMemRanges.Clear();
-                }
-                else
-                {
-                    FreeMemRange NewFreeRange = new();
-                    NewFreeRange.Start = Allocation.TotalStart;
-                    NewFreeRange.End = Allocation.TotalEnd;
-
-                    bool Added = false;
-                    int i;
-                    for (i = 0; i < FreeMemRanges.Count; i++)
-                    {
-                        if (NewFreeRange.Start < FreeMemRanges[i].Start)
-                        {
-                            FreeMemRanges.Insert(i, NewFreeRange);
-                            Added = true;
-                            break;
-                        }
-                    }
-                    if (!Added)
-                    {
-                        FreeMemRanges.Add(NewFreeRange);
-                        i = FreeMemRanges.Count;
-                    }
-
-                    if ((i > 0) && (FreeMemRanges[i].Start == (FreeMemRanges[i - 1].End + 1)))
-                    {
-                        FreeMemRanges[i - 1].End = FreeMemRanges[i].End;
-                        FreeMemRanges.RemoveAt(i);
-                        i--;
-                    }
-
-                    if ((i < (FreeMemRanges.Count - 1)) && (FreeMemRanges[i].End == (FreeMemRanges[i - 1].Start - 1)))
-                    {
-                        FreeMemRanges[i].End = FreeMemRanges[i + 1].End;
-                        FreeMemRanges.RemoveAt(i + 1);
-                    }
-
-                    if ((Allocations.Count > 0) && (FreeMemRanges[i].Start < Allocations[0].TotalStart))
-                    {
-                        FreeMemRanges.RemoveAt(i);
-                    }
-                }
-            }
-        }
-    }
-
-    internal class Allocation
-    {
-        public UInt32 TotalStart;
-        public UInt32 TotalEnd;
-        public UInt32 ContentStart;
-        public UInt32 ContentEnd;
-        public UInt32 HeadStart;
-        public UInt32 HeadEnd;
-        public UInt32 TailStart;
-        public UInt32 TailEnd;
-
-        public UInt32 TotalSize
-        {
-            get
-            {
-                return TotalEnd - TotalStart + 1;
-            }
-        }
-
-        public UInt32 ContentSize
-        {
-            get
-            {
-                return ContentEnd - ContentStart + 1;
-            }
-        }
-
-        public void CopyFromThisAllocation(UInt32 ContentOffset, UInt32 Size, byte[] Destination, UInt32 DestinationOffset)
-        {
-            Buffer.BlockCopy(UefiMemorySim.Buffer, (int)(ContentStart + ContentOffset), Destination, (int)DestinationOffset, (int)Size);
-        }
-
-        public void CopyToThisAllocation(byte[] Source, UInt32 SourceOffset, UInt32 Size, UInt32 ContentOffset)
-        {
-            Buffer.BlockCopy(Source, (int)SourceOffset, UefiMemorySim.Buffer, (int)(ContentStart + ContentOffset), (int)Size);
-        }
-    }
-
-    internal class FreeMemRange
-    {
-        public UInt32 Start;
-        public UInt32 End;
-
-        public UInt32 Size
-        {
-            get
-            {
-                return End - Start + 1;
-            }
-        }
-    }
-
-    internal class FlashPart
-    {
-        public string ProgressText;
-        public UInt32 StartSector;
-        public Stream Stream;
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace WPinternals
+{
+    internal class LumiaV2UnlockBootViewModel : ContextViewModel
+    {
+        internal static async Task LumiaV2FindFlashingProfile(PhoneNotifierViewModel Notifier, string FFUPath, bool DoResetFirst = true, bool Experimental = false, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null)
+        {
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
+
+            LogFile.BeginAction("FindFlashingProfile");
+            try
+            {
+                LogFile.Log("Find Flashing Profile", LogType.FileAndConsole);
+
+                NokiaFlashModel FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+
+                PhoneInfo Info;
+                if (DoResetFirst)
+                {
+                    // The phone will be reset before flashing, so we have the opportunity to get some more info from the phone
+                    Info = FlashModel.ReadPhoneInfo();
+                    Info.Log(LogType.ConsoleOnly);
+
+                    string FfuFirmware = null;
+                    if (FFUPath != null)
+                    {
+                        FFU FFU = new(FFUPath);
+                        FfuFirmware = FFU.GetFirmwareVersion();
+                    }
+                    FlashProfile Profile = App.Config.GetProfile(Info.PlatformID, Info.Firmware, FfuFirmware);
+
+                    if (Profile != null)
+                    {
+                        LogFile.Log("Flashing Profile already present for this phone", LogType.FileAndConsole);
+                        return;
+                    }
+                }
+                else
+                {
+                    Info = FlashModel.ReadPhoneInfo(ExtendedInfo: false);
+                }
+
+                SetWorkingStatus("Scanning for flashing-profile", "Your phone may appear to be in a reboot-loop. This is expected behavior. Don't interfere this process.", null, Status: WPinternalsStatus.Scanning);
+
+                await LumiaV2CustomFlash(Notifier, FFUPath, false, !Info.IsBootloaderSecure, null, DoResetFirst, Experimental: Experimental, SetWorkingStatus:
+                    (m, s, v, a, st) =>
+                    {
+                        if (st == WPinternalsStatus.SwitchingMode)
+                        {
+                            SetWorkingStatus(m, s, v, a, st);
+                        }
+                    },
+                    UpdateWorkingStatus:
+                    (m, s, v, st) =>
+                    {
+                        if (st == WPinternalsStatus.SwitchingMode)
+                        {
+                            UpdateWorkingStatus(m, s, v, st);
+                        }
+                    },
+                    ExitSuccess: ExitSuccess, ExitFailure: ExitFailure);
+
+                LogFile.Log("Flashing profile found!", LogType.FileAndConsole);
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex);
+            }
+            finally
+            {
+                LogFile.EndAction("FindFlashingProfile");
+            }
+        }
+
+        internal static async Task LumiaV2EnableTestSigning(System.Threading.SynchronizationContext UIContext, string FFUPath, bool DoResetFirst = true)
+        {
+            LogFile.BeginAction("EnableTestSigning");
+            try
+            {
+                LogFile.Log("Command: Enable testsigning", LogType.FileAndConsole);
+                PhoneNotifierViewModel Notifier = new();
+                UIContext.Send(s => Notifier.Start(), null);
+                NokiaFlashModel FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+
+                List<FlashPart> Parts = new();
+                FlashPart Part;
+
+                // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
+                // We need the fist sector if we want to write back the GPT.
+                byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
+                GPT GPT = new(GPTChunk);
+                bool GPTChanged = false;
+
+                Partition BACKUP_BS_NV = GPT.GetPartition("BACKUP_BS_NV");
+                Partition UEFI_BS_NV;
+                if (BACKUP_BS_NV == null)
+                {
+                    BACKUP_BS_NV = GPT.GetPartition("UEFI_BS_NV");
+                    Guid OriginalPartitionTypeGuid = BACKUP_BS_NV.PartitionTypeGuid;
+                    Guid OriginalPartitionGuid = BACKUP_BS_NV.PartitionGuid;
+                    BACKUP_BS_NV.Name = "BACKUP_BS_NV";
+                    BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
+                    BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
+                    UEFI_BS_NV = new Partition
+                    {
+                        Name = "UEFI_BS_NV",
+                        Attributes = BACKUP_BS_NV.Attributes,
+                        PartitionGuid = OriginalPartitionGuid,
+                        PartitionTypeGuid = OriginalPartitionTypeGuid,
+                        FirstSector = BACKUP_BS_NV.LastSector + 1
+                    };
+                    UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
+                    GPT.Partitions.Add(UEFI_BS_NV);
+                    GPTChanged = true;
+                }
+                if (GPTChanged)
+                {
+                    GPT.Rebuild();
+                    Part = new FlashPart
+                    {
+                        StartSector = 0,
+                        Stream = new MemoryStream(GPTChunk)
+                    };
+                    Parts.Add(Part);
+                }
+
+                // This code was used to compress the partition to an embedded resource:
+                //
+                // byte[] sbpart = System.IO.File.ReadAllBytes(@"C:\Windows Phone 8\Sources\WPInternals\SB.Original.bin");
+                // System.IO.FileStream s = new System.IO.FileStream(@"C:\Windows Phone 8\Sources\WPInternals\SB", System.IO.FileMode.Create, System.IO.FileAccess.Write);
+                // CompressedStream Out = new CompressedStream(s, (ulong)sbpart.Length);
+                // Out.Write(sbpart, 0, sbpart.Length);
+                // Out.Close();
+                // s.Close();
+
+                Part = new FlashPart();
+                Partition TargetPartition = GPT.GetPartition("UEFI_BS_NV");
+                Part.StartSector = (UInt32)TargetPartition.FirstSector; // GPT is prepared for 64-bit sector-offset, but flash app isn't.
+                Part.Stream = new SeekableStream(() =>
+                {
+                    var assembly = System.Reflection.Assembly.GetExecutingAssembly();
+
+                    // Magic!
+                    // The SB resource is a compressed version of a raw NV-variable-partition.
+                    // In this partition the SecureBoot variable is disabled.
+                    // It overwrites the variable in a different NV-partition than where this variable is stored usually.
+                    // This normally leads to endless-loops when the NV-variables are enumerated.
+                    // But the partition contains an extra hack to break out the endless loops.
+                    var stream = assembly.GetManifestResourceStream("WPinternals.SB");
+
+                    return new DecompressedStream(stream);
+                });
+                Parts.Add(Part);
+
+                await LumiaV2CustomFlash(Notifier, FFUPath, false, false, Parts, DoResetFirst, ClearFlashingStatusAtEnd: false);
+
+                Notifier.Stop();
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex);
+            }
+            finally
+            {
+                LogFile.EndAction("EnableTestSigning");
+            }
+        }
+
+        internal static async Task<string> LumiaV2SwitchToMassStorageMode(PhoneNotifierViewModel Notifier, string FFUPath, bool DoResetFirst = true)
+        {
+            // If there is no phone connected yet, we wait here for the phone to connect.
+            // Because it could be connecting in mass storage mode.
+            // So we dont want to let SwitchTo() wait for it, because it might already be trying to switch to flash mode, which is not possible and not necessary at that point.
+            if (Notifier.CurrentInterface == null)
+            {
+                LogFile.Log("Waiting for phone to connect...", LogType.FileAndConsole);
+                await Notifier.WaitForArrival();
+            }
+
+            if (Notifier.CurrentInterface == PhoneInterfaces.Lumia_MassStorage)
+            {
+                LogFile.Log("Phone is already in Mass Storage Mode", LogType.FileAndConsole);
+                return ((MassStorage)Notifier.CurrentModel).Drive;
+            }
+
+            NokiaFlashModel FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+            if (DoResetFirst)
+            {
+                // The phone will be reset before flashing, so we have the opportunity to get some more info from the phone
+                PhoneInfo Info = FlashModel.ReadPhoneInfo();
+                Info.Log(LogType.ConsoleOnly);
+            }
+
+            await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_MassStorage);
+
+            MassStorage Storage = null;
+            if (Notifier.CurrentModel is MassStorage)
+            {
+                Storage = (MassStorage)Notifier.CurrentModel;
+            }
+
+            if (Storage == null)
+            {
+                throw new WPinternalsException("Failed to switch to Mass Storage Mode");
+            }
+
+            return Storage.Drive;
+        }
+
+        internal static async Task LumiaV2ClearNV(System.Threading.SynchronizationContext UIContext, string FFUPath, bool DoResetFirst = true)
+        {
+            LogFile.BeginAction("ClearNV");
+            try
+            {
+                LogFile.Log("Command: Clear NV", LogType.FileAndConsole);
+                PhoneNotifierViewModel Notifier = new();
+                UIContext.Send(s => Notifier.Start(), null);
+                NokiaFlashModel FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+                List<FlashPart> Parts = new();
+
+                // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
+                // We need the fist sector if we want to write back the GPT.
+                byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
+                GPT GPT = new(GPTChunk);
+                bool GPTChanged = false;
+                Partition BACKUP_BS_NV = GPT.GetPartition("BACKUP_BS_NV");
+                Partition UEFI_BS_NV;
+                if (BACKUP_BS_NV == null)
+                {
+                    BACKUP_BS_NV = GPT.GetPartition("UEFI_BS_NV");
+                    Guid OriginalPartitionTypeGuid = BACKUP_BS_NV.PartitionTypeGuid;
+                    Guid OriginalPartitionGuid = BACKUP_BS_NV.PartitionGuid;
+                    BACKUP_BS_NV.Name = "BACKUP_BS_NV";
+                    BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
+                    BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
+                    UEFI_BS_NV = new Partition
+                    {
+                        Name = "UEFI_BS_NV",
+                        Attributes = BACKUP_BS_NV.Attributes,
+                        PartitionGuid = OriginalPartitionGuid,
+                        PartitionTypeGuid = OriginalPartitionTypeGuid,
+                        FirstSector = BACKUP_BS_NV.LastSector + 1
+                    };
+                    UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
+                    GPT.Partitions.Add(UEFI_BS_NV);
+                    GPTChanged = true;
+                }
+                if (GPTChanged)
+                {
+                    GPT.Rebuild();
+                    FlashPart Part = new();
+                    Part.StartSector = 0;
+                    Part.Stream = new MemoryStream(GPTChunk);
+                    Parts.Add(Part);
+                }
+
+                using (MemoryStream Space = new(new byte[0x40000]))
+                {
+                    Partition Target = GPT.GetPartition("UEFI_BS_NV");
+                    Parts.Add(new FlashPart() { StartSector = (uint)Target.FirstSector, Stream = Space });
+
+                    await LumiaV2CustomFlash(Notifier, FFUPath, false, false, Parts, DoResetFirst, ClearFlashingStatusAtEnd: false);
+                }
+
+                LogFile.Log("NV successfully cleared!", LogType.FileAndConsole);
+                Notifier.Stop();
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex);
+            }
+            finally
+            {
+                LogFile.EndAction("ClearNV");
+            }
+        }
+
+        internal static async Task LumiaV2FlashPartition(System.Threading.SynchronizationContext UIContext, string FFUPath, string PartitionName, string PartitionPath, bool DoResetFirst = true)
+        {
+            LogFile.BeginAction("FlashPartition");
+            try
+            {
+                LogFile.Log("Command: Flash Partition", LogType.FileAndConsole);
+                LogFile.Log("Partition name: " + PartitionName, LogType.FileAndConsole);
+                LogFile.Log("Partition file: " + PartitionPath, LogType.FileAndConsole);
+                if (FFUPath != null)
+                {
+                    LogFile.Log("Profile FFU file: " + FFUPath, LogType.FileAndConsole);
+                }
+
+                PhoneNotifierViewModel Notifier = new();
+                UIContext.Send(s => Notifier.Start(), null);
+
+                NokiaFlashModel FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+
+                PhoneInfo Info = FlashModel.ReadPhoneInfo();
+
+                // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
+                // We need the fist sector if we want to write back the GPT.
+                byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
+                GPT GPT = new(GPTChunk);
+
+                Partition TargetPartition = GPT.GetPartition(PartitionName);
+                if (TargetPartition == null)
+                {
+                    throw new WPinternalsException("Target partition not found!", "Couldn't find \"" + PartitionName + "\" from the device GPT.");
+                }
+
+                LogFile.Log("Target-partition found at sector: 0x" + TargetPartition.FirstSector.ToString("X8") + " - 0x" + TargetPartition.LastSector.ToString("X8"), LogType.FileAndConsole);
+
+                bool IsUnlocked = false;
+                bool GPTChanged = false;
+                List<FlashPart> Parts = new();
+                FlashPart Part;
+                if (string.Equals(PartitionName, "EFIESP", StringComparison.CurrentCultureIgnoreCase))
+                {
+                    byte[] EfiespBinary = File.ReadAllBytes(PartitionPath);
+                    IsUnlocked = (ByteOperations.ReadUInt32(EfiespBinary, 0x20) == (EfiespBinary.Length / 0x200 / 2)) && ByteOperations.ReadAsciiString(EfiespBinary, (UInt32)(EfiespBinary.Length / 2) + 3, 8) == "MSDOS5.0";
+
+                    if (IsUnlocked)
+                    {
+                        Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
+                        if (IsUnlockedFlag == null)
+                        {
+                            IsUnlockedFlag = new Partition
+                            {
+                                Name = "IS_UNLOCKED",
+                                Attributes = 0,
+                                PartitionGuid = Guid.NewGuid(),
+                                PartitionTypeGuid = Guid.NewGuid(),
+                                FirstSector = 0x40,
+                                LastSector = 0x40
+                            };
+                            GPT.Partitions.Add(IsUnlockedFlag);
+                            GPTChanged = true;
+                        }
+                    }
+                    else
+                    {
+                        Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
+                        if (IsUnlockedFlag != null)
+                        {
+                            GPT.Partitions.Remove(IsUnlockedFlag);
+                            GPTChanged = true;
+                        }
+                    }
+
+                    if (GPTChanged)
+                    {
+                        GPT.Rebuild();
+                        Part = new FlashPart
+                        {
+                            StartSector = 0,
+                            Stream = new MemoryStream(GPTChunk)
+                        };
+                        Parts.Add(Part);
+                    }
+                }
+
+                using (FileStream Stream = new(PartitionPath, FileMode.Open))
+                {
+                    if ((UInt64)Stream.Length != (TargetPartition.SizeInSectors * 0x200))
+                    {
+                        throw new WPinternalsException("Raw partition has wrong size. Size = 0x" + Stream.Length.ToString("X8") + ". Expected size = 0x" + (TargetPartition.SizeInSectors * 0x200).ToString("X8"));
+                    }
+
+                    Part = new FlashPart
+                    {
+                        StartSector = (UInt32)TargetPartition.FirstSector,
+                        Stream = Stream
+                    };
+                    Parts.Add(Part);
+                    await LumiaV2CustomFlash(Notifier, FFUPath, false, false, Parts, DoResetFirst, !string.Equals(PartitionName, "UEFI_BS_NV", StringComparison.CurrentCultureIgnoreCase));
+                }
+                Notifier.Stop();
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex);
+            }
+            finally
+            {
+                LogFile.EndAction("FlashPartition");
+            }
+        }
+
+        internal static async Task LumiaV2FlashRaw(System.Threading.SynchronizationContext UIContext, UInt64 StartSector, string DataPath, string FFUPath, bool DoResetFirst = true)
+        {
+            LogFile.BeginAction("FlashRaw");
+            try
+            {
+                LogFile.Log("Command: Flash Raw", LogType.FileAndConsole);
+                LogFile.Log("Start sector: 0x" + StartSector.ToString("X16"), LogType.FileAndConsole);
+                LogFile.Log("Data file: " + DataPath, LogType.FileAndConsole);
+                if (FFUPath != null)
+                {
+                    LogFile.Log("FFU file: " + FFUPath, LogType.FileAndConsole);
+                }
+
+                PhoneNotifierViewModel Notifier = new();
+                UIContext.Send(s => Notifier.Start(), null);
+
+                NokiaFlashModel FlashModel = (NokiaFlashModel)await SwitchModeViewModel.SwitchTo(Notifier, PhoneInterfaces.Lumia_Flash);
+
+                PhoneInfo Info = FlashModel.ReadPhoneInfo();
+
+                byte[] Data = File.ReadAllBytes(DataPath);
+
+                await LumiaV2CustomFlash(Notifier, FFUPath, false, false, (UInt32)StartSector, Data, DoResetFirst);
+                Notifier.Stop();
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex);
+            }
+            finally
+            {
+                LogFile.EndAction("FlashRaw");
+            }
+        }
+
+        internal async static Task LumiaV2CustomFlash(PhoneNotifierViewModel Notifier, string FFUPath, bool PerformFullFlashFirst, bool SkipWrite, UInt32 StartSector, byte[] Data, bool DoResetFirst = true, bool ClearFlashingStatusAtEnd = true, bool CheckSectorAlignment = true, bool ShowProgress = true, bool Experimental = false) //, string LoaderPath = null)
+        {
+            using MemoryStream Stream = new(Data);
+            FlashPart Part = new() { StartSector = StartSector, Stream = Stream };
+            List<FlashPart> Parts = new();
+            Parts.Add(Part);
+            await LumiaV2CustomFlash(Notifier, FFUPath, PerformFullFlashFirst, SkipWrite, Parts, DoResetFirst, ClearFlashingStatusAtEnd, CheckSectorAlignment, ShowProgress, Experimental);
+        }
+
+        internal async static Task LumiaV2CustomFlash(PhoneNotifierViewModel Notifier, string FFUPath, bool PerformFullFlashFirst, bool SkipWrite, UInt32 StartSector, Stream Data, bool DoResetFirst = true, bool ClearFlashingStatusAtEnd = true, bool CheckSectorAlignment = true, bool ShowProgress = true, bool Experimental = false) //, string LoaderPath = null)
+        {
+            FlashPart Part = new() { StartSector = StartSector, Stream = Data };
+            List<FlashPart> Parts = new();
+            Parts.Add(Part);
+            await LumiaV2CustomFlash(Notifier, FFUPath, PerformFullFlashFirst, SkipWrite, Parts, DoResetFirst, ClearFlashingStatusAtEnd, CheckSectorAlignment, ShowProgress, Experimental);
+        }
+
+        internal async static Task LumiaV2CustomFlash(PhoneNotifierViewModel Notifier, string FFUPath, bool PerformFullFlashFirst, bool SkipWrite, List<FlashPart> FlashParts, bool DoResetFirst = true, bool ClearFlashingStatusAtEnd = true, bool CheckSectorAlignment = true, bool ShowProgress = true, bool Experimental = false, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null, string ProgrammerPath = null)
+        {
+            NokiaFlashModel Model = (NokiaFlashModel)Notifier.CurrentModel;
+            PhoneInfo Info = Model.ReadPhoneInfo();
+
+            byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(Model, 131072u);
+
+            GPT GPT = new(GPTChunk);
+
+            Partition UefiBSNV = GPT.GetPartition("UEFI_BS_NV");
+
+            bool UseOlderExploit = Info.UefiSecureBootEnabled;
+
+            if (!UseOlderExploit && ClearFlashingStatusAtEnd)
+            {
+                if (FlashParts == null)
+                {
+                    UseOlderExploit = true;
+                }
+                else
+                {
+                    foreach (var part in FlashParts)
+                    {
+                        if (part.StartSector >= UefiBSNV.FirstSector && part.StartSector <= UefiBSNV.LastSector)
+                        {
+                            UseOlderExploit = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (UseOlderExploit || !ClearFlashingStatusAtEnd)
+            {
+                await LumiaV2CustomFlashInternal(Notifier, FFUPath, PerformFullFlashFirst, SkipWrite, FlashParts, DoResetFirst, ClearFlashingStatusAtEnd, CheckSectorAlignment, ShowProgress, Experimental, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure, ProgrammerPath);
+            }
+            else
+            {
+                await LumiaV3FlashRomViewModel.LumiaV3CustomFlash(Notifier, FlashParts, CheckSectorAlignment, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure);
+            }
+        }
+
+        // Magic!
+        internal async static Task LumiaV2CustomFlashInternal(PhoneNotifierViewModel Notifier, string FFUPath, bool PerformFullFlashFirst, bool SkipWrite, List<FlashPart> FlashParts, bool DoResetFirst = true, bool ClearFlashingStatusAtEnd = true, bool CheckSectorAlignment = true, bool ShowProgress = true, bool Experimental = false, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null, string ProgrammerPath = null) //, string LoaderPath = null)
+        {
+            // Both SecurityHeader and StoreHeader need to be modified.
+            // Those should both not fall in a memory-gap to allow modification.
+            // The partial FFU header must be allocated in front of those headers, so the size of the partial header must be at least the size of the the SecurityHeader.
+            // Hashes take more space than descriptors, so the SecurityHeader will always be the biggest.
+
+            bool AutoEmergencyReset = true;
+            bool Timeout;
+
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
+
+            NokiaFlashModel Model = (NokiaFlashModel)Notifier.CurrentModel;
+            PhoneInfo Info = Model.ReadPhoneInfo();
+
+            string Type = Info.Type;
+            if (ProgrammerPath == null)
+            {
+                ProgrammerPath = GetProgrammerPath(Info.RKH, Type);
+                if (ProgrammerPath == null)
+                {
+                    LogFile.Log("WARNING: No emergency programmer file found. Finding flash profile and rebooting phone may take a long time!", LogType.FileAndConsole);
+                }
+            }
+            List<FFUEntry> FFUs = null;
+            FlashProfile Profile;
+            if (FFUPath == null)
+            {
+                // Try to find an FFU from the repository for which there is also a known flashing profile
+                FFUs = App.Config.FFURepository.Where(e => Info.PlatformID.StartsWith(e.PlatformID, StringComparison.OrdinalIgnoreCase) && e.Exists()).ToList();
+                foreach (FFUEntry CurrentEntry in FFUs)
+                {
+                    Profile = App.Config.GetProfile(Info.PlatformID, Info.Firmware, CurrentEntry.FirmwareVersion);
+                    if (Profile != null)
+                    {
+                        FFUPath = CurrentEntry.Path;
+                        break;
+                    }
+                }
+            }
+
+            if (FFUPath == null)
+            {
+                // Try to find any FFU with matching PlatformID in the repository
+                if (FFUs.Count > 0)
+                {
+                    FFUPath = FFUs[0].Path;
+                }
+            }
+
+            if (FFUPath == null)
+            {
+                throw new WPinternalsException("No valid profile FFU found in repository", "You can download necessary files in the &quot;Download&quot; section");
+            }
+
+            FFU FFU = new(FFUPath);
+            UInt32 UpdateType = ByteOperations.ReadUInt32(FFU.StoreHeader, 0);
+            if (UpdateType != 0)
+            {
+                throw new WPinternalsException("Only Full Flash images supported", "The provided FFU file reports that it doesn't support Full Flash updates, but may support something else such as Partial Flash updates. This is not supported.");
+            }
+
+            if (FlashParts != null)
+            {
+                foreach (FlashPart Part in FlashParts)
+                {
+                    if (Part.Stream == null)
+                    {
+                        throw new ArgumentException("Stream is null");
+                    }
+
+                    if (!Part.Stream.CanSeek)
+                    {
+                        throw new ArgumentException("Streams must be seekable");
+                    }
+
+                    if ((Part.StartSector * 0x200 % FFU.ChunkSize) != 0)
+                    {
+                        throw new ArgumentException("Invalid StartSector alignment");
+                    }
+
+                    if (CheckSectorAlignment && (Part.Stream.Length % FFU.ChunkSize) != 0)
+                    {
+                        throw new ArgumentException("Invalid Data length");
+                    }
+                }
+            }
+
+            if ((Info.SecureFfuSupportedProtocolMask & ((ushort)FfuProtocol.ProtocolSyncV2)) == 0) // Exploit needs protocol v2 -> This check is not conclusive, because old phones also report support for this protocol, although it is really not supported.
+            {
+                throw new WPinternalsException("Flash failed!", "Protocols not supported. The phone reports that it does not support the Protocol Sync V2.");
+            }
+
+            if (Info.FlashAppProtocolVersionMajor < 2) // Old phones do not support the hack. These phones have Flash protocol 1.x.
+            {
+                throw new WPinternalsException("Flash failed!", "Protocols not supported. The phone reports that Flash App communication protocol is lower than 2. Reported version by the phone: " + Info.FlashAppProtocolVersionMajor + ".");
+            }
+
+            UEFI UEFI = new(FFU.GetPartition("UEFI"));
+            string BootMgrName = UEFI.EFIs.First(efi => efi.Name?.Contains("BootMgrApp") == true).Name;
+            UInt32 EstimatedSizeOfMemGap = (UInt32)UEFI.GetFile(BootMgrName).Length;
+            byte Options = 0;
+            if (SkipWrite)
+            {
+                Options = (byte)FlashOptions.SkipWrite;
+            }
+
+            if (!Info.IsBootloaderSecure)
+            {
+                Options = (byte)((FlashOptions)Options | FlashOptions.SkipSignatureCheck);
+            }
+
+            // Gap fill calculation:
+            // About 0x18000 of the gap is used for other purposes.
+            // Then round down to fill up the rest of the space, to make sure the memory for the headers is not allocated in a gap.
+            UInt32 EstimatedGapFill = FFU.RoundDownToChunks(EstimatedSizeOfMemGap - 0x18000);
+
+            UInt32 MaximumGapFill;
+            int MaximumAttempts;
+
+            if (!Experimental)
+            {
+                MaximumGapFill = FFU.RoundUpToChunks(2 * EstimatedSizeOfMemGap);
+                MaximumAttempts = (int)(((MaximumGapFill / FFU.ChunkSize) + 1) * 4);
+            }
+            else
+            {
+                MaximumGapFill = FFU.RoundUpToChunks(4 * EstimatedSizeOfMemGap);
+                MaximumAttempts = (int)(((MaximumGapFill / FFU.ChunkSize) + 1) * 8);
+            }
+
+            byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(Model, (UInt32)FFU.ChunkSize);
+
+            // Start with a reset
+            if (DoResetFirst)
+            {
+                SetWorkingStatus("Initializing flash...", "Rebooting phone", null, Status: WPinternalsStatus.Initializing);
+
+                // When in flash mode, it is not possible to reboot straight to flash.
+                // Reboot and catch the phone in bootloader mode and then switch to flash context
+                Model.ResetPhone();
+
+                #region Properly recover from reset - many phones respond differently
+
+                Timeout = false;
+                try
+                {
+                    await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
+                }
+                catch (TimeoutException)
+                {
+                    Timeout = true;
+                }
+                if ((Notifier.CurrentInterface == null) && (!AutoEmergencyReset || Timeout))
+                {
+                    AutoEmergencyReset = false;
+
+                    if (Timeout)
+                    {
+                        LogFile.Log("The phone is not responding", LogType.ConsoleOnly);
+                        LogFile.Log("It might be in emergency mode, while you have no matching driver installed", LogType.ConsoleOnly);
+                    }
+                    LogFile.Log("To continue the unlock-sequence, the phone needs to be rebooted", LogType.ConsoleOnly);
+                    LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
+                    LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
+                    LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
+                    LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
+
+                    SetWorkingStatus("You need to manually reset your phone now!", (Timeout ? "The phone is not responding. It might be in emergency mode, while you have no matching driver installed. " : "") + "To continue the unlock-sequence, the phone needs to be rebooted. Keep the phone connected to the PC. The unlock-sequence will resume automatically.", null, false, WPinternalsStatus.WaitingForManualReset);
+
+                    await Notifier.WaitForRemoval();
+
+                    UpdateWorkingStatus("Initializing flash...", null, null);
+
+                    await Notifier.WaitForArrival();
+                }
+                if (Notifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
+                {
+                    bool FailedToStartProgrammer = false;
+                    if (ProgrammerPath != null)
+                    {
+                        QualcommSahara Sahara = new((QualcommSerial)Notifier.CurrentModel);
+                        try
+                        {
+                            await Sahara.Reset(ProgrammerPath);
+                            await Notifier.WaitForArrival();
+                        }
+                        catch (BadConnectionException)
+                        {
+                            FailedToStartProgrammer = true;
+                        }
+                        catch (Exception ex)
+                        {
+                            LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                            LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                            FailedToStartProgrammer = true;
+                        }
+                    }
+
+                    if (ProgrammerPath == null || FailedToStartProgrammer)
+                    {
+                        ((QualcommSerial)Notifier.CurrentModel).Close(); // Prevent "Resource in use";
+
+                        Timeout = false;
+                        if (AutoEmergencyReset)
+                        {
+                            try
+                            {
+                                await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
+                            }
+                            catch (TimeoutException)
+                            {
+                                Timeout = true;
+                            }
+                            catch (Exception ex)
+                            {
+                                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                                FailedToStartProgrammer = true;
+                            }
+                        }
+                        if (!AutoEmergencyReset || Timeout)
+                        {
+                            AutoEmergencyReset = false;
+
+                            if (!FailedToStartProgrammer)
+                            {
+                                LogFile.Log("The phone is in emergency mode and you didn't provide an emergency programmer", LogType.ConsoleOnly);
+                                LogFile.Log("This phone also doesn't seem to reboot after a timeout, so you got to help a bit", LogType.ConsoleOnly);
+                                LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
+                                LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
+                                LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
+                                LogFile.Log("To prevent this, provide an emergency programmer next time you will unlock a bootloader", LogType.ConsoleOnly);
+                                LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
+
+                                SetWorkingStatus("You need to manually reset your phone now!",
+                                    "The phone is in emergency mode and you didn't provide an emergency programmer." +
+                                    " This phone also doesn't seem to reboot after a timeout, so you got to help a bit." +
+                                    " Keep the phone connected to the PC." +
+                                    " The unlock-sequence will resume automatically. To prevent this, provide an emergency programmer next time you will unlock a bootloader.",
+                                    null, false, WPinternalsStatus.WaitingForManualReset);
+                            }
+                            else
+                            {
+                                LogFile.Log("The phone is in emergency mode and we couldn't start the emergency programmer", LogType.ConsoleOnly);
+                                LogFile.Log("This phone also doesn't seem to reboot after a timeout, so you got to help a bit", LogType.ConsoleOnly);
+                                LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
+                                LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
+                                LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
+                                LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
+
+                                SetWorkingStatus("You need to manually reset your phone now!",
+                                    "The phone is in emergency mode and we couldn't start the emergency programmer." +
+                                    " This phone also doesn't seem to reboot after a timeout, so you got to help a bit." +
+                                    " Keep the phone connected to the PC." +
+                                    " The unlock-sequence will resume automatically.",
+                                    null, false, WPinternalsStatus.WaitingForManualReset);
+                            }
+                            await Notifier.WaitForRemoval();
+
+                            UpdateWorkingStatus("Initializing flash...", null, null);
+
+                            await Notifier.WaitForArrival();
+                        }
+                    }
+                }
+
+                #endregion
+
+                if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader))
+                {
+                    throw new WPinternalsException("Phone is in wrong mode", "The phone should have been detected in bootloader or flash mode. Instead it has been detected in " + Notifier.CurrentInterface.ToString() + " mode.");
+                }
+
+                Model = (NokiaFlashModel)Notifier.CurrentModel;
+                UpdateWorkingStatus("Initializing flash...", null, null);
+            }
+
+            try
+            {
+                // This will succeed on new models
+                Model.SwitchToFlashAppContext();
+                Model.DisableRebootTimeOut();
+            }
+            catch
+            {
+                // This will succeed on old models
+                Model.ResetPhoneToFlashMode();
+                await Notifier.WaitForArrival();
+                Model = (NokiaFlashModel)Notifier.CurrentModel;
+            }
+
+            // The payloads must be ordered by the number of locations
+            //
+            // FlashApp processes payloads like this:
+            // - First payloads which are with one location, those can be sent in bulk
+            // - Then payloads with more than one location, those should not be sent in bulk
+            //
+            // If you do not order payloads like this, you will get an error, most likely hash mismatch
+            //
+            FlashingPayload[] payloads = Array.Empty<FlashingPayload>();
+            if (FlashParts != null)
+            {
+                payloads = GetNonOptimizedPayloads(FlashParts, FFU.ChunkSize, (uint)(Info.WriteBufferSize / FFU.ChunkSize), SetWorkingStatus, UpdateWorkingStatus).OrderBy(x => x.TargetLocations.Length).ToArray();
+            }
+
+            bool AssumeImageHeaderFallsInGap = true;
+            bool AllocateAsyncBuffersOnPhone = true;
+            bool AllocateBackupBuffersOnPhone = false;
+            UInt32 CurrentGapFill = EstimatedGapFill;
+            UInt32 OldGapFill;
+            bool Success = false;
+            bool Abort = false;
+            bool PhoneNeedsReset = false;
+            bool WaitForReset = false;
+            int AttemptCount = 0;
+            UInt32 ExploitHeaderAllocationSize = 0;
+            UInt32 LastHeaderV2Size = 0;
+            byte[] PartialHeader;
+            byte[] FfuHeader;
+            UInt64 CombinedFFUHeaderSize;
+            Allocation SecurityHeaderAllocation = null;
+            Allocation ImageHeaderAllocation = null;
+            Allocation StoreHeaderAllocation = null;
+            Allocation PartialHeaderAllocation = null;
+            UInt32 HeaderOffset = 0;
+            bool Scanning = false;
+            bool ResetScanning = false;
+
+            Profile = App.Config.GetProfile(Info.PlatformID, Info.Firmware, FFU.GetFirmwareVersion());
+            if (Profile == null)
+            {
+                LogFile.Log("No flashing profile found", LogType.FileAndConsole);
+            }
+            else
+            {
+                if (ShowProgress)
+                {
+                    LogFile.Log("Flashing profile loaded", LogType.FileAndConsole);
+                }
+
+                CurrentGapFill = Profile.FillSize;
+                ExploitHeaderAllocationSize = Profile.HeaderSize;
+                AllocateAsyncBuffersOnPhone = Profile.AllocateAsyncBuffersOnPhone;
+                AssumeImageHeaderFallsInGap = Profile.AssumeImageHeaderFallsInGap;
+            }
+
+            do
+            {
+                AttemptCount++;
+                if ((Profile == null) || (AttemptCount > 1))
+                {
+                    LogFile.Log("Custom flash attempt: " + AttemptCount + " of " + MaximumAttempts, LogType.FileAndConsole);
+
+                    if (!Scanning)
+                    {
+                        SetWorkingStatus("Scanning for flashing-profile - attempt " + AttemptCount.ToString() + " of " + MaximumAttempts.ToString(), "Your phone may appear to be in a reboot-loop. This is expected behavior. Don't interfere this process.", (uint)MaximumAttempts, Status: WPinternalsStatus.Scanning);
+                    }
+
+                    Scanning = true;
+                    UpdateWorkingStatus("Scanning for flashing-profile - attempt " + AttemptCount.ToString() + " of " + MaximumAttempts.ToString(), "Your phone may appear to be in a reboot-loop. This is expected behavior. Don't interfere this process.", (uint)AttemptCount, Status: WPinternalsStatus.Scanning);
+
+                    ExploitHeaderAllocationSize = CurrentGapFill + (UInt32)FFU.ChunkSize;
+                }
+
+                // Initialize flash attempts
+                // Make sure async buffers are allocated on the phone before overflow attempts,
+                // or else failed attempts may cause more memory-gaps and allocation becomes more unpredictable.
+                // The phone is rebooted after each attempt (to avoid memory-corruption).
+                // And it seems that that normally all allocations are in a big memory-gap, which was created before BootMgr was loaded.
+                // And there is still memory allocated in a lower range.
+                // And by allocating USB buffers, it could cause more memory-scattering.
+                // On Lumia 950 2 USB buffers are allocated and on Lumia 930 there is only one USB buffer allocated.
+                // StartAsyncFlash() is needed on 950 and 640. But not needed on 930!
+                // In any case, the allocation of the async-buffers should not be simulated in the Uefi Memory Simulator,
+                // because that would create a gap in the Simulator, instead of avoiding a gap on the phone.
+                //
+                if (AllocateAsyncBuffersOnPhone)
+                {
+                    Model.StartAsyncFlash();
+                    Model.EndAsyncFlash(); // Ending Async flashing is not necessary for Lumia 950, but it is necessary for Lumia 640!
+                }
+
+                if (AllocateBackupBuffersOnPhone)
+                {
+                    Model.BackupPartitionToRam("MODEM_FSG");
+                    Model.BackupPartitionToRam("MODEM_FS1");
+                    Model.BackupPartitionToRam("MODEM_FS2");
+                    Model.BackupPartitionToRam("SSD");
+                    Model.BackupPartitionToRam("DPP");
+                }
+
+                HeaderOffset = 0;
+                SecurityHeaderAllocation = null;
+                ImageHeaderAllocation = null;
+                StoreHeaderAllocation = null;
+                PartialHeaderAllocation = null;
+                UInt32 DestinationChunkIndex = 0;
+
+                // Create memory map
+                UefiMemorySim.Reset();
+                SecurityHeaderAllocation = UefiMemorySim.AllocatePool((uint)FFU.SecurityHeader.Length);
+                SecurityHeaderAllocation.CopyToThisAllocation(FFU.SecurityHeader, 0, (uint)FFU.SecurityHeader.Length, 0);
+                if (!AssumeImageHeaderFallsInGap)
+                {
+                    ImageHeaderAllocation = UefiMemorySim.AllocatePool((uint)FFU.ImageHeader.Length);
+                    ImageHeaderAllocation.CopyToThisAllocation(FFU.ImageHeader, 0, (uint)FFU.ImageHeader.Length, 0);
+                }
+                StoreHeaderAllocation = UefiMemorySim.AllocatePool((uint)FFU.StoreHeader.Length);
+                StoreHeaderAllocation.CopyToThisAllocation(FFU.StoreHeader, 0, (uint)FFU.StoreHeader.Length, 0);
+
+                // Simulate sending partial header
+                PartialHeaderAllocation = UefiMemorySim.AllocatePool(ExploitHeaderAllocationSize);
+
+                CombinedFFUHeaderSize = FFU.HeaderSize;
+                FfuHeader = new byte[CombinedFFUHeaderSize];
+                UInt32 TotalPayloadCount = (uint)payloads.Length;
+                bool HeadersFull;
+                int FlashingPhase = 0;
+                UInt32 FlashingPhaseStartPayloadIndex = 0;
+                UInt32 FlashingPhasePayloadCount = 0;
+                bool FlashInProgress = false;
+                byte[] Buffer = new byte[FFU.ChunkSize];
+                LastHeaderV2Size = 0;
+                do
+                {
+                    HeadersFull = false;
+
+                    // On every flashing phase we must fill the memory gap first, before sending the header.
+                    if (CurrentGapFill > UefiMemorySim.PageSize)
+                    {
+                        if (FlashingPhase > 0)
+                        {
+                            // Avoid Error 0x0010 "Invalid sub block length".
+                            // Headersize must increase compared to last time a header was sent, to avoid processing the header.
+                            // Offset must be 0, to reset buffers.
+                            // Previous data + new data must fit in new headersize.
+                            // We can send an extra byte, because last memory buffer was sent including the tail.
+                            // And there is always extra space in the memoryspace after the tail.
+                            Model.SendFfuHeaderV2(LastHeaderV2Size + 1, 0, new byte[1], Options);
+                        }
+
+                        // CurrentGapFill is the amount of data we want to be allocated on the phone
+                        // But we send less data, so the header won't be processed yet.
+                        PartialHeader = new byte[UefiMemorySim.PageSize];
+                        Model.SendFfuHeaderV2(CurrentGapFill, 0, PartialHeader, Options); // Fill memory gap -> This will fail on phones with Flash Protocol v1.x !! On Lumia 640 this will hang on receiving the response when EndAsyncFlash was not called.
+                    }
+
+                    using (FileStream FfuFile = new(FFU.Path, FileMode.Open, FileAccess.Read))
+                    {
+                        // On every flashing phase we need to send the full header again to reset all the counters.
+                        FfuFile.Read(FfuHeader, 0, (int)CombinedFFUHeaderSize);
+                        Model.SendFfuHeaderV1(FfuHeader, Options);
+
+                        if (PerformFullFlashFirst && (FlashingPhase == 0))
+                        {
+                            // If we flash the stock ROM at this point, the header is in memory is not overwritten yet.
+                            // This means that after the last chunk was written, the flashing-status is written to NV (and also flushed).
+                            // But this doesn't matter, because even when we want to overwrite NV, this happens later.
+                            // When the header is successfully overwritten in memory, the next chunk of custom data will be allowed to be written.
+
+                            LogFile.Log("Starting custom flash attempt by doing a full flash.", LogType.FileAndConsole);
+
+                            UInt64 Position = CombinedFFUHeaderSize;
+                            byte[] FlashPayload;
+                            int ChunkIndex = 0;
+                            UInt32 TotalChunkCount = (UInt32)FFU.TotalChunkCount;
+
+                            // Protocol v2
+                            FlashPayload = new byte[Info.WriteBufferSize];
+
+                            while (Position < (UInt64)FfuFile.Length)
+                            {
+                                UInt32 CommonFlashPayloadSize = Info.WriteBufferSize;
+                                if (((UInt64)FfuFile.Length - Position) < CommonFlashPayloadSize)
+                                {
+                                    CommonFlashPayloadSize = (UInt32)((UInt64)FfuFile.Length - Position);
+                                    FlashPayload = new byte[CommonFlashPayloadSize];
+                                }
+
+                                FfuFile.Read(FlashPayload, 0, (int)CommonFlashPayloadSize);
+                                ChunkIndex += (int)(CommonFlashPayloadSize / FFU.ChunkSize);
+                                Model.SendFfuPayloadV2(FlashPayload, ShowProgress ? (int)((double)(ChunkIndex + 1) * 100 / TotalChunkCount) : 0, 0);
+                                Position += CommonFlashPayloadSize;
+                            }
+                        }
+                    }
+
+                    UInt32 NewWriteDescriptorOffset = 0xF8;
+                    UInt32 CatalogSize = ByteOperations.ReadUInt32(UefiMemorySim.Buffer, SecurityHeaderAllocation.ContentStart + 0x18);
+                    UInt32 NewHashOffset = 0x20 + CatalogSize;
+
+                    UInt32 WriteDescriptorLength = 0;
+                    UInt32 WriteDescriptorCount = 0;
+                    UInt32 HashTableSize = 0;
+
+                    if (PerformFullFlashFirst && (FlashingPhase == 0))
+                    {
+                        // Set offset for new descriptor to end of descriptor-table
+                        WriteDescriptorLength = ByteOperations.ReadUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xD4);
+                        NewWriteDescriptorOffset += WriteDescriptorLength;
+
+                        // Get descriptor-count of the FFU
+                        WriteDescriptorCount = ByteOperations.ReadUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xD0);
+
+                        // Set offset for new hash to end of hash-table
+                        HashTableSize = ByteOperations.ReadUInt32(UefiMemorySim.Buffer, SecurityHeaderAllocation.ContentStart + 0x1C);
+                        NewHashOffset += HashTableSize; // Skip to the end of the original hash-table.
+                    }
+                    else
+                    {
+                        // From start of hash-table skip the first hashes for Image- and StoreHeaders.
+                        HashTableSize = (UInt32)((FFU.ImageHeader.Length + FFU.StoreHeader.Length) / FFU.ChunkSize * 0x20);
+                        NewHashOffset += HashTableSize;
+                    }
+
+                    // Determine available space and number of payloads to send for this phase
+                    UInt32 HashSpace = (UInt32)(FFU.SecurityHeader.Length - NewHashOffset);
+                    UInt32 DescriptorSpace = (UInt32)(FFU.StoreHeader.Length - NewWriteDescriptorOffset);
+
+                    FlashingPhasePayloadCount = 0;
+
+                    // Always flash one extra chunk on the GPT (for purpose of testing and for making sure that first chunk does not contain all zero's).
+                    UInt32 SecurityHeaderSize = FlashInProgress ? 0 : 0x20u;
+                    UInt32 StoreHeaderSize = FlashInProgress ? 0 : 0x10u;
+                    for (UInt32 i = FlashingPhaseStartPayloadIndex; i < payloads.Length; i++)
+                    {
+                        UInt32 NewSecurityHeaderSize = SecurityHeaderSize + payloads[i].GetSecurityHeaderSize();
+                        UInt32 NewStoreHeaderSize = StoreHeaderSize + payloads[i].GetStoreHeaderSize();
+
+                        if (NewSecurityHeaderSize > HashSpace || NewStoreHeaderSize > DescriptorSpace)
+                        {
+                            HeadersFull = true;
+                            break;
+                        }
+
+                        FlashingPhasePayloadCount++;
+                        SecurityHeaderSize = NewSecurityHeaderSize;
+                        StoreHeaderSize = NewStoreHeaderSize;
+                    }
+
+                    HashTableSize += SecurityHeaderSize;
+                    WriteDescriptorCount += FlashingPhasePayloadCount + (FlashInProgress ? 0 : 1u);
+                    WriteDescriptorLength += StoreHeaderSize;
+
+                    if (!ClearFlashingStatusAtEnd || HeadersFull)
+                    {
+                        WriteDescriptorCount++;
+                    }
+
+                    // Write back new header values.
+                    ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xD4, WriteDescriptorLength);
+                    ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xD0, WriteDescriptorCount);
+                    ByteOperations.WriteUInt32(UefiMemorySim.Buffer, SecurityHeaderAllocation.ContentStart + 0x1C, HashTableSize);
+                    ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xEC, 0); // FlashOnlyTableLength - Make flash progress bar white immediately.
+                    ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + 0xE8, 1); // FlashOnlyTableCount
+
+                    // Write new descriptors
+                    // First write descriptor and hash for the first GPT chunk
+                    if (!FlashInProgress) // We only send the first GPT chunk when flash is not in progress yet.
+                    {
+                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x00, 0x00000001); // Location count
+                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x04, 0x00000001); // Chunk count
+                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x08, 0x00000000); // Disk access method (0 = Begin, 2 = End)
+                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x0C, 0x00000000); // Chunk index = GPT
+                        NewWriteDescriptorOffset += 0x10;
+                        byte[] GPTHashValue = System.Security.Cryptography.SHA256.Create().ComputeHash(GPTChunk, 0, FFU.ChunkSize); // Hash is 0x20 bytes
+                        System.Buffer.BlockCopy(GPTHashValue, 0, UefiMemorySim.Buffer, (int)(SecurityHeaderAllocation.ContentStart + NewHashOffset), 0x20);
+                        NewHashOffset += 0x20;
+                    }
+
+                    for (UInt32 i = 0; i < FlashingPhasePayloadCount; i++)
+                    {
+                        FlashingPayload payload = payloads[FlashingPhaseStartPayloadIndex + i];
+
+                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x00, (UInt32)payload.TargetLocations.Length); // Location count
+                        ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x04, payload.ChunkCount);                      // Chunk count
+                        NewWriteDescriptorOffset += 0x08;
+
+                        foreach (UInt32 location in payload.TargetLocations)
+                        {
+                            ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x00, 0x00000000);                          // Disk access method (0 = Begin, 2 = End)
+                            ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.ContentStart + NewWriteDescriptorOffset + 0x04, location);                            // Chunk index
+                            NewWriteDescriptorOffset += 0x08;
+                        }
+
+                        foreach (byte[] hashValue in payload.ChunkHashes)
+                        {
+                            // Write new hash
+                            System.Buffer.BlockCopy(hashValue, 0, UefiMemorySim.Buffer, (Int32)(SecurityHeaderAllocation.ContentStart + NewHashOffset), 0x20);
+                            NewHashOffset += 0x20;
+                        }
+                    }
+
+                    Stream CurrentStream = null;
+                    int StreamIndex = 0;
+                    int Step = 0;
+                    try
+                    {
+                        // Send a small portion of header v2 at offset 0
+                        // The payload is smaller than the total headersize, so that it won't start processing the header now.
+                        // This will allocate new memory at the bottom of the memory-pool, but it will not reset the previously imported ffu header.
+                        Step = 1;
+                        PartialHeader = new byte[UefiMemorySim.PageSize];
+                        Model.SendFfuHeaderV2(ExploitHeaderAllocationSize, 0, PartialHeader, Options); // SkipWrite = 1 (only works on engineering phones)
+
+                        // Now we will send the rest of the exploit header, but we will increase the total size even higher, so that it still won't start processing the headers.
+                        // We've send only a small first part of the header. The allocated header was bigger: ExploitHeaderAllocationSize.
+                        // But we HAVE to send the whole header. We can't skip a part.
+                        Step = 2;
+                        UInt32 ExploitHeaderRemaining = SecurityHeaderAllocation.TailEnd + 1 - PartialHeaderAllocation.ContentStart - (UInt32)PartialHeader.Length;
+                        HeaderOffset = (UInt32)PartialHeader.Length;
+                        while (ExploitHeaderRemaining > 0)
+                        {
+                            UInt32 CurrentFill = ExploitHeaderRemaining;
+                            if (CurrentFill > Info.WriteBufferSize)
+                            {
+                                CurrentFill = Info.WriteBufferSize;
+                            }
+
+                            PartialHeader = new byte[CurrentFill];
+                            PartialHeaderAllocation.CopyFromThisAllocation(HeaderOffset, CurrentFill, PartialHeader, 0);
+                            Model.SendFfuHeaderV2(HeaderOffset + CurrentFill + 1, HeaderOffset, PartialHeader, Options); // Phone may crash here. USB write is done. USB read might fail due to crash. Happens on my own Lumia 650.
+                            LastHeaderV2Size = HeaderOffset + CurrentFill + 1;
+                            ExploitHeaderRemaining -= CurrentFill;
+                            HeaderOffset += CurrentFill;
+                        }
+
+                        // Send custom payload
+                        Step = 3;
+                        Int32 payloadCount = 0;
+                        byte[] payloadBuffer = new byte[Info.WriteBufferSize];
+                        bool sendPayload = false;
+                        for (Int32 i = FlashInProgress ? 0 : -1; i < FlashingPhasePayloadCount; i++)
+                        {
+                            string NewProgressText = "Flashing resources...";
+                            if (!FlashInProgress)
+                            {
+                                // First send the GPT chunk
+                                Step = 4;
+                                System.Buffer.BlockCopy(GPTChunk, 0, Buffer, 0, FFU.ChunkSize);
+
+                                Step = 8;
+                                // This may fail. Normally with WPinternalsException for Invalid Hash or Data not aligned.
+                                // Or it may fail with a BadConnectionException when the phone crashes and drops the connection.
+                                Model.SendFfuPayloadV1(Buffer, 0);
+                                if (!FlashInProgress)
+                                {
+                                    Step = 9;
+                                    if (ShowProgress)
+                                    {
+                                        LogFile.Log("Flashing in progress!", LogType.FileAndConsole);
+                                    }
+
+                                    FlashInProgress = true;
+                                    Scanning = false;
+                                    SetWorkingStatus(null, null, (UInt64?)payloads.Length, Status: WPinternalsStatus.Flashing);
+                                }
+                            }
+                            else
+                            {
+                                Step = 5;
+
+                                FlashingPayload payload = payloads[FlashingPhaseStartPayloadIndex + i];
+
+                                if (payloadCount == ((Info.WriteBufferSize / FFU.ChunkSize) - 1))
+                                {
+                                    sendPayload = true;
+                                }
+
+                                if (FlashingPhaseStartPayloadIndex + i + 1 >= FlashingPhasePayloadCount)
+                                {
+                                    sendPayload = true;
+                                    byte[] tmpBuffer = new byte[(payloadCount + 1) * FFU.ChunkSize];
+                                    System.Buffer.BlockCopy(payloadBuffer, 0, tmpBuffer, 0, payloadCount * FFU.ChunkSize);
+                                    payloadBuffer = tmpBuffer;
+                                }
+
+                                // Check if the next payload contains more than one chunk
+                                if (!sendPayload && FlashingPhaseStartPayloadIndex + i + 1 < FlashingPhasePayloadCount && (payloads[FlashingPhaseStartPayloadIndex + i + 1].ChunkCount != 1 || payloads[FlashingPhaseStartPayloadIndex + i + 1].TargetLocations.Length != 1))
+                                {
+                                    sendPayload = true;
+                                    byte[] tmpBuffer = new byte[(payloadCount + 1) * FFU.ChunkSize];
+                                    System.Buffer.BlockCopy(payloadBuffer, 0, tmpBuffer, 0, payloadCount * FFU.ChunkSize);
+                                    payloadBuffer = tmpBuffer;
+                                }
+
+                                // We prepare the buffer setup above with all consecutive chunks we have to send in
+                                // We can't send a single chunk otherwise we would get 0x1007: Payload data does not contain all data
+                                if (payload.ChunkCount != 1)
+                                {
+                                    NewProgressText = "Flashing common resources...";
+                                    payloadBuffer = new byte[payload.ChunkCount * FFU.ChunkSize];
+                                    for (uint j = 0; j < payload.ChunkCount; j++)
+                                    {
+                                        StreamIndex = (Int32)payload.StreamIndexes[j];
+                                        FlashPart flashPart = FlashParts[StreamIndex];
+                                        CurrentStream = flashPart.Stream;
+                                        CurrentStream.Seek(payload.StreamLocations[j], SeekOrigin.Begin);
+
+                                        Step = 6;
+                                        Array.Clear(payloadBuffer, (Int32)(FFU.ChunkSize * j), FFU.ChunkSize); // Not really needed anymore?
+
+                                        Step = 7;
+                                        CurrentStream.Read(payloadBuffer, (Int32)(FFU.ChunkSize * j), FFU.ChunkSize);
+                                    }
+                                }
+
+                                if (payload.TargetLocations.Length != 1)
+                                {
+                                    NewProgressText = "Flashing common resources...";
+                                    payloadBuffer = new byte[FFU.ChunkSize];
+                                }
+
+                                if (payload.ChunkCount == 1)
+                                {
+                                    StreamIndex = (Int32)payload.StreamIndexes[0];
+                                    FlashPart flashPart = FlashParts[StreamIndex];
+                                    CurrentStream = flashPart.Stream;
+                                    CurrentStream.Seek(payload.StreamLocations[0], SeekOrigin.Begin);
+
+                                    if (payload.TargetLocations.Length == 1 && !string.IsNullOrEmpty(flashPart.ProgressText))
+                                    {
+                                        NewProgressText = flashPart.ProgressText;
+                                    }
+
+                                    CurrentStream.Read(payloadBuffer, FFU.ChunkSize * payloadCount, FFU.ChunkSize);
+                                }
+
+                                Step = 8;
+                                // This may fail. Normally with WPinternalsException for Invalid Hash or Data not aligned.
+                                // Or it may fail with a BadConnectionException when the phone crashes and drops the connection.
+
+                                payloadCount++;
+                            }
+
+                            UpdateWorkingStatus(NewProgressText, null, (UInt64?)(FlashingPhaseStartPayloadIndex + i + 1), WPinternalsStatus.Flashing);
+
+                            if (i != -1 && sendPayload)
+                            {
+                                // This fails when sending multiple chunks per payload with 0x1003: Hash mismatch
+                                Model.SendFfuPayloadV2(payloadBuffer, ShowProgress ? (Int32)((FlashingPhaseStartPayloadIndex + i + 1) * 100 / payloads.Length) : 0);
+                                sendPayload = false;
+                                payloadCount = 0;
+                                payloadBuffer = new byte[Info.WriteBufferSize];
+                            }
+
+                            DestinationChunkIndex++;
+                        }
+
+                        Step = 10;
+                        FlashingPhaseStartPayloadIndex += FlashingPhasePayloadCount;
+
+                        Step = 11;
+                        if (!HeadersFull)
+                        {
+                            Step = 12;
+                            App.Config.SetProfile(Info.Type, Info.PlatformID, Info.ProductCode, Info.Firmware, FFU.GetFirmwareVersion(), CurrentGapFill, ExploitHeaderAllocationSize, AssumeImageHeaderFallsInGap, AllocateAsyncBuffersOnPhone);
+                            if (ShowProgress)
+                            {
+                                LogFile.Log("Custom flash succeeded!", LogType.FileAndConsole);
+                            }
+
+                            Success = true;
+                        }
+                        else
+                        {
+                            // At this point we're missing a few payloads, so we need to start again.
+                            LogFile.Log("Reinitilizing a new flashing attempt because headers were full and we're not quite done yet!");
+                        }
+                    }
+                    catch (BadConnectionException)
+                    {
+                        LogFile.Log("Connection to phone is lost - " +
+                            Step.ToString() + " " +
+                            StreamIndex.ToString() + " " +
+                            (CurrentStream == null ? "0" : CurrentStream.Position.ToString()) + " " +
+                            FlashingPhase.ToString() + " " +
+                            FlashingPhaseStartPayloadIndex.ToString() + " " +
+                            DestinationChunkIndex.ToString());
+                        LogFile.Log("Expect phone to reboot", LogType.FileAndConsole);
+                        WaitForReset = true;
+                    }
+                    catch (Exception Ex)
+                    {
+                        if (FlashInProgress)
+                        {
+                            // Normally, when we end up here, we were not in process of flashing yet.
+                            // It would be a flash attempt which failed.
+                            // But if we were already flashing, then something else is wrong.
+                            // We need more info and stop flashing.
+                            LogFile.Log("Custom flash failed", LogType.FileAndConsole);
+                            LogFile.LogException(Ex, LogType.FileOnly,
+                                Step.ToString() + " " +
+                                StreamIndex.ToString() + " " +
+                                (CurrentStream == null ? "0" : CurrentStream.Position.ToString()) + " " +
+                                FlashingPhase.ToString() + " " +
+                                FlashingPhaseStartPayloadIndex.ToString() + " " +
+                                DestinationChunkIndex.ToString());
+                            Abort = true;
+                        }
+                        else
+                        {
+                            LogFile.Log("Custom flash attempt failed", LogType.FileAndConsole);
+                            LogFile.LogException(Ex, LogType.FileOnly,
+                                Step.ToString() + " " +
+                                StreamIndex.ToString() + " " +
+                                (CurrentStream == null ? "0" : CurrentStream.Position.ToString()) + " " +
+                                FlashingPhase.ToString() + " " +
+                                FlashingPhaseStartPayloadIndex.ToString() + " " +
+                                DestinationChunkIndex.ToString());
+                        }
+
+                        PhoneNeedsReset = true;
+                    }
+
+                    if (FlashInProgress)
+                    {
+                        FlashingPhase++;
+                    }
+                }
+                while (HeadersFull && FlashInProgress && !Abort);
+
+                if (!Success)
+                {
+                    if ((Profile != null) && !Abort)
+                    {
+                        LogFile.Log("Flashing profile was loaded, but it is not working", LogType.FileAndConsole);
+                        LogFile.Log("Attempting to find a working profile", LogType.FileAndConsole);
+                        ResetScanning = true;
+                    }
+
+                    if (PhoneNeedsReset)
+                    {
+                        Model.ResetPhone();
+                        WaitForReset = true;
+                    }
+
+                    if (WaitForReset)
+                    {
+                        #region Properly recover from reset between flash attempts - many phones respond differently
+
+                        Timeout = false;
+                        try
+                        {
+                            await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
+                        }
+                        catch (TimeoutException)
+                        {
+                            Timeout = true;
+                        }
+                        if ((Notifier.CurrentInterface == null) && (!AutoEmergencyReset || Timeout))
+                        {
+                            AutoEmergencyReset = false;
+
+                            if (Timeout)
+                            {
+                                LogFile.Log("The phone is not responding", LogType.ConsoleOnly);
+                                LogFile.Log("It might be in emergency mode, while you have no matching driver installed", LogType.ConsoleOnly);
+                            }
+                            LogFile.Log("To continue the unlock-sequence, the phone needs to be rebooted", LogType.ConsoleOnly);
+                            LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
+                            LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
+                            LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
+                            LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
+
+                            UpdateWorkingStatus("You need to manually reset your phone now!", (Timeout ? "The phone is not responding. It might be in emergency mode, while you have no matching driver installed. " : "") + "To continue the unlock-sequence, the phone needs to be rebooted. Keep the phone connected to the PC. The unlock-sequence will resume automatically.", null, WPinternalsStatus.WaitingForManualReset);
+
+                            await Notifier.WaitForRemoval();
+
+                            UpdateWorkingStatus("Scanning for flashing-profile - attempt " + AttemptCount.ToString() + " of " + MaximumAttempts.ToString(), "Your phone may appear to be in a reboot-loop. This is expected behavior. Don't interfere this process.", (uint)AttemptCount, Status: WPinternalsStatus.Scanning);
+
+                            await Notifier.WaitForArrival();
+                        }
+                        if (Notifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
+                        {
+                            bool FailedToStartProgrammer = false;
+                            if (ProgrammerPath != null)
+                            {
+                                QualcommSahara Sahara = new((QualcommSerial)Notifier.CurrentModel);
+                                try
+                                {
+                                    await Sahara.Reset(ProgrammerPath);
+                                    await Notifier.WaitForArrival();
+                                }
+                                catch (BadConnectionException)
+                                {
+                                    FailedToStartProgrammer = true;
+                                }
+                            }
+
+                            if (ProgrammerPath == null || FailedToStartProgrammer)
+                            {
+                                ((QualcommSerial)Notifier.CurrentModel).Close(); // Prevent "Resource in use";
+
+                                Timeout = false;
+                                if (AutoEmergencyReset)
+                                {
+                                    try
+                                    {
+                                        await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
+                                    }
+                                    catch (TimeoutException)
+                                    {
+                                        Timeout = true;
+                                    }
+                                    catch (Exception ex)
+                                    {
+                                        LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                                        LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                                        FailedToStartProgrammer = true;
+                                    }
+                                }
+                                if (!AutoEmergencyReset || Timeout)
+                                {
+                                    AutoEmergencyReset = false;
+                                    if (!FailedToStartProgrammer)
+                                    {
+                                        LogFile.Log("The phone is in emergency mode and you didn't provide an emergency programmer", LogType.ConsoleOnly);
+                                        LogFile.Log("This phone also doesn't seem to reboot after a timeout, so you got to help a bit", LogType.ConsoleOnly);
+                                        LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
+                                        LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
+                                        LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
+                                        LogFile.Log("To prevent this, provide an emergency programmer next time you will unlock a bootloader", LogType.ConsoleOnly);
+                                        LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
+
+                                        SetWorkingStatus("You need to manually reset your phone now!",
+                                            "The phone is in emergency mode and you didn't provide an emergency programmer." +
+                                            " This phone also doesn't seem to reboot after a timeout, so you got to help a bit." +
+                                            " Keep the phone connected to the PC." +
+                                            " The unlock-sequence will resume automatically. To prevent this, provide an emergency programmer next time you will unlock a bootloader.",
+                                            null, false, WPinternalsStatus.WaitingForManualReset);
+                                    }
+                                    else
+                                    {
+                                        LogFile.Log("The phone is in emergency mode and we couldn't start the emergency programmer", LogType.ConsoleOnly);
+                                        LogFile.Log("This phone also doesn't seem to reboot after a timeout, so you got to help a bit", LogType.ConsoleOnly);
+                                        LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
+                                        LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
+                                        LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
+                                        LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
+
+                                        SetWorkingStatus("You need to manually reset your phone now!",
+                                            "The phone is in emergency mode and we couldn't start the emergency programmer." +
+                                            " This phone also doesn't seem to reboot after a timeout, so you got to help a bit." +
+                                            " Keep the phone connected to the PC." +
+                                            " The unlock-sequence will resume automatically.",
+                                            null, false, WPinternalsStatus.WaitingForManualReset);
+                                    }
+
+                                    await Notifier.WaitForRemoval();
+
+                                    UpdateWorkingStatus("Scanning for flashing-profile - attempt " + AttemptCount.ToString() + " of " + MaximumAttempts.ToString(), "Your phone may appear to be in a reboot-loop. This is expected behavior. Don't interfere this process.", (uint)AttemptCount, Status: WPinternalsStatus.Scanning);
+
+                                    await Notifier.WaitForArrival();
+                                }
+                            }
+                        }
+
+                        #endregion
+
+                        // Sanity check: must be in flash mode
+                        if ((Notifier.CurrentInterface != PhoneInterfaces.Lumia_Flash) && (Notifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader))
+                        {
+                            break;
+                        }
+
+                        Model = (NokiaFlashModel)Notifier.CurrentModel;
+
+                        // In case we are on an Engineering phone which isn't stuck in flashmode and booted to BootMgrApp
+                        Model.SwitchToFlashAppContext();
+                        Model.DisableRebootTimeOut();
+                    }
+
+                    PhoneNeedsReset = false;
+                    WaitForReset = false;
+
+                    // Calculate variables for next attempt
+                    if (ResetScanning)
+                    {
+                        AssumeImageHeaderFallsInGap = true;
+                        AllocateAsyncBuffersOnPhone = true;
+                        AllocateBackupBuffersOnPhone = false;
+                        CurrentGapFill = EstimatedGapFill;
+                        Profile = null;
+                        ResetScanning = false;
+                    }
+                    else if (Experimental && !AllocateBackupBuffersOnPhone)
+                    {
+                        AllocateBackupBuffersOnPhone = true;
+                    }
+                    else
+                    {
+                        AllocateBackupBuffersOnPhone = false;
+                        if (AllocateAsyncBuffersOnPhone)
+                        {
+                            AllocateAsyncBuffersOnPhone = false;
+                        }
+                        else
+                        {
+                            AllocateAsyncBuffersOnPhone = true;
+                            OldGapFill = CurrentGapFill;
+                            if (OldGapFill <= EstimatedGapFill)
+                            {
+                                CurrentGapFill = EstimatedGapFill + (EstimatedGapFill - OldGapFill) + (UInt32)FFU.ChunkSize;
+                                if (CurrentGapFill > MaximumGapFill)
+                                {
+                                    if (OldGapFill > 0)
+                                    {
+                                        CurrentGapFill = OldGapFill - (UInt32)FFU.ChunkSize;
+                                    }
+                                    else if (AssumeImageHeaderFallsInGap)
+                                    {
+                                        AssumeImageHeaderFallsInGap = false;
+                                        CurrentGapFill = EstimatedGapFill;
+                                    }
+                                    else
+                                    {
+                                        break;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                if (OldGapFill <= (EstimatedGapFill * 2))
+                                {
+                                    CurrentGapFill = EstimatedGapFill - (OldGapFill - EstimatedGapFill);
+                                }
+                                else
+                                {
+                                    CurrentGapFill = OldGapFill + (UInt32)FFU.ChunkSize;
+                                    if (CurrentGapFill > MaximumGapFill)
+                                    {
+                                        if (AssumeImageHeaderFallsInGap)
+                                        {
+                                            AssumeImageHeaderFallsInGap = false;
+                                            CurrentGapFill = EstimatedGapFill;
+                                        }
+                                        else
+                                        {
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            while (!Success && !Abort);
+
+            // Now we will first try to create a memory corruption in the phone, before we reset the phone.
+            // The memory corruption will cause the phone to abort the shutdown-sequence and switch to emergency mode immediately.
+            // We already avoided that the FlashingStatus was written to NV.
+            // But we also need to avoid that the BootFlag is written to NV when the phone is properly shut down, because that will overwrite the NV vars we wrote earlier.
+            if (Success && !ClearFlashingStatusAtEnd)
+            {
+                // Make the phone crash here!
+                // This will actually make the phone crash when it frees memory during shutdown or reboot of the phone
+
+                ByteOperations.WriteUInt32(UefiMemorySim.Buffer, SecurityHeaderAllocation.HeadStart + 4, 0); // Set allocation size to 0 in allocationhead
+                ByteOperations.WriteUInt32(UefiMemorySim.Buffer, StoreHeaderAllocation.HeadStart + 4, 0); // Set allocation size to 0 in allocationhead
+                if (CurrentGapFill > UefiMemorySim.PageSize)
+                {
+                    Model.SendFfuHeaderV2(LastHeaderV2Size + 1, 0, new byte[1], Options);
+                    PartialHeader = new byte[UefiMemorySim.PageSize];
+                    Model.SendFfuHeaderV2(CurrentGapFill, 0, PartialHeader, Options); // Fill memory gap
+                }
+                using (FileStream FfuFile = new(FFU.Path, FileMode.Open, FileAccess.Read))
+                {
+                    // On every flashing phase we need to send the full header again, because this triggers ffu_import_invalidate(), which is necessary to reset all the counters.
+                    FfuFile.Read(FfuHeader, 0, (int)CombinedFFUHeaderSize);
+                    Model.SendFfuHeaderV1(FfuHeader, Options);
+                }
+                PartialHeader = new byte[UefiMemorySim.PageSize];
+                Model.SendFfuHeaderV2(ExploitHeaderAllocationSize, 0, PartialHeader, Options); // SkipWrite = 1 (only works on engineering phones)
+                UInt32 ExploitHeaderRemaining = SecurityHeaderAllocation.TailEnd + 1 - PartialHeaderAllocation.ContentStart - (UInt32)PartialHeader.Length;
+                HeaderOffset = (UInt32)PartialHeader.Length;
+                while (ExploitHeaderRemaining > 0)
+                {
+                    UInt32 CurrentFill = ExploitHeaderRemaining;
+                    if (CurrentFill > Info.WriteBufferSize)
+                    {
+                        CurrentFill = Info.WriteBufferSize;
+                    }
+
+                    PartialHeader = new byte[CurrentFill];
+                    PartialHeaderAllocation.CopyFromThisAllocation(HeaderOffset, CurrentFill, PartialHeader, 0);
+                    Model.SendFfuHeaderV2(HeaderOffset + CurrentFill + 1, HeaderOffset, PartialHeader, Options);
+                    LastHeaderV2Size = HeaderOffset + CurrentFill + 1;
+                    ExploitHeaderRemaining -= CurrentFill;
+                    HeaderOffset += CurrentFill;
+                }
+
+                // Do the actual reset, which will result in a crash while cleaning up memory
+                ((NokiaFlashModel)Notifier.CurrentModel).ResetPhone();
+
+                LogFile.Log("Phone performs hard exit", LogType.FileAndConsole);
+
+                #region Properly recover from reset at the end of custom flash - many phones respond differently
+
+                // Wait for the phone to boot to emergency mode
+                // Emergency mode is always triggered on purpose to avoid writing NV vars
+                // We also wait for emergency mode when no valid programmer is present, or else caller-code will not know at which stage the phone is rebooting
+
+                // Possibilities here:
+                // - Lumia 950 or 950 XL which does not crash to emergency mode, switching to mass storage mode, but not assigning a drive-letter -> Bootmgr, Nothing
+                // - Lumia 950 or 950 XL which does not crash to emergency mode, switching to mass storage mode, and assigning a drive-letter -> Bootmgr, MSM
+                // - Other Lumia's, switching to mass storage mode, but not assigning a drive-letter -> Bootmgr, Nothing
+
+                Timeout = false;
+                try
+                {
+                    await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
+                }
+                catch (TimeoutException)
+                {
+                    Timeout = true;
+                }
+                if ((Notifier.CurrentInterface == null) && (!AutoEmergencyReset || Timeout))
+                {
+                    AutoEmergencyReset = false;
+
+                    if (Timeout)
+                    {
+                        LogFile.Log("The phone is not responding", LogType.ConsoleOnly);
+                        LogFile.Log("It might be in emergency mode, while you have no matching driver installed", LogType.ConsoleOnly);
+                    }
+                    LogFile.Log("To continue the unlock-sequence, the phone needs to be rebooted", LogType.ConsoleOnly);
+                    LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
+                    LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
+                    LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
+                    LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
+
+                    SetWorkingStatus("You need to manually reset your phone now!", (Timeout ? "The phone is not responding. It might be in emergency mode, while you have no matching driver installed. " : "") + "To continue the unlock-sequence, the phone needs to be rebooted. Keep the phone connected to the PC. The unlock-sequence will resume automatically.", null, false, WPinternalsStatus.WaitingForManualReset);
+
+                    await Notifier.WaitForRemoval();
+
+                    SetWorkingStatus("Rebooting phone...");
+                }
+                if (Notifier.CurrentInterface == PhoneInterfaces.Qualcomm_Download)
+                {
+                    bool FailedToStartProgrammer = false;
+                    if (ProgrammerPath != null)
+                    {
+                        QualcommSahara Sahara = new((QualcommSerial)Notifier.CurrentModel);
+                        try
+                        {
+                            await Sahara.Reset(ProgrammerPath);
+                            await Notifier.WaitForArrival();
+                        }
+                        catch (BadConnectionException)
+                        {
+                            FailedToStartProgrammer = true;
+                        }
+                    }
+
+                    if (ProgrammerPath == null || FailedToStartProgrammer)
+                    {
+                        ((QualcommSerial)Notifier.CurrentModel).Close(); // Prevent "Resource in use";
+
+                        Timeout = false;
+                        if (AutoEmergencyReset)
+                        {
+                            try
+                            {
+                                await Notifier.WaitForArrival().TimeoutAfter(TimeSpan.FromSeconds(40));
+                            }
+                            catch (TimeoutException)
+                            {
+                                Timeout = true;
+                            }
+                            catch (Exception ex)
+                            {
+                                LogFile.Log("An unexpected error happened", LogType.FileAndConsole);
+                                LogFile.Log(ex.GetType().ToString(), LogType.FileAndConsole);
+                                FailedToStartProgrammer = true;
+                            }
+                        }
+                        if (!AutoEmergencyReset || Timeout)
+                        {
+                            AutoEmergencyReset = false;
+
+                            if (!FailedToStartProgrammer)
+                            {
+                                LogFile.Log("The phone is in emergency mode and you didn't provide an emergency programmer", LogType.ConsoleOnly);
+                                LogFile.Log("This phone also doesn't seem to reboot after a timeout, so you got to help a bit", LogType.ConsoleOnly);
+                                LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
+                                LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
+                                LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
+                                LogFile.Log("To prevent this, provide an emergency programmer next time you will unlock a bootloader", LogType.ConsoleOnly);
+                                LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
+
+                                SetWorkingStatus("You need to manually reset your phone now!",
+                                    "The phone is in emergency mode and you didn't provide an emergency programmer." +
+                                    " This phone also doesn't seem to reboot after a timeout, so you got to help a bit." +
+                                    " Keep the phone connected to the PC." +
+                                    " The unlock-sequence will resume automatically. To prevent this, provide an emergency programmer next time you will unlock a bootloader.",
+                                    null, false, WPinternalsStatus.WaitingForManualReset);
+                            }
+                            else
+                            {
+                                LogFile.Log("The phone is in emergency mode and we couldn't start the emergency programmer", LogType.ConsoleOnly);
+                                LogFile.Log("This phone also doesn't seem to reboot after a timeout, so you got to help a bit", LogType.ConsoleOnly);
+                                LogFile.Log("Keep the phone connected to the PC", LogType.ConsoleOnly);
+                                LogFile.Log("Reboot the phone manually by pressing and holding the power-button of the phone for about 10 seconds until it vibrates", LogType.ConsoleOnly);
+                                LogFile.Log("The unlock-sequence will resume automatically", LogType.ConsoleOnly);
+                                LogFile.Log("Waiting for manual reset of the phone...", LogType.ConsoleOnly);
+
+                                SetWorkingStatus("You need to manually reset your phone now!",
+                                    "The phone is in emergency mode and we couldn't start the emergency programmer." +
+                                    " This phone also doesn't seem to reboot after a timeout, so you got to help a bit." +
+                                    " Keep the phone connected to the PC." +
+                                    " The unlock-sequence will resume automatically.",
+                                    null, false, WPinternalsStatus.WaitingForManualReset);
+                            }
+
+                            await Notifier.WaitForRemoval();
+
+                            SetWorkingStatus("Rebooting phone...");
+
+                            // await Notifier.WaitForArrival(); // Function will exit while phone is rebooting
+                        }
+                    }
+                }
+
+                #endregion
+            }
+            else
+            {
+                // If we didn't do a hard exit, we need to do a normal reboot
+                ((NokiaFlashModel)Notifier.CurrentModel).ResetPhone();
+            }
+
+            if (Success)
+            {
+                ExitSuccess("Flash succeeded!", null);
+            }
+            else
+            {
+                throw new WPinternalsException("Custom flash failed");
+            }
+        }
+
+        internal class FlashingPayload
+        {
+            public UInt32 ChunkCount;
+            public byte[][] ChunkHashes;
+            public UInt32[] TargetLocations;
+            public UInt32[] StreamIndexes;
+            public Int64[] StreamLocations;
+
+            public FlashingPayload(UInt32 ChunkCount, byte[][] ChunkHashes, UInt32[] TargetLocations, UInt32[] StreamIndexes, Int64[] StreamLocations)
+            {
+                this.ChunkCount = ChunkCount;
+                this.ChunkHashes = ChunkHashes;
+                this.TargetLocations = TargetLocations;
+                this.StreamIndexes = StreamIndexes;
+                this.StreamLocations = StreamLocations;
+            }
+
+            public UInt32 GetSecurityHeaderSize()
+            {
+                return 0x20 * (UInt32)ChunkHashes.Length;
+            }
+
+            public UInt32 GetStoreHeaderSize()
+            {
+                return 0x08 * ((UInt32)TargetLocations.Length + 1);
+            }
+        }
+
+        //
+        // Function to fall back into the legacy implementation of custom flash, to test the modifications done in the custom flash function
+        // in LumiaV2UnlockBootViewModel
+        //
+        internal static FlashingPayload[] GetNonOptimizedPayloads(List<FlashPart> flashParts, Int32 chunkSize, UInt32 MaximumChunkCount, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null)
+        {
+            long TotalProcess1 = 0;
+            for (Int32 j = 0; j < flashParts.Count; j++)
+            {
+                FlashPart flashPart = flashParts[j];
+                TotalProcess1 += flashPart.Stream.Length / chunkSize;
+            }
+
+            ulong CurrentProcess1 = 0;
+            SetWorkingStatus("Hashing resources...", "Initializing flash...", (UInt64)TotalProcess1, Status: WPinternalsStatus.Initializing);
+
+            var crypto = System.Security.Cryptography.SHA256.Create();
+            List<FlashingPayload> flashingPayloads = new();
+            if (flashParts == null)
+            {
+                return flashingPayloads.ToArray();
+            }
+
+            for (UInt32 j = 0; j < flashParts.Count; j++)
+            {
+                FlashPart flashPart = flashParts[(Int32)j];
+                flashPart.Stream.Seek(0, SeekOrigin.Begin);
+                var totalChunkCount = flashPart.Stream.Length / chunkSize;
+                for (UInt32 i = 0; i < totalChunkCount; i++)
+                {
+                    UpdateWorkingStatus("Hashing resources...", "Initializing flash...", CurrentProcess1, WPinternalsStatus.Initializing);
+                    byte[] buffer = new byte[chunkSize];
+                    Int64 position = flashPart.Stream.Position;
+                    flashPart.Stream.Read(buffer, 0, chunkSize);
+                    flashingPayloads.Add(new FlashingPayload(1, new byte[][] { crypto.ComputeHash(buffer) }, new UInt32[] { (flashPart.StartSector * 0x200 / (UInt32)chunkSize) + i }, new UInt32[] { j }, new Int64[] { position }));
+                    CurrentProcess1++;
+                }
+            }
+
+            return flashingPayloads.ToArray();
+        }
+
+        //
+        // This function finds in an optimized way the number of duplicate chunks in a given stream, and returns
+        // a list of elements, defining a chunk occurence in said stream and the chunk precomputed SHA256 hash.
+        //
+        internal static FlashingPayload[] GetOptimizedPayloads(List<FlashPart> flashParts, Int32 chunkSize, UInt32 MaximumChunkCount, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null)
+        {
+            List<FlashingPayload> flashingPayloads = new();
+            if (flashParts == null)
+            {
+                return flashingPayloads.ToArray();
+            }
+
+            long TotalProcess1 = 0;
+            for (Int32 j = 0; j < flashParts.Count; j++)
+            {
+                FlashPart flashPart = flashParts[j];
+                TotalProcess1 += flashPart.Stream.Length / chunkSize;
+            }
+
+            ulong CurrentProcess1 = 0;
+            SetWorkingStatus("Hashing resources...", "Initializing flash...", (UInt64)TotalProcess1, Status: WPinternalsStatus.Initializing);
+
+            using (System.Security.Cryptography.SHA256 crypto = System.Security.Cryptography.SHA256.Create())
+            {
+                for (UInt32 j = 0; j < flashParts.Count; j++)
+                {
+                    FlashPart flashPart = flashParts[(Int32)j];
+                    flashPart.Stream.Seek(0, SeekOrigin.Begin);
+                    var totalChunkCount = flashPart.Stream.Length / chunkSize;
+                    for (UInt32 i = 0; i < totalChunkCount; i++)
+                    {
+                        UpdateWorkingStatus("Hashing resources...", "Initializing flash...", CurrentProcess1, WPinternalsStatus.Initializing);
+                        byte[] buffer = new byte[chunkSize];
+                        Int64 position = flashPart.Stream.Position;
+                        flashPart.Stream.Read(buffer, 0, chunkSize);
+                        var hash = crypto.ComputeHash(buffer);
+
+                        if (flashingPayloads.Any(x => ByteOperations.Compare(x.ChunkHashes[0], hash)))
+                        {
+                            var payloadIndex = flashingPayloads.FindIndex(x => ByteOperations.Compare(x.ChunkHashes[0], hash));
+                            var locationList = flashingPayloads[payloadIndex].TargetLocations.ToList();
+                            locationList.Add((flashPart.StartSector * 0x200 / (UInt32)chunkSize) + i);
+                            flashingPayloads[payloadIndex].TargetLocations = locationList.ToArray();
+                        }
+                        else
+                        {
+                            flashingPayloads.Add(new FlashingPayload(1, new byte[][] { hash }, new UInt32[] { (flashPart.StartSector * 0x200 / (UInt32)chunkSize) + i }, new UInt32[] { j }, new Int64[] { position }));
+                        }
+
+                        CurrentProcess1++;
+                    }
+                }
+            }
+
+            return flashingPayloads.ToArray();
+        }
+
+        internal static string GetProgrammerPath(byte[] RKH, string Type)
+        {
+            IEnumerable<EmergencyFileEntry> RKHEntries = App.Config.EmergencyRepository.Where(e => StructuralComparisons.StructuralEqualityComparer.Equals(e.RKH, RKH) && e.ProgrammerExists());
+            if (RKHEntries.Any())
+            {
+                if (RKHEntries.Count() == 1)
+                {
+                    return RKHEntries.First().ProgrammerPath;
+                }
+                else
+                {
+                    EmergencyFileEntry RKHEntry = RKHEntries.FirstOrDefault(e => string.Equals(e.Type, Type, StringComparison.CurrentCulture));
+                    if (RKHEntry != null)
+                    {
+                        return RKHEntry.ProgrammerPath;
+                    }
+                    else
+                    {
+                        return RKHEntries.First().ProgrammerPath; // Cannot be sure this is the right one!!
+                    }
+                }
+            }
+            else
+            {
+                EmergencyFileEntry TypeEntry = App.Config.EmergencyRepository.Find(e => string.Equals(e.Type, Type, StringComparison.CurrentCulture) && e.ProgrammerExists());
+                if (TypeEntry != null)
+                {
+                    return TypeEntry.ProgrammerPath;
+                }
+                else
+                {
+                    return null;
+                }
+            }
+        }
+
+        // Assumes phone with Flash protocol v2
+        // Assumes phone is in flash mode
+        internal async static Task LumiaV2FlashArchive(PhoneNotifierViewModel Notifier, string ArchivePath, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null)
+        {
+            LogFile.BeginAction("FlashCustomROM");
+
+            NokiaFlashModel FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
+
+            // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
+            // We need the fist sector if we want to write back the GPT.
+            byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
+            GPT GPT = new(GPTChunk);
+
+            Partition Target;
+            FlashPart Part;
+            List<FlashPart> Parts = new();
+            ulong MainOSOldSectorCount = 0;
+            ulong MainOSNewSectorCount = 0;
+            ulong DataOldSectorCount = 0;
+            ulong DataNewSectorCount = 0;
+            ulong FirstMainOSSector = 0;
+            int PartitionCount = 0;
+            ulong TotalSizeSectors = 0;
+            bool IsUnlocked = false;
+            bool GPTChanged = false;
+
+            bool ClearFlashingStatus = true;
+
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            SetWorkingStatus("Initializing flash...", null, null, Status: WPinternalsStatus.Initializing);
+
+            try
+            {
+                using FileStream FileStream = new(ArchivePath, FileMode.Open);
+                using ZipArchive Archive = new(FileStream, ZipArchiveMode.Read);
+                // Determine if there is a partition layout present
+                ZipArchiveEntry PartitionEntry = Archive.GetEntry("Partitions.xml");
+                if (PartitionEntry == null)
+                {
+                    GPT.MergePartitions(null, true, Archive);
+                    GPTChanged |= GPT.HasChanged;
+                }
+                else
+                {
+                    using Stream ZipStream = PartitionEntry.Open();
+                    using StreamReader ZipReader = new(ZipStream);
+                    string PartitionXml = ZipReader.ReadToEnd();
+                    GPT.MergePartitions(PartitionXml, true, Archive);
+                    GPTChanged |= GPT.HasChanged;
+                }
+
+                // First determine if we need a new GPT!
+                foreach (ZipArchiveEntry Entry in Archive.Entries)
+                {
+                    if (!Entry.FullName.Contains("/")) // No subfolders
+                    {
+                        string PartitionName = Entry.Name;
+                        int Pos = PartitionName.IndexOf('.');
+                        if (Pos >= 0)
+                        {
+                            PartitionName = PartitionName.Substring(0, Pos);
+                        }
+
+                        Partition Partition = GPT.Partitions.Find(p => string.Equals(p.Name, PartitionName, StringComparison.CurrentCultureIgnoreCase));
+                        if (Partition != null)
+                        {
+                            using DecompressedStream DecompressedStream = new(Entry.Open());
+                            ulong StreamLengthInSectors = (ulong)Entry.Length / 0x200;
+                            try
+                            {
+                                StreamLengthInSectors = (ulong)DecompressedStream.Length / 0x200;
+                            }
+                            catch { }
+
+                            TotalSizeSectors += StreamLengthInSectors;
+                            PartitionCount++;
+
+                            if (string.Equals(PartitionName, "MainOS", StringComparison.CurrentCultureIgnoreCase))
+                            {
+                                MainOSOldSectorCount = Partition.SizeInSectors;
+                                MainOSNewSectorCount = StreamLengthInSectors;
+                                FirstMainOSSector = Partition.FirstSector;
+                            }
+                            else if (string.Equals(PartitionName, "Data", StringComparison.CurrentCultureIgnoreCase))
+                            {
+                                DataOldSectorCount = Partition.SizeInSectors;
+                                DataNewSectorCount = StreamLengthInSectors;
+                            }
+                            else if (StreamLengthInSectors > Partition.SizeInSectors)
+                            {
+                                LogFile.Log("Flash failed! Size of partition '" + PartitionName + "' is too big.", LogType.FileAndConsole);
+                                ExitFailure("Flash failed!", "Size of partition '" + PartitionName + "' is too big.");
+                                return;
+                            }
+                            else if (string.Equals(PartitionName, "EFIESP", StringComparison.CurrentCultureIgnoreCase))
+                            {
+                                ulong EfiespLength = StreamLengthInSectors * 0x200;
+                                byte[] EfiespBinary = new byte[EfiespLength];
+                                DecompressedStream.Read(EfiespBinary, 0, (int)EfiespLength);
+                                IsUnlocked = (ByteOperations.ReadUInt32(EfiespBinary, 0x20) == (EfiespBinary.Length / 0x200 / 2)) && ByteOperations.ReadAsciiString(EfiespBinary, (UInt32)(EfiespBinary.Length / 2) + 3, 8) == "MSDOS5.0";
+                                if (IsUnlocked)
+                                {
+                                    Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
+                                    if (IsUnlockedFlag == null)
+                                    {
+                                        IsUnlockedFlag = new Partition
+                                        {
+                                            Name = "IS_UNLOCKED",
+                                            Attributes = 0,
+                                            PartitionGuid = Guid.NewGuid(),
+                                            PartitionTypeGuid = Guid.NewGuid(),
+                                            FirstSector = 0x40,
+                                            LastSector = 0x40
+                                        };
+                                        GPT.Partitions.Add(IsUnlockedFlag);
+                                        GPTChanged = true;
+                                        ClearFlashingStatus = false;
+                                    }
+                                }
+                                else
+                                {
+                                    Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
+                                    if (IsUnlockedFlag != null)
+                                    {
+                                        GPT.Partitions.Remove(IsUnlockedFlag);
+                                        GPTChanged = true;
+                                        ClearFlashingStatus = false;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if ((MainOSNewSectorCount > 0) && (DataNewSectorCount > 0))
+                {
+                    if ((MainOSNewSectorCount > MainOSOldSectorCount) || (DataNewSectorCount > DataOldSectorCount))
+                    {
+                        UInt64 OSSpace = GPT.LastUsableSector - FirstMainOSSector + 1;
+                        if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
+                        {
+                            // MainOS and Data partitions need to be re-aligned!
+                            Partition MainOSPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "MainOS", StringComparison.CurrentCultureIgnoreCase));
+                            Partition DataPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "Data", StringComparison.CurrentCultureIgnoreCase));
+                            MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
+                            DataPartition.FirstSector = MainOSPartition.LastSector + 1;
+                            if ((DataPartition.FirstSector % 0x100) > 0)
+                            {
+                                DataPartition.FirstSector = (DataPartition.FirstSector + 0x100) / 0x100 * 0x100;
+                            }
+
+                            DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
+
+                            GPTChanged = true;
+                        }
+                        else
+                        {
+                            LogFile.Log("Flash failed! Sizes of partitions 'MainOS' and 'Data' together are too big.", LogType.FileAndConsole);
+                            ExitFailure("Flash failed!", "Sizes of partitions 'MainOS' and 'Data' together are too big.");
+                            return;
+                        }
+                    }
+                }
+                else if ((MainOSNewSectorCount > 0) && (MainOSNewSectorCount > MainOSOldSectorCount))
+                {
+                    LogFile.Log("Flash failed! Size of partition 'MainOS' is too big.", LogType.FileAndConsole);
+                    ExitFailure("Flash failed!", "Size of partition 'MainOS' is too big.");
+                    return;
+                }
+                else if ((DataNewSectorCount > 0) && (DataNewSectorCount > DataOldSectorCount))
+                {
+                    LogFile.Log("Flash failed! Size of partition 'Data' is too big.", LogType.FileAndConsole);
+                    ExitFailure("Flash failed!", "Size of partition 'Data' is too big.");
+                    return;
+                }
+
+                if (!ClearFlashingStatus)
+                {
+                    if (!IsUnlocked)
+                    {
+                        // Undo secure boot exploit
+                        Partition NvBackupPartition = GPT.GetPartition("BACKUP_BS_NV");
+                        if (NvBackupPartition != null)
+                        {
+                            // This must be a left over of a half unlocked bootloader
+                            Partition NvPartition = GPT.GetPartition("UEFI_BS_NV");
+                            NvBackupPartition.Name = "UEFI_BS_NV";
+                            NvBackupPartition.PartitionGuid = NvPartition.PartitionGuid;
+                            NvBackupPartition.PartitionTypeGuid = NvPartition.PartitionTypeGuid;
+                            GPT.Partitions.Remove(NvPartition);
+                            GPTChanged = true;
+                        }
+
+                        PhoneInfo Info = FlashModel.ReadPhoneInfo(false);
+
+                        // We should only clear NV if there was no backup NV to be restored and the current NV contains the SB unlock.
+                        if ((NvBackupPartition == null) && !Info.UefiSecureBootEnabled)
+                        {
+                            // ClearNV
+                            Part = new FlashPart();
+                            Partition Target2 = GPT.GetPartition("UEFI_BS_NV");
+                            Part.StartSector = (UInt32)Target2.FirstSector;
+                            Part.Stream = new MemoryStream(new byte[0x40000]);
+                            Parts.Add(Part);
+                        }
+                    }
+                    else
+                    {
+                        // Now add NV partition
+                        Partition BACKUP_BS_NV = GPT.GetPartition("BACKUP_BS_NV");
+                        Partition UEFI_BS_NV;
+                        if (BACKUP_BS_NV == null)
+                        {
+                            BACKUP_BS_NV = GPT.GetPartition("UEFI_BS_NV");
+                            Guid OriginalPartitionTypeGuid = BACKUP_BS_NV.PartitionTypeGuid;
+                            Guid OriginalPartitionGuid = BACKUP_BS_NV.PartitionGuid;
+                            BACKUP_BS_NV.Name = "BACKUP_BS_NV";
+                            BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
+                            BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
+                            UEFI_BS_NV = new Partition
+                            {
+                                Name = "UEFI_BS_NV",
+                                Attributes = BACKUP_BS_NV.Attributes,
+                                PartitionGuid = OriginalPartitionGuid,
+                                PartitionTypeGuid = OriginalPartitionTypeGuid,
+                                FirstSector = BACKUP_BS_NV.LastSector + 1
+                            };
+                            UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
+                            GPT.Partitions.Add(UEFI_BS_NV);
+                            GPTChanged = true;
+                        }
+
+                        Part = new FlashPart();
+                        Target = GPT.GetPartition("UEFI_BS_NV");
+                        Part.StartSector = (UInt32)Target.FirstSector; // GPT is prepared for 64-bit sector-offset, but flash app isn't.
+                        Part.Stream = new SeekableStream(() =>
+                        {
+                            var assembly = System.Reflection.Assembly.GetExecutingAssembly();
+
+                                    // Magic!
+                                    // The SB resource is a compressed version of a raw NV-variable-partition.
+                                    // In this partition the SecureBoot variable is disabled.
+                                    // It overwrites the variable in a different NV-partition than where this variable is stored usually.
+                                    // This normally leads to endless-loops when the NV-variables are enumerated.
+                                    // But the partition contains an extra hack to break out the endless loops.
+                                    var stream = assembly.GetManifestResourceStream("WPinternals.SB");
+
+                            return new DecompressedStream(stream);
+                        });
+                        Parts.Add(Part);
+                    }
+                }
+
+                if (GPTChanged)
+                {
+                    GPT.Rebuild();
+                    Part = new FlashPart
+                    {
+                        StartSector = 0,
+                        Stream = new MemoryStream(GPTChunk)
+                    };
+                    Parts.Add(Part);
+                }
+
+                // And then add the partitions from the archive
+                if (PartitionCount > 0)
+                {
+                    foreach (ZipArchiveEntry Entry in Archive.Entries)
+                    {
+                        if (!Entry.FullName.Contains("/")) // No subfolders
+                        {
+                            // "MainOS.bin.gz" => "MainOS"
+                            string PartitionName = Entry.Name;
+                            int Pos = PartitionName.IndexOf('.');
+                            if (Pos >= 0)
+                            {
+                                PartitionName = PartitionName.Substring(0, Pos);
+                            }
+
+                            Target = GPT.Partitions.Find(p => string.Equals(p.Name, PartitionName, StringComparison.CurrentCultureIgnoreCase));
+                            if (Target != null)
+                            {
+                                Part = new FlashPart
+                                {
+                                    StartSector = (UInt32)Target.FirstSector,
+                                    Stream = new SeekableStream(() => new DecompressedStream(Entry.Open()), Entry.Length),
+                                    ProgressText = "Flashing partition " + Target.Name
+                                };
+                                Parts.Add(Part);
+                                LogFile.Log("Partition name=" + PartitionName + ", startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Entry.Length / 0x200).ToString("X8"), LogType.FileOnly);
+                            }
+                        }
+                    }
+
+                    Parts = Parts.OrderBy(p => p.StartSector).ToList();
+                    int Count = 1;
+                    Parts.Where(p => p.ProgressText?.StartsWith("Flashing partition ") == true).ToList().ForEach((p) =>
+                    {
+                        p.ProgressText += " (" + Count.ToString() + "/" + PartitionCount.ToString() + ")";
+                        Count++;
+                    });
+
+                    // Do actual flashing!
+                    await LumiaV2CustomFlash(Notifier, null, false, false, Parts, true, ClearFlashingStatus, false, true, false, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure);
+                }
+                else
+                {
+                    LogFile.Log("Flash failed! No valid partitions found in the archive.", LogType.FileAndConsole);
+                    ExitFailure("Flash failed!", "No valid partitions found in the archive");
+                    return;
+                }
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex);
+                ExitFailure(Ex.Message, Ex is WPinternalsException ? ((WPinternalsException)Ex).SubMessage : null);
+            }
+
+            LogFile.EndAction("FlashCustomROM");
+        }
+
+        internal async static Task LumiaV2FixBoot(PhoneNotifierViewModel Notifier, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null)
+        {
+            LogFile.BeginAction("FixBoot");
+
+            LogFile.Log("Command: Fix boot after unlocking bootloader", LogType.FileAndConsole);
+            NokiaFlashModel FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
+
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
+
+            try
+            {
+                await SwitchModeViewModel.SwitchToWithProgress(Notifier, PhoneInterfaces.Lumia_MassStorage, (msg, sub) => SetWorkingStatus(msg, sub, null, Status: WPinternalsStatus.SwitchingMode));
+                SetWorkingStatus("Applying patches...", null, null, Status: WPinternalsStatus.Patching);
+                App.PatchEngine.TargetPath = ((MassStorage)Notifier.CurrentModel).Drive + "\\";
+                bool PatchResult = App.PatchEngine.Patch("SecureBootHack-MainOS");
+                if (!PatchResult)
+                {
+                    throw new WPinternalsException("Patch failed", "An error occured while patching Operating System files on the MainOS partition of your phone. Make sure your phone runs a supported Operating System version.");
+                }
+
+                LogFile.Log("Fixed bootloader", LogType.FileAndConsole);
+                LogFile.Log("The phone is left in Mass Storage mode", LogType.FileAndConsole);
+                LogFile.Log("Press and hold the power-button of the phone for at least 10 seconds to reset the phone", LogType.FileAndConsole);
+                ExitSuccess("Fixed bootloader!", "The phone is left in Mass Storage mode. Press and hold the power-button of the phone for at least 10 seconds to reset the phone.");
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex);
+                ExitFailure(Ex.Message, Ex is WPinternalsException ? ((WPinternalsException)Ex).SubMessage : null);
+            }
+
+            LogFile.EndAction("FixBoot");
+        }
+
+        // Assumes phone with Flash protocol v2
+        // Assumes phone is in flash mode
+        internal async static Task LumiaV2FlashPartitions(PhoneNotifierViewModel Notifier, string EFIESPPath, string MainOSPath, string DataPath, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, ExitSuccess ExitSuccess = null, ExitFailure ExitFailure = null)
+        {
+            NokiaFlashModel FlashModel = (NokiaFlashModel)Notifier.CurrentModel;
+
+            // Use GetGptChunk() here instead of ReadGPT(), because ReadGPT() skips the first sector.
+            // We need the fist sector if we want to write back the GPT.
+            byte[] GPTChunk = LumiaUnlockBootloaderViewModel.GetGptChunk(FlashModel, 0x20000);
+            GPT GPT = new(GPTChunk);
+
+            Partition Target;
+            FlashPart Part;
+            List<FlashPart> Parts = new();
+            ulong MainOSOldSectorCount = 0;
+            ulong MainOSNewSectorCount = 0;
+            ulong DataOldSectorCount = 0;
+            ulong DataNewSectorCount = 0;
+            ulong FirstMainOSSector = 0;
+            int PartitionCount = 0;
+            ulong LengthInSectors;
+            FileInfo FileInfo;
+            Partition Partition;
+            bool IsUnlocked = false;
+            bool GPTChanged = false;
+            bool ClearFlashingStatus = true;
+
+            if (SetWorkingStatus == null)
+            {
+                SetWorkingStatus = (m, s, v, a, st) => { };
+            }
+
+            if (UpdateWorkingStatus == null)
+            {
+                UpdateWorkingStatus = (m, s, v, st) => { };
+            }
+
+            if (ExitSuccess == null)
+            {
+                ExitSuccess = (m, s) => { };
+            }
+
+            if (ExitFailure == null)
+            {
+                ExitFailure = (m, s) => { };
+            }
+
+            SetWorkingStatus("Initializing flash...", null, null, Status: WPinternalsStatus.Initializing);
+
+            try
+            {
+                if (EFIESPPath != null)
+                {
+                    FileInfo = new FileInfo(EFIESPPath);
+                    LengthInSectors = (ulong)FileInfo.Length / 0x200;
+                    Partition = GPT.GetPartition("EFIESP");
+                    if (Partition.SizeInSectors < LengthInSectors)
+                    {
+                        LogFile.Log("Flash failed! Size of partition 'EFIESP' is too big.", LogType.FileAndConsole);
+                        ExitFailure("Flash failed!", "Size of partition 'EFIESP' is too big.");
+                        return;
+                    }
+                    PartitionCount++;
+
+                    byte[] EfiespBinary = File.ReadAllBytes(EFIESPPath);
+                    IsUnlocked = (ByteOperations.ReadUInt32(EfiespBinary, 0x20) == (EfiespBinary.Length / 0x200 / 2)) && ByteOperations.ReadAsciiString(EfiespBinary, (UInt32)(EfiespBinary.Length / 2) + 3, 8) == "MSDOS5.0";
+                    if (IsUnlocked)
+                    {
+                        Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
+                        if (IsUnlockedFlag == null)
+                        {
+                            IsUnlockedFlag = new Partition
+                            {
+                                Name = "IS_UNLOCKED",
+                                Attributes = 0,
+                                PartitionGuid = Guid.NewGuid(),
+                                PartitionTypeGuid = Guid.NewGuid(),
+                                FirstSector = 0x40,
+                                LastSector = 0x40
+                            };
+                            GPT.Partitions.Add(IsUnlockedFlag);
+                            GPTChanged = true;
+                            ClearFlashingStatus = false;
+                        }
+                    }
+                    else
+                    {
+                        Partition IsUnlockedFlag = GPT.GetPartition("IS_UNLOCKED");
+                        if (IsUnlockedFlag != null)
+                        {
+                            GPT.Partitions.Remove(IsUnlockedFlag);
+                            GPTChanged = true;
+                            ClearFlashingStatus = false;
+                        }
+                    }
+                }
+
+                if (MainOSPath != null)
+                {
+                    FileInfo = new FileInfo(MainOSPath);
+                    LengthInSectors = (ulong)FileInfo.Length / 0x200;
+                    Partition = GPT.GetPartition("MainOS");
+                    MainOSOldSectorCount = Partition.SizeInSectors;
+                    MainOSNewSectorCount = LengthInSectors;
+                    FirstMainOSSector = Partition.FirstSector;
+                    PartitionCount++;
+                }
+
+                if (DataPath != null)
+                {
+                    FileInfo = new FileInfo(DataPath);
+                    LengthInSectors = (ulong)FileInfo.Length / 0x200;
+                    Partition = GPT.GetPartition("Data");
+                    DataOldSectorCount = Partition.SizeInSectors;
+                    DataNewSectorCount = LengthInSectors;
+                    PartitionCount++;
+                }
+
+                if (PartitionCount > 0)
+                {
+                    if ((MainOSNewSectorCount > 0) && (DataNewSectorCount > 0))
+                    {
+                        if ((MainOSNewSectorCount > MainOSOldSectorCount) || (DataNewSectorCount > DataOldSectorCount))
+                        {
+                            UInt64 OSSpace = GPT.LastUsableSector - FirstMainOSSector + 1;
+                            if ((MainOSNewSectorCount + DataNewSectorCount) <= OSSpace)
+                            {
+                                // MainOS and Data partitions need to be re-aligned!
+                                Partition MainOSPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "MainOS", StringComparison.CurrentCultureIgnoreCase));
+                                Partition DataPartition = GPT.Partitions.Single(p => string.Equals(p.Name, "Data", StringComparison.CurrentCultureIgnoreCase));
+                                MainOSPartition.LastSector = MainOSPartition.FirstSector + MainOSNewSectorCount - 1;
+                                DataPartition.FirstSector = MainOSPartition.LastSector + 1;
+                                if ((DataPartition.FirstSector % 0x100) > 0)
+                                {
+                                    DataPartition.FirstSector = (DataPartition.FirstSector + 0x100) / 0x100 * 0x100;
+                                }
+
+                                DataPartition.LastSector = DataPartition.FirstSector + DataNewSectorCount - 1;
+
+                                GPTChanged = true;
+                            }
+                            else
+                            {
+                                LogFile.Log("Flash failed! Sizes of partitions 'MainOS' and 'Data' together are too big.", LogType.FileAndConsole);
+                                ExitFailure("Flash failed!", "Sizes of partitions 'MainOS' and 'Data' together are too big.");
+                                return;
+                            }
+                        }
+                    }
+                    else if ((MainOSNewSectorCount > 0) && (MainOSNewSectorCount > MainOSOldSectorCount))
+                    {
+                        LogFile.Log("Flash failed! Size of partition 'MainOS' is too big.", LogType.FileAndConsole);
+                        ExitFailure("Flash failed!", "Size of partition 'MainOS' is too big.");
+                        return;
+                    }
+                    else if ((DataNewSectorCount > 0) && (DataNewSectorCount > DataOldSectorCount))
+                    {
+                        LogFile.Log("Flash failed! Size of partition 'Data' is too big.", LogType.FileAndConsole);
+                        ExitFailure("Flash failed!", "Size of partition 'Data' is too big.");
+                        return;
+                    }
+
+                    if (!ClearFlashingStatus)
+                    {
+                        if (!IsUnlocked)
+                        {
+                            // Undo secure boot exploit
+                            Partition NvBackupPartition = GPT.GetPartition("BACKUP_BS_NV");
+                            if (NvBackupPartition != null)
+                            {
+                                // This must be a left over of a half unlocked bootloader
+                                Partition NvPartition = GPT.GetPartition("UEFI_BS_NV");
+                                NvBackupPartition.Name = "UEFI_BS_NV";
+                                NvBackupPartition.PartitionGuid = NvPartition.PartitionGuid;
+                                NvBackupPartition.PartitionTypeGuid = NvPartition.PartitionTypeGuid;
+                                GPT.Partitions.Remove(NvPartition);
+                                GPTChanged = true;
+                            }
+
+                            PhoneInfo Info = FlashModel.ReadPhoneInfo(false);
+
+                            // We should only clear NV if there was no backup NV to be restored and the current NV contains the SB unlock.
+                            if ((NvBackupPartition == null) && !Info.UefiSecureBootEnabled)
+                            {
+                                // ClearNV
+                                Part = new FlashPart();
+                                Partition Target2 = GPT.GetPartition("UEFI_BS_NV");
+                                Part.StartSector = (UInt32)Target2.FirstSector;
+                                Part.Stream = new MemoryStream(new byte[0x40000]);
+                                Parts.Add(Part);
+                            }
+                        }
+                        else
+                        {
+                            // Now add NV partition
+                            Partition BACKUP_BS_NV = GPT.GetPartition("BACKUP_BS_NV");
+                            Partition UEFI_BS_NV;
+                            if (BACKUP_BS_NV == null)
+                            {
+                                BACKUP_BS_NV = GPT.GetPartition("UEFI_BS_NV");
+                                Guid OriginalPartitionTypeGuid = BACKUP_BS_NV.PartitionTypeGuid;
+                                Guid OriginalPartitionGuid = BACKUP_BS_NV.PartitionGuid;
+                                BACKUP_BS_NV.Name = "BACKUP_BS_NV";
+                                BACKUP_BS_NV.PartitionGuid = Guid.NewGuid();
+                                BACKUP_BS_NV.PartitionTypeGuid = Guid.NewGuid();
+                                UEFI_BS_NV = new Partition
+                                {
+                                    Name = "UEFI_BS_NV",
+                                    Attributes = BACKUP_BS_NV.Attributes,
+                                    PartitionGuid = OriginalPartitionGuid,
+                                    PartitionTypeGuid = OriginalPartitionTypeGuid,
+                                    FirstSector = BACKUP_BS_NV.LastSector + 1
+                                };
+                                UEFI_BS_NV.LastSector = UEFI_BS_NV.FirstSector + BACKUP_BS_NV.LastSector - BACKUP_BS_NV.FirstSector;
+                                GPT.Partitions.Add(UEFI_BS_NV);
+                                GPTChanged = true;
+                            }
+
+                            Part = new FlashPart();
+                            Target = GPT.GetPartition("UEFI_BS_NV");
+                            Part.StartSector = (UInt32)Target.FirstSector; // GPT is prepared for 64-bit sector-offset, but flash app isn't.
+                            Part.Stream = new SeekableStream(() =>
+                            {
+                                var assembly = System.Reflection.Assembly.GetExecutingAssembly();
+
+                                // Magic!
+                                // The SB resource is a compressed version of a raw NV-variable-partition.
+                                // In this partition the SecureBoot variable is disabled.
+                                // It overwrites the variable in a different NV-partition than where this variable is stored usually.
+                                // This normally leads to endless-loops when the NV-variables are enumerated.
+                                // But the partition contains an extra hack to break out the endless loops.
+                                var stream = assembly.GetManifestResourceStream("WPinternals.SB");
+
+                                return new DecompressedStream(stream);
+                            });
+                            Parts.Add(Part);
+                        }
+                    }
+
+                    if (GPTChanged)
+                    {
+                        GPT.Rebuild();
+                        Part = new FlashPart
+                        {
+                            StartSector = 0,
+                            Stream = new MemoryStream(GPTChunk)
+                        };
+                        Parts.Add(Part);
+                    }
+
+                    int Count = 0;
+
+                    Target = GPT.Partitions.Find(p => string.Equals(p.Name, "EFIESP", StringComparison.CurrentCultureIgnoreCase));
+                    if ((EFIESPPath != null) && (Target != null))
+                    {
+                        Count++;
+                        Part = new FlashPart
+                        {
+                            StartSector = (UInt32)Target.FirstSector,
+                            Stream = new FileStream(EFIESPPath, FileMode.Open),
+                            ProgressText = "Flashing partition EFIESP (" + Count.ToString() + " / " + PartitionCount.ToString() + ")"
+                        };
+                        Parts.Add(Part);
+                        LogFile.Log("Partition name=EFIESP, startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Part.Stream.Length / 0x200).ToString("X8"), LogType.FileOnly);
+                    }
+
+                    Target = GPT.Partitions.Find(p => string.Equals(p.Name, "MainOS", StringComparison.CurrentCultureIgnoreCase));
+                    if ((MainOSPath != null) && (Target != null))
+                    {
+                        Count++;
+                        Part = new FlashPart
+                        {
+                            StartSector = (UInt32)Target.FirstSector,
+                            Stream = new FileStream(MainOSPath, FileMode.Open),
+                            ProgressText = "Flashing partition MainOS (" + Count.ToString() + " / " + PartitionCount.ToString() + ")"
+                        };
+                        Parts.Add(Part);
+                        LogFile.Log("Partition name=MainOS, startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Part.Stream.Length / 0x200).ToString("X8"), LogType.FileOnly);
+                    }
+
+                    Target = GPT.Partitions.Find(p => string.Equals(p.Name, "Data", StringComparison.CurrentCultureIgnoreCase));
+                    if ((DataPath != null) && (Target != null))
+                    {
+                        Count++;
+                        Part = new FlashPart
+                        {
+                            StartSector = (UInt32)Target.FirstSector,
+                            Stream = new FileStream(DataPath, FileMode.Open),
+                            ProgressText = "Flashing partition Data (" + Count.ToString() + " / " + PartitionCount.ToString() + ")"
+                        };
+                        Parts.Add(Part);
+                        LogFile.Log("Partition name=Data, startsector=0x" + Target.FirstSector.ToString("X8") + ", sectorcount = 0x" + (Part.Stream.Length / 0x200).ToString("X8"), LogType.FileOnly);
+                    }
+
+                    // Do actual flashing!
+                    await LumiaV2CustomFlash(Notifier, null, false, false, Parts, true, ClearFlashingStatus, false, true, false, SetWorkingStatus, UpdateWorkingStatus, ExitSuccess, ExitFailure);
+                }
+                else
+                {
+                    LogFile.Log("Flash failed! No valid partitions found in the archive.", LogType.FileAndConsole);
+                    ExitFailure("Flash failed!", "No valid partitions found in the archive");
+                    return;
+                }
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex);
+                ExitFailure(Ex.Message, Ex is WPinternalsException ? ((WPinternalsException)Ex).SubMessage : null);
+                return;
+            }
+        }
+    }
+
+    internal static class UefiMemorySim
+    {
+        internal const UInt32 PageSize = 0x1000;
+
+        private static UInt32 CurrentBufferSize = 0;
+        public static byte[] Buffer;
+        private static readonly List<Allocation> Allocations = new();
+        private static readonly List<FreeMemRange> FreeMemRanges = new();
+
+        public static UInt32 RoundUpToPages(UInt32 Size)
+        {
+            UInt32 Result = Size + 0x18;
+            if ((Size % PageSize) != 0)
+            {
+                Size = ((Size / PageSize) + 1) * PageSize;
+            }
+
+            return Result;
+        }
+
+        public static void Reset()
+        {
+            CurrentBufferSize = 0;
+            Buffer = null;
+            Allocations.Clear();
+            FreeMemRanges.Clear();
+        }
+
+        private static void ExtendBuffer(UInt32 Size)
+        {
+            byte[] NewBuffer = new byte[CurrentBufferSize + Size];
+            if (CurrentBufferSize > 0)
+            {
+                System.Buffer.BlockCopy(Buffer, 0, NewBuffer, (int)Size, (int)CurrentBufferSize);
+            }
+
+            foreach (Allocation CurrentAllocation in Allocations)
+            {
+                CurrentAllocation.TotalStart += Size;
+                CurrentAllocation.TotalEnd += Size;
+                CurrentAllocation.HeadStart += Size;
+                CurrentAllocation.HeadEnd += Size;
+                CurrentAllocation.ContentStart += Size;
+                CurrentAllocation.ContentEnd += Size;
+                CurrentAllocation.TailStart += Size;
+                CurrentAllocation.TailEnd += Size;
+            }
+            foreach (FreeMemRange CurrentRange in FreeMemRanges)
+            {
+                CurrentRange.Start += Size;
+                CurrentRange.End += Size;
+            }
+            CurrentBufferSize += Size;
+            Buffer = NewBuffer;
+        }
+
+        internal static Allocation AllocatePages(UInt32 Size)
+        {
+            Allocation NewAllocation = null;
+
+            UInt32 TotalSize = Size;
+
+            if ((TotalSize % PageSize) != 0)
+            {
+                throw new NotSupportedException("Wrong allocation size");
+            }
+            else
+            {
+                for (int i = FreeMemRanges.Count - 1; i >= 0; i--)
+                {
+                    if (FreeMemRanges[i].Size >= TotalSize)
+                    {
+                        NewAllocation = new Allocation
+                        {
+                            TotalStart = FreeMemRanges[i].End - TotalSize + 1
+                        };
+
+                        if (FreeMemRanges[i].Size == TotalSize)
+                        {
+                            FreeMemRanges.RemoveAt(i);
+                        }
+                        else
+                        {
+                            FreeMemRanges[i].End -= TotalSize;
+                        }
+
+                        break;
+                    }
+                }
+
+                if (NewAllocation == null)
+                {
+                    uint FreeBuffer = Allocations.Count > 0 ? Allocations[0].TotalStart : CurrentBufferSize;
+                    if (FreeBuffer < TotalSize)
+                    {
+                        ExtendBuffer(TotalSize - FreeBuffer);
+                    }
+
+                    NewAllocation = new Allocation();
+
+                    if (Allocations.Count > 0)
+                    {
+                        NewAllocation.TotalStart = Allocations[0].TotalStart - TotalSize;
+                    }
+                    else
+                    {
+                        FreeBuffer = CurrentBufferSize - TotalSize;
+                    }
+                }
+
+                bool Added = false;
+                for (int i = 0; i < Allocations.Count; i++)
+                {
+                    if (NewAllocation.TotalStart < Allocations[i].TotalStart)
+                    {
+                        Allocations.Insert(i, NewAllocation);
+                        Added = true;
+                        break;
+                    }
+                }
+                if (!Added)
+                {
+                    Allocations.Add(NewAllocation);
+                }
+            }
+
+            return NewAllocation;
+        }
+
+        internal static Allocation AllocatePool(UInt32 Size)
+        {
+            Allocation NewAllocation = null;
+
+            UInt32 TotalSize = Size + 24;
+
+            if (TotalSize < PageSize)
+            {
+                throw new NotSupportedException("Allocation of small memory area's is not supported by this UEFI memory management simulator");
+            }
+            else
+            {
+                if ((TotalSize % PageSize) != 0)
+                {
+                    TotalSize = ((TotalSize / PageSize) + 1) * PageSize;
+                }
+
+                for (int i = FreeMemRanges.Count - 1; i >= 0; i--)
+                {
+                    if (FreeMemRanges[i].Size >= TotalSize)
+                    {
+                        NewAllocation = new Allocation
+                        {
+                            TotalStart = FreeMemRanges[i].End - TotalSize + 1
+                        };
+
+                        if (FreeMemRanges[i].Size == TotalSize)
+                        {
+                            FreeMemRanges.RemoveAt(i);
+                        }
+                        else
+                        {
+                            FreeMemRanges[i].End -= TotalSize;
+                        }
+
+                        break;
+                    }
+                }
+
+                if (NewAllocation == null)
+                {
+                    uint FreeBuffer = Allocations.Count > 0 ? Allocations[0].TotalStart : CurrentBufferSize;
+                    if (FreeBuffer < TotalSize)
+                    {
+                        ExtendBuffer(TotalSize - FreeBuffer);
+                    }
+
+                    NewAllocation = new Allocation();
+
+                    if (Allocations.Count > 0)
+                    {
+                        NewAllocation.TotalStart = Allocations[0].TotalStart - TotalSize;
+                    }
+                    else
+                    {
+                        FreeBuffer = CurrentBufferSize - TotalSize;
+                    }
+                }
+
+                NewAllocation.TotalEnd = NewAllocation.TotalStart + TotalSize - 1;
+                NewAllocation.HeadStart = NewAllocation.TotalStart;
+                NewAllocation.HeadEnd = NewAllocation.HeadStart + 16 - 1;
+                NewAllocation.ContentStart = NewAllocation.HeadEnd + 1;
+                NewAllocation.ContentEnd = NewAllocation.ContentStart + Size - 1;
+                NewAllocation.TailStart = NewAllocation.ContentEnd + 1;
+                NewAllocation.TailEnd = NewAllocation.TailStart + 8 - 1;
+
+                ByteOperations.WriteAsciiString(Buffer, NewAllocation.HeadStart + 0x00, "phd0");
+
+                // Correct value here is: Size + 24
+                // Wrong value is: TotalSize
+                // Having correct value avoids memory errors and phone can reboot normally, but NV vars might be written (and that will overwrite the NV vars we wrote ourselves).
+                // Wrong value will make phone reboot to emergency boot and it makes the phone crash when you want to flash in multiple phases, but it will avoid writing NV vars.
+                ByteOperations.WriteUInt32(Buffer, NewAllocation.HeadStart + 0x04, Size + 24);
+
+                ByteOperations.WriteUInt32(Buffer, NewAllocation.HeadStart + 0x08, 0x04); // EfiBootServicesData = 0x04
+                ByteOperations.WriteUInt32(Buffer, NewAllocation.HeadStart + 0x0C, 0x00); // Reserved
+
+                ByteOperations.WriteAsciiString(Buffer, NewAllocation.TailStart + 0x00, "ptal");
+
+                // Correct value here is: Size + 24
+                // Wrong value is: TotalSize
+                // Having correct value avoids memory errors and phone can reboot normally, but NV vars might be written (and that will overwrite the NV vars we wrote ourselves).
+                // Wrong value will make phone reboot to emergency boot and it makes the phone crash when you want to flash in multiple phases, but it will avoid writing NV vars.
+                ByteOperations.WriteUInt32(Buffer, NewAllocation.TailStart + 0x04, Size + 24);
+
+                bool Added = false;
+                for (int i = 0; i < Allocations.Count; i++)
+                {
+                    if (NewAllocation.TotalStart < Allocations[i].TotalStart)
+                    {
+                        Allocations.Insert(i, NewAllocation);
+                        Added = true;
+                        break;
+                    }
+                }
+                if (!Added)
+                {
+                    Allocations.Add(NewAllocation);
+                }
+            }
+
+            return NewAllocation;
+        }
+
+        internal static void FreePool(Allocation Allocation)
+        {
+            if (Allocations.Contains(Allocation))
+            {
+                Allocations.Remove(Allocation);
+
+                if (Allocations.Count == 0)
+                {
+                    FreeMemRanges.Clear();
+                }
+                else
+                {
+                    FreeMemRange NewFreeRange = new();
+                    NewFreeRange.Start = Allocation.TotalStart;
+                    NewFreeRange.End = Allocation.TotalEnd;
+
+                    bool Added = false;
+                    int i;
+                    for (i = 0; i < FreeMemRanges.Count; i++)
+                    {
+                        if (NewFreeRange.Start < FreeMemRanges[i].Start)
+                        {
+                            FreeMemRanges.Insert(i, NewFreeRange);
+                            Added = true;
+                            break;
+                        }
+                    }
+                    if (!Added)
+                    {
+                        FreeMemRanges.Add(NewFreeRange);
+                        i = FreeMemRanges.Count;
+                    }
+
+                    if ((i > 0) && (FreeMemRanges[i].Start == (FreeMemRanges[i - 1].End + 1)))
+                    {
+                        FreeMemRanges[i - 1].End = FreeMemRanges[i].End;
+                        FreeMemRanges.RemoveAt(i);
+                        i--;
+                    }
+
+                    if ((i < (FreeMemRanges.Count - 1)) && (FreeMemRanges[i].End == (FreeMemRanges[i - 1].Start - 1)))
+                    {
+                        FreeMemRanges[i].End = FreeMemRanges[i + 1].End;
+                        FreeMemRanges.RemoveAt(i + 1);
+                    }
+
+                    if ((Allocations.Count > 0) && (FreeMemRanges[i].Start < Allocations[0].TotalStart))
+                    {
+                        FreeMemRanges.RemoveAt(i);
+                    }
+                }
+            }
+        }
+    }
+
+    internal class Allocation
+    {
+        public UInt32 TotalStart;
+        public UInt32 TotalEnd;
+        public UInt32 ContentStart;
+        public UInt32 ContentEnd;
+        public UInt32 HeadStart;
+        public UInt32 HeadEnd;
+        public UInt32 TailStart;
+        public UInt32 TailEnd;
+
+        public UInt32 TotalSize
+        {
+            get
+            {
+                return TotalEnd - TotalStart + 1;
+            }
+        }
+
+        public UInt32 ContentSize
+        {
+            get
+            {
+                return ContentEnd - ContentStart + 1;
+            }
+        }
+
+        public void CopyFromThisAllocation(UInt32 ContentOffset, UInt32 Size, byte[] Destination, UInt32 DestinationOffset)
+        {
+            Buffer.BlockCopy(UefiMemorySim.Buffer, (int)(ContentStart + ContentOffset), Destination, (int)DestinationOffset, (int)Size);
+        }
+
+        public void CopyToThisAllocation(byte[] Source, UInt32 SourceOffset, UInt32 Size, UInt32 ContentOffset)
+        {
+            Buffer.BlockCopy(Source, (int)SourceOffset, UefiMemorySim.Buffer, (int)(ContentStart + ContentOffset), (int)Size);
+        }
+    }
+
+    internal class FreeMemRange
+    {
+        public UInt32 Start;
+        public UInt32 End;
+
+        public UInt32 Size
+        {
+            get
+            {
+                return End - Start + 1;
+            }
+        }
+    }
+
+    internal class FlashPart
+    {
+        public string ProgressText;
+        public UInt32 StartSector;
+        public Stream Stream;
+    }
+}
diff --git a/ViewModels/LumiaV3FlashRomViewModel.cs b/WPinternals/ViewModels/LumiaV3FlashRomViewModel.cs
similarity index 100%
rename from ViewModels/LumiaV3FlashRomViewModel.cs
rename to WPinternals/ViewModels/LumiaV3FlashRomViewModel.cs
diff --git a/ViewModels/MainViewModel.cs b/WPinternals/ViewModels/MainViewModel.cs
similarity index 97%
rename from ViewModels/MainViewModel.cs
rename to WPinternals/ViewModels/MainViewModel.cs
index f49dd96..c643abf 100644
--- a/ViewModels/MainViewModel.cs
+++ b/WPinternals/ViewModels/MainViewModel.cs
@@ -1,485 +1,485 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using Microsoft.Win32;
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace WPinternals
-{
-    public enum NavigationSubject
-    {
-        Info,
-        Mode,
-        Install,
-        About
-    };
-
-    public enum PhoneInterfaces
-    {
-        Lumia_Normal,
-        Lumia_Flash,
-        Lumia_Label,
-        Lumia_MassStorage,
-        Lumia_Bootloader,
-        Qualcomm_Download,
-        Qualcomm_Flash,
-        Lumia_BadMassStorage
-    };
-
-    // Create this class on the UI thread, after the main-window of the application is initialized.
-    // It is necessary to create the object on the UI thread, because notification events to the View need to be fired on that thread.
-    // The Model for this ViewModel communicates over USB and for that it uses the hWnd of the main window.
-    // Therefore the main window must be created before the ViewModel is created.
-    internal class MainViewModel : INotifyPropertyChanged
-    {
-        public PhoneInterfaces? CurrentInterface = null;
-        public PhoneInterfaces? LastInterface = null;
-        public NokiaPhoneModel CurrentModel = null;
-        public PhoneNotifierViewModel PhoneNotifier;
-        public LumiaInfoViewModel InfoViewModel;
-        public LumiaModeViewModel ModeViewModel;
-        public LumiaUnlockBootViewModel BootUnlockViewModel;
-        public LumiaUnlockBootViewModel BootRestoreViewModel;
-        public LumiaUnlockRootViewModel RootUnlockViewModel;
-        public LumiaUnlockRootViewModel RootRestoreViewModel;
-        public BackupViewModel BackupViewModel;
-        public RestoreViewModel RestoreViewModel;
-        public LumiaFlashRomViewModel LumiaFlashRomViewModel;
-        public DumpRomViewModel DumpRomViewModel;
-        public DownloadsViewModel DownloadsViewModel;
-        private GettingStartedViewModel _GettingStartedViewModel = null;
-
-        public event PropertyChangedEventHandler PropertyChanged;
-        private void OnPropertyChanged(string propertyName)
-        {
-            if (this.PropertyChanged != null)
-            {
-                if (MainSyncContext == SynchronizationContext.Current)
-                {
-                    PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-                }
-                else
-                {
-                    MainSyncContext.Post(s => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
-                }
-            }
-        }
-
-        private ContextViewModel _ContextViewModel;
-        public ContextViewModel ContextViewModel
-        {
-            get
-            {
-                return _ContextViewModel;
-            }
-            set
-            {
-                if (_ContextViewModel != value)
-                {
-                    if (_ContextViewModel != null)
-                    {
-                        _ContextViewModel.IsActive = false;
-                    }
-
-                    _ContextViewModel = value;
-                    _ContextViewModel?.Activate();
-                    OnPropertyChanged(nameof(ContextViewModel));
-                }
-            }
-        }
-
-        private readonly SynchronizationContext MainSyncContext;
-
-        public MainViewModel()
-        {
-            MainSyncContext = SynchronizationContext.Current;
-
-            LogFile.LogApplicationVersion();
-
-            // Set global callback for cases where Dependency Injection is not possible.
-            App.NavigateToGettingStarted = () => GettingStartedCommand.Execute(null);
-            App.NavigateToUnlockBoot = () => BootUnlockCommand.Execute(null);
-
-            if (Registry.CurrentUser.OpenSubKey("Software\\WPInternals") == null)
-            {
-                Registry.CurrentUser.OpenSubKey("Software", true).CreateSubKey("WPInternals");
-            }
-
-            if (Registration.IsPrerelease && (Registry.CurrentUser.OpenSubKey("Software\\WPInternals").GetValue("NdaAccepted") == null))
-            {
-                this.ContextViewModel = new DisclaimerAndNdaViewModel(Disclaimer_Accepted);
-            }
-            else if (Registry.CurrentUser.OpenSubKey("Software\\WPInternals").GetValue("DisclaimerAccepted") == null)
-            {
-                this.ContextViewModel = new DisclaimerViewModel(Disclaimer_Accepted);
-            }
-            else if (Registration.IsPrerelease && !Registration.IsRegistered())
-            {
-                ContextViewModel = new RegistrationViewModel(Registration_Completed, Registration_Failed);
-            }
-            else
-            {
-                StartOperation();
-            }
-        }
-
-        private void Disclaimer_Accepted()
-        {
-            ContextViewModel = null;
-
-            if (Registration.IsPrerelease && !Registration.IsRegistered())
-            {
-                ContextViewModel = new RegistrationViewModel(Registration_Completed, Registration_Failed);
-            }
-            else
-            {
-                StartOperation();
-            }
-        }
-
-        private void Registration_Completed()
-        {
-            ContextViewModel = null;
-            StartOperation();
-        }
-
-        private void Registration_Failed()
-        {
-            ContextViewModel = new MessageViewModel("Registration failed", () => Environment.Exit(0));
-            ((MessageViewModel)ContextViewModel).SubMessage = "Check your filewall settings";
-        }
-
-        public void StartOperation()
-        {
-            IsMenuEnabled = true;
-
-            _GettingStartedViewModel = new GettingStartedViewModel(
-                () =>
-                {
-                    ContextViewModel = new DisclaimerViewModel(
-                        () => ContextViewModel = _GettingStartedViewModel
-                        );
-                },
-                SwitchToUnlockBoot,
-                SwitchToUnlockRoot,
-                SwitchToBackup,
-                SwitchToDumpFFU,
-                SwitchToFlashRom,
-                SwitchToDownload
-            );
-            this.ContextViewModel = _GettingStartedViewModel;
-
-            PhoneNotifier = new PhoneNotifierViewModel();
-            PhoneNotifier.NewDeviceArrived += PhoneNotifier_NewDeviceArrived;
-            PhoneNotifier.DeviceRemoved += PhoneNotifier_DeviceRemoved;
-
-            InfoViewModel = new LumiaInfoViewModel(PhoneNotifier, (TargetInterface) =>
-            {
-                ModeViewModel.OnModeSwitchRequested(TargetInterface);
-                ContextViewModel = ModeViewModel;
-            },
-            () => ContextViewModel = _GettingStartedViewModel);
-            InfoViewModel.ActivateSubContext(null);
-
-            ModeViewModel = new LumiaModeViewModel(PhoneNotifier, SwitchToInfoViewModel);
-            ModeViewModel.ActivateSubContext(null);
-
-            BootUnlockViewModel = new LumiaUnlockBootViewModel(PhoneNotifier, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, true, SwitchToInfoViewModel);
-            BootUnlockViewModel.ActivateSubContext(null);
-
-            BootRestoreViewModel = new LumiaUnlockBootViewModel(PhoneNotifier, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, false, SwitchToInfoViewModel);
-            BootRestoreViewModel.ActivateSubContext(null);
-
-            RootUnlockViewModel = new LumiaUnlockRootViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpFFU, SwitchToFlashRom, true, SwitchToInfoViewModel);
-            RootUnlockViewModel.ActivateSubContext(null);
-
-            RootRestoreViewModel = new LumiaUnlockRootViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpFFU, SwitchToFlashRom, false, SwitchToInfoViewModel);
-            RootRestoreViewModel.ActivateSubContext(null);
-
-            BackupViewModel = new BackupViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToInfoViewModel);
-            BackupViewModel.ActivateSubContext(null);
-
-            RestoreViewModel = new RestoreViewModel(PhoneNotifier, SwitchToDifferentInterface, SwitchToUnlockBoot, SwitchToFlashRom, SwitchToInfoViewModel);
-            RestoreViewModel.ActivateSubContext(null);
-
-            LumiaFlashRomViewModel = new LumiaFlashRomViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToUnlockRoot, SwitchToDumpFFU, SwitchToBackup, SwitchToInfoViewModel);
-            LumiaFlashRomViewModel.ActivateSubContext(null);
-
-            DumpRomViewModel = new DumpRomViewModel(SwitchToUnlockBoot, SwitchToUnlockRoot, SwitchToFlashRom);
-            DumpRomViewModel.ActivateSubContext(null);
-
-            DownloadsViewModel = new DownloadsViewModel(PhoneNotifier);
-            App.DownloadManager = DownloadsViewModel;
-
-            PhoneNotifier.Start();
-        }
-
-        internal void SwitchToInfoViewModel()
-        {
-            ContextViewModel = InfoViewModel;
-        }
-
-        internal void SwitchToUnlockBoot()
-        {
-            ContextViewModel = BootUnlockViewModel;
-        }
-
-        internal void SwitchToRestoreBoot()
-        {
-            ContextViewModel = BootRestoreViewModel;
-        }
-
-        internal void SwitchToUnlockRoot()
-        {
-            ContextViewModel = RootUnlockViewModel;
-        }
-
-        internal void SwitchToUndoRoot()
-        {
-            ContextViewModel = RootRestoreViewModel;
-        }
-
-        internal void SwitchToBackup()
-        {
-            ContextViewModel = BackupViewModel;
-        }
-
-        internal void SwitchToFlashRom()
-        {
-            ContextViewModel = LumiaFlashRomViewModel;
-        }
-
-        internal void SwitchToDumpFFU()
-        {
-            ContextViewModel = DumpRomViewModel;
-        }
-
-        internal void SwitchToDownload()
-        {
-            ContextViewModel = DownloadsViewModel;
-        }
-
-        internal void SwitchToDifferentInterface(PhoneInterfaces TargetInterface)
-        {
-            ModeViewModel.OnModeSwitchRequested(TargetInterface);
-            ContextViewModel = ModeViewModel;
-        }
-
-        private void PhoneNotifier_DeviceRemoved()
-        {
-            InfoViewModel.ActivateSubContext(null);
-        }
-
-        private void PhoneNotifier_NewDeviceArrived(ArrivalEventArgs Args)
-        {
-            PhoneInterfaces? PreviousInterface = LastInterface;
-            LastInterface = Args.NewInterface;
-
-            if (App.InterruptBoot && (Args.NewInterface == PhoneInterfaces.Lumia_Bootloader))
-            {
-                App.InterruptBoot = false;
-                LogFile.Log("Found Lumia BootMgr and user forced to interrupt the boot process. Force to Flash-mode.");
-                Task.Run(() => SwitchModeViewModel.SwitchTo(PhoneNotifier, PhoneInterfaces.Lumia_Flash));
-            }
-            else
-            {
-                if (Args.NewInterface != PhoneInterfaces.Qualcomm_Download)
-                {
-                    App.InterruptBoot = false;
-                }
-
-                if (ContextViewModel == null)
-                {
-                    ContextViewModel = InfoViewModel;
-                }
-                else if (ContextViewModel.IsFlashModeOperation)
-                {
-                    if ((!ContextViewModel.IsSwitchingInterface) && (Args.NewInterface == PhoneInterfaces.Lumia_Bootloader))
-                    {
-                        // The current screen is marked as "Flash operation".
-                        // When the bootloader is detected at this stage, it means a phone is booting and
-                        // it is possible that the phone is in a non-booting stage (not possible to boot past UEFI).
-                        // We will try to boot straight to Flash-mode, so that it will be possible to flash a new ROM.
-                        LogFile.Log("Found Lumia BootMgr while mode is not being switched. Screen is marked as Flash Operation. Force to Flash-mode.");
-                        Task.Run(() => SwitchModeViewModel.SwitchTo(PhoneNotifier, PhoneInterfaces.Lumia_Flash));
-                    }
-                }
-                else
-                {
-                    if ((!ContextViewModel.IsSwitchingInterface) && (Args.NewInterface != PhoneInterfaces.Lumia_Bootloader))
-                    {
-                        ContextViewModel = InfoViewModel;
-                    }
-                }
-            }
-        }
-
-        private ICommand _InfoCommand = null;
-        public ICommand InfoCommand
-        {
-            get
-            {
-                return _InfoCommand ??= new DelegateCommand(() => ContextViewModel = InfoViewModel);
-            }
-        }
-
-        private ICommand _ModeCommand = null;
-        public ICommand ModeCommand
-        {
-            get
-            {
-                return _ModeCommand ??= new DelegateCommand(() => ContextViewModel = ModeViewModel);
-            }
-        }
-
-        private ICommand _BootUnlockCommand = null;
-        public ICommand BootUnlockCommand
-        {
-            get
-            {
-                return _BootUnlockCommand ??= new DelegateCommand(() => ContextViewModel = BootUnlockViewModel);
-            }
-        }
-
-        private ICommand _BootRestoreCommand = null;
-        public ICommand BootRestoreCommand
-        {
-            get
-            {
-                return _BootRestoreCommand ??= new DelegateCommand(() => ContextViewModel = BootRestoreViewModel);
-            }
-        }
-
-        private ICommand _RootUnlockCommand = null;
-        public ICommand RootUnlockCommand
-        {
-            get
-            {
-                return _RootUnlockCommand ??= new DelegateCommand(() => ContextViewModel = RootUnlockViewModel);
-            }
-        }
-
-        private ICommand _RootUndoCommand = null;
-        public ICommand RootUndoCommand
-        {
-            get
-            {
-                return _RootUndoCommand ??= new DelegateCommand(() => ContextViewModel = RootRestoreViewModel);
-            }
-        }
-
-        private ICommand _BackupCommand = null;
-        public ICommand BackupCommand
-        {
-            get
-            {
-                return _BackupCommand ??= new DelegateCommand(() => ContextViewModel = BackupViewModel);
-            }
-        }
-
-        private ICommand _RestoreCommand = null;
-        public ICommand RestoreCommand
-        {
-            get
-            {
-                return _RestoreCommand ??= new DelegateCommand(() => ContextViewModel = RestoreViewModel);
-            }
-        }
-
-        private ICommand _LumiaFlashRomCommand = null;
-        public ICommand LumiaFlashRomCommand
-        {
-            get
-            {
-                return _LumiaFlashRomCommand ??= new DelegateCommand(() => ContextViewModel = LumiaFlashRomViewModel);
-            }
-        }
-
-        private ICommand _DumpRomCommand = null;
-        public ICommand DumpRomCommand
-        {
-            get
-            {
-                return _DumpRomCommand ??= new DelegateCommand(() => ContextViewModel = DumpRomViewModel);
-            }
-        }
-
-        private ICommand _AboutCommand = null;
-        public ICommand AboutCommand
-        {
-            get
-            {
-                return _AboutCommand ??= new DelegateCommand(() => ContextViewModel = new AboutViewModel());
-            }
-        }
-
-        private ICommand _DonateCommand = null;
-        public ICommand DonateCommand
-        {
-            get
-            {
-                return _DonateCommand ??= new DelegateCommand(() =>
-                {
-                    Process process = new();
-                    process.StartInfo.UseShellExecute = true;
-                    process.StartInfo.FileName = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=VY8N7BCBT9CS4";
-                    process.Start();
-                });
-            }
-        }
-
-        private ICommand _GettingStartedCommand = null;
-        public ICommand GettingStartedCommand
-        {
-            get
-            {
-                return _GettingStartedCommand ??= new DelegateCommand(() => ContextViewModel = _GettingStartedViewModel);
-            }
-        }
-
-        private ICommand _DownloadCommand = null;
-        public ICommand DownloadCommand
-        {
-            get
-            {
-                return _DownloadCommand ??= new DelegateCommand(() => ContextViewModel = DownloadsViewModel);
-            }
-        }
-
-        private bool _IsMenuEnabled = false;
-        public bool IsMenuEnabled
-        {
-            get
-            {
-                return _IsMenuEnabled;
-            }
-            set
-            {
-                _IsMenuEnabled = value;
-                OnPropertyChanged(nameof(IsMenuEnabled));
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using Microsoft.Win32;
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace WPinternals
+{
+    public enum NavigationSubject
+    {
+        Info,
+        Mode,
+        Install,
+        About
+    };
+
+    public enum PhoneInterfaces
+    {
+        Lumia_Normal,
+        Lumia_Flash,
+        Lumia_Label,
+        Lumia_MassStorage,
+        Lumia_Bootloader,
+        Qualcomm_Download,
+        Qualcomm_Flash,
+        Lumia_BadMassStorage
+    };
+
+    // Create this class on the UI thread, after the main-window of the application is initialized.
+    // It is necessary to create the object on the UI thread, because notification events to the View need to be fired on that thread.
+    // The Model for this ViewModel communicates over USB and for that it uses the hWnd of the main window.
+    // Therefore the main window must be created before the ViewModel is created.
+    internal class MainViewModel : INotifyPropertyChanged
+    {
+        public PhoneInterfaces? CurrentInterface = null;
+        public PhoneInterfaces? LastInterface = null;
+        public NokiaPhoneModel CurrentModel = null;
+        public PhoneNotifierViewModel PhoneNotifier;
+        public LumiaInfoViewModel InfoViewModel;
+        public LumiaModeViewModel ModeViewModel;
+        public LumiaUnlockBootViewModel BootUnlockViewModel;
+        public LumiaUnlockBootViewModel BootRestoreViewModel;
+        public LumiaUnlockRootViewModel RootUnlockViewModel;
+        public LumiaUnlockRootViewModel RootRestoreViewModel;
+        public BackupViewModel BackupViewModel;
+        public RestoreViewModel RestoreViewModel;
+        public LumiaFlashRomViewModel LumiaFlashRomViewModel;
+        public DumpRomViewModel DumpRomViewModel;
+        public DownloadsViewModel DownloadsViewModel;
+        private GettingStartedViewModel _GettingStartedViewModel = null;
+
+        public event PropertyChangedEventHandler PropertyChanged;
+        private void OnPropertyChanged(string propertyName)
+        {
+            if (this.PropertyChanged != null)
+            {
+                if (MainSyncContext == SynchronizationContext.Current)
+                {
+                    PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+                }
+                else
+                {
+                    MainSyncContext.Post(s => PropertyChanged(this, new PropertyChangedEventArgs(propertyName)), null);
+                }
+            }
+        }
+
+        private ContextViewModel _ContextViewModel;
+        public ContextViewModel ContextViewModel
+        {
+            get
+            {
+                return _ContextViewModel;
+            }
+            set
+            {
+                if (_ContextViewModel != value)
+                {
+                    if (_ContextViewModel != null)
+                    {
+                        _ContextViewModel.IsActive = false;
+                    }
+
+                    _ContextViewModel = value;
+                    _ContextViewModel?.Activate();
+                    OnPropertyChanged(nameof(ContextViewModel));
+                }
+            }
+        }
+
+        private readonly SynchronizationContext MainSyncContext;
+
+        public MainViewModel()
+        {
+            MainSyncContext = SynchronizationContext.Current;
+
+            LogFile.LogApplicationVersion();
+
+            // Set global callback for cases where Dependency Injection is not possible.
+            App.NavigateToGettingStarted = () => GettingStartedCommand.Execute(null);
+            App.NavigateToUnlockBoot = () => BootUnlockCommand.Execute(null);
+
+            if (Registry.CurrentUser.OpenSubKey("Software\\WPInternals") == null)
+            {
+                Registry.CurrentUser.OpenSubKey("Software", true).CreateSubKey("WPInternals");
+            }
+
+            if (Registration.IsPrerelease && (Registry.CurrentUser.OpenSubKey("Software\\WPInternals").GetValue("NdaAccepted") == null))
+            {
+                this.ContextViewModel = new DisclaimerAndNdaViewModel(Disclaimer_Accepted);
+            }
+            else if (Registry.CurrentUser.OpenSubKey("Software\\WPInternals").GetValue("DisclaimerAccepted") == null)
+            {
+                this.ContextViewModel = new DisclaimerViewModel(Disclaimer_Accepted);
+            }
+            else if (Registration.IsPrerelease && !Registration.IsRegistered())
+            {
+                ContextViewModel = new RegistrationViewModel(Registration_Completed, Registration_Failed);
+            }
+            else
+            {
+                StartOperation();
+            }
+        }
+
+        private void Disclaimer_Accepted()
+        {
+            ContextViewModel = null;
+
+            if (Registration.IsPrerelease && !Registration.IsRegistered())
+            {
+                ContextViewModel = new RegistrationViewModel(Registration_Completed, Registration_Failed);
+            }
+            else
+            {
+                StartOperation();
+            }
+        }
+
+        private void Registration_Completed()
+        {
+            ContextViewModel = null;
+            StartOperation();
+        }
+
+        private void Registration_Failed()
+        {
+            ContextViewModel = new MessageViewModel("Registration failed", () => Environment.Exit(0));
+            ((MessageViewModel)ContextViewModel).SubMessage = "Check your filewall settings";
+        }
+
+        public void StartOperation()
+        {
+            IsMenuEnabled = true;
+
+            _GettingStartedViewModel = new GettingStartedViewModel(
+                () =>
+                {
+                    ContextViewModel = new DisclaimerViewModel(
+                        () => ContextViewModel = _GettingStartedViewModel
+                        );
+                },
+                SwitchToUnlockBoot,
+                SwitchToUnlockRoot,
+                SwitchToBackup,
+                SwitchToDumpFFU,
+                SwitchToFlashRom,
+                SwitchToDownload
+            );
+            this.ContextViewModel = _GettingStartedViewModel;
+
+            PhoneNotifier = new PhoneNotifierViewModel();
+            PhoneNotifier.NewDeviceArrived += PhoneNotifier_NewDeviceArrived;
+            PhoneNotifier.DeviceRemoved += PhoneNotifier_DeviceRemoved;
+
+            InfoViewModel = new LumiaInfoViewModel(PhoneNotifier, (TargetInterface) =>
+            {
+                ModeViewModel.OnModeSwitchRequested(TargetInterface);
+                ContextViewModel = ModeViewModel;
+            },
+            () => ContextViewModel = _GettingStartedViewModel);
+            InfoViewModel.ActivateSubContext(null);
+
+            ModeViewModel = new LumiaModeViewModel(PhoneNotifier, SwitchToInfoViewModel);
+            ModeViewModel.ActivateSubContext(null);
+
+            BootUnlockViewModel = new LumiaUnlockBootViewModel(PhoneNotifier, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, true, SwitchToInfoViewModel);
+            BootUnlockViewModel.ActivateSubContext(null);
+
+            BootRestoreViewModel = new LumiaUnlockBootViewModel(PhoneNotifier, SwitchToFlashRom, SwitchToUndoRoot, SwitchToDownload, false, SwitchToInfoViewModel);
+            BootRestoreViewModel.ActivateSubContext(null);
+
+            RootUnlockViewModel = new LumiaUnlockRootViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpFFU, SwitchToFlashRom, true, SwitchToInfoViewModel);
+            RootUnlockViewModel.ActivateSubContext(null);
+
+            RootRestoreViewModel = new LumiaUnlockRootViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToDumpFFU, SwitchToFlashRom, false, SwitchToInfoViewModel);
+            RootRestoreViewModel.ActivateSubContext(null);
+
+            BackupViewModel = new BackupViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToInfoViewModel);
+            BackupViewModel.ActivateSubContext(null);
+
+            RestoreViewModel = new RestoreViewModel(PhoneNotifier, SwitchToDifferentInterface, SwitchToUnlockBoot, SwitchToFlashRom, SwitchToInfoViewModel);
+            RestoreViewModel.ActivateSubContext(null);
+
+            LumiaFlashRomViewModel = new LumiaFlashRomViewModel(PhoneNotifier, SwitchToUnlockBoot, SwitchToUnlockRoot, SwitchToDumpFFU, SwitchToBackup, SwitchToInfoViewModel);
+            LumiaFlashRomViewModel.ActivateSubContext(null);
+
+            DumpRomViewModel = new DumpRomViewModel(SwitchToUnlockBoot, SwitchToUnlockRoot, SwitchToFlashRom);
+            DumpRomViewModel.ActivateSubContext(null);
+
+            DownloadsViewModel = new DownloadsViewModel(PhoneNotifier);
+            App.DownloadManager = DownloadsViewModel;
+
+            PhoneNotifier.Start();
+        }
+
+        internal void SwitchToInfoViewModel()
+        {
+            ContextViewModel = InfoViewModel;
+        }
+
+        internal void SwitchToUnlockBoot()
+        {
+            ContextViewModel = BootUnlockViewModel;
+        }
+
+        internal void SwitchToRestoreBoot()
+        {
+            ContextViewModel = BootRestoreViewModel;
+        }
+
+        internal void SwitchToUnlockRoot()
+        {
+            ContextViewModel = RootUnlockViewModel;
+        }
+
+        internal void SwitchToUndoRoot()
+        {
+            ContextViewModel = RootRestoreViewModel;
+        }
+
+        internal void SwitchToBackup()
+        {
+            ContextViewModel = BackupViewModel;
+        }
+
+        internal void SwitchToFlashRom()
+        {
+            ContextViewModel = LumiaFlashRomViewModel;
+        }
+
+        internal void SwitchToDumpFFU()
+        {
+            ContextViewModel = DumpRomViewModel;
+        }
+
+        internal void SwitchToDownload()
+        {
+            ContextViewModel = DownloadsViewModel;
+        }
+
+        internal void SwitchToDifferentInterface(PhoneInterfaces TargetInterface)
+        {
+            ModeViewModel.OnModeSwitchRequested(TargetInterface);
+            ContextViewModel = ModeViewModel;
+        }
+
+        private void PhoneNotifier_DeviceRemoved()
+        {
+            InfoViewModel.ActivateSubContext(null);
+        }
+
+        private void PhoneNotifier_NewDeviceArrived(ArrivalEventArgs Args)
+        {
+            PhoneInterfaces? PreviousInterface = LastInterface;
+            LastInterface = Args.NewInterface;
+
+            if (App.InterruptBoot && (Args.NewInterface == PhoneInterfaces.Lumia_Bootloader))
+            {
+                App.InterruptBoot = false;
+                LogFile.Log("Found Lumia BootMgr and user forced to interrupt the boot process. Force to Flash-mode.");
+                Task.Run(() => SwitchModeViewModel.SwitchTo(PhoneNotifier, PhoneInterfaces.Lumia_Flash));
+            }
+            else
+            {
+                if (Args.NewInterface != PhoneInterfaces.Qualcomm_Download)
+                {
+                    App.InterruptBoot = false;
+                }
+
+                if (ContextViewModel == null)
+                {
+                    ContextViewModel = InfoViewModel;
+                }
+                else if (ContextViewModel.IsFlashModeOperation)
+                {
+                    if ((!ContextViewModel.IsSwitchingInterface) && (Args.NewInterface == PhoneInterfaces.Lumia_Bootloader))
+                    {
+                        // The current screen is marked as "Flash operation".
+                        // When the bootloader is detected at this stage, it means a phone is booting and
+                        // it is possible that the phone is in a non-booting stage (not possible to boot past UEFI).
+                        // We will try to boot straight to Flash-mode, so that it will be possible to flash a new ROM.
+                        LogFile.Log("Found Lumia BootMgr while mode is not being switched. Screen is marked as Flash Operation. Force to Flash-mode.");
+                        Task.Run(() => SwitchModeViewModel.SwitchTo(PhoneNotifier, PhoneInterfaces.Lumia_Flash));
+                    }
+                }
+                else
+                {
+                    if ((!ContextViewModel.IsSwitchingInterface) && (Args.NewInterface != PhoneInterfaces.Lumia_Bootloader))
+                    {
+                        ContextViewModel = InfoViewModel;
+                    }
+                }
+            }
+        }
+
+        private ICommand _InfoCommand = null;
+        public ICommand InfoCommand
+        {
+            get
+            {
+                return _InfoCommand ??= new DelegateCommand(() => ContextViewModel = InfoViewModel);
+            }
+        }
+
+        private ICommand _ModeCommand = null;
+        public ICommand ModeCommand
+        {
+            get
+            {
+                return _ModeCommand ??= new DelegateCommand(() => ContextViewModel = ModeViewModel);
+            }
+        }
+
+        private ICommand _BootUnlockCommand = null;
+        public ICommand BootUnlockCommand
+        {
+            get
+            {
+                return _BootUnlockCommand ??= new DelegateCommand(() => ContextViewModel = BootUnlockViewModel);
+            }
+        }
+
+        private ICommand _BootRestoreCommand = null;
+        public ICommand BootRestoreCommand
+        {
+            get
+            {
+                return _BootRestoreCommand ??= new DelegateCommand(() => ContextViewModel = BootRestoreViewModel);
+            }
+        }
+
+        private ICommand _RootUnlockCommand = null;
+        public ICommand RootUnlockCommand
+        {
+            get
+            {
+                return _RootUnlockCommand ??= new DelegateCommand(() => ContextViewModel = RootUnlockViewModel);
+            }
+        }
+
+        private ICommand _RootUndoCommand = null;
+        public ICommand RootUndoCommand
+        {
+            get
+            {
+                return _RootUndoCommand ??= new DelegateCommand(() => ContextViewModel = RootRestoreViewModel);
+            }
+        }
+
+        private ICommand _BackupCommand = null;
+        public ICommand BackupCommand
+        {
+            get
+            {
+                return _BackupCommand ??= new DelegateCommand(() => ContextViewModel = BackupViewModel);
+            }
+        }
+
+        private ICommand _RestoreCommand = null;
+        public ICommand RestoreCommand
+        {
+            get
+            {
+                return _RestoreCommand ??= new DelegateCommand(() => ContextViewModel = RestoreViewModel);
+            }
+        }
+
+        private ICommand _LumiaFlashRomCommand = null;
+        public ICommand LumiaFlashRomCommand
+        {
+            get
+            {
+                return _LumiaFlashRomCommand ??= new DelegateCommand(() => ContextViewModel = LumiaFlashRomViewModel);
+            }
+        }
+
+        private ICommand _DumpRomCommand = null;
+        public ICommand DumpRomCommand
+        {
+            get
+            {
+                return _DumpRomCommand ??= new DelegateCommand(() => ContextViewModel = DumpRomViewModel);
+            }
+        }
+
+        private ICommand _AboutCommand = null;
+        public ICommand AboutCommand
+        {
+            get
+            {
+                return _AboutCommand ??= new DelegateCommand(() => ContextViewModel = new AboutViewModel());
+            }
+        }
+
+        private ICommand _DonateCommand = null;
+        public ICommand DonateCommand
+        {
+            get
+            {
+                return _DonateCommand ??= new DelegateCommand(() =>
+                {
+                    Process process = new();
+                    process.StartInfo.UseShellExecute = true;
+                    process.StartInfo.FileName = "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=VY8N7BCBT9CS4";
+                    process.Start();
+                });
+            }
+        }
+
+        private ICommand _GettingStartedCommand = null;
+        public ICommand GettingStartedCommand
+        {
+            get
+            {
+                return _GettingStartedCommand ??= new DelegateCommand(() => ContextViewModel = _GettingStartedViewModel);
+            }
+        }
+
+        private ICommand _DownloadCommand = null;
+        public ICommand DownloadCommand
+        {
+            get
+            {
+                return _DownloadCommand ??= new DelegateCommand(() => ContextViewModel = DownloadsViewModel);
+            }
+        }
+
+        private bool _IsMenuEnabled = false;
+        public bool IsMenuEnabled
+        {
+            get
+            {
+                return _IsMenuEnabled;
+            }
+            set
+            {
+                _IsMenuEnabled = value;
+                OnPropertyChanged(nameof(IsMenuEnabled));
+            }
+        }
+    }
+}
diff --git a/ViewModels/MessageViewModel.cs b/WPinternals/ViewModels/MessageViewModel.cs
similarity index 97%
rename from ViewModels/MessageViewModel.cs
rename to WPinternals/ViewModels/MessageViewModel.cs
index 8183868..9ac297c 100644
--- a/ViewModels/MessageViewModel.cs
+++ b/WPinternals/ViewModels/MessageViewModel.cs
@@ -1,75 +1,75 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace WPinternals
-{
-    internal class MessageViewModel : ContextViewModel
-    {
-        internal MessageViewModel(string Message, Action OkAction = null, Action CancelAction = null)
-            : base()
-        {
-            LogFile.Log(Message);
-
-            if (OkAction != null)
-            {
-                this.OkCommand = new DelegateCommand(OkAction);
-            }
-
-            if (CancelAction != null)
-            {
-                this.CancelCommand = new DelegateCommand(CancelAction);
-            }
-
-            this.Message = Message;
-        }
-
-        private string _Message = null;
-        public string Message
-        {
-            get
-            {
-                return _Message;
-            }
-            set
-            {
-                _Message = value;
-                OnPropertyChanged(nameof(Message));
-            }
-        }
-
-        private string _SubMessage = null;
-        public string SubMessage
-        {
-            get
-            {
-                return _SubMessage;
-            }
-            set
-            {
-                _SubMessage = value;
-                OnPropertyChanged(nameof(SubMessage));
-            }
-        }
-        public DelegateCommand OkCommand { get; } = null;
-        public DelegateCommand CancelCommand { get; } = null;
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+
+namespace WPinternals
+{
+    internal class MessageViewModel : ContextViewModel
+    {
+        internal MessageViewModel(string Message, Action OkAction = null, Action CancelAction = null)
+            : base()
+        {
+            LogFile.Log(Message);
+
+            if (OkAction != null)
+            {
+                this.OkCommand = new DelegateCommand(OkAction);
+            }
+
+            if (CancelAction != null)
+            {
+                this.CancelCommand = new DelegateCommand(CancelAction);
+            }
+
+            this.Message = Message;
+        }
+
+        private string _Message = null;
+        public string Message
+        {
+            get
+            {
+                return _Message;
+            }
+            set
+            {
+                _Message = value;
+                OnPropertyChanged(nameof(Message));
+            }
+        }
+
+        private string _SubMessage = null;
+        public string SubMessage
+        {
+            get
+            {
+                return _SubMessage;
+            }
+            set
+            {
+                _SubMessage = value;
+                OnPropertyChanged(nameof(SubMessage));
+            }
+        }
+        public DelegateCommand OkCommand { get; } = null;
+        public DelegateCommand CancelCommand { get; } = null;
+    }
+}
diff --git a/ViewModels/NokiaBootloaderViewModel.cs b/WPinternals/ViewModels/NokiaBootloaderViewModel.cs
similarity index 100%
rename from ViewModels/NokiaBootloaderViewModel.cs
rename to WPinternals/ViewModels/NokiaBootloaderViewModel.cs
diff --git a/ViewModels/NokiaFlashViewModel.cs b/WPinternals/ViewModels/NokiaFlashViewModel.cs
similarity index 97%
rename from ViewModels/NokiaFlashViewModel.cs
rename to WPinternals/ViewModels/NokiaFlashViewModel.cs
index 4937eaa..bd521b5 100644
--- a/ViewModels/NokiaFlashViewModel.cs
+++ b/WPinternals/ViewModels/NokiaFlashViewModel.cs
@@ -1,762 +1,762 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Threading;
-
-namespace WPinternals
-{
-    // Create this class on the UI thread, after the main-window of the application is initialized.
-    // It is necessary to create the object on the UI thread, because notification events to the View need to be fired on that thread.
-    // The Model for this ViewModel communicates over USB and for that it uses the hWnd of the main window.
-    // Therefore the main window must be created before the ViewModel is created.
-
-    internal class NokiaFlashViewModel : ContextViewModel
-    {
-        private readonly NokiaFlashModel CurrentModel;
-        private readonly Action<PhoneInterfaces> RequestModeSwitch;
-        internal Action SwitchToGettingStarted;
-        private readonly object LockDeviceInfo = new();
-        private bool DeviceInfoLoaded = false;
-
-        internal NokiaFlashViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces> RequestModeSwitch, Action SwitchToGettingStarted)
-            : base()
-        {
-            this.CurrentModel = (NokiaFlashModel)CurrentModel;
-            this.RequestModeSwitch = RequestModeSwitch;
-            this.SwitchToGettingStarted = SwitchToGettingStarted;
-        }
-
-        // Device info should be loaded only one time and only when the ViewModel is active
-        internal override void EvaluateViewState()
-        {
-            if (IsActive)
-            {
-                new Thread(() => StartLoadDeviceInfo()).Start();
-            }
-        }
-
-        private void StartLoadDeviceInfo()
-        {
-            lock (LockDeviceInfo)
-            {
-                if (!DeviceInfoLoaded)
-                {
-                    try
-                    {
-                        //byte[] Imsi = CurrentModel.ExecuteJsonMethodAsBytes("ReadImsi", "Imsi"); // 9 bytes: 08 29 40 40 ...
-                        //string BatteryLevel = CurrentModel.ExecuteJsonMethodAsString("ReadBatteryLevel", "BatteryLevel");
-                        //string SystemAsicVersion = CurrentModel.ExecuteJsonMethodAsString("ReadSystemAsicVersion", "SystemAsicVersion"); // 8960 -> Chip SOC version
-                        //string OperatorName = CurrentModel.ExecuteJsonMethodAsString("ReadOperatorName", "OperatorName"); // 000-DK
-                        //string ManufacturerModelName = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName"); // RM-821_eu_denmark_251
-                        //string AkVersion = CurrentModel.ExecuteJsonMethodAsString("ReadAkVersion", "AkVersion"); // 9200.10521
-                        //string BspVersion = CurrentModel.ExecuteJsonMethodAsString("ReadBspVersion", "BspVersion"); // 3051.40000
-                        //string ProductCode = CurrentModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode"); // 059Q9D7
-                        //string SecurityMode = CurrentModel.ExecuteJsonMethodAsString("GetSecurityMode", "SecMode"); // Restricted
-                        //string SerialNumber = CurrentModel.ExecuteJsonMethodAsString("ReadSerialNumber", "SerialNumber"); // 356355051883955 = IMEI
-                        //string SwVersion = CurrentModel.ExecuteJsonMethodAsString("ReadSwVersion", "SwVersion"); // 3051.40000.1349.0007
-                        //string ModuleCode = CurrentModel.ExecuteJsonMethodAsString("ReadModuleCode", "ModuleCode"); // 0205137
-                        //byte[] PublicId = CurrentModel.ExecuteJsonMethodAsBytes("ReadPublicId", "PublicId"); // 0x14 bytes: a5 e5 ...
-                        //string Psn = CurrentModel.ExecuteJsonMethodAsString("ReadPsn", "Psn"); // CEP737370
-                        //string HwVersion = CurrentModel.ExecuteJsonMethodAsString("ReadHwVersion", "HWVersion"); // 6504 = 6.5.0.4
-                        //byte[] BtId = CurrentModel.ExecuteJsonMethodAsBytes("ReadBtId", "BtId"); // 6 bytes: bc c6 ...
-                        //byte[] WlanMacAddress1 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress1"); // 6 bytes
-                        //byte[] WlanMacAddress2 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress2"); // same
-                        //byte[] WlanMacAddress3 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress3"); // same
-                        //bool SimlockActive = CurrentModel.ExecuteJsonMethodAsBoolean("ReadSimlockActive", "SimLockActive"); // false
-                        //string ServiceTag = CurrentModel.ExecuteJsonMethodAsString("ReadServiceTag", "ServiceTag"); // error
-                        //byte[] RfChipsetVersion = CurrentModel.ExecuteJsonMethodAsBytes("ReadRfChipsetVersion", "RfChipsetVersion"); // error
-                        //byte[] Meid = CurrentModel.ExecuteJsonMethodAsBytes("ReadMeid", "Meid"); // error
-                        //string Test = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturingData", ""); -> This method is only possible in Label-mode.
-
-                        UefiSecurityStatusResponse SecurityStatus = CurrentModel.ReadSecurityStatus();
-
-                        UInt32? FlagsResult = CurrentModel.ReadSecurityFlags();
-                        UInt32 SecurityFlags = 0;
-                        if (FlagsResult != null)
-                        {
-                            SecurityFlags = (UInt32)CurrentModel.ReadSecurityFlags();
-                            LogFile.Log("Security flags: 0x" + SecurityFlags.ToString("X8"));
-
-                            FinalConfigDakStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Dak);
-                            FinalConfigFastBootStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.FastBoot);
-                            FinalConfigFfuVerifyStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.FfuVerify);
-                            FinalConfigJtagStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Jtag);
-                            FinalConfigOemIdStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.OemId);
-                            FinalConfigProductionDoneStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.ProductionDone);
-                            FinalConfigPublicIdStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.PublicId);
-                            FinalConfigRkhStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Rkh);
-                            FinalConfigRpmWdogStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.RpmWdog);
-                            FinalConfigSecGenStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.SecGen);
-                            FinalConfigSecureBootStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.SecureBoot);
-                            FinalConfigShkStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Shk);
-                            FinalConfigSimlockStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Simlock);
-                            FinalConfigSpdmSecModeStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.SpdmSecMode);
-                            FinalConfigSsmStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Ssm);
-                        }
-                        else
-                        {
-                            LogFile.Log("Security flags could not be read");
-                        }
-
-                        PlatformName = CurrentModel.ReadStringParam("DPI");
-                        LogFile.Log("Platform Name: " + PlatformName);
-
-                        // Some phones do not support the Terminal interface! (928 verizon)
-                        // Instead read param RRKH to get the RKH.
-                        PublicID = null;
-                        byte[] RawPublicID = CurrentModel.ReadParam("PID");
-                        if (RawPublicID?.Length > 4)
-                        {
-                            PublicID = new byte[RawPublicID.Length - 4];
-                            Array.Copy(RawPublicID, 4, PublicID, 0, RawPublicID.Length - 4);
-                            LogFile.Log("Public ID: " + Converter.ConvertHexToString(PublicID, " "));
-                        }
-                        else
-                        {
-                            PublicID = new byte[20];
-                            LogFile.Log("Public ID: " + Converter.ConvertHexToString(PublicID, " "));
-                        }
-                        RootKeyHash = CurrentModel.ReadParam("RRKH");
-                        if (RootKeyHash != null)
-                        {
-                            LogFile.Log("Root Key Hash: " + Converter.ConvertHexToString(RootKeyHash, " "));
-                        }
-
-                        if (SecurityStatus != null)
-                        {
-                            PlatformSecureBootStatus = SecurityStatus.PlatformSecureBootStatus;
-                            LogFile.Log("Platform Secure Boot Status: " + PlatformSecureBootStatus.ToString());
-                            UefiSecureBootStatus = SecurityStatus.UefiSecureBootStatus;
-                            LogFile.Log("Uefi Secure Boot Status: " + UefiSecureBootStatus.ToString());
-                            EffectiveSecureBootStatus = SecurityStatus.PlatformSecureBootStatus && SecurityStatus.UefiSecureBootStatus;
-                            LogFile.Log("Effective Secure Boot Status: " + EffectiveSecureBootStatus.ToString());
-
-                            BootloaderSecurityQfuseStatus = SecurityStatus.SecureFfuEfuseStatus;
-                            LogFile.Log("Bootloader Security Qfuse Status: " + BootloaderSecurityQfuseStatus.ToString());
-                            BootloaderSecurityAuthenticationStatus = SecurityStatus.AuthenticationStatus;
-                            LogFile.Log("Bootloader Security Authentication Status: " + BootloaderSecurityAuthenticationStatus.ToString());
-                            BootloaderSecurityRdcStatus = SecurityStatus.RdcStatus;
-                            LogFile.Log("Bootloader Security Rdc Status: " + BootloaderSecurityRdcStatus.ToString());
-                            EffectiveBootloaderSecurityStatus = SecurityStatus.SecureFfuEfuseStatus && !SecurityStatus.AuthenticationStatus && !SecurityStatus.RdcStatus;
-                            LogFile.Log("Effective Bootloader Security Status: " + EffectiveBootloaderSecurityStatus.ToString());
-
-                            NativeDebugStatus = !SecurityStatus.DebugStatus;
-                            LogFile.Log("Native Debug Status: " + NativeDebugStatus.ToString());
-                        }
-
-                        byte[] CID = CurrentModel.ReadParam("CID");
-                        byte[] EMS = CurrentModel.ReadParam("EMS");
-                        if (CID != null && EMS != null)
-                        {
-                            UInt16 MID = (UInt16)((CID[0] << 8) + CID[1]);
-                            UInt64 MemSize = (UInt64)(((UInt32)EMS[0] << 24) + ((UInt32)EMS[1] << 16) + ((UInt32)EMS[2] << 8) + EMS[3]) * 0x200;
-                            double MemSizeDouble = (double)MemSize / 1024 / 1024 / 1024;
-                            MemSizeDouble = (double)(int)(MemSizeDouble * 10) / 10;
-                            string Manufacturer = null;
-                            switch (MID)
-                            {
-                                case 0x0002:
-                                case 0x0045:
-                                    Manufacturer = "SanDisk";
-                                    break;
-                                case 0x0011:
-                                    Manufacturer = "Toshiba";
-                                    break;
-                                case 0x0013:
-                                    Manufacturer = "Micron";
-                                    break;
-                                case 0x0015:
-                                    Manufacturer = "Samsung";
-                                    break;
-                                case 0x0090:
-                                    Manufacturer = "Hynix";
-                                    break;
-                                case 0x0070:
-                                    Manufacturer = "Kingston";
-                                    break;
-                                case 0x00EC:
-                                    Manufacturer = "GigaDevice";
-                                    break;
-                            }
-                            eMMC = Manufacturer == null ? MemSizeDouble.ToString() + " GB" : Manufacturer + " " + MemSizeDouble.ToString() + " GB";
-
-                            SamsungWarningVisible = MID == 0x0015;
-                        }
-                        else
-                        {
-                            eMMC = "Unknown";
-                            SamsungWarningVisible = true;
-                        }
-
-                        int? chargecurrent = CurrentModel.ReadCurrentChargeCurrent();
-
-                        if (chargecurrent.HasValue)
-                        {
-                            ChargingStatus = chargecurrent < 0
-                                ? CurrentModel.ReadCurrentChargeLevel() + "% - " + ((-1) * CurrentModel.ReadCurrentChargeCurrent()) + " mA (discharging)"
-                                : CurrentModel.ReadCurrentChargeLevel() + "% - " + CurrentModel.ReadCurrentChargeCurrent() + " mA (charging)";
-
-                            LogFile.Log("Charging status: " + ChargingStatus);
-                        }
-                        else
-                        {
-                            ChargingStatus = "Unknown";
-                            LogFile.Log("Charging status: " + ChargingStatus);
-                        }
-
-                        PhoneInfo Info = CurrentModel.ReadPhoneInfo(true);
-                        BootloaderDescription = Info.FlashAppProtocolVersionMajor < 2 ? "Lumia Bootloader Spec A" : "Lumia Bootloader Spec B";
-
-                        LogFile.Log("Bootloader: " + BootloaderDescription);
-
-                        ProductCode = Info.ProductCode;
-                        LogFile.Log("ProductCode: " + ProductCode);
-
-                        ProductType = Info.Type;
-                        LogFile.Log("ProductType: " + ProductType);
-
-                        if (RootKeyHash == null)
-                        {
-                            LogFile.Log("Root Key Hash was null. Gathering information from an alternative source.");
-
-                            RootKeyHash = Info.RKH;
-
-                            if (RootKeyHash != null)
-                            {
-                                LogFile.Log("Root Key Hash: " + Converter.ConvertHexToString(RootKeyHash, " "));
-                            }
-                            else
-                            {
-                                RootKeyHash = new byte[32];
-                                LogFile.Log("Root Key Hash: " + Converter.ConvertHexToString(RootKeyHash, " "));
-                            }
-                        }
-
-                        if (PlatformName == null)
-                        {
-                            LogFile.Log("Platform Name was null. Gathering information from an alternative source.");
-
-                            PlatformName = Info.PlatformID;
-                            LogFile.Log("Platform Name: " + PlatformName);
-                        }
-
-                        if (SecurityStatus == null)
-                        {
-                            LogFile.Log("Security Status was null. Gathering information from an alternative source.");
-
-                            PlatformSecureBootStatus = Info.PlatformSecureBootEnabled;
-                            LogFile.Log("Platform Secure Boot Status: " + PlatformSecureBootStatus.ToString());
-                            UefiSecureBootStatus = Info.UefiSecureBootEnabled;
-                            LogFile.Log("Uefi Secure Boot Status: " + UefiSecureBootStatus.ToString());
-                            EffectiveSecureBootStatus = Info.PlatformSecureBootEnabled && Info.UefiSecureBootEnabled;
-                            LogFile.Log("Effective Secure Boot Status: " + EffectiveSecureBootStatus.ToString());
-
-                            BootloaderSecurityQfuseStatus = Info.SecureFfuEnabled;
-                            LogFile.Log("Bootloader Security Qfuse Status: " + BootloaderSecurityQfuseStatus.ToString());
-                            BootloaderSecurityAuthenticationStatus = Info.Authenticated;
-                            LogFile.Log("Bootloader Security Authentication Status: " + BootloaderSecurityAuthenticationStatus.ToString());
-                            BootloaderSecurityRdcStatus = Info.RdcPresent;
-                            LogFile.Log("Bootloader Security Rdc Status: " + BootloaderSecurityRdcStatus.ToString());
-                            EffectiveBootloaderSecurityStatus = !Info.IsBootloaderSecure;
-                            LogFile.Log("Effective Bootloader Security Status: " + EffectiveBootloaderSecurityStatus.ToString());
-
-                            NativeDebugStatus = !Info.JtagDisabled;
-                            LogFile.Log("Native Debug Status: " + NativeDebugStatus.ToString());
-                        }
-                    }
-                    catch
-                    {
-                        LogFile.Log("Reading status from Flash interface was aborted.");
-                    }
-                    DeviceInfoLoaded = true;
-                }
-            }
-        }
-
-        private byte[] _PublicID = null;
-        public byte[] PublicID
-        {
-            get
-            {
-                return _PublicID;
-            }
-            set
-            {
-                _PublicID = value;
-                OnPropertyChanged(nameof(PublicID));
-            }
-        }
-
-        private byte[] _RootKeyHash = null;
-        public byte[] RootKeyHash
-        {
-            get
-            {
-                return _RootKeyHash;
-            }
-            set
-            {
-                _RootKeyHash = value;
-                OnPropertyChanged(nameof(RootKeyHash));
-            }
-        }
-
-        private string _PlatformName = null;
-        public string PlatformName
-        {
-            get
-            {
-                return _PlatformName;
-            }
-            set
-            {
-                _PlatformName = value;
-                OnPropertyChanged(nameof(PlatformName));
-            }
-        }
-
-        private string _ProductType = null;
-        public string ProductType
-        {
-            get
-            {
-                return _ProductType;
-            }
-            set
-            {
-                _ProductType = value;
-                OnPropertyChanged(nameof(ProductType));
-            }
-        }
-
-        private string _ProductCode = null;
-        public string ProductCode
-        {
-            get
-            {
-                return _ProductCode;
-            }
-            set
-            {
-                _ProductCode = value;
-                OnPropertyChanged(nameof(ProductCode));
-            }
-        }
-
-        private string _eMMC = null;
-        public string eMMC
-        {
-            get
-            {
-                return _eMMC;
-            }
-            set
-            {
-                _eMMC = value;
-                OnPropertyChanged(nameof(eMMC));
-            }
-        }
-
-        private string _BootloaderDescription = null;
-        public string BootloaderDescription
-        {
-            get
-            {
-                return _BootloaderDescription;
-            }
-            set
-            {
-                _BootloaderDescription = value;
-                OnPropertyChanged(nameof(BootloaderDescription));
-            }
-        }
-
-        private string _ChargingStatus = null;
-        public string ChargingStatus
-        {
-            get
-            {
-                return _ChargingStatus;
-            }
-            set
-            {
-                _ChargingStatus = value;
-                OnPropertyChanged(nameof(ChargingStatus));
-            }
-        }
-
-        private bool _SamsungWarningVisible = false;
-        public bool SamsungWarningVisible
-        {
-            get
-            {
-                return _SamsungWarningVisible;
-            }
-            set
-            {
-                _SamsungWarningVisible = value;
-                OnPropertyChanged(nameof(SamsungWarningVisible));
-            }
-        }
-
-        private bool? _PlatformSecureBootStatus = null;
-        public bool? PlatformSecureBootStatus
-        {
-            get
-            {
-                return _PlatformSecureBootStatus;
-            }
-            set
-            {
-                _PlatformSecureBootStatus = value;
-                OnPropertyChanged(nameof(PlatformSecureBootStatus));
-            }
-        }
-
-        private bool? _BootloaderSecurityQfuseStatus = null;
-        public bool? BootloaderSecurityQfuseStatus
-        {
-            get
-            {
-                return _BootloaderSecurityQfuseStatus;
-            }
-            set
-            {
-                _BootloaderSecurityQfuseStatus = value;
-                OnPropertyChanged(nameof(BootloaderSecurityQfuseStatus));
-            }
-        }
-
-        private bool? _BootloaderSecurityRdcStatus = null;
-        public bool? BootloaderSecurityRdcStatus
-        {
-            get
-            {
-                return _BootloaderSecurityRdcStatus;
-            }
-            set
-            {
-                _BootloaderSecurityRdcStatus = value;
-                OnPropertyChanged(nameof(BootloaderSecurityRdcStatus));
-            }
-        }
-
-        private bool? _BootloaderSecurityAuthenticationStatus = null;
-        public bool? BootloaderSecurityAuthenticationStatus
-        {
-            get
-            {
-                return _BootloaderSecurityAuthenticationStatus;
-            }
-            set
-            {
-                _BootloaderSecurityAuthenticationStatus = value;
-                OnPropertyChanged(nameof(BootloaderSecurityAuthenticationStatus));
-            }
-        }
-
-        private bool? _UefiSecureBootStatus = null;
-        public bool? UefiSecureBootStatus
-        {
-            get
-            {
-                return _UefiSecureBootStatus;
-            }
-            set
-            {
-                _UefiSecureBootStatus = value;
-                OnPropertyChanged(nameof(UefiSecureBootStatus));
-            }
-        }
-
-        private bool? _EffectiveSecureBootStatus = null;
-        public bool? EffectiveSecureBootStatus
-        {
-            get
-            {
-                return _EffectiveSecureBootStatus;
-            }
-            set
-            {
-                _EffectiveSecureBootStatus = value;
-                OnPropertyChanged(nameof(EffectiveSecureBootStatus));
-            }
-        }
-
-        private bool? _EffectiveBootloaderSecurityStatus = null;
-        public bool? EffectiveBootloaderSecurityStatus
-        {
-            get
-            {
-                return _EffectiveBootloaderSecurityStatus;
-            }
-            set
-            {
-                _EffectiveBootloaderSecurityStatus = value;
-                OnPropertyChanged(nameof(EffectiveBootloaderSecurityStatus));
-            }
-        }
-
-        private bool? _NativeDebugStatus = null;
-        public bool? NativeDebugStatus
-        {
-            get
-            {
-                return _NativeDebugStatus;
-            }
-            set
-            {
-                _NativeDebugStatus = value;
-                OnPropertyChanged(nameof(NativeDebugStatus));
-            }
-        }
-
-        #region Final Config
-        private bool? _FinalConfigSecureBootStatus = null;
-        public bool? FinalConfigSecureBootStatus
-        {
-            get
-            {
-                return _FinalConfigSecureBootStatus;
-            }
-            set
-            {
-                _FinalConfigSecureBootStatus = value;
-                OnPropertyChanged(nameof(FinalConfigSecureBootStatus));
-            }
-        }
-
-        private bool? _FinalConfigFfuVerifyStatus = null;
-        public bool? FinalConfigFfuVerifyStatus
-        {
-            get
-            {
-                return _FinalConfigFfuVerifyStatus;
-            }
-            set
-            {
-                _FinalConfigFfuVerifyStatus = value;
-                OnPropertyChanged(nameof(FinalConfigFfuVerifyStatus));
-            }
-        }
-
-        private bool? _FinalConfigJtagStatus = null;
-        public bool? FinalConfigJtagStatus
-        {
-            get
-            {
-                return _FinalConfigJtagStatus;
-            }
-            set
-            {
-                _FinalConfigJtagStatus = value;
-                OnPropertyChanged(nameof(FinalConfigJtagStatus));
-            }
-        }
-
-        private bool? _FinalConfigShkStatus = null;
-        public bool? FinalConfigShkStatus
-        {
-            get
-            {
-                return _FinalConfigShkStatus;
-            }
-            set
-            {
-                _FinalConfigShkStatus = value;
-                OnPropertyChanged(nameof(FinalConfigShkStatus));
-            }
-        }
-
-        private bool? _FinalConfigSimlockStatus = null;
-        public bool? FinalConfigSimlockStatus
-        {
-            get
-            {
-                return _FinalConfigSimlockStatus;
-            }
-            set
-            {
-                _FinalConfigSimlockStatus = value;
-                OnPropertyChanged(nameof(FinalConfigSimlockStatus));
-            }
-        }
-
-        private bool? _FinalConfigProductionDoneStatus = null;
-        public bool? FinalConfigProductionDoneStatus
-        {
-            get
-            {
-                return _FinalConfigProductionDoneStatus;
-            }
-            set
-            {
-                _FinalConfigProductionDoneStatus = value;
-                OnPropertyChanged(nameof(FinalConfigProductionDoneStatus));
-            }
-        }
-
-        private bool? _FinalConfigRkhStatus = null;
-        public bool? FinalConfigRkhStatus
-        {
-            get
-            {
-                return _FinalConfigRkhStatus;
-            }
-            set
-            {
-                _FinalConfigRkhStatus = value;
-                OnPropertyChanged(nameof(FinalConfigRkhStatus));
-            }
-        }
-
-        private bool? _FinalConfigPublicIdStatus = null;
-        public bool? FinalConfigPublicIdStatus
-        {
-            get
-            {
-                return _FinalConfigPublicIdStatus;
-            }
-            set
-            {
-                _FinalConfigPublicIdStatus = value;
-                OnPropertyChanged(nameof(FinalConfigPublicIdStatus));
-            }
-        }
-
-        private bool? _FinalConfigDakStatus = null;
-        public bool? FinalConfigDakStatus
-        {
-            get
-            {
-                return _FinalConfigDakStatus;
-            }
-            set
-            {
-                _FinalConfigDakStatus = value;
-                OnPropertyChanged(nameof(FinalConfigDakStatus));
-            }
-        }
-
-        private bool? _FinalConfigSecGenStatus = null;
-        public bool? FinalConfigSecGenStatus
-        {
-            get
-            {
-                return _FinalConfigSecGenStatus;
-            }
-            set
-            {
-                _FinalConfigSecGenStatus = value;
-                OnPropertyChanged(nameof(FinalConfigSecGenStatus));
-            }
-        }
-
-        private bool? _FinalConfigOemIdStatus = null;
-        public bool? FinalConfigOemIdStatus
-        {
-            get
-            {
-                return _FinalConfigOemIdStatus;
-            }
-            set
-            {
-                _FinalConfigOemIdStatus = value;
-                OnPropertyChanged(nameof(FinalConfigOemIdStatus));
-            }
-        }
-
-        private bool? _FinalConfigFastBootStatus = null;
-        public bool? FinalConfigFastBootStatus
-        {
-            get
-            {
-                return _FinalConfigFastBootStatus;
-            }
-            set
-            {
-                _FinalConfigFastBootStatus = value;
-                OnPropertyChanged(nameof(FinalConfigFastBootStatus));
-            }
-        }
-
-        private bool? _FinalConfigSpdmSecModeStatus = null;
-        public bool? FinalConfigSpdmSecModeStatus
-        {
-            get
-            {
-                return _FinalConfigSpdmSecModeStatus;
-            }
-            set
-            {
-                _FinalConfigSpdmSecModeStatus = value;
-                OnPropertyChanged(nameof(FinalConfigSpdmSecModeStatus));
-            }
-        }
-
-        private bool? _FinalConfigRpmWdogStatus = null;
-        public bool? FinalConfigRpmWdogStatus
-        {
-            get
-            {
-                return _FinalConfigRpmWdogStatus;
-            }
-            set
-            {
-                _FinalConfigRpmWdogStatus = value;
-                OnPropertyChanged(nameof(FinalConfigRpmWdogStatus));
-            }
-        }
-
-        private bool? _FinalConfigSsmStatus = null;
-        public bool? FinalConfigSsmStatus
-        {
-            get
-            {
-                return _FinalConfigSsmStatus;
-            }
-            set
-            {
-                _FinalConfigSsmStatus = value;
-                OnPropertyChanged(nameof(FinalConfigSsmStatus));
-            }
-        }
-        #endregion
-
-        internal void RebootTo(string Mode)
-        {
-            switch (Mode)
-            {
-                case "Normal":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Normal);
-                    break;
-                case "Label":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
-                    break;
-                case "MassStorage":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
-                    break;
-                default:
-                    return;
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Threading;
+
+namespace WPinternals
+{
+    // Create this class on the UI thread, after the main-window of the application is initialized.
+    // It is necessary to create the object on the UI thread, because notification events to the View need to be fired on that thread.
+    // The Model for this ViewModel communicates over USB and for that it uses the hWnd of the main window.
+    // Therefore the main window must be created before the ViewModel is created.
+
+    internal class NokiaFlashViewModel : ContextViewModel
+    {
+        private readonly NokiaFlashModel CurrentModel;
+        private readonly Action<PhoneInterfaces> RequestModeSwitch;
+        internal Action SwitchToGettingStarted;
+        private readonly object LockDeviceInfo = new();
+        private bool DeviceInfoLoaded = false;
+
+        internal NokiaFlashViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces> RequestModeSwitch, Action SwitchToGettingStarted)
+            : base()
+        {
+            this.CurrentModel = (NokiaFlashModel)CurrentModel;
+            this.RequestModeSwitch = RequestModeSwitch;
+            this.SwitchToGettingStarted = SwitchToGettingStarted;
+        }
+
+        // Device info should be loaded only one time and only when the ViewModel is active
+        internal override void EvaluateViewState()
+        {
+            if (IsActive)
+            {
+                new Thread(() => StartLoadDeviceInfo()).Start();
+            }
+        }
+
+        private void StartLoadDeviceInfo()
+        {
+            lock (LockDeviceInfo)
+            {
+                if (!DeviceInfoLoaded)
+                {
+                    try
+                    {
+                        //byte[] Imsi = CurrentModel.ExecuteJsonMethodAsBytes("ReadImsi", "Imsi"); // 9 bytes: 08 29 40 40 ...
+                        //string BatteryLevel = CurrentModel.ExecuteJsonMethodAsString("ReadBatteryLevel", "BatteryLevel");
+                        //string SystemAsicVersion = CurrentModel.ExecuteJsonMethodAsString("ReadSystemAsicVersion", "SystemAsicVersion"); // 8960 -> Chip SOC version
+                        //string OperatorName = CurrentModel.ExecuteJsonMethodAsString("ReadOperatorName", "OperatorName"); // 000-DK
+                        //string ManufacturerModelName = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName"); // RM-821_eu_denmark_251
+                        //string AkVersion = CurrentModel.ExecuteJsonMethodAsString("ReadAkVersion", "AkVersion"); // 9200.10521
+                        //string BspVersion = CurrentModel.ExecuteJsonMethodAsString("ReadBspVersion", "BspVersion"); // 3051.40000
+                        //string ProductCode = CurrentModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode"); // 059Q9D7
+                        //string SecurityMode = CurrentModel.ExecuteJsonMethodAsString("GetSecurityMode", "SecMode"); // Restricted
+                        //string SerialNumber = CurrentModel.ExecuteJsonMethodAsString("ReadSerialNumber", "SerialNumber"); // 356355051883955 = IMEI
+                        //string SwVersion = CurrentModel.ExecuteJsonMethodAsString("ReadSwVersion", "SwVersion"); // 3051.40000.1349.0007
+                        //string ModuleCode = CurrentModel.ExecuteJsonMethodAsString("ReadModuleCode", "ModuleCode"); // 0205137
+                        //byte[] PublicId = CurrentModel.ExecuteJsonMethodAsBytes("ReadPublicId", "PublicId"); // 0x14 bytes: a5 e5 ...
+                        //string Psn = CurrentModel.ExecuteJsonMethodAsString("ReadPsn", "Psn"); // CEP737370
+                        //string HwVersion = CurrentModel.ExecuteJsonMethodAsString("ReadHwVersion", "HWVersion"); // 6504 = 6.5.0.4
+                        //byte[] BtId = CurrentModel.ExecuteJsonMethodAsBytes("ReadBtId", "BtId"); // 6 bytes: bc c6 ...
+                        //byte[] WlanMacAddress1 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress1"); // 6 bytes
+                        //byte[] WlanMacAddress2 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress2"); // same
+                        //byte[] WlanMacAddress3 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress3"); // same
+                        //bool SimlockActive = CurrentModel.ExecuteJsonMethodAsBoolean("ReadSimlockActive", "SimLockActive"); // false
+                        //string ServiceTag = CurrentModel.ExecuteJsonMethodAsString("ReadServiceTag", "ServiceTag"); // error
+                        //byte[] RfChipsetVersion = CurrentModel.ExecuteJsonMethodAsBytes("ReadRfChipsetVersion", "RfChipsetVersion"); // error
+                        //byte[] Meid = CurrentModel.ExecuteJsonMethodAsBytes("ReadMeid", "Meid"); // error
+                        //string Test = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturingData", ""); -> This method is only possible in Label-mode.
+
+                        UefiSecurityStatusResponse SecurityStatus = CurrentModel.ReadSecurityStatus();
+
+                        UInt32? FlagsResult = CurrentModel.ReadSecurityFlags();
+                        UInt32 SecurityFlags = 0;
+                        if (FlagsResult != null)
+                        {
+                            SecurityFlags = (UInt32)CurrentModel.ReadSecurityFlags();
+                            LogFile.Log("Security flags: 0x" + SecurityFlags.ToString("X8"));
+
+                            FinalConfigDakStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Dak);
+                            FinalConfigFastBootStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.FastBoot);
+                            FinalConfigFfuVerifyStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.FfuVerify);
+                            FinalConfigJtagStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Jtag);
+                            FinalConfigOemIdStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.OemId);
+                            FinalConfigProductionDoneStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.ProductionDone);
+                            FinalConfigPublicIdStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.PublicId);
+                            FinalConfigRkhStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Rkh);
+                            FinalConfigRpmWdogStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.RpmWdog);
+                            FinalConfigSecGenStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.SecGen);
+                            FinalConfigSecureBootStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.SecureBoot);
+                            FinalConfigShkStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Shk);
+                            FinalConfigSimlockStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Simlock);
+                            FinalConfigSpdmSecModeStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.SpdmSecMode);
+                            FinalConfigSsmStatus = CurrentModel.ReadFuseStatus(NokiaFlashModel.Fuse.Ssm);
+                        }
+                        else
+                        {
+                            LogFile.Log("Security flags could not be read");
+                        }
+
+                        PlatformName = CurrentModel.ReadStringParam("DPI");
+                        LogFile.Log("Platform Name: " + PlatformName);
+
+                        // Some phones do not support the Terminal interface! (928 verizon)
+                        // Instead read param RRKH to get the RKH.
+                        PublicID = null;
+                        byte[] RawPublicID = CurrentModel.ReadParam("PID");
+                        if (RawPublicID?.Length > 4)
+                        {
+                            PublicID = new byte[RawPublicID.Length - 4];
+                            Array.Copy(RawPublicID, 4, PublicID, 0, RawPublicID.Length - 4);
+                            LogFile.Log("Public ID: " + Converter.ConvertHexToString(PublicID, " "));
+                        }
+                        else
+                        {
+                            PublicID = new byte[20];
+                            LogFile.Log("Public ID: " + Converter.ConvertHexToString(PublicID, " "));
+                        }
+                        RootKeyHash = CurrentModel.ReadParam("RRKH");
+                        if (RootKeyHash != null)
+                        {
+                            LogFile.Log("Root Key Hash: " + Converter.ConvertHexToString(RootKeyHash, " "));
+                        }
+
+                        if (SecurityStatus != null)
+                        {
+                            PlatformSecureBootStatus = SecurityStatus.PlatformSecureBootStatus;
+                            LogFile.Log("Platform Secure Boot Status: " + PlatformSecureBootStatus.ToString());
+                            UefiSecureBootStatus = SecurityStatus.UefiSecureBootStatus;
+                            LogFile.Log("Uefi Secure Boot Status: " + UefiSecureBootStatus.ToString());
+                            EffectiveSecureBootStatus = SecurityStatus.PlatformSecureBootStatus && SecurityStatus.UefiSecureBootStatus;
+                            LogFile.Log("Effective Secure Boot Status: " + EffectiveSecureBootStatus.ToString());
+
+                            BootloaderSecurityQfuseStatus = SecurityStatus.SecureFfuEfuseStatus;
+                            LogFile.Log("Bootloader Security Qfuse Status: " + BootloaderSecurityQfuseStatus.ToString());
+                            BootloaderSecurityAuthenticationStatus = SecurityStatus.AuthenticationStatus;
+                            LogFile.Log("Bootloader Security Authentication Status: " + BootloaderSecurityAuthenticationStatus.ToString());
+                            BootloaderSecurityRdcStatus = SecurityStatus.RdcStatus;
+                            LogFile.Log("Bootloader Security Rdc Status: " + BootloaderSecurityRdcStatus.ToString());
+                            EffectiveBootloaderSecurityStatus = SecurityStatus.SecureFfuEfuseStatus && !SecurityStatus.AuthenticationStatus && !SecurityStatus.RdcStatus;
+                            LogFile.Log("Effective Bootloader Security Status: " + EffectiveBootloaderSecurityStatus.ToString());
+
+                            NativeDebugStatus = !SecurityStatus.DebugStatus;
+                            LogFile.Log("Native Debug Status: " + NativeDebugStatus.ToString());
+                        }
+
+                        byte[] CID = CurrentModel.ReadParam("CID");
+                        byte[] EMS = CurrentModel.ReadParam("EMS");
+                        if (CID != null && EMS != null)
+                        {
+                            UInt16 MID = (UInt16)((CID[0] << 8) + CID[1]);
+                            UInt64 MemSize = (UInt64)(((UInt32)EMS[0] << 24) + ((UInt32)EMS[1] << 16) + ((UInt32)EMS[2] << 8) + EMS[3]) * 0x200;
+                            double MemSizeDouble = (double)MemSize / 1024 / 1024 / 1024;
+                            MemSizeDouble = (double)(int)(MemSizeDouble * 10) / 10;
+                            string Manufacturer = null;
+                            switch (MID)
+                            {
+                                case 0x0002:
+                                case 0x0045:
+                                    Manufacturer = "SanDisk";
+                                    break;
+                                case 0x0011:
+                                    Manufacturer = "Toshiba";
+                                    break;
+                                case 0x0013:
+                                    Manufacturer = "Micron";
+                                    break;
+                                case 0x0015:
+                                    Manufacturer = "Samsung";
+                                    break;
+                                case 0x0090:
+                                    Manufacturer = "Hynix";
+                                    break;
+                                case 0x0070:
+                                    Manufacturer = "Kingston";
+                                    break;
+                                case 0x00EC:
+                                    Manufacturer = "GigaDevice";
+                                    break;
+                            }
+                            eMMC = Manufacturer == null ? MemSizeDouble.ToString() + " GB" : Manufacturer + " " + MemSizeDouble.ToString() + " GB";
+
+                            SamsungWarningVisible = MID == 0x0015;
+                        }
+                        else
+                        {
+                            eMMC = "Unknown";
+                            SamsungWarningVisible = true;
+                        }
+
+                        int? chargecurrent = CurrentModel.ReadCurrentChargeCurrent();
+
+                        if (chargecurrent.HasValue)
+                        {
+                            ChargingStatus = chargecurrent < 0
+                                ? CurrentModel.ReadCurrentChargeLevel() + "% - " + ((-1) * CurrentModel.ReadCurrentChargeCurrent()) + " mA (discharging)"
+                                : CurrentModel.ReadCurrentChargeLevel() + "% - " + CurrentModel.ReadCurrentChargeCurrent() + " mA (charging)";
+
+                            LogFile.Log("Charging status: " + ChargingStatus);
+                        }
+                        else
+                        {
+                            ChargingStatus = "Unknown";
+                            LogFile.Log("Charging status: " + ChargingStatus);
+                        }
+
+                        PhoneInfo Info = CurrentModel.ReadPhoneInfo(true);
+                        BootloaderDescription = Info.FlashAppProtocolVersionMajor < 2 ? "Lumia Bootloader Spec A" : "Lumia Bootloader Spec B";
+
+                        LogFile.Log("Bootloader: " + BootloaderDescription);
+
+                        ProductCode = Info.ProductCode;
+                        LogFile.Log("ProductCode: " + ProductCode);
+
+                        ProductType = Info.Type;
+                        LogFile.Log("ProductType: " + ProductType);
+
+                        if (RootKeyHash == null)
+                        {
+                            LogFile.Log("Root Key Hash was null. Gathering information from an alternative source.");
+
+                            RootKeyHash = Info.RKH;
+
+                            if (RootKeyHash != null)
+                            {
+                                LogFile.Log("Root Key Hash: " + Converter.ConvertHexToString(RootKeyHash, " "));
+                            }
+                            else
+                            {
+                                RootKeyHash = new byte[32];
+                                LogFile.Log("Root Key Hash: " + Converter.ConvertHexToString(RootKeyHash, " "));
+                            }
+                        }
+
+                        if (PlatformName == null)
+                        {
+                            LogFile.Log("Platform Name was null. Gathering information from an alternative source.");
+
+                            PlatformName = Info.PlatformID;
+                            LogFile.Log("Platform Name: " + PlatformName);
+                        }
+
+                        if (SecurityStatus == null)
+                        {
+                            LogFile.Log("Security Status was null. Gathering information from an alternative source.");
+
+                            PlatformSecureBootStatus = Info.PlatformSecureBootEnabled;
+                            LogFile.Log("Platform Secure Boot Status: " + PlatformSecureBootStatus.ToString());
+                            UefiSecureBootStatus = Info.UefiSecureBootEnabled;
+                            LogFile.Log("Uefi Secure Boot Status: " + UefiSecureBootStatus.ToString());
+                            EffectiveSecureBootStatus = Info.PlatformSecureBootEnabled && Info.UefiSecureBootEnabled;
+                            LogFile.Log("Effective Secure Boot Status: " + EffectiveSecureBootStatus.ToString());
+
+                            BootloaderSecurityQfuseStatus = Info.SecureFfuEnabled;
+                            LogFile.Log("Bootloader Security Qfuse Status: " + BootloaderSecurityQfuseStatus.ToString());
+                            BootloaderSecurityAuthenticationStatus = Info.Authenticated;
+                            LogFile.Log("Bootloader Security Authentication Status: " + BootloaderSecurityAuthenticationStatus.ToString());
+                            BootloaderSecurityRdcStatus = Info.RdcPresent;
+                            LogFile.Log("Bootloader Security Rdc Status: " + BootloaderSecurityRdcStatus.ToString());
+                            EffectiveBootloaderSecurityStatus = !Info.IsBootloaderSecure;
+                            LogFile.Log("Effective Bootloader Security Status: " + EffectiveBootloaderSecurityStatus.ToString());
+
+                            NativeDebugStatus = !Info.JtagDisabled;
+                            LogFile.Log("Native Debug Status: " + NativeDebugStatus.ToString());
+                        }
+                    }
+                    catch
+                    {
+                        LogFile.Log("Reading status from Flash interface was aborted.");
+                    }
+                    DeviceInfoLoaded = true;
+                }
+            }
+        }
+
+        private byte[] _PublicID = null;
+        public byte[] PublicID
+        {
+            get
+            {
+                return _PublicID;
+            }
+            set
+            {
+                _PublicID = value;
+                OnPropertyChanged(nameof(PublicID));
+            }
+        }
+
+        private byte[] _RootKeyHash = null;
+        public byte[] RootKeyHash
+        {
+            get
+            {
+                return _RootKeyHash;
+            }
+            set
+            {
+                _RootKeyHash = value;
+                OnPropertyChanged(nameof(RootKeyHash));
+            }
+        }
+
+        private string _PlatformName = null;
+        public string PlatformName
+        {
+            get
+            {
+                return _PlatformName;
+            }
+            set
+            {
+                _PlatformName = value;
+                OnPropertyChanged(nameof(PlatformName));
+            }
+        }
+
+        private string _ProductType = null;
+        public string ProductType
+        {
+            get
+            {
+                return _ProductType;
+            }
+            set
+            {
+                _ProductType = value;
+                OnPropertyChanged(nameof(ProductType));
+            }
+        }
+
+        private string _ProductCode = null;
+        public string ProductCode
+        {
+            get
+            {
+                return _ProductCode;
+            }
+            set
+            {
+                _ProductCode = value;
+                OnPropertyChanged(nameof(ProductCode));
+            }
+        }
+
+        private string _eMMC = null;
+        public string eMMC
+        {
+            get
+            {
+                return _eMMC;
+            }
+            set
+            {
+                _eMMC = value;
+                OnPropertyChanged(nameof(eMMC));
+            }
+        }
+
+        private string _BootloaderDescription = null;
+        public string BootloaderDescription
+        {
+            get
+            {
+                return _BootloaderDescription;
+            }
+            set
+            {
+                _BootloaderDescription = value;
+                OnPropertyChanged(nameof(BootloaderDescription));
+            }
+        }
+
+        private string _ChargingStatus = null;
+        public string ChargingStatus
+        {
+            get
+            {
+                return _ChargingStatus;
+            }
+            set
+            {
+                _ChargingStatus = value;
+                OnPropertyChanged(nameof(ChargingStatus));
+            }
+        }
+
+        private bool _SamsungWarningVisible = false;
+        public bool SamsungWarningVisible
+        {
+            get
+            {
+                return _SamsungWarningVisible;
+            }
+            set
+            {
+                _SamsungWarningVisible = value;
+                OnPropertyChanged(nameof(SamsungWarningVisible));
+            }
+        }
+
+        private bool? _PlatformSecureBootStatus = null;
+        public bool? PlatformSecureBootStatus
+        {
+            get
+            {
+                return _PlatformSecureBootStatus;
+            }
+            set
+            {
+                _PlatformSecureBootStatus = value;
+                OnPropertyChanged(nameof(PlatformSecureBootStatus));
+            }
+        }
+
+        private bool? _BootloaderSecurityQfuseStatus = null;
+        public bool? BootloaderSecurityQfuseStatus
+        {
+            get
+            {
+                return _BootloaderSecurityQfuseStatus;
+            }
+            set
+            {
+                _BootloaderSecurityQfuseStatus = value;
+                OnPropertyChanged(nameof(BootloaderSecurityQfuseStatus));
+            }
+        }
+
+        private bool? _BootloaderSecurityRdcStatus = null;
+        public bool? BootloaderSecurityRdcStatus
+        {
+            get
+            {
+                return _BootloaderSecurityRdcStatus;
+            }
+            set
+            {
+                _BootloaderSecurityRdcStatus = value;
+                OnPropertyChanged(nameof(BootloaderSecurityRdcStatus));
+            }
+        }
+
+        private bool? _BootloaderSecurityAuthenticationStatus = null;
+        public bool? BootloaderSecurityAuthenticationStatus
+        {
+            get
+            {
+                return _BootloaderSecurityAuthenticationStatus;
+            }
+            set
+            {
+                _BootloaderSecurityAuthenticationStatus = value;
+                OnPropertyChanged(nameof(BootloaderSecurityAuthenticationStatus));
+            }
+        }
+
+        private bool? _UefiSecureBootStatus = null;
+        public bool? UefiSecureBootStatus
+        {
+            get
+            {
+                return _UefiSecureBootStatus;
+            }
+            set
+            {
+                _UefiSecureBootStatus = value;
+                OnPropertyChanged(nameof(UefiSecureBootStatus));
+            }
+        }
+
+        private bool? _EffectiveSecureBootStatus = null;
+        public bool? EffectiveSecureBootStatus
+        {
+            get
+            {
+                return _EffectiveSecureBootStatus;
+            }
+            set
+            {
+                _EffectiveSecureBootStatus = value;
+                OnPropertyChanged(nameof(EffectiveSecureBootStatus));
+            }
+        }
+
+        private bool? _EffectiveBootloaderSecurityStatus = null;
+        public bool? EffectiveBootloaderSecurityStatus
+        {
+            get
+            {
+                return _EffectiveBootloaderSecurityStatus;
+            }
+            set
+            {
+                _EffectiveBootloaderSecurityStatus = value;
+                OnPropertyChanged(nameof(EffectiveBootloaderSecurityStatus));
+            }
+        }
+
+        private bool? _NativeDebugStatus = null;
+        public bool? NativeDebugStatus
+        {
+            get
+            {
+                return _NativeDebugStatus;
+            }
+            set
+            {
+                _NativeDebugStatus = value;
+                OnPropertyChanged(nameof(NativeDebugStatus));
+            }
+        }
+
+        #region Final Config
+        private bool? _FinalConfigSecureBootStatus = null;
+        public bool? FinalConfigSecureBootStatus
+        {
+            get
+            {
+                return _FinalConfigSecureBootStatus;
+            }
+            set
+            {
+                _FinalConfigSecureBootStatus = value;
+                OnPropertyChanged(nameof(FinalConfigSecureBootStatus));
+            }
+        }
+
+        private bool? _FinalConfigFfuVerifyStatus = null;
+        public bool? FinalConfigFfuVerifyStatus
+        {
+            get
+            {
+                return _FinalConfigFfuVerifyStatus;
+            }
+            set
+            {
+                _FinalConfigFfuVerifyStatus = value;
+                OnPropertyChanged(nameof(FinalConfigFfuVerifyStatus));
+            }
+        }
+
+        private bool? _FinalConfigJtagStatus = null;
+        public bool? FinalConfigJtagStatus
+        {
+            get
+            {
+                return _FinalConfigJtagStatus;
+            }
+            set
+            {
+                _FinalConfigJtagStatus = value;
+                OnPropertyChanged(nameof(FinalConfigJtagStatus));
+            }
+        }
+
+        private bool? _FinalConfigShkStatus = null;
+        public bool? FinalConfigShkStatus
+        {
+            get
+            {
+                return _FinalConfigShkStatus;
+            }
+            set
+            {
+                _FinalConfigShkStatus = value;
+                OnPropertyChanged(nameof(FinalConfigShkStatus));
+            }
+        }
+
+        private bool? _FinalConfigSimlockStatus = null;
+        public bool? FinalConfigSimlockStatus
+        {
+            get
+            {
+                return _FinalConfigSimlockStatus;
+            }
+            set
+            {
+                _FinalConfigSimlockStatus = value;
+                OnPropertyChanged(nameof(FinalConfigSimlockStatus));
+            }
+        }
+
+        private bool? _FinalConfigProductionDoneStatus = null;
+        public bool? FinalConfigProductionDoneStatus
+        {
+            get
+            {
+                return _FinalConfigProductionDoneStatus;
+            }
+            set
+            {
+                _FinalConfigProductionDoneStatus = value;
+                OnPropertyChanged(nameof(FinalConfigProductionDoneStatus));
+            }
+        }
+
+        private bool? _FinalConfigRkhStatus = null;
+        public bool? FinalConfigRkhStatus
+        {
+            get
+            {
+                return _FinalConfigRkhStatus;
+            }
+            set
+            {
+                _FinalConfigRkhStatus = value;
+                OnPropertyChanged(nameof(FinalConfigRkhStatus));
+            }
+        }
+
+        private bool? _FinalConfigPublicIdStatus = null;
+        public bool? FinalConfigPublicIdStatus
+        {
+            get
+            {
+                return _FinalConfigPublicIdStatus;
+            }
+            set
+            {
+                _FinalConfigPublicIdStatus = value;
+                OnPropertyChanged(nameof(FinalConfigPublicIdStatus));
+            }
+        }
+
+        private bool? _FinalConfigDakStatus = null;
+        public bool? FinalConfigDakStatus
+        {
+            get
+            {
+                return _FinalConfigDakStatus;
+            }
+            set
+            {
+                _FinalConfigDakStatus = value;
+                OnPropertyChanged(nameof(FinalConfigDakStatus));
+            }
+        }
+
+        private bool? _FinalConfigSecGenStatus = null;
+        public bool? FinalConfigSecGenStatus
+        {
+            get
+            {
+                return _FinalConfigSecGenStatus;
+            }
+            set
+            {
+                _FinalConfigSecGenStatus = value;
+                OnPropertyChanged(nameof(FinalConfigSecGenStatus));
+            }
+        }
+
+        private bool? _FinalConfigOemIdStatus = null;
+        public bool? FinalConfigOemIdStatus
+        {
+            get
+            {
+                return _FinalConfigOemIdStatus;
+            }
+            set
+            {
+                _FinalConfigOemIdStatus = value;
+                OnPropertyChanged(nameof(FinalConfigOemIdStatus));
+            }
+        }
+
+        private bool? _FinalConfigFastBootStatus = null;
+        public bool? FinalConfigFastBootStatus
+        {
+            get
+            {
+                return _FinalConfigFastBootStatus;
+            }
+            set
+            {
+                _FinalConfigFastBootStatus = value;
+                OnPropertyChanged(nameof(FinalConfigFastBootStatus));
+            }
+        }
+
+        private bool? _FinalConfigSpdmSecModeStatus = null;
+        public bool? FinalConfigSpdmSecModeStatus
+        {
+            get
+            {
+                return _FinalConfigSpdmSecModeStatus;
+            }
+            set
+            {
+                _FinalConfigSpdmSecModeStatus = value;
+                OnPropertyChanged(nameof(FinalConfigSpdmSecModeStatus));
+            }
+        }
+
+        private bool? _FinalConfigRpmWdogStatus = null;
+        public bool? FinalConfigRpmWdogStatus
+        {
+            get
+            {
+                return _FinalConfigRpmWdogStatus;
+            }
+            set
+            {
+                _FinalConfigRpmWdogStatus = value;
+                OnPropertyChanged(nameof(FinalConfigRpmWdogStatus));
+            }
+        }
+
+        private bool? _FinalConfigSsmStatus = null;
+        public bool? FinalConfigSsmStatus
+        {
+            get
+            {
+                return _FinalConfigSsmStatus;
+            }
+            set
+            {
+                _FinalConfigSsmStatus = value;
+                OnPropertyChanged(nameof(FinalConfigSsmStatus));
+            }
+        }
+        #endregion
+
+        internal void RebootTo(string Mode)
+        {
+            switch (Mode)
+            {
+                case "Normal":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Normal);
+                    break;
+                case "Label":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
+                    break;
+                case "MassStorage":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
+                    break;
+                default:
+                    return;
+            }
+        }
+    }
+}
diff --git a/ViewModels/NokiaLabelViewModel.cs b/WPinternals/ViewModels/NokiaLabelViewModel.cs
similarity index 97%
rename from ViewModels/NokiaLabelViewModel.cs
rename to WPinternals/ViewModels/NokiaLabelViewModel.cs
index a385c29..4c136b4 100644
--- a/ViewModels/NokiaLabelViewModel.cs
+++ b/WPinternals/ViewModels/NokiaLabelViewModel.cs
@@ -1,297 +1,297 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-
-namespace WPinternals
-{
-    // Create this class on the UI thread, after the main-window of the application is initialized.
-    // It is necessary to create the object on the UI thread, because notification events to the View need to be fired on that thread.
-    // The Model for this ViewModel communicates over USB and for that it uses the hWnd of the main window.
-    // Therefore the main window must be created before the ViewModel is created.
-
-    internal class NokiaLabelViewModel : ContextViewModel
-    {
-        private readonly NokiaPhoneModel CurrentModel;
-        private readonly Action<PhoneInterfaces> RequestModeSwitch;
-
-        internal NokiaLabelViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces> RequestModeSwitch)
-            : base()
-        {
-            this.RequestModeSwitch = RequestModeSwitch;
-
-            this.CurrentModel = CurrentModel;
-
-            new Thread(() => StartLoadDeviceInfo()).Start();
-        }
-
-        private void StartLoadDeviceInfo()
-        {
-            //byte[] Imsi = CurrentModel.ExecuteJsonMethodAsBytes("ReadImsi", "Imsi"); // 9 bytes: 08 29 40 40 ...
-            //string BatteryLevel = CurrentModel.ExecuteJsonMethodAsString("ReadBatteryLevel", "BatteryLevel");
-            //string SystemAsicVersion = CurrentModel.ExecuteJsonMethodAsString("ReadSystemAsicVersion", "SystemAsicVersion"); // 8960 -> Chip SOC version
-            //string OperatorName = CurrentModel.ExecuteJsonMethodAsString("ReadOperatorName", "OperatorName"); // 000-DK
-            //string ManufacturerModelName = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName"); // RM-821_eu_denmark_251
-            //string AkVersion = CurrentModel.ExecuteJsonMethodAsString("ReadAkVersion", "AkVersion"); // 9200.10521
-            //string BspVersion = CurrentModel.ExecuteJsonMethodAsString("ReadBspVersion", "BspVersion"); // 3051.40000
-            //string ProductCode = CurrentModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode"); // 059Q9D7
-            //string SecurityMode = CurrentModel.ExecuteJsonMethodAsString("GetSecurityMode", "SecMode"); // Restricted
-            //string SerialNumber = CurrentModel.ExecuteJsonMethodAsString("ReadSerialNumber", "SerialNumber"); // 356355051883955 = IMEI
-            //string SwVersion = CurrentModel.ExecuteJsonMethodAsString("ReadSwVersion", "SwVersion"); // 3051.40000.1349.0007
-            //string ModuleCode = CurrentModel.ExecuteJsonMethodAsString("ReadModuleCode", "ModuleCode"); // 0205137
-            //byte[] PublicId = CurrentModel.ExecuteJsonMethodAsBytes("ReadPublicId", "PublicId"); // 0x14 bytes: a5 e5 ...
-            //string Psn = CurrentModel.ExecuteJsonMethodAsString("ReadPsn", "Psn"); // CEP737370
-            //string HwVersion = CurrentModel.ExecuteJsonMethodAsString("ReadHwVersion", "HWVersion"); // 6504 = 6.5.0.4
-            //byte[] BtId = CurrentModel.ExecuteJsonMethodAsBytes("ReadBtId", "BtId"); // 6 bytes: bc c6 ...
-            //byte[] WlanMacAddress1 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress1"); // 6 bytes
-            //byte[] WlanMacAddress2 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress2"); // same
-            //byte[] WlanMacAddress3 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress3"); // same
-            //bool SimlockActive = CurrentModel.ExecuteJsonMethodAsBoolean("ReadSimlockActive", "SimLockActive"); // false
-            //string Version = CurrentModel.ExecuteJsonMethodAsString("GetVersion", "HelloString"); // Resultvars: HelloString Version BuildDate BuildType
-            //string ServiceTag = CurrentModel.ExecuteJsonMethodAsString("ReadServiceTag", "ServiceTag"); // error
-            //byte[] RfChipsetVersion = CurrentModel.ExecuteJsonMethodAsBytes("ReadRfChipsetVersion", "RfChipsetVersion"); // error
-            //byte[] Meid = CurrentModel.ExecuteJsonMethodAsBytes("ReadMeid", "Meid"); // error
-            //string Test = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturingData", ""); -> This method is only possible in Label-mode.
-
-            byte[] AsskMask = new byte[0x10] { 1, 0, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64 };
-            byte[] Challenge = new byte[0x88];
-            Dictionary<string, object> Params = new();
-            Params.Add("AsskMask", AsskMask);
-            Params.Add("Challenge", Challenge);
-            Params.Add("AsicIndex", 0);
-            byte[] TerminalResponseBytes = CurrentModel.ExecuteJsonMethodAsBytes("TerminalChallenge", Params, "TerminalResponse");
-            if (TerminalResponseBytes != null)
-            {
-                TerminalResponse TerminalResponse = Terminal.Parse(TerminalResponseBytes, 0);
-                if (TerminalResponse != null)
-                {
-                    PublicID = TerminalResponse.PublicId;
-                    LogFile.Log("Public ID: " + Converter.ConvertHexToString(PublicID, " "));
-                    RootKeyHash = TerminalResponse.RootKeyHash;
-                    LogFile.Log("RootKeyHash: " + Converter.ConvertHexToString(RootKeyHash, " "));
-                }
-            }
-
-            ManufacturerModelName = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName"); // RM-821_eu_denmark_251
-            LogFile.Log("Manufacturer Model Name: " + ManufacturerModelName);
-            ProductCode = CurrentModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode"); // 059Q9D7
-            LogFile.Log("Product Code: " + ProductCode);
-            Firmware = CurrentModel.ExecuteJsonMethodAsString("ReadSwVersion", "SwVersion"); // 3051.40000.1349.0007
-            LogFile.Log("Firmware: " + Firmware);
-
-            IMEI = CurrentModel.ExecuteJsonMethodAsString("ReadSerialNumber", "SerialNumber"); // IMEI
-            LogFile.Log("IMEI: " + IMEI);
-            BluetoothMac = CurrentModel.ExecuteJsonMethodAsBytes("ReadBtId", "BtId"); // 6 bytes: bc c6 ...
-            LogFile.Log("Bluetooth MAC: " + Converter.ConvertHexToString(BluetoothMac, " "));
-            WlanMac = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress1"); // 6 bytes
-            LogFile.Log("WLAN MAC: " + Converter.ConvertHexToString(WlanMac, " "));
-
-            IsBootloaderSecurityEnabled = (bool)CurrentModel.ExecuteJsonMethodAsBoolean("ReadProductionDoneState", "ProductionDone");
-            LogFile.Log("Bootloader Security: " + ((bool)IsBootloaderSecurityEnabled ? "Enabled" : "Disabled"));
-
-            Params = new Dictionary<string, object>
-            {
-                { "ID", 3534 },
-                { "NVData", new byte[] { 0 } }
-            };
-            CurrentModel.ExecuteJsonMethod("WriteNVData", Params); // Error: 150
-
-            Params = new Dictionary<string, object>
-            {
-                { "ID", 3534 }
-            };
-            byte[] NV3534 = CurrentModel.ExecuteJsonMethodAsBytes("ReadNVData", Params, "NVData"); // Error: value not written
-        }
-
-        private string _ProductCode = null;
-        public string ProductCode
-        {
-            get
-            {
-                return _ProductCode;
-            }
-            set
-            {
-                _ProductCode = value;
-                OnPropertyChanged(nameof(ProductCode));
-            }
-        }
-
-        private string _ManufacturerModelName = null;
-        public string ManufacturerModelName
-        {
-            get
-            {
-                return _ManufacturerModelName;
-            }
-            set
-            {
-                _ManufacturerModelName = value;
-                OnPropertyChanged(nameof(ManufacturerModelName));
-            }
-        }
-
-        private string _Operator = null;
-        public string Operator
-        {
-            get
-            {
-                return _Operator;
-            }
-            set
-            {
-                _Operator = value;
-                OnPropertyChanged(nameof(Operator));
-            }
-        }
-
-        private string _Firmware = null;
-        public string Firmware
-        {
-            get
-            {
-                return _Firmware;
-            }
-            set
-            {
-                _Firmware = value;
-                OnPropertyChanged(nameof(Firmware));
-            }
-        }
-
-        private string _IMEI = null;
-        public string IMEI
-        {
-            get
-            {
-                return _IMEI;
-            }
-            set
-            {
-                _IMEI = value;
-                OnPropertyChanged(nameof(IMEI));
-            }
-        }
-
-        private byte[] _PublicID = null;
-        public byte[] PublicID
-        {
-            get
-            {
-                return _PublicID;
-            }
-            set
-            {
-                _PublicID = value;
-                OnPropertyChanged(nameof(PublicID));
-            }
-        }
-
-        private byte[] _RootKeyHash = null;
-        public byte[] RootKeyHash
-        {
-            get
-            {
-                return _RootKeyHash;
-            }
-            set
-            {
-                _RootKeyHash = value;
-                OnPropertyChanged(nameof(RootKeyHash));
-            }
-        }
-
-        private byte[] _WlanMac = null;
-        public byte[] WlanMac
-        {
-            get
-            {
-                return _WlanMac;
-            }
-            set
-            {
-                _WlanMac = value;
-                OnPropertyChanged(nameof(WlanMac));
-            }
-        }
-
-        private byte[] _BluetoothMac = null;
-        public byte[] BluetoothMac
-        {
-            get
-            {
-                return _BluetoothMac;
-            }
-            set
-            {
-                _BluetoothMac = value;
-                OnPropertyChanged(nameof(BluetoothMac));
-            }
-        }
-
-        private bool? _IsBootloaderSecurityEnabled = null;
-        public bool? IsBootloaderSecurityEnabled
-        {
-            get
-            {
-                return _IsBootloaderSecurityEnabled;
-            }
-            set
-            {
-                _IsBootloaderSecurityEnabled = value;
-                OnPropertyChanged(nameof(IsBootloaderSecurityEnabled));
-            }
-        }
-
-        private bool? _IsSimLocked = null;
-        public bool? IsSimLocked
-        {
-            get
-            {
-                return _IsSimLocked;
-            }
-            set
-            {
-                _IsSimLocked = value;
-                OnPropertyChanged(nameof(IsSimLocked));
-            }
-        }
-
-        public void RebootTo(string Mode)
-        {
-            switch (Mode)
-            {
-                case "Flash":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
-                    break;
-                case "Label":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
-                    break;
-                case "MassStorage":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
-                    break;
-                default:
-                    return;
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace WPinternals
+{
+    // Create this class on the UI thread, after the main-window of the application is initialized.
+    // It is necessary to create the object on the UI thread, because notification events to the View need to be fired on that thread.
+    // The Model for this ViewModel communicates over USB and for that it uses the hWnd of the main window.
+    // Therefore the main window must be created before the ViewModel is created.
+
+    internal class NokiaLabelViewModel : ContextViewModel
+    {
+        private readonly NokiaPhoneModel CurrentModel;
+        private readonly Action<PhoneInterfaces> RequestModeSwitch;
+
+        internal NokiaLabelViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces> RequestModeSwitch)
+            : base()
+        {
+            this.RequestModeSwitch = RequestModeSwitch;
+
+            this.CurrentModel = CurrentModel;
+
+            new Thread(() => StartLoadDeviceInfo()).Start();
+        }
+
+        private void StartLoadDeviceInfo()
+        {
+            //byte[] Imsi = CurrentModel.ExecuteJsonMethodAsBytes("ReadImsi", "Imsi"); // 9 bytes: 08 29 40 40 ...
+            //string BatteryLevel = CurrentModel.ExecuteJsonMethodAsString("ReadBatteryLevel", "BatteryLevel");
+            //string SystemAsicVersion = CurrentModel.ExecuteJsonMethodAsString("ReadSystemAsicVersion", "SystemAsicVersion"); // 8960 -> Chip SOC version
+            //string OperatorName = CurrentModel.ExecuteJsonMethodAsString("ReadOperatorName", "OperatorName"); // 000-DK
+            //string ManufacturerModelName = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName"); // RM-821_eu_denmark_251
+            //string AkVersion = CurrentModel.ExecuteJsonMethodAsString("ReadAkVersion", "AkVersion"); // 9200.10521
+            //string BspVersion = CurrentModel.ExecuteJsonMethodAsString("ReadBspVersion", "BspVersion"); // 3051.40000
+            //string ProductCode = CurrentModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode"); // 059Q9D7
+            //string SecurityMode = CurrentModel.ExecuteJsonMethodAsString("GetSecurityMode", "SecMode"); // Restricted
+            //string SerialNumber = CurrentModel.ExecuteJsonMethodAsString("ReadSerialNumber", "SerialNumber"); // 356355051883955 = IMEI
+            //string SwVersion = CurrentModel.ExecuteJsonMethodAsString("ReadSwVersion", "SwVersion"); // 3051.40000.1349.0007
+            //string ModuleCode = CurrentModel.ExecuteJsonMethodAsString("ReadModuleCode", "ModuleCode"); // 0205137
+            //byte[] PublicId = CurrentModel.ExecuteJsonMethodAsBytes("ReadPublicId", "PublicId"); // 0x14 bytes: a5 e5 ...
+            //string Psn = CurrentModel.ExecuteJsonMethodAsString("ReadPsn", "Psn"); // CEP737370
+            //string HwVersion = CurrentModel.ExecuteJsonMethodAsString("ReadHwVersion", "HWVersion"); // 6504 = 6.5.0.4
+            //byte[] BtId = CurrentModel.ExecuteJsonMethodAsBytes("ReadBtId", "BtId"); // 6 bytes: bc c6 ...
+            //byte[] WlanMacAddress1 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress1"); // 6 bytes
+            //byte[] WlanMacAddress2 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress2"); // same
+            //byte[] WlanMacAddress3 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress3"); // same
+            //bool SimlockActive = CurrentModel.ExecuteJsonMethodAsBoolean("ReadSimlockActive", "SimLockActive"); // false
+            //string Version = CurrentModel.ExecuteJsonMethodAsString("GetVersion", "HelloString"); // Resultvars: HelloString Version BuildDate BuildType
+            //string ServiceTag = CurrentModel.ExecuteJsonMethodAsString("ReadServiceTag", "ServiceTag"); // error
+            //byte[] RfChipsetVersion = CurrentModel.ExecuteJsonMethodAsBytes("ReadRfChipsetVersion", "RfChipsetVersion"); // error
+            //byte[] Meid = CurrentModel.ExecuteJsonMethodAsBytes("ReadMeid", "Meid"); // error
+            //string Test = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturingData", ""); -> This method is only possible in Label-mode.
+
+            byte[] AsskMask = new byte[0x10] { 1, 0, 16, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64 };
+            byte[] Challenge = new byte[0x88];
+            Dictionary<string, object> Params = new();
+            Params.Add("AsskMask", AsskMask);
+            Params.Add("Challenge", Challenge);
+            Params.Add("AsicIndex", 0);
+            byte[] TerminalResponseBytes = CurrentModel.ExecuteJsonMethodAsBytes("TerminalChallenge", Params, "TerminalResponse");
+            if (TerminalResponseBytes != null)
+            {
+                TerminalResponse TerminalResponse = Terminal.Parse(TerminalResponseBytes, 0);
+                if (TerminalResponse != null)
+                {
+                    PublicID = TerminalResponse.PublicId;
+                    LogFile.Log("Public ID: " + Converter.ConvertHexToString(PublicID, " "));
+                    RootKeyHash = TerminalResponse.RootKeyHash;
+                    LogFile.Log("RootKeyHash: " + Converter.ConvertHexToString(RootKeyHash, " "));
+                }
+            }
+
+            ManufacturerModelName = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName"); // RM-821_eu_denmark_251
+            LogFile.Log("Manufacturer Model Name: " + ManufacturerModelName);
+            ProductCode = CurrentModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode"); // 059Q9D7
+            LogFile.Log("Product Code: " + ProductCode);
+            Firmware = CurrentModel.ExecuteJsonMethodAsString("ReadSwVersion", "SwVersion"); // 3051.40000.1349.0007
+            LogFile.Log("Firmware: " + Firmware);
+
+            IMEI = CurrentModel.ExecuteJsonMethodAsString("ReadSerialNumber", "SerialNumber"); // IMEI
+            LogFile.Log("IMEI: " + IMEI);
+            BluetoothMac = CurrentModel.ExecuteJsonMethodAsBytes("ReadBtId", "BtId"); // 6 bytes: bc c6 ...
+            LogFile.Log("Bluetooth MAC: " + Converter.ConvertHexToString(BluetoothMac, " "));
+            WlanMac = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress1"); // 6 bytes
+            LogFile.Log("WLAN MAC: " + Converter.ConvertHexToString(WlanMac, " "));
+
+            IsBootloaderSecurityEnabled = (bool)CurrentModel.ExecuteJsonMethodAsBoolean("ReadProductionDoneState", "ProductionDone");
+            LogFile.Log("Bootloader Security: " + ((bool)IsBootloaderSecurityEnabled ? "Enabled" : "Disabled"));
+
+            Params = new Dictionary<string, object>
+            {
+                { "ID", 3534 },
+                { "NVData", new byte[] { 0 } }
+            };
+            CurrentModel.ExecuteJsonMethod("WriteNVData", Params); // Error: 150
+
+            Params = new Dictionary<string, object>
+            {
+                { "ID", 3534 }
+            };
+            byte[] NV3534 = CurrentModel.ExecuteJsonMethodAsBytes("ReadNVData", Params, "NVData"); // Error: value not written
+        }
+
+        private string _ProductCode = null;
+        public string ProductCode
+        {
+            get
+            {
+                return _ProductCode;
+            }
+            set
+            {
+                _ProductCode = value;
+                OnPropertyChanged(nameof(ProductCode));
+            }
+        }
+
+        private string _ManufacturerModelName = null;
+        public string ManufacturerModelName
+        {
+            get
+            {
+                return _ManufacturerModelName;
+            }
+            set
+            {
+                _ManufacturerModelName = value;
+                OnPropertyChanged(nameof(ManufacturerModelName));
+            }
+        }
+
+        private string _Operator = null;
+        public string Operator
+        {
+            get
+            {
+                return _Operator;
+            }
+            set
+            {
+                _Operator = value;
+                OnPropertyChanged(nameof(Operator));
+            }
+        }
+
+        private string _Firmware = null;
+        public string Firmware
+        {
+            get
+            {
+                return _Firmware;
+            }
+            set
+            {
+                _Firmware = value;
+                OnPropertyChanged(nameof(Firmware));
+            }
+        }
+
+        private string _IMEI = null;
+        public string IMEI
+        {
+            get
+            {
+                return _IMEI;
+            }
+            set
+            {
+                _IMEI = value;
+                OnPropertyChanged(nameof(IMEI));
+            }
+        }
+
+        private byte[] _PublicID = null;
+        public byte[] PublicID
+        {
+            get
+            {
+                return _PublicID;
+            }
+            set
+            {
+                _PublicID = value;
+                OnPropertyChanged(nameof(PublicID));
+            }
+        }
+
+        private byte[] _RootKeyHash = null;
+        public byte[] RootKeyHash
+        {
+            get
+            {
+                return _RootKeyHash;
+            }
+            set
+            {
+                _RootKeyHash = value;
+                OnPropertyChanged(nameof(RootKeyHash));
+            }
+        }
+
+        private byte[] _WlanMac = null;
+        public byte[] WlanMac
+        {
+            get
+            {
+                return _WlanMac;
+            }
+            set
+            {
+                _WlanMac = value;
+                OnPropertyChanged(nameof(WlanMac));
+            }
+        }
+
+        private byte[] _BluetoothMac = null;
+        public byte[] BluetoothMac
+        {
+            get
+            {
+                return _BluetoothMac;
+            }
+            set
+            {
+                _BluetoothMac = value;
+                OnPropertyChanged(nameof(BluetoothMac));
+            }
+        }
+
+        private bool? _IsBootloaderSecurityEnabled = null;
+        public bool? IsBootloaderSecurityEnabled
+        {
+            get
+            {
+                return _IsBootloaderSecurityEnabled;
+            }
+            set
+            {
+                _IsBootloaderSecurityEnabled = value;
+                OnPropertyChanged(nameof(IsBootloaderSecurityEnabled));
+            }
+        }
+
+        private bool? _IsSimLocked = null;
+        public bool? IsSimLocked
+        {
+            get
+            {
+                return _IsSimLocked;
+            }
+            set
+            {
+                _IsSimLocked = value;
+                OnPropertyChanged(nameof(IsSimLocked));
+            }
+        }
+
+        public void RebootTo(string Mode)
+        {
+            switch (Mode)
+            {
+                case "Flash":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
+                    break;
+                case "Label":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
+                    break;
+                case "MassStorage":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
+                    break;
+                default:
+                    return;
+            }
+        }
+    }
+}
diff --git a/ViewModels/NokiaMassStorageViewModel.cs b/WPinternals/ViewModels/NokiaMassStorageViewModel.cs
similarity index 97%
rename from ViewModels/NokiaMassStorageViewModel.cs
rename to WPinternals/ViewModels/NokiaMassStorageViewModel.cs
index afd1275..9e3405a 100644
--- a/ViewModels/NokiaMassStorageViewModel.cs
+++ b/WPinternals/ViewModels/NokiaMassStorageViewModel.cs
@@ -1,35 +1,35 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-namespace WPinternals
-{
-    internal class NokiaMassStorageViewModel : ContextViewModel
-    {
-        private readonly MassStorage CurrentModel;
-
-        internal NokiaMassStorageViewModel(MassStorage CurrentModel)
-            : base()
-        {
-            this.CurrentModel = CurrentModel;
-            Drive = CurrentModel.Drive;
-        }
-        public string Drive { get; } = null;
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+namespace WPinternals
+{
+    internal class NokiaMassStorageViewModel : ContextViewModel
+    {
+        private readonly MassStorage CurrentModel;
+
+        internal NokiaMassStorageViewModel(MassStorage CurrentModel)
+            : base()
+        {
+            this.CurrentModel = CurrentModel;
+            Drive = CurrentModel.Drive;
+        }
+        public string Drive { get; } = null;
+    }
+}
diff --git a/ViewModels/NokiaModeBootloaderViewModel.cs b/WPinternals/ViewModels/NokiaModeBootloaderViewModel.cs
similarity index 100%
rename from ViewModels/NokiaModeBootloaderViewModel.cs
rename to WPinternals/ViewModels/NokiaModeBootloaderViewModel.cs
diff --git a/ViewModels/NokiaModeFlashViewModel.cs b/WPinternals/ViewModels/NokiaModeFlashViewModel.cs
similarity index 97%
rename from ViewModels/NokiaModeFlashViewModel.cs
rename to WPinternals/ViewModels/NokiaModeFlashViewModel.cs
index 50b2d02..f8b0ac6 100644
--- a/ViewModels/NokiaModeFlashViewModel.cs
+++ b/WPinternals/ViewModels/NokiaModeFlashViewModel.cs
@@ -1,120 +1,120 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal class NokiaModeFlashViewModel : ContextViewModel
-    {
-        private readonly NokiaFlashModel CurrentModel;
-        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
-        private readonly object LockDeviceInfo = new();
-        private bool DeviceInfoLoaded = false;
-
-        internal NokiaModeFlashViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
-            : base()
-        {
-            this.CurrentModel = (NokiaFlashModel)CurrentModel;
-            this.RequestModeSwitch = RequestModeSwitch;
-        }
-
-        internal override void EvaluateViewState()
-        {
-            if (IsActive)
-            {
-                new Thread(() => StartLoadDeviceInfo()).Start();
-            }
-        }
-
-        private bool? _EffectiveBootloaderSecurityStatus = null;
-        public bool? EffectiveBootloaderSecurityStatus
-        {
-            get
-            {
-                return _EffectiveBootloaderSecurityStatus;
-            }
-            set
-            {
-                _EffectiveBootloaderSecurityStatus = value;
-                OnPropertyChanged(nameof(EffectiveBootloaderSecurityStatus));
-            }
-        }
-
-        internal void StartLoadDeviceInfo()
-        {
-            lock (LockDeviceInfo)
-            {
-                if (!DeviceInfoLoaded)
-                {
-                    try
-                    {
-                        PhoneInfo Info = CurrentModel.ReadPhoneInfo();
-
-                        if (Info.FlashAppProtocolVersionMajor < 2)
-                        {
-                            UefiSecurityStatusResponse SecurityStatus = CurrentModel.ReadSecurityStatus();
-
-                            EffectiveBootloaderSecurityStatus = SecurityStatus != null
-                                ? SecurityStatus.SecureFfuEfuseStatus && !SecurityStatus.AuthenticationStatus && !SecurityStatus.RdcStatus
-                                : !Info.IsBootloaderSecure;
-                        }
-                        else
-                        {
-                            EffectiveBootloaderSecurityStatus = Info.UefiSecureBootEnabled;
-                        }
-
-                        LogFile.Log("Effective Bootloader Security Status: " + EffectiveBootloaderSecurityStatus.ToString());
-                    }
-                    catch
-                    {
-                        LogFile.Log("Reading status from Flash interface was aborted.");
-                    }
-                    DeviceInfoLoaded = true;
-                }
-            }
-        }
-
-        internal void RebootTo(string Mode)
-        {
-            switch (Mode)
-            {
-                case "Normal":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Normal);
-                    break;
-                case "Flash":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
-                    break;
-                case "Label":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
-                    break;
-                case "MassStorage":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
-                    break;
-                case "Shutdown":
-                    RequestModeSwitch(null);
-                    break;
-                default:
-                    return;
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal class NokiaModeFlashViewModel : ContextViewModel
+    {
+        private readonly NokiaFlashModel CurrentModel;
+        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
+        private readonly object LockDeviceInfo = new();
+        private bool DeviceInfoLoaded = false;
+
+        internal NokiaModeFlashViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
+            : base()
+        {
+            this.CurrentModel = (NokiaFlashModel)CurrentModel;
+            this.RequestModeSwitch = RequestModeSwitch;
+        }
+
+        internal override void EvaluateViewState()
+        {
+            if (IsActive)
+            {
+                new Thread(() => StartLoadDeviceInfo()).Start();
+            }
+        }
+
+        private bool? _EffectiveBootloaderSecurityStatus = null;
+        public bool? EffectiveBootloaderSecurityStatus
+        {
+            get
+            {
+                return _EffectiveBootloaderSecurityStatus;
+            }
+            set
+            {
+                _EffectiveBootloaderSecurityStatus = value;
+                OnPropertyChanged(nameof(EffectiveBootloaderSecurityStatus));
+            }
+        }
+
+        internal void StartLoadDeviceInfo()
+        {
+            lock (LockDeviceInfo)
+            {
+                if (!DeviceInfoLoaded)
+                {
+                    try
+                    {
+                        PhoneInfo Info = CurrentModel.ReadPhoneInfo();
+
+                        if (Info.FlashAppProtocolVersionMajor < 2)
+                        {
+                            UefiSecurityStatusResponse SecurityStatus = CurrentModel.ReadSecurityStatus();
+
+                            EffectiveBootloaderSecurityStatus = SecurityStatus != null
+                                ? SecurityStatus.SecureFfuEfuseStatus && !SecurityStatus.AuthenticationStatus && !SecurityStatus.RdcStatus
+                                : !Info.IsBootloaderSecure;
+                        }
+                        else
+                        {
+                            EffectiveBootloaderSecurityStatus = Info.UefiSecureBootEnabled;
+                        }
+
+                        LogFile.Log("Effective Bootloader Security Status: " + EffectiveBootloaderSecurityStatus.ToString());
+                    }
+                    catch
+                    {
+                        LogFile.Log("Reading status from Flash interface was aborted.");
+                    }
+                    DeviceInfoLoaded = true;
+                }
+            }
+        }
+
+        internal void RebootTo(string Mode)
+        {
+            switch (Mode)
+            {
+                case "Normal":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Normal);
+                    break;
+                case "Flash":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
+                    break;
+                case "Label":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
+                    break;
+                case "MassStorage":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
+                    break;
+                case "Shutdown":
+                    RequestModeSwitch(null);
+                    break;
+                default:
+                    return;
+            }
+        }
+    }
+}
diff --git a/ViewModels/NokiaModeLabelViewModel.cs b/WPinternals/ViewModels/NokiaModeLabelViewModel.cs
similarity index 97%
rename from ViewModels/NokiaModeLabelViewModel.cs
rename to WPinternals/ViewModels/NokiaModeLabelViewModel.cs
index 3f467f1..8ad5834 100644
--- a/ViewModels/NokiaModeLabelViewModel.cs
+++ b/WPinternals/ViewModels/NokiaModeLabelViewModel.cs
@@ -1,58 +1,58 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace WPinternals
-{
-    internal class NokiaModeLabelViewModel : ContextViewModel
-    {
-        private readonly NokiaPhoneModel CurrentModel;
-        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
-
-        internal NokiaModeLabelViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
-            : base()
-        {
-            this.CurrentModel = CurrentModel;
-            this.RequestModeSwitch = RequestModeSwitch;
-        }
-
-        public void RebootTo(string Mode)
-        {
-            switch (Mode)
-            {
-                case "Normal":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Normal);
-                    break;
-                case "Flash":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
-                    break;
-                case "Label":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
-                    break;
-                case "MassStorage":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
-                    break;
-                default:
-                    return;
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+
+namespace WPinternals
+{
+    internal class NokiaModeLabelViewModel : ContextViewModel
+    {
+        private readonly NokiaPhoneModel CurrentModel;
+        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
+
+        internal NokiaModeLabelViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
+            : base()
+        {
+            this.CurrentModel = CurrentModel;
+            this.RequestModeSwitch = RequestModeSwitch;
+        }
+
+        public void RebootTo(string Mode)
+        {
+            switch (Mode)
+            {
+                case "Normal":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Normal);
+                    break;
+                case "Flash":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
+                    break;
+                case "Label":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
+                    break;
+                case "MassStorage":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
+                    break;
+                default:
+                    return;
+            }
+        }
+    }
+}
diff --git a/ViewModels/NokiaModeMassStorageViewModel.cs b/WPinternals/ViewModels/NokiaModeMassStorageViewModel.cs
similarity index 97%
rename from ViewModels/NokiaModeMassStorageViewModel.cs
rename to WPinternals/ViewModels/NokiaModeMassStorageViewModel.cs
index 99c210a..b1f316b 100644
--- a/ViewModels/NokiaModeMassStorageViewModel.cs
+++ b/WPinternals/ViewModels/NokiaModeMassStorageViewModel.cs
@@ -1,80 +1,80 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace WPinternals
-{
-    internal class NokiaModeMassStorageViewModel : ContextViewModel
-    {
-        private readonly MassStorage CurrentModel;
-        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
-
-        internal NokiaModeMassStorageViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
-            : base()
-        {
-            this.CurrentModel = (MassStorage)CurrentModel;
-            this.RequestModeSwitch = RequestModeSwitch;
-        }
-
-        private bool _SupportsReboot = false;
-        public bool SupportsReboot
-        {
-            get
-            {
-                return _SupportsReboot;
-            }
-            set
-            {
-                _SupportsReboot = value;
-                OnPropertyChanged(nameof(SupportsReboot));
-            }
-        }
-
-        internal override void EvaluateViewState()
-        {
-            if (IsActive)
-            {
-                SupportsReboot = CurrentModel.DoesDeviceSupportReboot();
-            }
-        }
-
-        public void RebootTo(string Mode)
-        {
-            switch (Mode)
-            {
-                case "Normal":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Normal);
-                    break;
-                case "Label":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
-                    break;
-                case "Flash":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
-                    break;
-                case "Shutdown":
-                    RequestModeSwitch(null);
-                    break;
-                default:
-                    return;
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+
+namespace WPinternals
+{
+    internal class NokiaModeMassStorageViewModel : ContextViewModel
+    {
+        private readonly MassStorage CurrentModel;
+        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
+
+        internal NokiaModeMassStorageViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
+            : base()
+        {
+            this.CurrentModel = (MassStorage)CurrentModel;
+            this.RequestModeSwitch = RequestModeSwitch;
+        }
+
+        private bool _SupportsReboot = false;
+        public bool SupportsReboot
+        {
+            get
+            {
+                return _SupportsReboot;
+            }
+            set
+            {
+                _SupportsReboot = value;
+                OnPropertyChanged(nameof(SupportsReboot));
+            }
+        }
+
+        internal override void EvaluateViewState()
+        {
+            if (IsActive)
+            {
+                SupportsReboot = CurrentModel.DoesDeviceSupportReboot();
+            }
+        }
+
+        public void RebootTo(string Mode)
+        {
+            switch (Mode)
+            {
+                case "Normal":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Normal);
+                    break;
+                case "Label":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
+                    break;
+                case "Flash":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
+                    break;
+                case "Shutdown":
+                    RequestModeSwitch(null);
+                    break;
+                default:
+                    return;
+            }
+        }
+    }
+}
diff --git a/ViewModels/NokiaModeNormalViewModel.cs b/WPinternals/ViewModels/NokiaModeNormalViewModel.cs
similarity index 97%
rename from ViewModels/NokiaModeNormalViewModel.cs
rename to WPinternals/ViewModels/NokiaModeNormalViewModel.cs
index fb513e7..d3d88cb 100644
--- a/ViewModels/NokiaModeNormalViewModel.cs
+++ b/WPinternals/ViewModels/NokiaModeNormalViewModel.cs
@@ -1,55 +1,55 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-
-namespace WPinternals
-{
-    internal class NokiaModeNormalViewModel : ContextViewModel
-    {
-        private readonly NokiaPhoneModel CurrentModel;
-        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
-
-        internal NokiaModeNormalViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
-            : base()
-        {
-            this.CurrentModel = CurrentModel;
-            this.RequestModeSwitch = RequestModeSwitch;
-        }
-
-        public void RebootTo(string Mode)
-        {
-            switch (Mode)
-            {
-                case "Flash":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
-                    break;
-                case "Label":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
-                    break;
-                case "MassStorage":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
-                    break;
-                default:
-                    return;
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+
+namespace WPinternals
+{
+    internal class NokiaModeNormalViewModel : ContextViewModel
+    {
+        private readonly NokiaPhoneModel CurrentModel;
+        private readonly Action<PhoneInterfaces?> RequestModeSwitch;
+
+        internal NokiaModeNormalViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces?> RequestModeSwitch)
+            : base()
+        {
+            this.CurrentModel = CurrentModel;
+            this.RequestModeSwitch = RequestModeSwitch;
+        }
+
+        public void RebootTo(string Mode)
+        {
+            switch (Mode)
+            {
+                case "Flash":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
+                    break;
+                case "Label":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
+                    break;
+                case "MassStorage":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
+                    break;
+                default:
+                    return;
+            }
+        }
+    }
+}
diff --git a/ViewModels/NokiaNormalViewModel.cs b/WPinternals/ViewModels/NokiaNormalViewModel.cs
similarity index 97%
rename from ViewModels/NokiaNormalViewModel.cs
rename to WPinternals/ViewModels/NokiaNormalViewModel.cs
index cd84dc7..45064bf 100644
--- a/ViewModels/NokiaNormalViewModel.cs
+++ b/WPinternals/ViewModels/NokiaNormalViewModel.cs
@@ -1,395 +1,395 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Threading;
-
-namespace WPinternals
-{
-    // Create this class on the UI thread, after the main-window of the application is initialized.
-    // It is necessary to create the object on the UI thread, because notification events to the View need to be fired on that thread.
-    // The Model for this ViewModel communicates over USB and for that it uses the hWnd of the main window.
-    // Therefore the main window must be created before the ViewModel is created.
-
-    internal class NokiaNormalViewModel : ContextViewModel
-    {
-        private readonly NokiaPhoneModel CurrentModel;
-        private readonly Action<PhoneInterfaces> RequestModeSwitch;
-
-        internal NokiaNormalViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces> RequestModeSwitch)
-            : base()
-        {
-            this.CurrentModel = CurrentModel;
-            this.RequestModeSwitch = RequestModeSwitch;
-
-            new Thread(() => StartLoadDeviceInfo()).Start();
-        }
-
-        private void StartLoadDeviceInfo()
-        {
-            try
-            {
-                Operator = CurrentModel.ExecuteJsonMethodAsString("ReadOperatorName", "OperatorName"); // 000-NL
-                LogFile.Log("Operator: " + Operator);
-                ManufacturerModelName = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName"); // RM-821_eu_denmark_251
-                LogFile.Log("Manufacturer Model Name: " + ManufacturerModelName);
-                ProductCode = CurrentModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode"); // 059Q9D7
-                LogFile.Log("Product Code: " + ProductCode);
-                Firmware = CurrentModel.ExecuteJsonMethodAsString("ReadSwVersion", "SwVersion"); // 3051.40000.1349.0007
-                LogFile.Log("Firmware: " + Firmware);
-                HWID = CurrentModel.ExecuteJsonMethodAsString("ReadHwVersion", "HWVersion"); // 1002
-                LogFile.Log("HWID: " + HWID);
-
-                IMEI = CurrentModel.ExecuteJsonMethodAsString("ReadSerialNumber", new System.Collections.Generic.Dictionary<string, object>() { { "SubscriptionId", 0 } }, "SerialNumber"); // IMEI
-                string IMEI2 = CurrentModel.ExecuteJsonMethodAsString("ReadSerialNumber", new System.Collections.Generic.Dictionary<string, object>() { { "SubscriptionId", 1 } }, "SerialNumber"); // IMEI 2
-
-                if (!string.IsNullOrEmpty(IMEI2))
-                {
-                    IMEI += "\n" + IMEI2;
-                }
-
-                LogFile.Log("IMEI: " + IMEI);
-                PublicID = CurrentModel.ExecuteJsonMethodAsBytes("ReadPublicId", "PublicId"); // 0x14 bytes: a5 e5 ...
-                LogFile.Log("Public ID: " + Converter.ConvertHexToString(PublicID, " "));
-                BluetoothMac = CurrentModel.ExecuteJsonMethodAsBytes("ReadBtId", "BtId"); // 6 bytes: bc c6 ...
-                LogFile.Log("Bluetooth MAC: " + Converter.ConvertHexToString(BluetoothMac, " "));
-                WlanMac1 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress1"); // 6 bytes
-                LogFile.Log("WLAN MAC 1: " + Converter.ConvertHexToString(WlanMac1, " "));
-                WlanMac2 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress2"); // 6 bytes
-                LogFile.Log("WLAN MAC 2: " + Converter.ConvertHexToString(WlanMac2, " "));
-                WlanMac3 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress3"); // 6 bytes
-                LogFile.Log("WLAN MAC 3: " + Converter.ConvertHexToString(WlanMac3, " "));
-                WlanMac4 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress4"); // 6 bytes
-                LogFile.Log("WLAN MAC 4: " + Converter.ConvertHexToString(WlanMac4, " "));
-
-                bool? ProductionDone = CurrentModel.ExecuteJsonMethodAsBoolean("ReadProductionDoneState", "ProductionDone");
-                IsBootloaderSecurityEnabled = ProductionDone == null
-                    ? CurrentModel.ExecuteJsonMethodAsString("GetSecurityMode", "SecMode").Contains("Restricted", StringComparison.OrdinalIgnoreCase)
-                    : CurrentModel.ExecuteJsonMethodAsString("GetSecurityMode", "SecMode").Contains("Restricted", StringComparison.OrdinalIgnoreCase) && (bool)CurrentModel.ExecuteJsonMethodAsBoolean("ReadProductionDoneState", "ProductionDone");
-
-                LogFile.Log("Bootloader Security: " + ((bool)IsBootloaderSecurityEnabled ? "Enabled" : "Disabled"));
-                IsSimLocked = CurrentModel.ExecuteJsonMethodAsBoolean("ReadSimlockActive", "SimLockActive");
-                LogFile.Log("Simlock: " + ((bool)IsSimLocked ? "Active" : "Unlocked"));
-
-                string BootPolicy = CurrentModel.ExecuteJsonMethodAsString("GetUefiCertificateStatus", "BootPolicy");
-                string Db = CurrentModel.ExecuteJsonMethodAsString("GetUefiCertificateStatus", "Db");
-                string Dbx = CurrentModel.ExecuteJsonMethodAsString("GetUefiCertificateStatus", "Dbx");
-                string Kek = CurrentModel.ExecuteJsonMethodAsString("GetUefiCertificateStatus", "Kek");
-                string Pk = CurrentModel.ExecuteJsonMethodAsString("GetUefiCertificateStatus", "Pk");
-
-                this.BootPolicy = BootPolicy;
-                LogFile.Log("Boot policy: " + BootPolicy);
-                this.Db = Db;
-                LogFile.Log("DB: " + Db);
-                this.Dbx = Dbx;
-                LogFile.Log("DBX: " + Dbx);
-                this.Kek = Kek;
-                LogFile.Log("KEK: " + Kek);
-                this.Pk = Pk;
-                LogFile.Log("PK: " + Pk);
-            }
-            catch { }
-        }
-
-        private string _ProductCode = null;
-        public string ProductCode
-        {
-            get
-            {
-                return _ProductCode;
-            }
-            set
-            {
-                _ProductCode = value;
-                OnPropertyChanged(nameof(ProductCode));
-            }
-        }
-
-        private string _ManufacturerModelName = null;
-        public string ManufacturerModelName
-        {
-            get
-            {
-                return _ManufacturerModelName;
-            }
-            set
-            {
-                _ManufacturerModelName = value;
-                OnPropertyChanged(nameof(ManufacturerModelName));
-            }
-        }
-
-        private string _Operator = null;
-        public string Operator
-        {
-            get
-            {
-                return _Operator;
-            }
-            set
-            {
-                _Operator = value;
-                OnPropertyChanged(nameof(Operator));
-            }
-        }
-
-        private string _Firmware = null;
-        public string Firmware
-        {
-            get
-            {
-                return _Firmware;
-            }
-            set
-            {
-                _Firmware = value;
-                OnPropertyChanged(nameof(Firmware));
-            }
-        }
-
-        private string _HWID = null;
-        public string HWID
-        {
-            get
-            {
-                return _HWID;
-            }
-            set
-            {
-                _HWID = value;
-                OnPropertyChanged(nameof(HWID));
-            }
-        }
-
-        private string _IMEI = null;
-        public string IMEI
-        {
-            get
-            {
-                return _IMEI;
-            }
-            set
-            {
-                _IMEI = value;
-                OnPropertyChanged(nameof(IMEI));
-            }
-        }
-
-        private string _BootPolicy = null;
-        public string BootPolicy
-        {
-            get
-            {
-                return _BootPolicy;
-            }
-            set
-            {
-                _BootPolicy = value;
-                OnPropertyChanged(nameof(BootPolicy));
-            }
-        }
-
-        private string _Db = null;
-        public string Db
-        {
-            get
-            {
-                return _Db;
-            }
-            set
-            {
-                _Db = value;
-                OnPropertyChanged(nameof(Db));
-            }
-        }
-
-        private string _Dbx = null;
-        public string Dbx
-        {
-            get
-            {
-                return _Dbx;
-            }
-            set
-            {
-                _Dbx = value;
-                OnPropertyChanged(nameof(Dbx));
-            }
-        }
-
-        private string _Kek = null;
-        public string Kek
-        {
-            get
-            {
-                return _Kek;
-            }
-            set
-            {
-                _Kek = value;
-                OnPropertyChanged(nameof(Kek));
-            }
-        }
-
-        private string _Pk = null;
-        public string Pk
-        {
-            get
-            {
-                return _Pk;
-            }
-            set
-            {
-                _Pk = value;
-                OnPropertyChanged(nameof(Pk));
-            }
-        }
-
-        private byte[] _PublicID = null;
-        public byte[] PublicID
-        {
-            get
-            {
-                return _PublicID;
-            }
-            set
-            {
-                _PublicID = value;
-                OnPropertyChanged(nameof(PublicID));
-            }
-        }
-
-        private byte[] _WlanMac1 = null;
-        public byte[] WlanMac1
-        {
-            get
-            {
-                return _WlanMac1;
-            }
-            set
-            {
-                _WlanMac1 = value;
-                OnPropertyChanged(nameof(WlanMac1));
-            }
-        }
-
-        private byte[] _WlanMac2 = null;
-        public byte[] WlanMac2
-        {
-            get
-            {
-                return _WlanMac2;
-            }
-            set
-            {
-                _WlanMac2 = value;
-                OnPropertyChanged(nameof(WlanMac2));
-            }
-        }
-
-        private byte[] _WlanMac3 = null;
-        public byte[] WlanMac3
-        {
-            get
-            {
-                return _WlanMac3;
-            }
-            set
-            {
-                _WlanMac3 = value;
-                OnPropertyChanged(nameof(WlanMac3));
-            }
-        }
-
-        private byte[] _WlanMac4 = null;
-        public byte[] WlanMac4
-        {
-            get
-            {
-                return _WlanMac4;
-            }
-            set
-            {
-                _WlanMac4 = value;
-                OnPropertyChanged(nameof(WlanMac4));
-            }
-        }
-
-        private byte[] _BluetoothMac = null;
-        public byte[] BluetoothMac
-        {
-            get
-            {
-                return _BluetoothMac;
-            }
-            set
-            {
-                _BluetoothMac = value;
-                OnPropertyChanged(nameof(BluetoothMac));
-            }
-        }
-
-        private bool? _IsBootloaderSecurityEnabled = null;
-        public bool? IsBootloaderSecurityEnabled
-        {
-            get
-            {
-                return _IsBootloaderSecurityEnabled;
-            }
-            set
-            {
-                _IsBootloaderSecurityEnabled = value;
-                OnPropertyChanged(nameof(IsBootloaderSecurityEnabled));
-            }
-        }
-
-        private bool? _IsSimLocked = null;
-        public bool? IsSimLocked
-        {
-            get
-            {
-                return _IsSimLocked;
-            }
-            set
-            {
-                _IsSimLocked = value;
-                OnPropertyChanged(nameof(IsSimLocked));
-            }
-        }
-
-        public void RebootTo(string Mode)
-        {
-            switch (Mode)
-            {
-                case "Flash":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
-                    break;
-                case "Label":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
-                    break;
-                case "MassStorage":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
-                    break;
-                default:
-                    return;
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Threading;
+
+namespace WPinternals
+{
+    // Create this class on the UI thread, after the main-window of the application is initialized.
+    // It is necessary to create the object on the UI thread, because notification events to the View need to be fired on that thread.
+    // The Model for this ViewModel communicates over USB and for that it uses the hWnd of the main window.
+    // Therefore the main window must be created before the ViewModel is created.
+
+    internal class NokiaNormalViewModel : ContextViewModel
+    {
+        private readonly NokiaPhoneModel CurrentModel;
+        private readonly Action<PhoneInterfaces> RequestModeSwitch;
+
+        internal NokiaNormalViewModel(NokiaPhoneModel CurrentModel, Action<PhoneInterfaces> RequestModeSwitch)
+            : base()
+        {
+            this.CurrentModel = CurrentModel;
+            this.RequestModeSwitch = RequestModeSwitch;
+
+            new Thread(() => StartLoadDeviceInfo()).Start();
+        }
+
+        private void StartLoadDeviceInfo()
+        {
+            try
+            {
+                Operator = CurrentModel.ExecuteJsonMethodAsString("ReadOperatorName", "OperatorName"); // 000-NL
+                LogFile.Log("Operator: " + Operator);
+                ManufacturerModelName = CurrentModel.ExecuteJsonMethodAsString("ReadManufacturerModelName", "ManufacturerModelName"); // RM-821_eu_denmark_251
+                LogFile.Log("Manufacturer Model Name: " + ManufacturerModelName);
+                ProductCode = CurrentModel.ExecuteJsonMethodAsString("ReadProductCode", "ProductCode"); // 059Q9D7
+                LogFile.Log("Product Code: " + ProductCode);
+                Firmware = CurrentModel.ExecuteJsonMethodAsString("ReadSwVersion", "SwVersion"); // 3051.40000.1349.0007
+                LogFile.Log("Firmware: " + Firmware);
+                HWID = CurrentModel.ExecuteJsonMethodAsString("ReadHwVersion", "HWVersion"); // 1002
+                LogFile.Log("HWID: " + HWID);
+
+                IMEI = CurrentModel.ExecuteJsonMethodAsString("ReadSerialNumber", new System.Collections.Generic.Dictionary<string, object>() { { "SubscriptionId", 0 } }, "SerialNumber"); // IMEI
+                string IMEI2 = CurrentModel.ExecuteJsonMethodAsString("ReadSerialNumber", new System.Collections.Generic.Dictionary<string, object>() { { "SubscriptionId", 1 } }, "SerialNumber"); // IMEI 2
+
+                if (!string.IsNullOrEmpty(IMEI2))
+                {
+                    IMEI += "\n" + IMEI2;
+                }
+
+                LogFile.Log("IMEI: " + IMEI);
+                PublicID = CurrentModel.ExecuteJsonMethodAsBytes("ReadPublicId", "PublicId"); // 0x14 bytes: a5 e5 ...
+                LogFile.Log("Public ID: " + Converter.ConvertHexToString(PublicID, " "));
+                BluetoothMac = CurrentModel.ExecuteJsonMethodAsBytes("ReadBtId", "BtId"); // 6 bytes: bc c6 ...
+                LogFile.Log("Bluetooth MAC: " + Converter.ConvertHexToString(BluetoothMac, " "));
+                WlanMac1 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress1"); // 6 bytes
+                LogFile.Log("WLAN MAC 1: " + Converter.ConvertHexToString(WlanMac1, " "));
+                WlanMac2 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress2"); // 6 bytes
+                LogFile.Log("WLAN MAC 2: " + Converter.ConvertHexToString(WlanMac2, " "));
+                WlanMac3 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress3"); // 6 bytes
+                LogFile.Log("WLAN MAC 3: " + Converter.ConvertHexToString(WlanMac3, " "));
+                WlanMac4 = CurrentModel.ExecuteJsonMethodAsBytes("ReadWlanMacAddress", "WlanMacAddress4"); // 6 bytes
+                LogFile.Log("WLAN MAC 4: " + Converter.ConvertHexToString(WlanMac4, " "));
+
+                bool? ProductionDone = CurrentModel.ExecuteJsonMethodAsBoolean("ReadProductionDoneState", "ProductionDone");
+                IsBootloaderSecurityEnabled = ProductionDone == null
+                    ? CurrentModel.ExecuteJsonMethodAsString("GetSecurityMode", "SecMode").Contains("Restricted", StringComparison.OrdinalIgnoreCase)
+                    : CurrentModel.ExecuteJsonMethodAsString("GetSecurityMode", "SecMode").Contains("Restricted", StringComparison.OrdinalIgnoreCase) && (bool)CurrentModel.ExecuteJsonMethodAsBoolean("ReadProductionDoneState", "ProductionDone");
+
+                LogFile.Log("Bootloader Security: " + ((bool)IsBootloaderSecurityEnabled ? "Enabled" : "Disabled"));
+                IsSimLocked = CurrentModel.ExecuteJsonMethodAsBoolean("ReadSimlockActive", "SimLockActive");
+                LogFile.Log("Simlock: " + ((bool)IsSimLocked ? "Active" : "Unlocked"));
+
+                string BootPolicy = CurrentModel.ExecuteJsonMethodAsString("GetUefiCertificateStatus", "BootPolicy");
+                string Db = CurrentModel.ExecuteJsonMethodAsString("GetUefiCertificateStatus", "Db");
+                string Dbx = CurrentModel.ExecuteJsonMethodAsString("GetUefiCertificateStatus", "Dbx");
+                string Kek = CurrentModel.ExecuteJsonMethodAsString("GetUefiCertificateStatus", "Kek");
+                string Pk = CurrentModel.ExecuteJsonMethodAsString("GetUefiCertificateStatus", "Pk");
+
+                this.BootPolicy = BootPolicy;
+                LogFile.Log("Boot policy: " + BootPolicy);
+                this.Db = Db;
+                LogFile.Log("DB: " + Db);
+                this.Dbx = Dbx;
+                LogFile.Log("DBX: " + Dbx);
+                this.Kek = Kek;
+                LogFile.Log("KEK: " + Kek);
+                this.Pk = Pk;
+                LogFile.Log("PK: " + Pk);
+            }
+            catch { }
+        }
+
+        private string _ProductCode = null;
+        public string ProductCode
+        {
+            get
+            {
+                return _ProductCode;
+            }
+            set
+            {
+                _ProductCode = value;
+                OnPropertyChanged(nameof(ProductCode));
+            }
+        }
+
+        private string _ManufacturerModelName = null;
+        public string ManufacturerModelName
+        {
+            get
+            {
+                return _ManufacturerModelName;
+            }
+            set
+            {
+                _ManufacturerModelName = value;
+                OnPropertyChanged(nameof(ManufacturerModelName));
+            }
+        }
+
+        private string _Operator = null;
+        public string Operator
+        {
+            get
+            {
+                return _Operator;
+            }
+            set
+            {
+                _Operator = value;
+                OnPropertyChanged(nameof(Operator));
+            }
+        }
+
+        private string _Firmware = null;
+        public string Firmware
+        {
+            get
+            {
+                return _Firmware;
+            }
+            set
+            {
+                _Firmware = value;
+                OnPropertyChanged(nameof(Firmware));
+            }
+        }
+
+        private string _HWID = null;
+        public string HWID
+        {
+            get
+            {
+                return _HWID;
+            }
+            set
+            {
+                _HWID = value;
+                OnPropertyChanged(nameof(HWID));
+            }
+        }
+
+        private string _IMEI = null;
+        public string IMEI
+        {
+            get
+            {
+                return _IMEI;
+            }
+            set
+            {
+                _IMEI = value;
+                OnPropertyChanged(nameof(IMEI));
+            }
+        }
+
+        private string _BootPolicy = null;
+        public string BootPolicy
+        {
+            get
+            {
+                return _BootPolicy;
+            }
+            set
+            {
+                _BootPolicy = value;
+                OnPropertyChanged(nameof(BootPolicy));
+            }
+        }
+
+        private string _Db = null;
+        public string Db
+        {
+            get
+            {
+                return _Db;
+            }
+            set
+            {
+                _Db = value;
+                OnPropertyChanged(nameof(Db));
+            }
+        }
+
+        private string _Dbx = null;
+        public string Dbx
+        {
+            get
+            {
+                return _Dbx;
+            }
+            set
+            {
+                _Dbx = value;
+                OnPropertyChanged(nameof(Dbx));
+            }
+        }
+
+        private string _Kek = null;
+        public string Kek
+        {
+            get
+            {
+                return _Kek;
+            }
+            set
+            {
+                _Kek = value;
+                OnPropertyChanged(nameof(Kek));
+            }
+        }
+
+        private string _Pk = null;
+        public string Pk
+        {
+            get
+            {
+                return _Pk;
+            }
+            set
+            {
+                _Pk = value;
+                OnPropertyChanged(nameof(Pk));
+            }
+        }
+
+        private byte[] _PublicID = null;
+        public byte[] PublicID
+        {
+            get
+            {
+                return _PublicID;
+            }
+            set
+            {
+                _PublicID = value;
+                OnPropertyChanged(nameof(PublicID));
+            }
+        }
+
+        private byte[] _WlanMac1 = null;
+        public byte[] WlanMac1
+        {
+            get
+            {
+                return _WlanMac1;
+            }
+            set
+            {
+                _WlanMac1 = value;
+                OnPropertyChanged(nameof(WlanMac1));
+            }
+        }
+
+        private byte[] _WlanMac2 = null;
+        public byte[] WlanMac2
+        {
+            get
+            {
+                return _WlanMac2;
+            }
+            set
+            {
+                _WlanMac2 = value;
+                OnPropertyChanged(nameof(WlanMac2));
+            }
+        }
+
+        private byte[] _WlanMac3 = null;
+        public byte[] WlanMac3
+        {
+            get
+            {
+                return _WlanMac3;
+            }
+            set
+            {
+                _WlanMac3 = value;
+                OnPropertyChanged(nameof(WlanMac3));
+            }
+        }
+
+        private byte[] _WlanMac4 = null;
+        public byte[] WlanMac4
+        {
+            get
+            {
+                return _WlanMac4;
+            }
+            set
+            {
+                _WlanMac4 = value;
+                OnPropertyChanged(nameof(WlanMac4));
+            }
+        }
+
+        private byte[] _BluetoothMac = null;
+        public byte[] BluetoothMac
+        {
+            get
+            {
+                return _BluetoothMac;
+            }
+            set
+            {
+                _BluetoothMac = value;
+                OnPropertyChanged(nameof(BluetoothMac));
+            }
+        }
+
+        private bool? _IsBootloaderSecurityEnabled = null;
+        public bool? IsBootloaderSecurityEnabled
+        {
+            get
+            {
+                return _IsBootloaderSecurityEnabled;
+            }
+            set
+            {
+                _IsBootloaderSecurityEnabled = value;
+                OnPropertyChanged(nameof(IsBootloaderSecurityEnabled));
+            }
+        }
+
+        private bool? _IsSimLocked = null;
+        public bool? IsSimLocked
+        {
+            get
+            {
+                return _IsSimLocked;
+            }
+            set
+            {
+                _IsSimLocked = value;
+                OnPropertyChanged(nameof(IsSimLocked));
+            }
+        }
+
+        public void RebootTo(string Mode)
+        {
+            switch (Mode)
+            {
+                case "Flash":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
+                    break;
+                case "Label":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
+                    break;
+                case "MassStorage":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
+                    break;
+                default:
+                    return;
+            }
+        }
+    }
+}
diff --git a/ViewModels/NotImplementedViewModel.cs b/WPinternals/ViewModels/NotImplementedViewModel.cs
similarity index 97%
rename from ViewModels/NotImplementedViewModel.cs
rename to WPinternals/ViewModels/NotImplementedViewModel.cs
index 2b2ae6e..7aa08c9 100644
--- a/ViewModels/NotImplementedViewModel.cs
+++ b/WPinternals/ViewModels/NotImplementedViewModel.cs
@@ -1,39 +1,39 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-namespace WPinternals
-{
-    internal class NotImplementedViewModel : ContextViewModel
-    {
-        internal string Message { get; set; }
-
-        internal NotImplementedViewModel(MainViewModel Main)
-            : base(Main)
-        {
-            Message = "Not implemented yet...";
-        }
-
-        internal NotImplementedViewModel(MainViewModel Main, string Message)
-            : base(Main)
-        {
-            this.Message = Message;
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+namespace WPinternals
+{
+    internal class NotImplementedViewModel : ContextViewModel
+    {
+        internal string Message { get; set; }
+
+        internal NotImplementedViewModel(MainViewModel Main)
+            : base(Main)
+        {
+            Message = "Not implemented yet...";
+        }
+
+        internal NotImplementedViewModel(MainViewModel Main, string Message)
+            : base(Main)
+        {
+            this.Message = Message;
+        }
+    }
+}
diff --git a/ViewModels/PhoneNotifierViewModel.cs b/WPinternals/ViewModels/PhoneNotifierViewModel.cs
similarity index 98%
rename from ViewModels/PhoneNotifierViewModel.cs
rename to WPinternals/ViewModels/PhoneNotifierViewModel.cs
index 09d94a1..7f35498 100644
--- a/ViewModels/PhoneNotifierViewModel.cs
+++ b/WPinternals/ViewModels/PhoneNotifierViewModel.cs
@@ -1,497 +1,497 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using MadWizard.WinUSBNet;
-using System;
-using System.Diagnostics.Eventing.Reader;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace WPinternals
-{
-    internal delegate void NewDeviceArrivedEvent(ArrivalEventArgs Args);
-    internal delegate void DeviceRemovedEvent();
-
-    internal class PhoneNotifierViewModel
-    {
-        private USBNotifier LumiaOldCombiNotifier;
-        private USBNotifier LumiaNewCombiNotifier;
-        private USBNotifier LumiaNormalNotifier;
-        private USBNotifier LumiaFlashNotifier;
-        private USBNotifier StorageNotifier;
-        private USBNotifier ComPortNotifier;
-        private USBNotifier LumiaEmergencyNotifier;
-        private USBNotifier LumiaLabelNotifier;
-        private USBNotifier HidInterfaceNotifier;
-
-        public PhoneInterfaces? CurrentInterface = null;
-        private PhoneInterfaces? LastInterface = null;
-        public IDisposable CurrentModel = null;
-
-        public event NewDeviceArrivedEvent NewDeviceArrived = delegate { };
-        public event DeviceRemovedEvent DeviceRemoved = delegate { };
-
-        private Guid OldCombiInterfaceGuid = new("{0FD3B15C-D457-45d8-A779-C2B2C9F9D0FD}");
-        private Guid NewCombiInterfaceGuid = new("{7eaff726-34cc-4204-b09d-f95471b873cf}");
-
-        private Guid MassStorageInterfaceGuid = new("{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}");
-        private Guid ComPortInterfaceGuid = new("{86E0D1E0-8089-11D0-9CE4-08003E301F73}");
-        private Guid HidInterfaceGuid = new("{4D1E55B2-F16F-11CF-88CB-001111000030}");
-
-        private Guid LumiaNormalInterfaceGuid = new("{08324F9C-B621-435C-859B-AE4652481B7C}");
-        private Guid LumiaLabelInterfaceGuid = new("{F4FE0C27-7304-4ED7-AAB5-130893B84B6F}");
-        private Guid LumiaFlashInterfaceGuid = new("{9e3bd5f7-9690-4fcc-8810-3e2650cd6ecc}");
-        private Guid LumiaEmergencyInterfaceGuid = new("{71DE994D-8B7C-43DB-A27E-2AE7CD579A0C}");
-
-        private readonly object ModelLock = new();
-
-        private readonly EventWaitHandle NewInterfaceWaitHandle = new(false, EventResetMode.AutoReset);
-
-        private EventLogWatcher LogWatcher;
-
-        private string Qcom9006DevicePath;
-
-        internal void Start()
-        {
-            LumiaOldCombiNotifier = new USBNotifier(OldCombiInterfaceGuid);
-            LumiaOldCombiNotifier.Arrival += LumiaNotifier_Arrival;
-            LumiaOldCombiNotifier.Removal += LumiaNotifier_Removal;
-
-            LumiaNewCombiNotifier = new USBNotifier(NewCombiInterfaceGuid);
-            LumiaNewCombiNotifier.Arrival += LumiaNotifier_Arrival;
-            LumiaNewCombiNotifier.Removal += LumiaNotifier_Removal;
-
-            LumiaNormalNotifier = new USBNotifier(LumiaNormalInterfaceGuid);
-            LumiaNormalNotifier.Arrival += LumiaNotifier_Arrival;
-            LumiaNormalNotifier.Removal += LumiaNotifier_Removal;
-
-            LumiaFlashNotifier = new USBNotifier(LumiaFlashInterfaceGuid);
-            LumiaFlashNotifier.Arrival += LumiaNotifier_Arrival;
-            LumiaFlashNotifier.Removal += LumiaNotifier_Removal;
-
-            StorageNotifier = new USBNotifier(MassStorageInterfaceGuid);
-            StorageNotifier.Arrival += LumiaNotifier_Arrival;
-            StorageNotifier.Removal += LumiaNotifier_Removal;
-
-            ComPortNotifier = new USBNotifier(ComPortInterfaceGuid);
-            ComPortNotifier.Arrival += LumiaNotifier_Arrival;
-            ComPortNotifier.Removal += LumiaNotifier_Removal;
-
-            LumiaEmergencyNotifier = new USBNotifier(LumiaEmergencyInterfaceGuid);
-            LumiaEmergencyNotifier.Arrival += LumiaNotifier_Arrival;
-            LumiaEmergencyNotifier.Removal += LumiaNotifier_Removal;
-
-            LumiaLabelNotifier = new USBNotifier(LumiaLabelInterfaceGuid);
-            LumiaLabelNotifier.Arrival += LumiaNotifier_Arrival;
-            LumiaLabelNotifier.Removal += LumiaNotifier_Removal;
-
-            HidInterfaceNotifier = new USBNotifier(HidInterfaceGuid);
-            HidInterfaceNotifier.Arrival += LumiaNotifier_Arrival;
-            HidInterfaceNotifier.Removal += LumiaNotifier_Removal;
-
-            try
-            {
-                EventLogQuery LogQuery = new("Microsoft-Windows-Kernel-PnP/Configuration", PathType.LogName, "*[System[(EventID = 411)]]");
-                LogWatcher = new EventLogWatcher(LogQuery);
-                LogWatcher.EventRecordWritten += PnPEventWritten;
-                LogWatcher.Enabled = true;
-                App.IsPnPEventLogMissing = false;
-            }
-            catch { }
-        }
-
-        private void PnPEventWritten(Object obj, EventRecordWrittenEventArgs arg)
-        {
-            string Description = arg.EventRecord.FormatDescription();
-            if (Description.IndexOf("VID_045E&PID_9006", 0, StringComparison.OrdinalIgnoreCase) >= 0)
-            {
-                LogFile.Log("Event " + arg.EventRecord.Id.ToString() + ": " + Description, LogType.FileOnly);
-                LogFile.Log("Phone switched to Mass Storage mode, but the driver on the PC did not start correctly", LogType.FileAndConsole);
-                CurrentInterface = PhoneInterfaces.Lumia_BadMassStorage;
-                CurrentModel = null;
-                NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
-            }
-        }
-
-        internal void Stop()
-        {
-            LumiaOldCombiNotifier.Dispose();
-            LumiaNewCombiNotifier.Dispose();
-            LumiaNormalNotifier.Dispose();
-            LumiaFlashNotifier.Dispose();
-            StorageNotifier.Dispose();
-            ComPortNotifier.Dispose();
-            LumiaEmergencyNotifier.Dispose();
-            HidInterfaceNotifier.Dispose();
-            LogWatcher.Dispose();
-        }
-
-        internal async Task WaitForNextNodeChange()
-        {
-            // Node change events are on all USBnotifiers, so we just pick one
-            await LumiaEmergencyNotifier.WaitForNextNodeChange();
-        }
-
-        internal void NotifyArrival()
-        {
-            if (CurrentInterface != null)
-            {
-                NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
-            }
-        }
-
-        private void LumiaNotifier_Arrival(object sender, USBEvent e)
-        {
-            try
-            {
-                if (e.DevicePath.Contains("VID_0421&", StringComparison.OrdinalIgnoreCase) ||
-                    e.DevicePath.Contains("VID_045E&", StringComparison.OrdinalIgnoreCase))
-                {
-                    if (e.DevicePath.Contains("&PID_0660&MI_04", StringComparison.OrdinalIgnoreCase) ||
-                        e.DevicePath.Contains("&PID_0713&MI_04", StringComparison.OrdinalIgnoreCase) || // for Spec B
-                        e.DevicePath.Contains("&PID_0A01&MI_04", StringComparison.OrdinalIgnoreCase)) // for Spec B (650)
-                    {
-                        CurrentInterface = PhoneInterfaces.Lumia_Label;
-                        CurrentModel = new NokiaPhoneModel(e.DevicePath);
-                        LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
-                        LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
-                        LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                        LogFile.Log("Mode: Label", LogType.FileAndConsole);
-                        NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
-                    }
-                    else if (e.DevicePath.Contains("&PID_0661", StringComparison.OrdinalIgnoreCase) ||
-                             e.DevicePath.Contains("&PID_06FC", StringComparison.OrdinalIgnoreCase) || // VID_0421&PID_06FC is for Lumia 930
-                             e.DevicePath.Contains("&PID_0A00", StringComparison.OrdinalIgnoreCase))   // vid_045e & pid_0a00 & mi_03 = Lumia 950 XL normal mode
-                    {
-                        if (((USBNotifier)sender).Guid == OldCombiInterfaceGuid)
-                        {
-                            NewInterfaceWaitHandle.Reset();
-                            if (USBDevice.GetDevices(NewCombiInterfaceGuid).Length > 0)
-                            {
-                                return;
-                            }
-                            else
-                            {
-                                // Old combi-interface was detected, but new combi-interface was not detected.
-                                // This could mean 2 things:
-                                // - It is a WP80 phone, which has only this old combi-interface to talk to.
-                                // - It is a WP81 / W10M phone, which has an unresponsive old combi-interface and we need to wait for the new combi-interface to arrive.
-                                // We will wait maximum 1 sec for the new interface. If it doesn't arrive we will start talking on this old interface.
-                                // We will start a new thread, because if this thread is blocked, no new devices will arrive.
-                                string DevicePath = e.DevicePath;
-                                ThreadPool.QueueUserWorkItem(s =>
-                                {
-                                    if (!NewInterfaceWaitHandle.WaitOne(1000))
-                                    {
-                                        // Waithandle not set.
-                                        // So new interface did not arrive.
-                                        // So we assume we need to talk to this old interface.
-
-                                        CurrentInterface = PhoneInterfaces.Lumia_Normal;
-                                        CurrentModel = new NokiaPhoneModel(DevicePath);
-                                        LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
-                                        LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
-                                        LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                                        LogFile.Log("Mode: Normal", LogType.FileAndConsole);
-                                        NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
-                                    }
-                                });
-                            }
-                        }
-                        else
-                        {
-                            NewInterfaceWaitHandle.Set();
-
-                            CurrentInterface = PhoneInterfaces.Lumia_Normal;
-                            CurrentModel = new NokiaPhoneModel(e.DevicePath);
-                            LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
-                            LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
-                            LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                            LogFile.Log("Mode: Normal", LogType.FileAndConsole);
-                            NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
-                        }
-                    }
-                    else if (e.DevicePath.Contains("&PID_066E", StringComparison.OrdinalIgnoreCase) ||
-                             e.DevicePath.Contains("&PID_0714", StringComparison.OrdinalIgnoreCase) || // VID_0421&PID_0714 is for Lumia 930
-                             e.DevicePath.Contains("&PID_0A02", StringComparison.OrdinalIgnoreCase) || // VID_045E&PID_0A02 is for Lumia 950
-                             e.DevicePath.Contains("&PID_05EE", StringComparison.OrdinalIgnoreCase))   // VID_0421&PID_05EE is for early RX100
-                    {
-                        CurrentModel = new NokiaFlashModel(e.DevicePath);
-                        ((NokiaFlashModel)CurrentModel).InterfaceChanged += InterfaceChanged;
-
-                        FlashAppType type = FlashAppType.FlashApp;
-                        try
-                        {
-                            type = ((NokiaFlashModel)CurrentModel).GetFlashAppType();
-                            LogFile.Log("Flash App Type: " + type.ToString(), LogType.FileOnly);
-                        }
-                        catch
-                        {
-                            LogFile.Log("Flash App Type could not be determined, assuming " + type.ToString(), LogType.FileOnly);
-                        }
-
-                        switch (type)
-                        {
-                            case FlashAppType.BootManager:
-                                {
-                                    CurrentInterface = PhoneInterfaces.Lumia_Bootloader;
-                                    LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
-                                    LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
-                                    LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                                    LogFile.Log("Mode: Bootloader", LogType.FileAndConsole);
-                                    NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
-                                    break;
-                                }
-                            case FlashAppType.FlashApp:
-                                {
-                                    ((NokiaFlashModel)CurrentModel).DisableRebootTimeOut();
-                                    CurrentInterface = PhoneInterfaces.Lumia_Flash;
-                                    LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
-                                    LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
-                                    LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                                    LogFile.Log("Mode: Flash", LogType.FileAndConsole);
-                                    NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
-                                    break;
-                                }
-                            case FlashAppType.PhoneInfoApp:
-                                {
-                                    CurrentInterface = PhoneInterfaces.Lumia_Bootloader;
-                                    LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
-                                    LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
-                                    LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                                    LogFile.Log("Mode: Bootloader (Phone Info)", LogType.FileAndConsole);
-                                    NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
-                                    break;
-                                }
-                        }
-                    }
-                }
-                else if (e.DevicePath.Contains("DISK&VEN_QUALCOMM&PROD_MMC_STORAGE", StringComparison.OrdinalIgnoreCase) ||
-                         e.DevicePath.Contains("DISK&VEN_MSFT&PROD_PHONE_MMC_STOR", StringComparison.OrdinalIgnoreCase) ||
-                         ((e.DevicePath.Length == @"\\.\E:".Length) && e.DevicePath.StartsWith(@"\\.\") && e.DevicePath.EndsWith(":")))
-                {
-#if DEBUG
-                    LogFile.Log("Mass storage arrived: " + e.DevicePath, LogType.FileOnly);
-                    LogFile.Log("Start new thread for getting metadata.", LogType.FileOnly);
-#endif
-
-                    // This function is possibly called by an USB notification WndProc.
-                    // It is not possible to invoke COM objects from a WndProc.
-                    // MassStorage uses ManagementObjectSearcher, which is a COM object.
-                    // Therefore we use a new thread.
-                    ThreadPool.QueueUserWorkItem(s =>
-                    {
-                        lock (ModelLock)
-                        {
-                            if (!(CurrentModel is MassStorage))
-                            {
-                                // Wait 1 second to make sure MainOS is loaded
-                                // In case of multiple drive letters being assigned to the phone by the user
-                                // MainOS may take a while to show up and we may accidentally catch up a letter that is
-                                // not for MainOS.
-                                Task.Delay(1000).Wait();
-
-                                MassStorage NewModel = new(e.DevicePath);
-
-                                if (NewModel.Drive != null) // When logical drive is already known, we use this model. Or else we wait for the logical drive to arrive.
-                                {
-                                    CurrentInterface = PhoneInterfaces.Lumia_MassStorage;
-                                    CurrentModel = NewModel;
-                                    LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
-                                    LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
-                                    LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                                    LogFile.Log("Mode: Mass storage mode", LogType.FileAndConsole);
-                                    if (!string.IsNullOrEmpty(Qcom9006DevicePath))
-                                    {
-                                        LogFile.Log("Found 9006 device previously", LogType.FileOnly);
-                                        LogFile.Log("Attaching 9006 device", LogType.FileOnly);
-                                        NewModel.AttachQualcommSerial(Qcom9006DevicePath);
-                                    }
-                                    NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
-                                }
-                            }
-                        }
-                    });
-                }
-                else if (e.DevicePath.Contains("VID_05C6&", StringComparison.OrdinalIgnoreCase)) // Qualcomm device
-                {
-                    if (e.DevicePath.Contains("&PID_9008", StringComparison.OrdinalIgnoreCase))
-                    {
-                        USBDeviceInfo DeviceInfo = Array.Find(USBDevice.GetDevices(((USBNotifier)sender).Guid), (d) => string.Equals(d.DevicePath, e.DevicePath, StringComparison.CurrentCultureIgnoreCase));
-
-                        if ((DeviceInfo.BusName == "QHSUSB_DLOAD") || (DeviceInfo.BusName == "QHSUSB__BULK") || ((DeviceInfo.BusName?.Length == 0) && (LastInterface != PhoneInterfaces.Qualcomm_Download))) // TODO: Separate for Sahara!
-                        {
-                            CurrentInterface = PhoneInterfaces.Qualcomm_Download;
-                            CurrentModel = new QualcommSerial(e.DevicePath);
-                            NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
-                            LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
-                            LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
-                            LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                            if (DeviceInfo.BusName?.Length == 0)
-                            {
-                                LogFile.Log("Driver does not show busname, assume mode: Qualcomm Emergency Download 9008", LogType.FileAndConsole);
-                            }
-                            else
-                            {
-                                LogFile.Log("Mode: Qualcomm Emergency Download 9008", LogType.FileAndConsole);
-                            }
-                        }
-                        else if ((DeviceInfo.BusName == "QHSUSB_ARMPRG") || ((DeviceInfo.BusName?.Length == 0) && (LastInterface == PhoneInterfaces.Qualcomm_Download)))
-                        {
-                            CurrentInterface = PhoneInterfaces.Qualcomm_Flash;
-                            CurrentModel = new QualcommSerial(e.DevicePath);
-                            NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
-                            LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
-                            LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
-                            LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                            if (DeviceInfo.BusName?.Length == 0)
-                            {
-                                LogFile.Log("Driver does not show busname, assume mode: Qualcomm Emergency Flash 9008", LogType.FileAndConsole);
-                            }
-                            else
-                            {
-                                LogFile.Log("Mode: Qualcomm Emergency Flash 9008", LogType.FileAndConsole);
-                            }
-                        }
-                    }
-                    else if (e.DevicePath.Contains("&PID_9006", StringComparison.OrdinalIgnoreCase))
-                    {
-                        // This is part of the Mass Storage inteface.
-                        // It is a slightly different version of the Qualcomm Emergency interface, which is implemented in SBL3.
-                        // One important difference is that the base address for sending a loader is not 0x2A000000, but it is 0x82F00000.
-
-                        Qcom9006DevicePath = e.DevicePath;
-
-                        LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
-                        LogFile.Log("Device path: " + Qcom9006DevicePath, LogType.FileOnly);
-                        LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                        LogFile.Log("Mode: Qualcomm Emergency 9006", LogType.FileAndConsole);
-
-                        if (CurrentModel is MassStorage)
-                        {
-                            LogFile.Log("Found Mass Storage device previously", LogType.FileOnly);
-                            LogFile.Log("Attaching 9006 device", LogType.FileOnly);
-                            ((MassStorage)CurrentModel).AttachQualcommSerial(Qcom9006DevicePath);
-                        }
-                    }
-                    else if (e.DevicePath.Contains("&PID_F006", StringComparison.OrdinalIgnoreCase))
-                    {
-                        // This is part of the charging inteface.
-
-                        LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
-                        LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
-                        LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
-                        LogFile.Log("Mode: Qualcomm Emergency Charging F006", LogType.FileAndConsole);
-                    }
-                }
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex);
-                CurrentModel = null;
-                CurrentInterface = null;
-            }
-        }
-
-        private void InterfaceChanged(PhoneInterfaces NewInterface)
-        {
-            CurrentInterface = NewInterface;
-        }
-
-        private void LumiaNotifier_Removal(object sender, USBEvent e)
-        {
-            if (e.DevicePath.Contains("VID_05C6&PID_9006", StringComparison.OrdinalIgnoreCase))
-            {
-                Qcom9006DevicePath = null;
-            }
-
-            if (
-                e.DevicePath.Contains("VID_0421&PID_0660&MI_04", StringComparison.OrdinalIgnoreCase) ||
-                e.DevicePath.Contains("VID_0421&PID_0713&MI_04", StringComparison.OrdinalIgnoreCase) ||
-                e.DevicePath.Contains("VID_045E&PID_0A01&MI_04", StringComparison.OrdinalIgnoreCase) ||
-                e.DevicePath.Contains("VID_0421&PID_0661", StringComparison.OrdinalIgnoreCase) ||
-                e.DevicePath.Contains("VID_0421&PID_06FC", StringComparison.OrdinalIgnoreCase) ||
-                e.DevicePath.Contains("VID_0421&PID_066E", StringComparison.OrdinalIgnoreCase) ||
-                e.DevicePath.Contains("VID_0421&PID_0714", StringComparison.OrdinalIgnoreCase) ||
-                e.DevicePath.Contains("VID_0421&PID_05EE", StringComparison.OrdinalIgnoreCase) ||
-                e.DevicePath.Contains("VID_045E&PID_0A00", StringComparison.OrdinalIgnoreCase) ||
-                e.DevicePath.Contains("VID_045E&PID_0A02", StringComparison.OrdinalIgnoreCase) ||
-                e.DevicePath.Contains("VID_05C6&PID_9008", StringComparison.OrdinalIgnoreCase) ||
-                e.DevicePath.Contains("DISK&VEN_QUALCOMM&PROD_MMC_STORAGE", StringComparison.OrdinalIgnoreCase) ||
-                e.DevicePath.Contains("DISK&VEN_MSFT&PROD_PHONE_MMC_STOR", StringComparison.OrdinalIgnoreCase)
-            )
-            {
-                if (CurrentInterface != null)
-                {
-                    LastInterface = CurrentInterface;
-                }
-
-                CurrentInterface = null;
-                if (CurrentModel != null)
-                {
-                    CurrentModel.Dispose();
-                    CurrentModel = null;
-                    LogFile.Log("Lumia disconnected", LogType.FileAndConsole);
-                }
-                DeviceRemoved();
-            }
-        }
-
-        internal async Task<IDisposable> WaitForArrival()
-        {
-            IDisposable Result = null;
-
-            if (CurrentInterface == null)
-            {
-                LogFile.Log("Waiting for phone to connect...", LogType.FileOnly);
-            }
-
-            await Task.Run(() =>
-            {
-                AutoResetEvent e = new(false);
-                void Arrived(ArrivalEventArgs a)
-                {
-                    e.Set();
-                    Result = a.NewModel;
-                }
-                NewDeviceArrived += Arrived;
-                e.WaitOne();
-                NewDeviceArrived -= Arrived;
-            });
-
-            return Result;
-        }
-
-        internal async Task WaitForRemoval()
-        {
-            LogFile.Log("Waiting for phone to disconnect...", LogType.FileOnly);
-
-            await Task.Run(() =>
-            {
-                AutoResetEvent e = new(false);
-                void Removed() => e.Set();
-                DeviceRemoved += Removed;
-                e.WaitOne();
-                DeviceRemoved -= Removed;
-            });
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using MadWizard.WinUSBNet;
+using System;
+using System.Diagnostics.Eventing.Reader;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace WPinternals
+{
+    internal delegate void NewDeviceArrivedEvent(ArrivalEventArgs Args);
+    internal delegate void DeviceRemovedEvent();
+
+    internal class PhoneNotifierViewModel
+    {
+        private USBNotifier LumiaOldCombiNotifier;
+        private USBNotifier LumiaNewCombiNotifier;
+        private USBNotifier LumiaNormalNotifier;
+        private USBNotifier LumiaFlashNotifier;
+        private USBNotifier StorageNotifier;
+        private USBNotifier ComPortNotifier;
+        private USBNotifier LumiaEmergencyNotifier;
+        private USBNotifier LumiaLabelNotifier;
+        private USBNotifier HidInterfaceNotifier;
+
+        public PhoneInterfaces? CurrentInterface = null;
+        private PhoneInterfaces? LastInterface = null;
+        public IDisposable CurrentModel = null;
+
+        public event NewDeviceArrivedEvent NewDeviceArrived = delegate { };
+        public event DeviceRemovedEvent DeviceRemoved = delegate { };
+
+        private Guid OldCombiInterfaceGuid = new("{0FD3B15C-D457-45d8-A779-C2B2C9F9D0FD}");
+        private Guid NewCombiInterfaceGuid = new("{7eaff726-34cc-4204-b09d-f95471b873cf}");
+
+        private Guid MassStorageInterfaceGuid = new("{53F56307-B6BF-11D0-94F2-00A0C91EFB8B}");
+        private Guid ComPortInterfaceGuid = new("{86E0D1E0-8089-11D0-9CE4-08003E301F73}");
+        private Guid HidInterfaceGuid = new("{4D1E55B2-F16F-11CF-88CB-001111000030}");
+
+        private Guid LumiaNormalInterfaceGuid = new("{08324F9C-B621-435C-859B-AE4652481B7C}");
+        private Guid LumiaLabelInterfaceGuid = new("{F4FE0C27-7304-4ED7-AAB5-130893B84B6F}");
+        private Guid LumiaFlashInterfaceGuid = new("{9e3bd5f7-9690-4fcc-8810-3e2650cd6ecc}");
+        private Guid LumiaEmergencyInterfaceGuid = new("{71DE994D-8B7C-43DB-A27E-2AE7CD579A0C}");
+
+        private readonly object ModelLock = new();
+
+        private readonly EventWaitHandle NewInterfaceWaitHandle = new(false, EventResetMode.AutoReset);
+
+        private EventLogWatcher LogWatcher;
+
+        private string Qcom9006DevicePath;
+
+        internal void Start()
+        {
+            LumiaOldCombiNotifier = new USBNotifier(OldCombiInterfaceGuid);
+            LumiaOldCombiNotifier.Arrival += LumiaNotifier_Arrival;
+            LumiaOldCombiNotifier.Removal += LumiaNotifier_Removal;
+
+            LumiaNewCombiNotifier = new USBNotifier(NewCombiInterfaceGuid);
+            LumiaNewCombiNotifier.Arrival += LumiaNotifier_Arrival;
+            LumiaNewCombiNotifier.Removal += LumiaNotifier_Removal;
+
+            LumiaNormalNotifier = new USBNotifier(LumiaNormalInterfaceGuid);
+            LumiaNormalNotifier.Arrival += LumiaNotifier_Arrival;
+            LumiaNormalNotifier.Removal += LumiaNotifier_Removal;
+
+            LumiaFlashNotifier = new USBNotifier(LumiaFlashInterfaceGuid);
+            LumiaFlashNotifier.Arrival += LumiaNotifier_Arrival;
+            LumiaFlashNotifier.Removal += LumiaNotifier_Removal;
+
+            StorageNotifier = new USBNotifier(MassStorageInterfaceGuid);
+            StorageNotifier.Arrival += LumiaNotifier_Arrival;
+            StorageNotifier.Removal += LumiaNotifier_Removal;
+
+            ComPortNotifier = new USBNotifier(ComPortInterfaceGuid);
+            ComPortNotifier.Arrival += LumiaNotifier_Arrival;
+            ComPortNotifier.Removal += LumiaNotifier_Removal;
+
+            LumiaEmergencyNotifier = new USBNotifier(LumiaEmergencyInterfaceGuid);
+            LumiaEmergencyNotifier.Arrival += LumiaNotifier_Arrival;
+            LumiaEmergencyNotifier.Removal += LumiaNotifier_Removal;
+
+            LumiaLabelNotifier = new USBNotifier(LumiaLabelInterfaceGuid);
+            LumiaLabelNotifier.Arrival += LumiaNotifier_Arrival;
+            LumiaLabelNotifier.Removal += LumiaNotifier_Removal;
+
+            HidInterfaceNotifier = new USBNotifier(HidInterfaceGuid);
+            HidInterfaceNotifier.Arrival += LumiaNotifier_Arrival;
+            HidInterfaceNotifier.Removal += LumiaNotifier_Removal;
+
+            try
+            {
+                EventLogQuery LogQuery = new("Microsoft-Windows-Kernel-PnP/Configuration", PathType.LogName, "*[System[(EventID = 411)]]");
+                LogWatcher = new EventLogWatcher(LogQuery);
+                LogWatcher.EventRecordWritten += PnPEventWritten;
+                LogWatcher.Enabled = true;
+                App.IsPnPEventLogMissing = false;
+            }
+            catch { }
+        }
+
+        private void PnPEventWritten(Object obj, EventRecordWrittenEventArgs arg)
+        {
+            string Description = arg.EventRecord.FormatDescription();
+            if (Description.IndexOf("VID_045E&PID_9006", 0, StringComparison.OrdinalIgnoreCase) >= 0)
+            {
+                LogFile.Log("Event " + arg.EventRecord.Id.ToString() + ": " + Description, LogType.FileOnly);
+                LogFile.Log("Phone switched to Mass Storage mode, but the driver on the PC did not start correctly", LogType.FileAndConsole);
+                CurrentInterface = PhoneInterfaces.Lumia_BadMassStorage;
+                CurrentModel = null;
+                NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
+            }
+        }
+
+        internal void Stop()
+        {
+            LumiaOldCombiNotifier.Dispose();
+            LumiaNewCombiNotifier.Dispose();
+            LumiaNormalNotifier.Dispose();
+            LumiaFlashNotifier.Dispose();
+            StorageNotifier.Dispose();
+            ComPortNotifier.Dispose();
+            LumiaEmergencyNotifier.Dispose();
+            HidInterfaceNotifier.Dispose();
+            LogWatcher.Dispose();
+        }
+
+        internal async Task WaitForNextNodeChange()
+        {
+            // Node change events are on all USBnotifiers, so we just pick one
+            await LumiaEmergencyNotifier.WaitForNextNodeChange();
+        }
+
+        internal void NotifyArrival()
+        {
+            if (CurrentInterface != null)
+            {
+                NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
+            }
+        }
+
+        private void LumiaNotifier_Arrival(object sender, USBEvent e)
+        {
+            try
+            {
+                if (e.DevicePath.Contains("VID_0421&", StringComparison.OrdinalIgnoreCase) ||
+                    e.DevicePath.Contains("VID_045E&", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (e.DevicePath.Contains("&PID_0660&MI_04", StringComparison.OrdinalIgnoreCase) ||
+                        e.DevicePath.Contains("&PID_0713&MI_04", StringComparison.OrdinalIgnoreCase) || // for Spec B
+                        e.DevicePath.Contains("&PID_0A01&MI_04", StringComparison.OrdinalIgnoreCase)) // for Spec B (650)
+                    {
+                        CurrentInterface = PhoneInterfaces.Lumia_Label;
+                        CurrentModel = new NokiaPhoneModel(e.DevicePath);
+                        LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
+                        LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
+                        LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
+                        LogFile.Log("Mode: Label", LogType.FileAndConsole);
+                        NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
+                    }
+                    else if (e.DevicePath.Contains("&PID_0661", StringComparison.OrdinalIgnoreCase) ||
+                             e.DevicePath.Contains("&PID_06FC", StringComparison.OrdinalIgnoreCase) || // VID_0421&PID_06FC is for Lumia 930
+                             e.DevicePath.Contains("&PID_0A00", StringComparison.OrdinalIgnoreCase))   // vid_045e & pid_0a00 & mi_03 = Lumia 950 XL normal mode
+                    {
+                        if (((USBNotifier)sender).Guid == OldCombiInterfaceGuid)
+                        {
+                            NewInterfaceWaitHandle.Reset();
+                            if (USBDevice.GetDevices(NewCombiInterfaceGuid).Length > 0)
+                            {
+                                return;
+                            }
+                            else
+                            {
+                                // Old combi-interface was detected, but new combi-interface was not detected.
+                                // This could mean 2 things:
+                                // - It is a WP80 phone, which has only this old combi-interface to talk to.
+                                // - It is a WP81 / W10M phone, which has an unresponsive old combi-interface and we need to wait for the new combi-interface to arrive.
+                                // We will wait maximum 1 sec for the new interface. If it doesn't arrive we will start talking on this old interface.
+                                // We will start a new thread, because if this thread is blocked, no new devices will arrive.
+                                string DevicePath = e.DevicePath;
+                                ThreadPool.QueueUserWorkItem(s =>
+                                {
+                                    if (!NewInterfaceWaitHandle.WaitOne(1000))
+                                    {
+                                        // Waithandle not set.
+                                        // So new interface did not arrive.
+                                        // So we assume we need to talk to this old interface.
+
+                                        CurrentInterface = PhoneInterfaces.Lumia_Normal;
+                                        CurrentModel = new NokiaPhoneModel(DevicePath);
+                                        LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
+                                        LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
+                                        LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
+                                        LogFile.Log("Mode: Normal", LogType.FileAndConsole);
+                                        NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
+                                    }
+                                });
+                            }
+                        }
+                        else
+                        {
+                            NewInterfaceWaitHandle.Set();
+
+                            CurrentInterface = PhoneInterfaces.Lumia_Normal;
+                            CurrentModel = new NokiaPhoneModel(e.DevicePath);
+                            LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
+                            LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
+                            LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
+                            LogFile.Log("Mode: Normal", LogType.FileAndConsole);
+                            NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
+                        }
+                    }
+                    else if (e.DevicePath.Contains("&PID_066E", StringComparison.OrdinalIgnoreCase) ||
+                             e.DevicePath.Contains("&PID_0714", StringComparison.OrdinalIgnoreCase) || // VID_0421&PID_0714 is for Lumia 930
+                             e.DevicePath.Contains("&PID_0A02", StringComparison.OrdinalIgnoreCase) || // VID_045E&PID_0A02 is for Lumia 950
+                             e.DevicePath.Contains("&PID_05EE", StringComparison.OrdinalIgnoreCase))   // VID_0421&PID_05EE is for early RX100
+                    {
+                        CurrentModel = new NokiaFlashModel(e.DevicePath);
+                        ((NokiaFlashModel)CurrentModel).InterfaceChanged += InterfaceChanged;
+
+                        FlashAppType type = FlashAppType.FlashApp;
+                        try
+                        {
+                            type = ((NokiaFlashModel)CurrentModel).GetFlashAppType();
+                            LogFile.Log("Flash App Type: " + type.ToString(), LogType.FileOnly);
+                        }
+                        catch
+                        {
+                            LogFile.Log("Flash App Type could not be determined, assuming " + type.ToString(), LogType.FileOnly);
+                        }
+
+                        switch (type)
+                        {
+                            case FlashAppType.BootManager:
+                                {
+                                    CurrentInterface = PhoneInterfaces.Lumia_Bootloader;
+                                    LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
+                                    LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
+                                    LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
+                                    LogFile.Log("Mode: Bootloader", LogType.FileAndConsole);
+                                    NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
+                                    break;
+                                }
+                            case FlashAppType.FlashApp:
+                                {
+                                    ((NokiaFlashModel)CurrentModel).DisableRebootTimeOut();
+                                    CurrentInterface = PhoneInterfaces.Lumia_Flash;
+                                    LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
+                                    LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
+                                    LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
+                                    LogFile.Log("Mode: Flash", LogType.FileAndConsole);
+                                    NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
+                                    break;
+                                }
+                            case FlashAppType.PhoneInfoApp:
+                                {
+                                    CurrentInterface = PhoneInterfaces.Lumia_Bootloader;
+                                    LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
+                                    LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
+                                    LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
+                                    LogFile.Log("Mode: Bootloader (Phone Info)", LogType.FileAndConsole);
+                                    NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
+                                    break;
+                                }
+                        }
+                    }
+                }
+                else if (e.DevicePath.Contains("DISK&VEN_QUALCOMM&PROD_MMC_STORAGE", StringComparison.OrdinalIgnoreCase) ||
+                         e.DevicePath.Contains("DISK&VEN_MSFT&PROD_PHONE_MMC_STOR", StringComparison.OrdinalIgnoreCase) ||
+                         ((e.DevicePath.Length == @"\\.\E:".Length) && e.DevicePath.StartsWith(@"\\.\") && e.DevicePath.EndsWith(":")))
+                {
+#if DEBUG
+                    LogFile.Log("Mass storage arrived: " + e.DevicePath, LogType.FileOnly);
+                    LogFile.Log("Start new thread for getting metadata.", LogType.FileOnly);
+#endif
+
+                    // This function is possibly called by an USB notification WndProc.
+                    // It is not possible to invoke COM objects from a WndProc.
+                    // MassStorage uses ManagementObjectSearcher, which is a COM object.
+                    // Therefore we use a new thread.
+                    ThreadPool.QueueUserWorkItem(s =>
+                    {
+                        lock (ModelLock)
+                        {
+                            if (!(CurrentModel is MassStorage))
+                            {
+                                // Wait 1 second to make sure MainOS is loaded
+                                // In case of multiple drive letters being assigned to the phone by the user
+                                // MainOS may take a while to show up and we may accidentally catch up a letter that is
+                                // not for MainOS.
+                                Task.Delay(1000).Wait();
+
+                                MassStorage NewModel = new(e.DevicePath);
+
+                                if (NewModel.Drive != null) // When logical drive is already known, we use this model. Or else we wait for the logical drive to arrive.
+                                {
+                                    CurrentInterface = PhoneInterfaces.Lumia_MassStorage;
+                                    CurrentModel = NewModel;
+                                    LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
+                                    LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
+                                    LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
+                                    LogFile.Log("Mode: Mass storage mode", LogType.FileAndConsole);
+                                    if (!string.IsNullOrEmpty(Qcom9006DevicePath))
+                                    {
+                                        LogFile.Log("Found 9006 device previously", LogType.FileOnly);
+                                        LogFile.Log("Attaching 9006 device", LogType.FileOnly);
+                                        NewModel.AttachQualcommSerial(Qcom9006DevicePath);
+                                    }
+                                    NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
+                                }
+                            }
+                        }
+                    });
+                }
+                else if (e.DevicePath.Contains("VID_05C6&", StringComparison.OrdinalIgnoreCase)) // Qualcomm device
+                {
+                    if (e.DevicePath.Contains("&PID_9008", StringComparison.OrdinalIgnoreCase))
+                    {
+                        USBDeviceInfo DeviceInfo = Array.Find(USBDevice.GetDevices(((USBNotifier)sender).Guid), (d) => string.Equals(d.DevicePath, e.DevicePath, StringComparison.CurrentCultureIgnoreCase));
+
+                        if ((DeviceInfo.BusName == "QHSUSB_DLOAD") || (DeviceInfo.BusName == "QHSUSB__BULK") || ((DeviceInfo.BusName?.Length == 0) && (LastInterface != PhoneInterfaces.Qualcomm_Download))) // TODO: Separate for Sahara!
+                        {
+                            CurrentInterface = PhoneInterfaces.Qualcomm_Download;
+                            CurrentModel = new QualcommSerial(e.DevicePath);
+                            NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
+                            LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
+                            LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
+                            LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
+                            if (DeviceInfo.BusName?.Length == 0)
+                            {
+                                LogFile.Log("Driver does not show busname, assume mode: Qualcomm Emergency Download 9008", LogType.FileAndConsole);
+                            }
+                            else
+                            {
+                                LogFile.Log("Mode: Qualcomm Emergency Download 9008", LogType.FileAndConsole);
+                            }
+                        }
+                        else if ((DeviceInfo.BusName == "QHSUSB_ARMPRG") || ((DeviceInfo.BusName?.Length == 0) && (LastInterface == PhoneInterfaces.Qualcomm_Download)))
+                        {
+                            CurrentInterface = PhoneInterfaces.Qualcomm_Flash;
+                            CurrentModel = new QualcommSerial(e.DevicePath);
+                            NewDeviceArrived(new ArrivalEventArgs((PhoneInterfaces)CurrentInterface, CurrentModel));
+                            LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
+                            LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
+                            LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
+                            if (DeviceInfo.BusName?.Length == 0)
+                            {
+                                LogFile.Log("Driver does not show busname, assume mode: Qualcomm Emergency Flash 9008", LogType.FileAndConsole);
+                            }
+                            else
+                            {
+                                LogFile.Log("Mode: Qualcomm Emergency Flash 9008", LogType.FileAndConsole);
+                            }
+                        }
+                    }
+                    else if (e.DevicePath.Contains("&PID_9006", StringComparison.OrdinalIgnoreCase))
+                    {
+                        // This is part of the Mass Storage inteface.
+                        // It is a slightly different version of the Qualcomm Emergency interface, which is implemented in SBL3.
+                        // One important difference is that the base address for sending a loader is not 0x2A000000, but it is 0x82F00000.
+
+                        Qcom9006DevicePath = e.DevicePath;
+
+                        LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
+                        LogFile.Log("Device path: " + Qcom9006DevicePath, LogType.FileOnly);
+                        LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
+                        LogFile.Log("Mode: Qualcomm Emergency 9006", LogType.FileAndConsole);
+
+                        if (CurrentModel is MassStorage)
+                        {
+                            LogFile.Log("Found Mass Storage device previously", LogType.FileOnly);
+                            LogFile.Log("Attaching 9006 device", LogType.FileOnly);
+                            ((MassStorage)CurrentModel).AttachQualcommSerial(Qcom9006DevicePath);
+                        }
+                    }
+                    else if (e.DevicePath.Contains("&PID_F006", StringComparison.OrdinalIgnoreCase))
+                    {
+                        // This is part of the charging inteface.
+
+                        LogFile.Log("Found device on interface: " + ((USBNotifier)sender).Guid.ToString(), LogType.FileOnly);
+                        LogFile.Log("Device path: " + e.DevicePath, LogType.FileOnly);
+                        LogFile.Log("Connected device: Lumia", LogType.FileAndConsole);
+                        LogFile.Log("Mode: Qualcomm Emergency Charging F006", LogType.FileAndConsole);
+                    }
+                }
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex);
+                CurrentModel = null;
+                CurrentInterface = null;
+            }
+        }
+
+        private void InterfaceChanged(PhoneInterfaces NewInterface)
+        {
+            CurrentInterface = NewInterface;
+        }
+
+        private void LumiaNotifier_Removal(object sender, USBEvent e)
+        {
+            if (e.DevicePath.Contains("VID_05C6&PID_9006", StringComparison.OrdinalIgnoreCase))
+            {
+                Qcom9006DevicePath = null;
+            }
+
+            if (
+                e.DevicePath.Contains("VID_0421&PID_0660&MI_04", StringComparison.OrdinalIgnoreCase) ||
+                e.DevicePath.Contains("VID_0421&PID_0713&MI_04", StringComparison.OrdinalIgnoreCase) ||
+                e.DevicePath.Contains("VID_045E&PID_0A01&MI_04", StringComparison.OrdinalIgnoreCase) ||
+                e.DevicePath.Contains("VID_0421&PID_0661", StringComparison.OrdinalIgnoreCase) ||
+                e.DevicePath.Contains("VID_0421&PID_06FC", StringComparison.OrdinalIgnoreCase) ||
+                e.DevicePath.Contains("VID_0421&PID_066E", StringComparison.OrdinalIgnoreCase) ||
+                e.DevicePath.Contains("VID_0421&PID_0714", StringComparison.OrdinalIgnoreCase) ||
+                e.DevicePath.Contains("VID_0421&PID_05EE", StringComparison.OrdinalIgnoreCase) ||
+                e.DevicePath.Contains("VID_045E&PID_0A00", StringComparison.OrdinalIgnoreCase) ||
+                e.DevicePath.Contains("VID_045E&PID_0A02", StringComparison.OrdinalIgnoreCase) ||
+                e.DevicePath.Contains("VID_05C6&PID_9008", StringComparison.OrdinalIgnoreCase) ||
+                e.DevicePath.Contains("DISK&VEN_QUALCOMM&PROD_MMC_STORAGE", StringComparison.OrdinalIgnoreCase) ||
+                e.DevicePath.Contains("DISK&VEN_MSFT&PROD_PHONE_MMC_STOR", StringComparison.OrdinalIgnoreCase)
+            )
+            {
+                if (CurrentInterface != null)
+                {
+                    LastInterface = CurrentInterface;
+                }
+
+                CurrentInterface = null;
+                if (CurrentModel != null)
+                {
+                    CurrentModel.Dispose();
+                    CurrentModel = null;
+                    LogFile.Log("Lumia disconnected", LogType.FileAndConsole);
+                }
+                DeviceRemoved();
+            }
+        }
+
+        internal async Task<IDisposable> WaitForArrival()
+        {
+            IDisposable Result = null;
+
+            if (CurrentInterface == null)
+            {
+                LogFile.Log("Waiting for phone to connect...", LogType.FileOnly);
+            }
+
+            await Task.Run(() =>
+            {
+                AutoResetEvent e = new(false);
+                void Arrived(ArrivalEventArgs a)
+                {
+                    e.Set();
+                    Result = a.NewModel;
+                }
+                NewDeviceArrived += Arrived;
+                e.WaitOne();
+                NewDeviceArrived -= Arrived;
+            });
+
+            return Result;
+        }
+
+        internal async Task WaitForRemoval()
+        {
+            LogFile.Log("Waiting for phone to disconnect...", LogType.FileOnly);
+
+            await Task.Run(() =>
+            {
+                AutoResetEvent e = new(false);
+                void Removed() => e.Set();
+                DeviceRemoved += Removed;
+                e.WaitOne();
+                DeviceRemoved -= Removed;
+            });
+        }
+    }
+}
diff --git a/ViewModels/RegistrationViewModel.cs b/WPinternals/ViewModels/RegistrationViewModel.cs
similarity index 96%
rename from ViewModels/RegistrationViewModel.cs
rename to WPinternals/ViewModels/RegistrationViewModel.cs
index 1bc6d91..5450fe5 100644
--- a/ViewModels/RegistrationViewModel.cs
+++ b/WPinternals/ViewModels/RegistrationViewModel.cs
@@ -1,143 +1,143 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Windows;
-
-namespace WPinternals
-{
-    internal class RegistrationViewModel : ContextViewModel
-    {
-        private readonly Action Completed;
-        private readonly Action Failed;
-
-        internal RegistrationViewModel(Action Completed, Action Failed)
-            : base()
-        {
-            this.Completed = Completed;
-            this.Failed = Failed;
-        }
-
-        private DelegateCommand _ExitCommand = null;
-        public DelegateCommand ExitCommand
-        {
-            get
-            {
-                return _ExitCommand ??= new DelegateCommand(() => Application.Current.Shutdown());
-            }
-        }
-
-        private DelegateCommand _ContinueCommand = null;
-        public DelegateCommand ContinueCommand
-        {
-            get
-            {
-                return _ContinueCommand ??= new DelegateCommand(() =>
-                    {
-                        try
-                        {
-                            App.Config.RegistrationName = _Name;
-                            App.Config.RegistrationEmail = _Email;
-                            App.Config.RegistrationSkypeID = _SkypeID;
-                            App.Config.RegistrationTelegramID = _TelegramID;
-                            App.Config.RegistrationKey = Registration.CalcRegKey();
-
-                            LogFile.BeginAction("Registration");
-                            LogFile.EndAction("Registration");
-
-                            App.Config.WriteConfig();
-
-                            Completed();
-                        }
-                        catch
-                        {
-                            Failed();
-                        }
-                    });
-            }
-        }
-
-        public bool IsRegistrationComplete
-        {
-            get
-            {
-                return (_Name?.Length >= 2) && (_Email?.Length >= 5);
-            }
-        }
-
-        private string _Name = null;
-        public string Name
-        {
-            get
-            {
-                return _Name;
-            }
-            set
-            {
-                _Name = value;
-                OnPropertyChanged(nameof(Name));
-                OnPropertyChanged(nameof(IsRegistrationComplete));
-            }
-        }
-
-        private string _Email = null;
-        public string Email
-        {
-            get
-            {
-                return _Email;
-            }
-            set
-            {
-                _Email = value;
-                OnPropertyChanged(nameof(Email));
-                OnPropertyChanged(nameof(IsRegistrationComplete));
-            }
-        }
-
-        private string _SkypeID = null;
-        public string SkypeID
-        {
-            get
-            {
-                return _SkypeID;
-            }
-            set
-            {
-                _SkypeID = value;
-                OnPropertyChanged(nameof(SkypeID));
-            }
-        }
-
-        private string _TelegramID = null;
-        public string TelegramID
-        {
-            get
-            {
-                return _TelegramID;
-            }
-            set
-            {
-                _TelegramID = value;
-                OnPropertyChanged(nameof(TelegramID));
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Windows;
+
+namespace WPinternals
+{
+    internal class RegistrationViewModel : ContextViewModel
+    {
+        private readonly Action Completed;
+        private readonly Action Failed;
+
+        internal RegistrationViewModel(Action Completed, Action Failed)
+            : base()
+        {
+            this.Completed = Completed;
+            this.Failed = Failed;
+        }
+
+        private DelegateCommand _ExitCommand = null;
+        public DelegateCommand ExitCommand
+        {
+            get
+            {
+                return _ExitCommand ??= new DelegateCommand(() => Application.Current.Shutdown());
+            }
+        }
+
+        private DelegateCommand _ContinueCommand = null;
+        public DelegateCommand ContinueCommand
+        {
+            get
+            {
+                return _ContinueCommand ??= new DelegateCommand(() =>
+                    {
+                        try
+                        {
+                            App.Config.RegistrationName = _Name;
+                            App.Config.RegistrationEmail = _Email;
+                            App.Config.RegistrationSkypeID = _SkypeID;
+                            App.Config.RegistrationTelegramID = _TelegramID;
+                            App.Config.RegistrationKey = Registration.CalcRegKey();
+
+                            LogFile.BeginAction("Registration");
+                            LogFile.EndAction("Registration");
+
+                            App.Config.WriteConfig();
+
+                            Completed();
+                        }
+                        catch
+                        {
+                            Failed();
+                        }
+                    });
+            }
+        }
+
+        public bool IsRegistrationComplete
+        {
+            get
+            {
+                return (_Name?.Length >= 2) && (_Email?.Length >= 5);
+            }
+        }
+
+        private string _Name = null;
+        public string Name
+        {
+            get
+            {
+                return _Name;
+            }
+            set
+            {
+                _Name = value;
+                OnPropertyChanged(nameof(Name));
+                OnPropertyChanged(nameof(IsRegistrationComplete));
+            }
+        }
+
+        private string _Email = null;
+        public string Email
+        {
+            get
+            {
+                return _Email;
+            }
+            set
+            {
+                _Email = value;
+                OnPropertyChanged(nameof(Email));
+                OnPropertyChanged(nameof(IsRegistrationComplete));
+            }
+        }
+
+        private string _SkypeID = null;
+        public string SkypeID
+        {
+            get
+            {
+                return _SkypeID;
+            }
+            set
+            {
+                _SkypeID = value;
+                OnPropertyChanged(nameof(SkypeID));
+            }
+        }
+
+        private string _TelegramID = null;
+        public string TelegramID
+        {
+            get
+            {
+                return _TelegramID;
+            }
+            set
+            {
+                _TelegramID = value;
+                OnPropertyChanged(nameof(TelegramID));
+            }
+        }
+    }
+}
diff --git a/ViewModels/RestoreSourceSelectionViewModel.cs b/WPinternals/ViewModels/RestoreSourceSelectionViewModel.cs
similarity index 97%
rename from ViewModels/RestoreSourceSelectionViewModel.cs
rename to WPinternals/ViewModels/RestoreSourceSelectionViewModel.cs
index 9b06475..59e0c89 100644
--- a/ViewModels/RestoreSourceSelectionViewModel.cs
+++ b/WPinternals/ViewModels/RestoreSourceSelectionViewModel.cs
@@ -1,204 +1,204 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal class RestoreSourceSelectionViewModel : ContextViewModel
-    {
-        private readonly PhoneNotifierViewModel PhoneNotifier;
-        private readonly Action<string, string, string> RestoreCallback;
-        private readonly Action<PhoneInterfaces> RequestModeSwitch;
-        internal Action SwitchToUnlockBoot;
-        internal Action SwitchToFlashRom;
-
-        internal RestoreSourceSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action<PhoneInterfaces> RequestModeSwitch, Action SwitchToUnlockBoot, Action SwitchToFlashRom, Action<string, string, string> RestoreCallback)
-            : base()
-        {
-            this.PhoneNotifier = PhoneNotifier;
-            this.RestoreCallback = RestoreCallback;
-            this.RequestModeSwitch = RequestModeSwitch;
-            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
-            this.SwitchToFlashRom = SwitchToFlashRom;
-
-            this.PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-            this.PhoneNotifier.DeviceRemoved += DeviceRemoved;
-
-            new Thread(() => EvaluateViewState()).Start();
-        }
-
-        private string _EFIESPPath;
-        public string EFIESPPath
-        {
-            get
-            {
-                return _EFIESPPath;
-            }
-            set
-            {
-                if (value != _EFIESPPath)
-                {
-                    _EFIESPPath = value;
-                    OnPropertyChanged(nameof(EFIESPPath));
-                }
-            }
-        }
-
-        private string _MainOSPath;
-        public string MainOSPath
-        {
-            get
-            {
-                return _MainOSPath;
-            }
-            set
-            {
-                if (value != _MainOSPath)
-                {
-                    _MainOSPath = value;
-                    OnPropertyChanged(nameof(MainOSPath));
-                }
-            }
-        }
-
-        private string _DataPath;
-        public string DataPath
-        {
-            get
-            {
-                return _DataPath;
-            }
-            set
-            {
-                if (value != _DataPath)
-                {
-                    _DataPath = value;
-                    OnPropertyChanged(nameof(DataPath));
-                }
-            }
-        }
-
-        private bool _IsPhoneDisconnected;
-        public bool IsPhoneDisconnected
-        {
-            get
-            {
-                return _IsPhoneDisconnected;
-            }
-            set
-            {
-                if (value != _IsPhoneDisconnected)
-                {
-                    _IsPhoneDisconnected = value;
-                    OnPropertyChanged(nameof(IsPhoneDisconnected));
-                }
-            }
-        }
-
-        private bool _IsPhoneInFlashMode;
-        public bool IsPhoneInFlashMode
-        {
-            get
-            {
-                return _IsPhoneInFlashMode;
-            }
-            set
-            {
-                if (value != _IsPhoneInFlashMode)
-                {
-                    _IsPhoneInFlashMode = value;
-                    OnPropertyChanged(nameof(IsPhoneInFlashMode));
-                }
-            }
-        }
-
-        private bool _IsPhoneInOtherMode;
-        public bool IsPhoneInOtherMode
-        {
-            get
-            {
-                return _IsPhoneInOtherMode;
-            }
-            set
-            {
-                if (value != _IsPhoneInOtherMode)
-                {
-                    _IsPhoneInOtherMode = value;
-                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
-                }
-            }
-        }
-
-        private DelegateCommand _RestoreCommand;
-        public DelegateCommand RestoreCommand
-        {
-            get
-            {
-                return _RestoreCommand ??= new DelegateCommand(() => RestoreCallback(EFIESPPath, MainOSPath, DataPath), () => ((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)) && (PhoneNotifier.CurrentInterface != null));
-            }
-        }
-
-        ~RestoreSourceSelectionViewModel()
-        {
-            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
-        }
-
-        private void NewDeviceArrived(ArrivalEventArgs Args)
-        {
-            new Thread(() => EvaluateViewState()).Start();
-        }
-
-        private void DeviceRemoved()
-        {
-            new Thread(() => EvaluateViewState()).Start();
-        }
-
-        internal override void EvaluateViewState()
-        {
-            IsPhoneDisconnected = PhoneNotifier.CurrentInterface == null;
-            IsPhoneInFlashMode = PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Flash;
-            IsPhoneInOtherMode = !IsPhoneDisconnected && !IsPhoneInFlashMode;
-            RestoreCommand.RaiseCanExecuteChanged();
-        }
-
-        internal void RebootTo(string Mode)
-        {
-            switch (Mode)
-            {
-                case "Normal":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Normal);
-                    break;
-                case "Flash":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
-                    break;
-                case "Label":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
-                    break;
-                case "MassStorage":
-                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
-                    break;
-                default:
-                    return;
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal class RestoreSourceSelectionViewModel : ContextViewModel
+    {
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action<string, string, string> RestoreCallback;
+        private readonly Action<PhoneInterfaces> RequestModeSwitch;
+        internal Action SwitchToUnlockBoot;
+        internal Action SwitchToFlashRom;
+
+        internal RestoreSourceSelectionViewModel(PhoneNotifierViewModel PhoneNotifier, Action<PhoneInterfaces> RequestModeSwitch, Action SwitchToUnlockBoot, Action SwitchToFlashRom, Action<string, string, string> RestoreCallback)
+            : base()
+        {
+            this.PhoneNotifier = PhoneNotifier;
+            this.RestoreCallback = RestoreCallback;
+            this.RequestModeSwitch = RequestModeSwitch;
+            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
+            this.SwitchToFlashRom = SwitchToFlashRom;
+
+            this.PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+            this.PhoneNotifier.DeviceRemoved += DeviceRemoved;
+
+            new Thread(() => EvaluateViewState()).Start();
+        }
+
+        private string _EFIESPPath;
+        public string EFIESPPath
+        {
+            get
+            {
+                return _EFIESPPath;
+            }
+            set
+            {
+                if (value != _EFIESPPath)
+                {
+                    _EFIESPPath = value;
+                    OnPropertyChanged(nameof(EFIESPPath));
+                }
+            }
+        }
+
+        private string _MainOSPath;
+        public string MainOSPath
+        {
+            get
+            {
+                return _MainOSPath;
+            }
+            set
+            {
+                if (value != _MainOSPath)
+                {
+                    _MainOSPath = value;
+                    OnPropertyChanged(nameof(MainOSPath));
+                }
+            }
+        }
+
+        private string _DataPath;
+        public string DataPath
+        {
+            get
+            {
+                return _DataPath;
+            }
+            set
+            {
+                if (value != _DataPath)
+                {
+                    _DataPath = value;
+                    OnPropertyChanged(nameof(DataPath));
+                }
+            }
+        }
+
+        private bool _IsPhoneDisconnected;
+        public bool IsPhoneDisconnected
+        {
+            get
+            {
+                return _IsPhoneDisconnected;
+            }
+            set
+            {
+                if (value != _IsPhoneDisconnected)
+                {
+                    _IsPhoneDisconnected = value;
+                    OnPropertyChanged(nameof(IsPhoneDisconnected));
+                }
+            }
+        }
+
+        private bool _IsPhoneInFlashMode;
+        public bool IsPhoneInFlashMode
+        {
+            get
+            {
+                return _IsPhoneInFlashMode;
+            }
+            set
+            {
+                if (value != _IsPhoneInFlashMode)
+                {
+                    _IsPhoneInFlashMode = value;
+                    OnPropertyChanged(nameof(IsPhoneInFlashMode));
+                }
+            }
+        }
+
+        private bool _IsPhoneInOtherMode;
+        public bool IsPhoneInOtherMode
+        {
+            get
+            {
+                return _IsPhoneInOtherMode;
+            }
+            set
+            {
+                if (value != _IsPhoneInOtherMode)
+                {
+                    _IsPhoneInOtherMode = value;
+                    OnPropertyChanged(nameof(IsPhoneInOtherMode));
+                }
+            }
+        }
+
+        private DelegateCommand _RestoreCommand;
+        public DelegateCommand RestoreCommand
+        {
+            get
+            {
+                return _RestoreCommand ??= new DelegateCommand(() => RestoreCallback(EFIESPPath, MainOSPath, DataPath), () => ((EFIESPPath != null) || (MainOSPath != null) || (DataPath != null)) && (PhoneNotifier.CurrentInterface != null));
+            }
+        }
+
+        ~RestoreSourceSelectionViewModel()
+        {
+            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
+        }
+
+        private void NewDeviceArrived(ArrivalEventArgs Args)
+        {
+            new Thread(() => EvaluateViewState()).Start();
+        }
+
+        private void DeviceRemoved()
+        {
+            new Thread(() => EvaluateViewState()).Start();
+        }
+
+        internal override void EvaluateViewState()
+        {
+            IsPhoneDisconnected = PhoneNotifier.CurrentInterface == null;
+            IsPhoneInFlashMode = PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Flash;
+            IsPhoneInOtherMode = !IsPhoneDisconnected && !IsPhoneInFlashMode;
+            RestoreCommand.RaiseCanExecuteChanged();
+        }
+
+        internal void RebootTo(string Mode)
+        {
+            switch (Mode)
+            {
+                case "Normal":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Normal);
+                    break;
+                case "Flash":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Flash);
+                    break;
+                case "Label":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_Label);
+                    break;
+                case "MassStorage":
+                    RequestModeSwitch(PhoneInterfaces.Lumia_MassStorage);
+                    break;
+                default:
+                    return;
+            }
+        }
+    }
+}
diff --git a/ViewModels/RestoreViewModel.cs b/WPinternals/ViewModels/RestoreViewModel.cs
similarity index 97%
rename from ViewModels/RestoreViewModel.cs
rename to WPinternals/ViewModels/RestoreViewModel.cs
index f44fb62..a5b34a6 100644
--- a/ViewModels/RestoreViewModel.cs
+++ b/WPinternals/ViewModels/RestoreViewModel.cs
@@ -1,204 +1,204 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.IO;
-using System.Threading;
-
-namespace WPinternals
-{
-    internal class RestoreViewModel : ContextViewModel
-    {
-        private readonly PhoneNotifierViewModel PhoneNotifier;
-        private readonly Action Callback;
-        private readonly Action<PhoneInterfaces> RequestModeSwitch;
-        private readonly Action SwitchToUnlockBoot;
-        private readonly Action SwitchToFlashRom;
-
-        internal RestoreViewModel(PhoneNotifierViewModel PhoneNotifier, Action<PhoneInterfaces> RequestModeSwitch, Action SwitchToUnlockBoot, Action SwitchToFlashRom, Action Callback)
-            : base()
-        {
-            IsSwitchingInterface = true;
-
-            this.PhoneNotifier = PhoneNotifier;
-            this.Callback = Callback;
-            this.RequestModeSwitch = RequestModeSwitch;
-            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
-            this.SwitchToFlashRom = SwitchToFlashRom;
-        }
-
-        internal override void EvaluateViewState()
-        {
-            if (!IsActive)
-            {
-                return;
-            }
-
-            if (SubContextViewModel == null)
-            {
-                ActivateSubContext(new RestoreSourceSelectionViewModel(PhoneNotifier, RequestModeSwitch, SwitchToUnlockBoot, SwitchToFlashRom, DoRestore));
-            }
-
-            if (SubContextViewModel is RestoreSourceSelectionViewModel)
-            {
-                ((RestoreSourceSelectionViewModel)SubContextViewModel).EvaluateViewState();
-            }
-        }
-
-        internal async void DoRestore(string EFIESPPath, string MainOSPath, string DataPath)
-        {
-            try
-            {
-                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Flash,
-                    (msg, sub) =>
-                        ActivateSubContext(new BusyViewModel(msg, sub)));
-                RestoreTask(EFIESPPath, MainOSPath, DataPath);
-            }
-            catch (Exception Ex)
-            {
-                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
-            }
-        }
-
-        internal void RestoreTask(string EFIESPPath, string MainOSPath, string DataPath)
-        {
-            new Thread(() =>
-                {
-                    bool Result = true;
-
-                    ActivateSubContext(new BusyViewModel("Initializing restore..."));
-
-                    ulong TotalSizeSectors = 0;
-                    int PartitionCount = 0;
-                    try
-                    {
-                        if (EFIESPPath != null)
-                        {
-                            TotalSizeSectors += (ulong)new FileInfo(EFIESPPath).Length / 0x200;
-                            PartitionCount++;
-                        }
-
-                        if (MainOSPath != null)
-                        {
-                            TotalSizeSectors += (ulong)new FileInfo(MainOSPath).Length / 0x200;
-                            PartitionCount++;
-                        }
-
-                        if (DataPath != null)
-                        {
-                            TotalSizeSectors += (ulong)new FileInfo(DataPath).Length / 0x200;
-                            PartitionCount++;
-                        }
-                    }
-                    catch (Exception Ex)
-                    {
-                        LogFile.LogException(Ex);
-                        Result = false;
-                    }
-
-                    NokiaFlashModel Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
-
-                    BusyViewModel Busy = new("Restoring...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
-                    ProgressUpdater Updater = Busy.ProgressUpdater;
-                    ActivateSubContext(Busy);
-
-                    int i = 0;
-                    if (Result)
-                    {
-                        try
-                        {
-                            if (EFIESPPath != null)
-                            {
-                                i++;
-                                Busy.Message = "Restoring partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                Phone.FlashRawPartition(EFIESPPath, "EFIESP", Updater);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                    }
-
-                    if (Result)
-                    {
-                        try
-                        {
-                            if (MainOSPath != null)
-                            {
-                                i++;
-                                Busy.Message = "Restoring partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                Phone.FlashRawPartition(EFIESPPath, "MainOS", Updater);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                    }
-
-                    if (Result)
-                    {
-                        try
-                        {
-                            if (DataPath != null)
-                            {
-                                i++;
-                                Busy.Message = "Restoring partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
-                                Phone.FlashRawPartition(EFIESPPath, "Data", Updater);
-                            }
-                        }
-                        catch (Exception Ex)
-                        {
-                            LogFile.LogException(Ex);
-                            Result = false;
-                        }
-                    }
-
-                    if (!Result)
-                    {
-                        ActivateSubContext(new MessageViewModel("Failed to restore!", Exit));
-                        return;
-                    }
-
-                    ActivateSubContext(new MessageViewModel("Successfully restored!", Exit));
-                }).Start();
-        }
-
-        internal async void Exit()
-        {
-            IsSwitchingInterface = false;
-            try
-            {
-                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Normal,
-                    (msg, sub) =>
-                        ActivateSubContext(new BusyViewModel(msg, sub)));
-                Callback();
-                ActivateSubContext(null);
-            }
-            catch (Exception Ex)
-            {
-                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.IO;
+using System.Threading;
+
+namespace WPinternals
+{
+    internal class RestoreViewModel : ContextViewModel
+    {
+        private readonly PhoneNotifierViewModel PhoneNotifier;
+        private readonly Action Callback;
+        private readonly Action<PhoneInterfaces> RequestModeSwitch;
+        private readonly Action SwitchToUnlockBoot;
+        private readonly Action SwitchToFlashRom;
+
+        internal RestoreViewModel(PhoneNotifierViewModel PhoneNotifier, Action<PhoneInterfaces> RequestModeSwitch, Action SwitchToUnlockBoot, Action SwitchToFlashRom, Action Callback)
+            : base()
+        {
+            IsSwitchingInterface = true;
+
+            this.PhoneNotifier = PhoneNotifier;
+            this.Callback = Callback;
+            this.RequestModeSwitch = RequestModeSwitch;
+            this.SwitchToUnlockBoot = SwitchToUnlockBoot;
+            this.SwitchToFlashRom = SwitchToFlashRom;
+        }
+
+        internal override void EvaluateViewState()
+        {
+            if (!IsActive)
+            {
+                return;
+            }
+
+            if (SubContextViewModel == null)
+            {
+                ActivateSubContext(new RestoreSourceSelectionViewModel(PhoneNotifier, RequestModeSwitch, SwitchToUnlockBoot, SwitchToFlashRom, DoRestore));
+            }
+
+            if (SubContextViewModel is RestoreSourceSelectionViewModel)
+            {
+                ((RestoreSourceSelectionViewModel)SubContextViewModel).EvaluateViewState();
+            }
+        }
+
+        internal async void DoRestore(string EFIESPPath, string MainOSPath, string DataPath)
+        {
+            try
+            {
+                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Flash,
+                    (msg, sub) =>
+                        ActivateSubContext(new BusyViewModel(msg, sub)));
+                RestoreTask(EFIESPPath, MainOSPath, DataPath);
+            }
+            catch (Exception Ex)
+            {
+                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
+            }
+        }
+
+        internal void RestoreTask(string EFIESPPath, string MainOSPath, string DataPath)
+        {
+            new Thread(() =>
+                {
+                    bool Result = true;
+
+                    ActivateSubContext(new BusyViewModel("Initializing restore..."));
+
+                    ulong TotalSizeSectors = 0;
+                    int PartitionCount = 0;
+                    try
+                    {
+                        if (EFIESPPath != null)
+                        {
+                            TotalSizeSectors += (ulong)new FileInfo(EFIESPPath).Length / 0x200;
+                            PartitionCount++;
+                        }
+
+                        if (MainOSPath != null)
+                        {
+                            TotalSizeSectors += (ulong)new FileInfo(MainOSPath).Length / 0x200;
+                            PartitionCount++;
+                        }
+
+                        if (DataPath != null)
+                        {
+                            TotalSizeSectors += (ulong)new FileInfo(DataPath).Length / 0x200;
+                            PartitionCount++;
+                        }
+                    }
+                    catch (Exception Ex)
+                    {
+                        LogFile.LogException(Ex);
+                        Result = false;
+                    }
+
+                    NokiaFlashModel Phone = (NokiaFlashModel)PhoneNotifier.CurrentModel;
+
+                    BusyViewModel Busy = new("Restoring...", MaxProgressValue: TotalSizeSectors, UIContext: UIContext);
+                    ProgressUpdater Updater = Busy.ProgressUpdater;
+                    ActivateSubContext(Busy);
+
+                    int i = 0;
+                    if (Result)
+                    {
+                        try
+                        {
+                            if (EFIESPPath != null)
+                            {
+                                i++;
+                                Busy.Message = "Restoring partition EFIESP (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                Phone.FlashRawPartition(EFIESPPath, "EFIESP", Updater);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                    }
+
+                    if (Result)
+                    {
+                        try
+                        {
+                            if (MainOSPath != null)
+                            {
+                                i++;
+                                Busy.Message = "Restoring partition MainOS (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                Phone.FlashRawPartition(EFIESPPath, "MainOS", Updater);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                    }
+
+                    if (Result)
+                    {
+                        try
+                        {
+                            if (DataPath != null)
+                            {
+                                i++;
+                                Busy.Message = "Restoring partition Data (" + i.ToString() + "/" + PartitionCount.ToString() + ")";
+                                Phone.FlashRawPartition(EFIESPPath, "Data", Updater);
+                            }
+                        }
+                        catch (Exception Ex)
+                        {
+                            LogFile.LogException(Ex);
+                            Result = false;
+                        }
+                    }
+
+                    if (!Result)
+                    {
+                        ActivateSubContext(new MessageViewModel("Failed to restore!", Exit));
+                        return;
+                    }
+
+                    ActivateSubContext(new MessageViewModel("Successfully restored!", Exit));
+                }).Start();
+        }
+
+        internal async void Exit()
+        {
+            IsSwitchingInterface = false;
+            try
+            {
+                await SwitchModeViewModel.SwitchToWithProgress(PhoneNotifier, PhoneInterfaces.Lumia_Normal,
+                    (msg, sub) =>
+                        ActivateSubContext(new BusyViewModel(msg, sub)));
+                Callback();
+                ActivateSubContext(null);
+            }
+            catch (Exception Ex)
+            {
+                ActivateSubContext(new MessageViewModel(Ex.Message, Callback));
+            }
+        }
+    }
+}
diff --git a/ViewModels/SwitchModeViewModel.cs b/WPinternals/ViewModels/SwitchModeViewModel.cs
similarity index 98%
rename from ViewModels/SwitchModeViewModel.cs
rename to WPinternals/ViewModels/SwitchModeViewModel.cs
index 70144f1..871f464 100644
--- a/ViewModels/SwitchModeViewModel.cs
+++ b/WPinternals/ViewModels/SwitchModeViewModel.cs
@@ -1,918 +1,918 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace WPinternals
-{
-    internal delegate void ModeSwitchProgressHandler(string Message, string SubMessage);
-    internal delegate void ModeSwitchErrorHandler(string Message);
-    internal delegate void ModeSwitchSuccessHandler(IDisposable NewModel, PhoneInterfaces NewInterface);
-
-    internal class SwitchModeViewModel : ContextViewModel
-    {
-        protected PhoneNotifierViewModel PhoneNotifier;
-        protected IDisposable CurrentModel;
-        protected PhoneInterfaces? CurrentMode;
-        protected PhoneInterfaces? TargetMode;
-        protected bool IsSwitching = false;
-        internal event ModeSwitchProgressHandler ModeSwitchProgress = delegate { };
-        internal event ModeSwitchErrorHandler ModeSwitchError = delegate { };
-        internal event ModeSwitchSuccessHandler ModeSwitchSuccess = delegate { };
-        internal new SetWorkingStatus SetWorkingStatus = (m, s, v, a, st) => { };
-        internal new UpdateWorkingStatus UpdateWorkingStatus = (m, s, v, st) => { };
-        private string MassStorageWarning = null;
-
-        internal SwitchModeViewModel(PhoneNotifierViewModel PhoneNotifier, PhoneInterfaces? TargetMode)
-            : base()
-        {
-            if ((PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Flash) && (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Label) && (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Normal))
-            {
-                throw new ArgumentException();
-            }
-
-            this.PhoneNotifier = PhoneNotifier;
-            this.CurrentModel = (NokiaPhoneModel)PhoneNotifier.CurrentModel;
-            this.CurrentMode = PhoneNotifier.CurrentInterface;
-            this.TargetMode = TargetMode;
-
-            if (this.CurrentMode == null)
-            {
-                LogFile.Log("Waiting for phone to connect...", LogType.FileAndConsole);
-                PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-            }
-            else
-            {
-                // Make sure this ViewModel has its View loaded before we continue,
-                // or else loading of Views can get mixed up.
-                if (SynchronizationContext.Current == null)
-                {
-                    StartSwitch();
-                }
-                else
-                {
-                    SynchronizationContext.Current.Post((s) => ((SwitchModeViewModel)s).StartSwitch(), this);
-                }
-            }
-        }
-
-        internal SwitchModeViewModel(PhoneNotifierViewModel PhoneNotifier, PhoneInterfaces? TargetMode, ModeSwitchProgressHandler ModeSwitchProgress, ModeSwitchErrorHandler ModeSwitchError, ModeSwitchSuccessHandler ModeSwitchSuccess, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null)
-            : base()
-        {
-            if ((PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader) && (TargetMode == PhoneInterfaces.Lumia_Flash))
-            {
-                PhoneInfo Info = ((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadPhoneInfo(false);
-                if (Info.BootManagerProtocolVersionMajor >= 2)
-                {
-                    try
-                    {
-                        // The implementation of SwitchToFlashAppContext() is improved
-                        // SwitchToFlashAppContext() should only be used with BootMgr v2
-                        // For switching from BootMgr to FlashApp, it will use NOKS
-                        // That will switch to a charging state, whereas a normal context switch will not start charging
-                        // The implementation of NOKS in BootMgr mode has changed in BootMgr v2
-                        // It does not disconnect / reconnect anymore and the apptype is changed immediately
-                        // NOKS still doesnt return a status
-                        // BootMgr v1 uses normal NOKS and waits for arrival of FlashApp
-                        ((NokiaFlashModel)PhoneNotifier.CurrentModel).SwitchToFlashAppContext();
-
-                        // But this was called as a real switch, so we will raise an arrival event.
-                        PhoneNotifier.CurrentInterface = PhoneInterfaces.Lumia_Flash;
-                        PhoneNotifier.NotifyArrival();
-                    }
-                    catch { }
-                }
-            }
-
-            if (PhoneNotifier.CurrentInterface == TargetMode)
-            {
-                ModeSwitchSuccess(PhoneNotifier.CurrentModel, (PhoneInterfaces)PhoneNotifier.CurrentInterface);
-            }
-            else
-            {
-                this.PhoneNotifier = PhoneNotifier;
-                this.CurrentModel = (NokiaPhoneModel)PhoneNotifier.CurrentModel;
-                this.CurrentMode = PhoneNotifier.CurrentInterface;
-                this.TargetMode = TargetMode;
-                if (ModeSwitchProgress != null)
-                {
-                    this.ModeSwitchProgress += ModeSwitchProgress;
-                }
-
-                if (ModeSwitchError != null)
-                {
-                    this.ModeSwitchError += ModeSwitchError;
-                }
-
-                if (ModeSwitchSuccess != null)
-                {
-                    this.ModeSwitchSuccess += ModeSwitchSuccess;
-                }
-
-                if (SetWorkingStatus != null)
-                {
-                    this.SetWorkingStatus = SetWorkingStatus;
-                }
-
-                if (UpdateWorkingStatus != null)
-                {
-                    this.UpdateWorkingStatus = UpdateWorkingStatus;
-                }
-
-                if (this.CurrentMode == null)
-                {
-                    LogFile.Log("Waiting for phone to connect...", LogType.FileAndConsole);
-                    PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                }
-                else
-                {
-                    // Make sure this ViewModel has its View loaded before we continue,
-                    // or else loading of Views can get mixed up.
-                    if (SynchronizationContext.Current == null)
-                    {
-                        StartSwitch();
-                    }
-                    else
-                    {
-                        SynchronizationContext.Current.Post((s) => ((SwitchModeViewModel)s).StartSwitch(), this);
-                    }
-                }
-            }
-        }
-
-        private void ModeSwitchProgressWrapper(string Message, string SubMessage)
-        {
-            if ((UIContext == null) || (SynchronizationContext.Current == UIContext))
-            {
-                ModeSwitchProgress(Message, SubMessage);
-                SetWorkingStatus(Message, SubMessage);
-            }
-            else
-            {
-                UIContext.Post(s =>
-                {
-                    ModeSwitchProgress(Message, SubMessage);
-                    SetWorkingStatus(Message, SubMessage);
-                }, null);
-            }
-        }
-
-        private void ModeSwitchErrorWrapper(string Message)
-        {
-            IsSwitching = false;
-            if ((UIContext == null) || (SynchronizationContext.Current == UIContext))
-            {
-                ModeSwitchError(Message);
-            }
-            else
-            {
-                UIContext.Post(s => ModeSwitchError(Message), null);
-            }
-        }
-
-        private void ModeSwitchSuccessWrapper()
-        {
-            IsSwitching = false;
-            if ((UIContext == null) || (SynchronizationContext.Current == UIContext))
-            {
-                if (PhoneNotifier.CurrentInterface == null)
-                {
-                    ModeSwitchErrorWrapper("Phone disconnected");
-                }
-                else
-                {
-                    ModeSwitchSuccess(PhoneNotifier.CurrentModel, (PhoneInterfaces)PhoneNotifier.CurrentInterface);
-                }
-            }
-            else
-            {
-                if (PhoneNotifier.CurrentInterface == null)
-                {
-                    UIContext.Post(s => ModeSwitchErrorWrapper("Phone disconnected"), null);
-                }
-                else
-                {
-                    UIContext.Post(s => ModeSwitchSuccess(PhoneNotifier.CurrentModel, (PhoneInterfaces)PhoneNotifier.CurrentInterface), null);
-                }
-            }
-        }
-
-        ~SwitchModeViewModel()
-        {
-            if (PhoneNotifier != null)
-            {
-                PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
-            }
-        }
-
-        internal void StartSwitch()
-        {
-            IsSwitching = true;
-
-            // Make switch and set message or navigate to error
-            switch (CurrentMode)
-            {
-                case PhoneInterfaces.Lumia_Normal:
-                case PhoneInterfaces.Lumia_Label:
-                    string DeviceMode;
-
-                    switch (TargetMode)
-                    {
-                        case PhoneInterfaces.Lumia_Normal:
-                            DeviceMode = "Normal";
-                            IsSwitchingInterface = true;
-                            ModeSwitchProgressWrapper("Rebooting phone to Normal mode...", null);
-                            LogFile.Log("Rebooting phone to Normal mode", LogType.FileAndConsole);
-                            break;
-                        case PhoneInterfaces.Lumia_Bootloader:
-                            DeviceMode = "Normal";
-                            IsSwitchingInterface = true;
-                            ModeSwitchProgressWrapper("Rebooting phone to Bootloader mode...", null);
-                            LogFile.Log("Rebooting phone to Bootloader mode", LogType.FileAndConsole);
-                            break;
-                        case PhoneInterfaces.Lumia_Flash:
-                            DeviceMode = "Flash";
-                            IsSwitchingInterface = true;
-                            ModeSwitchProgressWrapper("Rebooting phone to Flash mode...", null);
-                            LogFile.Log("Rebooting phone to Flash mode", LogType.FileAndConsole);
-                            break;
-                        case PhoneInterfaces.Lumia_Label:
-                            DeviceMode = "Flash";
-                            IsSwitchingInterface = true;
-                            ModeSwitchProgressWrapper("First rebooting phone to Flash mode...", null);
-                            LogFile.Log("First rebooting phone to Flash mode (then attempt Label mode)", LogType.FileAndConsole);
-                            break;
-                        case PhoneInterfaces.Lumia_MassStorage:
-                            DeviceMode = "Flash";
-                            IsSwitchingInterface = true;
-                            ModeSwitchProgressWrapper("First rebooting phone to Flash mode...", null);
-                            LogFile.Log("First rebooting phone to Flash mode (then attempt Mass Storage mode)", LogType.FileAndConsole);
-                            break;
-                        case PhoneInterfaces.Qualcomm_Download: // Only available in new Lumia's
-                            DeviceMode = "Flash";
-                            IsSwitchingInterface = true;
-                            ModeSwitchProgressWrapper("First rebooting phone to Flash mode...", null);
-                            LogFile.Log("First rebooting phone to Flash mode (then attempt Qualcomm Download mode", LogType.FileAndConsole);
-                            break;
-                        default:
-                            return;
-                    }
-
-                    Dictionary<string, object> Params = new();
-                    Params.Add("DeviceMode", DeviceMode);
-                    Params.Add("ResetMethod", "HwReset");
-                    try
-                    {
-                        ((NokiaPhoneModel)CurrentModel).ExecuteJsonMethodAsync("SetDeviceMode", Params);
-                        PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                    }
-                    catch (Exception Ex)
-                    {
-                        LogFile.LogException(Ex);
-                        ModeSwitchErrorWrapper("Failed to switch to Qualcomm Download mode");
-                        IsSwitchingInterface = false;
-                    }
-                    break;
-                case PhoneInterfaces.Lumia_Flash:
-                case PhoneInterfaces.Lumia_Bootloader:
-                    byte[] BootModeFlagCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x58, 0x46, 0x57, 0x00, 0x55, 0x42, 0x46, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 }; // NOKFW UBF
-                    byte[] RebootCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x52 }; // NOKR
-                    byte[] RebootCommandResult;
-                    IsSwitchingInterface = true;
-                    switch (TargetMode)
-                    {
-                        case null:
-                            ((NokiaFlashModel)CurrentModel).Shutdown();
-                            ModeSwitchProgressWrapper("Please disconnect your device. Waiting...", null);
-                            LogFile.Log("Please disconnect your device. Waiting...", LogType.FileAndConsole);
-                            new Thread(() =>
-                            {
-                                PhoneNotifier.WaitForRemoval().Wait();
-                                ModeSwitchSuccessWrapper();
-                            }).Start();
-                            break;
-                        case PhoneInterfaces.Lumia_Normal:
-                            ((NokiaPhoneModel)CurrentModel).ExecuteRawVoidMethod(RebootCommand);
-                            PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                            ModeSwitchProgressWrapper("Rebooting phone to Normal mode...", null);
-                            LogFile.Log("Rebooting phone to Normal mode", LogType.FileAndConsole);
-                            break;
-                        case PhoneInterfaces.Lumia_Bootloader:
-                            ((NokiaPhoneModel)CurrentModel).ExecuteRawVoidMethod(RebootCommand);
-                            PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                            ModeSwitchProgressWrapper("Rebooting phone to Bootloader mode...", null);
-                            LogFile.Log("Rebooting phone to Bootloader mode", LogType.FileAndConsole);
-                            break;
-                        case PhoneInterfaces.Lumia_Label:
-                            SwitchFromFlashToLabelMode();
-                            break;
-                        case PhoneInterfaces.Lumia_Flash: // attempt to boot from limited flash to full flash
-                            byte[] RebootToFlashCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x53 }; // NOKS
-                            ((NokiaPhoneModel)CurrentModel).ExecuteRawVoidMethod(RebootToFlashCommand);
-                            PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                            ModeSwitchProgressWrapper("Rebooting phone to Flash mode...", null);
-                            LogFile.Log("Rebooting phone to Flash mode", LogType.FileAndConsole);
-                            break;
-                        case PhoneInterfaces.Lumia_MassStorage:
-                            SwitchFromFlashToMassStorageMode();
-                            break;
-                        case PhoneInterfaces.Qualcomm_Download:
-                            byte[] RebootToQualcommDownloadCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x58, 0x43, 0x42, 0x45 }; // NOKXCBE
-                            RebootCommandResult = ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(RebootToQualcommDownloadCommand);
-                            if (RebootCommandResult?.Length == 4) // This means fail: NOKU (unknow command)
-                            {
-                                IsSwitchingInterface = false;
-                                ModeSwitchErrorWrapper("Failed to switch to Qualcomm Download mode");
-                            }
-                            else
-                            {
-                                PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                                ModeSwitchProgressWrapper("Rebooting phone to Qualcomm Download mode...", null);
-                                LogFile.Log("Rebooting phone to Qualcomm Download mode", LogType.FileAndConsole);
-                            }
-                            break;
-                        default:
-                            return;
-                    }
-                    break;
-                case PhoneInterfaces.Lumia_MassStorage:
-                    IsSwitchingInterface = true;
-                    switch (TargetMode)
-                    {
-                        case PhoneInterfaces.Lumia_Normal:
-                            ((MassStorage)CurrentModel).Reboot();
-                            PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                            ModeSwitchProgressWrapper("Rebooting phone to Normal mode...", null);
-                            LogFile.Log("Rebooting phone to Normal mode", LogType.FileAndConsole);
-                            break;
-                        case PhoneInterfaces.Lumia_Label:
-                            ((MassStorage)CurrentModel).Reboot();
-                            PhoneNotifier.NewDeviceArrived += NewDeviceArrivedFromMassStorageMode;
-                            ModeSwitchProgressWrapper("Rebooting phone to Label mode...", null);
-                            LogFile.Log("Rebooting phone to Label mode...", LogType.FileAndConsole);
-                            break;
-                        case PhoneInterfaces.Lumia_Flash:
-                            ((MassStorage)CurrentModel).Reboot();
-                            PhoneNotifier.NewDeviceArrived += NewDeviceArrivedFromMassStorageMode;
-                            ModeSwitchProgressWrapper("Rebooting phone to Flash mode...", null);
-                            LogFile.Log("Rebooting phone to Flash mode...", LogType.FileAndConsole);
-                            break;
-                        case null:
-                            ((MassStorage)CurrentModel).Reboot();
-                            PhoneNotifier.NewDeviceArrived += NewDeviceArrivedFromMassStorageMode;
-                            ModeSwitchProgressWrapper("First rebooting phone to Flash mode...", null);
-                            LogFile.Log("First rebooting phone to Bootloader mode...", LogType.FileAndConsole);
-                            break;
-                        default:
-                            return;
-                    }
-                    break;
-                case PhoneInterfaces.Qualcomm_Download:
-                    // TODO: don't know how to switch from Qualcomm Download mode to other mode
-                    break;
-            }
-        }
-
-        private void NewDeviceArrivedFromMassStorageMode(ArrivalEventArgs Args)
-        {
-            PhoneNotifier.NewDeviceArrived -= NewDeviceArrivedFromMassStorageMode;
-
-            CurrentModel = Args.NewModel;
-            CurrentMode = Args.NewInterface;
-
-            // After the mass storage mode reboot command, the phone must be in Bootloader mode.
-            // If it isn't, something unexpected happened and the phone can't be switched.
-            //
-            if (CurrentMode == PhoneInterfaces.Lumia_Bootloader)
-            {
-                Task.Run(async () =>
-                {
-                    try
-                    {
-                        await SwitchToWithStatus(PhoneNotifier, TargetMode, SetWorkingStatus, UpdateWorkingStatus);
-                        ModeSwitchSuccessWrapper();
-                    }
-                    catch
-                    {
-                        switch (TargetMode)
-                        {
-                            case PhoneInterfaces.Lumia_Flash:
-                                ModeSwitchErrorWrapper("Failed to switch to Flash mode");
-                                break;
-                            case PhoneInterfaces.Lumia_Label:
-                                ModeSwitchErrorWrapper("Failed to switch to Label mode");
-                                break;
-                            case PhoneInterfaces.Lumia_Normal:
-                                ModeSwitchErrorWrapper("Failed to switch to Normal mode");
-                                break;
-                            case null:
-                                ModeSwitchSuccessWrapper();
-                                break;
-                        }
-                    }
-                });
-            }
-            else
-            {
-                switch (TargetMode)
-                {
-                    case PhoneInterfaces.Lumia_Flash:
-                        ModeSwitchErrorWrapper("Failed to switch to Flash mode");
-                        break;
-                    case PhoneInterfaces.Lumia_Label:
-                        ModeSwitchErrorWrapper("Failed to switch to Label mode");
-                        break;
-                    case PhoneInterfaces.Lumia_Normal:
-                        ModeSwitchErrorWrapper("Failed to switch to Normal mode");
-                        break;
-                    case null:
-                        ModeSwitchErrorWrapper("Failed to shutdown");
-                        break;
-                }
-            }
-        }
-
-        private void NewDeviceArrived(ArrivalEventArgs Args)
-        {
-            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
-
-            CurrentModel = Args.NewModel;
-            CurrentMode = Args.NewInterface;
-
-            if ((CurrentMode == PhoneInterfaces.Lumia_Bootloader) && (TargetMode == PhoneInterfaces.Lumia_Flash))
-            {
-                try
-                {
-                    // Going from BootMgr to FlashApp
-                    // SwitchToFlashAppContext() will only switch context. Phone will not charge.
-                    // ResetPhoneToFlashMode() reboots to real flash app. Phone will charge. Works when in BootMgrApp, not when already in FlashApp.
-
-                    ((NokiaFlashModel)CurrentModel).ResetPhoneToFlashMode();
-                    CurrentMode = PhoneInterfaces.Lumia_Flash;
-                    PhoneNotifier.NotifyArrival();
-                }
-                catch { }
-            }
-
-            if (CurrentMode == TargetMode)
-            {
-                if (TargetMode == PhoneInterfaces.Lumia_Bootloader)
-                {
-                    ((NokiaFlashModel)CurrentModel).DisableRebootTimeOut();
-                }
-
-                ModeSwitchSuccessWrapper();
-            }
-            else if (!IsSwitching)
-            {
-                StartSwitch();
-            }
-            else if ((CurrentMode == PhoneInterfaces.Lumia_Bootloader) && (TargetMode == PhoneInterfaces.Lumia_Normal))
-            {
-                // Do nothing, because booting to Normal shortly goes into Flash mode too.
-                // Just wait to arrive in Normal mode;
-                PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-            }
-            else if ((CurrentMode == PhoneInterfaces.Lumia_Flash) && (TargetMode == PhoneInterfaces.Lumia_MassStorage))
-            {
-                SwitchFromFlashToMassStorageMode(Continuation: true);
-            }
-            else if ((CurrentMode == PhoneInterfaces.Lumia_Flash) && (TargetMode == PhoneInterfaces.Lumia_Label))
-            {
-                SwitchFromFlashToLabelMode(Continuation: true);
-            }
-            else if ((CurrentMode == PhoneInterfaces.Lumia_Flash) && (TargetMode == PhoneInterfaces.Qualcomm_Download))
-            {
-                byte[] RebootCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x52 };
-                byte[] RebootToQualcommDownloadCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x58, 0x43, 0x42, 0x45 }; // NOKXCBE
-                IsSwitchingInterface = true;
-                LogFile.Log("Sending command for rebooting to Emergency Download mode");
-                byte[] RebootCommandResult = ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(RebootToQualcommDownloadCommand);
-                if (RebootCommandResult?.Length >= 8)
-                {
-                    int ResultCode = (RebootCommandResult[6] << 8) + RebootCommandResult[7];
-                    LogFile.Log("Resultcode: 0x" + ResultCode.ToString("X4"));
-                }
-                if (RebootCommandResult?.Length == 4) // This means fail: NOKU (unknow command)
-                {
-                    ModeSwitchErrorWrapper("Failed to switch to Qualcomm Download mode");
-                    IsSwitchingInterface = false;
-                }
-                else
-                {
-                    PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                    ModeSwitchProgressWrapper("And now rebooting phone to Qualcomm Download mode...", null);
-                    LogFile.Log("Rebooting phone to Qualcomm Download mode");
-                }
-            }
-            else
-            {
-                switch (TargetMode)
-                {
-                    case PhoneInterfaces.Lumia_Normal:
-                        ModeSwitchErrorWrapper("Failed to switch to Normal mode");
-                        break;
-                    case PhoneInterfaces.Lumia_Flash:
-                        ModeSwitchErrorWrapper("Failed to switch to Flash mode");
-                        break;
-                    case PhoneInterfaces.Lumia_Label:
-                        ModeSwitchErrorWrapper("Failed to switch to Label mode");
-                        break;
-                    case PhoneInterfaces.Lumia_MassStorage:
-                        ModeSwitchErrorWrapper("Failed to switch to Mass Storage mode");
-                        break;
-                }
-            }
-        }
-
-        private void SwitchFromFlashToLabelMode(bool Continuation = false)
-        {
-            string ProgressText = Continuation ? "And now preparing to boot the phone to Label mode..." : "Preparing to boot the phone to Label mode...";
-            NokiaFlashModel FlashModel = (NokiaFlashModel)CurrentModel;
-            if (CurrentMode == PhoneInterfaces.Lumia_Bootloader)
-            {
-                try
-                {
-                    FlashModel.SwitchToFlashAppContext();
-                }
-                catch { }
-            }
-            PhoneInfo Info = FlashModel.ReadPhoneInfo(ExtendedInfo: true);
-
-            if (Info.MmosOverUsbSupported)
-            {
-                new Thread(() =>
-                {
-                    LogFile.BeginAction("SwitchToLabelMode");
-
-                    try
-                    {
-                        ModeSwitchProgressWrapper(ProgressText, null);
-                        string TempFolder = Environment.GetEnvironmentVariable("TEMP") + @"\WPInternals";
-                        if (Info.Type == "RM-1152")
-                        {
-                            Info.Type = "RM-1151";
-                        }
-                        string ENOSWPackage = LumiaDownloadModel.SearchENOSW(Info.Type, Info.Firmware);
-                        SetWorkingStatus("Downloading " + Info.Type + " Test Mode package...", MaxProgressValue: 100);
-                        DownloadEntry downloadEntry = new(ENOSWPackage, TempFolder, null, null, null);
-
-                        downloadEntry.PropertyChanged += (object sender, System.ComponentModel.PropertyChangedEventArgs e) =>
-                        {
-                            if (e.PropertyName == "Progress")
-                            {
-                                int progress = (sender as DownloadEntry)?.Progress ?? 0;
-                                ulong.TryParse(progress.ToString(), out ulong progressret);
-                                UpdateWorkingStatus(null, CurrentProgressValue: progressret);
-
-                                if (progress == 100)
-                                {
-                                    ModeSwitchProgressWrapper("Initializing Flash...", null);
-
-                                    string MMOSPath = TempFolder + "\\" + (sender as DownloadEntry)?.Name;
-
-                                    PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                                    FileInfo info = new(MMOSPath);
-                                    uint length = uint.Parse(info.Length.ToString());
-                                    const int maximumbuffersize = 0x00240000;
-                                    uint totalcounts = (uint)Math.Truncate((decimal)length / maximumbuffersize);
-
-                                    SetWorkingStatus("Flashing Test Mode package...", MaxProgressValue: 100);
-
-                                    ProgressUpdater progressUpdater = new(totalcounts + 1, (int i, TimeSpan? time) => UpdateWorkingStatus(null, CurrentProgressValue: (ulong)i));
-                                    FlashModel.FlashMMOS(MMOSPath, progressUpdater);
-
-                                    SetWorkingStatus("And now booting phone to MMOS...", "If the phone stays on the lightning cog screen for a while, you may need to unplug and replug the phone to continue the boot process.");
-                                }
-                            }
-                        };
-                    }
-                    catch (Exception Ex)
-                    {
-                        LogFile.LogException(Ex);
-                        ModeSwitchErrorWrapper(Ex.Message);
-                    }
-
-                    LogFile.EndAction("SwitchToLabelMode");
-                }).Start();
-            }
-            else
-            {
-                byte[] BootModeFlagCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x58, 0x46, 0x57, 0x00, 0x55, 0x42, 0x46, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 }; // NOKFW UBF
-                byte[] RebootCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x52 }; // NOKR
-
-                BootModeFlagCommand[0x0F] = 0x59;
-                ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(BootModeFlagCommand);
-                ((NokiaPhoneModel)CurrentModel).ExecuteRawVoidMethod(RebootCommand);
-                PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                ModeSwitchProgressWrapper("Rebooting phone to Label mode", null);
-                LogFile.Log("Rebooting phone to Label mode", LogType.FileAndConsole);
-            }
-        }
-
-        private void SwitchFromFlashToMassStorageMode(bool Continuation = false)
-        {
-            string ProgressText = Continuation ? "And now rebooting phone to Mass Storage mode..." : "Rebooting phone to Mass Storage mode...";
-            NokiaFlashModel FlashModel = (NokiaFlashModel)CurrentModel;
-            if (CurrentMode == PhoneInterfaces.Lumia_Bootloader)
-            {
-                try
-                {
-                    FlashModel.SwitchToFlashAppContext();
-                }
-                catch { }
-            }
-            PhoneInfo Info = FlashModel.ReadPhoneInfo(ExtendedInfo: false);
-
-            MassStorageWarning = null;
-            if (Info.FlashAppProtocolVersionMajor < 2)
-            {
-                MassStorageWarning = "Switching to Mass Storage mode should take about 10 seconds. The phone should be unlocked using an Engineering SBL3 to enable Mass Storage mode. When you unlocked the bootloader, but you did not use an Engineering SBL3, an attempt to boot to Mass Storage mode may result in an unresponsive state. Installing drivers for this interface may also cause to hang the PC. So when this switch is taking too long, you should reboot both the PC and the phone. To reboot the phone, you have to perform a soft-reset. Press and hold the volume-down-button and the power-button at the same time for at least 10 seconds. This will trigger a power-cycle and the phone will reboot. Once fully booted, the phone may show strange behavior, like complaining about mail-accounts, showing old text-messages, inability to load https-websites, etc. This is expected behavior, because the time-settings of the phone are incorrect. Just wait a few seconds for the phone to get a data-connection and have the date/time synced. After that the strange behavior will stop automatically and normal operation is resumed.";
-            }
-            else
-            {
-                MassStorageWarning = "When the screen of the phone is black for a while, it could be that the phone is already in Mass Storage Mode, but there is no drive-letter assigned. To resolve this issue, open Device Manager and manually assign a drive-letter to the MainOS partition of your phone, or open a command-prompt and type: diskpart automount enable.";
-                if (App.IsPnPEventLogMissing)
-                {
-                    MassStorageWarning += " It is also possible that the phone is in Mass Storage mode, but the Mass Storage driver on this PC failed. Your PC does not have an eventlog to detect this misbehaviour. But in this case you will see a device with an exclamation mark in Device Manager and then you need to manually reset the phone by pressing and holding the power-button for at least 10 seconds until it vibrates and reboots. After that Windows Phone Internals will revert the changes. After the phone has rebooted to the OS, you can retry to unlock the bootloader.";
-                }
-            }
-
-            bool IsOldLumia = Info.FlashAppProtocolVersionMajor < 2;
-            bool IsNewLumia = Info.FlashAppProtocolVersionMajor >= 2;
-            bool IsUnlockedNew = false;
-            if (IsNewLumia)
-            {
-                GPT GPT = FlashModel.ReadGPT();
-                IsUnlockedNew = (GPT.GetPartition("IS_UNLOCKED") != null) || (GPT.GetPartition("BACKUP_EFIESP") != null) || (GPT.GetPartition("BACKUP_BS_NV") != null);
-            }
-            bool IsOriginalEngineeringLumia = !Info.IsBootloaderSecure && !IsUnlockedNew;
-
-            if (IsOldLumia || IsOriginalEngineeringLumia)
-            {
-                byte[] BootModeFlagCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x58, 0x46, 0x57, 0x00, 0x55, 0x42, 0x46, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 }; // NOKFW UBF
-                byte[] RebootCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x52 };
-                byte[] RebootToMassStorageCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x4D }; // NOKM
-                IsSwitchingInterface = true;
-                byte[] RebootCommandResult = ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(RebootToMassStorageCommand);
-                if (RebootCommandResult?.Length == 4) // This means fail: NOKU (unknown command)
-                {
-                    BootModeFlagCommand[0x0F] = 0x4D;
-                    byte[] BootFlagResult = ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(BootModeFlagCommand);
-                    UInt16 ResultCode = BitConverter.ToUInt16(BootFlagResult, 6);
-                    if (ResultCode == 0)
-                    {
-                        PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                        ((NokiaPhoneModel)CurrentModel).ExecuteRawVoidMethod(RebootCommand);
-                        ModeSwitchProgressWrapper(ProgressText, MassStorageWarning);
-                        LogFile.Log("Rebooting phone to Mass Storage mode");
-                    }
-                    else
-                    {
-                        ModeSwitchErrorWrapper("Failed to switch to Mass Storage mode");
-                        IsSwitchingInterface = false;
-                    }
-                }
-                else
-                {
-                    PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
-                    ModeSwitchProgressWrapper(ProgressText, MassStorageWarning);
-                    LogFile.Log("Rebooting phone to Mass Storage mode");
-                }
-            }
-            else if (IsUnlockedNew)
-            {
-                new Thread(async () =>
-                {
-                    LogFile.BeginAction("SwitchToMassStorageMode");
-
-                    try
-                    {
-                        // Implementation of writing a partition with SecureBoot variable to the phone
-                        ModeSwitchProgressWrapper(ProgressText, MassStorageWarning);
-                        LogFile.Log("Preparing phone for Mass Storage Mode", LogType.FileAndConsole);
-                        var assembly = System.Reflection.Assembly.GetExecutingAssembly();
-
-                        // Magic!
-                        // The SBMSM resource is a compressed version of a raw NV-variable-partition.
-                        // In this partition the SecureBoot variable is disabled and an extra variable is added which triggers Mass Storage Mode on next reboot.
-                        // It overwrites the variable in a different NV-partition than where this variable is stored usually.
-                        // This normally leads to endless-loops when the NV-variables are enumerated.
-                        // But the partition contains an extra hack to break out the endless loops.
-                        using (var stream = assembly.GetManifestResourceStream("WPinternals.SBMSM"))
-                        {
-                            using DecompressedStream dec = new(stream);
-                            using MemoryStream SB = new(); // Must be a seekable stream!
-                            dec.CopyTo(SB);
-
-                            // We don't need to check for the BACKUP_BS_NV partition here,
-                            // because the SecureBoot flag is disabled here.
-                            // So either the NV was already backupped or already overwritten.
-
-                            GPT GPT = FlashModel.ReadGPT();
-                            Partition Target = GPT.GetPartition("UEFI_BS_NV");
-
-                            // We've been reading the GPT, so we let the phone reset once more to be sure that memory maps are the same
-                            WPinternalsStatus LastStatus = WPinternalsStatus.Undefined;
-                            List<FlashPart> Parts = new();
-                            FlashPart Part = new();
-                            Part.StartSector = (uint)Target.FirstSector;
-                            Part.Stream = SB;
-                            Parts.Add(Part);
-                            await LumiaV2UnlockBootViewModel.LumiaV2CustomFlash(PhoneNotifier, null, false, false, Parts, DoResetFirst: true, ClearFlashingStatusAtEnd: false, ShowProgress: false,
-                                SetWorkingStatus: (m, s, v, a, st) =>
-                                {
-                                    if (SetWorkingStatus != null)
-                                    {
-                                        if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
-                                        {
-                                            SetWorkingStatus(m, s, v, a, st);
-                                        }
-                                        else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
-                                        {
-                                            SetWorkingStatus(ProgressText, MassStorageWarning);
-                                        }
-
-                                        LastStatus = st;
-                                    }
-                                },
-                                UpdateWorkingStatus: (m, s, v, st) =>
-                                {
-                                    if (UpdateWorkingStatus != null)
-                                    {
-                                        if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
-                                        {
-                                            UpdateWorkingStatus(m, s, v, st);
-                                        }
-                                        else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
-                                        {
-                                            SetWorkingStatus(ProgressText, MassStorageWarning);
-                                        }
-
-                                        LastStatus = st;
-                                    }
-                                });
-                        }
-
-                        if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_BadMassStorage)
-                        {
-                            throw new WPinternalsException("Phone is in Mass Storage mode, but the driver on PC failed to start");
-                        }
-
-                        // Wait for bootloader
-                        if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_MassStorage)
-                        {
-                            LogFile.Log("Waiting for Mass Storage Mode (1)...", LogType.FileOnly);
-                            await PhoneNotifier.WaitForArrival();
-                        }
-
-                        if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_BadMassStorage)
-                        {
-                            throw new WPinternalsException("Phone is in Mass Storage mode, but the driver on PC failed to start");
-                        }
-
-                        // Wait for mass storage mode
-                        if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_MassStorage)
-                        {
-                            LogFile.Log("Waiting for Mass Storage Mode (2)...", LogType.FileOnly);
-                            await PhoneNotifier.WaitForArrival();
-                        }
-
-                        if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_BadMassStorage)
-                        {
-                            throw new WPinternalsException("Phone is in Mass Storage mode, but the driver on PC failed to start");
-                        }
-
-                        MassStorage Storage = null;
-                        if (PhoneNotifier.CurrentModel is MassStorage)
-                        {
-                            Storage = (MassStorage)PhoneNotifier.CurrentModel;
-                        }
-
-                        if (Storage == null)
-                        {
-                            ModeSwitchErrorWrapper("Failed to switch to Mass Storage Mode");
-                        }
-                        else
-                        {
-                            ModeSwitchSuccessWrapper();
-                        }
-                    }
-                    catch (Exception Ex)
-                    {
-                        LogFile.LogException(Ex);
-                        ModeSwitchErrorWrapper(Ex.Message);
-                    }
-
-                    LogFile.EndAction("SwitchToMassStorageMode");
-                }).Start();
-            }
-            else
-            {
-                ModeSwitchErrorWrapper("Bootloader was not unlocked. First unlock bootloader before you try to switch to Mass Storage Mode.");
-            }
-        }
-
-        internal async static Task<IDisposable> SwitchTo(PhoneNotifierViewModel Notifier, PhoneInterfaces? TargetMode, string RequestedVolumeForMassStorage = "MainOS")
-        {
-            return await SwitchToWithProgress(Notifier, TargetMode, null, RequestedVolumeForMassStorage);
-        }
-
-        internal async static Task<IDisposable> SwitchToWithProgress(PhoneNotifierViewModel Notifier, PhoneInterfaces? TargetMode, ModeSwitchProgressHandler ModeSwitchProgress, string RequestedVolumeForMassStorage = "MainOS")
-        {
-            if (Notifier.CurrentInterface == TargetMode)
-            {
-                return Notifier.CurrentModel;
-            }
-
-            IDisposable Result = null;
-            string LocalErrorMessage = null;
-
-            AsyncAutoResetEvent Event = new(false);
-
-            SwitchModeViewModel Switch = new(
-                Notifier,
-                TargetMode,
-                ModeSwitchProgress,
-                (string ErrorMessage) =>
-                    {
-                        LocalErrorMessage = ErrorMessage;
-                        Event.Set();
-                    },
-                (IDisposable NewModel, PhoneInterfaces NewInterface) =>
-                    {
-                        Result = NewModel;
-                        Event.Set();
-                    }
-                );
-
-            await Event.WaitAsync(Timeout.InfiniteTimeSpan);
-
-            if (LocalErrorMessage != null)
-            {
-                throw new WPinternalsException(LocalErrorMessage);
-            }
-
-            return Result;
-        }
-
-        internal async static Task<IDisposable> SwitchToWithStatus(PhoneNotifierViewModel Notifier, PhoneInterfaces? TargetMode, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, string RequestedVolumeForMassStorage = "MainOS")
-        {
-            if (Notifier.CurrentInterface == TargetMode)
-            {
-                return Notifier.CurrentModel;
-            }
-
-            IDisposable Result = null;
-            string LocalErrorMessage = null;
-
-            AsyncAutoResetEvent Event = new(false);
-
-            SwitchModeViewModel Switch = new(
-                Notifier,
-                TargetMode,
-                null,
-                (string ErrorMessage) =>
-                {
-                    LocalErrorMessage = ErrorMessage;
-                    Event.Set();
-                },
-                (IDisposable NewModel, PhoneInterfaces NewInterface) =>
-                {
-                    Result = NewModel;
-                    Event.Set();
-                }, SetWorkingStatus, UpdateWorkingStatus
-            );
-
-            await Event.WaitAsync(Timeout.InfiniteTimeSpan);
-
-            if (LocalErrorMessage != null)
-            {
-                throw new WPinternalsException(LocalErrorMessage);
-            }
-
-            return Result;
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace WPinternals
+{
+    internal delegate void ModeSwitchProgressHandler(string Message, string SubMessage);
+    internal delegate void ModeSwitchErrorHandler(string Message);
+    internal delegate void ModeSwitchSuccessHandler(IDisposable NewModel, PhoneInterfaces NewInterface);
+
+    internal class SwitchModeViewModel : ContextViewModel
+    {
+        protected PhoneNotifierViewModel PhoneNotifier;
+        protected IDisposable CurrentModel;
+        protected PhoneInterfaces? CurrentMode;
+        protected PhoneInterfaces? TargetMode;
+        protected bool IsSwitching = false;
+        internal event ModeSwitchProgressHandler ModeSwitchProgress = delegate { };
+        internal event ModeSwitchErrorHandler ModeSwitchError = delegate { };
+        internal event ModeSwitchSuccessHandler ModeSwitchSuccess = delegate { };
+        internal new SetWorkingStatus SetWorkingStatus = (m, s, v, a, st) => { };
+        internal new UpdateWorkingStatus UpdateWorkingStatus = (m, s, v, st) => { };
+        private string MassStorageWarning = null;
+
+        internal SwitchModeViewModel(PhoneNotifierViewModel PhoneNotifier, PhoneInterfaces? TargetMode)
+            : base()
+        {
+            if ((PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Flash) && (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Bootloader) && (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Label) && (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_Normal))
+            {
+                throw new ArgumentException();
+            }
+
+            this.PhoneNotifier = PhoneNotifier;
+            this.CurrentModel = (NokiaPhoneModel)PhoneNotifier.CurrentModel;
+            this.CurrentMode = PhoneNotifier.CurrentInterface;
+            this.TargetMode = TargetMode;
+
+            if (this.CurrentMode == null)
+            {
+                LogFile.Log("Waiting for phone to connect...", LogType.FileAndConsole);
+                PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+            }
+            else
+            {
+                // Make sure this ViewModel has its View loaded before we continue,
+                // or else loading of Views can get mixed up.
+                if (SynchronizationContext.Current == null)
+                {
+                    StartSwitch();
+                }
+                else
+                {
+                    SynchronizationContext.Current.Post((s) => ((SwitchModeViewModel)s).StartSwitch(), this);
+                }
+            }
+        }
+
+        internal SwitchModeViewModel(PhoneNotifierViewModel PhoneNotifier, PhoneInterfaces? TargetMode, ModeSwitchProgressHandler ModeSwitchProgress, ModeSwitchErrorHandler ModeSwitchError, ModeSwitchSuccessHandler ModeSwitchSuccess, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null)
+            : base()
+        {
+            if ((PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader) && (TargetMode == PhoneInterfaces.Lumia_Flash))
+            {
+                PhoneInfo Info = ((NokiaFlashModel)PhoneNotifier.CurrentModel).ReadPhoneInfo(false);
+                if (Info.BootManagerProtocolVersionMajor >= 2)
+                {
+                    try
+                    {
+                        // The implementation of SwitchToFlashAppContext() is improved
+                        // SwitchToFlashAppContext() should only be used with BootMgr v2
+                        // For switching from BootMgr to FlashApp, it will use NOKS
+                        // That will switch to a charging state, whereas a normal context switch will not start charging
+                        // The implementation of NOKS in BootMgr mode has changed in BootMgr v2
+                        // It does not disconnect / reconnect anymore and the apptype is changed immediately
+                        // NOKS still doesnt return a status
+                        // BootMgr v1 uses normal NOKS and waits for arrival of FlashApp
+                        ((NokiaFlashModel)PhoneNotifier.CurrentModel).SwitchToFlashAppContext();
+
+                        // But this was called as a real switch, so we will raise an arrival event.
+                        PhoneNotifier.CurrentInterface = PhoneInterfaces.Lumia_Flash;
+                        PhoneNotifier.NotifyArrival();
+                    }
+                    catch { }
+                }
+            }
+
+            if (PhoneNotifier.CurrentInterface == TargetMode)
+            {
+                ModeSwitchSuccess(PhoneNotifier.CurrentModel, (PhoneInterfaces)PhoneNotifier.CurrentInterface);
+            }
+            else
+            {
+                this.PhoneNotifier = PhoneNotifier;
+                this.CurrentModel = (NokiaPhoneModel)PhoneNotifier.CurrentModel;
+                this.CurrentMode = PhoneNotifier.CurrentInterface;
+                this.TargetMode = TargetMode;
+                if (ModeSwitchProgress != null)
+                {
+                    this.ModeSwitchProgress += ModeSwitchProgress;
+                }
+
+                if (ModeSwitchError != null)
+                {
+                    this.ModeSwitchError += ModeSwitchError;
+                }
+
+                if (ModeSwitchSuccess != null)
+                {
+                    this.ModeSwitchSuccess += ModeSwitchSuccess;
+                }
+
+                if (SetWorkingStatus != null)
+                {
+                    this.SetWorkingStatus = SetWorkingStatus;
+                }
+
+                if (UpdateWorkingStatus != null)
+                {
+                    this.UpdateWorkingStatus = UpdateWorkingStatus;
+                }
+
+                if (this.CurrentMode == null)
+                {
+                    LogFile.Log("Waiting for phone to connect...", LogType.FileAndConsole);
+                    PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                }
+                else
+                {
+                    // Make sure this ViewModel has its View loaded before we continue,
+                    // or else loading of Views can get mixed up.
+                    if (SynchronizationContext.Current == null)
+                    {
+                        StartSwitch();
+                    }
+                    else
+                    {
+                        SynchronizationContext.Current.Post((s) => ((SwitchModeViewModel)s).StartSwitch(), this);
+                    }
+                }
+            }
+        }
+
+        private void ModeSwitchProgressWrapper(string Message, string SubMessage)
+        {
+            if ((UIContext == null) || (SynchronizationContext.Current == UIContext))
+            {
+                ModeSwitchProgress(Message, SubMessage);
+                SetWorkingStatus(Message, SubMessage);
+            }
+            else
+            {
+                UIContext.Post(s =>
+                {
+                    ModeSwitchProgress(Message, SubMessage);
+                    SetWorkingStatus(Message, SubMessage);
+                }, null);
+            }
+        }
+
+        private void ModeSwitchErrorWrapper(string Message)
+        {
+            IsSwitching = false;
+            if ((UIContext == null) || (SynchronizationContext.Current == UIContext))
+            {
+                ModeSwitchError(Message);
+            }
+            else
+            {
+                UIContext.Post(s => ModeSwitchError(Message), null);
+            }
+        }
+
+        private void ModeSwitchSuccessWrapper()
+        {
+            IsSwitching = false;
+            if ((UIContext == null) || (SynchronizationContext.Current == UIContext))
+            {
+                if (PhoneNotifier.CurrentInterface == null)
+                {
+                    ModeSwitchErrorWrapper("Phone disconnected");
+                }
+                else
+                {
+                    ModeSwitchSuccess(PhoneNotifier.CurrentModel, (PhoneInterfaces)PhoneNotifier.CurrentInterface);
+                }
+            }
+            else
+            {
+                if (PhoneNotifier.CurrentInterface == null)
+                {
+                    UIContext.Post(s => ModeSwitchErrorWrapper("Phone disconnected"), null);
+                }
+                else
+                {
+                    UIContext.Post(s => ModeSwitchSuccess(PhoneNotifier.CurrentModel, (PhoneInterfaces)PhoneNotifier.CurrentInterface), null);
+                }
+            }
+        }
+
+        ~SwitchModeViewModel()
+        {
+            if (PhoneNotifier != null)
+            {
+                PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
+            }
+        }
+
+        internal void StartSwitch()
+        {
+            IsSwitching = true;
+
+            // Make switch and set message or navigate to error
+            switch (CurrentMode)
+            {
+                case PhoneInterfaces.Lumia_Normal:
+                case PhoneInterfaces.Lumia_Label:
+                    string DeviceMode;
+
+                    switch (TargetMode)
+                    {
+                        case PhoneInterfaces.Lumia_Normal:
+                            DeviceMode = "Normal";
+                            IsSwitchingInterface = true;
+                            ModeSwitchProgressWrapper("Rebooting phone to Normal mode...", null);
+                            LogFile.Log("Rebooting phone to Normal mode", LogType.FileAndConsole);
+                            break;
+                        case PhoneInterfaces.Lumia_Bootloader:
+                            DeviceMode = "Normal";
+                            IsSwitchingInterface = true;
+                            ModeSwitchProgressWrapper("Rebooting phone to Bootloader mode...", null);
+                            LogFile.Log("Rebooting phone to Bootloader mode", LogType.FileAndConsole);
+                            break;
+                        case PhoneInterfaces.Lumia_Flash:
+                            DeviceMode = "Flash";
+                            IsSwitchingInterface = true;
+                            ModeSwitchProgressWrapper("Rebooting phone to Flash mode...", null);
+                            LogFile.Log("Rebooting phone to Flash mode", LogType.FileAndConsole);
+                            break;
+                        case PhoneInterfaces.Lumia_Label:
+                            DeviceMode = "Flash";
+                            IsSwitchingInterface = true;
+                            ModeSwitchProgressWrapper("First rebooting phone to Flash mode...", null);
+                            LogFile.Log("First rebooting phone to Flash mode (then attempt Label mode)", LogType.FileAndConsole);
+                            break;
+                        case PhoneInterfaces.Lumia_MassStorage:
+                            DeviceMode = "Flash";
+                            IsSwitchingInterface = true;
+                            ModeSwitchProgressWrapper("First rebooting phone to Flash mode...", null);
+                            LogFile.Log("First rebooting phone to Flash mode (then attempt Mass Storage mode)", LogType.FileAndConsole);
+                            break;
+                        case PhoneInterfaces.Qualcomm_Download: // Only available in new Lumia's
+                            DeviceMode = "Flash";
+                            IsSwitchingInterface = true;
+                            ModeSwitchProgressWrapper("First rebooting phone to Flash mode...", null);
+                            LogFile.Log("First rebooting phone to Flash mode (then attempt Qualcomm Download mode", LogType.FileAndConsole);
+                            break;
+                        default:
+                            return;
+                    }
+
+                    Dictionary<string, object> Params = new();
+                    Params.Add("DeviceMode", DeviceMode);
+                    Params.Add("ResetMethod", "HwReset");
+                    try
+                    {
+                        ((NokiaPhoneModel)CurrentModel).ExecuteJsonMethodAsync("SetDeviceMode", Params);
+                        PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                    }
+                    catch (Exception Ex)
+                    {
+                        LogFile.LogException(Ex);
+                        ModeSwitchErrorWrapper("Failed to switch to Qualcomm Download mode");
+                        IsSwitchingInterface = false;
+                    }
+                    break;
+                case PhoneInterfaces.Lumia_Flash:
+                case PhoneInterfaces.Lumia_Bootloader:
+                    byte[] BootModeFlagCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x58, 0x46, 0x57, 0x00, 0x55, 0x42, 0x46, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 }; // NOKFW UBF
+                    byte[] RebootCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x52 }; // NOKR
+                    byte[] RebootCommandResult;
+                    IsSwitchingInterface = true;
+                    switch (TargetMode)
+                    {
+                        case null:
+                            ((NokiaFlashModel)CurrentModel).Shutdown();
+                            ModeSwitchProgressWrapper("Please disconnect your device. Waiting...", null);
+                            LogFile.Log("Please disconnect your device. Waiting...", LogType.FileAndConsole);
+                            new Thread(() =>
+                            {
+                                PhoneNotifier.WaitForRemoval().Wait();
+                                ModeSwitchSuccessWrapper();
+                            }).Start();
+                            break;
+                        case PhoneInterfaces.Lumia_Normal:
+                            ((NokiaPhoneModel)CurrentModel).ExecuteRawVoidMethod(RebootCommand);
+                            PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                            ModeSwitchProgressWrapper("Rebooting phone to Normal mode...", null);
+                            LogFile.Log("Rebooting phone to Normal mode", LogType.FileAndConsole);
+                            break;
+                        case PhoneInterfaces.Lumia_Bootloader:
+                            ((NokiaPhoneModel)CurrentModel).ExecuteRawVoidMethod(RebootCommand);
+                            PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                            ModeSwitchProgressWrapper("Rebooting phone to Bootloader mode...", null);
+                            LogFile.Log("Rebooting phone to Bootloader mode", LogType.FileAndConsole);
+                            break;
+                        case PhoneInterfaces.Lumia_Label:
+                            SwitchFromFlashToLabelMode();
+                            break;
+                        case PhoneInterfaces.Lumia_Flash: // attempt to boot from limited flash to full flash
+                            byte[] RebootToFlashCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x53 }; // NOKS
+                            ((NokiaPhoneModel)CurrentModel).ExecuteRawVoidMethod(RebootToFlashCommand);
+                            PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                            ModeSwitchProgressWrapper("Rebooting phone to Flash mode...", null);
+                            LogFile.Log("Rebooting phone to Flash mode", LogType.FileAndConsole);
+                            break;
+                        case PhoneInterfaces.Lumia_MassStorage:
+                            SwitchFromFlashToMassStorageMode();
+                            break;
+                        case PhoneInterfaces.Qualcomm_Download:
+                            byte[] RebootToQualcommDownloadCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x58, 0x43, 0x42, 0x45 }; // NOKXCBE
+                            RebootCommandResult = ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(RebootToQualcommDownloadCommand);
+                            if (RebootCommandResult?.Length == 4) // This means fail: NOKU (unknow command)
+                            {
+                                IsSwitchingInterface = false;
+                                ModeSwitchErrorWrapper("Failed to switch to Qualcomm Download mode");
+                            }
+                            else
+                            {
+                                PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                                ModeSwitchProgressWrapper("Rebooting phone to Qualcomm Download mode...", null);
+                                LogFile.Log("Rebooting phone to Qualcomm Download mode", LogType.FileAndConsole);
+                            }
+                            break;
+                        default:
+                            return;
+                    }
+                    break;
+                case PhoneInterfaces.Lumia_MassStorage:
+                    IsSwitchingInterface = true;
+                    switch (TargetMode)
+                    {
+                        case PhoneInterfaces.Lumia_Normal:
+                            ((MassStorage)CurrentModel).Reboot();
+                            PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                            ModeSwitchProgressWrapper("Rebooting phone to Normal mode...", null);
+                            LogFile.Log("Rebooting phone to Normal mode", LogType.FileAndConsole);
+                            break;
+                        case PhoneInterfaces.Lumia_Label:
+                            ((MassStorage)CurrentModel).Reboot();
+                            PhoneNotifier.NewDeviceArrived += NewDeviceArrivedFromMassStorageMode;
+                            ModeSwitchProgressWrapper("Rebooting phone to Label mode...", null);
+                            LogFile.Log("Rebooting phone to Label mode...", LogType.FileAndConsole);
+                            break;
+                        case PhoneInterfaces.Lumia_Flash:
+                            ((MassStorage)CurrentModel).Reboot();
+                            PhoneNotifier.NewDeviceArrived += NewDeviceArrivedFromMassStorageMode;
+                            ModeSwitchProgressWrapper("Rebooting phone to Flash mode...", null);
+                            LogFile.Log("Rebooting phone to Flash mode...", LogType.FileAndConsole);
+                            break;
+                        case null:
+                            ((MassStorage)CurrentModel).Reboot();
+                            PhoneNotifier.NewDeviceArrived += NewDeviceArrivedFromMassStorageMode;
+                            ModeSwitchProgressWrapper("First rebooting phone to Flash mode...", null);
+                            LogFile.Log("First rebooting phone to Bootloader mode...", LogType.FileAndConsole);
+                            break;
+                        default:
+                            return;
+                    }
+                    break;
+                case PhoneInterfaces.Qualcomm_Download:
+                    // TODO: don't know how to switch from Qualcomm Download mode to other mode
+                    break;
+            }
+        }
+
+        private void NewDeviceArrivedFromMassStorageMode(ArrivalEventArgs Args)
+        {
+            PhoneNotifier.NewDeviceArrived -= NewDeviceArrivedFromMassStorageMode;
+
+            CurrentModel = Args.NewModel;
+            CurrentMode = Args.NewInterface;
+
+            // After the mass storage mode reboot command, the phone must be in Bootloader mode.
+            // If it isn't, something unexpected happened and the phone can't be switched.
+            //
+            if (CurrentMode == PhoneInterfaces.Lumia_Bootloader)
+            {
+                Task.Run(async () =>
+                {
+                    try
+                    {
+                        await SwitchToWithStatus(PhoneNotifier, TargetMode, SetWorkingStatus, UpdateWorkingStatus);
+                        ModeSwitchSuccessWrapper();
+                    }
+                    catch
+                    {
+                        switch (TargetMode)
+                        {
+                            case PhoneInterfaces.Lumia_Flash:
+                                ModeSwitchErrorWrapper("Failed to switch to Flash mode");
+                                break;
+                            case PhoneInterfaces.Lumia_Label:
+                                ModeSwitchErrorWrapper("Failed to switch to Label mode");
+                                break;
+                            case PhoneInterfaces.Lumia_Normal:
+                                ModeSwitchErrorWrapper("Failed to switch to Normal mode");
+                                break;
+                            case null:
+                                ModeSwitchSuccessWrapper();
+                                break;
+                        }
+                    }
+                });
+            }
+            else
+            {
+                switch (TargetMode)
+                {
+                    case PhoneInterfaces.Lumia_Flash:
+                        ModeSwitchErrorWrapper("Failed to switch to Flash mode");
+                        break;
+                    case PhoneInterfaces.Lumia_Label:
+                        ModeSwitchErrorWrapper("Failed to switch to Label mode");
+                        break;
+                    case PhoneInterfaces.Lumia_Normal:
+                        ModeSwitchErrorWrapper("Failed to switch to Normal mode");
+                        break;
+                    case null:
+                        ModeSwitchErrorWrapper("Failed to shutdown");
+                        break;
+                }
+            }
+        }
+
+        private void NewDeviceArrived(ArrivalEventArgs Args)
+        {
+            PhoneNotifier.NewDeviceArrived -= NewDeviceArrived;
+
+            CurrentModel = Args.NewModel;
+            CurrentMode = Args.NewInterface;
+
+            if ((CurrentMode == PhoneInterfaces.Lumia_Bootloader) && (TargetMode == PhoneInterfaces.Lumia_Flash))
+            {
+                try
+                {
+                    // Going from BootMgr to FlashApp
+                    // SwitchToFlashAppContext() will only switch context. Phone will not charge.
+                    // ResetPhoneToFlashMode() reboots to real flash app. Phone will charge. Works when in BootMgrApp, not when already in FlashApp.
+
+                    ((NokiaFlashModel)CurrentModel).ResetPhoneToFlashMode();
+                    CurrentMode = PhoneInterfaces.Lumia_Flash;
+                    PhoneNotifier.NotifyArrival();
+                }
+                catch { }
+            }
+
+            if (CurrentMode == TargetMode)
+            {
+                if (TargetMode == PhoneInterfaces.Lumia_Bootloader)
+                {
+                    ((NokiaFlashModel)CurrentModel).DisableRebootTimeOut();
+                }
+
+                ModeSwitchSuccessWrapper();
+            }
+            else if (!IsSwitching)
+            {
+                StartSwitch();
+            }
+            else if ((CurrentMode == PhoneInterfaces.Lumia_Bootloader) && (TargetMode == PhoneInterfaces.Lumia_Normal))
+            {
+                // Do nothing, because booting to Normal shortly goes into Flash mode too.
+                // Just wait to arrive in Normal mode;
+                PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+            }
+            else if ((CurrentMode == PhoneInterfaces.Lumia_Flash) && (TargetMode == PhoneInterfaces.Lumia_MassStorage))
+            {
+                SwitchFromFlashToMassStorageMode(Continuation: true);
+            }
+            else if ((CurrentMode == PhoneInterfaces.Lumia_Flash) && (TargetMode == PhoneInterfaces.Lumia_Label))
+            {
+                SwitchFromFlashToLabelMode(Continuation: true);
+            }
+            else if ((CurrentMode == PhoneInterfaces.Lumia_Flash) && (TargetMode == PhoneInterfaces.Qualcomm_Download))
+            {
+                byte[] RebootCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x52 };
+                byte[] RebootToQualcommDownloadCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x58, 0x43, 0x42, 0x45 }; // NOKXCBE
+                IsSwitchingInterface = true;
+                LogFile.Log("Sending command for rebooting to Emergency Download mode");
+                byte[] RebootCommandResult = ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(RebootToQualcommDownloadCommand);
+                if (RebootCommandResult?.Length >= 8)
+                {
+                    int ResultCode = (RebootCommandResult[6] << 8) + RebootCommandResult[7];
+                    LogFile.Log("Resultcode: 0x" + ResultCode.ToString("X4"));
+                }
+                if (RebootCommandResult?.Length == 4) // This means fail: NOKU (unknow command)
+                {
+                    ModeSwitchErrorWrapper("Failed to switch to Qualcomm Download mode");
+                    IsSwitchingInterface = false;
+                }
+                else
+                {
+                    PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                    ModeSwitchProgressWrapper("And now rebooting phone to Qualcomm Download mode...", null);
+                    LogFile.Log("Rebooting phone to Qualcomm Download mode");
+                }
+            }
+            else
+            {
+                switch (TargetMode)
+                {
+                    case PhoneInterfaces.Lumia_Normal:
+                        ModeSwitchErrorWrapper("Failed to switch to Normal mode");
+                        break;
+                    case PhoneInterfaces.Lumia_Flash:
+                        ModeSwitchErrorWrapper("Failed to switch to Flash mode");
+                        break;
+                    case PhoneInterfaces.Lumia_Label:
+                        ModeSwitchErrorWrapper("Failed to switch to Label mode");
+                        break;
+                    case PhoneInterfaces.Lumia_MassStorage:
+                        ModeSwitchErrorWrapper("Failed to switch to Mass Storage mode");
+                        break;
+                }
+            }
+        }
+
+        private void SwitchFromFlashToLabelMode(bool Continuation = false)
+        {
+            string ProgressText = Continuation ? "And now preparing to boot the phone to Label mode..." : "Preparing to boot the phone to Label mode...";
+            NokiaFlashModel FlashModel = (NokiaFlashModel)CurrentModel;
+            if (CurrentMode == PhoneInterfaces.Lumia_Bootloader)
+            {
+                try
+                {
+                    FlashModel.SwitchToFlashAppContext();
+                }
+                catch { }
+            }
+            PhoneInfo Info = FlashModel.ReadPhoneInfo(ExtendedInfo: true);
+
+            if (Info.MmosOverUsbSupported)
+            {
+                new Thread(() =>
+                {
+                    LogFile.BeginAction("SwitchToLabelMode");
+
+                    try
+                    {
+                        ModeSwitchProgressWrapper(ProgressText, null);
+                        string TempFolder = Environment.GetEnvironmentVariable("TEMP") + @"\WPInternals";
+                        if (Info.Type == "RM-1152")
+                        {
+                            Info.Type = "RM-1151";
+                        }
+                        string ENOSWPackage = LumiaDownloadModel.SearchENOSW(Info.Type, Info.Firmware);
+                        SetWorkingStatus("Downloading " + Info.Type + " Test Mode package...", MaxProgressValue: 100);
+                        DownloadEntry downloadEntry = new(ENOSWPackage, TempFolder, null, null, null);
+
+                        downloadEntry.PropertyChanged += (object sender, System.ComponentModel.PropertyChangedEventArgs e) =>
+                        {
+                            if (e.PropertyName == "Progress")
+                            {
+                                int progress = (sender as DownloadEntry)?.Progress ?? 0;
+                                ulong.TryParse(progress.ToString(), out ulong progressret);
+                                UpdateWorkingStatus(null, CurrentProgressValue: progressret);
+
+                                if (progress == 100)
+                                {
+                                    ModeSwitchProgressWrapper("Initializing Flash...", null);
+
+                                    string MMOSPath = TempFolder + "\\" + (sender as DownloadEntry)?.Name;
+
+                                    PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                                    FileInfo info = new(MMOSPath);
+                                    uint length = uint.Parse(info.Length.ToString());
+                                    const int maximumbuffersize = 0x00240000;
+                                    uint totalcounts = (uint)Math.Truncate((decimal)length / maximumbuffersize);
+
+                                    SetWorkingStatus("Flashing Test Mode package...", MaxProgressValue: 100);
+
+                                    ProgressUpdater progressUpdater = new(totalcounts + 1, (int i, TimeSpan? time) => UpdateWorkingStatus(null, CurrentProgressValue: (ulong)i));
+                                    FlashModel.FlashMMOS(MMOSPath, progressUpdater);
+
+                                    SetWorkingStatus("And now booting phone to MMOS...", "If the phone stays on the lightning cog screen for a while, you may need to unplug and replug the phone to continue the boot process.");
+                                }
+                            }
+                        };
+                    }
+                    catch (Exception Ex)
+                    {
+                        LogFile.LogException(Ex);
+                        ModeSwitchErrorWrapper(Ex.Message);
+                    }
+
+                    LogFile.EndAction("SwitchToLabelMode");
+                }).Start();
+            }
+            else
+            {
+                byte[] BootModeFlagCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x58, 0x46, 0x57, 0x00, 0x55, 0x42, 0x46, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 }; // NOKFW UBF
+                byte[] RebootCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x52 }; // NOKR
+
+                BootModeFlagCommand[0x0F] = 0x59;
+                ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(BootModeFlagCommand);
+                ((NokiaPhoneModel)CurrentModel).ExecuteRawVoidMethod(RebootCommand);
+                PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                ModeSwitchProgressWrapper("Rebooting phone to Label mode", null);
+                LogFile.Log("Rebooting phone to Label mode", LogType.FileAndConsole);
+            }
+        }
+
+        private void SwitchFromFlashToMassStorageMode(bool Continuation = false)
+        {
+            string ProgressText = Continuation ? "And now rebooting phone to Mass Storage mode..." : "Rebooting phone to Mass Storage mode...";
+            NokiaFlashModel FlashModel = (NokiaFlashModel)CurrentModel;
+            if (CurrentMode == PhoneInterfaces.Lumia_Bootloader)
+            {
+                try
+                {
+                    FlashModel.SwitchToFlashAppContext();
+                }
+                catch { }
+            }
+            PhoneInfo Info = FlashModel.ReadPhoneInfo(ExtendedInfo: false);
+
+            MassStorageWarning = null;
+            if (Info.FlashAppProtocolVersionMajor < 2)
+            {
+                MassStorageWarning = "Switching to Mass Storage mode should take about 10 seconds. The phone should be unlocked using an Engineering SBL3 to enable Mass Storage mode. When you unlocked the bootloader, but you did not use an Engineering SBL3, an attempt to boot to Mass Storage mode may result in an unresponsive state. Installing drivers for this interface may also cause to hang the PC. So when this switch is taking too long, you should reboot both the PC and the phone. To reboot the phone, you have to perform a soft-reset. Press and hold the volume-down-button and the power-button at the same time for at least 10 seconds. This will trigger a power-cycle and the phone will reboot. Once fully booted, the phone may show strange behavior, like complaining about mail-accounts, showing old text-messages, inability to load https-websites, etc. This is expected behavior, because the time-settings of the phone are incorrect. Just wait a few seconds for the phone to get a data-connection and have the date/time synced. After that the strange behavior will stop automatically and normal operation is resumed.";
+            }
+            else
+            {
+                MassStorageWarning = "When the screen of the phone is black for a while, it could be that the phone is already in Mass Storage Mode, but there is no drive-letter assigned. To resolve this issue, open Device Manager and manually assign a drive-letter to the MainOS partition of your phone, or open a command-prompt and type: diskpart automount enable.";
+                if (App.IsPnPEventLogMissing)
+                {
+                    MassStorageWarning += " It is also possible that the phone is in Mass Storage mode, but the Mass Storage driver on this PC failed. Your PC does not have an eventlog to detect this misbehaviour. But in this case you will see a device with an exclamation mark in Device Manager and then you need to manually reset the phone by pressing and holding the power-button for at least 10 seconds until it vibrates and reboots. After that Windows Phone Internals will revert the changes. After the phone has rebooted to the OS, you can retry to unlock the bootloader.";
+                }
+            }
+
+            bool IsOldLumia = Info.FlashAppProtocolVersionMajor < 2;
+            bool IsNewLumia = Info.FlashAppProtocolVersionMajor >= 2;
+            bool IsUnlockedNew = false;
+            if (IsNewLumia)
+            {
+                GPT GPT = FlashModel.ReadGPT();
+                IsUnlockedNew = (GPT.GetPartition("IS_UNLOCKED") != null) || (GPT.GetPartition("BACKUP_EFIESP") != null) || (GPT.GetPartition("BACKUP_BS_NV") != null);
+            }
+            bool IsOriginalEngineeringLumia = !Info.IsBootloaderSecure && !IsUnlockedNew;
+
+            if (IsOldLumia || IsOriginalEngineeringLumia)
+            {
+                byte[] BootModeFlagCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x58, 0x46, 0x57, 0x00, 0x55, 0x42, 0x46, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 }; // NOKFW UBF
+                byte[] RebootCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x52 };
+                byte[] RebootToMassStorageCommand = new byte[] { 0x4E, 0x4F, 0x4B, 0x4D }; // NOKM
+                IsSwitchingInterface = true;
+                byte[] RebootCommandResult = ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(RebootToMassStorageCommand);
+                if (RebootCommandResult?.Length == 4) // This means fail: NOKU (unknown command)
+                {
+                    BootModeFlagCommand[0x0F] = 0x4D;
+                    byte[] BootFlagResult = ((NokiaPhoneModel)CurrentModel).ExecuteRawMethod(BootModeFlagCommand);
+                    UInt16 ResultCode = BitConverter.ToUInt16(BootFlagResult, 6);
+                    if (ResultCode == 0)
+                    {
+                        PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                        ((NokiaPhoneModel)CurrentModel).ExecuteRawVoidMethod(RebootCommand);
+                        ModeSwitchProgressWrapper(ProgressText, MassStorageWarning);
+                        LogFile.Log("Rebooting phone to Mass Storage mode");
+                    }
+                    else
+                    {
+                        ModeSwitchErrorWrapper("Failed to switch to Mass Storage mode");
+                        IsSwitchingInterface = false;
+                    }
+                }
+                else
+                {
+                    PhoneNotifier.NewDeviceArrived += NewDeviceArrived;
+                    ModeSwitchProgressWrapper(ProgressText, MassStorageWarning);
+                    LogFile.Log("Rebooting phone to Mass Storage mode");
+                }
+            }
+            else if (IsUnlockedNew)
+            {
+                new Thread(async () =>
+                {
+                    LogFile.BeginAction("SwitchToMassStorageMode");
+
+                    try
+                    {
+                        // Implementation of writing a partition with SecureBoot variable to the phone
+                        ModeSwitchProgressWrapper(ProgressText, MassStorageWarning);
+                        LogFile.Log("Preparing phone for Mass Storage Mode", LogType.FileAndConsole);
+                        var assembly = System.Reflection.Assembly.GetExecutingAssembly();
+
+                        // Magic!
+                        // The SBMSM resource is a compressed version of a raw NV-variable-partition.
+                        // In this partition the SecureBoot variable is disabled and an extra variable is added which triggers Mass Storage Mode on next reboot.
+                        // It overwrites the variable in a different NV-partition than where this variable is stored usually.
+                        // This normally leads to endless-loops when the NV-variables are enumerated.
+                        // But the partition contains an extra hack to break out the endless loops.
+                        using (var stream = assembly.GetManifestResourceStream("WPinternals.SBMSM"))
+                        {
+                            using DecompressedStream dec = new(stream);
+                            using MemoryStream SB = new(); // Must be a seekable stream!
+                            dec.CopyTo(SB);
+
+                            // We don't need to check for the BACKUP_BS_NV partition here,
+                            // because the SecureBoot flag is disabled here.
+                            // So either the NV was already backupped or already overwritten.
+
+                            GPT GPT = FlashModel.ReadGPT();
+                            Partition Target = GPT.GetPartition("UEFI_BS_NV");
+
+                            // We've been reading the GPT, so we let the phone reset once more to be sure that memory maps are the same
+                            WPinternalsStatus LastStatus = WPinternalsStatus.Undefined;
+                            List<FlashPart> Parts = new();
+                            FlashPart Part = new();
+                            Part.StartSector = (uint)Target.FirstSector;
+                            Part.Stream = SB;
+                            Parts.Add(Part);
+                            await LumiaV2UnlockBootViewModel.LumiaV2CustomFlash(PhoneNotifier, null, false, false, Parts, DoResetFirst: true, ClearFlashingStatusAtEnd: false, ShowProgress: false,
+                                SetWorkingStatus: (m, s, v, a, st) =>
+                                {
+                                    if (SetWorkingStatus != null)
+                                    {
+                                        if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
+                                        {
+                                            SetWorkingStatus(m, s, v, a, st);
+                                        }
+                                        else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
+                                        {
+                                            SetWorkingStatus(ProgressText, MassStorageWarning);
+                                        }
+
+                                        LastStatus = st;
+                                    }
+                                },
+                                UpdateWorkingStatus: (m, s, v, st) =>
+                                {
+                                    if (UpdateWorkingStatus != null)
+                                    {
+                                        if ((st == WPinternalsStatus.Scanning) || (st == WPinternalsStatus.WaitingForManualReset))
+                                        {
+                                            UpdateWorkingStatus(m, s, v, st);
+                                        }
+                                        else if ((LastStatus == WPinternalsStatus.Scanning) || (LastStatus == WPinternalsStatus.WaitingForManualReset))
+                                        {
+                                            SetWorkingStatus(ProgressText, MassStorageWarning);
+                                        }
+
+                                        LastStatus = st;
+                                    }
+                                });
+                        }
+
+                        if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_BadMassStorage)
+                        {
+                            throw new WPinternalsException("Phone is in Mass Storage mode, but the driver on PC failed to start");
+                        }
+
+                        // Wait for bootloader
+                        if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_MassStorage)
+                        {
+                            LogFile.Log("Waiting for Mass Storage Mode (1)...", LogType.FileOnly);
+                            await PhoneNotifier.WaitForArrival();
+                        }
+
+                        if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_BadMassStorage)
+                        {
+                            throw new WPinternalsException("Phone is in Mass Storage mode, but the driver on PC failed to start");
+                        }
+
+                        // Wait for mass storage mode
+                        if (PhoneNotifier.CurrentInterface != PhoneInterfaces.Lumia_MassStorage)
+                        {
+                            LogFile.Log("Waiting for Mass Storage Mode (2)...", LogType.FileOnly);
+                            await PhoneNotifier.WaitForArrival();
+                        }
+
+                        if (PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_BadMassStorage)
+                        {
+                            throw new WPinternalsException("Phone is in Mass Storage mode, but the driver on PC failed to start");
+                        }
+
+                        MassStorage Storage = null;
+                        if (PhoneNotifier.CurrentModel is MassStorage)
+                        {
+                            Storage = (MassStorage)PhoneNotifier.CurrentModel;
+                        }
+
+                        if (Storage == null)
+                        {
+                            ModeSwitchErrorWrapper("Failed to switch to Mass Storage Mode");
+                        }
+                        else
+                        {
+                            ModeSwitchSuccessWrapper();
+                        }
+                    }
+                    catch (Exception Ex)
+                    {
+                        LogFile.LogException(Ex);
+                        ModeSwitchErrorWrapper(Ex.Message);
+                    }
+
+                    LogFile.EndAction("SwitchToMassStorageMode");
+                }).Start();
+            }
+            else
+            {
+                ModeSwitchErrorWrapper("Bootloader was not unlocked. First unlock bootloader before you try to switch to Mass Storage Mode.");
+            }
+        }
+
+        internal async static Task<IDisposable> SwitchTo(PhoneNotifierViewModel Notifier, PhoneInterfaces? TargetMode, string RequestedVolumeForMassStorage = "MainOS")
+        {
+            return await SwitchToWithProgress(Notifier, TargetMode, null, RequestedVolumeForMassStorage);
+        }
+
+        internal async static Task<IDisposable> SwitchToWithProgress(PhoneNotifierViewModel Notifier, PhoneInterfaces? TargetMode, ModeSwitchProgressHandler ModeSwitchProgress, string RequestedVolumeForMassStorage = "MainOS")
+        {
+            if (Notifier.CurrentInterface == TargetMode)
+            {
+                return Notifier.CurrentModel;
+            }
+
+            IDisposable Result = null;
+            string LocalErrorMessage = null;
+
+            AsyncAutoResetEvent Event = new(false);
+
+            SwitchModeViewModel Switch = new(
+                Notifier,
+                TargetMode,
+                ModeSwitchProgress,
+                (string ErrorMessage) =>
+                    {
+                        LocalErrorMessage = ErrorMessage;
+                        Event.Set();
+                    },
+                (IDisposable NewModel, PhoneInterfaces NewInterface) =>
+                    {
+                        Result = NewModel;
+                        Event.Set();
+                    }
+                );
+
+            await Event.WaitAsync(Timeout.InfiniteTimeSpan);
+
+            if (LocalErrorMessage != null)
+            {
+                throw new WPinternalsException(LocalErrorMessage);
+            }
+
+            return Result;
+        }
+
+        internal async static Task<IDisposable> SwitchToWithStatus(PhoneNotifierViewModel Notifier, PhoneInterfaces? TargetMode, SetWorkingStatus SetWorkingStatus = null, UpdateWorkingStatus UpdateWorkingStatus = null, string RequestedVolumeForMassStorage = "MainOS")
+        {
+            if (Notifier.CurrentInterface == TargetMode)
+            {
+                return Notifier.CurrentModel;
+            }
+
+            IDisposable Result = null;
+            string LocalErrorMessage = null;
+
+            AsyncAutoResetEvent Event = new(false);
+
+            SwitchModeViewModel Switch = new(
+                Notifier,
+                TargetMode,
+                null,
+                (string ErrorMessage) =>
+                {
+                    LocalErrorMessage = ErrorMessage;
+                    Event.Set();
+                },
+                (IDisposable NewModel, PhoneInterfaces NewInterface) =>
+                {
+                    Result = NewModel;
+                    Event.Set();
+                }, SetWorkingStatus, UpdateWorkingStatus
+            );
+
+            await Event.WaitAsync(Timeout.InfiniteTimeSpan);
+
+            if (LocalErrorMessage != null)
+            {
+                throw new WPinternalsException(LocalErrorMessage);
+            }
+
+            return Result;
+        }
+    }
+}
diff --git a/Views/About.xaml b/WPinternals/Views/About.xaml
similarity index 98%
rename from Views/About.xaml
rename to WPinternals/Views/About.xaml
index 70389c2..57f09e1 100644
--- a/Views/About.xaml
+++ b/WPinternals/Views/About.xaml
@@ -1,94 +1,94 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.About"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <BitmapImage x:Key="LogoImageSource" UriSource="..\Logo.png" />
-    </UserControl.Resources>
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="250"/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <Image Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Source="{StaticResource LogoImageSource}" Margin="-10,0,0,0">
-            </Image>
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                    <local:Paragraph>
-                        <Run Text="Windows Phone Internals" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <Run>
-                            <Run.Text>
-                                <MultiBinding StringFormat="Version {0}.{1}">
-                                    <Binding Path="MajorVersion" Mode="OneWay" />
-                                    <Binding Path="MinorVersion" Mode="OneWay" />
-                                </MultiBinding>
-                            </Run.Text>
-                        </Run>
-                        <LineBreak />
-                        <Run Text="Copyright © 2014 - 2021 by Heathcliff74" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Many thanks to the ATF Team and the Smart GSM Team for supplying JTAG and test equipment." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Many thanks to X-Shadow, Justin Angel, Joseph Manzy, Jeremy Sinclair, Vlad Slavskiy and Hikari Calyx for supplying test-phones." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Many thanks to X-Shadow, Cotulla, Rafael Rivera, Ultrashot and Gustave Monce for having enlighting discussions about Windows Mobile." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="This software uses the following libraries:" />
-                        <LineBreak />
-                        <Run Text="WinUSBNet by Thomas Bleeker (" />
-                        <Hyperlink NavigateUri="http://opensource.org/licenses/mit-license.php">license</Hyperlink>
-                        <Run Text=")" />
-                        <LineBreak />
-                        <Run Text="Prism by Microsoft patterns &amp; practices (" />
-                        <Hyperlink NavigateUri="http://compositewpf.codeplex.com/license">license</Hyperlink>
-                        <Run Text=")" />
-                        <LineBreak />
-                        <Run Text="Json.NET by James Newton-King (" />
-                        <Hyperlink NavigateUri="https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md">license</Hyperlink>
-                        <Run Text=")" />
-                        <LineBreak />
-                        <Run Text="7-zip LZMA SDK by Igor Pavlov (" />
-                        <Hyperlink NavigateUri="http://www.7-zip.org/sdk.html">license</Hyperlink>
-                        <Run Text=")" />
-                        <LineBreak />
-                        <Run Text="DiscUtils by Kenneth Bell (" />
-                        <Hyperlink NavigateUri="https://github.com/DiscUtils/DiscUtils/blob/master/LICENSE.txt">license</Hyperlink>
-                        <Run Text=")" />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Grid>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.About"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <BitmapImage x:Key="LogoImageSource" UriSource="..\Logo.png" />
+    </UserControl.Resources>
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="250"/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Image Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Source="{StaticResource LogoImageSource}" Margin="-10,0,0,0">
+            </Image>
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                    <local:Paragraph>
+                        <Run Text="Windows Phone Internals" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <Run>
+                            <Run.Text>
+                                <MultiBinding StringFormat="Version {0}.{1}">
+                                    <Binding Path="MajorVersion" Mode="OneWay" />
+                                    <Binding Path="MinorVersion" Mode="OneWay" />
+                                </MultiBinding>
+                            </Run.Text>
+                        </Run>
+                        <LineBreak />
+                        <Run Text="Copyright © 2014 - 2021 by Heathcliff74" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Many thanks to the ATF Team and the Smart GSM Team for supplying JTAG and test equipment." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Many thanks to X-Shadow, Justin Angel, Joseph Manzy, Jeremy Sinclair, Vlad Slavskiy and Hikari Calyx for supplying test-phones." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Many thanks to X-Shadow, Cotulla, Rafael Rivera, Ultrashot and Gustave Monce for having enlighting discussions about Windows Mobile." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="This software uses the following libraries:" />
+                        <LineBreak />
+                        <Run Text="WinUSBNet by Thomas Bleeker (" />
+                        <Hyperlink NavigateUri="http://opensource.org/licenses/mit-license.php">license</Hyperlink>
+                        <Run Text=")" />
+                        <LineBreak />
+                        <Run Text="Prism by Microsoft patterns &amp; practices (" />
+                        <Hyperlink NavigateUri="http://compositewpf.codeplex.com/license">license</Hyperlink>
+                        <Run Text=")" />
+                        <LineBreak />
+                        <Run Text="Json.NET by James Newton-King (" />
+                        <Hyperlink NavigateUri="https://raw.github.com/JamesNK/Newtonsoft.Json/master/LICENSE.md">license</Hyperlink>
+                        <Run Text=")" />
+                        <LineBreak />
+                        <Run Text="7-zip LZMA SDK by Igor Pavlov (" />
+                        <Hyperlink NavigateUri="http://www.7-zip.org/sdk.html">license</Hyperlink>
+                        <Run Text=")" />
+                        <LineBreak />
+                        <Run Text="DiscUtils by Kenneth Bell (" />
+                        <Hyperlink NavigateUri="https://github.com/DiscUtils/DiscUtils/blob/master/LICENSE.txt">license</Hyperlink>
+                        <Run Text=")" />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/Views/About.xaml.cs b/WPinternals/Views/About.xaml.cs
similarity index 97%
rename from Views/About.xaml.cs
rename to WPinternals/Views/About.xaml.cs
index 7d525ba..d3b5bef 100644
--- a/Views/About.xaml.cs
+++ b/WPinternals/Views/About.xaml.cs
@@ -1,54 +1,54 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for About.xaml
-    /// </summary>
-    public partial class About : UserControl
-    {
-        public About()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                Process process = new();
-                process.StartInfo.UseShellExecute = true;
-                process.StartInfo.FileName = link.NavigateUri.AbsoluteUri;
-                process.Start();
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for About.xaml
+    /// </summary>
+    public partial class About : UserControl
+    {
+        public About()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                Process process = new();
+                process.StartInfo.UseShellExecute = true;
+                process.StartInfo.FileName = link.NavigateUri.AbsoluteUri;
+                process.Start();
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/BackupView.xaml b/WPinternals/Views/BackupView.xaml
similarity index 98%
rename from Views/BackupView.xaml
rename to WPinternals/Views/BackupView.xaml
index 5fc703b..fdc8bb4 100644
--- a/Views/BackupView.xaml
+++ b/WPinternals/Views/BackupView.xaml
@@ -1,148 +1,148 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.BackupView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
-    </UserControl.Resources>
-    <StackPanel VerticalAlignment="Center">
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Backup to archive" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="Before you can make a backup of the phone, you need to have Mass Storage mode " />
-                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
-                            <Run Text=" on the phone first. Make sure you don't have any Windows Phone disks or partitions mounted before you continue to Mass Storage Mode. While in Mass Storage Mode, the phone-battery will not charge. Creating a backup of the phone in Mass Storage Mode will even drain your battery quite fast. Before you continue, make sure the phone is fully charged, or else the phone may reboot before the backup is complete." />
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="Archive: " SelectionText="Select the target-file for backup..." Path="{Binding ArchivePath, Mode=TwoWay}" DefaultFileName="Backup.zip" SaveDialog="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Mass Storage mode and then a backup will be made from the selected partitions." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="The phone is in Mass Storage mode. You can continue to make a backup." IsVisible="{Binding IsPhoneInMassStorage, Mode=OneWay}"/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
-                    <Button Command="{Binding Path=BackupArchiveCommand, Mode=OneWay}" Content="Backup phone" Width="120" Height="Auto" Padding="0,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Backup separate partitions" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="When you experiment with the OS or flash Custom ROM's you can make a backup of the MainOS partition and Data partition, so you can revert to an earlier state. Remember that the MainOS partition and Data partition are tied together. So you always need to backup or restore the MainOS partition and Data partition together. Select one or more target-files for backup." />
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="EFIESP: " SelectionText="Select the target-file for backup of the EFIESP partition..." Path="{Binding EFIESPPath, Mode=TwoWay}" AllowNull="True" SaveDialog="True" DefaultFileName="EFIESP.bin" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="MainOS: " SelectionText="Select the target-file for backup of the MainOS partition..." Path="{Binding MainOSPath, Mode=TwoWay}" AllowNull="True" SaveDialog="True" DefaultFileName="MainOS.bin" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="Data: " SelectionText="Select the target-file for backup of the Data partition..." Path="{Binding DataPath, Mode=TwoWay}" AllowNull="True" SaveDialog="True" DefaultFileName="Data.bin" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Mass Storage mode and then a backup will be made from the selected partitions." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="The phone is in Mass Storage mode. You can continue to make a backup." IsVisible="{Binding IsPhoneInMassStorage, Mode=OneWay}"/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
-                    <Button Command="{Binding Path=BackupCommand, Mode=OneWay}" Content="Backup phone" Width="120" Height="Auto" Padding="0,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Backup provisioned partitions" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="Before you can make a backup of the phone provisioned partitions, you need to have Mass Storage mode " />
-                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
-                            <Run Text=" on the phone first. Make sure you don't have any Windows Phone disks or partitions mounted before you continue to Mass Storage Mode. While in Mass Storage Mode, the phone-battery will not charge. Creating a backup of the phone provisioned partitions in Mass Storage Mode will even drain your battery quite fast. Before you continue, make sure the phone is fully charged, or else the phone may reboot before the backup is complete." />
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="Archive: " SelectionText="Select the target-file for backup..." Path="{Binding ArchiveProvisioningPath, Mode=TwoWay}" DefaultFileName="Backup Provisioning.zip" SaveDialog="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Mass Storage mode and then a backup will be made from the selected partitions." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="The phone is in Mass Storage mode. You can continue to make a backup." IsVisible="{Binding IsPhoneInMassStorage, Mode=OneWay}"/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
-                    <Button Command="{Binding Path=BackupArchiveProvisioningCommand, Mode=OneWay}" Content="Backup phone" Width="120" Height="Auto" Padding="0,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.BackupView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
+    </UserControl.Resources>
+    <StackPanel VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Backup to archive" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="Before you can make a backup of the phone, you need to have Mass Storage mode " />
+                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
+                            <Run Text=" on the phone first. Make sure you don't have any Windows Phone disks or partitions mounted before you continue to Mass Storage Mode. While in Mass Storage Mode, the phone-battery will not charge. Creating a backup of the phone in Mass Storage Mode will even drain your battery quite fast. Before you continue, make sure the phone is fully charged, or else the phone may reboot before the backup is complete." />
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="Archive: " SelectionText="Select the target-file for backup..." Path="{Binding ArchivePath, Mode=TwoWay}" DefaultFileName="Backup.zip" SaveDialog="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Mass Storage mode and then a backup will be made from the selected partitions." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="The phone is in Mass Storage mode. You can continue to make a backup." IsVisible="{Binding IsPhoneInMassStorage, Mode=OneWay}"/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
+                    <Button Command="{Binding Path=BackupArchiveCommand, Mode=OneWay}" Content="Backup phone" Width="120" Height="Auto" Padding="0,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Backup separate partitions" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="When you experiment with the OS or flash Custom ROM's you can make a backup of the MainOS partition and Data partition, so you can revert to an earlier state. Remember that the MainOS partition and Data partition are tied together. So you always need to backup or restore the MainOS partition and Data partition together. Select one or more target-files for backup." />
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="EFIESP: " SelectionText="Select the target-file for backup of the EFIESP partition..." Path="{Binding EFIESPPath, Mode=TwoWay}" AllowNull="True" SaveDialog="True" DefaultFileName="EFIESP.bin" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="MainOS: " SelectionText="Select the target-file for backup of the MainOS partition..." Path="{Binding MainOSPath, Mode=TwoWay}" AllowNull="True" SaveDialog="True" DefaultFileName="MainOS.bin" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="Data: " SelectionText="Select the target-file for backup of the Data partition..." Path="{Binding DataPath, Mode=TwoWay}" AllowNull="True" SaveDialog="True" DefaultFileName="Data.bin" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Mass Storage mode and then a backup will be made from the selected partitions." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="The phone is in Mass Storage mode. You can continue to make a backup." IsVisible="{Binding IsPhoneInMassStorage, Mode=OneWay}"/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
+                    <Button Command="{Binding Path=BackupCommand, Mode=OneWay}" Content="Backup phone" Width="120" Height="Auto" Padding="0,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Backup provisioned partitions" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="Before you can make a backup of the phone provisioned partitions, you need to have Mass Storage mode " />
+                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
+                            <Run Text=" on the phone first. Make sure you don't have any Windows Phone disks or partitions mounted before you continue to Mass Storage Mode. While in Mass Storage Mode, the phone-battery will not charge. Creating a backup of the phone provisioned partitions in Mass Storage Mode will even drain your battery quite fast. Before you continue, make sure the phone is fully charged, or else the phone may reboot before the backup is complete." />
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="Archive: " SelectionText="Select the target-file for backup..." Path="{Binding ArchiveProvisioningPath, Mode=TwoWay}" DefaultFileName="Backup Provisioning.zip" SaveDialog="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Mass Storage mode and then a backup will be made from the selected partitions." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="The phone is in Mass Storage mode. You can continue to make a backup." IsVisible="{Binding IsPhoneInMassStorage, Mode=OneWay}"/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
+                    <Button Command="{Binding Path=BackupArchiveProvisioningCommand, Mode=OneWay}" Content="Backup phone" Width="120" Height="Auto" Padding="0,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/BackupView.xaml.cs b/WPinternals/Views/BackupView.xaml.cs
similarity index 97%
rename from Views/BackupView.xaml.cs
rename to WPinternals/Views/BackupView.xaml.cs
index ab44f44..cc311b7 100644
--- a/Views/BackupView.xaml.cs
+++ b/WPinternals/Views/BackupView.xaml.cs
@@ -1,55 +1,55 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for BackupView.xaml
-    /// </summary>
-    public partial class BackupView : UserControl
-    {
-        public BackupView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link && link.NavigateUri.ToString() == "UnlockBoot")
-            {
-                ((BackupTargetSelectionViewModel)DataContext).SwitchToUnlockBoot();
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-
-        private void FilePicker_PathChanged(object sender, PathChangedEventArgs e)
-        {
-            ((BackupTargetSelectionViewModel)DataContext).EvaluateViewState();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for BackupView.xaml
+    /// </summary>
+    public partial class BackupView : UserControl
+    {
+        public BackupView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link && link.NavigateUri.ToString() == "UnlockBoot")
+            {
+                ((BackupTargetSelectionViewModel)DataContext).SwitchToUnlockBoot();
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+
+        private void FilePicker_PathChanged(object sender, PathChangedEventArgs e)
+        {
+            ((BackupTargetSelectionViewModel)DataContext).EvaluateViewState();
+        }
+    }
+}
diff --git a/Views/BootRestoreResourcesView.xaml b/WPinternals/Views/BootRestoreResourcesView.xaml
similarity index 98%
rename from Views/BootRestoreResourcesView.xaml
rename to WPinternals/Views/BootRestoreResourcesView.xaml
index abe7948..82da6f8 100644
--- a/Views/BootRestoreResourcesView.xaml
+++ b/WPinternals/Views/BootRestoreResourcesView.xaml
@@ -1,118 +1,118 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.BootRestoreResourcesView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:HexConverter x:Key="HexConverter" />
-        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
-        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
-    </UserControl.Resources>
-    <StackPanel VerticalAlignment="Center">
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,0">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="General info" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="200" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Operating mode" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentMode}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
-                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Root Key Hash" />
-                            <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=RootKeyHash, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
-                        </Grid>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,20,0,0" >
-            <StackPanel Margin="20,0,20,0">
-                <StackPanel Visibility="{Binding Path=TargetHasNewFlashProtocol, Converter={StaticResource InverseVisibilityConverter}}">
-                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
-                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                            <local:Paragraph TextAlignment="Left">
-                                <Run Text="Resources for boot restore" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                                <LineBreak />
-                                <LineBreak />
-                                <Run Text="You can use this function to restore the boot partitions to their original state or to repair corrupted boot partitions. If your phone currently has Root Access, then first disable Root Access before you restore the bootloader! If your bootloader is currently unlocked, the bootloader will be restored to its original state and the phone will boot normally. If you are trying to repair a corrupted bootloader, afterwards the phone will probably remain in Flash-mode. From there on, you can only flash a stock ROM. This will erase all you apps, data and settings."/>
-                                <LineBreak />
-                            </local:Paragraph>
-                        </FlowDocument>
-                    </local:FlowDocumentScrollViewerNoMouseWheel>
-                    <local:FilePicker SelectionText="Select your FFU-image..." Path="{Binding FFUPath, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
-                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=IsBootLoaderUnlocked, Converter={StaticResource InverseVisibilityConverter}}">
-                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                            <local:Paragraph TextAlignment="Left">
-                                <LineBreak />
-                                <Run Text="You should also select a folder where you have Lumia Emergency Flash Loaders. This tool will try to select the Loader that is suitable for your phone."/>
-                                <LineBreak />
-                            </local:Paragraph>
-                        </FlowDocument>
-                    </local:FlowDocumentScrollViewerNoMouseWheel>
-                    <local:FolderPicker SelectionText="Select the folder with Lumia Emergency Flash Loaders..." Path="{Binding LoadersPath, Mode=TwoWay}" HorizontalAlignment="Stretch" Visibility="{Binding Path=IsBootLoaderUnlocked, Converter={StaticResource InverseVisibilityConverter}}"/>
-                </StackPanel>
-                <StackPanel Visibility="{Binding Path=TargetHasNewFlashProtocol, Converter={StaticResource VisibilityConverter}}">
-                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
-                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                            <local:Paragraph TextAlignment="Left">
-                                <Run Text="Restore SecureBoot" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                                <LineBreak />
-                                <LineBreak />
-                                <Run Text="You can use this function to restore SecureBoot to its original state. During the process of restoring SecureBoot, the phone will be switched to Mass Storage mode. After that the phone must be rebooted. You will be notified. You will need to reboot the phone manually at that stage, because it cannot be done programmatically. After you reboot the phone, the relock procedure will continue automatically."/>
-                            </local:Paragraph>
-                        </FlowDocument>
-                    </local:FlowDocumentScrollViewerNoMouseWheel>
-                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=IsProfileFfuValid, Converter={StaticResource InverseVisibilityConverter}}">
-                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                            <local:Paragraph TextAlignment="Left">
-                                <LineBreak />
-                                <Run Text="WARNING: " FontWeight="Bold" Foreground="Red" />
-                                <Run Text="No valid profile-FFU could be found. Go to the "/>
-                                <Hyperlink NavigateUri="Download">download</Hyperlink>
-                                <Run Text=" page in this tool and download a new FFU-file for your phone, or add an existing FFU-file to the repository."/>
-                            </local:Paragraph>
-                        </FlowDocument>
-                    </local:FlowDocumentScrollViewerNoMouseWheel>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,25,0,0">
-                    <Button Command="{Binding Path=OkCommand, Mode=OneWay}" Content="Continue" Width="100" Height="Auto" Padding="0,5"/>
-                    <Button Command="{Binding Path=CancelCommand, Mode=OneWay}" Content="Abort" Width="100" Height="Auto" Padding="0,5" Margin="20,0,0,0" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.BootRestoreResourcesView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:HexConverter x:Key="HexConverter" />
+        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
+        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
+    </UserControl.Resources>
+    <StackPanel VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,0">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="General info" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="200" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Operating mode" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentMode}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
+                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Root Key Hash" />
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=RootKeyHash, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
+                        </Grid>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,20,0,0" >
+            <StackPanel Margin="20,0,20,0">
+                <StackPanel Visibility="{Binding Path=TargetHasNewFlashProtocol, Converter={StaticResource InverseVisibilityConverter}}">
+                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
+                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                            <local:Paragraph TextAlignment="Left">
+                                <Run Text="Resources for boot restore" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                                <LineBreak />
+                                <LineBreak />
+                                <Run Text="You can use this function to restore the boot partitions to their original state or to repair corrupted boot partitions. If your phone currently has Root Access, then first disable Root Access before you restore the bootloader! If your bootloader is currently unlocked, the bootloader will be restored to its original state and the phone will boot normally. If you are trying to repair a corrupted bootloader, afterwards the phone will probably remain in Flash-mode. From there on, you can only flash a stock ROM. This will erase all you apps, data and settings."/>
+                                <LineBreak />
+                            </local:Paragraph>
+                        </FlowDocument>
+                    </local:FlowDocumentScrollViewerNoMouseWheel>
+                    <local:FilePicker SelectionText="Select your FFU-image..." Path="{Binding FFUPath, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
+                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=IsBootLoaderUnlocked, Converter={StaticResource InverseVisibilityConverter}}">
+                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                            <local:Paragraph TextAlignment="Left">
+                                <LineBreak />
+                                <Run Text="You should also select a folder where you have Lumia Emergency Flash Loaders. This tool will try to select the Loader that is suitable for your phone."/>
+                                <LineBreak />
+                            </local:Paragraph>
+                        </FlowDocument>
+                    </local:FlowDocumentScrollViewerNoMouseWheel>
+                    <local:FolderPicker SelectionText="Select the folder with Lumia Emergency Flash Loaders..." Path="{Binding LoadersPath, Mode=TwoWay}" HorizontalAlignment="Stretch" Visibility="{Binding Path=IsBootLoaderUnlocked, Converter={StaticResource InverseVisibilityConverter}}"/>
+                </StackPanel>
+                <StackPanel Visibility="{Binding Path=TargetHasNewFlashProtocol, Converter={StaticResource VisibilityConverter}}">
+                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
+                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                            <local:Paragraph TextAlignment="Left">
+                                <Run Text="Restore SecureBoot" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                                <LineBreak />
+                                <LineBreak />
+                                <Run Text="You can use this function to restore SecureBoot to its original state. During the process of restoring SecureBoot, the phone will be switched to Mass Storage mode. After that the phone must be rebooted. You will be notified. You will need to reboot the phone manually at that stage, because it cannot be done programmatically. After you reboot the phone, the relock procedure will continue automatically."/>
+                            </local:Paragraph>
+                        </FlowDocument>
+                    </local:FlowDocumentScrollViewerNoMouseWheel>
+                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=IsProfileFfuValid, Converter={StaticResource InverseVisibilityConverter}}">
+                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                            <local:Paragraph TextAlignment="Left">
+                                <LineBreak />
+                                <Run Text="WARNING: " FontWeight="Bold" Foreground="Red" />
+                                <Run Text="No valid profile-FFU could be found. Go to the "/>
+                                <Hyperlink NavigateUri="Download">download</Hyperlink>
+                                <Run Text=" page in this tool and download a new FFU-file for your phone, or add an existing FFU-file to the repository."/>
+                            </local:Paragraph>
+                        </FlowDocument>
+                    </local:FlowDocumentScrollViewerNoMouseWheel>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,25,0,0">
+                    <Button Command="{Binding Path=OkCommand, Mode=OneWay}" Content="Continue" Width="100" Height="Auto" Padding="0,5"/>
+                    <Button Command="{Binding Path=CancelCommand, Mode=OneWay}" Content="Abort" Width="100" Height="Auto" Padding="0,5" Margin="20,0,0,0" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/BootRestoreResourcesView.xaml.cs b/WPinternals/Views/BootRestoreResourcesView.xaml.cs
similarity index 97%
rename from Views/BootRestoreResourcesView.xaml.cs
rename to WPinternals/Views/BootRestoreResourcesView.xaml.cs
index 957a062..66aebaa 100644
--- a/Views/BootRestoreResourcesView.xaml.cs
+++ b/WPinternals/Views/BootRestoreResourcesView.xaml.cs
@@ -1,75 +1,75 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for FlashResourcesView.xaml
-    /// </summary>
-    public partial class BootRestoreResourcesView : UserControl
-    {
-        public BootRestoreResourcesView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                if (link.NavigateUri.ToString() == "Flash")
-                {
-                    ((FlashResourcesViewModel)DataContext).SwitchToFlashRom();
-                }
-
-                if (link.NavigateUri.ToString() == "UndoRoot")
-                {
-                    ((FlashResourcesViewModel)DataContext).SwitchToUndoRoot();
-                }
-
-                if (link.NavigateUri.ToString() == "Download")
-                {
-                    ((FlashResourcesViewModel)DataContext).SwitchToDownload();
-                }
-                else
-                {
-                    Process process = new();
-                    process.StartInfo.UseShellExecute = true;
-                    process.StartInfo.FileName = link.NavigateUri.AbsoluteUri;
-                    process.Start();
-                }
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-
-        private void FolderPicker_PathChanged(object sender, PathChangedEventArgs e)
-        {
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for FlashResourcesView.xaml
+    /// </summary>
+    public partial class BootRestoreResourcesView : UserControl
+    {
+        public BootRestoreResourcesView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                if (link.NavigateUri.ToString() == "Flash")
+                {
+                    ((FlashResourcesViewModel)DataContext).SwitchToFlashRom();
+                }
+
+                if (link.NavigateUri.ToString() == "UndoRoot")
+                {
+                    ((FlashResourcesViewModel)DataContext).SwitchToUndoRoot();
+                }
+
+                if (link.NavigateUri.ToString() == "Download")
+                {
+                    ((FlashResourcesViewModel)DataContext).SwitchToDownload();
+                }
+                else
+                {
+                    Process process = new();
+                    process.StartInfo.UseShellExecute = true;
+                    process.StartInfo.FileName = link.NavigateUri.AbsoluteUri;
+                    process.Start();
+                }
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+
+        private void FolderPicker_PathChanged(object sender, PathChangedEventArgs e)
+        {
+        }
+    }
+}
diff --git a/Views/BusyView.xaml b/WPinternals/Views/BusyView.xaml
similarity index 98%
rename from Views/BusyView.xaml
rename to WPinternals/Views/BusyView.xaml
index 9873117..7e6c7f9 100644
--- a/Views/BusyView.xaml
+++ b/WPinternals/Views/BusyView.xaml
@@ -1,65 +1,65 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.BusyView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <BitmapImage x:Key="Busy" UriSource="..\aerobusy.gif" />
-        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
-        <local:InverseObjectToVisibilityConverter x:Key="InverseObjectToVisibilityConverter" />
-        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
-        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
-    </UserControl.Resources>
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Visibility="{Binding Path=Message, Converter={StaticResource ObjectToVisibilityConverter}}">
-        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Stretch" Orientation="Vertical">
-            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal">
-                <local:GifImage x:Name="GifImage" Stretch="None" Visibility="{Binding Path=ShowAnimation, Converter={StaticResource VisibilityConverter}}"/>
-                <Label Content="{Binding Message}" FontSize="20" Margin="10,0,0,0" VerticalContentAlignment="Center"/>
-            </StackPanel>
-            <ProgressBar MaxWidth="500" MinWidth="300" Height="10" Margin="0,10,0,5" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Value="{Binding ProgressPercentage}" Visibility="{Binding Path=ProgressPercentage, Converter={StaticResource ObjectToVisibilityConverter}}"/>
-            <TextBlock HorizontalAlignment="Center" Text="{Binding ProgressText}" Visibility="{Binding Path=ProgressText, Converter={StaticResource ObjectToVisibilityConverter}}" >
-                <TextBlock.Foreground>
-                    <SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ControlDarkDarkColorKey}}"/>
-                </TextBlock.Foreground>
-            </TextBlock>
-            <TextBlock TextAlignment="Center" HorizontalAlignment="Center" Text="{Binding SubMessage}" Visibility="{Binding Path=SubMessage, Converter={StaticResource ObjectToVisibilityConverter}}" Margin="0,10,0,0" TextWrapping="WrapWithOverflow" />
-            <Expander Header="Reboot instructions" HorizontalContentAlignment="Stretch" Template="{DynamicResource TopicExpanderTemplate}" Margin="20,10,20,0" Visibility="{Binding Path=ShowRebootHelp, Converter={StaticResource VisibilityConverter}}">
-                <Grid HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-                    <Image x:Name="RebootImage" Source="pack://application:,,,/PhoneReboot.png" Height="200"/>
-                    <StackPanel Margin="20,0,0,0" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-                        <TextBlock TextAlignment="Center" HorizontalAlignment="Center" Text="To reboot your device manually, press the power and volume down button as shown in the picture at the same time until the phone vibrates, then release both buttons. The phone will get automatically detected by the tool and the process will continue where it left off." TextWrapping="WrapWithOverflow" />
-                    </StackPanel>
-                </Grid>
-            </Expander>
-        </StackPanel>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.BusyView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <BitmapImage x:Key="Busy" UriSource="..\aerobusy.gif" />
+        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
+        <local:InverseObjectToVisibilityConverter x:Key="InverseObjectToVisibilityConverter" />
+        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
+        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
+    </UserControl.Resources>
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Visibility="{Binding Path=Message, Converter={StaticResource ObjectToVisibilityConverter}}">
+        <StackPanel VerticalAlignment="Center" HorizontalAlignment="Stretch" Orientation="Vertical">
+            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal">
+                <local:GifImage x:Name="GifImage" Stretch="None" Visibility="{Binding Path=ShowAnimation, Converter={StaticResource VisibilityConverter}}"/>
+                <Label Content="{Binding Message}" FontSize="20" Margin="10,0,0,0" VerticalContentAlignment="Center"/>
+            </StackPanel>
+            <ProgressBar MaxWidth="500" MinWidth="300" Height="10" Margin="0,10,0,5" HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" Value="{Binding ProgressPercentage}" Visibility="{Binding Path=ProgressPercentage, Converter={StaticResource ObjectToVisibilityConverter}}"/>
+            <TextBlock HorizontalAlignment="Center" Text="{Binding ProgressText}" Visibility="{Binding Path=ProgressText, Converter={StaticResource ObjectToVisibilityConverter}}" >
+                <TextBlock.Foreground>
+                    <SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ControlDarkDarkColorKey}}"/>
+                </TextBlock.Foreground>
+            </TextBlock>
+            <TextBlock TextAlignment="Center" HorizontalAlignment="Center" Text="{Binding SubMessage}" Visibility="{Binding Path=SubMessage, Converter={StaticResource ObjectToVisibilityConverter}}" Margin="0,10,0,0" TextWrapping="WrapWithOverflow" />
+            <Expander Header="Reboot instructions" HorizontalContentAlignment="Stretch" Template="{DynamicResource TopicExpanderTemplate}" Margin="20,10,20,0" Visibility="{Binding Path=ShowRebootHelp, Converter={StaticResource VisibilityConverter}}">
+                <Grid HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                    </Grid.ColumnDefinitions>
+                    <Image x:Name="RebootImage" Source="pack://application:,,,/PhoneReboot.png" Height="200"/>
+                    <StackPanel Margin="20,0,0,0" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <TextBlock TextAlignment="Center" HorizontalAlignment="Center" Text="To reboot your device manually, press the power and volume down button as shown in the picture at the same time until the phone vibrates, then release both buttons. The phone will get automatically detected by the tool and the process will continue where it left off." TextWrapping="WrapWithOverflow" />
+                    </StackPanel>
+                </Grid>
+            </Expander>
+        </StackPanel>
+    </Border>
+</UserControl>
diff --git a/Views/BusyView.xaml.cs b/WPinternals/Views/BusyView.xaml.cs
similarity index 97%
rename from Views/BusyView.xaml.cs
rename to WPinternals/Views/BusyView.xaml.cs
index 3498de8..f829ec4 100644
--- a/Views/BusyView.xaml.cs
+++ b/WPinternals/Views/BusyView.xaml.cs
@@ -1,39 +1,39 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows.Controls;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for BusyView.xaml
-    /// </summary>
-    public partial class BusyView : UserControl
-    {
-        public BusyView()
-        {
-            InitializeComponent();
-
-            // Setting these properties in XAML results in an error. Why?
-            GifImage.GifSource = "/aerobusy.gif";
-            GifImage.AutoStart = true;
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows.Controls;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for BusyView.xaml
+    /// </summary>
+    public partial class BusyView : UserControl
+    {
+        public BusyView()
+        {
+            InitializeComponent();
+
+            // Setting these properties in XAML results in an error. Why?
+            GifImage.GifSource = "/aerobusy.gif";
+            GifImage.AutoStart = true;
+        }
+    }
+}
diff --git a/Views/ContextView.xaml b/WPinternals/Views/ContextView.xaml
similarity index 98%
rename from Views/ContextView.xaml
rename to WPinternals/Views/ContextView.xaml
index a7f10f6..8a01b63 100644
--- a/Views/ContextView.xaml
+++ b/WPinternals/Views/ContextView.xaml
@@ -1,48 +1,48 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.ContextView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="700">
-    <ContentControl Content="{Binding SubContextViewModel}">
-        <ContentControl.Style>
-            <Style TargetType="{x:Type ContentControl}">
-                <Style.Triggers>
-                    <DataTrigger Binding="{Binding Content, RelativeSource={x:Static RelativeSource.Self}}" Value="{x:Null}">
-                        <Setter Property="Template">
-                            <Setter.Value>
-                                <ControlTemplate>
-                                    <local:Empty/>
-                                </ControlTemplate>
-                            </Setter.Value>
-                        </Setter>
-                    </DataTrigger>
-                </Style.Triggers>
-            </Style>
-        </ContentControl.Style>
-    </ContentControl>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.ContextView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="700">
+    <ContentControl Content="{Binding SubContextViewModel}">
+        <ContentControl.Style>
+            <Style TargetType="{x:Type ContentControl}">
+                <Style.Triggers>
+                    <DataTrigger Binding="{Binding Content, RelativeSource={x:Static RelativeSource.Self}}" Value="{x:Null}">
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate>
+                                    <local:Empty/>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </DataTrigger>
+                </Style.Triggers>
+            </Style>
+        </ContentControl.Style>
+    </ContentControl>
+</UserControl>
diff --git a/Views/ContextView.xaml.cs b/WPinternals/Views/ContextView.xaml.cs
similarity index 97%
rename from Views/ContextView.xaml.cs
rename to WPinternals/Views/ContextView.xaml.cs
index a898d16..6f7cbef 100644
--- a/Views/ContextView.xaml.cs
+++ b/WPinternals/Views/ContextView.xaml.cs
@@ -1,35 +1,35 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows.Controls;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for ContextView.xaml
-    /// </summary>
-    public partial class ContextView : UserControl
-    {
-        public ContextView()
-        {
-            InitializeComponent();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows.Controls;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for ContextView.xaml
+    /// </summary>
+    public partial class ContextView : UserControl
+    {
+        public ContextView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Views/DisclaimerAndNdaView.xaml b/WPinternals/Views/DisclaimerAndNdaView.xaml
similarity index 99%
rename from Views/DisclaimerAndNdaView.xaml
rename to WPinternals/Views/DisclaimerAndNdaView.xaml
index 89f990b..5ec3f48 100644
--- a/Views/DisclaimerAndNdaView.xaml
+++ b/WPinternals/Views/DisclaimerAndNdaView.xaml
@@ -1,87 +1,87 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.DisclaimerAndNdaView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center">
-        <Grid>
-            <local:FlowDocumentScrollViewerNoMouseWheel Margin="45,25,45,75" VerticalScrollBarVisibility="Auto">
-                <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" PagePadding="0">
-                    <local:Paragraph>
-                        <Run Text="Non-disclosure agreement" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="This specific version of the software is not publicly released. This non-disclosure agreement is a legal agreement binding you, the recipient, to confidentiality about the software and all associated confidential information, which are disclosed by the developer of this software, the disclosing party. By downloading, copying, or otherwise using the software, you agree to be bound by the terms of this agreement. If you do not agree to these terms, do not download, copy, or use the software." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="You shall not disclose or distribute the software, or any associated confidential information to any third person. You shall only use the software and confidential information for the purpose of testing the software, unless agreed to expressly in writing by the developer. You agree to keep this software and all associated information confidential, and to protect the confidentiality with a reasonable degree of care." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Nothing in this agreement shall be deemed to assume or provide for the transfer of ownership of any intellectual property rights. All intellectual property rights including, without limitation, copyright in any software provided hereunder, shall vest in and at all times remain vested in the originator of that intellectual property." />
-                        <LineBreak />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Disclaimer and warning" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="This software is licensed &quot;as-is&quot;. You bear the risk of using it. The developer gives no express warranties, guarantees or conditions. To the extent permitted under your local laws, the developer excludes the implied warranties of merchantability, fitness for a particular purpose and non-infringement. In no event shall the developer be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software. If you use this software, you accept this disclaimer. If you don't want to accept this disclaimer, then don't use the software." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="This software is a &quot;proof of concept&quot; tool which uses dangerous and largely untested techniques on Windows Phones (&quot;Target Devices&quot;). By using this tool the target device may start showing unstable behavior and crashes. There is significant and real potential that irreversible permanent damage will occur on some devices. As such this tool must only be used against target devices which it is acceptable for such damage to occur (for example retired devices used only for test purposes). This tool should not be used against target devices, which are intended as your primary means of telecommunications, because in some circumstances you may not be able to place calls (including calls for emergency services), or you may experience increased data charges. Use of this tool may void the warranty of any chosen target device." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Your data is not safe and you may experience data loss! This software can disable important security features of the target devices, which makes your data, including personal images and documents, more accessible to other individuals. You should therefore be aware that you don't keep any sensitive or personal material on the target devices." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="This software may only be used for research purposes for gaining a more comprehensive understanding of your target device. It is your responsibility to ensure that this software is not used in a manner which is unlawful." />
-                        <LineBreak />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Privacy policy" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="This software requires registration. When you register the software, personally identifiable information is obtained and sent to the developer. Additionally the software may automatically obtain and send information about the usage of the software, exclusively for the purpose of improving the software. Information collected may include, but not limited to, information provided via registration and collected diagnostic data, such as device name and folder paths. None of this information is shared with or sold to any third parties, except when required by law." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="If you want to stop the collection of information, you need to uninstall the software." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="The developer of this software is concerned about safeguarding the confidentiality of your information. The developer protects the confidentiality of the processed information with a reasonable degree of care. For example, all information is sent over encrypted connections. Please be aware that no security system can prevent all potential security breaches." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="By using the software, you are consenting to the processing of your information as set forth in this privacy policy." />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,80,45,25">
-                <Button Command="{Binding Path=ContinueCommand, Mode=OneWay}" Content="Agree" Width="100" Height="Auto" Padding="0,5" />
-                <Button Command="{Binding Path=ExitCommand, Mode=OneWay}" Content="Exit" Width="100" Height="Auto" Padding="0,5" Margin="10,0,0,0" />
-            </StackPanel>
-        </Grid>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.DisclaimerAndNdaView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center">
+        <Grid>
+            <local:FlowDocumentScrollViewerNoMouseWheel Margin="45,25,45,75" VerticalScrollBarVisibility="Auto">
+                <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" PagePadding="0">
+                    <local:Paragraph>
+                        <Run Text="Non-disclosure agreement" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="This specific version of the software is not publicly released. This non-disclosure agreement is a legal agreement binding you, the recipient, to confidentiality about the software and all associated confidential information, which are disclosed by the developer of this software, the disclosing party. By downloading, copying, or otherwise using the software, you agree to be bound by the terms of this agreement. If you do not agree to these terms, do not download, copy, or use the software." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="You shall not disclose or distribute the software, or any associated confidential information to any third person. You shall only use the software and confidential information for the purpose of testing the software, unless agreed to expressly in writing by the developer. You agree to keep this software and all associated information confidential, and to protect the confidentiality with a reasonable degree of care." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Nothing in this agreement shall be deemed to assume or provide for the transfer of ownership of any intellectual property rights. All intellectual property rights including, without limitation, copyright in any software provided hereunder, shall vest in and at all times remain vested in the originator of that intellectual property." />
+                        <LineBreak />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Disclaimer and warning" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="This software is licensed &quot;as-is&quot;. You bear the risk of using it. The developer gives no express warranties, guarantees or conditions. To the extent permitted under your local laws, the developer excludes the implied warranties of merchantability, fitness for a particular purpose and non-infringement. In no event shall the developer be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software. If you use this software, you accept this disclaimer. If you don't want to accept this disclaimer, then don't use the software." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="This software is a &quot;proof of concept&quot; tool which uses dangerous and largely untested techniques on Windows Phones (&quot;Target Devices&quot;). By using this tool the target device may start showing unstable behavior and crashes. There is significant and real potential that irreversible permanent damage will occur on some devices. As such this tool must only be used against target devices which it is acceptable for such damage to occur (for example retired devices used only for test purposes). This tool should not be used against target devices, which are intended as your primary means of telecommunications, because in some circumstances you may not be able to place calls (including calls for emergency services), or you may experience increased data charges. Use of this tool may void the warranty of any chosen target device." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Your data is not safe and you may experience data loss! This software can disable important security features of the target devices, which makes your data, including personal images and documents, more accessible to other individuals. You should therefore be aware that you don't keep any sensitive or personal material on the target devices." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="This software may only be used for research purposes for gaining a more comprehensive understanding of your target device. It is your responsibility to ensure that this software is not used in a manner which is unlawful." />
+                        <LineBreak />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Privacy policy" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="This software requires registration. When you register the software, personally identifiable information is obtained and sent to the developer. Additionally the software may automatically obtain and send information about the usage of the software, exclusively for the purpose of improving the software. Information collected may include, but not limited to, information provided via registration and collected diagnostic data, such as device name and folder paths. None of this information is shared with or sold to any third parties, except when required by law." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="If you want to stop the collection of information, you need to uninstall the software." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="The developer of this software is concerned about safeguarding the confidentiality of your information. The developer protects the confidentiality of the processed information with a reasonable degree of care. For example, all information is sent over encrypted connections. Please be aware that no security system can prevent all potential security breaches." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="By using the software, you are consenting to the processing of your information as set forth in this privacy policy." />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,80,45,25">
+                <Button Command="{Binding Path=ContinueCommand, Mode=OneWay}" Content="Agree" Width="100" Height="Auto" Padding="0,5" />
+                <Button Command="{Binding Path=ExitCommand, Mode=OneWay}" Content="Exit" Width="100" Height="Auto" Padding="0,5" Margin="10,0,0,0" />
+            </StackPanel>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/Views/DisclaimerAndNdaView.xaml.cs b/WPinternals/Views/DisclaimerAndNdaView.xaml.cs
similarity index 97%
rename from Views/DisclaimerAndNdaView.xaml.cs
rename to WPinternals/Views/DisclaimerAndNdaView.xaml.cs
index 1e0c069..f70a36d 100644
--- a/Views/DisclaimerAndNdaView.xaml.cs
+++ b/WPinternals/Views/DisclaimerAndNdaView.xaml.cs
@@ -1,35 +1,35 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows.Controls;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for DisclaimerView.xaml
-    /// </summary>
-    public partial class DisclaimerAndNdaView : UserControl
-    {
-        public DisclaimerAndNdaView()
-        {
-            InitializeComponent();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows.Controls;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for DisclaimerView.xaml
+    /// </summary>
+    public partial class DisclaimerAndNdaView : UserControl
+    {
+        public DisclaimerAndNdaView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Views/DisclaimerView.xaml b/WPinternals/Views/DisclaimerView.xaml
similarity index 98%
rename from Views/DisclaimerView.xaml
rename to WPinternals/Views/DisclaimerView.xaml
index 69f5f24..caaf3e4 100644
--- a/Views/DisclaimerView.xaml
+++ b/WPinternals/Views/DisclaimerView.xaml
@@ -1,58 +1,58 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.DisclaimerView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center">
-        <Grid>
-            <local:FlowDocumentScrollViewerNoMouseWheel Margin="45,25,45,75" VerticalScrollBarVisibility="Auto">
-                <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" PagePadding="0">
-                    <local:Paragraph>
-                        <Run Text="Disclaimer and warning!" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="This software is licensed &quot;as-is&quot;. You bear the risk of using it. The developer gives no express warranties, guarantees or conditions. To the extent permitted under your local laws, the developer excludes the implied warranties of merchantability, fitness for a particular purpose and non-infringement. In no event shall the developer be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software. If you use this software, you accept this disclaimer. If you don't want to accept this disclaimer, then don't use the software." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="This software is a &quot;proof of concept&quot; tool which uses dangerous and largely untested techniques on Windows Phones (&quot;Target Devices&quot;). By using this tool the target device may start showing unstable behavior and crashes. There is significant and real potential that irreversible permanent damage will occur on some devices. As such this tool must only be used against target devices which it is acceptable for such damage to occur (for example retired devices used only for test purposes). This tool should not be used against target devices, which are intended as your primary means of telecommunications, because in some circumstances you may not be able to place calls (including calls for emergency services), or you may experience increased data charges. Use of this tool may void the warranty of any chosen target device." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Your data is not safe and you may experience data loss! This software can disable important security features of the target devices, which makes your data, including personal images and documents, more accessible to other individuals. You should therefore be aware that you don't keep any sensitive or personal material on the target devices." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="This software may only be used for research purposes for gaining a more comprehensive understanding of your target device. It is your responsibility to ensure that this software is not used in a manner which is unlawful." />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,80,45,25">
-                <Button Command="{Binding Path=ContinueCommand, Mode=OneWay}" Content="Continue" Width="100" Height="Auto" Padding="0,5" />
-                <Button Command="{Binding Path=ExitCommand, Mode=OneWay}" Content="Exit" Width="100" Height="Auto" Padding="0,5" Margin="10,0,0,0" />
-            </StackPanel>
-        </Grid>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.DisclaimerView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center">
+        <Grid>
+            <local:FlowDocumentScrollViewerNoMouseWheel Margin="45,25,45,75" VerticalScrollBarVisibility="Auto">
+                <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" PagePadding="0">
+                    <local:Paragraph>
+                        <Run Text="Disclaimer and warning!" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="This software is licensed &quot;as-is&quot;. You bear the risk of using it. The developer gives no express warranties, guarantees or conditions. To the extent permitted under your local laws, the developer excludes the implied warranties of merchantability, fitness for a particular purpose and non-infringement. In no event shall the developer be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the software. If you use this software, you accept this disclaimer. If you don't want to accept this disclaimer, then don't use the software." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="This software is a &quot;proof of concept&quot; tool which uses dangerous and largely untested techniques on Windows Phones (&quot;Target Devices&quot;). By using this tool the target device may start showing unstable behavior and crashes. There is significant and real potential that irreversible permanent damage will occur on some devices. As such this tool must only be used against target devices which it is acceptable for such damage to occur (for example retired devices used only for test purposes). This tool should not be used against target devices, which are intended as your primary means of telecommunications, because in some circumstances you may not be able to place calls (including calls for emergency services), or you may experience increased data charges. Use of this tool may void the warranty of any chosen target device." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Your data is not safe and you may experience data loss! This software can disable important security features of the target devices, which makes your data, including personal images and documents, more accessible to other individuals. You should therefore be aware that you don't keep any sensitive or personal material on the target devices." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="This software may only be used for research purposes for gaining a more comprehensive understanding of your target device. It is your responsibility to ensure that this software is not used in a manner which is unlawful." />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,80,45,25">
+                <Button Command="{Binding Path=ContinueCommand, Mode=OneWay}" Content="Continue" Width="100" Height="Auto" Padding="0,5" />
+                <Button Command="{Binding Path=ExitCommand, Mode=OneWay}" Content="Exit" Width="100" Height="Auto" Padding="0,5" Margin="10,0,0,0" />
+            </StackPanel>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/Views/DisclaimerView.xaml.cs b/WPinternals/Views/DisclaimerView.xaml.cs
similarity index 97%
rename from Views/DisclaimerView.xaml.cs
rename to WPinternals/Views/DisclaimerView.xaml.cs
index e07eabc..ed5b48d 100644
--- a/Views/DisclaimerView.xaml.cs
+++ b/WPinternals/Views/DisclaimerView.xaml.cs
@@ -1,35 +1,35 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows.Controls;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for DisclaimerView.xaml
-    /// </summary>
-    public partial class DisclaimerView : UserControl
-    {
-        public DisclaimerView()
-        {
-            InitializeComponent();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows.Controls;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for DisclaimerView.xaml
+    /// </summary>
+    public partial class DisclaimerView : UserControl
+    {
+        public DisclaimerView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Views/DumpRomView.xaml b/WPinternals/Views/DumpRomView.xaml
similarity index 98%
rename from Views/DumpRomView.xaml
rename to WPinternals/Views/DumpRomView.xaml
index 6528351..e1617ec 100644
--- a/Views/DumpRomView.xaml
+++ b/WPinternals/Views/DumpRomView.xaml
@@ -1,83 +1,83 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.DumpRomView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
-    </UserControl.Resources>
-    <StackPanel VerticalAlignment="Center">
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,0">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Dump ROM" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="You can select a source FFU-file and extract the EFIESP partition and MainOS partition. You can enable " />
-                            <Hyperlink NavigateUri="UnlockRoot">Root Access</Hyperlink>
-                            <Run Text=" on these partitions and you can further customize MainOS if you want. After you have " />
-                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
-                            <Run Text=" the bootloader of the phone, you can " />
-                            <Hyperlink NavigateUri="FlashRom">flash</Hyperlink>
-                            <Run Text=" the custom ROM to the phone." />
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="Source FFU: " SelectionText="Select the source FFU-file for backup of the Data partition..." Path="{Binding FFUPath, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker x:Name="EFIESPPicker" Caption="EFIESP: " SelectionText="Select the target-file for the EFIESP partition..." Path="{Binding EFIESPPath, Mode=TwoWay}" AllowNull="True" SaveDialog="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged" DefaultFileName="EFIESP.bin"/>
-                            <CheckBox x:Name="CompressEFIESP" Margin="70,5,0,0" Content="Compress EFIESP partition" IsChecked="{Binding CompressEFIESP, Mode=TwoWay}" Checked="CompressEFIESP_Changed" Unchecked="CompressEFIESP_Changed"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker x:Name="MainOSPicker" Caption="MainOS: " SelectionText="Select the target-file for the MainOS partition..." Path="{Binding MainOSPath, Mode=TwoWay}" AllowNull="True" SaveDialog="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged" DefaultFileName="MainOS.bin"/>
-                            <CheckBox x:Name="CompressMainOS" Margin="70,5,0,0" Content="Compress MainOS partition" IsChecked="{Binding CompressMainOS, Mode=TwoWay}" Checked="CompressMainOS_Changed" Unchecked="CompressMainOS_Changed"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker x:Name="DataPicker" Caption="Data: " SelectionText="Select the target-file for the Data partition..." Path="{Binding DataPath, Mode=TwoWay}" AllowNull="True" SaveDialog="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged" DefaultFileName="Data.bin"/>
-                            <CheckBox x:Name="CompressData" Margin="70,5,0,0" Content="Compress Data partition" IsChecked="{Binding CompressData, Mode=TwoWay}" Checked="CompressData_Changed" Unchecked="CompressData_Changed"/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
-                    <Button Command="{Binding Path=DumpCommand, Mode=OneWay}" Content="Dump partitions" Width="120" Height="Auto" Padding="0,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.DumpRomView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
+    </UserControl.Resources>
+    <StackPanel VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,0">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Dump ROM" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="You can select a source FFU-file and extract the EFIESP partition and MainOS partition. You can enable " />
+                            <Hyperlink NavigateUri="UnlockRoot">Root Access</Hyperlink>
+                            <Run Text=" on these partitions and you can further customize MainOS if you want. After you have " />
+                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
+                            <Run Text=" the bootloader of the phone, you can " />
+                            <Hyperlink NavigateUri="FlashRom">flash</Hyperlink>
+                            <Run Text=" the custom ROM to the phone." />
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="Source FFU: " SelectionText="Select the source FFU-file for backup of the Data partition..." Path="{Binding FFUPath, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker x:Name="EFIESPPicker" Caption="EFIESP: " SelectionText="Select the target-file for the EFIESP partition..." Path="{Binding EFIESPPath, Mode=TwoWay}" AllowNull="True" SaveDialog="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged" DefaultFileName="EFIESP.bin"/>
+                            <CheckBox x:Name="CompressEFIESP" Margin="70,5,0,0" Content="Compress EFIESP partition" IsChecked="{Binding CompressEFIESP, Mode=TwoWay}" Checked="CompressEFIESP_Changed" Unchecked="CompressEFIESP_Changed"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker x:Name="MainOSPicker" Caption="MainOS: " SelectionText="Select the target-file for the MainOS partition..." Path="{Binding MainOSPath, Mode=TwoWay}" AllowNull="True" SaveDialog="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged" DefaultFileName="MainOS.bin"/>
+                            <CheckBox x:Name="CompressMainOS" Margin="70,5,0,0" Content="Compress MainOS partition" IsChecked="{Binding CompressMainOS, Mode=TwoWay}" Checked="CompressMainOS_Changed" Unchecked="CompressMainOS_Changed"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker x:Name="DataPicker" Caption="Data: " SelectionText="Select the target-file for the Data partition..." Path="{Binding DataPath, Mode=TwoWay}" AllowNull="True" SaveDialog="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged" DefaultFileName="Data.bin"/>
+                            <CheckBox x:Name="CompressData" Margin="70,5,0,0" Content="Compress Data partition" IsChecked="{Binding CompressData, Mode=TwoWay}" Checked="CompressData_Changed" Unchecked="CompressData_Changed"/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
+                    <Button Command="{Binding Path=DumpCommand, Mode=OneWay}" Content="Dump partitions" Width="120" Height="Auto" Padding="0,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/DumpRomView.xaml.cs b/WPinternals/Views/DumpRomView.xaml.cs
similarity index 97%
rename from Views/DumpRomView.xaml.cs
rename to WPinternals/Views/DumpRomView.xaml.cs
index 8d0253b..ce15e61 100644
--- a/Views/DumpRomView.xaml.cs
+++ b/WPinternals/Views/DumpRomView.xaml.cs
@@ -1,81 +1,81 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for DumpRomView.xaml
-    /// </summary>
-    public partial class DumpRomView : UserControl
-    {
-        public DumpRomView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                if (link.NavigateUri.ToString() == "UnlockBoot")
-                {
-                    (this.DataContext as DumpRomTargetSelectionViewModel)?.SwitchToUnlockBoot();
-                }
-                else if (link.NavigateUri.ToString() == "UnlockRoot")
-                {
-                    (this.DataContext as DumpRomTargetSelectionViewModel)?.SwitchToUnlockRoot();
-                }
-                else if (link.NavigateUri.ToString() == "FlashRom")
-                {
-                    (this.DataContext as DumpRomTargetSelectionViewModel)?.SwitchToFlashRom();
-                }
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-
-        private void FilePicker_PathChanged(object sender, PathChangedEventArgs e)
-        {
-            ((DumpRomTargetSelectionViewModel)DataContext).EvaluateViewState();
-        }
-
-        private void CompressEFIESP_Changed(object sender, RoutedEventArgs e)
-        {
-            EFIESPPicker.DefaultFileName = "EFIESP.bin" + ((CompressEFIESP.IsChecked == true) ? ".pz" : "");
-        }
-
-        private void CompressMainOS_Changed(object sender, RoutedEventArgs e)
-        {
-            MainOSPicker.DefaultFileName = "MainOS.bin" + ((CompressMainOS.IsChecked == true) ? ".pz" : "");
-        }
-
-        private void CompressData_Changed(object sender, RoutedEventArgs e)
-        {
-            DataPicker.DefaultFileName = "Data.bin" + ((CompressData.IsChecked == true) ? ".pz" : "");
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for DumpRomView.xaml
+    /// </summary>
+    public partial class DumpRomView : UserControl
+    {
+        public DumpRomView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                if (link.NavigateUri.ToString() == "UnlockBoot")
+                {
+                    (this.DataContext as DumpRomTargetSelectionViewModel)?.SwitchToUnlockBoot();
+                }
+                else if (link.NavigateUri.ToString() == "UnlockRoot")
+                {
+                    (this.DataContext as DumpRomTargetSelectionViewModel)?.SwitchToUnlockRoot();
+                }
+                else if (link.NavigateUri.ToString() == "FlashRom")
+                {
+                    (this.DataContext as DumpRomTargetSelectionViewModel)?.SwitchToFlashRom();
+                }
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+
+        private void FilePicker_PathChanged(object sender, PathChangedEventArgs e)
+        {
+            ((DumpRomTargetSelectionViewModel)DataContext).EvaluateViewState();
+        }
+
+        private void CompressEFIESP_Changed(object sender, RoutedEventArgs e)
+        {
+            EFIESPPicker.DefaultFileName = "EFIESP.bin" + ((CompressEFIESP.IsChecked == true) ? ".pz" : "");
+        }
+
+        private void CompressMainOS_Changed(object sender, RoutedEventArgs e)
+        {
+            MainOSPicker.DefaultFileName = "MainOS.bin" + ((CompressMainOS.IsChecked == true) ? ".pz" : "");
+        }
+
+        private void CompressData_Changed(object sender, RoutedEventArgs e)
+        {
+            DataPicker.DefaultFileName = "Data.bin" + ((CompressData.IsChecked == true) ? ".pz" : "");
+        }
+    }
+}
diff --git a/Views/Empty.xaml b/WPinternals/Views/Empty.xaml
similarity index 98%
rename from Views/Empty.xaml
rename to WPinternals/Views/Empty.xaml
index 0d75f7f..97d8753 100644
--- a/Views/Empty.xaml
+++ b/WPinternals/Views/Empty.xaml
@@ -1,72 +1,72 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.Empty"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700"
-             >
-    <UserControl.Resources>
-        <BitmapImage x:Key="Busy" UriSource="..\aerobusy.gif" />
-        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
-        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
-    </UserControl.Resources>
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
-        <StackPanel>
-            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal" Margin="20,0,20,5" Height="50">
-                <local:GifImage x:Name="GifImage" Stretch="None" Margin="0,0,10,0" Visibility="Collapsed"/>
-                <Label x:Name="StatusText" Content="Waiting for connection with phone..." FontSize="20" VerticalContentAlignment="Center"/>
-            </StackPanel>
-            <local:FlowDocumentScrollViewerNoMouseWheel Margin="20,0,20,0" VerticalScrollBarVisibility="Auto">
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded">
-                    <local:Paragraph TextAlignment="Center">
-                        <Run Text="When you connect the phone, it can take a moment before it is recognized. If it still isn't recognized after a while, you might need to install the necessary drivers first. For more information about the drivers, read the " />
-                        <Hyperlink NavigateUri="Getting started">Getting started</Hyperlink>
-                        <Run Text=" section. If the drivers are installed, but the phone is still not recognized, then try to perform a soft-reset, while the USB of the phone is connected. On Lumia phones you have to press-and-hold the power-button and volume-down-button at the same time for at least 10 seconds. If the tool detects the bootloader of the phone it will try to connect to the phone at this early boot-stage." />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,-20,20,0" VerticalScrollBarVisibility="Auto" Visibility="{Binding InterruptBoot, RelativeSource={RelativeSource AncestorType={x:Type local:Empty}}, Converter={StaticResource InverseVisibilityConverter}}">
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded">
-                    <local:Paragraph TextAlignment="Center">
-                        <Run Text="You can "/>
-                        <Hyperlink NavigateUri="Interrupt boot">interrupt the boot-process</Hyperlink>
-                        <Run Text=" as soon as the bootloader is detected. This allows you to configure the phone or flash a ROM before it boots to the OS. You can also try this when the phone is not booting properly. When you unlocked the bootloader and the phone boots to a Blue Screen, you can still enter Mass Storage Mode if you want. To boot properly again, restore the bootloader. You can update to a supported OS version and try again after that."/>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,-20,20,0" VerticalScrollBarVisibility="Auto" Visibility="{Binding InterruptBoot, RelativeSource={RelativeSource AncestorType={x:Type local:Empty}}, Converter={StaticResource VisibilityConverter}}">
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded">
-                    <local:Paragraph TextAlignment="Center">
-                        <Run Text="Windows Phone Internals is set to interrupt the boot-process as soon as the bootloader is detected. You can also allow the phone to "/>
-                        <Hyperlink NavigateUri="Normal boot">boot normally</Hyperlink>
-                        <Run Text="."/>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </StackPanel>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.Empty"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700"
+             >
+    <UserControl.Resources>
+        <BitmapImage x:Key="Busy" UriSource="..\aerobusy.gif" />
+        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
+        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
+    </UserControl.Resources>
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
+        <StackPanel>
+            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal" Margin="20,0,20,5" Height="50">
+                <local:GifImage x:Name="GifImage" Stretch="None" Margin="0,0,10,0" Visibility="Collapsed"/>
+                <Label x:Name="StatusText" Content="Waiting for connection with phone..." FontSize="20" VerticalContentAlignment="Center"/>
+            </StackPanel>
+            <local:FlowDocumentScrollViewerNoMouseWheel Margin="20,0,20,0" VerticalScrollBarVisibility="Auto">
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded">
+                    <local:Paragraph TextAlignment="Center">
+                        <Run Text="When you connect the phone, it can take a moment before it is recognized. If it still isn't recognized after a while, you might need to install the necessary drivers first. For more information about the drivers, read the " />
+                        <Hyperlink NavigateUri="Getting started">Getting started</Hyperlink>
+                        <Run Text=" section. If the drivers are installed, but the phone is still not recognized, then try to perform a soft-reset, while the USB of the phone is connected. On Lumia phones you have to press-and-hold the power-button and volume-down-button at the same time for at least 10 seconds. If the tool detects the bootloader of the phone it will try to connect to the phone at this early boot-stage." />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,-20,20,0" VerticalScrollBarVisibility="Auto" Visibility="{Binding InterruptBoot, RelativeSource={RelativeSource AncestorType={x:Type local:Empty}}, Converter={StaticResource InverseVisibilityConverter}}">
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded">
+                    <local:Paragraph TextAlignment="Center">
+                        <Run Text="You can "/>
+                        <Hyperlink NavigateUri="Interrupt boot">interrupt the boot-process</Hyperlink>
+                        <Run Text=" as soon as the bootloader is detected. This allows you to configure the phone or flash a ROM before it boots to the OS. You can also try this when the phone is not booting properly. When you unlocked the bootloader and the phone boots to a Blue Screen, you can still enter Mass Storage Mode if you want. To boot properly again, restore the bootloader. You can update to a supported OS version and try again after that."/>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,-20,20,0" VerticalScrollBarVisibility="Auto" Visibility="{Binding InterruptBoot, RelativeSource={RelativeSource AncestorType={x:Type local:Empty}}, Converter={StaticResource VisibilityConverter}}">
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded">
+                    <local:Paragraph TextAlignment="Center">
+                        <Run Text="Windows Phone Internals is set to interrupt the boot-process as soon as the bootloader is detected. You can also allow the phone to "/>
+                        <Hyperlink NavigateUri="Normal boot">boot normally</Hyperlink>
+                        <Run Text="."/>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </StackPanel>
+    </Border>
+</UserControl>
diff --git a/Views/Empty.xaml.cs b/WPinternals/Views/Empty.xaml.cs
similarity index 97%
rename from Views/Empty.xaml.cs
rename to WPinternals/Views/Empty.xaml.cs
index 966a8c1..b9f3ec1 100644
--- a/Views/Empty.xaml.cs
+++ b/WPinternals/Views/Empty.xaml.cs
@@ -1,153 +1,153 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Media;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for Empty.xaml
-    /// </summary>
-    public partial class Empty : UserControl
-    {
-        private static PhoneNotifierViewModel PhoneNotifier;
-        private static SynchronizationContext UIContext;
-
-        // Dependency injection is not possible here, because this ViewModel is used in a Style.
-        public Empty()
-        {
-            InitializeComponent();
-
-            InterruptBoot = App.InterruptBoot;
-            UIContext = SynchronizationContext.Current;
-
-            // Setting these properties in XAML results in an error. Why?
-            GifImage.GifSource = "/aerobusy.gif";
-            GifImage.AutoStart = true;
-
-            Loaded += Empty_Loaded;
-            Unloaded += Empty_Unloaded;
-        }
-
-        private void Empty_Unloaded(object sender, RoutedEventArgs e)
-        {
-            PhoneNotifier.NewDeviceArrived -= PhoneNotifier_NewDeviceArrived;
-        }
-
-        private void Empty_Loaded(object sender, RoutedEventArgs e)
-        {
-            // Find the phone notifier
-            DependencyObject obj = (DependencyObject)sender;
-            while (!(obj is MainWindow))
-            {
-                obj = VisualTreeHelper.GetParent(obj);
-            }
-
-            PhoneNotifier = ((MainViewModel)((MainWindow)obj).DataContext).PhoneNotifier;
-
-            PhoneNotifier.NewDeviceArrived += PhoneNotifier_NewDeviceArrived;
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                if (link.NavigateUri.ToString() == "Getting started")
-                {
-                    App.NavigateToGettingStarted();
-                }
-                else if (link.NavigateUri.ToString() == "Unlock boot")
-                {
-                    App.NavigateToUnlockBoot();
-                }
-                else if (link.NavigateUri.ToString() == "Interrupt boot")
-                {
-                    InterruptBoot = true;
-                }
-                else if (link.NavigateUri.ToString() == "Normal boot")
-                {
-                    InterruptBoot = false;
-                }
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-
-        public static readonly DependencyProperty InterruptBootProperty =
-            DependencyProperty.Register("InterruptBoot", typeof(Boolean), typeof(Empty), new FrameworkPropertyMetadata(InterruptBootChanged));
-        public bool InterruptBoot
-        {
-            get
-            {
-                return (bool)GetValue(InterruptBootProperty);
-            }
-            set
-            {
-                SetValue(InterruptBootProperty, value);
-            }
-        }
-
-        internal static void InterruptBootChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            App.InterruptBoot = (bool)e.NewValue;
-
-            if ((bool)e.NewValue && PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
-            {
-                App.InterruptBoot = false;
-                LogFile.Log("Found Lumia BootMgr and user forced to interrupt the boot process. Force to Flash-mode.");
-                Task.Run(() => SwitchModeViewModel.SwitchTo(PhoneNotifier, PhoneInterfaces.Lumia_Flash));
-            }
-        }
-
-        internal void PhoneNotifier_NewDeviceArrived(ArrivalEventArgs Args)
-        {
-            if (App.InterruptBoot && Args.NewInterface == PhoneInterfaces.Lumia_Bootloader)
-            {
-                App.InterruptBoot = false;
-                LogFile.Log("Found Lumia BootMgr and user forced to interrupt the boot process. Force to Flash-mode.");
-                Task.Run(() => SwitchModeViewModel.SwitchTo(PhoneNotifier, PhoneInterfaces.Lumia_Flash));
-            }
-
-            UIContext.Send(s =>
-            {
-                if (!App.InterruptBoot && Args.NewInterface == PhoneInterfaces.Lumia_Bootloader)
-                {
-                    StatusText.Content = "Phone is booting...";
-                    GifImage.Visibility = Visibility.Visible;
-                }
-
-                if (!App.InterruptBoot && Args.NewInterface != PhoneInterfaces.Lumia_Bootloader)
-                {
-                    StatusText.Content = "Waiting for connection with phone...";
-                    GifImage.Visibility = Visibility.Collapsed;
-                }
-            }, null);
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Media;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for Empty.xaml
+    /// </summary>
+    public partial class Empty : UserControl
+    {
+        private static PhoneNotifierViewModel PhoneNotifier;
+        private static SynchronizationContext UIContext;
+
+        // Dependency injection is not possible here, because this ViewModel is used in a Style.
+        public Empty()
+        {
+            InitializeComponent();
+
+            InterruptBoot = App.InterruptBoot;
+            UIContext = SynchronizationContext.Current;
+
+            // Setting these properties in XAML results in an error. Why?
+            GifImage.GifSource = "/aerobusy.gif";
+            GifImage.AutoStart = true;
+
+            Loaded += Empty_Loaded;
+            Unloaded += Empty_Unloaded;
+        }
+
+        private void Empty_Unloaded(object sender, RoutedEventArgs e)
+        {
+            PhoneNotifier.NewDeviceArrived -= PhoneNotifier_NewDeviceArrived;
+        }
+
+        private void Empty_Loaded(object sender, RoutedEventArgs e)
+        {
+            // Find the phone notifier
+            DependencyObject obj = (DependencyObject)sender;
+            while (!(obj is MainWindow))
+            {
+                obj = VisualTreeHelper.GetParent(obj);
+            }
+
+            PhoneNotifier = ((MainViewModel)((MainWindow)obj).DataContext).PhoneNotifier;
+
+            PhoneNotifier.NewDeviceArrived += PhoneNotifier_NewDeviceArrived;
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                if (link.NavigateUri.ToString() == "Getting started")
+                {
+                    App.NavigateToGettingStarted();
+                }
+                else if (link.NavigateUri.ToString() == "Unlock boot")
+                {
+                    App.NavigateToUnlockBoot();
+                }
+                else if (link.NavigateUri.ToString() == "Interrupt boot")
+                {
+                    InterruptBoot = true;
+                }
+                else if (link.NavigateUri.ToString() == "Normal boot")
+                {
+                    InterruptBoot = false;
+                }
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+
+        public static readonly DependencyProperty InterruptBootProperty =
+            DependencyProperty.Register("InterruptBoot", typeof(Boolean), typeof(Empty), new FrameworkPropertyMetadata(InterruptBootChanged));
+        public bool InterruptBoot
+        {
+            get
+            {
+                return (bool)GetValue(InterruptBootProperty);
+            }
+            set
+            {
+                SetValue(InterruptBootProperty, value);
+            }
+        }
+
+        internal static void InterruptBootChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            App.InterruptBoot = (bool)e.NewValue;
+
+            if ((bool)e.NewValue && PhoneNotifier.CurrentInterface == PhoneInterfaces.Lumia_Bootloader)
+            {
+                App.InterruptBoot = false;
+                LogFile.Log("Found Lumia BootMgr and user forced to interrupt the boot process. Force to Flash-mode.");
+                Task.Run(() => SwitchModeViewModel.SwitchTo(PhoneNotifier, PhoneInterfaces.Lumia_Flash));
+            }
+        }
+
+        internal void PhoneNotifier_NewDeviceArrived(ArrivalEventArgs Args)
+        {
+            if (App.InterruptBoot && Args.NewInterface == PhoneInterfaces.Lumia_Bootloader)
+            {
+                App.InterruptBoot = false;
+                LogFile.Log("Found Lumia BootMgr and user forced to interrupt the boot process. Force to Flash-mode.");
+                Task.Run(() => SwitchModeViewModel.SwitchTo(PhoneNotifier, PhoneInterfaces.Lumia_Flash));
+            }
+
+            UIContext.Send(s =>
+            {
+                if (!App.InterruptBoot && Args.NewInterface == PhoneInterfaces.Lumia_Bootloader)
+                {
+                    StatusText.Content = "Phone is booting...";
+                    GifImage.Visibility = Visibility.Visible;
+                }
+
+                if (!App.InterruptBoot && Args.NewInterface != PhoneInterfaces.Lumia_Bootloader)
+                {
+                    StatusText.Content = "Waiting for connection with phone...";
+                    GifImage.Visibility = Visibility.Collapsed;
+                }
+            }, null);
+        }
+    }
+}
diff --git a/Views/FlashResourcesView.xaml b/WPinternals/Views/FlashResourcesView.xaml
similarity index 98%
rename from Views/FlashResourcesView.xaml
rename to WPinternals/Views/FlashResourcesView.xaml
index 5d12c31..d4e7a6c 100644
--- a/Views/FlashResourcesView.xaml
+++ b/WPinternals/Views/FlashResourcesView.xaml
@@ -1,198 +1,198 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.FlashResourcesView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:HexConverter x:Key="HexConverter" />
-        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
-        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
-    </UserControl.Resources>
-    <StackPanel VerticalAlignment="Center">
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,0">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="General info" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="200" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Operating mode" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentMode}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
-                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Root Key Hash" />
-                            <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=RootKeyHash, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
-                        </Grid>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,20,0,0" >
-            <StackPanel Margin="20,0,20,0">
-                <StackPanel Visibility="{Binding Path=TargetHasNewFlashProtocol, Converter={StaticResource InverseVisibilityConverter}}">
-                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
-                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                            <local:Paragraph TextAlignment="Left">
-                                <Run Text="SecureBoot Unlock V1" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                                <LineBreak />
-                                <LineBreak />
-                                <Run Text="When you unlock the bootloader, Windows Phone Internals will also need an original FFU file for this phone, to extract some data from it. If you don't have an FFU-image for your phone yet, you can "/>
-                                <Hyperlink NavigateUri="Download">
-                                    <Run Text="download"/>
-                                </Hyperlink>
-                                <Run Text=" it."/>
-                                <LineBreak />
-                            </local:Paragraph>
-                        </FlowDocument>
-                    </local:FlowDocumentScrollViewerNoMouseWheel>
-                    <local:FilePicker SelectionText="Select your FFU-image..." Path="{Binding FFUPath, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
-                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=IsBootLoaderUnlocked, Converter={StaticResource InverseVisibilityConverter}}">
-                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                            <local:Paragraph TextAlignment="Left">
-                                <LineBreak />
-                                <Run Text="You should also select a folder where you have Lumia Emergency Flash Loaders. This tool will try to select the Loader that is suitable for your phone."/>
-                                <LineBreak />
-                            </local:Paragraph>
-                        </FlowDocument>
-                    </local:FlowDocumentScrollViewerNoMouseWheel>
-                    <local:FolderPicker SelectionText="Select the folder with Lumia Emergency Flash Loaders..." Path="{Binding LoadersPath, Mode=TwoWay}" HorizontalAlignment="Stretch" Visibility="{Binding Path=IsBootLoaderUnlocked, Converter={StaticResource InverseVisibilityConverter}}"/>
-                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
-                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                            <local:Paragraph TextAlignment="Left">
-                                <LineBreak />
-                                <Run Text="You can optionally select an image that contains the SBL3 partition of an engineering phone. This is for the purpose of unlocking Mass Storage Mode. This mode is not implemented in the retail versions of the SBL3 partition. You can select an " />
-                                <Hyperlink NavigateUri="https://www.google.com/search?safe=off&amp;q=%22Lumia%22+%22Engineering+ROM%22&amp;oq=%22Lumia%22+%22Engineering+ROM%22">FFU-image</Hyperlink>
-                                <Run Text=" or raw-image. This tool will try to extract the partition. SBL3 also contains hardware-profiles. So it is not possible to exchange SBL3 partitions from different CPU's or OEM's! Verify that the SBL3 you select was originally meant for a phone from the same OEM and it has the same CPU as your target device! Flashing a wrong SBL3 will harm your phone!" />
-                                <LineBreak />
-                            </local:Paragraph>
-                        </FlowDocument>
-                    </local:FlowDocumentScrollViewerNoMouseWheel>
-                    <local:FilePicker SelectionText="Optionally select an FFU-image or raw image with an Engineering SBL3 partition..." AllowNull="True" Path="{Binding SBL3Path, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
-                    <StackPanel Visibility="{Binding Path=IsSupportedFfuNeeded, Converter={StaticResource VisibilityConverter}}">
-                        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
-                            <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                                <local:Paragraph TextAlignment="Left">
-                                    <LineBreak />
-                                    <Run Text="The FFU-image you selected does not have a supported OS-version. Windows Phone Internals needs to extract files from a supported OS-version. You need to select such donor-FFU. If necessary, you can select an FFU-image for a different model." />
-                                    <LineBreak />
-                                </local:Paragraph>
-                            </FlowDocument>
-                        </local:FlowDocumentScrollViewerNoMouseWheel>
-                        <local:FilePicker SelectionText="Select an FFU-image with supported OS-version..." AllowNull="False" Path="{Binding SupportedFFUPath, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
-                        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=IsSupportedFfuValid, Converter={StaticResource InverseVisibilityConverter}}">
-                            <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1" FontWeight="Bold" Foreground="Red">
-                                <local:Paragraph TextAlignment="Left">
-                                    <LineBreak />
-                                    <Run Text="The OS version of the selected FFU is not supported. Select a donor-FFU with a supported OS version." />
-                                </local:Paragraph>
-                            </FlowDocument>
-                        </local:FlowDocumentScrollViewerNoMouseWheel>
-                    </StackPanel>
-                </StackPanel>
-                <StackPanel Visibility="{Binding Path=TargetHasNewFlashProtocol, Converter={StaticResource VisibilityConverter}}">
-                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
-                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                            <local:Paragraph TextAlignment="Left">
-                                <Run Foreground="#FF3753A6" FontWeight="Bold" FontSize="18" Text="SecureBoot Unlock V2"/>
-                                <LineBreak/>
-                                <LineBreak/>
-                                <Run Text="To unlock this phone you need Windows Phone Internals SecureBoot Unlock V2. To flash this to the phone Windows Phone Internals needs to have a &quot;Flashing Profile&quot;. If you unlock or flash this phone for the first time, Windows Phone Internals will try to find the flashing profile. During this phase your phone will start to reboot a couple of times. This may look weird, but it is expected behavior. When a flashing profile is found, it is saved. After that Windows Phone Internals will flash an unlocked bootloader." />
-                                <LineBreak/>
-                                <LineBreak/>
-                                <Run Text="Warning: " Foreground="Red" FontWeight="Bold"/>
-                                <Run Text="While looking for a Flashing Profile, the phone will be rebooted through different modes. The phone will also enter Emergency Download Mode. Windows Phone Internals will use the Emergency Programmer to run faster through the process. If you haven't downloaded the Emergency Programmer for target phone yet, you can still do so by going to the " />
-                                <Hyperlink NavigateUri="Download">
-                                    <Run Text="download-section"/>
-                                </Hyperlink>
-                                <Run Text=". Emergency Programmers are available for most Lumia-models. If you don't have an Emergency Programmer for the phone and you still choose to continue, the phone may pause for up to 30 seconds between reboots. Some phone models may not even reboot at all without an Emergency Programmer. In this case you need to manually reboot the phone, when it hangs after an attempt to find the Flashing Profile. Reboot the phone by pressing and holding the power-button until the phone vibrates."/>
-                                <LineBreak/>
-                                <LineBreak/>
-                                <Run Text="Warning: " Foreground="Red" FontWeight="Bold"/>
-                                <Run Text="Some Windows 10 based phones need additional modifications to be able to boot properly after the bootloader is unlocked. The patches will be applied automatically if the OS on the phone is on a supported version. In case the phone doesn't boot properly, you can still enter Mass Storage Mode if you want. To boot properly again, restore the bootloader. You can update to a supported OS version and try again after that." />
-                                <LineBreak/>
-                                <LineBreak/>
-                                <Run Text="Warning: " Foreground="Red" FontWeight="Bold"/>
-                                <Run Text="The unlock sequence for Lumia's with bootloader spec B depends on a certain &quot;Boot order&quot;. Right after a Full Flash or right after you relocked a phone, this boot order is different. When you flash an FFU, you can interrupt the boot immediately, before it has completed its first boot. If you would then try to unlock the bootloader, this will fail halfway. This problem will be detected and the changes will be rolled back. A simple reboot will solve the problem; the boot order is restored. After that you can start the unlock sequence again." />
-                                <LineBreak />
-                                <LineBreak />
-                                <Run Text="When you perform a &quot;Custom Flash&quot; Windows Phone Internals will also need an original FFU file for this phone, to extract some profiling information from it. If you don't have an FFU-image for your phone yet, you can "/>
-                                <Hyperlink NavigateUri="Download">
-                                    <Run Text="download"/>
-                                </Hyperlink>
-                                <Run Text=" it."/>
-                                <LineBreak/>
-                            </local:Paragraph>
-                        </FlowDocument>
-                    </local:FlowDocumentScrollViewerNoMouseWheel>
-                    <local:FilePicker SelectionText="Select your FFU-image for profiling..." Path="{Binding ProfileFFUPath, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
-                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
-                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                            <local:Paragraph TextAlignment="Left">
-                                <LineBreak />
-                                <Run Text="You will also need an emergency programmer for your phone."/>
-                                <LineBreak />
-                            </local:Paragraph>
-                        </FlowDocument>
-                    </local:FlowDocumentScrollViewerNoMouseWheel>
-                    <local:FilePicker SelectionText="Select the EDE-file for your phone..." Path="{Binding EDEPath, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
-                    <StackPanel Visibility="{Binding Path=IsSupportedFfuNeeded, Converter={StaticResource VisibilityConverter}}">
-                        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
-                            <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
-                                <local:Paragraph TextAlignment="Left">
-                                    <LineBreak />
-                                    <Run Text="The FFU-image you selected for profiling does not have a supported OS-version. Windows Phone Internals needs to extract files from a supported OS-version. You need to select such donor-FFU. If necessary, you can select an FFU-image for a different model." />
-                                    <LineBreak />
-                                </local:Paragraph>
-                            </FlowDocument>
-                        </local:FlowDocumentScrollViewerNoMouseWheel>
-                        <local:FilePicker SelectionText="Select an FFU-image with supported OS-version..." AllowNull="False" Path="{Binding SupportedFFUPath, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
-                        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=IsSupportedFfuValid, Converter={StaticResource InverseVisibilityConverter}}">
-                            <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1" FontWeight="Bold" Foreground="Red">
-                                <local:Paragraph TextAlignment="Left">
-                                    <LineBreak />
-                                    <Run Text="The OS version of the selected FFU is not supported. Select a donor-FFU with a supported OS version." />
-                                </local:Paragraph>
-                            </FlowDocument>
-                        </local:FlowDocumentScrollViewerNoMouseWheel>
-                    </StackPanel>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,25,0,0">
-                    <Button Command="{Binding Path=OkCommand, Mode=OneWay}" Content="Unlock" Width="100" Height="Auto" Padding="0,5"/>
-                    <Button Command="{Binding Path=CancelCommand, Mode=OneWay}" Content="Abort" Width="100" Height="Auto" Padding="0,5" Margin="20,0,0,0" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.FlashResourcesView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:HexConverter x:Key="HexConverter" />
+        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
+        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
+    </UserControl.Resources>
+    <StackPanel VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,0">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="General info" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="200" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Operating mode" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding CurrentMode}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
+                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Root Key Hash" />
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=RootKeyHash, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
+                        </Grid>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,20,0,0" >
+            <StackPanel Margin="20,0,20,0">
+                <StackPanel Visibility="{Binding Path=TargetHasNewFlashProtocol, Converter={StaticResource InverseVisibilityConverter}}">
+                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
+                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                            <local:Paragraph TextAlignment="Left">
+                                <Run Text="SecureBoot Unlock V1" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                                <LineBreak />
+                                <LineBreak />
+                                <Run Text="When you unlock the bootloader, Windows Phone Internals will also need an original FFU file for this phone, to extract some data from it. If you don't have an FFU-image for your phone yet, you can "/>
+                                <Hyperlink NavigateUri="Download">
+                                    <Run Text="download"/>
+                                </Hyperlink>
+                                <Run Text=" it."/>
+                                <LineBreak />
+                            </local:Paragraph>
+                        </FlowDocument>
+                    </local:FlowDocumentScrollViewerNoMouseWheel>
+                    <local:FilePicker SelectionText="Select your FFU-image..." Path="{Binding FFUPath, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
+                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=IsBootLoaderUnlocked, Converter={StaticResource InverseVisibilityConverter}}">
+                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                            <local:Paragraph TextAlignment="Left">
+                                <LineBreak />
+                                <Run Text="You should also select a folder where you have Lumia Emergency Flash Loaders. This tool will try to select the Loader that is suitable for your phone."/>
+                                <LineBreak />
+                            </local:Paragraph>
+                        </FlowDocument>
+                    </local:FlowDocumentScrollViewerNoMouseWheel>
+                    <local:FolderPicker SelectionText="Select the folder with Lumia Emergency Flash Loaders..." Path="{Binding LoadersPath, Mode=TwoWay}" HorizontalAlignment="Stretch" Visibility="{Binding Path=IsBootLoaderUnlocked, Converter={StaticResource InverseVisibilityConverter}}"/>
+                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
+                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                            <local:Paragraph TextAlignment="Left">
+                                <LineBreak />
+                                <Run Text="You can optionally select an image that contains the SBL3 partition of an engineering phone. This is for the purpose of unlocking Mass Storage Mode. This mode is not implemented in the retail versions of the SBL3 partition. You can select an " />
+                                <Hyperlink NavigateUri="https://www.google.com/search?safe=off&amp;q=%22Lumia%22+%22Engineering+ROM%22&amp;oq=%22Lumia%22+%22Engineering+ROM%22">FFU-image</Hyperlink>
+                                <Run Text=" or raw-image. This tool will try to extract the partition. SBL3 also contains hardware-profiles. So it is not possible to exchange SBL3 partitions from different CPU's or OEM's! Verify that the SBL3 you select was originally meant for a phone from the same OEM and it has the same CPU as your target device! Flashing a wrong SBL3 will harm your phone!" />
+                                <LineBreak />
+                            </local:Paragraph>
+                        </FlowDocument>
+                    </local:FlowDocumentScrollViewerNoMouseWheel>
+                    <local:FilePicker SelectionText="Optionally select an FFU-image or raw image with an Engineering SBL3 partition..." AllowNull="True" Path="{Binding SBL3Path, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
+                    <StackPanel Visibility="{Binding Path=IsSupportedFfuNeeded, Converter={StaticResource VisibilityConverter}}">
+                        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
+                            <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                                <local:Paragraph TextAlignment="Left">
+                                    <LineBreak />
+                                    <Run Text="The FFU-image you selected does not have a supported OS-version. Windows Phone Internals needs to extract files from a supported OS-version. You need to select such donor-FFU. If necessary, you can select an FFU-image for a different model." />
+                                    <LineBreak />
+                                </local:Paragraph>
+                            </FlowDocument>
+                        </local:FlowDocumentScrollViewerNoMouseWheel>
+                        <local:FilePicker SelectionText="Select an FFU-image with supported OS-version..." AllowNull="False" Path="{Binding SupportedFFUPath, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
+                        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=IsSupportedFfuValid, Converter={StaticResource InverseVisibilityConverter}}">
+                            <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1" FontWeight="Bold" Foreground="Red">
+                                <local:Paragraph TextAlignment="Left">
+                                    <LineBreak />
+                                    <Run Text="The OS version of the selected FFU is not supported. Select a donor-FFU with a supported OS version." />
+                                </local:Paragraph>
+                            </FlowDocument>
+                        </local:FlowDocumentScrollViewerNoMouseWheel>
+                    </StackPanel>
+                </StackPanel>
+                <StackPanel Visibility="{Binding Path=TargetHasNewFlashProtocol, Converter={StaticResource VisibilityConverter}}">
+                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
+                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                            <local:Paragraph TextAlignment="Left">
+                                <Run Foreground="#FF3753A6" FontWeight="Bold" FontSize="18" Text="SecureBoot Unlock V2"/>
+                                <LineBreak/>
+                                <LineBreak/>
+                                <Run Text="To unlock this phone you need Windows Phone Internals SecureBoot Unlock V2. To flash this to the phone Windows Phone Internals needs to have a &quot;Flashing Profile&quot;. If you unlock or flash this phone for the first time, Windows Phone Internals will try to find the flashing profile. During this phase your phone will start to reboot a couple of times. This may look weird, but it is expected behavior. When a flashing profile is found, it is saved. After that Windows Phone Internals will flash an unlocked bootloader." />
+                                <LineBreak/>
+                                <LineBreak/>
+                                <Run Text="Warning: " Foreground="Red" FontWeight="Bold"/>
+                                <Run Text="While looking for a Flashing Profile, the phone will be rebooted through different modes. The phone will also enter Emergency Download Mode. Windows Phone Internals will use the Emergency Programmer to run faster through the process. If you haven't downloaded the Emergency Programmer for target phone yet, you can still do so by going to the " />
+                                <Hyperlink NavigateUri="Download">
+                                    <Run Text="download-section"/>
+                                </Hyperlink>
+                                <Run Text=". Emergency Programmers are available for most Lumia-models. If you don't have an Emergency Programmer for the phone and you still choose to continue, the phone may pause for up to 30 seconds between reboots. Some phone models may not even reboot at all without an Emergency Programmer. In this case you need to manually reboot the phone, when it hangs after an attempt to find the Flashing Profile. Reboot the phone by pressing and holding the power-button until the phone vibrates."/>
+                                <LineBreak/>
+                                <LineBreak/>
+                                <Run Text="Warning: " Foreground="Red" FontWeight="Bold"/>
+                                <Run Text="Some Windows 10 based phones need additional modifications to be able to boot properly after the bootloader is unlocked. The patches will be applied automatically if the OS on the phone is on a supported version. In case the phone doesn't boot properly, you can still enter Mass Storage Mode if you want. To boot properly again, restore the bootloader. You can update to a supported OS version and try again after that." />
+                                <LineBreak/>
+                                <LineBreak/>
+                                <Run Text="Warning: " Foreground="Red" FontWeight="Bold"/>
+                                <Run Text="The unlock sequence for Lumia's with bootloader spec B depends on a certain &quot;Boot order&quot;. Right after a Full Flash or right after you relocked a phone, this boot order is different. When you flash an FFU, you can interrupt the boot immediately, before it has completed its first boot. If you would then try to unlock the bootloader, this will fail halfway. This problem will be detected and the changes will be rolled back. A simple reboot will solve the problem; the boot order is restored. After that you can start the unlock sequence again." />
+                                <LineBreak />
+                                <LineBreak />
+                                <Run Text="When you perform a &quot;Custom Flash&quot; Windows Phone Internals will also need an original FFU file for this phone, to extract some profiling information from it. If you don't have an FFU-image for your phone yet, you can "/>
+                                <Hyperlink NavigateUri="Download">
+                                    <Run Text="download"/>
+                                </Hyperlink>
+                                <Run Text=" it."/>
+                                <LineBreak/>
+                            </local:Paragraph>
+                        </FlowDocument>
+                    </local:FlowDocumentScrollViewerNoMouseWheel>
+                    <local:FilePicker SelectionText="Select your FFU-image for profiling..." Path="{Binding ProfileFFUPath, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
+                    <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
+                        <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                            <local:Paragraph TextAlignment="Left">
+                                <LineBreak />
+                                <Run Text="You will also need an emergency programmer for your phone."/>
+                                <LineBreak />
+                            </local:Paragraph>
+                        </FlowDocument>
+                    </local:FlowDocumentScrollViewerNoMouseWheel>
+                    <local:FilePicker SelectionText="Select the EDE-file for your phone..." Path="{Binding EDEPath, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
+                    <StackPanel Visibility="{Binding Path=IsSupportedFfuNeeded, Converter={StaticResource VisibilityConverter}}">
+                        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
+                            <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1">
+                                <local:Paragraph TextAlignment="Left">
+                                    <LineBreak />
+                                    <Run Text="The FFU-image you selected for profiling does not have a supported OS-version. Windows Phone Internals needs to extract files from a supported OS-version. You need to select such donor-FFU. If necessary, you can select an FFU-image for a different model." />
+                                    <LineBreak />
+                                </local:Paragraph>
+                            </FlowDocument>
+                        </local:FlowDocumentScrollViewerNoMouseWheel>
+                        <local:FilePicker SelectionText="Select an FFU-image with supported OS-version..." AllowNull="False" Path="{Binding SupportedFFUPath, Mode=TwoWay}" HorizontalAlignment="Stretch"/>
+                        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=IsSupportedFfuValid, Converter={StaticResource InverseVisibilityConverter}}">
+                            <FlowDocument Loaded="Document_Loaded" FontFamily="Segoe UI" FontSize="12" PagePadding="1" FontWeight="Bold" Foreground="Red">
+                                <local:Paragraph TextAlignment="Left">
+                                    <LineBreak />
+                                    <Run Text="The OS version of the selected FFU is not supported. Select a donor-FFU with a supported OS version." />
+                                </local:Paragraph>
+                            </FlowDocument>
+                        </local:FlowDocumentScrollViewerNoMouseWheel>
+                    </StackPanel>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,25,0,0">
+                    <Button Command="{Binding Path=OkCommand, Mode=OneWay}" Content="Unlock" Width="100" Height="Auto" Padding="0,5"/>
+                    <Button Command="{Binding Path=CancelCommand, Mode=OneWay}" Content="Abort" Width="100" Height="Auto" Padding="0,5" Margin="20,0,0,0" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/FlashResourcesView.xaml.cs b/WPinternals/Views/FlashResourcesView.xaml.cs
similarity index 97%
rename from Views/FlashResourcesView.xaml.cs
rename to WPinternals/Views/FlashResourcesView.xaml.cs
index fa7ac96..9507065 100644
--- a/Views/FlashResourcesView.xaml.cs
+++ b/WPinternals/Views/FlashResourcesView.xaml.cs
@@ -1,65 +1,65 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for FlashResourcesView.xaml
-    /// </summary>
-    public partial class FlashResourcesView : UserControl
-    {
-        public FlashResourcesView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                if (link.NavigateUri.ToString() == "Flash")
-                {
-                    ((FlashResourcesViewModel)DataContext).SwitchToFlashRom();
-                }
-                else if (link.NavigateUri.ToString() == "Download")
-                {
-                    ((FlashResourcesViewModel)DataContext).SwitchToDownload();
-                }
-                else
-                {
-                    Process process = new();
-                    process.StartInfo.UseShellExecute = true;
-                    process.StartInfo.FileName = link.NavigateUri.AbsoluteUri;
-                    process.Start();
-                }
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for FlashResourcesView.xaml
+    /// </summary>
+    public partial class FlashResourcesView : UserControl
+    {
+        public FlashResourcesView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                if (link.NavigateUri.ToString() == "Flash")
+                {
+                    ((FlashResourcesViewModel)DataContext).SwitchToFlashRom();
+                }
+                else if (link.NavigateUri.ToString() == "Download")
+                {
+                    ((FlashResourcesViewModel)DataContext).SwitchToDownload();
+                }
+                else
+                {
+                    Process process = new();
+                    process.StartInfo.UseShellExecute = true;
+                    process.StartInfo.FileName = link.NavigateUri.AbsoluteUri;
+                    process.Start();
+                }
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/FlashRomView.xaml b/WPinternals/Views/FlashRomView.xaml
similarity index 98%
rename from Views/FlashRomView.xaml
rename to WPinternals/Views/FlashRomView.xaml
index 2a4054f..e5e22e4 100644
--- a/Views/FlashRomView.xaml
+++ b/WPinternals/Views/FlashRomView.xaml
@@ -1,194 +1,194 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.FlashRomView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
-    </UserControl.Resources>
-    <StackPanel VerticalAlignment="Center">
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Flash Custom ROM" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="A Custom ROM typically contains an unlocked EFIESP partition and an uninitialized MainOS partition and Data partition. If you have a phone with a Bootloader Spec B, you can flash the Custom ROM straight to the phone. If you have a phone with Bootloader Spec A, your bootloader needs to be "/>
-                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
-                            <Run Text=" before you can flash a Custom ROM or restore a backup. You don't need to have an Engineering bootloader to use this flash-method. A Custom ROM can be created based on a "/>
-                            <Hyperlink NavigateUri="Backup">backup</Hyperlink>
-                            <Run Text=" of a live phone, or you can "/>
-                            <Hyperlink NavigateUri="Dump">dump</Hyperlink>
-                            <Run Text=" these partitions from an original FFU file, which can then be customized. After a Custom ROM is flashed, all apps, data and settings are be removed from the phone! " />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="NOTE: " FontWeight="Bold"/>
-                            <Run Text=" Flashing a Custom ROM usually takes a lot of time, especially on phones with Bootloader Spec B! Be sure that the battery of your phone is properly charged before you start flashing a Custom ROM."/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="Custom ROM or backup image: " SelectionText="Select the source-file to flash to the phone..." Path="{Binding ArchivePath, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Flash mode and then the Custom ROM will be flashed." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="The phone is in Flash mode. You can continue to flash the Custom ROM." IsVisible="{Binding IsPhoneInFlashMode, Mode=OneWay}"/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
-                    <Button Command="{Binding Path=FlashArchiveCommand, Mode=OneWay}" Content="Flash custom ROM" Width="120" Height="Auto" Padding="0,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Flash original FFU" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="When you flash an original FFU, the phone will be restored to its original configuration. All unlocks, apps and data will be removed from the phone!"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="FFU: " SelectionText="Select the FFU-file to flash to the phone..." Path="{Binding FFUPath, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Flash mode and then the FFU image will be flashed." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="The phone is in Flash mode. You can continue to flash the FFU image." IsVisible="{Binding IsPhoneInFlashMode, Mode=OneWay}"/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
-                    <Button Command="{Binding Path=FlashFFUCommand, Mode=OneWay}" Content="Flash FFU image" Width="120" Height="Auto" Padding="0,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Flash separate partitions" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="To flash separate partitions, your bootloader needs to be "/>
-                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
-                            <Run Text=". You can flash an " />
-                            <Hyperlink NavigateUri="UnlockRoot">unlocked</Hyperlink>
-                            <Run Text=" EFIESP partition, which you typically need to do only once. Make sure you flash an EFIESP partition for exact model of the phone because this partition contains model-specific information. After that you can flash an " />
-                            <Hyperlink NavigateUri="UnlockRoot">unlocked</Hyperlink>
-                            <Run Text=" MainOS partition or custom ROM as often as you want. Remember that the MainOS partition and Data partition are tied together, so you need to flash both partitions together. When these partitions are flashed, all apps, data and settings are removed from the phone!" />
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="EFIESP: " SelectionText="Select the source-file to flash to the EFIESP partition..." Path="{Binding EFIESPPath, Mode=TwoWay}" AllowNull="True" DefaultFileName="EFIESP.bin" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="MainOS: " SelectionText="Select the source-file to flash to the MainOS partition..." Path="{Binding MainOSPath, Mode=TwoWay}" AllowNull="True" DefaultFileName="MainOS.bin" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="Data: " SelectionText="Select the source-file to flash to the Data partition..." Path="{Binding DataPath, Mode=TwoWay}" AllowNull="True" DefaultFileName="Data.bin" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Flash mode and then the selected partitions will be flashed." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="The phone is in Flash mode. You can continue to flash selected partitions." IsVisible="{Binding IsPhoneInFlashMode, Mode=OneWay}"/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
-                    <Button Command="{Binding Path=FlashPartitionsCommand, Mode=OneWay}" Content="Flash partitions" Width="120" Height="Auto" Padding="0,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,0">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Flash MMOS" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="To flash a MMOS image (secwim), your phone will be switched to FFULoader mode."/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="SecWim: " SelectionText="Select the source-file to flash to the MMOS image..." Path="{Binding MMOSPath, Mode=TwoWay}" AllowNull="True" DefaultFileName="MMOS.secwim" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Flash mode and then the selected MMOS image will be flashed." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="The phone is in Flash mode. You can continue to flash MMOS." IsVisible="{Binding IsPhoneInFlashMode, Mode=OneWay}"/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
-                    <Button Command="{Binding Path=FlashMMOSCommand, Mode=OneWay}" Content="Flash MMOS" Width="120" Height="Auto" Padding="0,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.FlashRomView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
+    </UserControl.Resources>
+    <StackPanel VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Flash Custom ROM" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="A Custom ROM typically contains an unlocked EFIESP partition and an uninitialized MainOS partition and Data partition. If you have a phone with a Bootloader Spec B, you can flash the Custom ROM straight to the phone. If you have a phone with Bootloader Spec A, your bootloader needs to be "/>
+                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
+                            <Run Text=" before you can flash a Custom ROM or restore a backup. You don't need to have an Engineering bootloader to use this flash-method. A Custom ROM can be created based on a "/>
+                            <Hyperlink NavigateUri="Backup">backup</Hyperlink>
+                            <Run Text=" of a live phone, or you can "/>
+                            <Hyperlink NavigateUri="Dump">dump</Hyperlink>
+                            <Run Text=" these partitions from an original FFU file, which can then be customized. After a Custom ROM is flashed, all apps, data and settings are be removed from the phone! " />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="NOTE: " FontWeight="Bold"/>
+                            <Run Text=" Flashing a Custom ROM usually takes a lot of time, especially on phones with Bootloader Spec B! Be sure that the battery of your phone is properly charged before you start flashing a Custom ROM."/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="Custom ROM or backup image: " SelectionText="Select the source-file to flash to the phone..." Path="{Binding ArchivePath, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Flash mode and then the Custom ROM will be flashed." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="The phone is in Flash mode. You can continue to flash the Custom ROM." IsVisible="{Binding IsPhoneInFlashMode, Mode=OneWay}"/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
+                    <Button Command="{Binding Path=FlashArchiveCommand, Mode=OneWay}" Content="Flash custom ROM" Width="120" Height="Auto" Padding="0,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Flash original FFU" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="When you flash an original FFU, the phone will be restored to its original configuration. All unlocks, apps and data will be removed from the phone!"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="FFU: " SelectionText="Select the FFU-file to flash to the phone..." Path="{Binding FFUPath, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Flash mode and then the FFU image will be flashed." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="The phone is in Flash mode. You can continue to flash the FFU image." IsVisible="{Binding IsPhoneInFlashMode, Mode=OneWay}"/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
+                    <Button Command="{Binding Path=FlashFFUCommand, Mode=OneWay}" Content="Flash FFU image" Width="120" Height="Auto" Padding="0,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Flash separate partitions" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="To flash separate partitions, your bootloader needs to be "/>
+                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
+                            <Run Text=". You can flash an " />
+                            <Hyperlink NavigateUri="UnlockRoot">unlocked</Hyperlink>
+                            <Run Text=" EFIESP partition, which you typically need to do only once. Make sure you flash an EFIESP partition for exact model of the phone because this partition contains model-specific information. After that you can flash an " />
+                            <Hyperlink NavigateUri="UnlockRoot">unlocked</Hyperlink>
+                            <Run Text=" MainOS partition or custom ROM as often as you want. Remember that the MainOS partition and Data partition are tied together, so you need to flash both partitions together. When these partitions are flashed, all apps, data and settings are removed from the phone!" />
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="EFIESP: " SelectionText="Select the source-file to flash to the EFIESP partition..." Path="{Binding EFIESPPath, Mode=TwoWay}" AllowNull="True" DefaultFileName="EFIESP.bin" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="MainOS: " SelectionText="Select the source-file to flash to the MainOS partition..." Path="{Binding MainOSPath, Mode=TwoWay}" AllowNull="True" DefaultFileName="MainOS.bin" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="Data: " SelectionText="Select the source-file to flash to the Data partition..." Path="{Binding DataPath, Mode=TwoWay}" AllowNull="True" DefaultFileName="Data.bin" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Flash mode and then the selected partitions will be flashed." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="The phone is in Flash mode. You can continue to flash selected partitions." IsVisible="{Binding IsPhoneInFlashMode, Mode=OneWay}"/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
+                    <Button Command="{Binding Path=FlashPartitionsCommand, Mode=OneWay}" Content="Flash partitions" Width="120" Height="Auto" Padding="0,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,0">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Flash MMOS" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="To flash a MMOS image (secwim), your phone will be switched to FFULoader mode."/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="SecWim: " SelectionText="Select the source-file to flash to the MMOS image..." Path="{Binding MMOSPath, Mode=TwoWay}" AllowNull="True" DefaultFileName="MMOS.secwim" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Flash mode and then the selected MMOS image will be flashed." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="The phone is in Flash mode. You can continue to flash MMOS." IsVisible="{Binding IsPhoneInFlashMode, Mode=OneWay}"/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
+                    <Button Command="{Binding Path=FlashMMOSCommand, Mode=OneWay}" Content="Flash MMOS" Width="120" Height="Auto" Padding="0,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/FlashRomView.xaml.cs b/WPinternals/Views/FlashRomView.xaml.cs
similarity index 97%
rename from Views/FlashRomView.xaml.cs
rename to WPinternals/Views/FlashRomView.xaml.cs
index 3ebfe7d..3d53412 100644
--- a/Views/FlashRomView.xaml.cs
+++ b/WPinternals/Views/FlashRomView.xaml.cs
@@ -1,70 +1,70 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for FlashRomView.xaml
-    /// </summary>
-    public partial class FlashRomView : UserControl
-    {
-        public FlashRomView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                if (link.NavigateUri.ToString() == "UnlockBoot")
-                {
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToUnlockBoot();
-                }
-                else if (link.NavigateUri.ToString() == "UnlockRoot")
-                {
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToUnlockRoot();
-                }
-                else if (link.NavigateUri.ToString() == "Dump")
-                {
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToDumpFFU();
-                }
-                else if (link.NavigateUri.ToString() == "Backup")
-                {
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToBackup();
-                }
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-
-        private void FilePicker_PathChanged(object sender, PathChangedEventArgs e)
-        {
-            ((LumiaFlashRomSourceSelectionViewModel)DataContext).EvaluateViewState();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for FlashRomView.xaml
+    /// </summary>
+    public partial class FlashRomView : UserControl
+    {
+        public FlashRomView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                if (link.NavigateUri.ToString() == "UnlockBoot")
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToUnlockBoot();
+                }
+                else if (link.NavigateUri.ToString() == "UnlockRoot")
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToUnlockRoot();
+                }
+                else if (link.NavigateUri.ToString() == "Dump")
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToDumpFFU();
+                }
+                else if (link.NavigateUri.ToString() == "Backup")
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToBackup();
+                }
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+
+        private void FilePicker_PathChanged(object sender, PathChangedEventArgs e)
+        {
+            ((LumiaFlashRomSourceSelectionViewModel)DataContext).EvaluateViewState();
+        }
+    }
+}
diff --git a/Views/GettingStartedView.xaml b/WPinternals/Views/GettingStartedView.xaml
similarity index 98%
rename from Views/GettingStartedView.xaml
rename to WPinternals/Views/GettingStartedView.xaml
index 1932af2..01e2a64 100644
--- a/Views/GettingStartedView.xaml
+++ b/WPinternals/Views/GettingStartedView.xaml
@@ -1,880 +1,880 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.GettingStartedView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <StackPanel>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto">
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                        <local:Paragraph>
-                            <Run Text="Getting started" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="This tool may cause irrevocable damage and/or data loss when applied to any target device. As such please ensure that you fully comprehend and accept the " />
-                            <Hyperlink NavigateUri="Disclaimer">Disclaimer and warnings</Hyperlink>
-                            <Run Text=" before proceeding any further." />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="If you appreciate the countless hours of hacking, research and development I put into creating this tool then consider " />
-                            <Hyperlink NavigateUri="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=VY8N7BCBT9CS4">buying me a beer</Hyperlink>
-                            <Run Text="." />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="This section explains some basic information about using this tool. I suggest you take a few minutes and read this section thoroughly to help avoid problems and surprises. However please remember that any damage caused to a device during the use of this tool is your responsibility solely." />
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-            </StackPanel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                        <local:Paragraph>
-                            <Run Text="Supported phones" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="Compatibility of this tool largely depends on the bootloader of the phone. The bootloaders of Lumia phones consist of different parts. Different bootphases are implemented by Qualcomm, Intel, Nokia and Microsoft. The earliest Windows Phone 8 based Lumia's are based on the Qualcomm Snapdragon S4 chipset. For reference I will call the bootloaders of these phones: " />
-                            <Run Text="&quot;Lumia Bootloader Spec A&quot;" FontStyle="Italic" />
-                            <Run Text=". Windows Phone Internals version 1 was written to target those Lumia's." />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="Later models are based on Qualcomm Snapdragon 200 - 800 series. Qualcomm refactored a significant part of their bootloader-code for these new chipsets. And at the same time Nokia also made significant changes to their parts of the bootloader. For reference I will call the bootloaders of these phones: " />
-                            <Run Text="&quot;Lumia Bootloader Spec B&quot;" FontStyle="Italic" />
-                            <Run Text=". So by introducing Lumia's based on the new Qualcomm chipsets all my earlier exploits were rendered useless. I had to find new exploits for defeating the new SecureBoot code, for flashing custom ROM's and for entering Mass Storage mode. Windows Phone Internals version 2 also targets Lumia phones with Bootloader Spec B now." />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="My old exploits have been proven to work on all Lumia's with Bootloader Spec A. My new exploits should be working on all Lumia's with Bootloader Spec B. I have tested a lot of models, but not all. So I cannot be sure yet that the new exploits work on all models. It is possible that some models have modified bootloaders which may not be compatible. When a phone turns out to be incompatible when trying to unlock it, it will end up in Flash mode, and it will not be able to boot the OS anymore. In this case it will always be possible to flash a stock ROM to get the phone booting again. Here is a list which shows what Bootloader Spec was used for different Lumia models. It also shows which OS versions are supported for enabling Root Access."/>
-                            <LineBreak />
-                            <LineBreak />
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <Border BorderThickness="1" BorderBrush="#FFD4D4D4" Background="#FFF8F8F8" HorizontalAlignment="Stretch" Margin="20,-10,20,0" Padding="0,20,0,20" >
-                    <TextBlock Margin="30,0,30,0">
-                        <Bold>Lumia models with Bootloader Spec A</Bold><LineBreak />
-                        <LineBreak />
-                        - Lumia 520, 521, 525, 526 <LineBreak />
-                        - Lumia 620, 625 <LineBreak />
-                        - Lumia 720 <LineBreak />
-                        - Lumia 820, 822 <LineBreak />
-                        - Lumia 920, 925, 928 <LineBreak />
-                        - Lumia 1020 <LineBreak />
-                        - Lumia 1320 <LineBreak />
-                        <LineBreak />
-                        <Bold>Lumia models with Bootloader Spec B</Bold><LineBreak />
-                        <LineBreak />
-                        - Lumia 1520 <LineBreak />
-                        - Lumia 430, 435 <LineBreak />
-                        - Lumia 530, 532, 535 <LineBreak />
-                        - Lumia 630, 635, 636, 638 <LineBreak />
-                        - Lumia 730, 735 <LineBreak />
-                        - Lumia 830 <LineBreak />
-                        - Lumia 929 (Icon), 930 <LineBreak />
-                        - Lumia 540 <LineBreak />
-                        - Lumia 640, 640 XL <LineBreak />
-                        - Lumia 550 <LineBreak />
-                        - Lumia 650 <LineBreak />
-                        - Lumia 950, 950 XL
-                    </TextBlock>
-                </Border>
-                <Border BorderThickness="1" BorderBrush="#FFD4D4D4" Background="#FFF8F8F8" HorizontalAlignment="Stretch" Margin="20,20,20,0" Padding="0,20,0,20" >
-                    <TextBlock Margin="30,0,30,0">
-                        <Bold>Supported OS versions for Root Access on models with Bootloader Spec A</Bold><LineBreak />
-                        <LineBreak />
-                        - 8.10.12393.890 <LineBreak />
-                        - 8.10.12397.895 <LineBreak />
-                        - 8.10.14219.341 <LineBreak />
-                        - 8.10.14226.359 <LineBreak />
-                        - 8.10.14234.375 <LineBreak />
-                        - 8.10.15116.125 <LineBreak />
-                        - 8.10.15148.160 <LineBreak />
-                        - 10.0.10512.1000 <LineBreak />
-                        - 10.0.10536.1004 <LineBreak />
-                        - 10.0.10549.4 <LineBreak />
-                        - 10.0.10581.0 <LineBreak />
-                        - 10.0.10586.11 <LineBreak />
-                        - 10.0.10586.36 <LineBreak />
-                        <LineBreak />
-                        <Bold>Supported OS versions for all Lumia's</Bold><LineBreak />
-                        <LineBreak />
-                        - 10.0.10586.107 <LineBreak />
-                        - 10.0.10586.318 <LineBreak />
-                        - 10.0.10586.494 <LineBreak />
-                        - 10.0.15063.0 <LineBreak />
-                        - 10.0.15063.297 <LineBreak />
-                        - 10.0.15254.1 <LineBreak />
-                        - 10.0.15254.12 <LineBreak />
-                        - 10.0.15254.16 (Insider build) <LineBreak />
-                        - 10.0.15254.124 <LineBreak />
-                        - 10.0.15254.158 (Insider and production builds) <LineBreak />
-                        - 10.0.15254.490 <LineBreak />
-                        - 10.0.15254.527 <LineBreak />
-                        - 10.0.15254.530 <LineBreak />
-                        - 10.0.15254.538 <LineBreak />
-                        - 10.0.15254.541 <LineBreak />
-                        - 10.0.15254.544 <LineBreak />
-                        - 10.0.15254.547 <LineBreak />
-                        - 10.0.15254.603
-                    </TextBlock>
-                    <!--
-                        - 10.0.10240.16384 <LineBreak />
-                    -->
-                </Border>
-            </StackPanel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="Required Third Party Downloads" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="There are a number of third party components which must be downloaded and in some cases installed before you can use this tool." />
-                    </local:Paragraph>
-                    <local:Paragraph>
-                        <Run Text="Lumia drivers" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="The majority of the Lumia drivers which are required by this tool are installed by the " />
-                        <Hyperlink NavigateUri="http://go.microsoft.com/fwlink/?LinkID=525569">Windows Device Recovery Tool</Hyperlink>
-                        <Run Text=". Please download and install this tool on the computer on which you will run this tool." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Qualcomm Emergency Download drivers" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="When the bootloader is being unlocked, the phone needs to be switched to Qualcomm Emergency Download mode." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="To enable communication with your phone whilst it is in this mode you must install one of the following drivers, both of which are supported by the tool."/>
-                    </local:Paragraph>
-                    <List MarkerStyle="Decimal">
-                        <ListItem>
-                            <local:Paragraph>
-                                <Run FontWeight="Bold" Text="Microsoft / Nokia Driver"/>
-                                <Run Text=" – This exposes the phone in emergency mode as a WinUSB device. This "/>
-                                <Hyperlink NavigateUri="https://www.google.com/search?q=%22emergencydownloaddriver.msi%22">google search</Hyperlink>
-                                <Run Text=" will help you locate the driver."/>
-                            </local:Paragraph>    
-                        </ListItem>
-                        <ListItem>
-                            <local:Paragraph>
-                                <Run FontWeight="Bold" Text="Qualcomm Driver"/>
-                                <Run Text=" – This exposes the phone as a serial device whilst in this emergency mode. This "/>
-                                <Hyperlink NavigateUri="https://www.google.com/search?q=%22qcser.inf%22">google search</Hyperlink>
-                                <Run Text=" will help you locate the driver."/>
-                            </local:Paragraph>
-                        </ListItem>
-                    </List>
-                    <local:Paragraph>
-                        <Run FontWeight="Bold" Text="WARNING: "/>
-                        <Run Text="I would strongly suggest to use the Microsoft / Nokia driver. Eventhough the Qualcomm driver is supported, I have seen some unexpected behavior when using this driver. If Windows Phone Internals freezes when the phone is switched to or through Emergency Mode, first make sure you have a driver installed for Emergency Mode. If the phone is exposed as serial COM port, then you should uninstall the driver and install the WinUSB driver from Microsoft." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="The downloaded driver may come as an msi package which can simply be run/installed. Alternatively if the driver package comes as an archive it will contain an INF file which can be installed with this command line:-" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="    PNPUtil.exe -i -a PATH_TO_YOUR_FILE.INF" FontFamily="Courier New" FontSize="12" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run FontWeight="Bold" Text="NOTE: "/>
-                        <Run Text="Whilst in emergency mode the phone will appear in device manager as having the device ID &quot;VID_05C6&amp;PID_9008&quot;." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="FFU file" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="The process of unlocking the bootloader depends on a ROM image for your target phone. Downloading such ROM images (FFU files) has become much easier with Windows Phone Internals version 2. Basically you just connect the phone, go to the " />
-                        <Hyperlink NavigateUri="Download">Download</Hyperlink>
-                        <Run Text=" page of this tool and download the ROM image."/>
-                        <LineBreak />
-                        <LineBreak />
-                        <Run FontWeight="Bold" Text="NOTE: " />
-                        <Run Text="If you are about to unlock a phone with Bootloader Spec B, then you also click the &quot;Download all&quot; button. This will download the FFU file and also the emergency programmer files. If the FFU file contains an OS version which is not supported by Windows Phone Internals SecureBoot Unlock version 2, the this will also automatically download an additional FFU file to extract the necessary files from it." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run FontWeight="Bold" Text="WARNING:"/>
-                        <Run Text=" There is a "/>
-                        <Hyperlink NavigateUri="http://forum.xda-developers.com/showthread.php?t=2096045">known bug</Hyperlink>
-                        <Run Text=" related to Samsung branded memory which is used in some Lumia phones. This bug can be triggered during flashing both with official and unofficial tools and during OS updates and will render the entire eMMC (flash memory) to become write protected." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="If this bug is trigged it " />
-                        <Run FontWeight="Bold" Text="is not"/>
-                        <Run Text=" caused by this tool (official tools also trigger it) but instead it is a fault caused by a combination of the Samsung eMMC bug and recent eMMC drivers." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="It is possible that tweakers may be able to modify drivers or restore an old driver to avoid this problem using the access provided by this tool." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Lumia Emergency Programmer" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="The tool requires an emergency programmer for the device that you are unlocking. There is a different programmer for every phone model. The emergency programmer can also be downloaded by using the " />
-                        <Hyperlink NavigateUri="Download">Download</Hyperlink>
-                        <Run Text=" page of this tool. In some cases the emergency files cannot be found this way and you will need to download the emergency files yourself. This " />
-                        <Hyperlink NavigateUri="https://www.google.com/search?q=%22Lumia 650 emergency files%22">google search</Hyperlink>
-                        <Run Text=" may yield some relevant results." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Engineering SBL3" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Engineering phones can be switched to Mass Storage Mode. When in this mode the phone acts as if it is removable hard drive allowing full access to the flash memory. This mode is not implemented in retail ROM images. For phones with Bootloader Spec B this is not a problem, because Windows Phone Internals is able to locate all necessary resources to unlock Mass Storage Mode on these phone. If you want to unlock Mass Storage Mode on a phone with Bootloader Spec A, then you need to select an image from an engineering phone which contains an SBL3 partition." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="This tool will try to extract the SBL3 partition from either an FFU file or a raw image. This " />
-                        <Hyperlink NavigateUri="https://www.google.com/search?q=%22Lumia%22+%22Engineering%22+%22FFU%22">google search</Hyperlink>
-                        <Run Text=" may yield some relevant results. But remember to verify the OEM and CPU from the image you download. The engineering SBL3 must come from a phone or image that is from the same OEM and has the same CPU as your target device. " />
-                        <Run FontWeight="Bold" Text="Flashing the wrong SBL3 may permanently damage your phone."/>
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="If you are unable to obtain an engineering image, you must first dump your phones ROM image, then apply the desired changes to this image and finally flash the modified image back onto your device." />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="Unlocking the bootloader" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="SecureBoot is a chain of integrity checks which prevents any modifications to system-files that has the following phases." />
-                        <LineBreak />
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Text="Bootloader" Margin="30,0,0,0"/>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Text="Operating System Loader" Margin="30,0,0,0"/>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Text="Operating System Runtime" Margin="30,0,0,0"/>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <LineBreak />
-                        <Hyperlink NavigateUri="UnlockBoot">Unlocking the bootloader</Hyperlink>
-                        <Run Text=" will disable the integrity checks in bootloader (e.g. the first stage of SecureBoot). This is a mandatory requirement that enables changes to the subsequent stages of the secure boot chain. Therefore you must unlock the bootloader before you enable Root Access." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="As for flashing Custom ROM's there is a difference in the approach for Bootloaders Spec A and Bootloaders Spec B. The &quot;Custom flash&quot; exploit, which is used for the phones with Bootloader Spec B, works even on phones which did not unlock the bootloader yet. So you can start flashing a Custom ROM straight away. But the first time you will use the Custom flash on such phone, it will need to find a Flashing Profile first. It will be done automatically. During this phase the phone may reboot quite a few times. Although it may look as if the phone is in a reboot-loop, you should not interfere with the process. This reboot-loop will end after Windows Phone Internals was able to find a working Flashing Profile." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run FontWeight="Bold" Text="NOTE: "/>
-                        <Run Text="Unlocking the bootloader of the phone requires a certain version of UEFI on your phone. This tool will verify this version. If it is not possible to perform the Flash-operation you will be notified and you will need to run Windows Updates on your phone or flash a newer ROM to your phone before you can proceed." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run FontWeight="Bold" Text="NOTE: "/>
-                        <Run Text="The unlock sequence for Lumia's with bootloader spec B depends on a certain &quot;Boot order&quot;. Right after a Full Flash or right after you relocked a phone, this boot order is different. When you flash an FFU, you can interrupt the boot immediately, before it has completed its first boot. If you would then try to unlock the bootloader, this will fail halfway. This problem will be detected and the changes will be rolled back. A simple reboot will solve the problem; the boot order is restored. After that you can start the unlock sequence again." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Mass Storage Mode" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="This mode allows direct access to the eMMC (flash memory) of the phone at sector and file levels. This means it is possible to directly patch system-files. Once in mass storage mode the phone will appear as a removable hard drive in Windows." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Be very careful with this feature as it can cause irreparable damage to your phone. In particular be aware of the following:-" />
-                        <LineBreak />
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" Text="Never use a Virus Scanner on the phone as they may inadvertently corrupt system boot data."/>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" Text="Never use disk repair tools for the same reason."/>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
-                                <TextBlock.Inlines>
-                                    <Run Text="If Windows prompts you to format a partition when your phone is in Mass Storage Mode it is essentially that your ignore these messages. "/>
-                                    <Run FontWeight="Bold" Text="Formatting a phone partition may permanently damage the device."/>
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
-                                <TextBlock.Inlines>
-                                    <Run Text="Never modify the security-settings (ACL) of a file or registry-key."/>
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="You will notice that some files or folders cannot be accessed due to its security-settings. Do not alter the security-settings to get access to these files! Instead run a file-browser under the SYSTEM account to access these files and folders. Download and install " />
-                        <Hyperlink NavigateUri="https://technet.microsoft.com/en-us/sysinternals/bb896649.aspx">Sysinternals PsTools</Hyperlink>
-                        <Run Text=" and a " />
-                        <Hyperlink NavigateUri="https://www.google.nl/?#&amp;q=freeware+file+manager">3rd party file manager</Hyperlink>
-                        <Run Text=". Then launch the file manager like this:-" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="    &quot;C:\Program Files\PsTools\PsExec.exe&quot; -d -s -i &quot;&lt;PATH TO FILE MANAGER&gt;&quot;" FontFamily="Courier New" FontSize="12" />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="Root Access" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Hyperlink NavigateUri="UnlockRoot">Root Access</Hyperlink>
-                        <Run Text=" is a set of hacks that unleashes the power of your Windows Phone:" />
-                        <LineBreak />
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
-                                <TextBlock.Inlines>
-                                    <Run Text="Disable SecureBoot at OS loader and at OS runtime level"/>
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
-                                <TextBlock.Inlines>
-                                    <Run Text="Disable all ACL, Capability and Privileges checks"/>
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
-                                <TextBlock.Inlines>
-                                    <Run Text="Allow threads to escape from sandbox security"/>
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
-                                <TextBlock.Inlines>
-                                    <Run Text="Allow .NET Console executables"/>
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
-                                <TextBlock.Inlines>
-                                    <Run Text="Jailbreak (side-load homebrew apps, only for WP 8.0 and 8.1 as Windows 10 Mobile already allows side-loading through &quot;developer mode&quot;)"/>
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="When all ACL, Capability and Privileges checks are disabled, it means that you have access to all system resources, which effectively means you have Root Access. Apps will still run in a &quot;Low Box&quot;, because the Low Box security token contains information that is necessary for app to be able to communicate with the system. Some API's deny access to threads that run with a Low Box token. Root Access disables the account logon checks, which allows an app to logon an account and create a thread with non-Lowboxed security token. This thread will also have access to these forbidden API's." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Root Access also implements Windows Phone Jailbreak, which lets you install Homebrew apps on your phone." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Root Access can be applied directly on the phone through Mass Storage Mode or it can be applied to a mounted ROM image." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Root Access must be implemented differently for every version of the Windows Phone Operating System. This tool aims to support the most popular versions of the OS. The Patch Engine is very flexible. Future versions will add support for additional versions of the Windows Phone Operating System." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Root Access allows a high degree of tweaking on your phone. But be aware that it also makes your phone vulnerable to badly written software and malware! If you unlocked Mass Storage mode, then this tool will allow you to enable or disable Root Access directly on your phone. To be safe, you can enable Root Access, then make necessary changes and tweaks to your phone and then disable Root Access afterwards." />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="Custom ROM's" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="At present there is very little tooling around custom ROM's for Windows Phone 8+. This tool implements a basic set of tools that provide the necessary building blocks to enable experimentation with custom ROMs in a convenient manner." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="The eMMC of the phone basically consists of four partition types:" />
-                        <LineBreak />
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run FontStyle="Italic" Text="Boot Partitions" />
-                                    <Run Text="– There are a bunch of boot partitions. This tool manages these on your behalf." />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run FontStyle="Italic" Text="The EFIESP partition" />
-                                    <Run Text="– The OS Loader and model-specific configuration." />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run FontStyle="Italic" Text="The MainOS partition" />
-                                    <Run Text="– The majority of the operating system, model-specific drivers and configuration data." />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run FontStyle="Italic" Text="The Data partition" />
-                                    <Run Text="– Applications and user data." />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="A custom ROM image contains copies of the EFIESP, MainOS and Data-partitions. To create an image you must first "/>
-                        <Hyperlink NavigateUri="Dump">dump</Hyperlink>
-                        <Run Text=" these partitions. Then use " />
-                        <Hyperlink NavigateUri="http://www.osforensics.com/tools/mount-disk-images.html">OSFMount</Hyperlink>
-                        <Run Text=" to mount these partitions and "/>
-                        <Hyperlink NavigateUri="UnlockRoot">Root Access</Hyperlink>
-                        <Run Text=" can be applied on the mounted partitions. When you apply Root Access, the EFIESP and MainOS partitions will be modified. After that you can further customize the partitions." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="When you are ready dismount the partitions and compress these partitions into a Zip-archive. This Zip-archive is effectively your custom ROM image." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="The " />
-                        <Hyperlink NavigateUri="Flash">flash-function</Hyperlink>
-                        <Run Text=" allows you to select the Zip-archive and flash the complete contents to the phone at once. It is also possible to flash separate partitions." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="The partition images are usually very large files. Especially the Data-partition. It can be many Gigabytes in size, depending on the phone-model. Handling such large files can be painful. Therefore it is possible to compress a partition when it is dumped." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="If you add the compressed partition to the custom ROM Zip-image the flash-function is able to use it properly. Compressed partitions cannot be mounted so you may not wish to compress the EFIESP and MainOS-partitions. The sizes of the partitions can be different on different versions of the OS. The partition-table of the phone will automatically be realigned if necessary." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Be aware that the Windows Phone system binaries are protected by copyright! Only create custom ROM's for gaining a more comprehensive understanding of your target device and for your own personal use." />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="Updating your phone" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="If you want to update your phone, you should first disable Root Access and Relock the bootloader. After that you can safely update your phone. But be aware that the phone may get updated to a version, which is not supported by Windows Phone Internals. In that case you won't be able to unlock the phone after the update." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run FontWeight="Bold" Text="WARNING: "/>
-                        <Run Text="When you are running Windows Phone 8 or Windows Phone 8.1, the phone can still start the update process when the phone is unlocked. But that may damage your phone! On Windows 10 Mobile update process will first do an integrity check. When the phone it unlocked, the update process will not start. After relocking the phone, you can update it again." />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="Backup" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="If you unlocked Mass Storage mode, this allows you to make a "/>
-                        <Hyperlink NavigateUri="Backup">backup</Hyperlink>
-                        <Run Text=" of the phone. You can backup either single partitions or all partitions straight into one single Zip-image. This Zip-image can be used as if it were a custom ROM and you can use the "/>
-                        <Hyperlink NavigateUri="Flash">flash-function</Hyperlink>
-                        <Run Text=" to restore this backup to the phone." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="It is important to realize that the MainOS and Data partitions are tied together. Even though the Data partition contains most user data and installed apps, the MainOS partition contains the registry hives and other configuration data.  This means that system backup and restore must contain the contents of both partitions." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Be aware that all stages of SecureBoot must be disabled at all times to be able to boot a custom ROM. Therefore the Backup-function also makes a backup of the EFIESP partition." />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="Build and capture" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="A custom ROM can be built on a live phone and then captured to a ROM image. The phone needs to have unlocked Mass Storage mode. After you applied all changes to the phone, you should Hard Reset the phone and create a backup of the reinitialized phone at the moment it is about to perform a clean boot for the first time. When you create a backup of the phone in this state, the user will have to perform the cold-boot procedure, just as if a stock ROM was flashed to the phone." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run FontWeight="Bold" Text="Performing a Hard Reset on a phone will remove all user data including pictures, music, call history, messages and saved games."/>
-                        <LineBreak />
-                        <LineBreak />
-                        <Run FontWeight="Bold" Text="NOTE: " />
-                        <Run Text="Most changes to the file-system on the C: drive of the phone will survive a Hard Reset. If a bootloader was unlocked and Root Access was enabled, the phone will still be unlocked after a Hard Reset. However, the registry-hives are restored on Hard Reset. If you want to modify the registry permanently, you have to edit the registry-hives in this location:-" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="    \Windows\system32\config\REGBACK\" FontFamily="Courier New" FontSize="12" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="After a Hard Reset the backup-image of the phone may still contain dirty sectors, which can possibly even contain private data. Therefore it is best practice to clean unused sectors. You can download and install " />
-                        <Hyperlink NavigateUri="https://technet.microsoft.com/en-us/sysinternals/bb897443.aspx">Sysinternals SDelete</Hyperlink>
-                        <Run Text=" to clean up the images." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Follow these steps for a complete Build and Capture:-" />
-                        <LineBreak />
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="Make sure the phone is fully charged" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="Disconnect the phone from the PC" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="Power down the phone" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="Press and hold Volume-Down-button and then shortly press the Power-button while still keeping the Volume-Down-button pressed until you see an exclamation-mark" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="Press in this order: Volume Up, Volume Down, Power and Volume Down" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="The phone will reboot and show spinning gears" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="When the phone is showing gears choose the Backup menu-item in this tool and then connect the phone to the PC" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="After a while the phone will reboot and this tool will force the phone into Flash mode" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="Choose to make a backup of separate partitions and select target-locations for the EFIESP, MainOS and Data-partition binaries" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="True">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="Use " />
-                                    <Hyperlink NavigateUri="http://www.osforensics.com/tools/mount-disk-images.html">OSFMount</Hyperlink>
-                                    <Run Text=" to mount all three partitions in Read / Write mode" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="Assuming the partitions are mounted as drives D: E: and F: execute these commandlines: " />
-                                    <LineBreak />
-                                    <LineBreak />
-                                    <Run Text="    sdelete -z D:" FontFamily="Courier New" FontSize="12" />
-                                    <LineBreak />
-                                    <Run Text="    sdelete -z E:" FontFamily="Courier New" FontSize="12" />
-                                    <LineBreak />
-                                    <Run Text="    sdelete -z F:" FontFamily="Courier New" FontSize="12" />
-                                    <LineBreak />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="Unmount the partitions" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="Create a ZIP-archive containing the three partitions" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="Windows 10 Mobile" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="If your phone is not officially supported to run Windows 10 Mobile, then you can follow "/>
-                        <Hyperlink NavigateUri="https://forum.xda-developers.com/windows-10-mobile/guide-win10-mobile-offline-update-t3527340">these steps</Hyperlink>
-                        <Run Text=" to update your phone. Keep in mind that Windows 10 Mobile may have performance issues when running on unsupported phones."/>
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Security Lock" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Windows 10 Mobile has a new security feature, which is called Security Lock. This feature is part of the NGC module (Next Generation Credentials), also known as Windows Hello. This module is responsible for storing credentials, like the Device Pincode, in a secure place. When the Device Pincode is enabled, it creates a container to store the pincode, using encryption and some system-variables (hash-codes of system-files)." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="When system-files are modified, the hash-codes don't match the variables on the secure container anymore, and it will not be possible to decrypt the pincode for two hours and it will not be possible to unlock the phone during this time. The phone will show this warning: -" />
-                    </local:Paragraph>
-                    <local:Paragraph Margin="30,0,0,0">
-                        <Run FontStyle="Italic" Text="&quot;This device has been locked for security reasons. Connect your device to a power source for at least two hours, and then try again.&quot;" />
-                    </local:Paragraph>
-                    <local:Paragraph>
-                        <Run Text="Security Lock can be triggered when you previously had a pincode enabled and then disabled it later on. Disabling the pincode does not clean-up the security container. If you then Enable Root Access, the variables with hash-codes of system-files will change. As soon as you enable the pincode again, you will get the Security Lock warning. In this situation you have three options:"/>
-                        <LineBreak/>
-                        <LineBreak/>
-                        <BulletDecorator IsHitTestVisible="True">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Hyperlink NavigateUri="https://support.microsoft.com/en-us/help/4028741/windows-unlock-your-windows-10-phone-remotely">Remote unlock</Hyperlink>
-                                    <Run Text=" your phone"/>
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="Charge your phone and reboot after two hours" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                        <LineBreak />
-                        <BulletDecorator IsHitTestVisible="False">
-                            <BulletDecorator.Bullet>
-                                <TextBlock Text="-" Margin="20,0,10,0"/>
-                            </BulletDecorator.Bullet>
-                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
-                                <TextBlock.Inlines>
-                                    <Run Text="Or you can prevent this situation by performing a Hard Reset on the phone after having Root Access enabled. This will remove all user data including pictures, music, call history, messages and saved games!" />
-                                </TextBlock.Inlines>
-                            </TextBlock>
-                        </BulletDecorator>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="Known limitations" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="The problems stated in this section should be fixed in later versions of Windows Phone Internals. But it needs more time to implement the solutions." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Can't unlock ROM image for Lumia's with Bootloader Spec B" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Due to the complexity of SecureBoot Hack v2, unlocking mounted ROM images is only possible for Lumia's with Bootloader Spec A. For Lumia's with bootloader Spec B you can create Custom ROM's with Root Access using the &quot;Build and capture&quot; technique, as described on the Getting started page." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="SecureBoot unlock v2 may occasionally fail" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="On occasional the Mass Storage drivers on the PC can misbehave. In this case, the phone will be in mass storage mode, but the PC does not recognize it. This could affect the unlock process. Windows Phone Internals now has a detection-method for this behavior, but that only works on Windows 8.1 and Windows 10. So for the most stable unlock-experience, you should avoid Windows 7 or older." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Sector-boundaries for custom flashing partitions" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Lumia's with Bootloader Spec B can only flash partitions on a 0x100 sector-boundary (or 0x20000 bytes-boundary). Your partition-layout should comply to this rule. When Windows Phone Internals calculates a new partition layout for a Custom ROM, the layout will automatically comply to this rule." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="SecureBoot Unlock v2 may fail altogether" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Some phones, namely the Lumia 535 models, may experience problems during the unlock process. The first part of the unlock succeeds, but when the phone is being switched to Mass Storage Mode, it is not able to find a working Flashing Profile anymore. This issue is under investigation." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Windows Phone Internals often tries to find a flashing profile" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="When you try to unlock or relock a phone with a non-supported OS version, then you will need to provide a donor-FFU with a supported OS-version. When unlocking or relocking the phone, modifications will be made to the phone, which may also cause the existing flashing-profile to become invalid. In this case Windown Phone Internals may need to search for a new flashing profile during any unlock- or relock-attempt." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Support for single phone" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Windows Phone Internals supports only one single connected phone at a time. When multiple phones are connected, Windows Phone Internals can start showing unexpected and unstable behaviour." />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.GettingStartedView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <StackPanel>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto">
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                        <local:Paragraph>
+                            <Run Text="Getting started" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="This tool may cause irrevocable damage and/or data loss when applied to any target device. As such please ensure that you fully comprehend and accept the " />
+                            <Hyperlink NavigateUri="Disclaimer">Disclaimer and warnings</Hyperlink>
+                            <Run Text=" before proceeding any further." />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="If you appreciate the countless hours of hacking, research and development I put into creating this tool then consider " />
+                            <Hyperlink NavigateUri="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=VY8N7BCBT9CS4">buying me a beer</Hyperlink>
+                            <Run Text="." />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="This section explains some basic information about using this tool. I suggest you take a few minutes and read this section thoroughly to help avoid problems and surprises. However please remember that any damage caused to a device during the use of this tool is your responsibility solely." />
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                        <local:Paragraph>
+                            <Run Text="Supported phones" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="Compatibility of this tool largely depends on the bootloader of the phone. The bootloaders of Lumia phones consist of different parts. Different bootphases are implemented by Qualcomm, Intel, Nokia and Microsoft. The earliest Windows Phone 8 based Lumia's are based on the Qualcomm Snapdragon S4 chipset. For reference I will call the bootloaders of these phones: " />
+                            <Run Text="&quot;Lumia Bootloader Spec A&quot;" FontStyle="Italic" />
+                            <Run Text=". Windows Phone Internals version 1 was written to target those Lumia's." />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="Later models are based on Qualcomm Snapdragon 200 - 800 series. Qualcomm refactored a significant part of their bootloader-code for these new chipsets. And at the same time Nokia also made significant changes to their parts of the bootloader. For reference I will call the bootloaders of these phones: " />
+                            <Run Text="&quot;Lumia Bootloader Spec B&quot;" FontStyle="Italic" />
+                            <Run Text=". So by introducing Lumia's based on the new Qualcomm chipsets all my earlier exploits were rendered useless. I had to find new exploits for defeating the new SecureBoot code, for flashing custom ROM's and for entering Mass Storage mode. Windows Phone Internals version 2 also targets Lumia phones with Bootloader Spec B now." />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="My old exploits have been proven to work on all Lumia's with Bootloader Spec A. My new exploits should be working on all Lumia's with Bootloader Spec B. I have tested a lot of models, but not all. So I cannot be sure yet that the new exploits work on all models. It is possible that some models have modified bootloaders which may not be compatible. When a phone turns out to be incompatible when trying to unlock it, it will end up in Flash mode, and it will not be able to boot the OS anymore. In this case it will always be possible to flash a stock ROM to get the phone booting again. Here is a list which shows what Bootloader Spec was used for different Lumia models. It also shows which OS versions are supported for enabling Root Access."/>
+                            <LineBreak />
+                            <LineBreak />
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <Border BorderThickness="1" BorderBrush="#FFD4D4D4" Background="#FFF8F8F8" HorizontalAlignment="Stretch" Margin="20,-10,20,0" Padding="0,20,0,20" >
+                    <TextBlock Margin="30,0,30,0">
+                        <Bold>Lumia models with Bootloader Spec A</Bold><LineBreak />
+                        <LineBreak />
+                        - Lumia 520, 521, 525, 526 <LineBreak />
+                        - Lumia 620, 625 <LineBreak />
+                        - Lumia 720 <LineBreak />
+                        - Lumia 820, 822 <LineBreak />
+                        - Lumia 920, 925, 928 <LineBreak />
+                        - Lumia 1020 <LineBreak />
+                        - Lumia 1320 <LineBreak />
+                        <LineBreak />
+                        <Bold>Lumia models with Bootloader Spec B</Bold><LineBreak />
+                        <LineBreak />
+                        - Lumia 1520 <LineBreak />
+                        - Lumia 430, 435 <LineBreak />
+                        - Lumia 530, 532, 535 <LineBreak />
+                        - Lumia 630, 635, 636, 638 <LineBreak />
+                        - Lumia 730, 735 <LineBreak />
+                        - Lumia 830 <LineBreak />
+                        - Lumia 929 (Icon), 930 <LineBreak />
+                        - Lumia 540 <LineBreak />
+                        - Lumia 640, 640 XL <LineBreak />
+                        - Lumia 550 <LineBreak />
+                        - Lumia 650 <LineBreak />
+                        - Lumia 950, 950 XL
+                    </TextBlock>
+                </Border>
+                <Border BorderThickness="1" BorderBrush="#FFD4D4D4" Background="#FFF8F8F8" HorizontalAlignment="Stretch" Margin="20,20,20,0" Padding="0,20,0,20" >
+                    <TextBlock Margin="30,0,30,0">
+                        <Bold>Supported OS versions for Root Access on models with Bootloader Spec A</Bold><LineBreak />
+                        <LineBreak />
+                        - 8.10.12393.890 <LineBreak />
+                        - 8.10.12397.895 <LineBreak />
+                        - 8.10.14219.341 <LineBreak />
+                        - 8.10.14226.359 <LineBreak />
+                        - 8.10.14234.375 <LineBreak />
+                        - 8.10.15116.125 <LineBreak />
+                        - 8.10.15148.160 <LineBreak />
+                        - 10.0.10512.1000 <LineBreak />
+                        - 10.0.10536.1004 <LineBreak />
+                        - 10.0.10549.4 <LineBreak />
+                        - 10.0.10581.0 <LineBreak />
+                        - 10.0.10586.11 <LineBreak />
+                        - 10.0.10586.36 <LineBreak />
+                        <LineBreak />
+                        <Bold>Supported OS versions for all Lumia's</Bold><LineBreak />
+                        <LineBreak />
+                        - 10.0.10586.107 <LineBreak />
+                        - 10.0.10586.318 <LineBreak />
+                        - 10.0.10586.494 <LineBreak />
+                        - 10.0.15063.0 <LineBreak />
+                        - 10.0.15063.297 <LineBreak />
+                        - 10.0.15254.1 <LineBreak />
+                        - 10.0.15254.12 <LineBreak />
+                        - 10.0.15254.16 (Insider build) <LineBreak />
+                        - 10.0.15254.124 <LineBreak />
+                        - 10.0.15254.158 (Insider and production builds) <LineBreak />
+                        - 10.0.15254.490 <LineBreak />
+                        - 10.0.15254.527 <LineBreak />
+                        - 10.0.15254.530 <LineBreak />
+                        - 10.0.15254.538 <LineBreak />
+                        - 10.0.15254.541 <LineBreak />
+                        - 10.0.15254.544 <LineBreak />
+                        - 10.0.15254.547 <LineBreak />
+                        - 10.0.15254.603
+                    </TextBlock>
+                    <!--
+                        - 10.0.10240.16384 <LineBreak />
+                    -->
+                </Border>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="Required Third Party Downloads" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="There are a number of third party components which must be downloaded and in some cases installed before you can use this tool." />
+                    </local:Paragraph>
+                    <local:Paragraph>
+                        <Run Text="Lumia drivers" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="The majority of the Lumia drivers which are required by this tool are installed by the " />
+                        <Hyperlink NavigateUri="http://go.microsoft.com/fwlink/?LinkID=525569">Windows Device Recovery Tool</Hyperlink>
+                        <Run Text=". Please download and install this tool on the computer on which you will run this tool." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Qualcomm Emergency Download drivers" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="When the bootloader is being unlocked, the phone needs to be switched to Qualcomm Emergency Download mode." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="To enable communication with your phone whilst it is in this mode you must install one of the following drivers, both of which are supported by the tool."/>
+                    </local:Paragraph>
+                    <List MarkerStyle="Decimal">
+                        <ListItem>
+                            <local:Paragraph>
+                                <Run FontWeight="Bold" Text="Microsoft / Nokia Driver"/>
+                                <Run Text=" – This exposes the phone in emergency mode as a WinUSB device. This "/>
+                                <Hyperlink NavigateUri="https://www.google.com/search?q=%22emergencydownloaddriver.msi%22">google search</Hyperlink>
+                                <Run Text=" will help you locate the driver."/>
+                            </local:Paragraph>    
+                        </ListItem>
+                        <ListItem>
+                            <local:Paragraph>
+                                <Run FontWeight="Bold" Text="Qualcomm Driver"/>
+                                <Run Text=" – This exposes the phone as a serial device whilst in this emergency mode. This "/>
+                                <Hyperlink NavigateUri="https://www.google.com/search?q=%22qcser.inf%22">google search</Hyperlink>
+                                <Run Text=" will help you locate the driver."/>
+                            </local:Paragraph>
+                        </ListItem>
+                    </List>
+                    <local:Paragraph>
+                        <Run FontWeight="Bold" Text="WARNING: "/>
+                        <Run Text="I would strongly suggest to use the Microsoft / Nokia driver. Eventhough the Qualcomm driver is supported, I have seen some unexpected behavior when using this driver. If Windows Phone Internals freezes when the phone is switched to or through Emergency Mode, first make sure you have a driver installed for Emergency Mode. If the phone is exposed as serial COM port, then you should uninstall the driver and install the WinUSB driver from Microsoft." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="The downloaded driver may come as an msi package which can simply be run/installed. Alternatively if the driver package comes as an archive it will contain an INF file which can be installed with this command line:-" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="    PNPUtil.exe -i -a PATH_TO_YOUR_FILE.INF" FontFamily="Courier New" FontSize="12" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run FontWeight="Bold" Text="NOTE: "/>
+                        <Run Text="Whilst in emergency mode the phone will appear in device manager as having the device ID &quot;VID_05C6&amp;PID_9008&quot;." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="FFU file" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="The process of unlocking the bootloader depends on a ROM image for your target phone. Downloading such ROM images (FFU files) has become much easier with Windows Phone Internals version 2. Basically you just connect the phone, go to the " />
+                        <Hyperlink NavigateUri="Download">Download</Hyperlink>
+                        <Run Text=" page of this tool and download the ROM image."/>
+                        <LineBreak />
+                        <LineBreak />
+                        <Run FontWeight="Bold" Text="NOTE: " />
+                        <Run Text="If you are about to unlock a phone with Bootloader Spec B, then you also click the &quot;Download all&quot; button. This will download the FFU file and also the emergency programmer files. If the FFU file contains an OS version which is not supported by Windows Phone Internals SecureBoot Unlock version 2, the this will also automatically download an additional FFU file to extract the necessary files from it." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run FontWeight="Bold" Text="WARNING:"/>
+                        <Run Text=" There is a "/>
+                        <Hyperlink NavigateUri="http://forum.xda-developers.com/showthread.php?t=2096045">known bug</Hyperlink>
+                        <Run Text=" related to Samsung branded memory which is used in some Lumia phones. This bug can be triggered during flashing both with official and unofficial tools and during OS updates and will render the entire eMMC (flash memory) to become write protected." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="If this bug is trigged it " />
+                        <Run FontWeight="Bold" Text="is not"/>
+                        <Run Text=" caused by this tool (official tools also trigger it) but instead it is a fault caused by a combination of the Samsung eMMC bug and recent eMMC drivers." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="It is possible that tweakers may be able to modify drivers or restore an old driver to avoid this problem using the access provided by this tool." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Lumia Emergency Programmer" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="The tool requires an emergency programmer for the device that you are unlocking. There is a different programmer for every phone model. The emergency programmer can also be downloaded by using the " />
+                        <Hyperlink NavigateUri="Download">Download</Hyperlink>
+                        <Run Text=" page of this tool. In some cases the emergency files cannot be found this way and you will need to download the emergency files yourself. This " />
+                        <Hyperlink NavigateUri="https://www.google.com/search?q=%22Lumia 650 emergency files%22">google search</Hyperlink>
+                        <Run Text=" may yield some relevant results." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Engineering SBL3" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Engineering phones can be switched to Mass Storage Mode. When in this mode the phone acts as if it is removable hard drive allowing full access to the flash memory. This mode is not implemented in retail ROM images. For phones with Bootloader Spec B this is not a problem, because Windows Phone Internals is able to locate all necessary resources to unlock Mass Storage Mode on these phone. If you want to unlock Mass Storage Mode on a phone with Bootloader Spec A, then you need to select an image from an engineering phone which contains an SBL3 partition." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="This tool will try to extract the SBL3 partition from either an FFU file or a raw image. This " />
+                        <Hyperlink NavigateUri="https://www.google.com/search?q=%22Lumia%22+%22Engineering%22+%22FFU%22">google search</Hyperlink>
+                        <Run Text=" may yield some relevant results. But remember to verify the OEM and CPU from the image you download. The engineering SBL3 must come from a phone or image that is from the same OEM and has the same CPU as your target device. " />
+                        <Run FontWeight="Bold" Text="Flashing the wrong SBL3 may permanently damage your phone."/>
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="If you are unable to obtain an engineering image, you must first dump your phones ROM image, then apply the desired changes to this image and finally flash the modified image back onto your device." />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="Unlocking the bootloader" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="SecureBoot is a chain of integrity checks which prevents any modifications to system-files that has the following phases." />
+                        <LineBreak />
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Text="Bootloader" Margin="30,0,0,0"/>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Text="Operating System Loader" Margin="30,0,0,0"/>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Text="Operating System Runtime" Margin="30,0,0,0"/>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <LineBreak />
+                        <Hyperlink NavigateUri="UnlockBoot">Unlocking the bootloader</Hyperlink>
+                        <Run Text=" will disable the integrity checks in bootloader (e.g. the first stage of SecureBoot). This is a mandatory requirement that enables changes to the subsequent stages of the secure boot chain. Therefore you must unlock the bootloader before you enable Root Access." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="As for flashing Custom ROM's there is a difference in the approach for Bootloaders Spec A and Bootloaders Spec B. The &quot;Custom flash&quot; exploit, which is used for the phones with Bootloader Spec B, works even on phones which did not unlock the bootloader yet. So you can start flashing a Custom ROM straight away. But the first time you will use the Custom flash on such phone, it will need to find a Flashing Profile first. It will be done automatically. During this phase the phone may reboot quite a few times. Although it may look as if the phone is in a reboot-loop, you should not interfere with the process. This reboot-loop will end after Windows Phone Internals was able to find a working Flashing Profile." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run FontWeight="Bold" Text="NOTE: "/>
+                        <Run Text="Unlocking the bootloader of the phone requires a certain version of UEFI on your phone. This tool will verify this version. If it is not possible to perform the Flash-operation you will be notified and you will need to run Windows Updates on your phone or flash a newer ROM to your phone before you can proceed." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run FontWeight="Bold" Text="NOTE: "/>
+                        <Run Text="The unlock sequence for Lumia's with bootloader spec B depends on a certain &quot;Boot order&quot;. Right after a Full Flash or right after you relocked a phone, this boot order is different. When you flash an FFU, you can interrupt the boot immediately, before it has completed its first boot. If you would then try to unlock the bootloader, this will fail halfway. This problem will be detected and the changes will be rolled back. A simple reboot will solve the problem; the boot order is restored. After that you can start the unlock sequence again." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Mass Storage Mode" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="This mode allows direct access to the eMMC (flash memory) of the phone at sector and file levels. This means it is possible to directly patch system-files. Once in mass storage mode the phone will appear as a removable hard drive in Windows." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Be very careful with this feature as it can cause irreparable damage to your phone. In particular be aware of the following:-" />
+                        <LineBreak />
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" Text="Never use a Virus Scanner on the phone as they may inadvertently corrupt system boot data."/>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" Text="Never use disk repair tools for the same reason."/>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
+                                <TextBlock.Inlines>
+                                    <Run Text="If Windows prompts you to format a partition when your phone is in Mass Storage Mode it is essentially that your ignore these messages. "/>
+                                    <Run FontWeight="Bold" Text="Formatting a phone partition may permanently damage the device."/>
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
+                                <TextBlock.Inlines>
+                                    <Run Text="Never modify the security-settings (ACL) of a file or registry-key."/>
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="You will notice that some files or folders cannot be accessed due to its security-settings. Do not alter the security-settings to get access to these files! Instead run a file-browser under the SYSTEM account to access these files and folders. Download and install " />
+                        <Hyperlink NavigateUri="https://technet.microsoft.com/en-us/sysinternals/bb896649.aspx">Sysinternals PsTools</Hyperlink>
+                        <Run Text=" and a " />
+                        <Hyperlink NavigateUri="https://www.google.nl/?#&amp;q=freeware+file+manager">3rd party file manager</Hyperlink>
+                        <Run Text=". Then launch the file manager like this:-" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="    &quot;C:\Program Files\PsTools\PsExec.exe&quot; -d -s -i &quot;&lt;PATH TO FILE MANAGER&gt;&quot;" FontFamily="Courier New" FontSize="12" />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="Root Access" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Hyperlink NavigateUri="UnlockRoot">Root Access</Hyperlink>
+                        <Run Text=" is a set of hacks that unleashes the power of your Windows Phone:" />
+                        <LineBreak />
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
+                                <TextBlock.Inlines>
+                                    <Run Text="Disable SecureBoot at OS loader and at OS runtime level"/>
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
+                                <TextBlock.Inlines>
+                                    <Run Text="Disable all ACL, Capability and Privileges checks"/>
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
+                                <TextBlock.Inlines>
+                                    <Run Text="Allow threads to escape from sandbox security"/>
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
+                                <TextBlock.Inlines>
+                                    <Run Text="Allow .NET Console executables"/>
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock TextWrapping="Wrap" Margin="30,0,0,0" >
+                                <TextBlock.Inlines>
+                                    <Run Text="Jailbreak (side-load homebrew apps, only for WP 8.0 and 8.1 as Windows 10 Mobile already allows side-loading through &quot;developer mode&quot;)"/>
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="When all ACL, Capability and Privileges checks are disabled, it means that you have access to all system resources, which effectively means you have Root Access. Apps will still run in a &quot;Low Box&quot;, because the Low Box security token contains information that is necessary for app to be able to communicate with the system. Some API's deny access to threads that run with a Low Box token. Root Access disables the account logon checks, which allows an app to logon an account and create a thread with non-Lowboxed security token. This thread will also have access to these forbidden API's." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Root Access also implements Windows Phone Jailbreak, which lets you install Homebrew apps on your phone." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Root Access can be applied directly on the phone through Mass Storage Mode or it can be applied to a mounted ROM image." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Root Access must be implemented differently for every version of the Windows Phone Operating System. This tool aims to support the most popular versions of the OS. The Patch Engine is very flexible. Future versions will add support for additional versions of the Windows Phone Operating System." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Root Access allows a high degree of tweaking on your phone. But be aware that it also makes your phone vulnerable to badly written software and malware! If you unlocked Mass Storage mode, then this tool will allow you to enable or disable Root Access directly on your phone. To be safe, you can enable Root Access, then make necessary changes and tweaks to your phone and then disable Root Access afterwards." />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="Custom ROM's" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="At present there is very little tooling around custom ROM's for Windows Phone 8+. This tool implements a basic set of tools that provide the necessary building blocks to enable experimentation with custom ROMs in a convenient manner." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="The eMMC of the phone basically consists of four partition types:" />
+                        <LineBreak />
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run FontStyle="Italic" Text="Boot Partitions" />
+                                    <Run Text="– There are a bunch of boot partitions. This tool manages these on your behalf." />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run FontStyle="Italic" Text="The EFIESP partition" />
+                                    <Run Text="– The OS Loader and model-specific configuration." />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run FontStyle="Italic" Text="The MainOS partition" />
+                                    <Run Text="– The majority of the operating system, model-specific drivers and configuration data." />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run FontStyle="Italic" Text="The Data partition" />
+                                    <Run Text="– Applications and user data." />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="A custom ROM image contains copies of the EFIESP, MainOS and Data-partitions. To create an image you must first "/>
+                        <Hyperlink NavigateUri="Dump">dump</Hyperlink>
+                        <Run Text=" these partitions. Then use " />
+                        <Hyperlink NavigateUri="http://www.osforensics.com/tools/mount-disk-images.html">OSFMount</Hyperlink>
+                        <Run Text=" to mount these partitions and "/>
+                        <Hyperlink NavigateUri="UnlockRoot">Root Access</Hyperlink>
+                        <Run Text=" can be applied on the mounted partitions. When you apply Root Access, the EFIESP and MainOS partitions will be modified. After that you can further customize the partitions." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="When you are ready dismount the partitions and compress these partitions into a Zip-archive. This Zip-archive is effectively your custom ROM image." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="The " />
+                        <Hyperlink NavigateUri="Flash">flash-function</Hyperlink>
+                        <Run Text=" allows you to select the Zip-archive and flash the complete contents to the phone at once. It is also possible to flash separate partitions." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="The partition images are usually very large files. Especially the Data-partition. It can be many Gigabytes in size, depending on the phone-model. Handling such large files can be painful. Therefore it is possible to compress a partition when it is dumped." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="If you add the compressed partition to the custom ROM Zip-image the flash-function is able to use it properly. Compressed partitions cannot be mounted so you may not wish to compress the EFIESP and MainOS-partitions. The sizes of the partitions can be different on different versions of the OS. The partition-table of the phone will automatically be realigned if necessary." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Be aware that the Windows Phone system binaries are protected by copyright! Only create custom ROM's for gaining a more comprehensive understanding of your target device and for your own personal use." />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="Updating your phone" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="If you want to update your phone, you should first disable Root Access and Relock the bootloader. After that you can safely update your phone. But be aware that the phone may get updated to a version, which is not supported by Windows Phone Internals. In that case you won't be able to unlock the phone after the update." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run FontWeight="Bold" Text="WARNING: "/>
+                        <Run Text="When you are running Windows Phone 8 or Windows Phone 8.1, the phone can still start the update process when the phone is unlocked. But that may damage your phone! On Windows 10 Mobile update process will first do an integrity check. When the phone it unlocked, the update process will not start. After relocking the phone, you can update it again." />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="Backup" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="If you unlocked Mass Storage mode, this allows you to make a "/>
+                        <Hyperlink NavigateUri="Backup">backup</Hyperlink>
+                        <Run Text=" of the phone. You can backup either single partitions or all partitions straight into one single Zip-image. This Zip-image can be used as if it were a custom ROM and you can use the "/>
+                        <Hyperlink NavigateUri="Flash">flash-function</Hyperlink>
+                        <Run Text=" to restore this backup to the phone." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="It is important to realize that the MainOS and Data partitions are tied together. Even though the Data partition contains most user data and installed apps, the MainOS partition contains the registry hives and other configuration data.  This means that system backup and restore must contain the contents of both partitions." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Be aware that all stages of SecureBoot must be disabled at all times to be able to boot a custom ROM. Therefore the Backup-function also makes a backup of the EFIESP partition." />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="Build and capture" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="A custom ROM can be built on a live phone and then captured to a ROM image. The phone needs to have unlocked Mass Storage mode. After you applied all changes to the phone, you should Hard Reset the phone and create a backup of the reinitialized phone at the moment it is about to perform a clean boot for the first time. When you create a backup of the phone in this state, the user will have to perform the cold-boot procedure, just as if a stock ROM was flashed to the phone." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run FontWeight="Bold" Text="Performing a Hard Reset on a phone will remove all user data including pictures, music, call history, messages and saved games."/>
+                        <LineBreak />
+                        <LineBreak />
+                        <Run FontWeight="Bold" Text="NOTE: " />
+                        <Run Text="Most changes to the file-system on the C: drive of the phone will survive a Hard Reset. If a bootloader was unlocked and Root Access was enabled, the phone will still be unlocked after a Hard Reset. However, the registry-hives are restored on Hard Reset. If you want to modify the registry permanently, you have to edit the registry-hives in this location:-" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="    \Windows\system32\config\REGBACK\" FontFamily="Courier New" FontSize="12" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="After a Hard Reset the backup-image of the phone may still contain dirty sectors, which can possibly even contain private data. Therefore it is best practice to clean unused sectors. You can download and install " />
+                        <Hyperlink NavigateUri="https://technet.microsoft.com/en-us/sysinternals/bb897443.aspx">Sysinternals SDelete</Hyperlink>
+                        <Run Text=" to clean up the images." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Follow these steps for a complete Build and Capture:-" />
+                        <LineBreak />
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="Make sure the phone is fully charged" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="Disconnect the phone from the PC" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="Power down the phone" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="Press and hold Volume-Down-button and then shortly press the Power-button while still keeping the Volume-Down-button pressed until you see an exclamation-mark" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="Press in this order: Volume Up, Volume Down, Power and Volume Down" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="The phone will reboot and show spinning gears" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="When the phone is showing gears choose the Backup menu-item in this tool and then connect the phone to the PC" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="After a while the phone will reboot and this tool will force the phone into Flash mode" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="Choose to make a backup of separate partitions and select target-locations for the EFIESP, MainOS and Data-partition binaries" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="True">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="Use " />
+                                    <Hyperlink NavigateUri="http://www.osforensics.com/tools/mount-disk-images.html">OSFMount</Hyperlink>
+                                    <Run Text=" to mount all three partitions in Read / Write mode" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="Assuming the partitions are mounted as drives D: E: and F: execute these commandlines: " />
+                                    <LineBreak />
+                                    <LineBreak />
+                                    <Run Text="    sdelete -z D:" FontFamily="Courier New" FontSize="12" />
+                                    <LineBreak />
+                                    <Run Text="    sdelete -z E:" FontFamily="Courier New" FontSize="12" />
+                                    <LineBreak />
+                                    <Run Text="    sdelete -z F:" FontFamily="Courier New" FontSize="12" />
+                                    <LineBreak />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="Unmount the partitions" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="Create a ZIP-archive containing the three partitions" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="Windows 10 Mobile" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="If your phone is not officially supported to run Windows 10 Mobile, then you can follow "/>
+                        <Hyperlink NavigateUri="https://forum.xda-developers.com/windows-10-mobile/guide-win10-mobile-offline-update-t3527340">these steps</Hyperlink>
+                        <Run Text=" to update your phone. Keep in mind that Windows 10 Mobile may have performance issues when running on unsupported phones."/>
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Security Lock" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Windows 10 Mobile has a new security feature, which is called Security Lock. This feature is part of the NGC module (Next Generation Credentials), also known as Windows Hello. This module is responsible for storing credentials, like the Device Pincode, in a secure place. When the Device Pincode is enabled, it creates a container to store the pincode, using encryption and some system-variables (hash-codes of system-files)." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="When system-files are modified, the hash-codes don't match the variables on the secure container anymore, and it will not be possible to decrypt the pincode for two hours and it will not be possible to unlock the phone during this time. The phone will show this warning: -" />
+                    </local:Paragraph>
+                    <local:Paragraph Margin="30,0,0,0">
+                        <Run FontStyle="Italic" Text="&quot;This device has been locked for security reasons. Connect your device to a power source for at least two hours, and then try again.&quot;" />
+                    </local:Paragraph>
+                    <local:Paragraph>
+                        <Run Text="Security Lock can be triggered when you previously had a pincode enabled and then disabled it later on. Disabling the pincode does not clean-up the security container. If you then Enable Root Access, the variables with hash-codes of system-files will change. As soon as you enable the pincode again, you will get the Security Lock warning. In this situation you have three options:"/>
+                        <LineBreak/>
+                        <LineBreak/>
+                        <BulletDecorator IsHitTestVisible="True">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Hyperlink NavigateUri="https://support.microsoft.com/en-us/help/4028741/windows-unlock-your-windows-10-phone-remotely">Remote unlock</Hyperlink>
+                                    <Run Text=" your phone"/>
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="Charge your phone and reboot after two hours" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                        <LineBreak />
+                        <BulletDecorator IsHitTestVisible="False">
+                            <BulletDecorator.Bullet>
+                                <TextBlock Text="-" Margin="20,0,10,0"/>
+                            </BulletDecorator.Bullet>
+                            <TextBlock Margin="30,0,0,0" TextWrapping="Wrap">
+                                <TextBlock.Inlines>
+                                    <Run Text="Or you can prevent this situation by performing a Hard Reset on the phone after having Root Access enabled. This will remove all user data including pictures, music, call history, messages and saved games!" />
+                                </TextBlock.Inlines>
+                            </TextBlock>
+                        </BulletDecorator>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="Known limitations" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="The problems stated in this section should be fixed in later versions of Windows Phone Internals. But it needs more time to implement the solutions." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Can't unlock ROM image for Lumia's with Bootloader Spec B" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Due to the complexity of SecureBoot Hack v2, unlocking mounted ROM images is only possible for Lumia's with Bootloader Spec A. For Lumia's with bootloader Spec B you can create Custom ROM's with Root Access using the &quot;Build and capture&quot; technique, as described on the Getting started page." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="SecureBoot unlock v2 may occasionally fail" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="On occasional the Mass Storage drivers on the PC can misbehave. In this case, the phone will be in mass storage mode, but the PC does not recognize it. This could affect the unlock process. Windows Phone Internals now has a detection-method for this behavior, but that only works on Windows 8.1 and Windows 10. So for the most stable unlock-experience, you should avoid Windows 7 or older." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Sector-boundaries for custom flashing partitions" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Lumia's with Bootloader Spec B can only flash partitions on a 0x100 sector-boundary (or 0x20000 bytes-boundary). Your partition-layout should comply to this rule. When Windows Phone Internals calculates a new partition layout for a Custom ROM, the layout will automatically comply to this rule." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="SecureBoot Unlock v2 may fail altogether" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Some phones, namely the Lumia 535 models, may experience problems during the unlock process. The first part of the unlock succeeds, but when the phone is being switched to Mass Storage Mode, it is not able to find a working Flashing Profile anymore. This issue is under investigation." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Windows Phone Internals often tries to find a flashing profile" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="When you try to unlock or relock a phone with a non-supported OS version, then you will need to provide a donor-FFU with a supported OS-version. When unlocking or relocking the phone, modifications will be made to the phone, which may also cause the existing flashing-profile to become invalid. In this case Windown Phone Internals may need to search for a new flashing profile during any unlock- or relock-attempt." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Support for single phone" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Windows Phone Internals supports only one single connected phone at a time. When multiple phones are connected, Windows Phone Internals can start showing unexpected and unstable behaviour." />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/GettingStartedView.xaml.cs b/WPinternals/Views/GettingStartedView.xaml.cs
similarity index 97%
rename from Views/GettingStartedView.xaml.cs
rename to WPinternals/Views/GettingStartedView.xaml.cs
index ab7f666..d8b534c 100644
--- a/Views/GettingStartedView.xaml.cs
+++ b/WPinternals/Views/GettingStartedView.xaml.cs
@@ -1,90 +1,90 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for GettingStartedView.xaml
-    /// </summary>
-    public partial class GettingStartedView : UserControl
-    {
-        public GettingStartedView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                switch (link.NavigateUri.ToString())
-                {
-                    case "Disclaimer":
-                        (this.DataContext as GettingStartedViewModel)?.ShowDisclaimer();
-                        break;
-                    case "UnlockBoot":
-                        (this.DataContext as GettingStartedViewModel)?.SwitchToUnlockBoot();
-                        break;
-                    case "UnlockRoot":
-                        (this.DataContext as GettingStartedViewModel)?.SwitchToUnlockRoot();
-                        break;
-                    case "Backup":
-                        (this.DataContext as GettingStartedViewModel)?.SwitchToBackup();
-                        break;
-                    case "Flash":
-                        (this.DataContext as GettingStartedViewModel)?.SwitchToFlashRom();
-                        break;
-                    case "Dump":
-                        (this.DataContext as GettingStartedViewModel)?.SwitchToDumpRom();
-                        break;
-                    case "Download":
-                        (this.DataContext as GettingStartedViewModel)?.SwitchToDownload();
-                        break;
-                    default:
-                        Process process = new();
-                        process.StartInfo.UseShellExecute = true;
-                        process.StartInfo.FileName = link.NavigateUri.AbsoluteUri;
-                        process.Start();
-                        break;
-                }
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-
-        private void TextBlock_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as TextBlock)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-
-        private void BulletDecorator_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as System.Windows.Controls.Primitives.BulletDecorator)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for GettingStartedView.xaml
+    /// </summary>
+    public partial class GettingStartedView : UserControl
+    {
+        public GettingStartedView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                switch (link.NavigateUri.ToString())
+                {
+                    case "Disclaimer":
+                        (this.DataContext as GettingStartedViewModel)?.ShowDisclaimer();
+                        break;
+                    case "UnlockBoot":
+                        (this.DataContext as GettingStartedViewModel)?.SwitchToUnlockBoot();
+                        break;
+                    case "UnlockRoot":
+                        (this.DataContext as GettingStartedViewModel)?.SwitchToUnlockRoot();
+                        break;
+                    case "Backup":
+                        (this.DataContext as GettingStartedViewModel)?.SwitchToBackup();
+                        break;
+                    case "Flash":
+                        (this.DataContext as GettingStartedViewModel)?.SwitchToFlashRom();
+                        break;
+                    case "Dump":
+                        (this.DataContext as GettingStartedViewModel)?.SwitchToDumpRom();
+                        break;
+                    case "Download":
+                        (this.DataContext as GettingStartedViewModel)?.SwitchToDownload();
+                        break;
+                    default:
+                        Process process = new();
+                        process.StartInfo.UseShellExecute = true;
+                        process.StartInfo.FileName = link.NavigateUri.AbsoluteUri;
+                        process.Start();
+                        break;
+                }
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+
+        private void TextBlock_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as TextBlock)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+
+        private void BulletDecorator_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as System.Windows.Controls.Primitives.BulletDecorator)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/LumiaDownloadView.xaml b/WPinternals/Views/LumiaDownloadView.xaml
similarity index 98%
rename from Views/LumiaDownloadView.xaml
rename to WPinternals/Views/LumiaDownloadView.xaml
index 8249e27..eb7b5e9 100644
--- a/Views/LumiaDownloadView.xaml
+++ b/WPinternals/Views/LumiaDownloadView.xaml
@@ -1,240 +1,240 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.LumiaDownloadView"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="clr-namespace:WPinternals"
-      mc:Ignorable="d" 
-      d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
-        <local:DownloaderNameConvertor x:Key="DownloaderNameConvertor" />
-        <local:DownloaderSizeConvertor x:Key="DownloaderSizeConvertor" />
-        <local:DownloaderSpeedConvertor x:Key="DownloaderSpeedConvertor" />
-        <local:DownloaderTimeRemainingConvertor x:Key="DownloaderTimeRemainingConvertor" />
-        <Style x:Key="HeaderLeftAligned" TargetType="{x:Type GridViewColumnHeader}">
-            <Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
-            <Setter Property="Padding" Value="6,0,0,0"></Setter>
-        </Style>
-        <Style x:Key="HeaderRightAligned" TargetType="{x:Type GridViewColumnHeader}">
-            <Setter Property="HorizontalContentAlignment" Value="Right"></Setter>
-            <Setter Property="Padding" Value="0,0,6,0"></Setter>
-        </Style>
-        <Style x:Key="ContentRightAligned" TargetType="ListViewItem">
-            <Setter Property="HorizontalContentAlignment" Value="Right" />
-            <Setter Property="Padding" Value="0,0,6,0" />
-        </Style>
-    </UserControl.Resources>
-    <StackPanel VerticalAlignment="Center">
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Download" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FolderPicker Caption="Download folder: " SelectionText="Select the destination location for the downloaded files..." Path="{Binding DownloadFolder, Mode=TwoWay}" AllowNull="False" HorizontalAlignment="Stretch" />
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <TextBlock Margin="36,0,36,6">Currently downloading:</TextBlock>
-                <ListView Grid.Row="1" ItemsSource="{Binding DownloadList}" Margin="36,0,36,24" MinHeight="66" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Visible" local:GridViewColumnResize.Enabled="True" >
-                    <ListView.ItemContainerStyle>
-                        <Style TargetType="ListViewItem">
-                            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                        </Style>
-                    </ListView.ItemContainerStyle>
-                    <ListView.View>
-                        <GridView>
-                            <GridViewColumn local:GridViewColumnResize.Width="*" Header="Name" DisplayMemberBinding="{Binding Name}" HeaderContainerStyle="{StaticResource HeaderLeftAligned}" />
-                            <GridViewColumn Width="80" Header="Size" HeaderContainerStyle="{StaticResource HeaderRightAligned}" >
-                                <GridViewColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <TextBlock Style="{x:Null}" Text="{Binding Size, Converter={StaticResource DownloaderSizeConvertor}}" TextAlignment="Right" />
-                                    </DataTemplate>
-                                </GridViewColumn.CellTemplate>
-                            </GridViewColumn>
-                            <GridViewColumn Width="75" Header="Time Left" HeaderContainerStyle="{StaticResource HeaderRightAligned}" >
-                                <GridViewColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <TextBlock Style="{x:Null}" Text="{Binding TimeLeft,Mode=OneWay,Converter={StaticResource DownloaderTimeRemainingConvertor}}" TextAlignment="Right" />
-                                    </DataTemplate>
-                                </GridViewColumn.CellTemplate>
-                            </GridViewColumn>
-                            <GridViewColumn Width="75" Header="Speed" HeaderContainerStyle="{StaticResource HeaderRightAligned}" >
-                                <GridViewColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <TextBlock Style="{x:Null}" Text="{Binding Speed, Mode=OneWay,Converter={StaticResource DownloaderSpeedConvertor}}" TextAlignment="Right" />
-                                    </DataTemplate>
-                                </GridViewColumn.CellTemplate>
-                            </GridViewColumn>
-                            <GridViewColumn Width="123" Header="Progress">
-                                <GridViewColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <ProgressBar Value="{Binding Progress, Mode=OneWay}" Width="120" Height="16" Maximum="100"></ProgressBar>
-                                    </DataTemplate>
-                                </GridViewColumn.CellTemplate>
-                            </GridViewColumn>
-                        </GridView>
-                    </ListView.View>
-                </ListView>
-            </StackPanel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Model" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak/>
-                            <LineBreak/>
-                            <Run Text="When you choose &quot;Download all&quot;, Windows Phone Internals will download an FFU-file and emergency-files for your phone. When the FFU-file is downloaded, it will be analyzed. And if the OS-version is not a supported version, then Windows Phone Internals will start to download another FFU-file, which should have a supported OS-version. It will be for a different model, but Windows Phone Internals needs it extract some files from it." />
-                            <LineBreak/>
-                            <LineBreak/>
-                            <Run Text="When you connect your phone, the search criteria will be detected automatically. For some older Lumia models this may not work when the phone is in Flash mode. To get the exact search criteria, you need to switch the phone to Normal mode first." />
-                            <LineBreak/>
-                            <LineBreak/>
-                            <Run Text="In some cases the emergency files cannot be found and you will need to download the emergency files yourself. This " />
-                            <Hyperlink NavigateUri="https://www.google.com/search?q=%22Lumia 650 emergency files%22">google search</Hyperlink>
-                            <Run Text=" may yield some relevant results." />
-                            <LineBreak/>
-                            <LineBreak/>
-                            <Run Text="For some older Lumia models the operatorcode search criterion doesn't work. Your search may not yield any results when use the Operatorcode search criterion. You should use the Productcode to find the files for your exact model." />
-                            <LineBreak/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <Grid Margin="36,-6,36,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                    </Grid.ColumnDefinitions>
-                    <Grid Grid.Column="0">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="100" />
-                            <ColumnDefinition Width="120" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition />
-                            <RowDefinition />
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <TextBlock Grid.Column="0" Grid.Row="0">Producttype</TextBlock>
-                        <TextBlock Grid.Column="0" Grid.Row="1">Productcode</TextBlock>
-                        <TextBlock Grid.Column="0" Grid.Row="2">Operatorcode</TextBlock>
-                        <TextBox Grid.Column="1" Grid.Row="0" Width="Auto" Margin="0,0,0,8" Text="{Binding ProductType, Mode=TwoWay}"/>
-                        <TextBox Grid.Column="1" Grid.Row="1" Width="Auto" Margin="0,0,0,8" Text="{Binding ProductCode, Mode=TwoWay}"/>
-                        <TextBox Grid.Column="1" Grid.Row="2" Width="Auto" Text="{Binding OperatorCode, Mode=TwoWay}"/>
-                    </Grid>
-                    <StackPanel Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Orientation="Horizontal">
-                        <Button Content="Search" Padding="0,5" Width="120" Margin="0,0,20,0" Command="{Binding Path=SearchCommand, Mode=OneWay}" IsDefault="True"/>
-                        <Button Content="Download all" Padding="0,5" Width="120" Command="{Binding Path=DownloadAllCommand, Mode=OneWay}" />
-                    </StackPanel>
-                </Grid>
-
-                <TextBlock Margin="36,30,36,6">Search results:</TextBlock>
-                <ListView Grid.Row="1" Name="SearchResultsListView" ItemsSource="{Binding SearchResultList}" Margin="36,0,36,0" MinHeight="66" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Visible" local:GridViewColumnResize.Enabled="True">
-                    <ListView.ItemContainerStyle>
-                        <Style TargetType="{x:Type ListBoxItem}">
-                            <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
-                            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                        </Style>
-                    </ListView.ItemContainerStyle>
-                    <ListView.View>
-                        <GridView>
-                            <GridViewColumn local:GridViewColumnResize.Width="*" Header="Name" DisplayMemberBinding="{Binding Name}" HeaderContainerStyle="{StaticResource HeaderLeftAligned}" />
-                            <GridViewColumn Width="80" Header="Size" HeaderContainerStyle="{StaticResource HeaderRightAligned}" >
-                                <GridViewColumn.CellTemplate>
-                                    <DataTemplate>
-                                        <TextBlock Style="{x:Null}" Text="{Binding Size, Converter={StaticResource DownloaderSizeConvertor}}" TextAlignment="Right" />
-                                    </DataTemplate>
-                                </GridViewColumn.CellTemplate>
-                            </GridViewColumn>
-                        </GridView>
-                    </ListView.View>
-                </ListView>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,16,36,25">
-                    <Button Command="{Binding Path=DownloadSelectedCommand, Mode=OneWay}" Content="Download selected" Width="Auto" Height="Auto" Padding="20,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto">
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Repository" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,-15,20,0" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=LastStatusText, Converter={StaticResource ObjectToVisibilityConverter}}">
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="{Binding Path=LastStatusText}" />
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <Button Height="30" Width="Auto" Content="Add existing FFU-file..." Padding="20,5,20,5" HorizontalAlignment="Right" Margin="0,0,36,20" Command="{Binding Path=AddFFUCommand}"/>
-            </StackPanel>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.LumiaDownloadView"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:local="clr-namespace:WPinternals"
+      mc:Ignorable="d" 
+      d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
+        <local:DownloaderNameConvertor x:Key="DownloaderNameConvertor" />
+        <local:DownloaderSizeConvertor x:Key="DownloaderSizeConvertor" />
+        <local:DownloaderSpeedConvertor x:Key="DownloaderSpeedConvertor" />
+        <local:DownloaderTimeRemainingConvertor x:Key="DownloaderTimeRemainingConvertor" />
+        <Style x:Key="HeaderLeftAligned" TargetType="{x:Type GridViewColumnHeader}">
+            <Setter Property="HorizontalContentAlignment" Value="Left"></Setter>
+            <Setter Property="Padding" Value="6,0,0,0"></Setter>
+        </Style>
+        <Style x:Key="HeaderRightAligned" TargetType="{x:Type GridViewColumnHeader}">
+            <Setter Property="HorizontalContentAlignment" Value="Right"></Setter>
+            <Setter Property="Padding" Value="0,0,6,0"></Setter>
+        </Style>
+        <Style x:Key="ContentRightAligned" TargetType="ListViewItem">
+            <Setter Property="HorizontalContentAlignment" Value="Right" />
+            <Setter Property="Padding" Value="0,0,6,0" />
+        </Style>
+    </UserControl.Resources>
+    <StackPanel VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Download" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FolderPicker Caption="Download folder: " SelectionText="Select the destination location for the downloaded files..." Path="{Binding DownloadFolder, Mode=TwoWay}" AllowNull="False" HorizontalAlignment="Stretch" />
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <TextBlock Margin="36,0,36,6">Currently downloading:</TextBlock>
+                <ListView Grid.Row="1" ItemsSource="{Binding DownloadList}" Margin="36,0,36,24" MinHeight="66" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Visible" local:GridViewColumnResize.Enabled="True" >
+                    <ListView.ItemContainerStyle>
+                        <Style TargetType="ListViewItem">
+                            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                        </Style>
+                    </ListView.ItemContainerStyle>
+                    <ListView.View>
+                        <GridView>
+                            <GridViewColumn local:GridViewColumnResize.Width="*" Header="Name" DisplayMemberBinding="{Binding Name}" HeaderContainerStyle="{StaticResource HeaderLeftAligned}" />
+                            <GridViewColumn Width="80" Header="Size" HeaderContainerStyle="{StaticResource HeaderRightAligned}" >
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Style="{x:Null}" Text="{Binding Size, Converter={StaticResource DownloaderSizeConvertor}}" TextAlignment="Right" />
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
+                            <GridViewColumn Width="75" Header="Time Left" HeaderContainerStyle="{StaticResource HeaderRightAligned}" >
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Style="{x:Null}" Text="{Binding TimeLeft,Mode=OneWay,Converter={StaticResource DownloaderTimeRemainingConvertor}}" TextAlignment="Right" />
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
+                            <GridViewColumn Width="75" Header="Speed" HeaderContainerStyle="{StaticResource HeaderRightAligned}" >
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Style="{x:Null}" Text="{Binding Speed, Mode=OneWay,Converter={StaticResource DownloaderSpeedConvertor}}" TextAlignment="Right" />
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
+                            <GridViewColumn Width="123" Header="Progress">
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <ProgressBar Value="{Binding Progress, Mode=OneWay}" Width="120" Height="16" Maximum="100"></ProgressBar>
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
+                        </GridView>
+                    </ListView.View>
+                </ListView>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,20">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Model" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak/>
+                            <LineBreak/>
+                            <Run Text="When you choose &quot;Download all&quot;, Windows Phone Internals will download an FFU-file and emergency-files for your phone. When the FFU-file is downloaded, it will be analyzed. And if the OS-version is not a supported version, then Windows Phone Internals will start to download another FFU-file, which should have a supported OS-version. It will be for a different model, but Windows Phone Internals needs it extract some files from it." />
+                            <LineBreak/>
+                            <LineBreak/>
+                            <Run Text="When you connect your phone, the search criteria will be detected automatically. For some older Lumia models this may not work when the phone is in Flash mode. To get the exact search criteria, you need to switch the phone to Normal mode first." />
+                            <LineBreak/>
+                            <LineBreak/>
+                            <Run Text="In some cases the emergency files cannot be found and you will need to download the emergency files yourself. This " />
+                            <Hyperlink NavigateUri="https://www.google.com/search?q=%22Lumia 650 emergency files%22">google search</Hyperlink>
+                            <Run Text=" may yield some relevant results." />
+                            <LineBreak/>
+                            <LineBreak/>
+                            <Run Text="For some older Lumia models the operatorcode search criterion doesn't work. Your search may not yield any results when use the Operatorcode search criterion. You should use the Productcode to find the files for your exact model." />
+                            <LineBreak/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <Grid Margin="36,-6,36,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid Grid.Column="0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="100" />
+                            <ColumnDefinition Width="120" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock Grid.Column="0" Grid.Row="0">Producttype</TextBlock>
+                        <TextBlock Grid.Column="0" Grid.Row="1">Productcode</TextBlock>
+                        <TextBlock Grid.Column="0" Grid.Row="2">Operatorcode</TextBlock>
+                        <TextBox Grid.Column="1" Grid.Row="0" Width="Auto" Margin="0,0,0,8" Text="{Binding ProductType, Mode=TwoWay}"/>
+                        <TextBox Grid.Column="1" Grid.Row="1" Width="Auto" Margin="0,0,0,8" Text="{Binding ProductCode, Mode=TwoWay}"/>
+                        <TextBox Grid.Column="1" Grid.Row="2" Width="Auto" Text="{Binding OperatorCode, Mode=TwoWay}"/>
+                    </Grid>
+                    <StackPanel Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Orientation="Horizontal">
+                        <Button Content="Search" Padding="0,5" Width="120" Margin="0,0,20,0" Command="{Binding Path=SearchCommand, Mode=OneWay}" IsDefault="True"/>
+                        <Button Content="Download all" Padding="0,5" Width="120" Command="{Binding Path=DownloadAllCommand, Mode=OneWay}" />
+                    </StackPanel>
+                </Grid>
+
+                <TextBlock Margin="36,30,36,6">Search results:</TextBlock>
+                <ListView Grid.Row="1" Name="SearchResultsListView" ItemsSource="{Binding SearchResultList}" Margin="36,0,36,0" MinHeight="66" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Visible" local:GridViewColumnResize.Enabled="True">
+                    <ListView.ItemContainerStyle>
+                        <Style TargetType="{x:Type ListBoxItem}">
+                            <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+                            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+                        </Style>
+                    </ListView.ItemContainerStyle>
+                    <ListView.View>
+                        <GridView>
+                            <GridViewColumn local:GridViewColumnResize.Width="*" Header="Name" DisplayMemberBinding="{Binding Name}" HeaderContainerStyle="{StaticResource HeaderLeftAligned}" />
+                            <GridViewColumn Width="80" Header="Size" HeaderContainerStyle="{StaticResource HeaderRightAligned}" >
+                                <GridViewColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Style="{x:Null}" Text="{Binding Size, Converter={StaticResource DownloaderSizeConvertor}}" TextAlignment="Right" />
+                                    </DataTemplate>
+                                </GridViewColumn.CellTemplate>
+                            </GridViewColumn>
+                        </GridView>
+                    </ListView.View>
+                </ListView>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,16,36,25">
+                    <Button Command="{Binding Path=DownloadSelectedCommand, Mode=OneWay}" Content="Download selected" Width="Auto" Height="Auto" Padding="20,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto">
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Repository" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,-15,20,0" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=LastStatusText, Converter={StaticResource ObjectToVisibilityConverter}}">
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="{Binding Path=LastStatusText}" />
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <Button Height="30" Width="Auto" Content="Add existing FFU-file..." Padding="20,5,20,5" HorizontalAlignment="Right" Margin="0,0,36,20" Command="{Binding Path=AddFFUCommand}"/>
+            </StackPanel>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/LumiaDownloadView.xaml.cs b/WPinternals/Views/LumiaDownloadView.xaml.cs
similarity index 97%
rename from Views/LumiaDownloadView.xaml.cs
rename to WPinternals/Views/LumiaDownloadView.xaml.cs
index 5de160f..d85f9b8 100644
--- a/Views/LumiaDownloadView.xaml.cs
+++ b/WPinternals/Views/LumiaDownloadView.xaml.cs
@@ -1,69 +1,69 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for LumiaDownloadView.xaml
-    /// </summary>
-    public partial class LumiaDownloadView : UserControl
-    {
-        public LumiaDownloadView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                if (link.NavigateUri.ToString() == "UnlockBoot")
-                {
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToUnlockBoot();
-                }
-                else if (link.NavigateUri.ToString() == "UnlockRoot")
-                {
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToUnlockRoot();
-                }
-                else if (link.NavigateUri.ToString() == "Dump")
-                {
-                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToDumpFFU();
-                }
-                else
-                {
-                    Process process = new();
-                    process.StartInfo.UseShellExecute = true;
-                    process.StartInfo.FileName = link.NavigateUri.AbsoluteUri;
-                    process.Start();
-                }
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for LumiaDownloadView.xaml
+    /// </summary>
+    public partial class LumiaDownloadView : UserControl
+    {
+        public LumiaDownloadView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                if (link.NavigateUri.ToString() == "UnlockBoot")
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToUnlockBoot();
+                }
+                else if (link.NavigateUri.ToString() == "UnlockRoot")
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToUnlockRoot();
+                }
+                else if (link.NavigateUri.ToString() == "Dump")
+                {
+                    (this.DataContext as LumiaFlashRomSourceSelectionViewModel)?.SwitchToDumpFFU();
+                }
+                else
+                {
+                    Process process = new();
+                    process.StartInfo.UseShellExecute = true;
+                    process.StartInfo.FileName = link.NavigateUri.AbsoluteUri;
+                    process.Start();
+                }
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/LumiaUndoRootTargetSelectionView.xaml b/WPinternals/Views/LumiaUndoRootTargetSelectionView.xaml
similarity index 98%
rename from Views/LumiaUndoRootTargetSelectionView.xaml
rename to WPinternals/Views/LumiaUndoRootTargetSelectionView.xaml
index b18674f..a126008 100644
--- a/Views/LumiaUndoRootTargetSelectionView.xaml
+++ b/WPinternals/Views/LumiaUndoRootTargetSelectionView.xaml
@@ -1,73 +1,73 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.LumiaUndoRootTargetSelectionView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
-    </UserControl.Resources>
-    <StackPanel VerticalAlignment="Center">
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,0">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Disable Root Access directly on phone" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="If you want to disable Root Access directly on the phone, Mass Storage mode must have been " />
-                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
-                            <Run Text=". Make sure you don't have any Windows Phone disks or partitions mounted before you continue to Mass Storage Mode." />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="Warning: " FontWeight="Bold" Foreground="Red" />
-                            <Run Text="If you flashed a Custom ROM with Root Access enabled, or if you performed a Hard Reset while Root Access was still enabled, then the phone may not boot properly anymore, after you disabled Root Access. In this case you should perform another Hard Reset to solve the problem. A Hard Reset will erase all Apps, Settings, Photo's and other data from the phone!" />
-                            <LineBreak />
-                            <LineBreak />
-                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Mass Storage mode and then Root Access will be disabled." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="The phone is in Mass Storage mode. You can continue to disable Root Access." IsVisible="{Binding IsPhoneInMassStorage, Mode=OneWay}"/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
-                    <Button Command="{Binding Path=UnlockPhoneCommand, Mode=OneWay}" Content="Disable Root Access" Width="120" Height="Auto" Padding="0,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.LumiaUndoRootTargetSelectionView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
+    </UserControl.Resources>
+    <StackPanel VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,0">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Disable Root Access directly on phone" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="If you want to disable Root Access directly on the phone, Mass Storage mode must have been " />
+                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
+                            <Run Text=". Make sure you don't have any Windows Phone disks or partitions mounted before you continue to Mass Storage Mode." />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="Warning: " FontWeight="Bold" Foreground="Red" />
+                            <Run Text="If you flashed a Custom ROM with Root Access enabled, or if you performed a Hard Reset while Root Access was still enabled, then the phone may not boot properly anymore, after you disabled Root Access. In this case you should perform another Hard Reset to solve the problem. A Hard Reset will erase all Apps, Settings, Photo's and other data from the phone!" />
+                            <LineBreak />
+                            <LineBreak />
+                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Mass Storage mode and then Root Access will be disabled." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="The phone is in Mass Storage mode. You can continue to disable Root Access." IsVisible="{Binding IsPhoneInMassStorage, Mode=OneWay}"/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
+                    <Button Command="{Binding Path=UnlockPhoneCommand, Mode=OneWay}" Content="Disable Root Access" Width="120" Height="Auto" Padding="0,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/LumiaUndoRootTargetSelectionView.xaml.cs b/WPinternals/Views/LumiaUndoRootTargetSelectionView.xaml.cs
similarity index 97%
rename from Views/LumiaUndoRootTargetSelectionView.xaml.cs
rename to WPinternals/Views/LumiaUndoRootTargetSelectionView.xaml.cs
index 4d2f265..c73ac90 100644
--- a/Views/LumiaUndoRootTargetSelectionView.xaml.cs
+++ b/WPinternals/Views/LumiaUndoRootTargetSelectionView.xaml.cs
@@ -1,50 +1,50 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for LumiaUnlockRootTargetSelectionView.xaml
-    /// </summary>
-    public partial class LumiaUndoRootTargetSelectionView : UserControl
-    {
-        public LumiaUndoRootTargetSelectionView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link && link.NavigateUri.ToString() == "UnlockBoot")
-            {
-                ((LumiaUndoRootTargetSelectionViewModel)DataContext).SwitchToUnlockBoot();
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for LumiaUnlockRootTargetSelectionView.xaml
+    /// </summary>
+    public partial class LumiaUndoRootTargetSelectionView : UserControl
+    {
+        public LumiaUndoRootTargetSelectionView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link && link.NavigateUri.ToString() == "UnlockBoot")
+            {
+                ((LumiaUndoRootTargetSelectionViewModel)DataContext).SwitchToUnlockBoot();
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/LumiaUnlockRootTargetSelectionView.xaml b/WPinternals/Views/LumiaUnlockRootTargetSelectionView.xaml
similarity index 98%
rename from Views/LumiaUnlockRootTargetSelectionView.xaml
rename to WPinternals/Views/LumiaUnlockRootTargetSelectionView.xaml
index 52bdf4b..283f962 100644
--- a/Views/LumiaUnlockRootTargetSelectionView.xaml
+++ b/WPinternals/Views/LumiaUnlockRootTargetSelectionView.xaml
@@ -1,119 +1,119 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.LumiaUnlockRootTargetSelectionView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
-    </UserControl.Resources>
-    <StackPanel VerticalAlignment="Center">
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,25">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Enable Root Access directly on phone" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="Before you can enable Root Access directly on the phone, you need to have Mass Storage mode " />
-                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
-                            <Run Text=" first. Make sure you don't have any Windows Phone disks or partitions mounted before you continue to Mass Storage Mode. Not all OS versions are supported. The OS version will verified after the phone is switched to Mass Storage mode." />
-                            <LineBreak />
-                            <LineBreak />
-                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Mass Storage mode and then Root Access will be enabled." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="The phone is in Mass Storage mode. You can continue to enable Root Access." IsVisible="{Binding IsPhoneInMassStorage, Mode=OneWay}"/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
-                    <Button Command="{Binding Path=UnlockPhoneCommand, Mode=OneWay}" Content="Unlock phone" Width="120" Height="Auto" Padding="0,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Enable Root Access on ROM images" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="In some cases you may want to unlock a ROM image, instead of enabling Root Access directly on the phone. For example, if you were not able to unlock Mass Storage mode on the phone, or when you want to prepare a ROM image for later use."/>
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="If you can't use Mass Storage on the phone, you need to "/>
-                            <Hyperlink NavigateUri="Dump">dump</Hyperlink>
-                            <Run Text=" the EFIESP and MainOS partitions from an FFU file. Then you need to mount the partitions with a tool like " />
-                            <Hyperlink NavigateUri="http://www.osforensics.com/tools/mount-disk-images.html">OSFMount</Hyperlink>
-                            <Run Text=" and use the selection fields below to browse to the mounted partitions. After the images are unlocked you need to unmount them and then " />
-                            <Hyperlink NavigateUri="Flash">flash</Hyperlink>
-                            <Run Text=" the unlocked images to the phone. Unlocking the EFIESP partition is something you typically need to do only once. Note that the EFIESP partition contains model-specific data for your phone! So you need to make sure that you dump EFIESP partition from an FFU file that is meant specifically for your phone." />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="WARNING: " Foreground="Red" FontWeight="Bold"/>
-                            <Run Text="Due to the complexity of SecureBoot Hack v2, unlocking mounted ROM images is only possible for Lumia's with bootloader Spec A. For Lumia's with bootloader Spec B you can create Custom ROM's with Root Access using the &quot;Build and capture&quot; technique, as described on the " />
-                            <Hyperlink NavigateUri="GettingStarted">Getting started</Hyperlink>
-                            <Run Text=" page." />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="Select the mount-points of the partitions you wish to unlock:" />
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FolderPicker Caption="EFIESP: " SelectionText="Select the drive where the EFIESP partition is mounted..." Path="{Binding EFIESPMountPoint, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FolderPicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FolderPicker Caption="MainOS: " SelectionText="Select the drive where the MainOS partition is mounted..." Path="{Binding MainOSMountPoint, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FolderPicker_PathChanged"/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
-                    <Button Command="{Binding Path=UnlockImageCommand, Mode=OneWay}" Content="Unlock images" Width="120" Height="Auto" Padding="0,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.LumiaUnlockRootTargetSelectionView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
+    </UserControl.Resources>
+    <StackPanel VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,25">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Enable Root Access directly on phone" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="Before you can enable Root Access directly on the phone, you need to have Mass Storage mode " />
+                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
+                            <Run Text=" first. Make sure you don't have any Windows Phone disks or partitions mounted before you continue to Mass Storage Mode. Not all OS versions are supported. The OS version will verified after the phone is switched to Mass Storage mode." />
+                            <LineBreak />
+                            <LineBreak />
+                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Mass Storage mode and then Root Access will be enabled." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="The phone is in Mass Storage mode. You can continue to enable Root Access." IsVisible="{Binding IsPhoneInMassStorage, Mode=OneWay}"/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
+                    <Button Command="{Binding Path=UnlockPhoneCommand, Mode=OneWay}" Content="Unlock phone" Width="120" Height="Auto" Padding="0,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Enable Root Access on ROM images" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="In some cases you may want to unlock a ROM image, instead of enabling Root Access directly on the phone. For example, if you were not able to unlock Mass Storage mode on the phone, or when you want to prepare a ROM image for later use."/>
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="If you can't use Mass Storage on the phone, you need to "/>
+                            <Hyperlink NavigateUri="Dump">dump</Hyperlink>
+                            <Run Text=" the EFIESP and MainOS partitions from an FFU file. Then you need to mount the partitions with a tool like " />
+                            <Hyperlink NavigateUri="http://www.osforensics.com/tools/mount-disk-images.html">OSFMount</Hyperlink>
+                            <Run Text=" and use the selection fields below to browse to the mounted partitions. After the images are unlocked you need to unmount them and then " />
+                            <Hyperlink NavigateUri="Flash">flash</Hyperlink>
+                            <Run Text=" the unlocked images to the phone. Unlocking the EFIESP partition is something you typically need to do only once. Note that the EFIESP partition contains model-specific data for your phone! So you need to make sure that you dump EFIESP partition from an FFU file that is meant specifically for your phone." />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="WARNING: " Foreground="Red" FontWeight="Bold"/>
+                            <Run Text="Due to the complexity of SecureBoot Hack v2, unlocking mounted ROM images is only possible for Lumia's with bootloader Spec A. For Lumia's with bootloader Spec B you can create Custom ROM's with Root Access using the &quot;Build and capture&quot; technique, as described on the " />
+                            <Hyperlink NavigateUri="GettingStarted">Getting started</Hyperlink>
+                            <Run Text=" page." />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="Select the mount-points of the partitions you wish to unlock:" />
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FolderPicker Caption="EFIESP: " SelectionText="Select the drive where the EFIESP partition is mounted..." Path="{Binding EFIESPMountPoint, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FolderPicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FolderPicker Caption="MainOS: " SelectionText="Select the drive where the MainOS partition is mounted..." Path="{Binding MainOSMountPoint, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FolderPicker_PathChanged"/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
+                    <Button Command="{Binding Path=UnlockImageCommand, Mode=OneWay}" Content="Unlock images" Width="120" Height="Auto" Padding="0,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/LumiaUnlockRootTargetSelectionView.xaml.cs b/WPinternals/Views/LumiaUnlockRootTargetSelectionView.xaml.cs
similarity index 97%
rename from Views/LumiaUnlockRootTargetSelectionView.xaml.cs
rename to WPinternals/Views/LumiaUnlockRootTargetSelectionView.xaml.cs
index 1f62477..63881dc 100644
--- a/Views/LumiaUnlockRootTargetSelectionView.xaml.cs
+++ b/WPinternals/Views/LumiaUnlockRootTargetSelectionView.xaml.cs
@@ -1,78 +1,78 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for LumiaUnlockRootTargetSelectionView.xaml
-    /// </summary>
-    public partial class LumiaUnlockRootTargetSelectionView : UserControl
-    {
-        public LumiaUnlockRootTargetSelectionView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                if (link.NavigateUri.ToString() == "Dump")
-                {
-                    ((LumiaUnlockRootTargetSelectionViewModel)DataContext).SwitchToDumpRom();
-                }
-                else if (link.NavigateUri.ToString() == "Flash")
-                {
-                    ((LumiaUnlockRootTargetSelectionViewModel)DataContext).SwitchToFlashRom();
-                }
-                else if (link.NavigateUri.ToString() == "UnlockBoot")
-                {
-                    ((LumiaUnlockRootTargetSelectionViewModel)DataContext).SwitchToUnlockBoot();
-                }
-                else if (link.NavigateUri.ToString() == "GettingStarted")
-                {
-                    App.NavigateToGettingStarted();
-                }
-                else
-                {
-                    Process process = new();
-                    process.StartInfo.UseShellExecute = true;
-                    process.StartInfo.FileName = link.NavigateUri.AbsoluteUri;
-                    process.Start();
-                }
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-
-        private void FolderPicker_PathChanged(object sender, PathChangedEventArgs e)
-        {
-            ((LumiaUnlockRootTargetSelectionViewModel)DataContext).EvaluateViewState();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for LumiaUnlockRootTargetSelectionView.xaml
+    /// </summary>
+    public partial class LumiaUnlockRootTargetSelectionView : UserControl
+    {
+        public LumiaUnlockRootTargetSelectionView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                if (link.NavigateUri.ToString() == "Dump")
+                {
+                    ((LumiaUnlockRootTargetSelectionViewModel)DataContext).SwitchToDumpRom();
+                }
+                else if (link.NavigateUri.ToString() == "Flash")
+                {
+                    ((LumiaUnlockRootTargetSelectionViewModel)DataContext).SwitchToFlashRom();
+                }
+                else if (link.NavigateUri.ToString() == "UnlockBoot")
+                {
+                    ((LumiaUnlockRootTargetSelectionViewModel)DataContext).SwitchToUnlockBoot();
+                }
+                else if (link.NavigateUri.ToString() == "GettingStarted")
+                {
+                    App.NavigateToGettingStarted();
+                }
+                else
+                {
+                    Process process = new();
+                    process.StartInfo.UseShellExecute = true;
+                    process.StartInfo.FileName = link.NavigateUri.AbsoluteUri;
+                    process.Start();
+                }
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+
+        private void FolderPicker_PathChanged(object sender, PathChangedEventArgs e)
+        {
+            ((LumiaUnlockRootTargetSelectionViewModel)DataContext).EvaluateViewState();
+        }
+    }
+}
diff --git a/Views/MainWindow.xaml b/WPinternals/Views/MainWindow.xaml
similarity index 98%
rename from Views/MainWindow.xaml
rename to WPinternals/Views/MainWindow.xaml
index a6a1032..9d7b499 100644
--- a/Views/MainWindow.xaml
+++ b/WPinternals/Views/MainWindow.xaml
@@ -1,236 +1,236 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<Window x:Class="WPinternals.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:local="clr-namespace:WPinternals" Height="760" Width="1150" Icon="..\WPinternals.ico" Closed="Window_Closed">
-    <Window.Resources>
-        <DataTemplate DataType="{x:Type local:BootUnlockResourcesViewModel}">
-            <local:FlashResourcesView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:BootRestoreResourcesViewModel}">
-            <local:BootRestoreResourcesView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:NokiaNormalViewModel}">
-            <local:NokiaNormalView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:NokiaBootloaderViewModel}">
-            <local:NokiaBootloaderView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:NokiaFlashViewModel}">
-            <local:NokiaFlashView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:NokiaLabelViewModel}">
-            <local:NokiaLabelView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:AboutViewModel}">
-            <local:About />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:NotImplementedViewModel}">
-            <local:NotImplementedView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:NokiaModeNormalViewModel}">
-            <local:NokiaModeNormalView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:NokiaModeFlashViewModel}">
-            <local:NokiaModeFlashView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:NokiaModeBootloaderViewModel}">
-            <local:NokiaModeBootloaderView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:NokiaModeLabelViewModel}">
-            <local:NokiaModeLabelView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:NokiaModeMassStorageViewModel}">
-            <local:NokiaModeMassStorageView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:NokiaMassStorageViewModel}">
-            <local:NokiaMassStorageView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:BusyViewModel}">
-            <local:BusyView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:MessageViewModel}">
-            <local:MessageView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:DisclaimerViewModel}">
-            <local:DisclaimerView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:DisclaimerAndNdaViewModel}">
-            <local:DisclaimerAndNdaView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:RegistrationViewModel}">
-            <local:RegistrationView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:GettingStartedViewModel}">
-            <local:GettingStartedView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:LumiaUnlockRootTargetSelectionViewModel}">
-            <local:LumiaUnlockRootTargetSelectionView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:LumiaUndoRootTargetSelectionViewModel}">
-            <local:LumiaUndoRootTargetSelectionView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:BackupTargetSelectionViewModel}">
-            <local:BackupView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:RestoreSourceSelectionViewModel}">
-            <local:RestoreView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:LumiaFlashRomSourceSelectionViewModel}">
-            <local:FlashRomView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:DumpRomTargetSelectionViewModel}">
-            <local:DumpRomView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:DownloadsViewModel}">
-            <local:LumiaDownloadView />
-        </DataTemplate>
-        <DataTemplate DataType="{x:Type local:ContextViewModel}">
-            <local:ContextView />
-        </DataTemplate>
-        <BitmapImage x:Key="LogoImageSource" UriSource="..\Logo.png" />
-        <BitmapImage x:Key="LogoSmallImageSource" UriSource="..\Logo-Small.png" />
-        <Style x:Key="MenuButtonStyle" BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}">
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type Button}">
-                        <Grid x:Name="Bd" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-                            <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" TargetName="Bd" Value="#21FFFFFF"/>
-                            </Trigger>
-                            <Trigger Property="IsKeyboardFocused" Value="True">
-                                <Setter Property="Background" TargetName="Bd" Value="#10FFFFFF"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" TargetName="Bd" Value="#40FFFFFF"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-        <Style x:Key="MenuButtonStyle_" TargetType="{x:Type Button}">
-            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-            <Setter Property="Padding" Value="2"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
-            <Setter Property="HorizontalAlignment" Value="Center"/>
-            <Setter Property="VerticalAlignment" Value="Center"/>
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="VerticalContentAlignment" Value="Center"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type Button}">
-                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-                            <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="#80DADADA"/>
-                                <Setter Property="Background" TargetName="Bd" Value="#210080FF"/>
-                            </Trigger>
-                            <Trigger Property="IsKeyboardFocused" Value="True">
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="#80DADADA"/>
-                                <Setter Property="Background" TargetName="Bd" Value="#210080FF"/>
-                            </Trigger>
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="#90006CD9"/>
-                                <Setter Property="Background" TargetName="Bd" Value="#400080FF"/>
-                            </Trigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </Window.Resources>
-    <Grid>
-        <Grid.Background>
-            <LinearGradientBrush EndPoint="1.5,1.5" StartPoint="0.6,0.2" SpreadMethod="Reflect">
-                <GradientStop Color="#FF342F8D" Offset="0"/>
-                <GradientStop Color="#FFE8E7F0" Offset="1"/>
-            </LinearGradientBrush>
-        </Grid.Background>
-        <Grid HorizontalAlignment="Left" Height="100" VerticalAlignment="Top" Width="100"/>
-        <Border Margin="256,100,0,30" HorizontalAlignment="Stretch" CornerRadius="15,0,0,15" Background="White" Padding="0">
-            <ScrollViewer x:Name="MainContentScrollViewer" VerticalScrollBarVisibility="Auto" SizeChanged="ScrollViewer_SizeChanged">
-                <ContentControl x:Name="ChildFrame" Content="{Binding ContextViewModel}" HorizontalAlignment="Center" Width="700">
-                    <ContentControl.Style>
-                        <Style TargetType="{x:Type ContentControl}">
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding Content, RelativeSource={x:Static RelativeSource.Self}}" Value="{x:Null}">
-                                    <Setter Property="Template">
-                                        <Setter.Value>
-                                            <ControlTemplate>
-                                                <local:Empty/>
-                                            </ControlTemplate>
-                                        </Setter.Value>
-                                    </Setter>
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </ContentControl.Style>
-                </ContentControl>
-            </ScrollViewer>
-        </Border>
-        <StackPanel HorizontalAlignment="Right" Height="85" Margin="0,10,10,0" VerticalAlignment="Top" Orientation="Horizontal">
-            <Label Content="Windows Phone Internals" Width="657" Foreground="White" FontSize="56" HorizontalContentAlignment="Right"/>
-            <Image Source="{StaticResource LogoSmallImageSource}" SnapsToDevicePixels="True"/>
-        </StackPanel>
-        <StackPanel Name="Menu" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,120,0,0" Orientation="Vertical" IsEnabled="{Binding IsMenuEnabled}">
-            <Label FontSize="20" Height="40" Margin="0,6,0,0" Content="General" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180" Foreground="White"/>
-            <Border Height="2" Margin="0,-6,0,6" BorderBrush="#FFA0A0E2" BorderThickness="1" HorizontalAlignment="Left" VerticalAlignment="Top" Width="219"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Getting started" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding GettingStartedCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Label FontSize="20" Height="40" Margin="0,6,0,0" Content="Phone" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180" Foreground="White"/>
-            <Border BorderBrush="#FFA0A0E2" BorderThickness="1" HorizontalAlignment="Left" Height="2" Margin="0,-6,0,6" VerticalAlignment="Top" Width="219"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Info" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding InfoCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Manual mode" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding ModeCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Label FontSize="20" Height="40" Margin="0,6,0,0" Content="Unlock" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180" Foreground="White"/>
-            <Border BorderBrush="#FFA0A0E2" BorderThickness="1" HorizontalAlignment="Left" Height="2" Margin="0,-6,0,6" VerticalAlignment="Top" Width="219"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Unlock bootloader" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding BootUnlockCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Restore bootloader" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding BootRestoreCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Enable root access" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding RootUnlockCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Disable root access" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding RootUndoCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Label FontSize="20" Height="40" Margin="0,6,0,0" Content="Platform" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180" Foreground="White"/>
-            <Border BorderBrush="#FFA0A0E2" BorderThickness="1" HorizontalAlignment="Left" Height="2" Margin="0,-6,0,6" VerticalAlignment="Top" Width="219"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Backup" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding BackupCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Flash" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding LumiaFlashRomCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Dump" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding DumpRomCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Download" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding DownloadCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Label FontSize="20" Height="40" Margin="0,6,0,0" Content="Help" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180" Foreground="White"/>
-            <Border BorderBrush="#FFA0A0E2" BorderThickness="1" HorizontalAlignment="Left" Height="2" Margin="0,-6,0,6" VerticalAlignment="Top" Width="219"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="About" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding AboutCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Donate" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding DonateCommand}" Style="{DynamicResource MenuButtonStyle}"/>
-        </StackPanel>
-    </Grid>
-</Window>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<Window x:Class="WPinternals.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:WPinternals" Height="760" Width="1150" Icon="..\WPinternals.ico" Closed="Window_Closed">
+    <Window.Resources>
+        <DataTemplate DataType="{x:Type local:BootUnlockResourcesViewModel}">
+            <local:FlashResourcesView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:BootRestoreResourcesViewModel}">
+            <local:BootRestoreResourcesView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:NokiaNormalViewModel}">
+            <local:NokiaNormalView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:NokiaBootloaderViewModel}">
+            <local:NokiaBootloaderView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:NokiaFlashViewModel}">
+            <local:NokiaFlashView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:NokiaLabelViewModel}">
+            <local:NokiaLabelView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:AboutViewModel}">
+            <local:About />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:NotImplementedViewModel}">
+            <local:NotImplementedView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:NokiaModeNormalViewModel}">
+            <local:NokiaModeNormalView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:NokiaModeFlashViewModel}">
+            <local:NokiaModeFlashView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:NokiaModeBootloaderViewModel}">
+            <local:NokiaModeBootloaderView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:NokiaModeLabelViewModel}">
+            <local:NokiaModeLabelView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:NokiaModeMassStorageViewModel}">
+            <local:NokiaModeMassStorageView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:NokiaMassStorageViewModel}">
+            <local:NokiaMassStorageView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:BusyViewModel}">
+            <local:BusyView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:MessageViewModel}">
+            <local:MessageView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:DisclaimerViewModel}">
+            <local:DisclaimerView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:DisclaimerAndNdaViewModel}">
+            <local:DisclaimerAndNdaView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:RegistrationViewModel}">
+            <local:RegistrationView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:GettingStartedViewModel}">
+            <local:GettingStartedView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:LumiaUnlockRootTargetSelectionViewModel}">
+            <local:LumiaUnlockRootTargetSelectionView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:LumiaUndoRootTargetSelectionViewModel}">
+            <local:LumiaUndoRootTargetSelectionView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:BackupTargetSelectionViewModel}">
+            <local:BackupView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:RestoreSourceSelectionViewModel}">
+            <local:RestoreView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:LumiaFlashRomSourceSelectionViewModel}">
+            <local:FlashRomView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:DumpRomTargetSelectionViewModel}">
+            <local:DumpRomView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:DownloadsViewModel}">
+            <local:LumiaDownloadView />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type local:ContextViewModel}">
+            <local:ContextView />
+        </DataTemplate>
+        <BitmapImage x:Key="LogoImageSource" UriSource="..\Logo.png" />
+        <BitmapImage x:Key="LogoSmallImageSource" UriSource="..\Logo-Small.png" />
+        <Style x:Key="MenuButtonStyle" BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Grid x:Name="Bd" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                            <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" TargetName="Bd" Value="#21FFFFFF"/>
+                            </Trigger>
+                            <Trigger Property="IsKeyboardFocused" Value="True">
+                                <Setter Property="Background" TargetName="Bd" Value="#10FFFFFF"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" TargetName="Bd" Value="#40FFFFFF"/>
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="MenuButtonStyle_" TargetType="{x:Type Button}">
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+            <Setter Property="Padding" Value="2"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Background" Value="Transparent"/>
+            <Setter Property="BorderBrush" Value="Transparent"/>
+            <Setter Property="HorizontalAlignment" Value="Center"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                            <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="BorderBrush" TargetName="Bd" Value="#80DADADA"/>
+                                <Setter Property="Background" TargetName="Bd" Value="#210080FF"/>
+                            </Trigger>
+                            <Trigger Property="IsKeyboardFocused" Value="True">
+                                <Setter Property="BorderBrush" TargetName="Bd" Value="#80DADADA"/>
+                                <Setter Property="Background" TargetName="Bd" Value="#210080FF"/>
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="BorderBrush" TargetName="Bd" Value="#90006CD9"/>
+                                <Setter Property="Background" TargetName="Bd" Value="#400080FF"/>
+                            </Trigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </Window.Resources>
+    <Grid>
+        <Grid.Background>
+            <LinearGradientBrush EndPoint="1.5,1.5" StartPoint="0.6,0.2" SpreadMethod="Reflect">
+                <GradientStop Color="#FF342F8D" Offset="0"/>
+                <GradientStop Color="#FFE8E7F0" Offset="1"/>
+            </LinearGradientBrush>
+        </Grid.Background>
+        <Grid HorizontalAlignment="Left" Height="100" VerticalAlignment="Top" Width="100"/>
+        <Border Margin="256,100,0,30" HorizontalAlignment="Stretch" CornerRadius="15,0,0,15" Background="White" Padding="0">
+            <ScrollViewer x:Name="MainContentScrollViewer" VerticalScrollBarVisibility="Auto" SizeChanged="ScrollViewer_SizeChanged">
+                <ContentControl x:Name="ChildFrame" Content="{Binding ContextViewModel}" HorizontalAlignment="Center" Width="700">
+                    <ContentControl.Style>
+                        <Style TargetType="{x:Type ContentControl}">
+                            <Style.Triggers>
+                                <DataTrigger Binding="{Binding Content, RelativeSource={x:Static RelativeSource.Self}}" Value="{x:Null}">
+                                    <Setter Property="Template">
+                                        <Setter.Value>
+                                            <ControlTemplate>
+                                                <local:Empty/>
+                                            </ControlTemplate>
+                                        </Setter.Value>
+                                    </Setter>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </ContentControl.Style>
+                </ContentControl>
+            </ScrollViewer>
+        </Border>
+        <StackPanel HorizontalAlignment="Right" Height="85" Margin="0,10,10,0" VerticalAlignment="Top" Orientation="Horizontal">
+            <Label Content="Windows Phone Internals" Width="657" Foreground="White" FontSize="56" HorizontalContentAlignment="Right"/>
+            <Image Source="{StaticResource LogoSmallImageSource}" SnapsToDevicePixels="True"/>
+        </StackPanel>
+        <StackPanel Name="Menu" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,120,0,0" Orientation="Vertical" IsEnabled="{Binding IsMenuEnabled}">
+            <Label FontSize="20" Height="40" Margin="0,6,0,0" Content="General" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180" Foreground="White"/>
+            <Border Height="2" Margin="0,-6,0,6" BorderBrush="#FFA0A0E2" BorderThickness="1" HorizontalAlignment="Left" VerticalAlignment="Top" Width="219"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Getting started" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding GettingStartedCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+            <Label FontSize="20" Height="40" Margin="0,6,0,0" Content="Phone" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180" Foreground="White"/>
+            <Border BorderBrush="#FFA0A0E2" BorderThickness="1" HorizontalAlignment="Left" Height="2" Margin="0,-6,0,6" VerticalAlignment="Top" Width="219"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Info" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding InfoCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Manual mode" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding ModeCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+            <Label FontSize="20" Height="40" Margin="0,6,0,0" Content="Unlock" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180" Foreground="White"/>
+            <Border BorderBrush="#FFA0A0E2" BorderThickness="1" HorizontalAlignment="Left" Height="2" Margin="0,-6,0,6" VerticalAlignment="Top" Width="219"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Unlock bootloader" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding BootUnlockCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Restore bootloader" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding BootRestoreCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Enable root access" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding RootUnlockCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Disable root access" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding RootUndoCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+            <Label FontSize="20" Height="40" Margin="0,6,0,0" Content="Platform" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180" Foreground="White"/>
+            <Border BorderBrush="#FFA0A0E2" BorderThickness="1" HorizontalAlignment="Left" Height="2" Margin="0,-6,0,6" VerticalAlignment="Top" Width="219"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Backup" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding BackupCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Flash" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding LumiaFlashRomCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Dump" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding DumpRomCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Download" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding DownloadCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+            <Label FontSize="20" Height="40" Margin="0,6,0,0" Content="Help" HorizontalAlignment="Left" VerticalAlignment="Top" Width="180" Foreground="White"/>
+            <Border BorderBrush="#FFA0A0E2" BorderThickness="1" HorizontalAlignment="Left" Height="2" Margin="0,-6,0,6" VerticalAlignment="Top" Width="219"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="About" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding AboutCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+            <Button FontSize="16" Height="24" Margin="21,0,0,0" Content="Donate" HorizontalAlignment="Left" VerticalAlignment="Top" Width="198" Background="{x:Null}" BorderBrush="{x:Null}" Foreground="White" BorderThickness="0" HorizontalContentAlignment="Stretch" Padding="0" VerticalContentAlignment="Top" Command="{Binding DonateCommand}" Style="{DynamicResource MenuButtonStyle}"/>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/Views/MainWindow.xaml.cs b/WPinternals/Views/MainWindow.xaml.cs
similarity index 97%
rename from Views/MainWindow.xaml.cs
rename to WPinternals/Views/MainWindow.xaml.cs
index 236da37..2b351d6 100644
--- a/Views/MainWindow.xaml.cs
+++ b/WPinternals/Views/MainWindow.xaml.cs
@@ -1,82 +1,82 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Windows;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for MainWindow.xaml
-    /// </summary>
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-
-            Visibility = Visibility.Collapsed;
-        }
-
-        protected override void OnSourceInitialized(EventArgs e)
-        {
-            base.OnSourceInitialized(e);
-
-            DataContext = new MainViewModel();
-            ((MainViewModel)DataContext).PropertyChanged += MainViewModel_PropertyChanged;
-        }
-
-        private void MainViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == "ContextViewModel")
-            {
-                MainContentScrollViewer.ScrollToTop();
-            }
-        }
-
-        private void ScrollViewer_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            const int MinChildWidth = 500;
-            const int MaxChildWidth = 700;
-            const int MarginTarget = 100;
-
-            if (e.WidthChanged)
-            {
-                if (e.NewSize.Width >= (MaxChildWidth + (2 * MarginTarget)))
-                {
-                    ChildFrame.Width = MaxChildWidth;
-                }
-                else
-                {
-                    ChildFrame.Width = (e.NewSize.Width - (2 * MarginTarget)) < MinChildWidth ? MinChildWidth : e.NewSize.Width - (2 * MarginTarget);
-                }
-            }
-            ChildFrame.Margin = new Thickness(0, 20, 0, 20);
-        }
-
-        private void Window_Closed(object sender, EventArgs e)
-        {
-            if ((Application.Current.MainWindow != this) && (Application.Current.MainWindow != null))
-            {
-                Application.Current.MainWindow.Close(); // This one holds the hWnd for handling USB events and it must be closed too.
-            }
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Windows;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+
+            Visibility = Visibility.Collapsed;
+        }
+
+        protected override void OnSourceInitialized(EventArgs e)
+        {
+            base.OnSourceInitialized(e);
+
+            DataContext = new MainViewModel();
+            ((MainViewModel)DataContext).PropertyChanged += MainViewModel_PropertyChanged;
+        }
+
+        private void MainViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "ContextViewModel")
+            {
+                MainContentScrollViewer.ScrollToTop();
+            }
+        }
+
+        private void ScrollViewer_SizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            const int MinChildWidth = 500;
+            const int MaxChildWidth = 700;
+            const int MarginTarget = 100;
+
+            if (e.WidthChanged)
+            {
+                if (e.NewSize.Width >= (MaxChildWidth + (2 * MarginTarget)))
+                {
+                    ChildFrame.Width = MaxChildWidth;
+                }
+                else
+                {
+                    ChildFrame.Width = (e.NewSize.Width - (2 * MarginTarget)) < MinChildWidth ? MinChildWidth : e.NewSize.Width - (2 * MarginTarget);
+                }
+            }
+            ChildFrame.Margin = new Thickness(0, 20, 0, 20);
+        }
+
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            if ((Application.Current.MainWindow != this) && (Application.Current.MainWindow != null))
+            {
+                Application.Current.MainWindow.Close(); // This one holds the hWnd for handling USB events and it must be closed too.
+            }
+        }
+    }
+}
diff --git a/Views/MessageView.xaml b/WPinternals/Views/MessageView.xaml
similarity index 98%
rename from Views/MessageView.xaml
rename to WPinternals/Views/MessageView.xaml
index 9f708d8..f5cdac5 100644
--- a/Views/MessageView.xaml
+++ b/WPinternals/Views/MessageView.xaml
@@ -1,48 +1,48 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.MessageView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
-    </UserControl.Resources>
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center">
-        <StackPanel Orientation="Vertical" Margin="50,25,50,25">
-            <TextBlock Text="{Binding Message}" FontSize="20" TextWrapping="WrapWithOverflow" />
-            <TextBlock TextAlignment="Left" Text="{Binding SubMessage}" Visibility="{Binding Path=SubMessage, Converter={StaticResource ObjectToVisibilityConverter}}" Margin="0,10,0,0" TextWrapping="WrapWithOverflow" >
-                <TextBlock.Foreground>
-                    <SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ControlDarkDarkColorKey}}"/>
-                </TextBlock.Foreground>
-            </TextBlock>
-            <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,20,0,0">
-                <Button Command="{Binding Path=OkCommand, Mode=OneWay}" Content="OK" Width="100" Height="Auto" Padding="0,5" Visibility="{Binding Path=OkCommand, Converter={StaticResource ObjectToVisibilityConverter}}"/>
-                <Button Command="{Binding Path=CancelCommand, Mode=OneWay}" Content="Cancel" Width="100" Height="Auto" Padding="0,5" Margin="20,0,0,0" Visibility="{Binding Path=CancelCommand, Converter={StaticResource ObjectToVisibilityConverter}}"/>
-            </StackPanel>
-        </StackPanel>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.MessageView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
+    </UserControl.Resources>
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center">
+        <StackPanel Orientation="Vertical" Margin="50,25,50,25">
+            <TextBlock Text="{Binding Message}" FontSize="20" TextWrapping="WrapWithOverflow" />
+            <TextBlock TextAlignment="Left" Text="{Binding SubMessage}" Visibility="{Binding Path=SubMessage, Converter={StaticResource ObjectToVisibilityConverter}}" Margin="0,10,0,0" TextWrapping="WrapWithOverflow" >
+                <TextBlock.Foreground>
+                    <SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ControlDarkDarkColorKey}}"/>
+                </TextBlock.Foreground>
+            </TextBlock>
+            <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,20,0,0">
+                <Button Command="{Binding Path=OkCommand, Mode=OneWay}" Content="OK" Width="100" Height="Auto" Padding="0,5" Visibility="{Binding Path=OkCommand, Converter={StaticResource ObjectToVisibilityConverter}}"/>
+                <Button Command="{Binding Path=CancelCommand, Mode=OneWay}" Content="Cancel" Width="100" Height="Auto" Padding="0,5" Margin="20,0,0,0" Visibility="{Binding Path=CancelCommand, Converter={StaticResource ObjectToVisibilityConverter}}"/>
+            </StackPanel>
+        </StackPanel>
+    </Border>
+</UserControl>
diff --git a/Views/MessageView.xaml.cs b/WPinternals/Views/MessageView.xaml.cs
similarity index 97%
rename from Views/MessageView.xaml.cs
rename to WPinternals/Views/MessageView.xaml.cs
index 56742f9..3d799f8 100644
--- a/Views/MessageView.xaml.cs
+++ b/WPinternals/Views/MessageView.xaml.cs
@@ -1,35 +1,35 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows.Controls;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for MessageView.xaml
-    /// </summary>
-    public partial class MessageView : UserControl
-    {
-        public MessageView()
-        {
-            InitializeComponent();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows.Controls;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for MessageView.xaml
+    /// </summary>
+    public partial class MessageView : UserControl
+    {
+        public MessageView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Views/NokiaBootloaderView.xaml b/WPinternals/Views/NokiaBootloaderView.xaml
similarity index 100%
rename from Views/NokiaBootloaderView.xaml
rename to WPinternals/Views/NokiaBootloaderView.xaml
diff --git a/Views/NokiaBootloaderView.xaml.cs b/WPinternals/Views/NokiaBootloaderView.xaml.cs
similarity index 100%
rename from Views/NokiaBootloaderView.xaml.cs
rename to WPinternals/Views/NokiaBootloaderView.xaml.cs
diff --git a/Views/NokiaFlashView.xaml b/WPinternals/Views/NokiaFlashView.xaml
similarity index 98%
rename from Views/NokiaFlashView.xaml
rename to WPinternals/Views/NokiaFlashView.xaml
index b4a873b..3ba845e 100644
--- a/Views/NokiaFlashView.xaml
+++ b/WPinternals/Views/NokiaFlashView.xaml
@@ -1,340 +1,340 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.NokiaFlashView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:HexConverter x:Key="HexConverter" />
-        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
-        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
-        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
-    </UserControl.Resources>
-    <StackPanel>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <StackPanel Orientation="Vertical">
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto">
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                        <local:Paragraph>
-                            <Run Text="General info" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Grid IsHitTestVisible="False">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="200" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition Height="*"/>
-                                    <RowDefinition Height="*"/>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <TextBlock Grid.Row="0" Grid.Column="0" Text="Platform name" />
-                                <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" Text="{Binding PlatformName, Mode=OneWay}" />
-                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Operating mode" />
-                                <TextBlock Grid.Row="1" Grid.Column="1" Text="Flash" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
-                                <TextBlock Grid.Row="2" Grid.Column="0" Text="Product Type" Visibility="{Binding Path=ProductType, Converter={StaticResource ObjectToVisibilityConverter}}"/>
-                                <TextBlock Grid.Row="2" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" Text="{Binding ProductType}" Visibility="{Binding Path=ProductType, Converter={StaticResource ObjectToVisibilityConverter}}"/>
-                                <TextBlock Grid.Row="3" Grid.Column="0" Text="Product Code" Visibility="{Binding Path=ProductCode, Converter={StaticResource ObjectToVisibilityConverter}}"/>
-                                <TextBlock Grid.Row="3" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" Text="{Binding ProductCode}" Visibility="{Binding Path=ProductCode, Converter={StaticResource ObjectToVisibilityConverter}}"/>
-                                <TextBlock Grid.Row="4" Grid.Column="0" Text="Charging status" />
-                                <TextBlock Grid.Row="4" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" Text="{Binding ChargingStatus}"/>
-                                <TextBlock Grid.Row="5" Grid.Column="0" Text="Storage" />
-                                <TextBlock Grid.Row="5" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" Text="{Binding eMMC}"/>
-                                <TextBlock Grid.Row="6" Grid.Column="0" Text="Bootloader" />
-                                <TextBlock Grid.Row="6" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" Text="{Binding BootloaderDescription}"/>
-                            </Grid>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=SamsungWarningVisible, Converter={StaticResource VisibilityConverter}}">
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                        <local:Paragraph>
-                            <LineBreak />
-                            <local:CollapsibleRun Text="Read the " IsVisible="{Binding SamsungWarningVisible}" />
-                            <Hyperlink NavigateUri="GettingStarted">Getting started</Hyperlink>
-                            <Run Text=" section for important information about Samsung eMMC." />
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto">
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                        <local:Paragraph>
-                            <LineBreak />
-                            <Run Text="To let the phone go back to Windows, boot to " />
-                            <Hyperlink NavigateUri="Normal">Normal</Hyperlink>
-                            <Run Text=" mode." />
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-            </StackPanel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <Expander Header="Phone identity" HorizontalContentAlignment="Stretch" Template="{DynamicResource TopicExpanderTemplate}" Margin="20,0">
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                        <local:Paragraph>
-                            <LineBreak />
-                            <Grid IsHitTestVisible="False">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="200" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <TextBlock Grid.Row="0" Grid.Column="0" Text="Root Key Hash" />
-                                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Path=RootKeyHash, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
-                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Public Phone ID" />
-                                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=PublicID, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
-                            </Grid>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-            </Expander>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20" >
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph TextAlignment="Left">
-                        <Run Text="Bootloader Security" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="If either one of these flags is green, the effective bootloader security will be disabled. When bootloader security is disabled, the phone allows unsecure actions, like entering Mass Storage mode and flashing unsigned ROM images. Phones with Bootloader Spec B can flash custom ROM's even when the bootloader security is enabled." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Grid IsHitTestVisible="False">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="200" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0" Grid.Column="0" Text="QFuse" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=BootloaderSecurityQfuseStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=BootloaderSecurityQfuseStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Valid RDC certificate" />
-                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Present" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=BootloaderSecurityRdcStatus, Converter={StaticResource VisibilityConverter}}" />
-                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Not present" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=BootloaderSecurityRdcStatus, Converter={StaticResource InverseVisibilityConverter}}"/>
-                            <TextBlock Grid.Row="2" Grid.Column="0" Text="Super dongle" />
-                            <TextBlock Grid.Row="2" Grid.Column="1" Text="Authenticated" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=BootloaderSecurityAuthenticationStatus, Converter={StaticResource VisibilityConverter}}" />
-                            <TextBlock Grid.Row="2" Grid.Column="1" Text="Not authenticated" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=BootloaderSecurityAuthenticationStatus, Converter={StaticResource InverseVisibilityConverter}}"/>
-                            <TextBlock Grid.Row="3" Grid.Column="0" Text="" />
-                            <TextBlock Grid.Row="4" Grid.Column="0" Text="Effective bootloader security" />
-                            <TextBlock Grid.Row="4" Grid.Column="1" Text="Disabled" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=EffectiveBootloaderSecurityStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="4" Grid.Column="1" Text="Enabled" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=EffectiveBootloaderSecurityStatus, Converter={StaticResource VisibilityConverter}}"/>
-                        </Grid>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20" >
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph TextAlignment="Left">
-                        <Run Text="Secure Boot technology" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="&quot;Secure Boot&quot; is part of the &quot;chain of trust&quot; in the boot process. This technology verifies the integrity of the primary Operating System binaries. If either one of these flags is green, Secure Boot is disabled and primary Operating System binaries can be replaced with custom or patched binaries. The Windows Phone Operation System also has its own integrity verifications, which still remain active. These flags only affect the security of the boot process before the Operating System is loaded." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Grid IsHitTestVisible="False">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="200" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0" Grid.Column="0" Text="UEFI" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=UefiSecureBootStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=UefiSecureBootStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Secure Boot platform" />
-                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Disabled" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=PlatformSecureBootStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Enabled" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=PlatformSecureBootStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="2" Grid.Column="0" Text="" />
-                            <TextBlock Grid.Row="3" Grid.Column="0" Text="Effective Secure Boot status" />
-                            <TextBlock Grid.Row="3" Grid.Column="1" Text="Disabled" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=EffectiveSecureBootStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="3" Grid.Column="1" Text="Enabled" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=EffectiveSecureBootStatus, Converter={StaticResource VisibilityConverter}}"/>
-                        </Grid>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20" >
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph TextAlignment="Left">
-                        <Run Text="Hardware debugging" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Hardware debugging, also known as JTAG, is disabled on most retail phones. There is technology available that allows JTAG on some platforms, even when it is disabled on the phone. More info about that here: " />
-                        <Hyperlink NavigateUri="http://www.advance-box.com/">www.advance-box.com</Hyperlink>
-                        <Run Text="." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Grid IsHitTestVisible="False">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="200" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Native JTAG debugging" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Disabled" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=NativeDebugStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Enabled" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=NativeDebugStatus, Converter={StaticResource VisibilityConverter}}"/>
-                        </Grid>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" >
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph TextAlignment="Left">
-                        <Run Text="Fuse Security" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Different fuses control different security feature's states. If one of those flags is green, the feature bound to the corresponding fuse will be enabled." />
-                        <LineBreak />
-                        <Run Text="Some fuses are detailed below:" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Bold>SECURE_BOOT (Platform Secure Boot)</Bold>
-                        <LineBreak />
-                        - Manages Secure Boot status for entire boot chain.
-                        <LineBreak />
-                        - Phones with this fuse unblown can have their bootloader partitions replaced.
-                        <LineBreak />
-                        - Spec A phones can have some of their partitions replaced when unlocked without this fuse unblown.
-                        <LineBreak />
-                        <LineBreak />
-                        <Bold>FFU_VERIFY (Secure FFU)</Bold>
-                        <LineBreak />
-                        - If unblown, the phone allows non secure sync flashing.
-                        <LineBreak />
-                        - If unblown, the phone also allows skipping security checks when flashing.
-                        <LineBreak />
-                        <LineBreak />
-                        <Bold>PRODUCTION_DONE</Bold>
-                        <LineBreak />
-                        - Indicates if the phone passed the production phase of manufacturing.
-                        <LineBreak />
-                        <LineBreak />
-                        <Bold>FAST_BOOT</Bold>
-                        <LineBreak />
-                        - If unblown, UEFI allows booting from the SD card first, if programmed to do so.
-                        <LineBreak />
-                        <LineBreak />
-                        <Grid IsHitTestVisible="False">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="200" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0" Grid.Column="0" Text="SECURE_BOOT" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSecureBootStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSecureBootStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="1" Grid.Column="0" Text="FFU_VERIFY" />
-                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigFfuVerifyStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigFfuVerifyStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="2" Grid.Column="0" Text="JTAG" />
-                            <TextBlock Grid.Row="2" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigJtagStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="2" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigJtagStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="3" Grid.Column="0" Text="SHK" />
-                            <TextBlock Grid.Row="3" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigShkStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="3" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigShkStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="4" Grid.Column="0" Text="SIMLOCK" />
-                            <TextBlock Grid.Row="4" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSimlockStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="4" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSimlockStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="5" Grid.Column="0" Text="PRODUCTION_DONE" />
-                            <TextBlock Grid.Row="5" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigProductionDoneStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="5" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigProductionDoneStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="6" Grid.Column="0" Text="RKH" />
-                            <TextBlock Grid.Row="6" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigRkhStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="6" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigRkhStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="7" Grid.Column="0" Text="PUBLIC_ID" />
-                            <TextBlock Grid.Row="7" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigPublicIdStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="7" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigPublicIdStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="8" Grid.Column="0" Text="DAK" />
-                            <TextBlock Grid.Row="8" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigDakStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="8" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigDakStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="9" Grid.Column="0" Text="SEC_GEN" />
-                            <TextBlock Grid.Row="9" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSecGenStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="9" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSecGenStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="10" Grid.Column="0" Text="OEM_ID" />
-                            <TextBlock Grid.Row="10" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigOemIdStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="10" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigOemIdStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="11" Grid.Column="0" Text="FAST_BOOT" />
-                            <TextBlock Grid.Row="11" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigFastBootStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="11" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigFastBootStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="12" Grid.Column="0" Text="SPDM_SEC_MODE" />
-                            <TextBlock Grid.Row="12" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSpdmSecModeStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="12" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSpdmSecModeStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="13" Grid.Column="0" Text="RPM_WDOG" />
-                            <TextBlock Grid.Row="13" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigRpmWdogStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="13" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigRpmWdogStatus, Converter={StaticResource VisibilityConverter}}"/>
-                            <TextBlock Grid.Row="14" Grid.Column="0" Text="SSM" />
-                            <TextBlock Grid.Row="14" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSsmStatus, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="14" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSsmStatus, Converter={StaticResource VisibilityConverter}}"/>
-                        </Grid>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.NokiaFlashView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:HexConverter x:Key="HexConverter" />
+        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
+        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
+        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
+    </UserControl.Resources>
+    <StackPanel>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <StackPanel Orientation="Vertical">
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto">
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                        <local:Paragraph>
+                            <Run Text="General info" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Grid IsHitTestVisible="False">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="200" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <TextBlock Grid.Row="0" Grid.Column="0" Text="Platform name" />
+                                <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" Text="{Binding PlatformName, Mode=OneWay}" />
+                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Operating mode" />
+                                <TextBlock Grid.Row="1" Grid.Column="1" Text="Flash" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
+                                <TextBlock Grid.Row="2" Grid.Column="0" Text="Product Type" Visibility="{Binding Path=ProductType, Converter={StaticResource ObjectToVisibilityConverter}}"/>
+                                <TextBlock Grid.Row="2" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" Text="{Binding ProductType}" Visibility="{Binding Path=ProductType, Converter={StaticResource ObjectToVisibilityConverter}}"/>
+                                <TextBlock Grid.Row="3" Grid.Column="0" Text="Product Code" Visibility="{Binding Path=ProductCode, Converter={StaticResource ObjectToVisibilityConverter}}"/>
+                                <TextBlock Grid.Row="3" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" Text="{Binding ProductCode}" Visibility="{Binding Path=ProductCode, Converter={StaticResource ObjectToVisibilityConverter}}"/>
+                                <TextBlock Grid.Row="4" Grid.Column="0" Text="Charging status" />
+                                <TextBlock Grid.Row="4" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" Text="{Binding ChargingStatus}"/>
+                                <TextBlock Grid.Row="5" Grid.Column="0" Text="Storage" />
+                                <TextBlock Grid.Row="5" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" Text="{Binding eMMC}"/>
+                                <TextBlock Grid.Row="6" Grid.Column="0" Text="Bootloader" />
+                                <TextBlock Grid.Row="6" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" Text="{Binding BootloaderDescription}"/>
+                            </Grid>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=SamsungWarningVisible, Converter={StaticResource VisibilityConverter}}">
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                        <local:Paragraph>
+                            <LineBreak />
+                            <local:CollapsibleRun Text="Read the " IsVisible="{Binding SamsungWarningVisible}" />
+                            <Hyperlink NavigateUri="GettingStarted">Getting started</Hyperlink>
+                            <Run Text=" section for important information about Samsung eMMC." />
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto">
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                        <local:Paragraph>
+                            <LineBreak />
+                            <Run Text="To let the phone go back to Windows, boot to " />
+                            <Hyperlink NavigateUri="Normal">Normal</Hyperlink>
+                            <Run Text=" mode." />
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+            </StackPanel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <Expander Header="Phone identity" HorizontalContentAlignment="Stretch" Template="{DynamicResource TopicExpanderTemplate}" Margin="20,0">
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                        <local:Paragraph>
+                            <LineBreak />
+                            <Grid IsHitTestVisible="False">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="200" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <TextBlock Grid.Row="0" Grid.Column="0" Text="Root Key Hash" />
+                                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Path=RootKeyHash, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
+                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Public Phone ID" />
+                                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=PublicID, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
+                            </Grid>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+            </Expander>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20" >
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph TextAlignment="Left">
+                        <Run Text="Bootloader Security" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="If either one of these flags is green, the effective bootloader security will be disabled. When bootloader security is disabled, the phone allows unsecure actions, like entering Mass Storage mode and flashing unsigned ROM images. Phones with Bootloader Spec B can flash custom ROM's even when the bootloader security is enabled." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Grid IsHitTestVisible="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="200" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <TextBlock Grid.Row="0" Grid.Column="0" Text="QFuse" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=BootloaderSecurityQfuseStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=BootloaderSecurityQfuseStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Valid RDC certificate" />
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Present" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=BootloaderSecurityRdcStatus, Converter={StaticResource VisibilityConverter}}" />
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Not present" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=BootloaderSecurityRdcStatus, Converter={StaticResource InverseVisibilityConverter}}"/>
+                            <TextBlock Grid.Row="2" Grid.Column="0" Text="Super dongle" />
+                            <TextBlock Grid.Row="2" Grid.Column="1" Text="Authenticated" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=BootloaderSecurityAuthenticationStatus, Converter={StaticResource VisibilityConverter}}" />
+                            <TextBlock Grid.Row="2" Grid.Column="1" Text="Not authenticated" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=BootloaderSecurityAuthenticationStatus, Converter={StaticResource InverseVisibilityConverter}}"/>
+                            <TextBlock Grid.Row="3" Grid.Column="0" Text="" />
+                            <TextBlock Grid.Row="4" Grid.Column="0" Text="Effective bootloader security" />
+                            <TextBlock Grid.Row="4" Grid.Column="1" Text="Disabled" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=EffectiveBootloaderSecurityStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="4" Grid.Column="1" Text="Enabled" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=EffectiveBootloaderSecurityStatus, Converter={StaticResource VisibilityConverter}}"/>
+                        </Grid>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20" >
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph TextAlignment="Left">
+                        <Run Text="Secure Boot technology" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="&quot;Secure Boot&quot; is part of the &quot;chain of trust&quot; in the boot process. This technology verifies the integrity of the primary Operating System binaries. If either one of these flags is green, Secure Boot is disabled and primary Operating System binaries can be replaced with custom or patched binaries. The Windows Phone Operation System also has its own integrity verifications, which still remain active. These flags only affect the security of the boot process before the Operating System is loaded." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Grid IsHitTestVisible="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="200" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <TextBlock Grid.Row="0" Grid.Column="0" Text="UEFI" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=UefiSecureBootStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=UefiSecureBootStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Secure Boot platform" />
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Disabled" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=PlatformSecureBootStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Enabled" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=PlatformSecureBootStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="2" Grid.Column="0" Text="" />
+                            <TextBlock Grid.Row="3" Grid.Column="0" Text="Effective Secure Boot status" />
+                            <TextBlock Grid.Row="3" Grid.Column="1" Text="Disabled" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=EffectiveSecureBootStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="3" Grid.Column="1" Text="Enabled" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=EffectiveSecureBootStatus, Converter={StaticResource VisibilityConverter}}"/>
+                        </Grid>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20" >
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph TextAlignment="Left">
+                        <Run Text="Hardware debugging" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Hardware debugging, also known as JTAG, is disabled on most retail phones. There is technology available that allows JTAG on some platforms, even when it is disabled on the phone. More info about that here: " />
+                        <Hyperlink NavigateUri="http://www.advance-box.com/">www.advance-box.com</Hyperlink>
+                        <Run Text="." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Grid IsHitTestVisible="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="200" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Native JTAG debugging" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Disabled" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=NativeDebugStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Enabled" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=NativeDebugStatus, Converter={StaticResource VisibilityConverter}}"/>
+                        </Grid>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" >
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph TextAlignment="Left">
+                        <Run Text="Fuse Security" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Different fuses control different security feature's states. If one of those flags is green, the feature bound to the corresponding fuse will be enabled." />
+                        <LineBreak />
+                        <Run Text="Some fuses are detailed below:" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Bold>SECURE_BOOT (Platform Secure Boot)</Bold>
+                        <LineBreak />
+                        - Manages Secure Boot status for entire boot chain.
+                        <LineBreak />
+                        - Phones with this fuse unblown can have their bootloader partitions replaced.
+                        <LineBreak />
+                        - Spec A phones can have some of their partitions replaced when unlocked without this fuse unblown.
+                        <LineBreak />
+                        <LineBreak />
+                        <Bold>FFU_VERIFY (Secure FFU)</Bold>
+                        <LineBreak />
+                        - If unblown, the phone allows non secure sync flashing.
+                        <LineBreak />
+                        - If unblown, the phone also allows skipping security checks when flashing.
+                        <LineBreak />
+                        <LineBreak />
+                        <Bold>PRODUCTION_DONE</Bold>
+                        <LineBreak />
+                        - Indicates if the phone passed the production phase of manufacturing.
+                        <LineBreak />
+                        <LineBreak />
+                        <Bold>FAST_BOOT</Bold>
+                        <LineBreak />
+                        - If unblown, UEFI allows booting from the SD card first, if programmed to do so.
+                        <LineBreak />
+                        <LineBreak />
+                        <Grid IsHitTestVisible="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="200" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <TextBlock Grid.Row="0" Grid.Column="0" Text="SECURE_BOOT" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSecureBootStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSecureBootStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="1" Grid.Column="0" Text="FFU_VERIFY" />
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigFfuVerifyStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigFfuVerifyStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="2" Grid.Column="0" Text="JTAG" />
+                            <TextBlock Grid.Row="2" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigJtagStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="2" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigJtagStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="3" Grid.Column="0" Text="SHK" />
+                            <TextBlock Grid.Row="3" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigShkStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="3" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigShkStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="4" Grid.Column="0" Text="SIMLOCK" />
+                            <TextBlock Grid.Row="4" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSimlockStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="4" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSimlockStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="5" Grid.Column="0" Text="PRODUCTION_DONE" />
+                            <TextBlock Grid.Row="5" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigProductionDoneStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="5" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigProductionDoneStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="6" Grid.Column="0" Text="RKH" />
+                            <TextBlock Grid.Row="6" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigRkhStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="6" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigRkhStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="7" Grid.Column="0" Text="PUBLIC_ID" />
+                            <TextBlock Grid.Row="7" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigPublicIdStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="7" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigPublicIdStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="8" Grid.Column="0" Text="DAK" />
+                            <TextBlock Grid.Row="8" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigDakStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="8" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigDakStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="9" Grid.Column="0" Text="SEC_GEN" />
+                            <TextBlock Grid.Row="9" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSecGenStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="9" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSecGenStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="10" Grid.Column="0" Text="OEM_ID" />
+                            <TextBlock Grid.Row="10" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigOemIdStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="10" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigOemIdStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="11" Grid.Column="0" Text="FAST_BOOT" />
+                            <TextBlock Grid.Row="11" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigFastBootStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="11" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigFastBootStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="12" Grid.Column="0" Text="SPDM_SEC_MODE" />
+                            <TextBlock Grid.Row="12" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSpdmSecModeStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="12" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSpdmSecModeStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="13" Grid.Column="0" Text="RPM_WDOG" />
+                            <TextBlock Grid.Row="13" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigRpmWdogStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="13" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigRpmWdogStatus, Converter={StaticResource VisibilityConverter}}"/>
+                            <TextBlock Grid.Row="14" Grid.Column="0" Text="SSM" />
+                            <TextBlock Grid.Row="14" Grid.Column="1" Text="Not blown" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSsmStatus, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="14" Grid.Column="1" Text="Blown" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=FinalConfigSsmStatus, Converter={StaticResource VisibilityConverter}}"/>
+                        </Grid>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/NokiaFlashView.xaml.cs b/WPinternals/Views/NokiaFlashView.xaml.cs
similarity index 97%
rename from Views/NokiaFlashView.xaml.cs
rename to WPinternals/Views/NokiaFlashView.xaml.cs
index 6bf9a3d..2567fa2 100644
--- a/Views/NokiaFlashView.xaml.cs
+++ b/WPinternals/Views/NokiaFlashView.xaml.cs
@@ -1,54 +1,54 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for NokiaFlashView.xaml
-    /// </summary>
-    public partial class NokiaFlashView : UserControl
-    {
-        public NokiaFlashView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            Hyperlink link = args.Source as Hyperlink;
-            if (link?.NavigateUri != null)
-            {
-                if (link.NavigateUri.ToString() == "GettingStarted")
-                {
-                    (this.DataContext as NokiaFlashViewModel)?.SwitchToGettingStarted();
-                } (this.DataContext as NokiaFlashViewModel)?.RebootTo(link.NavigateUri.ToString());
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for NokiaFlashView.xaml
+    /// </summary>
+    public partial class NokiaFlashView : UserControl
+    {
+        public NokiaFlashView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            Hyperlink link = args.Source as Hyperlink;
+            if (link?.NavigateUri != null)
+            {
+                if (link.NavigateUri.ToString() == "GettingStarted")
+                {
+                    (this.DataContext as NokiaFlashViewModel)?.SwitchToGettingStarted();
+                } (this.DataContext as NokiaFlashViewModel)?.RebootTo(link.NavigateUri.ToString());
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/NokiaLabelView.xaml b/WPinternals/Views/NokiaLabelView.xaml
similarity index 98%
rename from Views/NokiaLabelView.xaml
rename to WPinternals/Views/NokiaLabelView.xaml
index 5368ec8..aea6157 100644
--- a/Views/NokiaLabelView.xaml
+++ b/WPinternals/Views/NokiaLabelView.xaml
@@ -1,110 +1,110 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.NokiaLabelView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:HexConverter x:Key="MACConverter" Separator=":" />
-        <local:HexConverter x:Key="HexConverter" />
-        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
-        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
-    </UserControl.Resources>
-    <StackPanel VerticalAlignment="Center">
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="General info" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Grid IsHitTestVisible="False">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="200" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Brand / model" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap">
-                                <TextBlock.Text>
-                                    <MultiBinding StringFormat="Nokia Lumia {0}">
-                                        <Binding Path="ManufacturerModelName" />
-                                    </MultiBinding>
-                                </TextBlock.Text>
-                            </TextBlock>
-                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Operating mode" />
-                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Label" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
-                            <TextBlock Grid.Row="2" Grid.Column="0" Text="Product code" />
-                            <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=ProductCode}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap"/>
-                            <TextBlock Grid.Row="3" Grid.Column="0" Text="Firmware version" />
-                            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=Firmware}" TextWrapping="Wrap" />
-                        </Grid>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" ><!-- Margin="0,0,0,20" -->
-            <Expander Header="Phone identity" HorizontalContentAlignment="Stretch" Template="{DynamicResource TopicExpanderTemplate}" Margin="20,0">
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                        <local:Paragraph>
-                            <LineBreak />
-                            <Grid IsHitTestVisible="False">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="200" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <TextBlock Grid.Row="0" Grid.Column="0" Text="IMEI" />
-                                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Path=IMEI}" TextWrapping="Wrap" />
-                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Root Key Hash" />
-                                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=RootKeyHash, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
-                                <TextBlock Grid.Row="2" Grid.Column="0" Text="Public Phone ID" />
-                                <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=PublicID, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
-                                <TextBlock Grid.Row="3" Grid.Column="0" Text="WLAN MAC" />
-                                <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=WlanMac, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap"/>
-                                <TextBlock Grid.Row="4" Grid.Column="0" Text="Bluetooth MAC" />
-                                <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=BluetoothMac, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap" />
-                            </Grid>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-            </Expander>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.NokiaLabelView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:HexConverter x:Key="MACConverter" Separator=":" />
+        <local:HexConverter x:Key="HexConverter" />
+        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
+        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
+    </UserControl.Resources>
+    <StackPanel VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="General info" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Grid IsHitTestVisible="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="200" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Brand / model" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap">
+                                <TextBlock.Text>
+                                    <MultiBinding StringFormat="Nokia Lumia {0}">
+                                        <Binding Path="ManufacturerModelName" />
+                                    </MultiBinding>
+                                </TextBlock.Text>
+                            </TextBlock>
+                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Operating mode" />
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Label" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
+                            <TextBlock Grid.Row="2" Grid.Column="0" Text="Product code" />
+                            <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=ProductCode}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap"/>
+                            <TextBlock Grid.Row="3" Grid.Column="0" Text="Firmware version" />
+                            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=Firmware}" TextWrapping="Wrap" />
+                        </Grid>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" ><!-- Margin="0,0,0,20" -->
+            <Expander Header="Phone identity" HorizontalContentAlignment="Stretch" Template="{DynamicResource TopicExpanderTemplate}" Margin="20,0">
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                        <local:Paragraph>
+                            <LineBreak />
+                            <Grid IsHitTestVisible="False">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="200" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <TextBlock Grid.Row="0" Grid.Column="0" Text="IMEI" />
+                                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Path=IMEI}" TextWrapping="Wrap" />
+                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Root Key Hash" />
+                                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=RootKeyHash, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
+                                <TextBlock Grid.Row="2" Grid.Column="0" Text="Public Phone ID" />
+                                <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=PublicID, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
+                                <TextBlock Grid.Row="3" Grid.Column="0" Text="WLAN MAC" />
+                                <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=WlanMac, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap"/>
+                                <TextBlock Grid.Row="4" Grid.Column="0" Text="Bluetooth MAC" />
+                                <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=BluetoothMac, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap" />
+                            </Grid>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+            </Expander>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/NokiaLabelView.xaml.cs b/WPinternals/Views/NokiaLabelView.xaml.cs
similarity index 97%
rename from Views/NokiaLabelView.xaml.cs
rename to WPinternals/Views/NokiaLabelView.xaml.cs
index 6a556b2..482b20a 100644
--- a/Views/NokiaLabelView.xaml.cs
+++ b/WPinternals/Views/NokiaLabelView.xaml.cs
@@ -1,47 +1,47 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for NokiaLabelView.xaml
-    /// </summary>
-    public partial class NokiaLabelView : UserControl
-    {
-        public NokiaLabelView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            Hyperlink link = args.Source as Hyperlink;
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for NokiaLabelView.xaml
+    /// </summary>
+    public partial class NokiaLabelView : UserControl
+    {
+        public NokiaLabelView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            Hyperlink link = args.Source as Hyperlink;
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/NokiaMassStorageView.xaml b/WPinternals/Views/NokiaMassStorageView.xaml
similarity index 98%
rename from Views/NokiaMassStorageView.xaml
rename to WPinternals/Views/NokiaMassStorageView.xaml
index 383eb09..51c4e69 100644
--- a/Views/NokiaMassStorageView.xaml
+++ b/WPinternals/Views/NokiaMassStorageView.xaml
@@ -1,66 +1,66 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.NokiaMassStorageView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
-        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" >
-            <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded">
-                <local:Paragraph>
-                    <Run Text="Nokia Lumia - Mass Storage mode" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="You can now access the file-system of the phone from your PC at drive " />
-                    <Run Text="{Binding Drive, Mode=OneTime}" FontWeight="Bold" />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 1: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="Be very careful with altering files. You can easily brick your phone, when you make invalid changes to the file-system of the phone." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 2: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="If you try to access a partition and it cannot be accessed, then DO NOT FORMAT IT! Also when you are asked to format it, DON'T DO THAT!" />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 3: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="While in Mass Storage Mode the phone-battery will not charge. When battery is low, the phone will automatically reboot to Normal Mode." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 4: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="Never format or delete the boot-partitions! Take special care with the DPP partition. Do not format or delete this partition, bacause there is no known method to recover the phone after that (except with special equipment to access eMMC directly)." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="How to reboot back to normal mode" FontWeight="Bold" Foreground="#FF3753A6" />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="When the phone is in Mass Storage mode, it also exposes a special version of the Qualcomm Emergency Download mode. That mode supports reboot-commands. But those are blocked by Mass Storage mode, so this tool is not able to reboot your phone to normal mode. But this is not a problem. To escape from Mass Storage mode you have to perform a soft-reset. Older Lumia models require you to press and hold the volume-down-button and the power-button at the same time for at least 10 seconds. New Lumia models only require to press and hold the power-button for 10 seconds. This will trigger a power-cycle and the phone will reboot. Once fully booted, the phone may show strange behavior, like complaining about mail-accounts, showing old text-messages, inability to load https-websites, etc. This is expected behavior, because the time-settings of the phone are incorrect. Just wait a few seconds for the phone to get a data-connection and have the date/time synced. After that the strange behavior will stop automatically and normal operation is resumed." />
-                </local:Paragraph>
-            </FlowDocument>
-        </local:FlowDocumentScrollViewerNoMouseWheel>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.NokiaMassStorageView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
+        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" >
+            <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded">
+                <local:Paragraph>
+                    <Run Text="Nokia Lumia - Mass Storage mode" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="You can now access the file-system of the phone from your PC at drive " />
+                    <Run Text="{Binding Drive, Mode=OneTime}" FontWeight="Bold" />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 1: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="Be very careful with altering files. You can easily brick your phone, when you make invalid changes to the file-system of the phone." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 2: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="If you try to access a partition and it cannot be accessed, then DO NOT FORMAT IT! Also when you are asked to format it, DON'T DO THAT!" />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 3: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="While in Mass Storage Mode the phone-battery will not charge. When battery is low, the phone will automatically reboot to Normal Mode." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 4: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="Never format or delete the boot-partitions! Take special care with the DPP partition. Do not format or delete this partition, bacause there is no known method to recover the phone after that (except with special equipment to access eMMC directly)." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="How to reboot back to normal mode" FontWeight="Bold" Foreground="#FF3753A6" />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="When the phone is in Mass Storage mode, it also exposes a special version of the Qualcomm Emergency Download mode. That mode supports reboot-commands. But those are blocked by Mass Storage mode, so this tool is not able to reboot your phone to normal mode. But this is not a problem. To escape from Mass Storage mode you have to perform a soft-reset. Older Lumia models require you to press and hold the volume-down-button and the power-button at the same time for at least 10 seconds. New Lumia models only require to press and hold the power-button for 10 seconds. This will trigger a power-cycle and the phone will reboot. Once fully booted, the phone may show strange behavior, like complaining about mail-accounts, showing old text-messages, inability to load https-websites, etc. This is expected behavior, because the time-settings of the phone are incorrect. Just wait a few seconds for the phone to get a data-connection and have the date/time synced. After that the strange behavior will stop automatically and normal operation is resumed." />
+                </local:Paragraph>
+            </FlowDocument>
+        </local:FlowDocumentScrollViewerNoMouseWheel>
+    </Border>
+</UserControl>
diff --git a/Views/NokiaMassStorageView.xaml.cs b/WPinternals/Views/NokiaMassStorageView.xaml.cs
similarity index 97%
rename from Views/NokiaMassStorageView.xaml.cs
rename to WPinternals/Views/NokiaMassStorageView.xaml.cs
index 087cc39..d0bbfc7 100644
--- a/Views/NokiaMassStorageView.xaml.cs
+++ b/WPinternals/Views/NokiaMassStorageView.xaml.cs
@@ -1,47 +1,47 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for NokiaMassStorageView.xaml
-    /// </summary>
-    public partial class NokiaMassStorageView : UserControl
-    {
-        public NokiaMassStorageView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            Hyperlink link = args.Source as Hyperlink;
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for NokiaMassStorageView.xaml
+    /// </summary>
+    public partial class NokiaMassStorageView : UserControl
+    {
+        public NokiaMassStorageView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            Hyperlink link = args.Source as Hyperlink;
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/NokiaModeBootloaderView.xaml b/WPinternals/Views/NokiaModeBootloaderView.xaml
similarity index 100%
rename from Views/NokiaModeBootloaderView.xaml
rename to WPinternals/Views/NokiaModeBootloaderView.xaml
diff --git a/Views/NokiaModeBootloaderView.xaml.cs b/WPinternals/Views/NokiaModeBootloaderView.xaml.cs
similarity index 100%
rename from Views/NokiaModeBootloaderView.xaml.cs
rename to WPinternals/Views/NokiaModeBootloaderView.xaml.cs
diff --git a/Views/NokiaModeFlashView.xaml b/WPinternals/Views/NokiaModeFlashView.xaml
similarity index 98%
rename from Views/NokiaModeFlashView.xaml
rename to WPinternals/Views/NokiaModeFlashView.xaml
index fb635a8..fb56c3e 100644
--- a/Views/NokiaModeFlashView.xaml
+++ b/WPinternals/Views/NokiaModeFlashView.xaml
@@ -1,92 +1,92 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.NokiaModeFlashView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" />
-        <local:BooleanConverter x:Key="InvisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" />
-        <local:BooleanConverter x:Key="InverseConverter" OnTrue="False" OnFalse="True" />
-    </UserControl.Resources>
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
-        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" >
-            <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                <FlowDocument.Resources>
-                    <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                    <Style TargetType="{x:Type Paragraph}">
-                        <Setter Property="Margin" Value="0"/>
-                    </Style>
-                    <Style TargetType="{x:Type Section}">
-                        <Setter Property="Margin" Value="0"/>
-                    </Style>
-                </FlowDocument.Resources>
-                <local:Paragraph>
-                    <Run Text="Nokia Lumia - Switch mode" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Current mode: " />
-                    <Run Text="Flash" Foreground="#FF3753A6" FontWeight="Bold" />
-                    <LineBreak />
-                    <LineBreak />
-                    <Hyperlink NavigateUri="Normal">Switch to Normal-mode</Hyperlink>
-                    <LineBreak />
-                    <Run Text="This will switch back to Windows Phone OS." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Hyperlink NavigateUri="Label">Switch to Label-mode</Hyperlink>
-                    <LineBreak />
-                    <Run Text="This interface is meant for querying and provisioning the phone. This is normally used for configuring the phone during manufacturing." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Hyperlink NavigateUri="MassStorage">Switch to Mass-Storage-mode</Hyperlink>
-                    <LineBreak />
-                    <Run Text="This mode allows you to access the complete file-system of the phone. " />
-                    <local:CollapsibleRun IsVisible="{Binding EffectiveBootloaderSecurityStatus, Mode=OneWay}" Text="Your security flags indicate that this mode is prohibited on this phone."/>
-                    <local:CollapsibleRun IsVisible="{Binding EffectiveBootloaderSecurityStatus, Converter={StaticResource InverseConverter}, Mode=OneWay}" Text="Your security flags indicate the this mode can be accessed. But this switch will only succeed if you took all measures to unlock Mass Storage mode." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Hyperlink NavigateUri="Shutdown">Shutdown the phone</Hyperlink>
-                    <LineBreak />
-                    <Run Text="This will shutdown your phone. After selecting this option, you'll need to unplug your phone from your computer." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 1: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="Once you've entered Mass Storage mode, be very careful with altering files. You can easily brick your phone, when you make invalid changes to the file-system of the phone." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 2: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="Before switching to Mass Storage Mode, verify that you do not have any other Windows Phone disks or partitions mounted. The partitions may have equal identifiers, which will result in a conflict. The phone partitions will be mounted &quot;offline&quot; and if you try to switch them &quot;online&quot; in the Disk Manager, it will corrupt the partitions on the phone. Unmount any Windows Phone partitions before you continue." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 3: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="Switching to Mass Storage mode should take about 10 seconds. Phones with Bootloader Spec A should be unlocked using an Engineering SBL3 to enable Mass Storage mode. When you unlocked the bootloader, but you did not use an Engineering SBL3, an attempt to boot to Mass Storage mode may result in an unresponsive state. Installing drivers for this interface may also cause to hang the PC. So when this switch is taking too long, you should reboot both the PC and the phone." />
-                </local:Paragraph>
-            </FlowDocument>
-        </local:FlowDocumentScrollViewerNoMouseWheel>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.NokiaModeFlashView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" />
+        <local:BooleanConverter x:Key="InvisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" />
+        <local:BooleanConverter x:Key="InverseConverter" OnTrue="False" OnFalse="True" />
+    </UserControl.Resources>
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
+        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" >
+            <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                <FlowDocument.Resources>
+                    <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                    <Style TargetType="{x:Type Paragraph}">
+                        <Setter Property="Margin" Value="0"/>
+                    </Style>
+                    <Style TargetType="{x:Type Section}">
+                        <Setter Property="Margin" Value="0"/>
+                    </Style>
+                </FlowDocument.Resources>
+                <local:Paragraph>
+                    <Run Text="Nokia Lumia - Switch mode" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Current mode: " />
+                    <Run Text="Flash" Foreground="#FF3753A6" FontWeight="Bold" />
+                    <LineBreak />
+                    <LineBreak />
+                    <Hyperlink NavigateUri="Normal">Switch to Normal-mode</Hyperlink>
+                    <LineBreak />
+                    <Run Text="This will switch back to Windows Phone OS." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Hyperlink NavigateUri="Label">Switch to Label-mode</Hyperlink>
+                    <LineBreak />
+                    <Run Text="This interface is meant for querying and provisioning the phone. This is normally used for configuring the phone during manufacturing." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Hyperlink NavigateUri="MassStorage">Switch to Mass-Storage-mode</Hyperlink>
+                    <LineBreak />
+                    <Run Text="This mode allows you to access the complete file-system of the phone. " />
+                    <local:CollapsibleRun IsVisible="{Binding EffectiveBootloaderSecurityStatus, Mode=OneWay}" Text="Your security flags indicate that this mode is prohibited on this phone."/>
+                    <local:CollapsibleRun IsVisible="{Binding EffectiveBootloaderSecurityStatus, Converter={StaticResource InverseConverter}, Mode=OneWay}" Text="Your security flags indicate the this mode can be accessed. But this switch will only succeed if you took all measures to unlock Mass Storage mode." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Hyperlink NavigateUri="Shutdown">Shutdown the phone</Hyperlink>
+                    <LineBreak />
+                    <Run Text="This will shutdown your phone. After selecting this option, you'll need to unplug your phone from your computer." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 1: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="Once you've entered Mass Storage mode, be very careful with altering files. You can easily brick your phone, when you make invalid changes to the file-system of the phone." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 2: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="Before switching to Mass Storage Mode, verify that you do not have any other Windows Phone disks or partitions mounted. The partitions may have equal identifiers, which will result in a conflict. The phone partitions will be mounted &quot;offline&quot; and if you try to switch them &quot;online&quot; in the Disk Manager, it will corrupt the partitions on the phone. Unmount any Windows Phone partitions before you continue." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 3: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="Switching to Mass Storage mode should take about 10 seconds. Phones with Bootloader Spec A should be unlocked using an Engineering SBL3 to enable Mass Storage mode. When you unlocked the bootloader, but you did not use an Engineering SBL3, an attempt to boot to Mass Storage mode may result in an unresponsive state. Installing drivers for this interface may also cause to hang the PC. So when this switch is taking too long, you should reboot both the PC and the phone." />
+                </local:Paragraph>
+            </FlowDocument>
+        </local:FlowDocumentScrollViewerNoMouseWheel>
+    </Border>
+</UserControl>
diff --git a/Views/NokiaModeFlashView.xaml.cs b/WPinternals/Views/NokiaModeFlashView.xaml.cs
similarity index 97%
rename from Views/NokiaModeFlashView.xaml.cs
rename to WPinternals/Views/NokiaModeFlashView.xaml.cs
index 7d8a887..92a0add 100644
--- a/Views/NokiaModeFlashView.xaml.cs
+++ b/WPinternals/Views/NokiaModeFlashView.xaml.cs
@@ -1,50 +1,50 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for NokiaModeFlashView.xaml
-    /// </summary>
-    public partial class NokiaModeFlashView : UserControl
-    {
-        public NokiaModeFlashView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                (this.DataContext as NokiaModeFlashViewModel)?.RebootTo(link.NavigateUri.ToString());
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for NokiaModeFlashView.xaml
+    /// </summary>
+    public partial class NokiaModeFlashView : UserControl
+    {
+        public NokiaModeFlashView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                (this.DataContext as NokiaModeFlashViewModel)?.RebootTo(link.NavigateUri.ToString());
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/NokiaModeLabelView.xaml b/WPinternals/Views/NokiaModeLabelView.xaml
similarity index 98%
rename from Views/NokiaModeLabelView.xaml
rename to WPinternals/Views/NokiaModeLabelView.xaml
index 5b9d3c5..50fe4dd 100644
--- a/Views/NokiaModeLabelView.xaml
+++ b/WPinternals/Views/NokiaModeLabelView.xaml
@@ -1,86 +1,86 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.NokiaModeLabelView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" />
-        <local:BooleanConverter x:Key="InvisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" />
-        <local:BooleanConverter x:Key="InverseConverter" OnTrue="False" OnFalse="True" />
-    </UserControl.Resources>
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
-        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" >
-            <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                <FlowDocument.Resources>
-                    <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                    <Style TargetType="{x:Type Paragraph}">
-                        <Setter Property="Margin" Value="0"/>
-                    </Style>
-                    <Style TargetType="{x:Type Section}">
-                        <Setter Property="Margin" Value="0"/>
-                    </Style>
-                </FlowDocument.Resources>
-                <local:Paragraph>
-                    <Run Text="Nokia Lumia - Switch mode" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Current mode: " />
-                    <Run Text="Label" Foreground="#FF3753A6" FontWeight="Bold" />
-                    <LineBreak />
-                    <LineBreak />
-                    <Hyperlink NavigateUri="Normal">Switch to Normal-mode</Hyperlink>
-                    <LineBreak />
-                    <Run Text="This will switch back to Windows Phone OS." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Hyperlink NavigateUri="Flash">Switch to Flash-mode</Hyperlink>
-                    <LineBreak />
-                    <Run Text="This is the interface that can be used to flash a new ROM image. It can also be used to retrieve additional info and security status." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Hyperlink NavigateUri="MassStorage">Switch to Mass-Storage-mode</Hyperlink>
-                    <LineBreak />
-                    <Run Text="This mode allows you to access the complete file-system of the phone. " />
-                    <Run Text="To enter this mode the phone will first be booted to Flash mode. After that this tool will immediately attempt to boot the phone to Mass Storage mode. So you may see your phone reboot multiple times." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 1: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="Once you've entered Mass Storage mode, be very careful with altering files. You can easily brick your phone, when you make invalid changes to the file-system of the phone." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 2: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="Before switching to Mass Storage Mode, verify that you do not have any other Windows Phone disks or partitions mounted. The partitions may have equal identifiers, which will result in a conflict. The phone partitions will be mounted &quot;offline&quot; and if you try to switch them &quot;online&quot; in the Disk Manager, it will corrupt the partitions on the phone. Unmount any Windows Phone partitions before you continue." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 3: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="Switching to Mass Storage mode should take about 10 seconds. Phones with Bootloader Spec A should be unlocked using an Engineering SBL3 to enable Mass Storage mode. When you unlocked the bootloader, but you did not use an Engineering SBL3, an attempt to boot to Mass Storage mode may result in an unresponsive state. Installing drivers for this interface may also cause to hang the PC. So when this switch is taking too long, you should reboot both the PC and the phone." />
-                </local:Paragraph>
-            </FlowDocument>
-        </local:FlowDocumentScrollViewerNoMouseWheel>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.NokiaModeLabelView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" />
+        <local:BooleanConverter x:Key="InvisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" />
+        <local:BooleanConverter x:Key="InverseConverter" OnTrue="False" OnFalse="True" />
+    </UserControl.Resources>
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
+        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" >
+            <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                <FlowDocument.Resources>
+                    <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                    <Style TargetType="{x:Type Paragraph}">
+                        <Setter Property="Margin" Value="0"/>
+                    </Style>
+                    <Style TargetType="{x:Type Section}">
+                        <Setter Property="Margin" Value="0"/>
+                    </Style>
+                </FlowDocument.Resources>
+                <local:Paragraph>
+                    <Run Text="Nokia Lumia - Switch mode" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Current mode: " />
+                    <Run Text="Label" Foreground="#FF3753A6" FontWeight="Bold" />
+                    <LineBreak />
+                    <LineBreak />
+                    <Hyperlink NavigateUri="Normal">Switch to Normal-mode</Hyperlink>
+                    <LineBreak />
+                    <Run Text="This will switch back to Windows Phone OS." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Hyperlink NavigateUri="Flash">Switch to Flash-mode</Hyperlink>
+                    <LineBreak />
+                    <Run Text="This is the interface that can be used to flash a new ROM image. It can also be used to retrieve additional info and security status." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Hyperlink NavigateUri="MassStorage">Switch to Mass-Storage-mode</Hyperlink>
+                    <LineBreak />
+                    <Run Text="This mode allows you to access the complete file-system of the phone. " />
+                    <Run Text="To enter this mode the phone will first be booted to Flash mode. After that this tool will immediately attempt to boot the phone to Mass Storage mode. So you may see your phone reboot multiple times." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 1: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="Once you've entered Mass Storage mode, be very careful with altering files. You can easily brick your phone, when you make invalid changes to the file-system of the phone." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 2: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="Before switching to Mass Storage Mode, verify that you do not have any other Windows Phone disks or partitions mounted. The partitions may have equal identifiers, which will result in a conflict. The phone partitions will be mounted &quot;offline&quot; and if you try to switch them &quot;online&quot; in the Disk Manager, it will corrupt the partitions on the phone. Unmount any Windows Phone partitions before you continue." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 3: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="Switching to Mass Storage mode should take about 10 seconds. Phones with Bootloader Spec A should be unlocked using an Engineering SBL3 to enable Mass Storage mode. When you unlocked the bootloader, but you did not use an Engineering SBL3, an attempt to boot to Mass Storage mode may result in an unresponsive state. Installing drivers for this interface may also cause to hang the PC. So when this switch is taking too long, you should reboot both the PC and the phone." />
+                </local:Paragraph>
+            </FlowDocument>
+        </local:FlowDocumentScrollViewerNoMouseWheel>
+    </Border>
+</UserControl>
diff --git a/Views/NokiaModeLabelView.xaml.cs b/WPinternals/Views/NokiaModeLabelView.xaml.cs
similarity index 97%
rename from Views/NokiaModeLabelView.xaml.cs
rename to WPinternals/Views/NokiaModeLabelView.xaml.cs
index 5363f25..5f405e2 100644
--- a/Views/NokiaModeLabelView.xaml.cs
+++ b/WPinternals/Views/NokiaModeLabelView.xaml.cs
@@ -1,50 +1,50 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for NokiaModeLabelView.xaml
-    /// </summary>
-    public partial class NokiaModeLabelView : UserControl
-    {
-        public NokiaModeLabelView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                (this.DataContext as NokiaModeLabelViewModel)?.RebootTo(link.NavigateUri.ToString());
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for NokiaModeLabelView.xaml
+    /// </summary>
+    public partial class NokiaModeLabelView : UserControl
+    {
+        public NokiaModeLabelView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                (this.DataContext as NokiaModeLabelViewModel)?.RebootTo(link.NavigateUri.ToString());
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/NokiaModeMassStorageView.xaml b/WPinternals/Views/NokiaModeMassStorageView.xaml
similarity index 98%
rename from Views/NokiaModeMassStorageView.xaml
rename to WPinternals/Views/NokiaModeMassStorageView.xaml
index 431ab37..c101c47 100644
--- a/Views/NokiaModeMassStorageView.xaml
+++ b/WPinternals/Views/NokiaModeMassStorageView.xaml
@@ -1,119 +1,119 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.NokiaModeMassStorageView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" />
-        <local:BooleanConverter x:Key="InvisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" />
-        <local:BooleanConverter x:Key="InverseConverter" OnTrue="False" OnFalse="True" />
-    </UserControl.Resources>
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
-        <Grid>
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=SupportsReboot, Converter={StaticResource InvisibilityConverter}}" >
-                <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                    <FlowDocument.Resources>
-                        <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                        <Style TargetType="{x:Type Paragraph}">
-                            <Setter Property="Margin" Value="0"/>
-                        </Style>
-                        <Style TargetType="{x:Type Section}">
-                            <Setter Property="Margin" Value="0"/>
-                        </Style>
-                    </FlowDocument.Resources>
-                    <local:Paragraph>
-                        <Run Text="Nokia Lumia - Switch mode" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Current mode: " />
-                        <Run Text="Mass Storage" Foreground="#FF3753A6" FontWeight="Bold" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Currently it is not possible to switch from Mass Storage mode to another mode. You can press and hold the power-button and volume-down to soft-reset the phone. You will then boot to Windows Phone OS." />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=SupportsReboot, Converter={StaticResource VisibilityConverter}}" >
-                <FlowDocument x:Name="Document2" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                    <FlowDocument.Resources>
-                        <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                        <Style TargetType="{x:Type Paragraph}">
-                            <Setter Property="Margin" Value="0"/>
-                        </Style>
-                        <Style TargetType="{x:Type Section}">
-                            <Setter Property="Margin" Value="0"/>
-                        </Style>
-                    </FlowDocument.Resources>
-                    <local:Paragraph>
-                        <Run Text="Nokia Lumia - Switch mode" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Current mode: " />
-                        <Run Text="Mass Storage" Foreground="#FF3753A6" FontWeight="Bold" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Hyperlink NavigateUri="Normal">Switch to Normal-mode</Hyperlink>
-                        <LineBreak />
-                        <Run Text="This will switch back to Windows Phone OS." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Hyperlink NavigateUri="Label">Switch to Label-mode</Hyperlink>
-                        <LineBreak />
-                        <Run Text="This interface is meant for querying and provisioning the phone. This is normally used for configuring the phone during manufacturing." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Hyperlink NavigateUri="Flash">Switch to Flash-mode</Hyperlink>
-                        <LineBreak />
-                        <Run Text="This is the interface that can be used to flash a new ROM image. It can also be used to retrieve additional info and security status." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Hyperlink NavigateUri="Shutdown">Shutdown the phone</Hyperlink>
-                        <LineBreak />
-                        <Run Text="This will shutdown your phone. After selecting this option, you'll need to unplug your phone from your computer." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Warning 1: " Foreground="Red" FontWeight="Bold"/>
-                        <Run Text="Be very careful with altering files. You can easily brick your phone, when you make invalid changes to the file-system of the phone." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Warning 2: " Foreground="Red" FontWeight="Bold"/>
-                        <Run Text="If you try to access a partition and it cannot be accessed, then DO NOT FORMAT IT! Also when you are asked to format it, DON'T DO THAT!" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Warning 3: " Foreground="Red" FontWeight="Bold"/>
-                        <Run Text="While in Mass Storage Mode the phone-battery will not charge. When battery is low, the phone will automatically reboot to Normal Mode." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="Warning 4: " Foreground="Red" FontWeight="Bold"/>
-                        <Run Text="Never format or delete the boot-partitions! Take special care with the DPP partition. Do not format or delete this partition, bacause there is no known method to recover the phone after that (except with special equipment to access eMMC directly)." />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Grid>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.NokiaModeMassStorageView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" />
+        <local:BooleanConverter x:Key="InvisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" />
+        <local:BooleanConverter x:Key="InverseConverter" OnTrue="False" OnFalse="True" />
+    </UserControl.Resources>
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
+        <Grid>
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=SupportsReboot, Converter={StaticResource InvisibilityConverter}}" >
+                <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                    <FlowDocument.Resources>
+                        <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                        <Style TargetType="{x:Type Paragraph}">
+                            <Setter Property="Margin" Value="0"/>
+                        </Style>
+                        <Style TargetType="{x:Type Section}">
+                            <Setter Property="Margin" Value="0"/>
+                        </Style>
+                    </FlowDocument.Resources>
+                    <local:Paragraph>
+                        <Run Text="Nokia Lumia - Switch mode" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Current mode: " />
+                        <Run Text="Mass Storage" Foreground="#FF3753A6" FontWeight="Bold" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Currently it is not possible to switch from Mass Storage mode to another mode. You can press and hold the power-button and volume-down to soft-reset the phone. You will then boot to Windows Phone OS." />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" Visibility="{Binding Path=SupportsReboot, Converter={StaticResource VisibilityConverter}}" >
+                <FlowDocument x:Name="Document2" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                    <FlowDocument.Resources>
+                        <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                        <Style TargetType="{x:Type Paragraph}">
+                            <Setter Property="Margin" Value="0"/>
+                        </Style>
+                        <Style TargetType="{x:Type Section}">
+                            <Setter Property="Margin" Value="0"/>
+                        </Style>
+                    </FlowDocument.Resources>
+                    <local:Paragraph>
+                        <Run Text="Nokia Lumia - Switch mode" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Current mode: " />
+                        <Run Text="Mass Storage" Foreground="#FF3753A6" FontWeight="Bold" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Hyperlink NavigateUri="Normal">Switch to Normal-mode</Hyperlink>
+                        <LineBreak />
+                        <Run Text="This will switch back to Windows Phone OS." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Hyperlink NavigateUri="Label">Switch to Label-mode</Hyperlink>
+                        <LineBreak />
+                        <Run Text="This interface is meant for querying and provisioning the phone. This is normally used for configuring the phone during manufacturing." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Hyperlink NavigateUri="Flash">Switch to Flash-mode</Hyperlink>
+                        <LineBreak />
+                        <Run Text="This is the interface that can be used to flash a new ROM image. It can also be used to retrieve additional info and security status." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Hyperlink NavigateUri="Shutdown">Shutdown the phone</Hyperlink>
+                        <LineBreak />
+                        <Run Text="This will shutdown your phone. After selecting this option, you'll need to unplug your phone from your computer." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Warning 1: " Foreground="Red" FontWeight="Bold"/>
+                        <Run Text="Be very careful with altering files. You can easily brick your phone, when you make invalid changes to the file-system of the phone." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Warning 2: " Foreground="Red" FontWeight="Bold"/>
+                        <Run Text="If you try to access a partition and it cannot be accessed, then DO NOT FORMAT IT! Also when you are asked to format it, DON'T DO THAT!" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Warning 3: " Foreground="Red" FontWeight="Bold"/>
+                        <Run Text="While in Mass Storage Mode the phone-battery will not charge. When battery is low, the phone will automatically reboot to Normal Mode." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="Warning 4: " Foreground="Red" FontWeight="Bold"/>
+                        <Run Text="Never format or delete the boot-partitions! Take special care with the DPP partition. Do not format or delete this partition, bacause there is no known method to recover the phone after that (except with special equipment to access eMMC directly)." />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/Views/NokiaModeMassStorageView.xaml.cs b/WPinternals/Views/NokiaModeMassStorageView.xaml.cs
similarity index 97%
rename from Views/NokiaModeMassStorageView.xaml.cs
rename to WPinternals/Views/NokiaModeMassStorageView.xaml.cs
index 28a23a6..b56417e 100644
--- a/Views/NokiaModeMassStorageView.xaml.cs
+++ b/WPinternals/Views/NokiaModeMassStorageView.xaml.cs
@@ -1,50 +1,50 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for NokiaModeMassStorageView.xaml
-    /// </summary>
-    public partial class NokiaModeMassStorageView : UserControl
-    {
-        public NokiaModeMassStorageView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                (this.DataContext as NokiaModeMassStorageViewModel)?.RebootTo(link.NavigateUri.ToString());
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for NokiaModeMassStorageView.xaml
+    /// </summary>
+    public partial class NokiaModeMassStorageView : UserControl
+    {
+        public NokiaModeMassStorageView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                (this.DataContext as NokiaModeMassStorageViewModel)?.RebootTo(link.NavigateUri.ToString());
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/NokiaModeNormalView.xaml b/WPinternals/Views/NokiaModeNormalView.xaml
similarity index 98%
rename from Views/NokiaModeNormalView.xaml
rename to WPinternals/Views/NokiaModeNormalView.xaml
index 92be4e3..f4ecd7e 100644
--- a/Views/NokiaModeNormalView.xaml
+++ b/WPinternals/Views/NokiaModeNormalView.xaml
@@ -1,86 +1,86 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.NokiaModeNormalView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" />
-        <local:BooleanConverter x:Key="InvisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" />
-        <local:BooleanConverter x:Key="InverseConverter" OnTrue="False" OnFalse="True" />
-    </UserControl.Resources>
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
-        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" >
-            <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                <FlowDocument.Resources>
-                    <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                    <Style TargetType="{x:Type Paragraph}">
-                        <Setter Property="Margin" Value="0"/>
-                    </Style>
-                    <Style TargetType="{x:Type Section}">
-                        <Setter Property="Margin" Value="0"/>
-                    </Style>
-                </FlowDocument.Resources>
-                <local:Paragraph>
-                    <Run Text="Nokia Lumia - Switch mode" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Current mode: " />
-                    <Run Text="Normal (Windows Phone OS)" Foreground="#FF3753A6" FontWeight="Bold" />
-                    <LineBreak />
-                    <LineBreak />
-                    <Hyperlink NavigateUri="Flash">Switch to Flash-mode</Hyperlink>
-                    <LineBreak />
-                    <Run Text="This is the interface that can be used to flash a new ROM image. It can also be used to retrieve additional info and security status." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Hyperlink NavigateUri="Label">Switch to Label-mode</Hyperlink>
-                    <LineBreak />
-                    <Run Text="This interface is meant for querying and provisioning the phone. This is normally used for configuring the phone during manufacturing." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Hyperlink NavigateUri="MassStorage">Switch to Mass-Storage-mode</Hyperlink>
-                    <LineBreak />
-                    <Run Text="This mode allows you to access the complete file-system of the phone. " />
-                    <Run Text="To enter this mode the phone will first be booted to Flash mode. After that this tool will immediately attempt to boot the phone to Mass Storage mode. So you may see your phone reboot multiple times." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 1: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="Once you've entered Mass Storage mode, be very careful with altering files. You can easily brick your phone, when you make invalid changes to the file-system of the phone." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 2: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="Before switching to Mass Storage Mode, verify that you do not have any other Windows Phone disks or partitions mounted. The partitions may have equal identifiers, which will result in a conflict. The phone partitions will be mounted &quot;offline&quot; and if you try to switch them &quot;online&quot; in the Disk Manager, it will corrupt the partitions on the phone. Unmount any Windows Phone partitions before you continue." />
-                    <LineBreak />
-                    <LineBreak />
-                    <Run Text="Warning 3: " Foreground="Red" FontWeight="Bold"/>
-                    <Run Text="Switching to Mass Storage mode should take about 10 seconds. Phones with Bootloader Spec A should be unlocked using an Engineering SBL3 to enable Mass Storage mode. When you unlocked the bootloader, but you did not use an Engineering SBL3, an attempt to boot to Mass Storage mode may result in an unresponsive state. Installing drivers for this interface may also cause to hang the PC. So when this switch is taking too long, you should reboot both the PC and the phone." />
-                </local:Paragraph>
-            </FlowDocument>
-        </local:FlowDocumentScrollViewerNoMouseWheel>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.NokiaModeNormalView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" />
+        <local:BooleanConverter x:Key="InvisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" />
+        <local:BooleanConverter x:Key="InverseConverter" OnTrue="False" OnFalse="True" />
+    </UserControl.Resources>
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
+        <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,0,0" VerticalScrollBarVisibility="Auto" >
+            <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                <FlowDocument.Resources>
+                    <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                    <Style TargetType="{x:Type Paragraph}">
+                        <Setter Property="Margin" Value="0"/>
+                    </Style>
+                    <Style TargetType="{x:Type Section}">
+                        <Setter Property="Margin" Value="0"/>
+                    </Style>
+                </FlowDocument.Resources>
+                <local:Paragraph>
+                    <Run Text="Nokia Lumia - Switch mode" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Current mode: " />
+                    <Run Text="Normal (Windows Phone OS)" Foreground="#FF3753A6" FontWeight="Bold" />
+                    <LineBreak />
+                    <LineBreak />
+                    <Hyperlink NavigateUri="Flash">Switch to Flash-mode</Hyperlink>
+                    <LineBreak />
+                    <Run Text="This is the interface that can be used to flash a new ROM image. It can also be used to retrieve additional info and security status." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Hyperlink NavigateUri="Label">Switch to Label-mode</Hyperlink>
+                    <LineBreak />
+                    <Run Text="This interface is meant for querying and provisioning the phone. This is normally used for configuring the phone during manufacturing." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Hyperlink NavigateUri="MassStorage">Switch to Mass-Storage-mode</Hyperlink>
+                    <LineBreak />
+                    <Run Text="This mode allows you to access the complete file-system of the phone. " />
+                    <Run Text="To enter this mode the phone will first be booted to Flash mode. After that this tool will immediately attempt to boot the phone to Mass Storage mode. So you may see your phone reboot multiple times." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 1: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="Once you've entered Mass Storage mode, be very careful with altering files. You can easily brick your phone, when you make invalid changes to the file-system of the phone." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 2: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="Before switching to Mass Storage Mode, verify that you do not have any other Windows Phone disks or partitions mounted. The partitions may have equal identifiers, which will result in a conflict. The phone partitions will be mounted &quot;offline&quot; and if you try to switch them &quot;online&quot; in the Disk Manager, it will corrupt the partitions on the phone. Unmount any Windows Phone partitions before you continue." />
+                    <LineBreak />
+                    <LineBreak />
+                    <Run Text="Warning 3: " Foreground="Red" FontWeight="Bold"/>
+                    <Run Text="Switching to Mass Storage mode should take about 10 seconds. Phones with Bootloader Spec A should be unlocked using an Engineering SBL3 to enable Mass Storage mode. When you unlocked the bootloader, but you did not use an Engineering SBL3, an attempt to boot to Mass Storage mode may result in an unresponsive state. Installing drivers for this interface may also cause to hang the PC. So when this switch is taking too long, you should reboot both the PC and the phone." />
+                </local:Paragraph>
+            </FlowDocument>
+        </local:FlowDocumentScrollViewerNoMouseWheel>
+    </Border>
+</UserControl>
diff --git a/Views/NokiaModeNormalView.xaml.cs b/WPinternals/Views/NokiaModeNormalView.xaml.cs
similarity index 97%
rename from Views/NokiaModeNormalView.xaml.cs
rename to WPinternals/Views/NokiaModeNormalView.xaml.cs
index 30fb3db..6892687 100644
--- a/Views/NokiaModeNormalView.xaml.cs
+++ b/WPinternals/Views/NokiaModeNormalView.xaml.cs
@@ -1,50 +1,50 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for NokiaModeNormalView.xaml
-    /// </summary>
-    public partial class NokiaModeNormalView : UserControl
-    {
-        public NokiaModeNormalView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                (this.DataContext as NokiaModeNormalViewModel)?.RebootTo(link.NavigateUri.ToString());
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for NokiaModeNormalView.xaml
+    /// </summary>
+    public partial class NokiaModeNormalView : UserControl
+    {
+        public NokiaModeNormalView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                (this.DataContext as NokiaModeNormalViewModel)?.RebootTo(link.NavigateUri.ToString());
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/NokiaNormalView.xaml b/WPinternals/Views/NokiaNormalView.xaml
similarity index 98%
rename from Views/NokiaNormalView.xaml
rename to WPinternals/Views/NokiaNormalView.xaml
index 1e91468..a4d0e4b 100644
--- a/Views/NokiaNormalView.xaml
+++ b/WPinternals/Views/NokiaNormalView.xaml
@@ -1,165 +1,165 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.NokiaNormalView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:HexConverter x:Key="MACConverter" Separator=":" />
-        <local:HexConverter x:Key="HexConverter" />
-        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
-        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
-    </UserControl.Resources>
-    <StackPanel VerticalAlignment="Center">
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph>
-                        <Run Text="General info" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Grid IsHitTestVisible="False">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="200" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Brand / model" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap">
-                                <TextBlock.Text>
-                                    <MultiBinding StringFormat="Nokia Lumia {0}">
-                                        <Binding Path="ManufacturerModelName" />
-                                    </MultiBinding> 
-                                </TextBlock.Text>
-                            </TextBlock>
-                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Operating mode" />
-                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Normal (Windows Phone OS)" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
-                            <TextBlock Grid.Row="2" Grid.Column="0" Text="Product code" />
-                            <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=ProductCode}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap"/>
-                            <TextBlock Grid.Row="3" Grid.Column="0" Text="Operator" />
-                            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=Operator}" TextWrapping="Wrap" />
-                            <TextBlock Grid.Row="4" Grid.Column="0" Text="Firmware version" />
-                            <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=Firmware}" TextWrapping="Wrap" />
-                            <TextBlock Grid.Row="5" Grid.Column="0" Text="Hardware version" />
-                            <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding Path=HWID}" TextWrapping="Wrap" />
-                        </Grid>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
-            <Expander Header="Phone identity" HorizontalContentAlignment="Stretch" Template="{DynamicResource TopicExpanderTemplate}" Margin="20,0">
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                        <local:Paragraph>
-                            <LineBreak />
-                            <Grid IsHitTestVisible="False">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="200" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <TextBlock Grid.Row="0" Grid.Column="0" Text="IMEI" />
-                                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Path=IMEI}" TextWrapping="Wrap" />
-                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Public Phone ID" />
-                                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=PublicID, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
-                                <TextBlock Grid.Row="2" Grid.Column="0" Text="WLAN MAC 1" />
-                                <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=WlanMac1, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap"/>
-                                <TextBlock Grid.Row="3" Grid.Column="0" Text="WLAN MAC 2" />
-                                <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=WlanMac2, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap"/>
-                                <TextBlock Grid.Row="4" Grid.Column="0" Text="WLAN MAC 3" />
-                                <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=WlanMac3, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap"/>
-                                <TextBlock Grid.Row="5" Grid.Column="0" Text="WLAN MAC 4" />
-                                <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding Path=WlanMac4, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap"/>
-                                <TextBlock Grid.Row="6" Grid.Column="0" Text="Bluetooth MAC" />
-                                <TextBlock Grid.Row="6" Grid.Column="1" Text="{Binding Path=BluetoothMac, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap" />
-                            </Grid>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-            </Expander>
-        </Border>
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" >
-            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
-                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
-                    <local:Paragraph TextAlignment="Left">
-                        <Run Text="Security" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Grid IsHitTestVisible="False">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="200" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Boot policy" />
-                            <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Path=BootPolicy}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
-                            <TextBlock Grid.Row="1" Grid.Column="0" Text="DB" />
-                            <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=Db}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
-                            <TextBlock Grid.Row="2" Grid.Column="0" Text="DBX" />
-                            <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=Dbx}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
-                            <TextBlock Grid.Row="3" Grid.Column="0" Text="KEK" />
-                            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=Kek}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
-                            <TextBlock Grid.Row="4" Grid.Column="0" Text="PK" />
-                            <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=Pk}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
-                            <TextBlock Grid.Row="5" Grid.Column="0" Text="Sim lock" />
-                            <TextBlock Grid.Row="5" Grid.Column="1" Text="Disabled" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=IsSimLocked, Converter={StaticResource InverseVisibilityConverter}}" />
-                            <TextBlock Grid.Row="5" Grid.Column="1" Text="Enabled" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=IsSimLocked, Converter={StaticResource VisibilityConverter}}"/>
-                        </Grid>
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="For more detailed and accurate status info, switch to " />
-                        <Hyperlink NavigateUri="Flash">Flash</Hyperlink>
-                        <Run Text=" mode." />
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.NokiaNormalView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:HexConverter x:Key="MACConverter" Separator=":" />
+        <local:HexConverter x:Key="HexConverter" />
+        <local:BooleanConverter x:Key="VisibilityConverter" OnTrue="Visible" OnFalse="Collapsed" OnNull="Collapsed"/>
+        <local:BooleanConverter x:Key="InverseVisibilityConverter" OnTrue="Collapsed" OnFalse="Visible" OnNull="Collapsed" />
+    </UserControl.Resources>
+    <StackPanel VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph>
+                        <Run Text="General info" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Grid IsHitTestVisible="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="200" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Brand / model" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap">
+                                <TextBlock.Text>
+                                    <MultiBinding StringFormat="Nokia Lumia {0}">
+                                        <Binding Path="ManufacturerModelName" />
+                                    </MultiBinding> 
+                                </TextBlock.Text>
+                            </TextBlock>
+                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Operating mode" />
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="Normal (Windows Phone OS)" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
+                            <TextBlock Grid.Row="2" Grid.Column="0" Text="Product code" />
+                            <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=ProductCode}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap"/>
+                            <TextBlock Grid.Row="3" Grid.Column="0" Text="Operator" />
+                            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=Operator}" TextWrapping="Wrap" />
+                            <TextBlock Grid.Row="4" Grid.Column="0" Text="Firmware version" />
+                            <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=Firmware}" TextWrapping="Wrap" />
+                            <TextBlock Grid.Row="5" Grid.Column="0" Text="Hardware version" />
+                            <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding Path=HWID}" TextWrapping="Wrap" />
+                        </Grid>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" Margin="0,0,0,20">
+            <Expander Header="Phone identity" HorizontalContentAlignment="Stretch" Template="{DynamicResource TopicExpanderTemplate}" Margin="20,0">
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                        <local:Paragraph>
+                            <LineBreak />
+                            <Grid IsHitTestVisible="False">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="200" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <TextBlock Grid.Row="0" Grid.Column="0" Text="IMEI" />
+                                <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Path=IMEI}" TextWrapping="Wrap" />
+                                <TextBlock Grid.Row="1" Grid.Column="0" Text="Public Phone ID" />
+                                <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=PublicID, Converter={StaticResource HexConverter}, Mode=OneWay}" TextWrapping="Wrap" />
+                                <TextBlock Grid.Row="2" Grid.Column="0" Text="WLAN MAC 1" />
+                                <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=WlanMac1, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap"/>
+                                <TextBlock Grid.Row="3" Grid.Column="0" Text="WLAN MAC 2" />
+                                <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=WlanMac2, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap"/>
+                                <TextBlock Grid.Row="4" Grid.Column="0" Text="WLAN MAC 3" />
+                                <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=WlanMac3, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap"/>
+                                <TextBlock Grid.Row="5" Grid.Column="0" Text="WLAN MAC 4" />
+                                <TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding Path=WlanMac4, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap"/>
+                                <TextBlock Grid.Row="6" Grid.Column="0" Text="Bluetooth MAC" />
+                                <TextBlock Grid.Row="6" Grid.Column="1" Text="{Binding Path=BluetoothMac, Converter={StaticResource MACConverter}, Mode=OneWay}" TextWrapping="Wrap" />
+                            </Grid>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+            </Expander>
+        </Border>
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25" >
+            <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0" VerticalScrollBarVisibility="Auto" >
+                <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" PagePadding="1">
+                    <local:Paragraph TextAlignment="Left">
+                        <Run Text="Security" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Grid IsHitTestVisible="False">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="200" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Boot policy" />
+                            <TextBlock Grid.Row="0" Grid.Column="1" Text="{Binding Path=BootPolicy}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
+                            <TextBlock Grid.Row="1" Grid.Column="0" Text="DB" />
+                            <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding Path=Db}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
+                            <TextBlock Grid.Row="2" Grid.Column="0" Text="DBX" />
+                            <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=Dbx}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
+                            <TextBlock Grid.Row="3" Grid.Column="0" Text="KEK" />
+                            <TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=Kek}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
+                            <TextBlock Grid.Row="4" Grid.Column="0" Text="PK" />
+                            <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=Pk}" FontWeight="Bold" Foreground="#FF3753A6" TextWrapping="Wrap" />
+                            <TextBlock Grid.Row="5" Grid.Column="0" Text="Sim lock" />
+                            <TextBlock Grid.Row="5" Grid.Column="1" Text="Disabled" FontWeight="Bold" Foreground="#FF40C133" TextWrapping="Wrap" Visibility="{Binding Path=IsSimLocked, Converter={StaticResource InverseVisibilityConverter}}" />
+                            <TextBlock Grid.Row="5" Grid.Column="1" Text="Enabled" FontWeight="Bold" Foreground="#FFAC3631" TextWrapping="Wrap" Visibility="{Binding Path=IsSimLocked, Converter={StaticResource VisibilityConverter}}"/>
+                        </Grid>
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="For more detailed and accurate status info, switch to " />
+                        <Hyperlink NavigateUri="Flash">Flash</Hyperlink>
+                        <Run Text=" mode." />
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/NokiaNormalView.xaml.cs b/WPinternals/Views/NokiaNormalView.xaml.cs
similarity index 97%
rename from Views/NokiaNormalView.xaml.cs
rename to WPinternals/Views/NokiaNormalView.xaml.cs
index 0d14e07..8a74a03 100644
--- a/Views/NokiaNormalView.xaml.cs
+++ b/WPinternals/Views/NokiaNormalView.xaml.cs
@@ -1,50 +1,50 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for NokiaNormalView.xaml
-    /// </summary>
-    public partial class NokiaNormalView : UserControl
-    {
-        public NokiaNormalView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                (this.DataContext as NokiaNormalViewModel)?.RebootTo(link.NavigateUri.ToString());
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for NokiaNormalView.xaml
+    /// </summary>
+    public partial class NokiaNormalView : UserControl
+    {
+        public NokiaNormalView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                (this.DataContext as NokiaNormalViewModel)?.RebootTo(link.NavigateUri.ToString());
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+    }
+}
diff --git a/Views/NotImplementedView.xaml b/WPinternals/Views/NotImplementedView.xaml
similarity index 98%
rename from Views/NotImplementedView.xaml
rename to WPinternals/Views/NotImplementedView.xaml
index 5e5f220..dbfe45d 100644
--- a/Views/NotImplementedView.xaml
+++ b/WPinternals/Views/NotImplementedView.xaml
@@ -1,33 +1,33 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.NotImplementedView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
-        <Label Content="{Binding Message}" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20"/>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.NotImplementedView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Padding="25">
+        <Label Content="{Binding Message}" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20"/>
+    </Border>
+</UserControl>
diff --git a/Views/NotImplementedView.xaml.cs b/WPinternals/Views/NotImplementedView.xaml.cs
similarity index 97%
rename from Views/NotImplementedView.xaml.cs
rename to WPinternals/Views/NotImplementedView.xaml.cs
index 8755121..b519975 100644
--- a/Views/NotImplementedView.xaml.cs
+++ b/WPinternals/Views/NotImplementedView.xaml.cs
@@ -1,35 +1,35 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows.Controls;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for NotImplementedView.xaml
-    /// </summary>
-    public partial class NotImplementedView : UserControl
-    {
-        public NotImplementedView()
-        {
-            InitializeComponent();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows.Controls;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for NotImplementedView.xaml
+    /// </summary>
+    public partial class NotImplementedView : UserControl
+    {
+        public NotImplementedView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Views/RegistrationView.xaml b/WPinternals/Views/RegistrationView.xaml
similarity index 98%
rename from Views/RegistrationView.xaml
rename to WPinternals/Views/RegistrationView.xaml
index 3b50c26..9655aee 100644
--- a/Views/RegistrationView.xaml
+++ b/WPinternals/Views/RegistrationView.xaml
@@ -1,71 +1,71 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.RegistrationView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center">
-        <Grid>
-            <local:FlowDocumentScrollViewerNoMouseWheel Margin="45,25,45,75" VerticalScrollBarVisibility="Auto">
-                <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" PagePadding="0">
-                    <local:Paragraph>
-                        <Run Text="Registration" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                        <LineBreak />
-                        <LineBreak />
-                        <Run Text="This software needs to be registered. Your personal data will not be shared or sold. Information is collected for the purpose of improving the software." />
-                        <LineBreak />
-                        <LineBreak />
-                        <Grid >
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="150" />
-                                <ColumnDefinition Width="350" />
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Name" Margin="0,3,0,0" />
-                            <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" Margin="0,0,0,10" Height="24" VerticalContentAlignment="Center"/>
-                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Email" Margin="0,3,0,0" />
-                            <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Email, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" Margin="0,0,0,10" Height="24" />
-                            <TextBlock Grid.Row="2" Grid.Column="0" Text="Skype ID (optional)" Margin="0,3,0,0" />
-                            <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding SkypeID, Mode=TwoWay}" HorizontalAlignment="Stretch" Margin="0,0,0,10" Height="24" />
-                            <TextBlock Grid.Row="3" Grid.Column="0" Text="Telegram ID (optional)" Margin="0,3,0,0" />
-                            <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding TelegramID, Mode=TwoWay}" HorizontalAlignment="Stretch" Height="24" />
-                        </Grid>
-                    </local:Paragraph>
-                </FlowDocument>
-            </local:FlowDocumentScrollViewerNoMouseWheel>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,80,45,25">
-                <Button Command="{Binding Path=ContinueCommand, Mode=OneWay}" Content="Register" Width="100" Height="Auto" Padding="0,5" IsEnabled="{Binding Path=IsRegistrationComplete, Mode=OneWay}" />
-                <Button Command="{Binding Path=ExitCommand, Mode=OneWay}" Content="Exit" Width="100" Height="Auto" Padding="0,5" Margin="10,0,0,0" />
-            </StackPanel>
-        </Grid>
-    </Border>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.RegistrationView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center">
+        <Grid>
+            <local:FlowDocumentScrollViewerNoMouseWheel Margin="45,25,45,75" VerticalScrollBarVisibility="Auto">
+                <FlowDocument x:Name="Document" FontFamily="Segoe UI" FontSize="12" PagePadding="0">
+                    <local:Paragraph>
+                        <Run Text="Registration" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                        <LineBreak />
+                        <LineBreak />
+                        <Run Text="This software needs to be registered. Your personal data will not be shared or sold. Information is collected for the purpose of improving the software." />
+                        <LineBreak />
+                        <LineBreak />
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="150" />
+                                <ColumnDefinition Width="350" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <TextBlock Grid.Row="0" Grid.Column="0" Text="Name" Margin="0,3,0,0" />
+                            <TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Name, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" Margin="0,0,0,10" Height="24" VerticalContentAlignment="Center"/>
+                            <TextBlock Grid.Row="1" Grid.Column="0" Text="Email" Margin="0,3,0,0" />
+                            <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Email, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" Margin="0,0,0,10" Height="24" />
+                            <TextBlock Grid.Row="2" Grid.Column="0" Text="Skype ID (optional)" Margin="0,3,0,0" />
+                            <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding SkypeID, Mode=TwoWay}" HorizontalAlignment="Stretch" Margin="0,0,0,10" Height="24" />
+                            <TextBlock Grid.Row="3" Grid.Column="0" Text="Telegram ID (optional)" Margin="0,3,0,0" />
+                            <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding TelegramID, Mode=TwoWay}" HorizontalAlignment="Stretch" Height="24" />
+                        </Grid>
+                    </local:Paragraph>
+                </FlowDocument>
+            </local:FlowDocumentScrollViewerNoMouseWheel>
+            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,80,45,25">
+                <Button Command="{Binding Path=ContinueCommand, Mode=OneWay}" Content="Register" Width="100" Height="Auto" Padding="0,5" IsEnabled="{Binding Path=IsRegistrationComplete, Mode=OneWay}" />
+                <Button Command="{Binding Path=ExitCommand, Mode=OneWay}" Content="Exit" Width="100" Height="Auto" Padding="0,5" Margin="10,0,0,0" />
+            </StackPanel>
+        </Grid>
+    </Border>
+</UserControl>
diff --git a/Views/RegistrationView.xaml.cs b/WPinternals/Views/RegistrationView.xaml.cs
similarity index 97%
rename from Views/RegistrationView.xaml.cs
rename to WPinternals/Views/RegistrationView.xaml.cs
index ac535a1..740c990 100644
--- a/Views/RegistrationView.xaml.cs
+++ b/WPinternals/Views/RegistrationView.xaml.cs
@@ -1,35 +1,35 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows.Controls;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for DisclaimerView.xaml
-    /// </summary>
-    public partial class RegistrationView : UserControl
-    {
-        public RegistrationView()
-        {
-            InitializeComponent();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows.Controls;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for DisclaimerView.xaml
+    /// </summary>
+    public partial class RegistrationView : UserControl
+    {
+        public RegistrationView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Views/RestoreView.xaml b/WPinternals/Views/RestoreView.xaml
similarity index 98%
rename from Views/RestoreView.xaml
rename to WPinternals/Views/RestoreView.xaml
index beac30c..39b04ce 100644
--- a/Views/RestoreView.xaml
+++ b/WPinternals/Views/RestoreView.xaml
@@ -1,80 +1,80 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<UserControl x:Class="WPinternals.RestoreView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:WPinternals"
-             mc:Ignorable="d" 
-             d:DesignWidth="700">
-    <UserControl.Resources>
-        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
-    </UserControl.Resources>
-    <StackPanel VerticalAlignment="Center">
-        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,0">
-            <StackPanel>
-                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
-                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
-                        <FlowDocument.Resources>
-                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
-                            <Style TargetType="{x:Type Paragraph}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                            <Style TargetType="{x:Type Section}">
-                                <Setter Property="Margin" Value="0"/>
-                            </Style>
-                        </FlowDocument.Resources>
-                        <local:Paragraph>
-                            <Run Text="Restore phone" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
-                            <LineBreak />
-                            <LineBreak />
-                            <Run Text="You need to have an "/>
-                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
-                            <Run Text=" Engineering bootloader. Use this to restore an earlier backup. If you want to flash a new unlocked custom ROM, the "/>
-                            <Hyperlink NavigateUri="Flash">Flash-function</Hyperlink>
-                            <Run Text=" is more suitable. Remember that MainOS partition and Data partition are tied together. Always backup and restore those partitions together. You should only restore EFIESP from the exact same phone-model, because the EFIESP partition contains model-specific data. Select one or more source-files to restore." />
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="EFIESP: " SelectionText="Select the source-file to restore a backup of the EFIESP partition..." Path="{Binding EFIESPPath, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="MainOS: " SelectionText="Select the source-file to restore a backup of the MainOS partition..." Path="{Binding MainOSPath, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:FilePicker Caption="Data: " SelectionText="Select the source-file to restore a backup of the Data partition..." Path="{Binding DataPath, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
-                            <LineBreak />
-                            <LineBreak />
-                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Flash mode and then a backup will be restored to the selected partitions." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
-                            <local:CollapsibleRun Text="The phone is in Flash mode. You can continue to restore a backup." IsVisible="{Binding IsPhoneInFlashMode, Mode=OneWay}"/>
-                        </local:Paragraph>
-                    </FlowDocument>
-                </local:FlowDocumentScrollViewerNoMouseWheel>
-                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
-                    <Button Command="{Binding Path=RestoreCommand, Mode=OneWay}" Content="Restore phone" Width="120" Height="Auto" Padding="0,5" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </StackPanel>
-</UserControl>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<UserControl x:Class="WPinternals.RestoreView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPinternals"
+             mc:Ignorable="d" 
+             d:DesignWidth="700">
+    <UserControl.Resources>
+        <local:ObjectToVisibilityConverter x:Key="ObjectToVisibilityConverter" />
+    </UserControl.Resources>
+    <StackPanel VerticalAlignment="Center">
+        <Border BorderThickness="1" BorderBrush="#FFD4D4D4" HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="0,0,0,0">
+            <StackPanel>
+                <local:FlowDocumentScrollViewerNoMouseWheel Grid.Column="1" Margin="20,0,20,0" VerticalScrollBarVisibility="Auto" >
+                    <FlowDocument FontFamily="Segoe UI" FontSize="12" Loaded="Document_Loaded" TextAlignment="Left">
+                        <FlowDocument.Resources>
+                            <!-- This style is used to set the margins for all paragraphs in the FlowDocument to 0. -->
+                            <Style TargetType="{x:Type Paragraph}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                            <Style TargetType="{x:Type Section}">
+                                <Setter Property="Margin" Value="0"/>
+                            </Style>
+                        </FlowDocument.Resources>
+                        <local:Paragraph>
+                            <Run Text="Restore phone" FontSize="18" FontWeight="Bold" Foreground="#FF3753A6" />
+                            <LineBreak />
+                            <LineBreak />
+                            <Run Text="You need to have an "/>
+                            <Hyperlink NavigateUri="UnlockBoot">unlocked</Hyperlink>
+                            <Run Text=" Engineering bootloader. Use this to restore an earlier backup. If you want to flash a new unlocked custom ROM, the "/>
+                            <Hyperlink NavigateUri="Flash">Flash-function</Hyperlink>
+                            <Run Text=" is more suitable. Remember that MainOS partition and Data partition are tied together. Always backup and restore those partitions together. You should only restore EFIESP from the exact same phone-model, because the EFIESP partition contains model-specific data. Select one or more source-files to restore." />
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="EFIESP: " SelectionText="Select the source-file to restore a backup of the EFIESP partition..." Path="{Binding EFIESPPath, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="MainOS: " SelectionText="Select the source-file to restore a backup of the MainOS partition..." Path="{Binding MainOSPath, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:FilePicker Caption="Data: " SelectionText="Select the source-file to restore a backup of the Data partition..." Path="{Binding DataPath, Mode=TwoWay}" AllowNull="True" HorizontalAlignment="Stretch" PathChanged="FilePicker_PathChanged"/>
+                            <LineBreak />
+                            <LineBreak />
+                            <local:CollapsibleRun Text="You have to connect your phone before you can continue." IsVisible="{Binding IsPhoneDisconnected, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="When you continue, the phone will be switched to Flash mode and then a backup will be restored to the selected partitions." IsVisible="{Binding IsPhoneInOtherMode, Mode=OneWay}"/>
+                            <local:CollapsibleRun Text="The phone is in Flash mode. You can continue to restore a backup." IsVisible="{Binding IsPhoneInFlashMode, Mode=OneWay}"/>
+                        </local:Paragraph>
+                    </FlowDocument>
+                </local:FlowDocumentScrollViewerNoMouseWheel>
+                <StackPanel Orientation="Horizontal" Width="Auto" Height="Auto" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,10,40,25">
+                    <Button Command="{Binding Path=RestoreCommand, Mode=OneWay}" Content="Restore phone" Width="120" Height="Auto" Padding="0,5" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+    </StackPanel>
+</UserControl>
diff --git a/Views/RestoreView.xaml.cs b/WPinternals/Views/RestoreView.xaml.cs
similarity index 97%
rename from Views/RestoreView.xaml.cs
rename to WPinternals/Views/RestoreView.xaml.cs
index 7c0dc0b..a54bed4 100644
--- a/Views/RestoreView.xaml.cs
+++ b/WPinternals/Views/RestoreView.xaml.cs
@@ -1,62 +1,62 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for RestoreView.xaml
-    /// </summary>
-    public partial class RestoreView : UserControl
-    {
-        public RestoreView()
-        {
-            InitializeComponent();
-        }
-
-        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
-        {
-            if (args.Source is Hyperlink link)
-            {
-                if (link.NavigateUri.ToString() == "UnlockBoot")
-                {
-                    (this.DataContext as RestoreSourceSelectionViewModel)?.SwitchToUnlockBoot();
-                }
-                else if (link.NavigateUri.ToString() == "Flash")
-                {
-                    (this.DataContext as RestoreSourceSelectionViewModel)?.SwitchToFlashRom();
-                }
-            }
-        }
-
-        private void Document_Loaded(object sender, RoutedEventArgs e)
-        {
-            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
-        }
-
-        private void FilePicker_PathChanged(object sender, PathChangedEventArgs e)
-        {
-            ((RestoreSourceSelectionViewModel)DataContext).EvaluateViewState();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for RestoreView.xaml
+    /// </summary>
+    public partial class RestoreView : UserControl
+    {
+        public RestoreView()
+        {
+            InitializeComponent();
+        }
+
+        private void HandleHyperlinkClick(object sender, RoutedEventArgs args)
+        {
+            if (args.Source is Hyperlink link)
+            {
+                if (link.NavigateUri.ToString() == "UnlockBoot")
+                {
+                    (this.DataContext as RestoreSourceSelectionViewModel)?.SwitchToUnlockBoot();
+                }
+                else if (link.NavigateUri.ToString() == "Flash")
+                {
+                    (this.DataContext as RestoreSourceSelectionViewModel)?.SwitchToFlashRom();
+                }
+            }
+        }
+
+        private void Document_Loaded(object sender, RoutedEventArgs e)
+        {
+            (sender as FlowDocument)?.AddHandler(Hyperlink.ClickEvent, new RoutedEventHandler(HandleHyperlinkClick));
+        }
+
+        private void FilePicker_PathChanged(object sender, PathChangedEventArgs e)
+        {
+            ((RestoreSourceSelectionViewModel)DataContext).EvaluateViewState();
+        }
+    }
+}
diff --git a/Views/StartupWindow.xaml b/WPinternals/Views/StartupWindow.xaml
similarity index 97%
rename from Views/StartupWindow.xaml
rename to WPinternals/Views/StartupWindow.xaml
index 8af5cf7..107ae8a 100644
--- a/Views/StartupWindow.xaml
+++ b/WPinternals/Views/StartupWindow.xaml
@@ -1,30 +1,30 @@
-<!--
-Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--->
-
-<Window x:Class="WPinternals.StartupWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="StartupWindow" Height="0" Width="0" WindowStyle="None" ShowInTaskbar="False" ShowActivated="False">
-    <Grid>
-        
-    </Grid>
-</Window>
+<!--
+Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+-->
+
+<Window x:Class="WPinternals.StartupWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="StartupWindow" Height="0" Width="0" WindowStyle="None" ShowInTaskbar="False" ShowActivated="False">
+    <Grid>
+        
+    </Grid>
+</Window>
diff --git a/Views/StartupWindow.xaml.cs b/WPinternals/Views/StartupWindow.xaml.cs
similarity index 97%
rename from Views/StartupWindow.xaml.cs
rename to WPinternals/Views/StartupWindow.xaml.cs
index bd827c4..5a81fb2 100644
--- a/Views/StartupWindow.xaml.cs
+++ b/WPinternals/Views/StartupWindow.xaml.cs
@@ -1,74 +1,74 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using Microsoft.Win32;
-using System;
-using System.Linq;
-using System.Windows;
-
-namespace WPinternals
-{
-    /// <summary>
-    /// Interaction logic for StartupWindow.xaml
-    /// </summary>
-    public partial class StartupWindow : Window
-    {
-        public StartupWindow()
-        {
-            InitializeComponent();
-        }
-
-        protected override async void OnSourceInitialized(EventArgs e)
-        {
-            Visibility = Visibility.Hidden;
-
-            bool NeedLicenseAgrement = false;
-            if (Registry.CurrentUser.OpenSubKey("Software\\WPInternals") == null)
-            {
-                Registry.CurrentUser.OpenSubKey("Software", true).CreateSubKey("WPInternals");
-            }
-
-            if (Registration.IsPrerelease && (Registry.CurrentUser.OpenSubKey("Software\\WPInternals").GetValue("NdaAccepted") == null))
-            {
-                NeedLicenseAgrement = true;
-            }
-            else if (Registry.CurrentUser.OpenSubKey("Software\\WPInternals").GetValue("DisclaimerAccepted") == null)
-            {
-                NeedLicenseAgrement = true;
-            }
-
-            if ((!Registration.IsPrerelease || Registration.IsRegistered()) && !NeedLicenseAgrement)
-            {
-                // USB communication uses Windows Messages and therefore the MainViewModel
-                // can only be created after the Main Window was initialized.
-                System.Threading.SynchronizationContext UIContext = System.Threading.SynchronizationContext.Current;
-                await CommandLine.ParseCommandLine(UIContext);
-            }
-            else if (Environment.GetCommandLineArgs().Length > 1)
-            {
-                Console.WriteLine("First time use");
-                Console.WriteLine("Switching to graphic user interface for license and registration");
-                CommandLine.CloseConsole(false);
-            }
-
-            new MainWindow().Show();
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using Microsoft.Win32;
+using System;
+using System.Linq;
+using System.Windows;
+
+namespace WPinternals
+{
+    /// <summary>
+    /// Interaction logic for StartupWindow.xaml
+    /// </summary>
+    public partial class StartupWindow : Window
+    {
+        public StartupWindow()
+        {
+            InitializeComponent();
+        }
+
+        protected override async void OnSourceInitialized(EventArgs e)
+        {
+            Visibility = Visibility.Hidden;
+
+            bool NeedLicenseAgrement = false;
+            if (Registry.CurrentUser.OpenSubKey("Software\\WPInternals") == null)
+            {
+                Registry.CurrentUser.OpenSubKey("Software", true).CreateSubKey("WPInternals");
+            }
+
+            if (Registration.IsPrerelease && (Registry.CurrentUser.OpenSubKey("Software\\WPInternals").GetValue("NdaAccepted") == null))
+            {
+                NeedLicenseAgrement = true;
+            }
+            else if (Registry.CurrentUser.OpenSubKey("Software\\WPInternals").GetValue("DisclaimerAccepted") == null)
+            {
+                NeedLicenseAgrement = true;
+            }
+
+            if ((!Registration.IsPrerelease || Registration.IsRegistered()) && !NeedLicenseAgrement)
+            {
+                // USB communication uses Windows Messages and therefore the MainViewModel
+                // can only be created after the Main Window was initialized.
+                System.Threading.SynchronizationContext UIContext = System.Threading.SynchronizationContext.Current;
+                await CommandLine.ParseCommandLine(UIContext);
+            }
+            else if (Environment.GetCommandLineArgs().Length > 1)
+            {
+                Console.WriteLine("First time use");
+                Console.WriteLine("Switching to graphic user interface for license and registration");
+                CommandLine.CloseConsole(false);
+            }
+
+            new MainWindow().Show();
+        }
+    }
+}
diff --git a/WPinternals.csproj b/WPinternals/WPinternals.csproj
similarity index 100%
rename from WPinternals.csproj
rename to WPinternals/WPinternals.csproj
diff --git a/WPinternals.csproj.user b/WPinternals/WPinternals.csproj.user
similarity index 100%
rename from WPinternals.csproj.user
rename to WPinternals/WPinternals.csproj.user
diff --git a/WPinternals.ico b/WPinternals/WPinternals.ico
similarity index 100%
rename from WPinternals.ico
rename to WPinternals/WPinternals.ico
diff --git a/WPinternalsConfig.cs b/WPinternals/WPinternalsConfig.cs
similarity index 97%
rename from WPinternalsConfig.cs
rename to WPinternals/WPinternalsConfig.cs
index 8f198a3..08adba1 100644
--- a/WPinternalsConfig.cs
+++ b/WPinternals/WPinternalsConfig.cs
@@ -1,378 +1,378 @@
-// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the "Software"),
-// to deal in the Software without restriction, including without limitation
-// the rights to use, copy, modify, merge, publish, distribute, sublicense,
-// and/or sell copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-// DEALINGS IN THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Security.Cryptography;
-using System.Xml.Serialization;
-
-namespace WPinternals
-{
-    internal static class Registration
-    {
-#if PREVIEW
-        internal const bool IsPrerelease = true;
-#else
-        internal const bool IsPrerelease = false;
-#endif
-
-        internal static readonly DateTime ExpirationDate = new(2019, 01, 06);
-
-        internal static void CheckExpiration()
-        {
-#if PREVIEW
-            //if (IsPrerelease && (DateTime.Now >= ExpirationDate))
-            if (DateTime.Now >= ExpirationDate)
-            {
-                if (Environment.GetCommandLineArgs().Count() > 1)
-                {
-                    Console.WriteLine("This prerelease version is expired!");
-                    CommandLine.CloseConsole();
-                }
-                else
-                    MessageBox.Show("This prerelease version is expired!", "Windows Phone Internals", MessageBoxButton.OK, MessageBoxImage.Exclamation);
-                Environment.Exit(0);
-            }
-#endif
-        }
-
-        internal static bool IsRegistered()
-        {
-            bool Result = false;
-            if (App.Config.RegistrationName != null)
-            {
-                Result = CalcRegKey() == App.Config.RegistrationKey;
-            }
-            return Result;
-        }
-
-        internal static string CalcRegKey()
-        {
-            string KeyBase = App.Config.RegistrationName;
-            if (Environment.MachineName == null)
-            {
-                KeyBase += "-Unknown";
-            }
-            else
-            {
-                KeyBase += "-" + Environment.MachineName;
-            }
-
-            byte[] KeyBytes = System.Text.Encoding.UTF8.GetBytes(KeyBase);
-            SHA1Managed sha = new();
-            byte[] Key = sha.ComputeHash(KeyBytes);
-            return Convert.ToBase64String(Key);
-        }
-    }
-
-    public class WPinternalsConfig
-    {
-        internal static WPinternalsConfig ReadConfig()
-        {
-            string FilePath = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\WPInternals.config");
-            if (File.Exists(FilePath))
-            {
-                string XmlString = File.ReadAllText(FilePath);
-                XmlSerializer x = new(typeof(WPinternalsConfig), "");
-                MemoryStream s = new(System.Text.Encoding.UTF8.GetBytes(XmlString));
-                return (WPinternalsConfig)x.Deserialize(s);
-            }
-            else
-            {
-                return new WPinternalsConfig();
-            }
-        }
-
-        internal void WriteConfig()
-        {
-            string DirPath = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals");
-            if (!Directory.Exists(DirPath))
-            {
-                Directory.CreateDirectory(DirPath);
-            }
-
-            string FilePath = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\WPInternals.config");
-
-            XmlSerializer x = new(typeof(WPinternalsConfig), "");
-
-            XmlSerializerNamespaces ns = new();
-            ns.Add("", "");
-            StreamWriter FileWriter = new(FilePath);
-            x.Serialize(FileWriter, this, ns);
-            FileWriter.Close();
-        }
-
-        internal void SetProfile(string Type, string PlatformID, string ProductCode, string PhoneFirmware, string FfuFirmware, UInt32 FillSize, UInt32 HeaderSize, bool AssumeImageHeaderFallsInGap, bool AllocateAsyncBuffersOnPhone)
-        {
-            FlashProfile Profile = GetProfile(PlatformID, PhoneFirmware, FfuFirmware);
-            if (Profile == null)
-            {
-                Profile = new FlashProfile
-                {
-                    Type = Type,
-                    PlatformID = PlatformID,
-                    ProductCode = ProductCode,
-                    PhoneFirmware = PhoneFirmware,
-                    FfuFirmware = FfuFirmware
-                };
-                FlashProfiles.Add(Profile);
-            }
-
-            Profile.FillSize = FillSize;
-            Profile.HeaderSize = HeaderSize;
-            Profile.AssumeImageHeaderFallsInGap = AssumeImageHeaderFallsInGap;
-            Profile.AllocateAsyncBuffersOnPhone = AllocateAsyncBuffersOnPhone;
-
-            WriteConfig();
-        }
-
-        internal FlashProfile GetProfile(string PlatformID, string PhoneFirmware, string FfuFirmware = null)
-        {
-            return FlashProfiles.Find(p => string.Equals(p.PlatformID, PlatformID, StringComparison.CurrentCultureIgnoreCase) && string.Equals(p.PhoneFirmware, PhoneFirmware, StringComparison.CurrentCultureIgnoreCase) && ((FfuFirmware == null) || string.Equals(p.FfuFirmware, FfuFirmware, StringComparison.CurrentCultureIgnoreCase)));
-        }
-
-        public List<FlashProfile> FlashProfiles = new();
-
-        internal void AddFfuToRepository(string FFUPath)
-        {
-            try
-            {
-                FFU NewFFU = new(FFUPath);
-                AddFfuToRepository(FFUPath, NewFFU.PlatformID, NewFFU.GetFirmwareVersion(), NewFFU.GetOSVersion());
-            }
-            catch (Exception Ex)
-            {
-                LogFile.LogException(Ex, LogType.FileAndConsole);
-            }
-        }
-
-        internal void AddFfuToRepository(string FFUPath, string PlatformID, string FirmwareVersion, string OSVersion)
-        {
-            FFUEntry Entry = FFURepository.Find(e => (e.PlatformID == PlatformID) && (e.FirmwareVersion == FirmwareVersion) && string.Equals(e.Path, FFUPath, StringComparison.CurrentCultureIgnoreCase));
-            if (Entry == null)
-            {
-                LogFile.Log("Adding FFU to repository: " + FFUPath, LogType.FileAndConsole);
-                LogFile.Log("Platform ID: " + PlatformID, LogType.FileAndConsole);
-                if (FirmwareVersion != null)
-                {
-                    LogFile.Log("Firmware version: " + FirmwareVersion, LogType.FileAndConsole);
-                }
-
-                if (OSVersion != null)
-                {
-                    LogFile.Log("OS version: " + OSVersion, LogType.FileAndConsole);
-                }
-
-                Entry = new FFUEntry
-                {
-                    Path = FFUPath,
-                    PlatformID = PlatformID,
-                    FirmwareVersion = FirmwareVersion,
-                    OSVersion = OSVersion
-                };
-                FFURepository.Add(Entry);
-                WriteConfig();
-            }
-            else
-            {
-                LogFile.Log("FFU not added, because it was already present in the repository.", LogType.FileAndConsole);
-            }
-        }
-
-        internal void RemoveFfuFromRepository(string FFUPath)
-        {
-            int Count = 0;
-            FFURepository.Where(e => string.Equals(e.Path, FFUPath, StringComparison.CurrentCultureIgnoreCase)).ToList().ForEach(e =>
-                {
-                    Count++;
-                    FFURepository.Remove(e);
-                });
-            if (Count == 0)
-            {
-                LogFile.Log("FFU was not removed from repository because it was not present.", LogType.FileAndConsole);
-            }
-            else
-            {
-                LogFile.Log("Removed FFU from repository: " + FFUPath, LogType.FileAndConsole);
-                WriteConfig();
-            }
-        }
-
-        public List<FFUEntry> FFURepository = new();
-
-        public List<EmergencyFileEntry> EmergencyRepository = new();
-
-        internal void AddEmergencyToRepository(string Type, string ProgrammerPath, string PayloadPath)
-        {
-            EmergencyFileEntry Entry = EmergencyRepository.Find(e => (e.Type == Type) && string.Equals(e.ProgrammerPath, ProgrammerPath, StringComparison.CurrentCultureIgnoreCase));
-            if ((Entry != null) && (PayloadPath != null) && (!string.Equals(Entry.PayloadPath, PayloadPath, StringComparison.CurrentCultureIgnoreCase)))
-            {
-                LogFile.Log("Updating emergency payload path in repository: " + PayloadPath, LogType.FileAndConsole);
-                Entry.PayloadPath = PayloadPath;
-                WriteConfig();
-            }
-            else if (Entry == null)
-            {
-                LogFile.Log("Adding emergency files to repository: " + ProgrammerPath, LogType.FileAndConsole);
-                LogFile.Log("Type: " + Type, LogType.FileAndConsole);
-
-                Entry = new EmergencyFileEntry
-                {
-                    Type = Type,
-                    ProgrammerPath = ProgrammerPath,
-                    PayloadPath = PayloadPath
-                };
-
-                QualcommPartition Programmer = new(ProgrammerPath);
-                Entry.RKH = Programmer.RootKeyHash;
-
-                EmergencyRepository.Add(Entry);
-                WriteConfig();
-            }
-            else
-            {
-                LogFile.Log("Emergency files not added, because they were already present in the repository.", LogType.FileAndConsole);
-            }
-        }
-
-        internal void RemoveEmergencyFromRepository(string ProgrammerPath)
-        {
-            int Count = 0;
-            EmergencyRepository.Where(e => string.Equals(e.ProgrammerPath, ProgrammerPath, StringComparison.CurrentCultureIgnoreCase)).ToList().ForEach(e =>
-            {
-                Count++;
-                EmergencyRepository.Remove(e);
-            });
-            if (Count == 0)
-            {
-                LogFile.Log("Emergency file was not removed from repository because it was not present.", LogType.FileAndConsole);
-            }
-            else
-            {
-                LogFile.Log("Removed Emergency file from repository: " + ProgrammerPath, LogType.FileAndConsole);
-                WriteConfig();
-            }
-        }
-
-        public string RegistrationName;
-        public string RegistrationEmail;
-        public string RegistrationSkypeID;
-        public string RegistrationTelegramID;
-        public string RegistrationKey;
-    }
-
-    public class FlashProfile
-    {
-        public string Type;
-        public string PlatformID;
-        public string ProductCode;
-        public string PhoneFirmware;
-        public string FfuFirmware;
-
-        [XmlIgnore]
-        internal UInt32 FillSize;
-        [XmlIgnore]
-        internal UInt32 HeaderSize;
-        [XmlIgnore]
-        internal bool AssumeImageHeaderFallsInGap;
-        [XmlIgnore]
-        internal bool AllocateAsyncBuffersOnPhone;
-
-        [XmlElement(ElementName = "Profile")]
-        public string ProfileAsString
-        {
-            get
-            {
-                byte[] ValueBuffer = new byte[10];
-                ValueBuffer[0] = 1; // Profile version
-                ByteOperations.WriteUInt32(ValueBuffer, 1, FillSize);
-                ByteOperations.WriteUInt32(ValueBuffer, 5, HeaderSize);
-                if (AssumeImageHeaderFallsInGap)
-                {
-                    ValueBuffer[9] |= 1;
-                }
-
-                if (AllocateAsyncBuffersOnPhone)
-                {
-                    ValueBuffer[9] |= 2;
-                }
-
-                return Convert.ToBase64String(ValueBuffer);
-            }
-            set
-            {
-                byte[] ValueBuffer = Convert.FromBase64String(value);
-                byte Version = ValueBuffer[0];
-                FillSize = ByteOperations.ReadUInt32(ValueBuffer, 1);
-                HeaderSize = ByteOperations.ReadUInt32(ValueBuffer, 5);
-                AssumeImageHeaderFallsInGap = (ValueBuffer[9] & 1) != 0;
-                AllocateAsyncBuffersOnPhone = (ValueBuffer[9] & 2) != 0;
-            }
-        }
-    }
-
-    public class FFUEntry
-    {
-        public string PlatformID;
-        public string FirmwareVersion;
-        public string OSVersion;
-        public string Path;
-
-        internal bool Exists()
-        {
-            return File.Exists(Path);
-        }
-    }
-
-    public class EmergencyFileEntry
-    {
-        public string Type;
-
-        [XmlIgnore]
-        public byte[] RKH;
-        [XmlElement(ElementName = "RKH")]
-        public string RKHAsString
-        {
-            get
-            {
-                return RKH == null ? null : Converter.ConvertHexToString(RKH, "");
-            }
-            set
-            {
-                RKH = value == null ? null : Converter.ConvertStringToHex(value);
-            }
-        }
-
-        public string ProgrammerPath;
-        public string PayloadPath;
-
-        internal bool ProgrammerExists()
-        {
-            return File.Exists(ProgrammerPath);
-        }
-
-        internal bool PayloadExists()
-        {
-            return File.Exists(PayloadPath);
-        }
-    }
-}
+// Copyright (c) 2018, Rene Lergner - @Heathcliff74xda
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Xml.Serialization;
+
+namespace WPinternals
+{
+    internal static class Registration
+    {
+#if PREVIEW
+        internal const bool IsPrerelease = true;
+#else
+        internal const bool IsPrerelease = false;
+#endif
+
+        internal static readonly DateTime ExpirationDate = new(2019, 01, 06);
+
+        internal static void CheckExpiration()
+        {
+#if PREVIEW
+            //if (IsPrerelease && (DateTime.Now >= ExpirationDate))
+            if (DateTime.Now >= ExpirationDate)
+            {
+                if (Environment.GetCommandLineArgs().Count() > 1)
+                {
+                    Console.WriteLine("This prerelease version is expired!");
+                    CommandLine.CloseConsole();
+                }
+                else
+                    MessageBox.Show("This prerelease version is expired!", "Windows Phone Internals", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                Environment.Exit(0);
+            }
+#endif
+        }
+
+        internal static bool IsRegistered()
+        {
+            bool Result = false;
+            if (App.Config.RegistrationName != null)
+            {
+                Result = CalcRegKey() == App.Config.RegistrationKey;
+            }
+            return Result;
+        }
+
+        internal static string CalcRegKey()
+        {
+            string KeyBase = App.Config.RegistrationName;
+            if (Environment.MachineName == null)
+            {
+                KeyBase += "-Unknown";
+            }
+            else
+            {
+                KeyBase += "-" + Environment.MachineName;
+            }
+
+            byte[] KeyBytes = System.Text.Encoding.UTF8.GetBytes(KeyBase);
+            SHA1Managed sha = new();
+            byte[] Key = sha.ComputeHash(KeyBytes);
+            return Convert.ToBase64String(Key);
+        }
+    }
+
+    public class WPinternalsConfig
+    {
+        internal static WPinternalsConfig ReadConfig()
+        {
+            string FilePath = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\WPInternals.config");
+            if (File.Exists(FilePath))
+            {
+                string XmlString = File.ReadAllText(FilePath);
+                XmlSerializer x = new(typeof(WPinternalsConfig), "");
+                MemoryStream s = new(System.Text.Encoding.UTF8.GetBytes(XmlString));
+                return (WPinternalsConfig)x.Deserialize(s);
+            }
+            else
+            {
+                return new WPinternalsConfig();
+            }
+        }
+
+        internal void WriteConfig()
+        {
+            string DirPath = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals");
+            if (!Directory.Exists(DirPath))
+            {
+                Directory.CreateDirectory(DirPath);
+            }
+
+            string FilePath = Environment.ExpandEnvironmentVariables("%ALLUSERSPROFILE%\\WPInternals\\WPInternals.config");
+
+            XmlSerializer x = new(typeof(WPinternalsConfig), "");
+
+            XmlSerializerNamespaces ns = new();
+            ns.Add("", "");
+            StreamWriter FileWriter = new(FilePath);
+            x.Serialize(FileWriter, this, ns);
+            FileWriter.Close();
+        }
+
+        internal void SetProfile(string Type, string PlatformID, string ProductCode, string PhoneFirmware, string FfuFirmware, UInt32 FillSize, UInt32 HeaderSize, bool AssumeImageHeaderFallsInGap, bool AllocateAsyncBuffersOnPhone)
+        {
+            FlashProfile Profile = GetProfile(PlatformID, PhoneFirmware, FfuFirmware);
+            if (Profile == null)
+            {
+                Profile = new FlashProfile
+                {
+                    Type = Type,
+                    PlatformID = PlatformID,
+                    ProductCode = ProductCode,
+                    PhoneFirmware = PhoneFirmware,
+                    FfuFirmware = FfuFirmware
+                };
+                FlashProfiles.Add(Profile);
+            }
+
+            Profile.FillSize = FillSize;
+            Profile.HeaderSize = HeaderSize;
+            Profile.AssumeImageHeaderFallsInGap = AssumeImageHeaderFallsInGap;
+            Profile.AllocateAsyncBuffersOnPhone = AllocateAsyncBuffersOnPhone;
+
+            WriteConfig();
+        }
+
+        internal FlashProfile GetProfile(string PlatformID, string PhoneFirmware, string FfuFirmware = null)
+        {
+            return FlashProfiles.Find(p => string.Equals(p.PlatformID, PlatformID, StringComparison.CurrentCultureIgnoreCase) && string.Equals(p.PhoneFirmware, PhoneFirmware, StringComparison.CurrentCultureIgnoreCase) && ((FfuFirmware == null) || string.Equals(p.FfuFirmware, FfuFirmware, StringComparison.CurrentCultureIgnoreCase)));
+        }
+
+        public List<FlashProfile> FlashProfiles = new();
+
+        internal void AddFfuToRepository(string FFUPath)
+        {
+            try
+            {
+                FFU NewFFU = new(FFUPath);
+                AddFfuToRepository(FFUPath, NewFFU.PlatformID, NewFFU.GetFirmwareVersion(), NewFFU.GetOSVersion());
+            }
+            catch (Exception Ex)
+            {
+                LogFile.LogException(Ex, LogType.FileAndConsole);
+            }
+        }
+
+        internal void AddFfuToRepository(string FFUPath, string PlatformID, string FirmwareVersion, string OSVersion)
+        {
+            FFUEntry Entry = FFURepository.Find(e => (e.PlatformID == PlatformID) && (e.FirmwareVersion == FirmwareVersion) && string.Equals(e.Path, FFUPath, StringComparison.CurrentCultureIgnoreCase));
+            if (Entry == null)
+            {
+                LogFile.Log("Adding FFU to repository: " + FFUPath, LogType.FileAndConsole);
+                LogFile.Log("Platform ID: " + PlatformID, LogType.FileAndConsole);
+                if (FirmwareVersion != null)
+                {
+                    LogFile.Log("Firmware version: " + FirmwareVersion, LogType.FileAndConsole);
+                }
+
+                if (OSVersion != null)
+                {
+                    LogFile.Log("OS version: " + OSVersion, LogType.FileAndConsole);
+                }
+
+                Entry = new FFUEntry
+                {
+                    Path = FFUPath,
+                    PlatformID = PlatformID,
+                    FirmwareVersion = FirmwareVersion,
+                    OSVersion = OSVersion
+                };
+                FFURepository.Add(Entry);
+                WriteConfig();
+            }
+            else
+            {
+                LogFile.Log("FFU not added, because it was already present in the repository.", LogType.FileAndConsole);
+            }
+        }
+
+        internal void RemoveFfuFromRepository(string FFUPath)
+        {
+            int Count = 0;
+            FFURepository.Where(e => string.Equals(e.Path, FFUPath, StringComparison.CurrentCultureIgnoreCase)).ToList().ForEach(e =>
+                {
+                    Count++;
+                    FFURepository.Remove(e);
+                });
+            if (Count == 0)
+            {
+                LogFile.Log("FFU was not removed from repository because it was not present.", LogType.FileAndConsole);
+            }
+            else
+            {
+                LogFile.Log("Removed FFU from repository: " + FFUPath, LogType.FileAndConsole);
+                WriteConfig();
+            }
+        }
+
+        public List<FFUEntry> FFURepository = new();
+
+        public List<EmergencyFileEntry> EmergencyRepository = new();
+
+        internal void AddEmergencyToRepository(string Type, string ProgrammerPath, string PayloadPath)
+        {
+            EmergencyFileEntry Entry = EmergencyRepository.Find(e => (e.Type == Type) && string.Equals(e.ProgrammerPath, ProgrammerPath, StringComparison.CurrentCultureIgnoreCase));
+            if ((Entry != null) && (PayloadPath != null) && (!string.Equals(Entry.PayloadPath, PayloadPath, StringComparison.CurrentCultureIgnoreCase)))
+            {
+                LogFile.Log("Updating emergency payload path in repository: " + PayloadPath, LogType.FileAndConsole);
+                Entry.PayloadPath = PayloadPath;
+                WriteConfig();
+            }
+            else if (Entry == null)
+            {
+                LogFile.Log("Adding emergency files to repository: " + ProgrammerPath, LogType.FileAndConsole);
+                LogFile.Log("Type: " + Type, LogType.FileAndConsole);
+
+                Entry = new EmergencyFileEntry
+                {
+                    Type = Type,
+                    ProgrammerPath = ProgrammerPath,
+                    PayloadPath = PayloadPath
+                };
+
+                QualcommPartition Programmer = new(ProgrammerPath);
+                Entry.RKH = Programmer.RootKeyHash;
+
+                EmergencyRepository.Add(Entry);
+                WriteConfig();
+            }
+            else
+            {
+                LogFile.Log("Emergency files not added, because they were already present in the repository.", LogType.FileAndConsole);
+            }
+        }
+
+        internal void RemoveEmergencyFromRepository(string ProgrammerPath)
+        {
+            int Count = 0;
+            EmergencyRepository.Where(e => string.Equals(e.ProgrammerPath, ProgrammerPath, StringComparison.CurrentCultureIgnoreCase)).ToList().ForEach(e =>
+            {
+                Count++;
+                EmergencyRepository.Remove(e);
+            });
+            if (Count == 0)
+            {
+                LogFile.Log("Emergency file was not removed from repository because it was not present.", LogType.FileAndConsole);
+            }
+            else
+            {
+                LogFile.Log("Removed Emergency file from repository: " + ProgrammerPath, LogType.FileAndConsole);
+                WriteConfig();
+            }
+        }
+
+        public string RegistrationName;
+        public string RegistrationEmail;
+        public string RegistrationSkypeID;
+        public string RegistrationTelegramID;
+        public string RegistrationKey;
+    }
+
+    public class FlashProfile
+    {
+        public string Type;
+        public string PlatformID;
+        public string ProductCode;
+        public string PhoneFirmware;
+        public string FfuFirmware;
+
+        [XmlIgnore]
+        internal UInt32 FillSize;
+        [XmlIgnore]
+        internal UInt32 HeaderSize;
+        [XmlIgnore]
+        internal bool AssumeImageHeaderFallsInGap;
+        [XmlIgnore]
+        internal bool AllocateAsyncBuffersOnPhone;
+
+        [XmlElement(ElementName = "Profile")]
+        public string ProfileAsString
+        {
+            get
+            {
+                byte[] ValueBuffer = new byte[10];
+                ValueBuffer[0] = 1; // Profile version
+                ByteOperations.WriteUInt32(ValueBuffer, 1, FillSize);
+                ByteOperations.WriteUInt32(ValueBuffer, 5, HeaderSize);
+                if (AssumeImageHeaderFallsInGap)
+                {
+                    ValueBuffer[9] |= 1;
+                }
+
+                if (AllocateAsyncBuffersOnPhone)
+                {
+                    ValueBuffer[9] |= 2;
+                }
+
+                return Convert.ToBase64String(ValueBuffer);
+            }
+            set
+            {
+                byte[] ValueBuffer = Convert.FromBase64String(value);
+                byte Version = ValueBuffer[0];
+                FillSize = ByteOperations.ReadUInt32(ValueBuffer, 1);
+                HeaderSize = ByteOperations.ReadUInt32(ValueBuffer, 5);
+                AssumeImageHeaderFallsInGap = (ValueBuffer[9] & 1) != 0;
+                AllocateAsyncBuffersOnPhone = (ValueBuffer[9] & 2) != 0;
+            }
+        }
+    }
+
+    public class FFUEntry
+    {
+        public string PlatformID;
+        public string FirmwareVersion;
+        public string OSVersion;
+        public string Path;
+
+        internal bool Exists()
+        {
+            return File.Exists(Path);
+        }
+    }
+
+    public class EmergencyFileEntry
+    {
+        public string Type;
+
+        [XmlIgnore]
+        public byte[] RKH;
+        [XmlElement(ElementName = "RKH")]
+        public string RKHAsString
+        {
+            get
+            {
+                return RKH == null ? null : Converter.ConvertHexToString(RKH, "");
+            }
+            set
+            {
+                RKH = value == null ? null : Converter.ConvertStringToHex(value);
+            }
+        }
+
+        public string ProgrammerPath;
+        public string PayloadPath;
+
+        internal bool ProgrammerExists()
+        {
+            return File.Exists(ProgrammerPath);
+        }
+
+        internal bool PayloadExists()
+        {
+            return File.Exists(PayloadPath);
+        }
+    }
+}
diff --git a/WinUSBNet/API/APIException.cs b/WPinternals/WinUSBNet/API/APIException.cs
similarity index 96%
rename from WinUSBNet/API/APIException.cs
rename to WPinternals/WinUSBNet/API/APIException.cs
index 707d7b7..7c83dff 100644
--- a/WinUSBNet/API/APIException.cs
+++ b/WPinternals/WinUSBNet/API/APIException.cs
@@ -1,48 +1,48 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *  
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-using System;
-using System.ComponentModel;
-using System.Runtime.InteropServices;
-
-namespace MadWizard.WinUSBNet.API
-{
-    /// <summary>
-    /// Exception used internally to catch Win32 API errors. This exception should
-    /// not be thrown to the library's caller.
-    /// </summary>
-    internal class APIException : Exception
-    {
-        public APIException(string message) :
-            base(message)
-        {
-        }
-        public APIException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
-
-        public APIException() : base()
-        {
-        }
-
-        public static APIException Win32(string message)
-        {
-            return Win32(message, Marshal.GetLastWin32Error());
-
-            // TEST!!
-            // int ErrorCode = Marshal.GetLastWin32Error();
-            // if ((ErrorCode & 0xffff) == 0x1f)
-            //     ErrorCode = ErrorCode; // Break here
-            // return APIException.Win32(message, ErrorCode);
-        }
-
-        public static APIException Win32(string message, int errorCode)
-        {
-            return new APIException(message, new Win32Exception(errorCode));
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *  
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+using System;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+
+namespace MadWizard.WinUSBNet.API
+{
+    /// <summary>
+    /// Exception used internally to catch Win32 API errors. This exception should
+    /// not be thrown to the library's caller.
+    /// </summary>
+    internal class APIException : Exception
+    {
+        public APIException(string message) :
+            base(message)
+        {
+        }
+        public APIException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+
+        public APIException() : base()
+        {
+        }
+
+        public static APIException Win32(string message)
+        {
+            return Win32(message, Marshal.GetLastWin32Error());
+
+            // TEST!!
+            // int ErrorCode = Marshal.GetLastWin32Error();
+            // if ((ErrorCode & 0xffff) == 0x1f)
+            //     ErrorCode = ErrorCode; // Break here
+            // return APIException.Win32(message, ErrorCode);
+        }
+
+        public static APIException Win32(string message, int errorCode)
+        {
+            return new APIException(message, new Win32Exception(errorCode));
+        }
+    }
+}
diff --git a/WinUSBNet/API/DeviceDetails.cs b/WPinternals/WinUSBNet/API/DeviceDetails.cs
similarity index 95%
rename from WinUSBNet/API/DeviceDetails.cs
rename to WPinternals/WinUSBNet/API/DeviceDetails.cs
index 64988e0..2b6e442 100644
--- a/WinUSBNet/API/DeviceDetails.cs
+++ b/WPinternals/WinUSBNet/API/DeviceDetails.cs
@@ -1,21 +1,21 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *  
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-namespace MadWizard.WinUSBNet.API
-{
-    internal struct DeviceDetails
-    {
-        public string DevicePath;
-        public string Manufacturer;
-        public string DeviceDescription;
-        public ushort VID;
-        public ushort PID;
-
-        // Heathcliff74
-        public string BusName;
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *  
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+namespace MadWizard.WinUSBNet.API
+{
+    internal struct DeviceDetails
+    {
+        public string DevicePath;
+        public string Manufacturer;
+        public string DeviceDescription;
+        public ushort VID;
+        public ushort PID;
+
+        // Heathcliff74
+        public string BusName;
+    }
+}
diff --git a/WinUSBNet/API/DeviceManagement.cs b/WPinternals/WinUSBNet/API/DeviceManagement.cs
similarity index 97%
rename from WinUSBNet/API/DeviceManagement.cs
rename to WPinternals/WinUSBNet/API/DeviceManagement.cs
index 9ca5e68..c18ed25 100644
--- a/WinUSBNet/API/DeviceManagement.cs
+++ b/WPinternals/WinUSBNet/API/DeviceManagement.cs
@@ -1,370 +1,370 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *  
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-/* NOTE: Parts of the code in this file are based on the work of Jan Axelson
- * See http://www.lvr.com/winusb.htm for more information
- */
-
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
-
-namespace MadWizard.WinUSBNet.API
-{
-    ///  <summary>
-    ///  Routines for detecting devices and receiving device notifications.
-    ///  </summary>
-    internal static partial class DeviceManagement
-    {
-        // Get device name from notification message.
-        // Also checks checkGuid with the GUID from the message to check the notification
-        // is for a relevant device. Other messages might be received.
-        public static string GetNotifyMessageDeviceName(IntPtr pDevBroadcastHeader, Guid checkGuid)
-        {
-            int stringSize;
-
-            DEV_BROADCAST_DEVICEINTERFACE_1 devBroadcastDeviceInterface = new();
-            DEV_BROADCAST_HDR devBroadcastHeader = new();
-
-            // The LParam parameter of Message is a pointer to a DEV_BROADCAST_HDR structure.
-
-            Marshal.PtrToStructure(pDevBroadcastHeader, devBroadcastHeader);
-
-            if (devBroadcastHeader.dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE)
-            {
-                // The dbch_devicetype parameter indicates that the event applies to a device interface.
-                // So the structure in LParam is actually a DEV_BROADCAST_INTERFACE structure, 
-                // which begins with a DEV_BROADCAST_HDR.
-
-                // Obtain the number of characters in dbch_name by subtracting the 32 bytes
-                // in the strucutre that are not part of dbch_name and dividing by 2 because there are 
-                // 2 bytes per character.
-
-                stringSize = Convert.ToInt32((devBroadcastHeader.dbch_size - 32) / 2);
-
-                // The dbcc_name parameter of devBroadcastDeviceInterface contains the device name. 
-                // Trim dbcc_name to match the size of the String.         
-
-                devBroadcastDeviceInterface.dbcc_name = new char[stringSize + 1];
-
-                // Marshal data from the unmanaged block pointed to by m.LParam 
-                // to the managed object devBroadcastDeviceInterface.
-
-                Marshal.PtrToStructure(pDevBroadcastHeader, devBroadcastDeviceInterface);
-
-                // Check if message is for the GUID
-                if (devBroadcastDeviceInterface.dbcc_classguid != checkGuid)
-                {
-                    return null;
-                }
-
-                // Store the device name in a String.
-                return (string)(new(devBroadcastDeviceInterface.dbcc_name, 0, stringSize));
-            }
-            else if (devBroadcastHeader.dbch_devicetype == DBT_DEVTYP_VOLUME)
-            {
-                DEV_BROADCAST_VOLUME vol = new();
-                Marshal.PtrToStructure(pDevBroadcastHeader, vol);
-                Int32 Mask = vol.dbcv_unitmask;
-                Int32 DriveInt = Convert.ToInt32('A') - 1;
-                do
-                {
-                    Mask /= 2;
-                    DriveInt++;
-                }
-                while (Mask > 0);
-                return @"\\.\" + Convert.ToChar(DriveInt) + ":";
-            }
-            return null;
-        }
-
-        private static byte[] GetProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, SPDRP property, out int regType)
-        {
-            if (!SetupDiGetDeviceRegistryProperty(deviceInfoSet, ref deviceInfoData, property, IntPtr.Zero, IntPtr.Zero, 0, out uint requiredSize) && Marshal.GetLastWin32Error() != ERROR_INSUFFICIENT_BUFFER)
-            {
-                throw APIException.Win32("Failed to get buffer size for device registry property.");
-            }
-
-            byte[] buffer = new byte[requiredSize];
-
-            if (!SetupDiGetDeviceRegistryProperty(deviceInfoSet, ref deviceInfoData, property, out regType, buffer, (uint)buffer.Length, out requiredSize))
-            {
-                throw APIException.Win32("Failed to get device registry property.");
-            }
-
-            return buffer;
-        }
-
-        //DEFINE_DEVPROPKEY(DEVPKEY_Device_BusReportedDeviceDesc,  0x540b947e, 0x8b40, 0x45bc, 0xa8, 0xa2, 0x6a, 0x0b, 0x89, 0x4c, 0xbd, 0xa2, 4);     // DEVPROP_TYPE_STRING
-        //DEFINE_DEVPROPKEY(DEVPKEY_Device_ContainerId,            0x8c7ed206, 0x3f8a, 0x4827, 0xb3, 0xab, 0xae, 0x9e, 0x1f, 0xae, 0xfc, 0x6c, 2);     // DEVPROP_TYPE_GUID
-        //DEFINE_DEVPROPKEY(DEVPKEY_Device_FriendlyName,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14);    // DEVPROP_TYPE_STRING
-        //DEFINE_DEVPROPKEY(DEVPKEY_DeviceDisplay_Category,        0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57, 0x5a);  // DEVPROP_TYPE_STRING_LIST
-        //DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationInfo,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 15);    // DEVPROP_TYPE_STRING
-        //DEFINE_DEVPROPKEY(DEVPKEY_Device_Manufacturer,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 13);    // DEVPROP_TYPE_STRING
-        //DEFINE_DEVPROPKEY(DEVPKEY_Device_SecuritySDS,            0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 26);    // DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING
-
-        // Heathcliff74
-        private static byte[] GetProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, DEVPROPKEY property, out uint propertyType)
-        {
-            if (!SetupDiGetDeviceProperty(deviceInfoSet, ref deviceInfoData, ref property, out propertyType, null, 0, out int requiredSize, 0) && Marshal.GetLastWin32Error() != ERROR_INSUFFICIENT_BUFFER)
-            {
-                throw APIException.Win32("Failed to get buffer size for device registry property.");
-            }
-
-            byte[] buffer = new byte[requiredSize];
-
-            if (!SetupDiGetDeviceProperty(deviceInfoSet, ref deviceInfoData, ref property, out propertyType, buffer, buffer.Length, out requiredSize, 0))
-            {
-                throw APIException.Win32("Failed to get device registry property.");
-            }
-
-            return buffer;
-        }
-
-        // todo: is the queried data always available, or should we check ERROR_INVALID_DATA?
-        private static string GetStringProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, SPDRP property)
-        {
-            byte[] buffer = GetProperty(deviceInfoSet, deviceInfoData, property, out int regType);
-            if (regType != (int)RegTypes.REG_SZ)
-            {
-                throw new APIException("Invalid registry type returned for device property.");
-            }
-
-            // sizof(char), 2 bytes, are removed to leave out the string terminator
-            return System.Text.Encoding.Unicode.GetString(buffer, 0, buffer.Length - sizeof(char));
-        }
-
-        // Heathcliff74
-        // todo: is the queried data always available, or should we check ERROR_INVALID_DATA?
-        private static string GetStringProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, DEVPROPKEY property)
-        {
-            byte[] buffer = GetProperty(deviceInfoSet, deviceInfoData, property, out uint propertyType);
-            if (propertyType != 0x00000012) // DEVPROP_TYPE_STRING
-            {
-                throw new APIException("Invalid registry type returned for device property.");
-            }
-
-            // sizof(char), 2 bytes, are removed to leave out the string terminator
-            return System.Text.Encoding.Unicode.GetString(buffer, 0, buffer.Length - sizeof(char));
-        }
-
-        private static string[] GetMultiStringProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, SPDRP property)
-        {
-            byte[] buffer = GetProperty(deviceInfoSet, deviceInfoData, property, out int regType);
-            if (regType != (int)RegTypes.REG_MULTI_SZ)
-            {
-                throw new APIException("Invalid registry type returned for device property.");
-            }
-
-            string fullString = System.Text.Encoding.Unicode.GetString(buffer);
-
-            return fullString.Split(new char[] { '\0' }, StringSplitOptions.RemoveEmptyEntries);
-        }
-        private static DeviceDetails GetDeviceDetails(string devicePath, IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData)
-        {
-            DeviceDetails details = new();
-            details.DevicePath = devicePath;
-            details.DeviceDescription = GetStringProperty(deviceInfoSet, deviceInfoData, SPDRP.SPDRP_DEVICEDESC);
-            details.Manufacturer = GetStringProperty(deviceInfoSet, deviceInfoData, SPDRP.SPDRP_MFG);
-
-            // Heathcliff74
-            details.BusName = "";
-            try
-            {
-                details.BusName = GetStringProperty(deviceInfoSet, deviceInfoData, new DEVPROPKEY(new Guid(0x540b947e, 0x8b40, 0x45bc, 0xa8, 0xa2, 0x6a, 0x0b, 0x89, 0x4c, 0xbd, 0xa2), 4));
-            }
-            catch { }
-
-            string[] hardwareIDs = GetMultiStringProperty(deviceInfoSet, deviceInfoData, SPDRP.SPDRP_HARDWAREID);
-
-            Regex regex = new("^USB\\\\VID_([0-9A-F]{4})&PID_([0-9A-F]{4})", RegexOptions.IgnoreCase);
-            foreach (string hardwareID in hardwareIDs)
-            {
-                Match match = regex.Match(hardwareID);
-                if (match.Success)
-                {
-                    details.VID = ushort.Parse(match.Groups[1].Value, System.Globalization.NumberStyles.AllowHexSpecifier);
-                    details.PID = ushort.Parse(match.Groups[2].Value, System.Globalization.NumberStyles.AllowHexSpecifier);
-                    break;
-                }
-            }
-
-            // Heathcliff74
-            // Not all devices have numeric VID and PID
-            // 
-            // if (!foundVidPid)
-            //     throw new APIException("Failed to find VID and PID for USB device. No hardware ID could be parsed.");
-
-            return details;
-        }
-
-        public static DeviceDetails[] FindDevicesFromGuid(Guid guid)
-        {
-            IntPtr deviceInfoSet = IntPtr.Zero;
-            List<DeviceDetails> deviceList = new();
-            try
-            {
-                deviceInfoSet = SetupDiGetClassDevs(ref guid, IntPtr.Zero, IntPtr.Zero,
-                    DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
-                if (deviceInfoSet == FileIO.INVALID_HANDLE_VALUE)
-                {
-                    throw APIException.Win32("Failed to enumerate devices.");
-                }
-
-                int memberIndex = 0;
-                while (true)
-                {
-                    // Begin with 0 and increment through the device information set until
-                    // no more devices are available.					
-                    SP_DEVICE_INTERFACE_DATA deviceInterfaceData = new();
-
-                    // The cbSize element of the deviceInterfaceData structure must be set to
-                    // the structure's size in bytes. 
-                    // The size is 28 bytes for 32-bit code and 32 bytes for 64-bit code.
-                    deviceInterfaceData.cbSize = Marshal.SizeOf(deviceInterfaceData);
-
-                    bool success = SetupDiEnumDeviceInterfaces(deviceInfoSet, IntPtr.Zero, ref guid, memberIndex, ref deviceInterfaceData);
-
-                    // Find out if a device information set was retrieved.
-                    if (!success)
-                    {
-                        int lastError = Marshal.GetLastWin32Error();
-                        if (lastError == ERROR_NO_MORE_ITEMS)
-                        {
-                            break;
-                        }
-
-                        throw APIException.Win32("Failed to get device interface.");
-                    }
-                    // A device is present.
-
-                    int bufferSize = 0;
-
-                    success = SetupDiGetDeviceInterfaceDetail
-                        (deviceInfoSet,
-                        ref deviceInterfaceData,
-                        IntPtr.Zero,
-                        0,
-                        ref bufferSize,
-                        IntPtr.Zero);
-
-                    if (!success && Marshal.GetLastWin32Error() != ERROR_INSUFFICIENT_BUFFER)
-                    {
-                        throw APIException.Win32("Failed to get interface details buffer size.");
-                    }
-
-                    IntPtr detailDataBuffer = IntPtr.Zero;
-                    try
-                    {
-                        // Allocate memory for the SP_DEVICE_INTERFACE_DETAIL_DATA structure using the returned buffer size.
-                        detailDataBuffer = Marshal.AllocHGlobal(bufferSize);
-
-                        // Store cbSize in the first bytes of the array. The number of bytes varies with 32- and 64-bit systems.
-
-                        Marshal.WriteInt32(detailDataBuffer, (IntPtr.Size == 4) ? (4 + Marshal.SystemDefaultCharSize) : 8);
-
-                        // Call SetupDiGetDeviceInterfaceDetail again.
-                        // This time, pass a pointer to DetailDataBuffer
-                        // and the returned required buffer size.
-
-                        // build a DevInfo Data structure
-                        SP_DEVINFO_DATA da = new();
-                        da.cbSize = Marshal.SizeOf(da);
-
-                        success = SetupDiGetDeviceInterfaceDetail
-                            (deviceInfoSet,
-                            ref deviceInterfaceData,
-                            detailDataBuffer,
-                            bufferSize,
-                            ref bufferSize,
-                            ref da);
-
-                        if (!success)
-                        {
-                            throw APIException.Win32("Failed to get device interface details.");
-                        }
-
-                        // Skip over cbsize (4 bytes) to get the address of the devicePathName.
-
-                        IntPtr pDevicePathName = new(detailDataBuffer.ToInt64() + 4);
-                        string pathName = Marshal.PtrToStringUni(pDevicePathName);
-
-                        // Get the String containing the devicePathName.
-
-                        DeviceDetails details = GetDeviceDetails(pathName, deviceInfoSet, da);
-
-                        deviceList.Add(details);
-                    }
-                    finally
-                    {
-                        if (detailDataBuffer != IntPtr.Zero)
-                        {
-                            Marshal.FreeHGlobal(detailDataBuffer);
-                            detailDataBuffer = IntPtr.Zero;
-                        }
-                    }
-                    memberIndex++;
-                }
-            }
-            finally
-            {
-                if (deviceInfoSet != IntPtr.Zero && deviceInfoSet != FileIO.INVALID_HANDLE_VALUE)
-                {
-                    SetupDiDestroyDeviceInfoList(deviceInfoSet);
-                }
-            }
-            return deviceList.ToArray();
-        }
-
-        public static void RegisterForDeviceNotifications(IntPtr controlHandle, Guid classGuid, ref IntPtr deviceNotificationHandle)
-        {
-            DEV_BROADCAST_DEVICEINTERFACE devBroadcastDeviceInterface = new();
-            IntPtr devBroadcastDeviceInterfaceBuffer = IntPtr.Zero;
-            try
-            {
-                int size = Marshal.SizeOf(devBroadcastDeviceInterface);
-                devBroadcastDeviceInterface.dbcc_size = size;
-
-                devBroadcastDeviceInterface.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
-                devBroadcastDeviceInterface.dbcc_reserved = 0;
-                devBroadcastDeviceInterface.dbcc_classguid = classGuid;
-                devBroadcastDeviceInterfaceBuffer = Marshal.AllocHGlobal(size);
-
-                // Copy the DEV_BROADCAST_DEVICEINTERFACE structure to the buffer.
-                // Set fDeleteOld True to prevent memory leaks.
-                Marshal.StructureToPtr(devBroadcastDeviceInterface, devBroadcastDeviceInterfaceBuffer, true);
-
-                deviceNotificationHandle = RegisterDeviceNotification(controlHandle, devBroadcastDeviceInterfaceBuffer, DEVICE_NOTIFY_WINDOW_HANDLE);
-                if (deviceNotificationHandle == IntPtr.Zero)
-                {
-                    throw APIException.Win32("Failed to register device notification");
-                }
-
-                // Marshal data from the unmanaged block devBroadcastDeviceInterfaceBuffer to
-                // the managed object devBroadcastDeviceInterface
-                Marshal.PtrToStructure(devBroadcastDeviceInterfaceBuffer, devBroadcastDeviceInterface);
-            }
-            finally
-            {
-                // Free the memory allocated previously by AllocHGlobal.
-                if (devBroadcastDeviceInterfaceBuffer != IntPtr.Zero)
-                {
-                    Marshal.FreeHGlobal(devBroadcastDeviceInterfaceBuffer);
-                }
-            }
-        }
-
-        public static void StopDeviceDeviceNotifications(IntPtr deviceNotificationHandle)
-        {
-            if (!UnregisterDeviceNotification(deviceNotificationHandle))
-            {
-                throw APIException.Win32("Failed to unregister device notification");
-            }
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *  
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+/* NOTE: Parts of the code in this file are based on the work of Jan Axelson
+ * See http://www.lvr.com/winusb.htm for more information
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
+
+namespace MadWizard.WinUSBNet.API
+{
+    ///  <summary>
+    ///  Routines for detecting devices and receiving device notifications.
+    ///  </summary>
+    internal static partial class DeviceManagement
+    {
+        // Get device name from notification message.
+        // Also checks checkGuid with the GUID from the message to check the notification
+        // is for a relevant device. Other messages might be received.
+        public static string GetNotifyMessageDeviceName(IntPtr pDevBroadcastHeader, Guid checkGuid)
+        {
+            int stringSize;
+
+            DEV_BROADCAST_DEVICEINTERFACE_1 devBroadcastDeviceInterface = new();
+            DEV_BROADCAST_HDR devBroadcastHeader = new();
+
+            // The LParam parameter of Message is a pointer to a DEV_BROADCAST_HDR structure.
+
+            Marshal.PtrToStructure(pDevBroadcastHeader, devBroadcastHeader);
+
+            if (devBroadcastHeader.dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE)
+            {
+                // The dbch_devicetype parameter indicates that the event applies to a device interface.
+                // So the structure in LParam is actually a DEV_BROADCAST_INTERFACE structure, 
+                // which begins with a DEV_BROADCAST_HDR.
+
+                // Obtain the number of characters in dbch_name by subtracting the 32 bytes
+                // in the strucutre that are not part of dbch_name and dividing by 2 because there are 
+                // 2 bytes per character.
+
+                stringSize = Convert.ToInt32((devBroadcastHeader.dbch_size - 32) / 2);
+
+                // The dbcc_name parameter of devBroadcastDeviceInterface contains the device name. 
+                // Trim dbcc_name to match the size of the String.         
+
+                devBroadcastDeviceInterface.dbcc_name = new char[stringSize + 1];
+
+                // Marshal data from the unmanaged block pointed to by m.LParam 
+                // to the managed object devBroadcastDeviceInterface.
+
+                Marshal.PtrToStructure(pDevBroadcastHeader, devBroadcastDeviceInterface);
+
+                // Check if message is for the GUID
+                if (devBroadcastDeviceInterface.dbcc_classguid != checkGuid)
+                {
+                    return null;
+                }
+
+                // Store the device name in a String.
+                return (string)(new(devBroadcastDeviceInterface.dbcc_name, 0, stringSize));
+            }
+            else if (devBroadcastHeader.dbch_devicetype == DBT_DEVTYP_VOLUME)
+            {
+                DEV_BROADCAST_VOLUME vol = new();
+                Marshal.PtrToStructure(pDevBroadcastHeader, vol);
+                Int32 Mask = vol.dbcv_unitmask;
+                Int32 DriveInt = Convert.ToInt32('A') - 1;
+                do
+                {
+                    Mask /= 2;
+                    DriveInt++;
+                }
+                while (Mask > 0);
+                return @"\\.\" + Convert.ToChar(DriveInt) + ":";
+            }
+            return null;
+        }
+
+        private static byte[] GetProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, SPDRP property, out int regType)
+        {
+            if (!SetupDiGetDeviceRegistryProperty(deviceInfoSet, ref deviceInfoData, property, IntPtr.Zero, IntPtr.Zero, 0, out uint requiredSize) && Marshal.GetLastWin32Error() != ERROR_INSUFFICIENT_BUFFER)
+            {
+                throw APIException.Win32("Failed to get buffer size for device registry property.");
+            }
+
+            byte[] buffer = new byte[requiredSize];
+
+            if (!SetupDiGetDeviceRegistryProperty(deviceInfoSet, ref deviceInfoData, property, out regType, buffer, (uint)buffer.Length, out requiredSize))
+            {
+                throw APIException.Win32("Failed to get device registry property.");
+            }
+
+            return buffer;
+        }
+
+        //DEFINE_DEVPROPKEY(DEVPKEY_Device_BusReportedDeviceDesc,  0x540b947e, 0x8b40, 0x45bc, 0xa8, 0xa2, 0x6a, 0x0b, 0x89, 0x4c, 0xbd, 0xa2, 4);     // DEVPROP_TYPE_STRING
+        //DEFINE_DEVPROPKEY(DEVPKEY_Device_ContainerId,            0x8c7ed206, 0x3f8a, 0x4827, 0xb3, 0xab, 0xae, 0x9e, 0x1f, 0xae, 0xfc, 0x6c, 2);     // DEVPROP_TYPE_GUID
+        //DEFINE_DEVPROPKEY(DEVPKEY_Device_FriendlyName,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 14);    // DEVPROP_TYPE_STRING
+        //DEFINE_DEVPROPKEY(DEVPKEY_DeviceDisplay_Category,        0x78c34fc8, 0x104a, 0x4aca, 0x9e, 0xa4, 0x52, 0x4d, 0x52, 0x99, 0x6e, 0x57, 0x5a);  // DEVPROP_TYPE_STRING_LIST
+        //DEFINE_DEVPROPKEY(DEVPKEY_Device_LocationInfo,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 15);    // DEVPROP_TYPE_STRING
+        //DEFINE_DEVPROPKEY(DEVPKEY_Device_Manufacturer,           0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 13);    // DEVPROP_TYPE_STRING
+        //DEFINE_DEVPROPKEY(DEVPKEY_Device_SecuritySDS,            0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20, 0x67, 0xd1, 0x46, 0xa8, 0x50, 0xe0, 26);    // DEVPROP_TYPE_SECURITY_DESCRIPTOR_STRING
+
+        // Heathcliff74
+        private static byte[] GetProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, DEVPROPKEY property, out uint propertyType)
+        {
+            if (!SetupDiGetDeviceProperty(deviceInfoSet, ref deviceInfoData, ref property, out propertyType, null, 0, out int requiredSize, 0) && Marshal.GetLastWin32Error() != ERROR_INSUFFICIENT_BUFFER)
+            {
+                throw APIException.Win32("Failed to get buffer size for device registry property.");
+            }
+
+            byte[] buffer = new byte[requiredSize];
+
+            if (!SetupDiGetDeviceProperty(deviceInfoSet, ref deviceInfoData, ref property, out propertyType, buffer, buffer.Length, out requiredSize, 0))
+            {
+                throw APIException.Win32("Failed to get device registry property.");
+            }
+
+            return buffer;
+        }
+
+        // todo: is the queried data always available, or should we check ERROR_INVALID_DATA?
+        private static string GetStringProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, SPDRP property)
+        {
+            byte[] buffer = GetProperty(deviceInfoSet, deviceInfoData, property, out int regType);
+            if (regType != (int)RegTypes.REG_SZ)
+            {
+                throw new APIException("Invalid registry type returned for device property.");
+            }
+
+            // sizof(char), 2 bytes, are removed to leave out the string terminator
+            return System.Text.Encoding.Unicode.GetString(buffer, 0, buffer.Length - sizeof(char));
+        }
+
+        // Heathcliff74
+        // todo: is the queried data always available, or should we check ERROR_INVALID_DATA?
+        private static string GetStringProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, DEVPROPKEY property)
+        {
+            byte[] buffer = GetProperty(deviceInfoSet, deviceInfoData, property, out uint propertyType);
+            if (propertyType != 0x00000012) // DEVPROP_TYPE_STRING
+            {
+                throw new APIException("Invalid registry type returned for device property.");
+            }
+
+            // sizof(char), 2 bytes, are removed to leave out the string terminator
+            return System.Text.Encoding.Unicode.GetString(buffer, 0, buffer.Length - sizeof(char));
+        }
+
+        private static string[] GetMultiStringProperty(IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData, SPDRP property)
+        {
+            byte[] buffer = GetProperty(deviceInfoSet, deviceInfoData, property, out int regType);
+            if (regType != (int)RegTypes.REG_MULTI_SZ)
+            {
+                throw new APIException("Invalid registry type returned for device property.");
+            }
+
+            string fullString = System.Text.Encoding.Unicode.GetString(buffer);
+
+            return fullString.Split(new char[] { '\0' }, StringSplitOptions.RemoveEmptyEntries);
+        }
+        private static DeviceDetails GetDeviceDetails(string devicePath, IntPtr deviceInfoSet, SP_DEVINFO_DATA deviceInfoData)
+        {
+            DeviceDetails details = new();
+            details.DevicePath = devicePath;
+            details.DeviceDescription = GetStringProperty(deviceInfoSet, deviceInfoData, SPDRP.SPDRP_DEVICEDESC);
+            details.Manufacturer = GetStringProperty(deviceInfoSet, deviceInfoData, SPDRP.SPDRP_MFG);
+
+            // Heathcliff74
+            details.BusName = "";
+            try
+            {
+                details.BusName = GetStringProperty(deviceInfoSet, deviceInfoData, new DEVPROPKEY(new Guid(0x540b947e, 0x8b40, 0x45bc, 0xa8, 0xa2, 0x6a, 0x0b, 0x89, 0x4c, 0xbd, 0xa2), 4));
+            }
+            catch { }
+
+            string[] hardwareIDs = GetMultiStringProperty(deviceInfoSet, deviceInfoData, SPDRP.SPDRP_HARDWAREID);
+
+            Regex regex = new("^USB\\\\VID_([0-9A-F]{4})&PID_([0-9A-F]{4})", RegexOptions.IgnoreCase);
+            foreach (string hardwareID in hardwareIDs)
+            {
+                Match match = regex.Match(hardwareID);
+                if (match.Success)
+                {
+                    details.VID = ushort.Parse(match.Groups[1].Value, System.Globalization.NumberStyles.AllowHexSpecifier);
+                    details.PID = ushort.Parse(match.Groups[2].Value, System.Globalization.NumberStyles.AllowHexSpecifier);
+                    break;
+                }
+            }
+
+            // Heathcliff74
+            // Not all devices have numeric VID and PID
+            // 
+            // if (!foundVidPid)
+            //     throw new APIException("Failed to find VID and PID for USB device. No hardware ID could be parsed.");
+
+            return details;
+        }
+
+        public static DeviceDetails[] FindDevicesFromGuid(Guid guid)
+        {
+            IntPtr deviceInfoSet = IntPtr.Zero;
+            List<DeviceDetails> deviceList = new();
+            try
+            {
+                deviceInfoSet = SetupDiGetClassDevs(ref guid, IntPtr.Zero, IntPtr.Zero,
+                    DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
+                if (deviceInfoSet == FileIO.INVALID_HANDLE_VALUE)
+                {
+                    throw APIException.Win32("Failed to enumerate devices.");
+                }
+
+                int memberIndex = 0;
+                while (true)
+                {
+                    // Begin with 0 and increment through the device information set until
+                    // no more devices are available.					
+                    SP_DEVICE_INTERFACE_DATA deviceInterfaceData = new();
+
+                    // The cbSize element of the deviceInterfaceData structure must be set to
+                    // the structure's size in bytes. 
+                    // The size is 28 bytes for 32-bit code and 32 bytes for 64-bit code.
+                    deviceInterfaceData.cbSize = Marshal.SizeOf(deviceInterfaceData);
+
+                    bool success = SetupDiEnumDeviceInterfaces(deviceInfoSet, IntPtr.Zero, ref guid, memberIndex, ref deviceInterfaceData);
+
+                    // Find out if a device information set was retrieved.
+                    if (!success)
+                    {
+                        int lastError = Marshal.GetLastWin32Error();
+                        if (lastError == ERROR_NO_MORE_ITEMS)
+                        {
+                            break;
+                        }
+
+                        throw APIException.Win32("Failed to get device interface.");
+                    }
+                    // A device is present.
+
+                    int bufferSize = 0;
+
+                    success = SetupDiGetDeviceInterfaceDetail
+                        (deviceInfoSet,
+                        ref deviceInterfaceData,
+                        IntPtr.Zero,
+                        0,
+                        ref bufferSize,
+                        IntPtr.Zero);
+
+                    if (!success && Marshal.GetLastWin32Error() != ERROR_INSUFFICIENT_BUFFER)
+                    {
+                        throw APIException.Win32("Failed to get interface details buffer size.");
+                    }
+
+                    IntPtr detailDataBuffer = IntPtr.Zero;
+                    try
+                    {
+                        // Allocate memory for the SP_DEVICE_INTERFACE_DETAIL_DATA structure using the returned buffer size.
+                        detailDataBuffer = Marshal.AllocHGlobal(bufferSize);
+
+                        // Store cbSize in the first bytes of the array. The number of bytes varies with 32- and 64-bit systems.
+
+                        Marshal.WriteInt32(detailDataBuffer, (IntPtr.Size == 4) ? (4 + Marshal.SystemDefaultCharSize) : 8);
+
+                        // Call SetupDiGetDeviceInterfaceDetail again.
+                        // This time, pass a pointer to DetailDataBuffer
+                        // and the returned required buffer size.
+
+                        // build a DevInfo Data structure
+                        SP_DEVINFO_DATA da = new();
+                        da.cbSize = Marshal.SizeOf(da);
+
+                        success = SetupDiGetDeviceInterfaceDetail
+                            (deviceInfoSet,
+                            ref deviceInterfaceData,
+                            detailDataBuffer,
+                            bufferSize,
+                            ref bufferSize,
+                            ref da);
+
+                        if (!success)
+                        {
+                            throw APIException.Win32("Failed to get device interface details.");
+                        }
+
+                        // Skip over cbsize (4 bytes) to get the address of the devicePathName.
+
+                        IntPtr pDevicePathName = new(detailDataBuffer.ToInt64() + 4);
+                        string pathName = Marshal.PtrToStringUni(pDevicePathName);
+
+                        // Get the String containing the devicePathName.
+
+                        DeviceDetails details = GetDeviceDetails(pathName, deviceInfoSet, da);
+
+                        deviceList.Add(details);
+                    }
+                    finally
+                    {
+                        if (detailDataBuffer != IntPtr.Zero)
+                        {
+                            Marshal.FreeHGlobal(detailDataBuffer);
+                            detailDataBuffer = IntPtr.Zero;
+                        }
+                    }
+                    memberIndex++;
+                }
+            }
+            finally
+            {
+                if (deviceInfoSet != IntPtr.Zero && deviceInfoSet != FileIO.INVALID_HANDLE_VALUE)
+                {
+                    SetupDiDestroyDeviceInfoList(deviceInfoSet);
+                }
+            }
+            return deviceList.ToArray();
+        }
+
+        public static void RegisterForDeviceNotifications(IntPtr controlHandle, Guid classGuid, ref IntPtr deviceNotificationHandle)
+        {
+            DEV_BROADCAST_DEVICEINTERFACE devBroadcastDeviceInterface = new();
+            IntPtr devBroadcastDeviceInterfaceBuffer = IntPtr.Zero;
+            try
+            {
+                int size = Marshal.SizeOf(devBroadcastDeviceInterface);
+                devBroadcastDeviceInterface.dbcc_size = size;
+
+                devBroadcastDeviceInterface.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
+                devBroadcastDeviceInterface.dbcc_reserved = 0;
+                devBroadcastDeviceInterface.dbcc_classguid = classGuid;
+                devBroadcastDeviceInterfaceBuffer = Marshal.AllocHGlobal(size);
+
+                // Copy the DEV_BROADCAST_DEVICEINTERFACE structure to the buffer.
+                // Set fDeleteOld True to prevent memory leaks.
+                Marshal.StructureToPtr(devBroadcastDeviceInterface, devBroadcastDeviceInterfaceBuffer, true);
+
+                deviceNotificationHandle = RegisterDeviceNotification(controlHandle, devBroadcastDeviceInterfaceBuffer, DEVICE_NOTIFY_WINDOW_HANDLE);
+                if (deviceNotificationHandle == IntPtr.Zero)
+                {
+                    throw APIException.Win32("Failed to register device notification");
+                }
+
+                // Marshal data from the unmanaged block devBroadcastDeviceInterfaceBuffer to
+                // the managed object devBroadcastDeviceInterface
+                Marshal.PtrToStructure(devBroadcastDeviceInterfaceBuffer, devBroadcastDeviceInterface);
+            }
+            finally
+            {
+                // Free the memory allocated previously by AllocHGlobal.
+                if (devBroadcastDeviceInterfaceBuffer != IntPtr.Zero)
+                {
+                    Marshal.FreeHGlobal(devBroadcastDeviceInterfaceBuffer);
+                }
+            }
+        }
+
+        public static void StopDeviceDeviceNotifications(IntPtr deviceNotificationHandle)
+        {
+            if (!UnregisterDeviceNotification(deviceNotificationHandle))
+            {
+                throw APIException.Win32("Failed to unregister device notification");
+            }
+        }
+    }
+}
diff --git a/WinUSBNet/API/DeviceManagementAPI.cs b/WPinternals/WinUSBNet/API/DeviceManagementAPI.cs
similarity index 97%
rename from WinUSBNet/API/DeviceManagementAPI.cs
rename to WPinternals/WinUSBNet/API/DeviceManagementAPI.cs
index 09fb1f2..ed91a64 100644
--- a/WinUSBNet/API/DeviceManagementAPI.cs
+++ b/WPinternals/WinUSBNet/API/DeviceManagementAPI.cs
@@ -1,180 +1,180 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *  
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-/* NOTE: Parts of the code in this file are based on the work of Jan Axelson
- * See http://www.lvr.com/winusb.htm for more information
- */
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace MadWizard.WinUSBNet.API
-{
-    /// <summary>
-    /// API declarations relating to device management (SetupDixxx and
-    /// RegisterDeviceNotification functions).
-    /// </summary>
-    internal static partial class DeviceManagement
-    {
-        // from dbt.h
-
-        internal const Int32 DBT_DEVICEARRIVAL = 0X8000;
-        internal const Int32 DBT_DEVICEREMOVECOMPLETE = 0X8004;
-        internal const Int32 DBT_QUERYCHANGECONFIG = 0x0017;
-        private const Int32 DBT_DEVTYP_DEVICEINTERFACE = 5;
-        private const Int32 DBT_DEVTYP_VOLUME = 2; // drive type is logical volume
-        private const Int32 DBT_DEVTYP_HANDLE = 6;
-        private const Int32 DEVICE_NOTIFY_ALL_INTERFACE_CLASSES = 4;
-        private const Int32 DEVICE_NOTIFY_SERVICE_HANDLE = 1;
-        private const Int32 DEVICE_NOTIFY_WINDOW_HANDLE = 0;
-        internal const Int32 WM_DEVICECHANGE = 0X219;
-        internal const Int32 DBT_DEVNODES_CHANGED = 7;
-
-        // from setupapi.h
-
-        private const Int32 DIGCF_PRESENT = 2;
-        private const Int32 DIGCF_DEVICEINTERFACE = 0X10;
-
-        // Two declarations for the DEV_BROADCAST_DEVICEINTERFACE structure.
-
-        // Use this one in the call to RegisterDeviceNotification() and
-        // in checking dbch_devicetype in a DEV_BROADCAST_HDR structure:
-
-        [StructLayout(LayoutKind.Sequential)]
-        private class DEV_BROADCAST_DEVICEINTERFACE
-        {
-            internal Int32 dbcc_size;
-            internal Int32 dbcc_devicetype;
-            internal Int32 dbcc_reserved;
-            internal Guid dbcc_classguid;
-            internal Int16 dbcc_name;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        private class DEV_BROADCAST_DEVICEINTERFACE_1
-        {
-            internal Int32 dbcc_size;
-            internal Int32 dbcc_devicetype;
-            internal Int32 dbcc_reserved;
-            internal Guid dbcc_classguid;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 255)]
-            internal Char[] dbcc_name;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        public class DEV_BROADCAST_VOLUME
-        {
-            public Int32 dbcv_size;
-            public Int32 dbcv_devicetype;
-            public Int32 dbcv_reserved;
-            public Int32 dbcv_unitmask;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        private class DEV_BROADCAST_HDR
-        {
-            internal Int32 dbch_size;
-            internal Int32 dbch_devicetype;
-            internal Int32 dbch_reserved;
-        }
-
-        private struct SP_DEVICE_INTERFACE_DATA
-        {
-            internal Int32 cbSize;
-            internal Guid InterfaceClassGuid;
-            internal Int32 Flags;
-            internal IntPtr Reserved;
-        }
-        private struct SP_DEVINFO_DATA
-        {
-            internal Int32 cbSize;
-            internal Guid ClassGuid;
-            internal Int32 DevInst;
-            internal IntPtr Reserved;
-        }
-
-        // from pinvoke.net
-        private enum SPDRP : uint
-        {
-            SPDRP_DEVICEDESC = 0x00000000,
-            SPDRP_HARDWAREID = 0x00000001,
-            SPDRP_COMPATIBLEIDS = 0x00000002,
-            SPDRP_NTDEVICEPATHS = 0x00000003,
-            SPDRP_SERVICE = 0x00000004,
-            SPDRP_CONFIGURATION = 0x00000005,
-            SPDRP_CONFIGURATIONVECTOR = 0x00000006,
-            SPDRP_CLASS = 0x00000007,
-            SPDRP_CLASSGUID = 0x00000008,
-            SPDRP_DRIVER = 0x00000009,
-            SPDRP_CONFIGFLAGS = 0x0000000A,
-            SPDRP_MFG = 0x0000000B,
-            SPDRP_FRIENDLYNAME = 0x0000000C,
-            SPDRP_LOCATION_INFORMATION = 0x0000000D,
-            SPDRP_PHYSICAL_DEVICE_OBJECT_NAME = 0x0000000E,
-            SPDRP_CAPABILITIES = 0x0000000F,
-            SPDRP_UI_NUMBER = 0x00000010,
-            SPDRP_UPPERFILTERS = 0x00000011,
-            SPDRP_LOWERFILTERS = 0x00000012,
-            SPDRP_MAXIMUM_PROPERTY = 0x00000013,
-
-            SPDRP_ENUMERATOR_NAME = 0x16,
-        };
-
-        // Device Property
-        [StructLayout(LayoutKind.Sequential)]
-        internal unsafe struct DEVPROPKEY
-        {
-            public DEVPROPKEY(Guid ifmtid, UInt32 ipid)
-            { fmtid = ifmtid; pid = ipid; }
-            public Guid fmtid;
-            public UInt32 pid;
-        }
-
-        private enum RegTypes : int
-        {
-            // incomplete list, these are just the ones used.
-            REG_SZ = 1,
-            REG_MULTI_SZ = 7
-        }
-
-        [DllImport("user32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        private static extern IntPtr RegisterDeviceNotification(IntPtr hRecipient, IntPtr NotificationFilter, Int32 Flags);
-
-        //[DllImport("setupapi.dll", SetLastError = true)]
-        //internal static extern Int32 SetupDiCreateDeviceInfoList(ref System.Guid ClassGuid, Int32 hwndParent);
-
-        [DllImport("setupapi.dll", SetLastError = true)]
-        private static extern Int32 SetupDiDestroyDeviceInfoList(IntPtr DeviceInfoSet);
-
-        [DllImport("setupapi.dll", SetLastError = true)]
-        private static extern bool SetupDiEnumDeviceInterfaces(IntPtr DeviceInfoSet, IntPtr DeviceInfoData, ref Guid InterfaceClassGuid, Int32 MemberIndex, ref SP_DEVICE_INTERFACE_DATA DeviceInterfaceData);
-
-        [DllImport("setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        private static extern bool SetupDiGetDeviceRegistryProperty(IntPtr DeviceInfoSet, ref SP_DEVINFO_DATA DeviceInfoData, SPDRP Property, out int PropertyRegDataType, byte[] PropertyBuffer, uint PropertyBufferSize, out UInt32 RequiredSize);
-
-        [DllImport("setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        private static extern bool SetupDiGetDeviceRegistryProperty(IntPtr DeviceInfoSet, ref SP_DEVINFO_DATA DeviceInfoData, SPDRP Property, IntPtr PropertyRegDataType, IntPtr PropertyBuffer, uint PropertyBufferSize, out UInt32 RequiredSize);
-
-        [DllImport("setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        private static extern unsafe bool SetupDiGetDeviceProperty(IntPtr deviceInfoSet, ref SP_DEVINFO_DATA DeviceInfoData, ref DEVPROPKEY propertyKey, out UInt32 propertyType, byte[] propertyBuffer, Int32 propertyBufferSize, out int requiredSize, UInt32 flags);
-
-        [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern IntPtr SetupDiGetClassDevs(ref Guid ClassGuid, IntPtr Enumerator, IntPtr hwndParent, Int32 Flags);
-
-        [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern bool SetupDiGetDeviceInterfaceDetail(IntPtr DeviceInfoSet, ref SP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IntPtr DeviceInterfaceDetailData, Int32 DeviceInterfaceDetailDataSize, ref Int32 RequiredSize, ref SP_DEVINFO_DATA DeviceInfoData);
-
-        [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        private static extern bool SetupDiGetDeviceInterfaceDetail(IntPtr DeviceInfoSet, ref SP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IntPtr DeviceInterfaceDetailData, Int32 DeviceInterfaceDetailDataSize, ref Int32 RequiredSize, IntPtr DeviceInfoData);
-
-        [DllImport("user32.dll", SetLastError = true)]
-        private static extern bool UnregisterDeviceNotification(IntPtr Handle);
-
-        private const int ERROR_NO_MORE_ITEMS = 259;
-        private const int ERROR_INSUFFICIENT_BUFFER = 122;
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *  
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+/* NOTE: Parts of the code in this file are based on the work of Jan Axelson
+ * See http://www.lvr.com/winusb.htm for more information
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace MadWizard.WinUSBNet.API
+{
+    /// <summary>
+    /// API declarations relating to device management (SetupDixxx and
+    /// RegisterDeviceNotification functions).
+    /// </summary>
+    internal static partial class DeviceManagement
+    {
+        // from dbt.h
+
+        internal const Int32 DBT_DEVICEARRIVAL = 0X8000;
+        internal const Int32 DBT_DEVICEREMOVECOMPLETE = 0X8004;
+        internal const Int32 DBT_QUERYCHANGECONFIG = 0x0017;
+        private const Int32 DBT_DEVTYP_DEVICEINTERFACE = 5;
+        private const Int32 DBT_DEVTYP_VOLUME = 2; // drive type is logical volume
+        private const Int32 DBT_DEVTYP_HANDLE = 6;
+        private const Int32 DEVICE_NOTIFY_ALL_INTERFACE_CLASSES = 4;
+        private const Int32 DEVICE_NOTIFY_SERVICE_HANDLE = 1;
+        private const Int32 DEVICE_NOTIFY_WINDOW_HANDLE = 0;
+        internal const Int32 WM_DEVICECHANGE = 0X219;
+        internal const Int32 DBT_DEVNODES_CHANGED = 7;
+
+        // from setupapi.h
+
+        private const Int32 DIGCF_PRESENT = 2;
+        private const Int32 DIGCF_DEVICEINTERFACE = 0X10;
+
+        // Two declarations for the DEV_BROADCAST_DEVICEINTERFACE structure.
+
+        // Use this one in the call to RegisterDeviceNotification() and
+        // in checking dbch_devicetype in a DEV_BROADCAST_HDR structure:
+
+        [StructLayout(LayoutKind.Sequential)]
+        private class DEV_BROADCAST_DEVICEINTERFACE
+        {
+            internal Int32 dbcc_size;
+            internal Int32 dbcc_devicetype;
+            internal Int32 dbcc_reserved;
+            internal Guid dbcc_classguid;
+            internal Int16 dbcc_name;
+        }
+
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        private class DEV_BROADCAST_DEVICEINTERFACE_1
+        {
+            internal Int32 dbcc_size;
+            internal Int32 dbcc_devicetype;
+            internal Int32 dbcc_reserved;
+            internal Guid dbcc_classguid;
+            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 255)]
+            internal Char[] dbcc_name;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        public class DEV_BROADCAST_VOLUME
+        {
+            public Int32 dbcv_size;
+            public Int32 dbcv_devicetype;
+            public Int32 dbcv_reserved;
+            public Int32 dbcv_unitmask;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private class DEV_BROADCAST_HDR
+        {
+            internal Int32 dbch_size;
+            internal Int32 dbch_devicetype;
+            internal Int32 dbch_reserved;
+        }
+
+        private struct SP_DEVICE_INTERFACE_DATA
+        {
+            internal Int32 cbSize;
+            internal Guid InterfaceClassGuid;
+            internal Int32 Flags;
+            internal IntPtr Reserved;
+        }
+        private struct SP_DEVINFO_DATA
+        {
+            internal Int32 cbSize;
+            internal Guid ClassGuid;
+            internal Int32 DevInst;
+            internal IntPtr Reserved;
+        }
+
+        // from pinvoke.net
+        private enum SPDRP : uint
+        {
+            SPDRP_DEVICEDESC = 0x00000000,
+            SPDRP_HARDWAREID = 0x00000001,
+            SPDRP_COMPATIBLEIDS = 0x00000002,
+            SPDRP_NTDEVICEPATHS = 0x00000003,
+            SPDRP_SERVICE = 0x00000004,
+            SPDRP_CONFIGURATION = 0x00000005,
+            SPDRP_CONFIGURATIONVECTOR = 0x00000006,
+            SPDRP_CLASS = 0x00000007,
+            SPDRP_CLASSGUID = 0x00000008,
+            SPDRP_DRIVER = 0x00000009,
+            SPDRP_CONFIGFLAGS = 0x0000000A,
+            SPDRP_MFG = 0x0000000B,
+            SPDRP_FRIENDLYNAME = 0x0000000C,
+            SPDRP_LOCATION_INFORMATION = 0x0000000D,
+            SPDRP_PHYSICAL_DEVICE_OBJECT_NAME = 0x0000000E,
+            SPDRP_CAPABILITIES = 0x0000000F,
+            SPDRP_UI_NUMBER = 0x00000010,
+            SPDRP_UPPERFILTERS = 0x00000011,
+            SPDRP_LOWERFILTERS = 0x00000012,
+            SPDRP_MAXIMUM_PROPERTY = 0x00000013,
+
+            SPDRP_ENUMERATOR_NAME = 0x16,
+        };
+
+        // Device Property
+        [StructLayout(LayoutKind.Sequential)]
+        internal unsafe struct DEVPROPKEY
+        {
+            public DEVPROPKEY(Guid ifmtid, UInt32 ipid)
+            { fmtid = ifmtid; pid = ipid; }
+            public Guid fmtid;
+            public UInt32 pid;
+        }
+
+        private enum RegTypes : int
+        {
+            // incomplete list, these are just the ones used.
+            REG_SZ = 1,
+            REG_MULTI_SZ = 7
+        }
+
+        [DllImport("user32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern IntPtr RegisterDeviceNotification(IntPtr hRecipient, IntPtr NotificationFilter, Int32 Flags);
+
+        //[DllImport("setupapi.dll", SetLastError = true)]
+        //internal static extern Int32 SetupDiCreateDeviceInfoList(ref System.Guid ClassGuid, Int32 hwndParent);
+
+        [DllImport("setupapi.dll", SetLastError = true)]
+        private static extern Int32 SetupDiDestroyDeviceInfoList(IntPtr DeviceInfoSet);
+
+        [DllImport("setupapi.dll", SetLastError = true)]
+        private static extern bool SetupDiEnumDeviceInterfaces(IntPtr DeviceInfoSet, IntPtr DeviceInfoData, ref Guid InterfaceClassGuid, Int32 MemberIndex, ref SP_DEVICE_INTERFACE_DATA DeviceInterfaceData);
+
+        [DllImport("setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern bool SetupDiGetDeviceRegistryProperty(IntPtr DeviceInfoSet, ref SP_DEVINFO_DATA DeviceInfoData, SPDRP Property, out int PropertyRegDataType, byte[] PropertyBuffer, uint PropertyBufferSize, out UInt32 RequiredSize);
+
+        [DllImport("setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern bool SetupDiGetDeviceRegistryProperty(IntPtr DeviceInfoSet, ref SP_DEVINFO_DATA DeviceInfoData, SPDRP Property, IntPtr PropertyRegDataType, IntPtr PropertyBuffer, uint PropertyBufferSize, out UInt32 RequiredSize);
+
+        [DllImport("setupapi.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern unsafe bool SetupDiGetDeviceProperty(IntPtr deviceInfoSet, ref SP_DEVINFO_DATA DeviceInfoData, ref DEVPROPKEY propertyKey, out UInt32 propertyType, byte[] propertyBuffer, Int32 propertyBufferSize, out int requiredSize, UInt32 flags);
+
+        [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern IntPtr SetupDiGetClassDevs(ref Guid ClassGuid, IntPtr Enumerator, IntPtr hwndParent, Int32 Flags);
+
+        [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern bool SetupDiGetDeviceInterfaceDetail(IntPtr DeviceInfoSet, ref SP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IntPtr DeviceInterfaceDetailData, Int32 DeviceInterfaceDetailDataSize, ref Int32 RequiredSize, ref SP_DEVINFO_DATA DeviceInfoData);
+
+        [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern bool SetupDiGetDeviceInterfaceDetail(IntPtr DeviceInfoSet, ref SP_DEVICE_INTERFACE_DATA DeviceInterfaceData, IntPtr DeviceInterfaceDetailData, Int32 DeviceInterfaceDetailDataSize, ref Int32 RequiredSize, IntPtr DeviceInfoData);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        private static extern bool UnregisterDeviceNotification(IntPtr Handle);
+
+        private const int ERROR_NO_MORE_ITEMS = 259;
+        private const int ERROR_INSUFFICIENT_BUFFER = 122;
+    }
+}
diff --git a/WinUSBNet/API/FileAPI.cs b/WPinternals/WinUSBNet/API/FileAPI.cs
similarity index 97%
rename from WinUSBNet/API/FileAPI.cs
rename to WPinternals/WinUSBNet/API/FileAPI.cs
index e264df8..09f54f5 100644
--- a/WinUSBNet/API/FileAPI.cs
+++ b/WPinternals/WinUSBNet/API/FileAPI.cs
@@ -1,37 +1,37 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *  
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-/* NOTE: Parts of the code in this file are based on the work of Jan Axelson
- * See http://www.lvr.com/winusb.htm for more information
- */
-
-using Microsoft.Win32.SafeHandles;
-using System;
-using System.Runtime.InteropServices;
-
-namespace MadWizard.WinUSBNet.API
-{
-    ///  <summary>
-    ///  API declarations relating to file I/O (and used by WinUsb).
-    ///  </summary>
-    sealed internal class FileIO
-    {
-        public const Int32 FILE_ATTRIBUTE_NORMAL = 0X80;
-        public const Int32 FILE_FLAG_OVERLAPPED = 0X40000000;
-        public const Int32 FILE_SHARE_READ = 1;
-        public const Int32 FILE_SHARE_WRITE = 2;
-        public const UInt32 GENERIC_READ = 0X80000000;
-        public const UInt32 GENERIC_WRITE = 0X40000000;
-        public static readonly IntPtr INVALID_HANDLE_VALUE = new(-1);
-        public const Int32 OPEN_EXISTING = 3;
-
-        public const Int32 ERROR_IO_PENDING = 997;
-
-        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-        public static extern SafeFileHandle CreateFile(String lpFileName, UInt32 dwDesiredAccess, Int32 dwShareMode, IntPtr lpSecurityAttributes, Int32 dwCreationDisposition, Int32 dwFlagsAndAttributes, Int32 hTemplateFile);
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *  
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+/* NOTE: Parts of the code in this file are based on the work of Jan Axelson
+ * See http://www.lvr.com/winusb.htm for more information
+ */
+
+using Microsoft.Win32.SafeHandles;
+using System;
+using System.Runtime.InteropServices;
+
+namespace MadWizard.WinUSBNet.API
+{
+    ///  <summary>
+    ///  API declarations relating to file I/O (and used by WinUsb).
+    ///  </summary>
+    sealed internal class FileIO
+    {
+        public const Int32 FILE_ATTRIBUTE_NORMAL = 0X80;
+        public const Int32 FILE_FLAG_OVERLAPPED = 0X40000000;
+        public const Int32 FILE_SHARE_READ = 1;
+        public const Int32 FILE_SHARE_WRITE = 2;
+        public const UInt32 GENERIC_READ = 0X80000000;
+        public const UInt32 GENERIC_WRITE = 0X40000000;
+        public static readonly IntPtr INVALID_HANDLE_VALUE = new(-1);
+        public const Int32 OPEN_EXISTING = 3;
+
+        public const Int32 ERROR_IO_PENDING = 997;
+
+        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        public static extern SafeFileHandle CreateFile(String lpFileName, UInt32 dwDesiredAccess, Int32 dwShareMode, IntPtr lpSecurityAttributes, Int32 dwCreationDisposition, Int32 dwFlagsAndAttributes, Int32 hTemplateFile);
+    }
+}
diff --git a/WinUSBNet/API/WinUSBDevice.cs b/WPinternals/WinUSBNet/API/WinUSBDevice.cs
similarity index 97%
rename from WinUSBNet/API/WinUSBDevice.cs
rename to WPinternals/WinUSBNet/API/WinUSBDevice.cs
index 120399a..0a30cc4 100644
--- a/WinUSBNet/API/WinUSBDevice.cs
+++ b/WPinternals/WinUSBNet/API/WinUSBDevice.cs
@@ -1,529 +1,529 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-/* NOTE: Parts of the code in this file are based on the work of Jan Axelson
- * See http://www.lvr.com/winusb.htm for more information
- */
-
-using Microsoft.Win32.SafeHandles;
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Threading;
-
-namespace MadWizard.WinUSBNet.API
-{
-    /// <summary>
-    ///  Wrapper for a WinUSB device dealing with the WinUSB and additional interface handles
-    /// </summary>
-    internal partial class WinUSBDevice : IDisposable
-    {
-        private bool _disposed = false;
-        private SafeFileHandle _deviceHandle;
-        private IntPtr _winUsbHandle = IntPtr.Zero;
-        private IntPtr[] _addInterfaces = null;
-        public WinUSBDevice()
-        {
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        ~WinUSBDevice()
-        {
-            Dispose(false);
-        }
-
-        private void CheckNotDisposed()
-        {
-            if (_disposed)
-            {
-                throw new ObjectDisposedException("USB device object has been disposed.");
-            }
-        }
-
-        // TODO: check if not disposed on methods (although this is already checked by USBDevice)
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (disposing)
-            {
-                // Dispose managed resources
-                if (_deviceHandle?.IsInvalid == false)
-                {
-                    _deviceHandle.Dispose();
-                }
-
-                _deviceHandle = null;
-            }
-
-            // Dispose unmanaged resources
-            FreeWinUSB();
-            _disposed = true;
-        }
-        private void FreeWinUSB()
-        {
-            if (_addInterfaces != null)
-            {
-                for (int i = 0; i < _addInterfaces.Length; i++)
-                {
-                    WinUsb_Free(_addInterfaces[i]);
-                }
-                _addInterfaces = null;
-            }
-            if (_winUsbHandle != IntPtr.Zero)
-            {
-                WinUsb_Free(_winUsbHandle);
-            }
-
-            _winUsbHandle = IntPtr.Zero;
-        }
-
-        public USB_DEVICE_DESCRIPTOR GetDeviceDescriptor()
-        {
-            uint size = (uint)Marshal.SizeOf(typeof(USB_DEVICE_DESCRIPTOR));
-            bool success = WinUsb_GetDescriptor(_winUsbHandle, USB_DEVICE_DESCRIPTOR_TYPE,
-                        0, 0, out USB_DEVICE_DESCRIPTOR deviceDesc, size, out uint transfered);
-            if (!success)
-            {
-                throw APIException.Win32("Failed to get USB device descriptor.");
-            }
-
-            if (transfered != size)
-            {
-                throw APIException.Win32("Incomplete USB device descriptor.");
-            }
-
-            return deviceDesc;
-        }
-
-        private int ReadStringDescriptor(byte index, ushort languageID, byte[] buffer)
-        {
-            bool success = WinUsb_GetDescriptor(_winUsbHandle, USB_STRING_DESCRIPTOR_TYPE,
-                        index, languageID, buffer, (uint)buffer.Length, out uint transfered);
-            if (!success)
-            {
-                throw APIException.Win32("Failed to get USB string descriptor (" + index + ").");
-            }
-
-            if (transfered == 0)
-            {
-                throw new APIException("No data returned when reading USB descriptor.");
-            }
-
-            int length = buffer[0];
-            if (length != transfered)
-            {
-                throw new APIException("Unexpected length when reading USB descriptor.");
-            }
-
-            return length;
-        }
-
-        public ushort[] GetSupportedLanguageIDs()
-        {
-            byte[] buffer = new byte[256];
-            int length = ReadStringDescriptor(0, 0, buffer);
-            length -= 2; // Skip length byte and descriptor type
-            if (length < 0 || (length % 2) != 0)
-            {
-                throw new APIException("Unexpected length when reading supported languages.");
-            }
-
-            ushort[] langIDs = new ushort[length / 2];
-            Buffer.BlockCopy(buffer, 2, langIDs, 0, length);
-            return langIDs;
-        }
-
-        public string GetStringDescriptor(byte index, ushort languageID)
-        {
-            byte[] buffer = new byte[256];
-            int length = ReadStringDescriptor(index, languageID, buffer);
-            length -= 2; // Skip length byte and descriptor type
-            if (length < 0)
-            {
-                return null;
-            }
-
-            char[] chars = System.Text.Encoding.Unicode.GetChars(buffer, 2, length);
-            return new string(chars);
-        }
-
-        public int ControlTransfer(byte requestType, byte request, ushort value, ushort index, ushort length, byte[] data)
-        {
-            uint bytesReturned = 0;
-            WINUSB_SETUP_PACKET setupPacket;
-
-            setupPacket.RequestType = requestType;
-            setupPacket.Request = request;
-            setupPacket.Value = value;
-            setupPacket.Index = index;
-            setupPacket.Length = length;
-
-            bool success = WinUsb_ControlTransfer(_winUsbHandle, setupPacket, data, length, ref bytesReturned, IntPtr.Zero);
-            if (!success) // todo check bytes returned?
-            {
-                throw APIException.Win32("Control transfer on WinUSB device failed.");
-            }
-
-            return (int)bytesReturned;
-        }
-
-        public void OpenDevice(string devicePathName)
-        {
-            try
-            {
-                _deviceHandle = FileIO.CreateFile(devicePathName,
-                        FileIO.GENERIC_WRITE | FileIO.GENERIC_READ,
-                        FileIO.FILE_SHARE_READ | FileIO.FILE_SHARE_WRITE,
-                        IntPtr.Zero,
-                        FileIO.OPEN_EXISTING,
-                        FileIO.FILE_ATTRIBUTE_NORMAL | FileIO.FILE_FLAG_OVERLAPPED,
-                        0);
-                if (_deviceHandle.IsInvalid)
-                {
-                    throw APIException.Win32("Failed to open WinUSB device handle.");
-                }
-
-                InitializeDevice();
-            }
-            catch (Exception)
-            {
-                if (_deviceHandle != null)
-                {
-                    _deviceHandle.Dispose();
-                    _deviceHandle = null;
-                }
-                FreeWinUSB();
-                throw;
-            }
-        }
-
-        private IntPtr InterfaceHandle(int index)
-        {
-            if (index == 0)
-            {
-                return _winUsbHandle;
-            }
-
-            return _addInterfaces[index - 1];
-        }
-
-        public int InterfaceCount
-        {
-            get
-            {
-                return 1 + ((_addInterfaces?.Length) ?? 0);
-            }
-        }
-
-        public void GetInterfaceInfo(int interfaceIndex, out USB_INTERFACE_DESCRIPTOR descriptor, out WINUSB_PIPE_INFORMATION[] pipes)
-        {
-            var pipeList = new List<WINUSB_PIPE_INFORMATION>();
-            bool success = WinUsb_QueryInterfaceSettings(InterfaceHandle(interfaceIndex), 0, out descriptor);
-            if (!success)
-            {
-                throw APIException.Win32("Failed to get WinUSB device interface descriptor.");
-            }
-
-            IntPtr interfaceHandle = InterfaceHandle(interfaceIndex);
-            for (byte pipeIdx = 0; pipeIdx < descriptor.bNumEndpoints; pipeIdx++)
-            {
-                success = WinUsb_QueryPipe(interfaceHandle, 0, pipeIdx, out WINUSB_PIPE_INFORMATION pipeInfo);
-
-                pipeList.Add(pipeInfo);
-                if (!success)
-                {
-                    throw APIException.Win32("Failed to get WinUSB device pipe information.");
-                }
-            }
-            pipes = pipeList.ToArray();
-        }
-        private void InitializeDevice()
-        {
-            bool success = WinUsb_Initialize(_deviceHandle, ref _winUsbHandle);
-
-            if (!success)
-            {
-                throw APIException.Win32("Failed to initialize WinUSB handle. Device might not be connected.");
-            }
-
-            List<IntPtr> interfaces = new();
-            byte numAddInterfaces = 0;
-            byte idx = 0;
-
-            try
-            {
-                while (true)
-                {
-                    IntPtr ifaceHandle = IntPtr.Zero;
-                    success = WinUsb_GetAssociatedInterface(_winUsbHandle, idx, out ifaceHandle);
-                    if (!success)
-                    {
-                        if (Marshal.GetLastWin32Error() == ERROR_NO_MORE_ITEMS)
-                        {
-                            break;
-                        }
-
-                        throw APIException.Win32("Failed to enumerate interfaces for WinUSB device.");
-                    }
-                    interfaces.Add(ifaceHandle);
-                    idx++;
-                    numAddInterfaces++;
-                }
-            }
-            finally
-            {
-                // Save interface handles (will be cleaned by Dispose)
-                // also in case of exception (which is why it is in finally block),
-                // because some handles might have already been opened and need
-                // to be disposed.
-                _addInterfaces = interfaces.ToArray();
-            }
-
-            // Bind handle (needed for overlapped I/O thread pool)
-            ThreadPool.BindHandle(_deviceHandle);
-            // TODO: bind interface handles as well? doesn't seem to be necessary
-        }
-
-        public void ReadPipe(int ifaceIndex, byte pipeID, byte[] buffer, int offset, int bytesToRead, out uint bytesRead)
-        {
-            bool success;
-            unsafe
-            {
-                fixed (byte* pBuffer = buffer)
-                {
-                    //WPinternals.LogFile.Log("Start WinUSB_ReadPipe");
-                    success = WinUsb_ReadPipe(InterfaceHandle(ifaceIndex), pipeID, pBuffer + offset, (uint)bytesToRead,
-                                    out bytesRead, IntPtr.Zero);
-                    //WPinternals.LogFile.Log("End WinUSB_ReadPipe: " + (success ? "True" : "False"));
-                }
-            }
-            if (!success)
-            {
-                throw APIException.Win32("Failed to read pipe on WinUSB device.");
-            }
-        }
-
-        private unsafe void HandleOverlappedAPI(bool success, string errorMessage, NativeOverlapped* pOverlapped, USBAsyncResult result, int bytesTransfered)
-        {
-            if (!success)
-            {
-                if (Marshal.GetLastWin32Error() != FileIO.ERROR_IO_PENDING)
-                {
-                    Overlapped.Unpack(pOverlapped);
-                    Overlapped.Free(pOverlapped);
-                    throw APIException.Win32(errorMessage);
-                }
-            }
-            else
-            {
-                // Immediate success!
-                Overlapped.Unpack(pOverlapped);
-                Overlapped.Free(pOverlapped);
-
-                result.OnCompletion(true, null, bytesTransfered, false);
-                // is the callback still called in this case?? todo
-            }
-        }
-
-        public void ReadPipeOverlapped(int ifaceIndex, byte pipeID, byte[] buffer, int offset, int bytesToRead, USBAsyncResult result)
-        {
-            Overlapped overlapped = new();
-
-            overlapped.AsyncResult = result;
-
-            unsafe
-            {
-                NativeOverlapped* pOverlapped = null;
-                uint bytesRead;
-
-                pOverlapped = overlapped.Pack(PipeIOCallback, buffer);
-                bool success;
-                // Buffer is pinned already by overlapped.Pack
-                fixed (byte* pBuffer = buffer)
-                {
-                    success = WinUsb_ReadPipe(InterfaceHandle(ifaceIndex), pipeID, pBuffer + offset, (uint)bytesToRead,
-                                out bytesRead, pOverlapped);
-                }
-                HandleOverlappedAPI(success, "Failed to asynchronously read pipe on WinUSB device.", pOverlapped, result, (int)bytesRead);
-            }
-        }
-
-        public void WriteOverlapped(int ifaceIndex, byte pipeID, byte[] buffer, int offset, int bytesToWrite, USBAsyncResult result)
-        {
-            Overlapped overlapped = new();
-            overlapped.AsyncResult = result;
-
-            unsafe
-            {
-                NativeOverlapped* pOverlapped = null;
-
-                uint bytesWritten;
-                pOverlapped = overlapped.Pack(PipeIOCallback, buffer);
-
-                bool success;
-                // Buffer is pinned already by overlapped.Pack
-                fixed (byte* pBuffer = buffer)
-                {
-                    success = WinUsb_WritePipe(InterfaceHandle(ifaceIndex), pipeID, pBuffer + offset, (uint)bytesToWrite,
-                            out bytesWritten, pOverlapped);
-                }
-                HandleOverlappedAPI(success, "Failed to asynchronously write pipe on WinUSB device.", pOverlapped, result, (int)bytesWritten);
-            }
-        }
-
-        public void ControlTransferOverlapped(byte requestType, byte request, ushort value, ushort index, ushort length, byte[] data, USBAsyncResult result)
-        {
-            uint bytesReturned = 0;
-            WINUSB_SETUP_PACKET setupPacket;
-
-            setupPacket.RequestType = requestType;
-            setupPacket.Request = request;
-            setupPacket.Value = value;
-            setupPacket.Index = index;
-            setupPacket.Length = length;
-
-            Overlapped overlapped = new();
-            overlapped.AsyncResult = result;
-
-            unsafe
-            {
-                NativeOverlapped* pOverlapped = null;
-                pOverlapped = overlapped.Pack(PipeIOCallback, data);
-                bool success = WinUsb_ControlTransfer(_winUsbHandle, setupPacket, data, length, ref bytesReturned, pOverlapped);
-                HandleOverlappedAPI(success, "Asynchronous control transfer on WinUSB device failed.", pOverlapped, result, (int)bytesReturned);
-            }
-        }
-
-        private unsafe void PipeIOCallback(uint errorCode, uint numBytes, NativeOverlapped* pOverlapped)
-        {
-            try
-            {
-                Exception error = null;
-                if (errorCode != 0)
-                {
-                    error = APIException.Win32("Asynchronous operation on WinUSB device failed.", (int)errorCode);
-                }
-                Overlapped overlapped = Overlapped.Unpack(pOverlapped);
-                USBAsyncResult result = (USBAsyncResult)overlapped.AsyncResult;
-                Overlapped.Free(pOverlapped);
-                pOverlapped = null;
-
-                result.OnCompletion(false, error, (int)numBytes, true);
-            }
-            finally
-            {
-                if (pOverlapped != null)
-                {
-                    Overlapped.Unpack(pOverlapped);
-                    Overlapped.Free(pOverlapped);
-                }
-            }
-        }
-        public void AbortPipe(int ifaceIndex, byte pipeID)
-        {
-            bool success = WinUsb_AbortPipe(InterfaceHandle(ifaceIndex), pipeID);
-            if (!success)
-            {
-                throw APIException.Win32("Failed to abort pipe on WinUSB device.");
-            }
-        }
-
-        public void ResetPipe(int ifaceIndex, byte pipeID)
-        {
-            bool success = WinUsb_ResetPipe(InterfaceHandle(ifaceIndex), pipeID);
-            if (!success)
-            {
-                throw APIException.Win32("Failed to reset pipe on WinUSB device.");
-            }
-        }
-
-        public void WritePipe(int ifaceIndex, byte pipeID, byte[] buffer, int offset, int length)
-        {
-            uint bytesWritten;
-            bool success;
-            unsafe
-            {
-                fixed (byte* pBuffer = buffer)
-                {
-                    //WPinternals.LogFile.Log("Start WinUSB_WritePipe");
-                    success = WinUsb_WritePipe(InterfaceHandle(ifaceIndex), pipeID, pBuffer + offset, (uint)length,
-                            out bytesWritten, IntPtr.Zero);
-                    //WPinternals.LogFile.Log("End WinUSB_WritePipe: " + (success ? "True" : "False"));
-                }
-            }
-            if (!success || (bytesWritten != length))
-            {
-                throw APIException.Win32("Failed to write pipe on WinUSB device.");
-            }
-        }
-
-        public void FlushPipe(int ifaceIndex, byte pipeID)
-        {
-            bool success = WinUsb_FlushPipe(InterfaceHandle(ifaceIndex), pipeID);
-            if (!success)
-            {
-                throw APIException.Win32("Failed to flush pipe on WinUSB device.");
-            }
-        }
-
-        public void SetPipePolicy(int ifaceIndex, byte pipeID, POLICY_TYPE policyType, bool value)
-        {
-            byte byteVal = (byte)(value ? 1 : 0);
-            bool success = WinUsb_SetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, 1, ref byteVal);
-            if (!success)
-            {
-                throw APIException.Win32("Failed to set WinUSB pipe policy.");
-            }
-        }
-
-        public void SetPipePolicy(int ifaceIndex, byte pipeID, POLICY_TYPE policyType, uint value)
-        {
-            bool success = WinUsb_SetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, 4, ref value);
-
-            if (!success)
-            {
-                throw APIException.Win32("Failed to set WinUSB pipe policy.");
-            }
-        }
-
-        public bool GetPipePolicyBool(int ifaceIndex, byte pipeID, POLICY_TYPE policyType)
-        {
-            uint length = 1;
-
-            bool success = WinUsb_GetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, ref length, out byte result);
-            if (!success || length != 1)
-            {
-                throw APIException.Win32("Failed to get WinUSB pipe policy.");
-            }
-
-            return result != 0;
-        }
-
-        public uint GetPipePolicyUInt(int ifaceIndex, byte pipeID, POLICY_TYPE policyType)
-        {
-            uint length = 4;
-            bool success = WinUsb_GetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, ref length, out uint result);
-
-            if (!success || length != 4)
-            {
-                throw APIException.Win32("Failed to get WinUSB pipe policy.");
-            }
-
-            return result;
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+/* NOTE: Parts of the code in this file are based on the work of Jan Axelson
+ * See http://www.lvr.com/winusb.htm for more information
+ */
+
+using Microsoft.Win32.SafeHandles;
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+namespace MadWizard.WinUSBNet.API
+{
+    /// <summary>
+    ///  Wrapper for a WinUSB device dealing with the WinUSB and additional interface handles
+    /// </summary>
+    internal partial class WinUSBDevice : IDisposable
+    {
+        private bool _disposed = false;
+        private SafeFileHandle _deviceHandle;
+        private IntPtr _winUsbHandle = IntPtr.Zero;
+        private IntPtr[] _addInterfaces = null;
+        public WinUSBDevice()
+        {
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        ~WinUSBDevice()
+        {
+            Dispose(false);
+        }
+
+        private void CheckNotDisposed()
+        {
+            if (_disposed)
+            {
+                throw new ObjectDisposedException("USB device object has been disposed.");
+            }
+        }
+
+        // TODO: check if not disposed on methods (although this is already checked by USBDevice)
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                // Dispose managed resources
+                if (_deviceHandle?.IsInvalid == false)
+                {
+                    _deviceHandle.Dispose();
+                }
+
+                _deviceHandle = null;
+            }
+
+            // Dispose unmanaged resources
+            FreeWinUSB();
+            _disposed = true;
+        }
+        private void FreeWinUSB()
+        {
+            if (_addInterfaces != null)
+            {
+                for (int i = 0; i < _addInterfaces.Length; i++)
+                {
+                    WinUsb_Free(_addInterfaces[i]);
+                }
+                _addInterfaces = null;
+            }
+            if (_winUsbHandle != IntPtr.Zero)
+            {
+                WinUsb_Free(_winUsbHandle);
+            }
+
+            _winUsbHandle = IntPtr.Zero;
+        }
+
+        public USB_DEVICE_DESCRIPTOR GetDeviceDescriptor()
+        {
+            uint size = (uint)Marshal.SizeOf(typeof(USB_DEVICE_DESCRIPTOR));
+            bool success = WinUsb_GetDescriptor(_winUsbHandle, USB_DEVICE_DESCRIPTOR_TYPE,
+                        0, 0, out USB_DEVICE_DESCRIPTOR deviceDesc, size, out uint transfered);
+            if (!success)
+            {
+                throw APIException.Win32("Failed to get USB device descriptor.");
+            }
+
+            if (transfered != size)
+            {
+                throw APIException.Win32("Incomplete USB device descriptor.");
+            }
+
+            return deviceDesc;
+        }
+
+        private int ReadStringDescriptor(byte index, ushort languageID, byte[] buffer)
+        {
+            bool success = WinUsb_GetDescriptor(_winUsbHandle, USB_STRING_DESCRIPTOR_TYPE,
+                        index, languageID, buffer, (uint)buffer.Length, out uint transfered);
+            if (!success)
+            {
+                throw APIException.Win32("Failed to get USB string descriptor (" + index + ").");
+            }
+
+            if (transfered == 0)
+            {
+                throw new APIException("No data returned when reading USB descriptor.");
+            }
+
+            int length = buffer[0];
+            if (length != transfered)
+            {
+                throw new APIException("Unexpected length when reading USB descriptor.");
+            }
+
+            return length;
+        }
+
+        public ushort[] GetSupportedLanguageIDs()
+        {
+            byte[] buffer = new byte[256];
+            int length = ReadStringDescriptor(0, 0, buffer);
+            length -= 2; // Skip length byte and descriptor type
+            if (length < 0 || (length % 2) != 0)
+            {
+                throw new APIException("Unexpected length when reading supported languages.");
+            }
+
+            ushort[] langIDs = new ushort[length / 2];
+            Buffer.BlockCopy(buffer, 2, langIDs, 0, length);
+            return langIDs;
+        }
+
+        public string GetStringDescriptor(byte index, ushort languageID)
+        {
+            byte[] buffer = new byte[256];
+            int length = ReadStringDescriptor(index, languageID, buffer);
+            length -= 2; // Skip length byte and descriptor type
+            if (length < 0)
+            {
+                return null;
+            }
+
+            char[] chars = System.Text.Encoding.Unicode.GetChars(buffer, 2, length);
+            return new string(chars);
+        }
+
+        public int ControlTransfer(byte requestType, byte request, ushort value, ushort index, ushort length, byte[] data)
+        {
+            uint bytesReturned = 0;
+            WINUSB_SETUP_PACKET setupPacket;
+
+            setupPacket.RequestType = requestType;
+            setupPacket.Request = request;
+            setupPacket.Value = value;
+            setupPacket.Index = index;
+            setupPacket.Length = length;
+
+            bool success = WinUsb_ControlTransfer(_winUsbHandle, setupPacket, data, length, ref bytesReturned, IntPtr.Zero);
+            if (!success) // todo check bytes returned?
+            {
+                throw APIException.Win32("Control transfer on WinUSB device failed.");
+            }
+
+            return (int)bytesReturned;
+        }
+
+        public void OpenDevice(string devicePathName)
+        {
+            try
+            {
+                _deviceHandle = FileIO.CreateFile(devicePathName,
+                        FileIO.GENERIC_WRITE | FileIO.GENERIC_READ,
+                        FileIO.FILE_SHARE_READ | FileIO.FILE_SHARE_WRITE,
+                        IntPtr.Zero,
+                        FileIO.OPEN_EXISTING,
+                        FileIO.FILE_ATTRIBUTE_NORMAL | FileIO.FILE_FLAG_OVERLAPPED,
+                        0);
+                if (_deviceHandle.IsInvalid)
+                {
+                    throw APIException.Win32("Failed to open WinUSB device handle.");
+                }
+
+                InitializeDevice();
+            }
+            catch (Exception)
+            {
+                if (_deviceHandle != null)
+                {
+                    _deviceHandle.Dispose();
+                    _deviceHandle = null;
+                }
+                FreeWinUSB();
+                throw;
+            }
+        }
+
+        private IntPtr InterfaceHandle(int index)
+        {
+            if (index == 0)
+            {
+                return _winUsbHandle;
+            }
+
+            return _addInterfaces[index - 1];
+        }
+
+        public int InterfaceCount
+        {
+            get
+            {
+                return 1 + ((_addInterfaces?.Length) ?? 0);
+            }
+        }
+
+        public void GetInterfaceInfo(int interfaceIndex, out USB_INTERFACE_DESCRIPTOR descriptor, out WINUSB_PIPE_INFORMATION[] pipes)
+        {
+            var pipeList = new List<WINUSB_PIPE_INFORMATION>();
+            bool success = WinUsb_QueryInterfaceSettings(InterfaceHandle(interfaceIndex), 0, out descriptor);
+            if (!success)
+            {
+                throw APIException.Win32("Failed to get WinUSB device interface descriptor.");
+            }
+
+            IntPtr interfaceHandle = InterfaceHandle(interfaceIndex);
+            for (byte pipeIdx = 0; pipeIdx < descriptor.bNumEndpoints; pipeIdx++)
+            {
+                success = WinUsb_QueryPipe(interfaceHandle, 0, pipeIdx, out WINUSB_PIPE_INFORMATION pipeInfo);
+
+                pipeList.Add(pipeInfo);
+                if (!success)
+                {
+                    throw APIException.Win32("Failed to get WinUSB device pipe information.");
+                }
+            }
+            pipes = pipeList.ToArray();
+        }
+        private void InitializeDevice()
+        {
+            bool success = WinUsb_Initialize(_deviceHandle, ref _winUsbHandle);
+
+            if (!success)
+            {
+                throw APIException.Win32("Failed to initialize WinUSB handle. Device might not be connected.");
+            }
+
+            List<IntPtr> interfaces = new();
+            byte numAddInterfaces = 0;
+            byte idx = 0;
+
+            try
+            {
+                while (true)
+                {
+                    IntPtr ifaceHandle = IntPtr.Zero;
+                    success = WinUsb_GetAssociatedInterface(_winUsbHandle, idx, out ifaceHandle);
+                    if (!success)
+                    {
+                        if (Marshal.GetLastWin32Error() == ERROR_NO_MORE_ITEMS)
+                        {
+                            break;
+                        }
+
+                        throw APIException.Win32("Failed to enumerate interfaces for WinUSB device.");
+                    }
+                    interfaces.Add(ifaceHandle);
+                    idx++;
+                    numAddInterfaces++;
+                }
+            }
+            finally
+            {
+                // Save interface handles (will be cleaned by Dispose)
+                // also in case of exception (which is why it is in finally block),
+                // because some handles might have already been opened and need
+                // to be disposed.
+                _addInterfaces = interfaces.ToArray();
+            }
+
+            // Bind handle (needed for overlapped I/O thread pool)
+            ThreadPool.BindHandle(_deviceHandle);
+            // TODO: bind interface handles as well? doesn't seem to be necessary
+        }
+
+        public void ReadPipe(int ifaceIndex, byte pipeID, byte[] buffer, int offset, int bytesToRead, out uint bytesRead)
+        {
+            bool success;
+            unsafe
+            {
+                fixed (byte* pBuffer = buffer)
+                {
+                    //WPinternals.LogFile.Log("Start WinUSB_ReadPipe");
+                    success = WinUsb_ReadPipe(InterfaceHandle(ifaceIndex), pipeID, pBuffer + offset, (uint)bytesToRead,
+                                    out bytesRead, IntPtr.Zero);
+                    //WPinternals.LogFile.Log("End WinUSB_ReadPipe: " + (success ? "True" : "False"));
+                }
+            }
+            if (!success)
+            {
+                throw APIException.Win32("Failed to read pipe on WinUSB device.");
+            }
+        }
+
+        private unsafe void HandleOverlappedAPI(bool success, string errorMessage, NativeOverlapped* pOverlapped, USBAsyncResult result, int bytesTransfered)
+        {
+            if (!success)
+            {
+                if (Marshal.GetLastWin32Error() != FileIO.ERROR_IO_PENDING)
+                {
+                    Overlapped.Unpack(pOverlapped);
+                    Overlapped.Free(pOverlapped);
+                    throw APIException.Win32(errorMessage);
+                }
+            }
+            else
+            {
+                // Immediate success!
+                Overlapped.Unpack(pOverlapped);
+                Overlapped.Free(pOverlapped);
+
+                result.OnCompletion(true, null, bytesTransfered, false);
+                // is the callback still called in this case?? todo
+            }
+        }
+
+        public void ReadPipeOverlapped(int ifaceIndex, byte pipeID, byte[] buffer, int offset, int bytesToRead, USBAsyncResult result)
+        {
+            Overlapped overlapped = new();
+
+            overlapped.AsyncResult = result;
+
+            unsafe
+            {
+                NativeOverlapped* pOverlapped = null;
+                uint bytesRead;
+
+                pOverlapped = overlapped.Pack(PipeIOCallback, buffer);
+                bool success;
+                // Buffer is pinned already by overlapped.Pack
+                fixed (byte* pBuffer = buffer)
+                {
+                    success = WinUsb_ReadPipe(InterfaceHandle(ifaceIndex), pipeID, pBuffer + offset, (uint)bytesToRead,
+                                out bytesRead, pOverlapped);
+                }
+                HandleOverlappedAPI(success, "Failed to asynchronously read pipe on WinUSB device.", pOverlapped, result, (int)bytesRead);
+            }
+        }
+
+        public void WriteOverlapped(int ifaceIndex, byte pipeID, byte[] buffer, int offset, int bytesToWrite, USBAsyncResult result)
+        {
+            Overlapped overlapped = new();
+            overlapped.AsyncResult = result;
+
+            unsafe
+            {
+                NativeOverlapped* pOverlapped = null;
+
+                uint bytesWritten;
+                pOverlapped = overlapped.Pack(PipeIOCallback, buffer);
+
+                bool success;
+                // Buffer is pinned already by overlapped.Pack
+                fixed (byte* pBuffer = buffer)
+                {
+                    success = WinUsb_WritePipe(InterfaceHandle(ifaceIndex), pipeID, pBuffer + offset, (uint)bytesToWrite,
+                            out bytesWritten, pOverlapped);
+                }
+                HandleOverlappedAPI(success, "Failed to asynchronously write pipe on WinUSB device.", pOverlapped, result, (int)bytesWritten);
+            }
+        }
+
+        public void ControlTransferOverlapped(byte requestType, byte request, ushort value, ushort index, ushort length, byte[] data, USBAsyncResult result)
+        {
+            uint bytesReturned = 0;
+            WINUSB_SETUP_PACKET setupPacket;
+
+            setupPacket.RequestType = requestType;
+            setupPacket.Request = request;
+            setupPacket.Value = value;
+            setupPacket.Index = index;
+            setupPacket.Length = length;
+
+            Overlapped overlapped = new();
+            overlapped.AsyncResult = result;
+
+            unsafe
+            {
+                NativeOverlapped* pOverlapped = null;
+                pOverlapped = overlapped.Pack(PipeIOCallback, data);
+                bool success = WinUsb_ControlTransfer(_winUsbHandle, setupPacket, data, length, ref bytesReturned, pOverlapped);
+                HandleOverlappedAPI(success, "Asynchronous control transfer on WinUSB device failed.", pOverlapped, result, (int)bytesReturned);
+            }
+        }
+
+        private unsafe void PipeIOCallback(uint errorCode, uint numBytes, NativeOverlapped* pOverlapped)
+        {
+            try
+            {
+                Exception error = null;
+                if (errorCode != 0)
+                {
+                    error = APIException.Win32("Asynchronous operation on WinUSB device failed.", (int)errorCode);
+                }
+                Overlapped overlapped = Overlapped.Unpack(pOverlapped);
+                USBAsyncResult result = (USBAsyncResult)overlapped.AsyncResult;
+                Overlapped.Free(pOverlapped);
+                pOverlapped = null;
+
+                result.OnCompletion(false, error, (int)numBytes, true);
+            }
+            finally
+            {
+                if (pOverlapped != null)
+                {
+                    Overlapped.Unpack(pOverlapped);
+                    Overlapped.Free(pOverlapped);
+                }
+            }
+        }
+        public void AbortPipe(int ifaceIndex, byte pipeID)
+        {
+            bool success = WinUsb_AbortPipe(InterfaceHandle(ifaceIndex), pipeID);
+            if (!success)
+            {
+                throw APIException.Win32("Failed to abort pipe on WinUSB device.");
+            }
+        }
+
+        public void ResetPipe(int ifaceIndex, byte pipeID)
+        {
+            bool success = WinUsb_ResetPipe(InterfaceHandle(ifaceIndex), pipeID);
+            if (!success)
+            {
+                throw APIException.Win32("Failed to reset pipe on WinUSB device.");
+            }
+        }
+
+        public void WritePipe(int ifaceIndex, byte pipeID, byte[] buffer, int offset, int length)
+        {
+            uint bytesWritten;
+            bool success;
+            unsafe
+            {
+                fixed (byte* pBuffer = buffer)
+                {
+                    //WPinternals.LogFile.Log("Start WinUSB_WritePipe");
+                    success = WinUsb_WritePipe(InterfaceHandle(ifaceIndex), pipeID, pBuffer + offset, (uint)length,
+                            out bytesWritten, IntPtr.Zero);
+                    //WPinternals.LogFile.Log("End WinUSB_WritePipe: " + (success ? "True" : "False"));
+                }
+            }
+            if (!success || (bytesWritten != length))
+            {
+                throw APIException.Win32("Failed to write pipe on WinUSB device.");
+            }
+        }
+
+        public void FlushPipe(int ifaceIndex, byte pipeID)
+        {
+            bool success = WinUsb_FlushPipe(InterfaceHandle(ifaceIndex), pipeID);
+            if (!success)
+            {
+                throw APIException.Win32("Failed to flush pipe on WinUSB device.");
+            }
+        }
+
+        public void SetPipePolicy(int ifaceIndex, byte pipeID, POLICY_TYPE policyType, bool value)
+        {
+            byte byteVal = (byte)(value ? 1 : 0);
+            bool success = WinUsb_SetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, 1, ref byteVal);
+            if (!success)
+            {
+                throw APIException.Win32("Failed to set WinUSB pipe policy.");
+            }
+        }
+
+        public void SetPipePolicy(int ifaceIndex, byte pipeID, POLICY_TYPE policyType, uint value)
+        {
+            bool success = WinUsb_SetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, 4, ref value);
+
+            if (!success)
+            {
+                throw APIException.Win32("Failed to set WinUSB pipe policy.");
+            }
+        }
+
+        public bool GetPipePolicyBool(int ifaceIndex, byte pipeID, POLICY_TYPE policyType)
+        {
+            uint length = 1;
+
+            bool success = WinUsb_GetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, ref length, out byte result);
+            if (!success || length != 1)
+            {
+                throw APIException.Win32("Failed to get WinUSB pipe policy.");
+            }
+
+            return result != 0;
+        }
+
+        public uint GetPipePolicyUInt(int ifaceIndex, byte pipeID, POLICY_TYPE policyType)
+        {
+            uint length = 4;
+            bool success = WinUsb_GetPipePolicy(InterfaceHandle(ifaceIndex), pipeID, (uint)policyType, ref length, out uint result);
+
+            if (!success || length != 4)
+            {
+                throw APIException.Win32("Failed to get WinUSB pipe policy.");
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/WinUSBNet/API/WinUSBDeviceAPI.cs b/WPinternals/WinUSBNet/API/WinUSBDeviceAPI.cs
similarity index 97%
rename from WinUSBNet/API/WinUSBDeviceAPI.cs
rename to WPinternals/WinUSBNet/API/WinUSBDeviceAPI.cs
index ea09740..a35c6dd 100644
--- a/WinUSBNet/API/WinUSBDeviceAPI.cs
+++ b/WPinternals/WinUSBNet/API/WinUSBDeviceAPI.cs
@@ -1,199 +1,199 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *  
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-/* NOTE: Parts of the code in this file are based on the work of Jan Axelson
- * See http://www.lvr.com/winusb.htm for more information
- */
-
-using Microsoft.Win32.SafeHandles;
-using System;
-using System.Runtime.InteropServices;
-using System.Threading;
-
-namespace MadWizard.WinUSBNet.API
-{
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct USB_DEVICE_DESCRIPTOR
-    {
-        public byte bLength;
-        public byte bDescriptorType;
-        public ushort bcdUSB;
-        public byte bDeviceClass;
-        public byte bDeviceSubClass;
-        public byte bDeviceProtocol;
-        public byte bMaxPacketSize0;
-        public ushort idVendor;
-        public ushort idProduct;
-        public ushort bcdDevice;
-        public byte iManufacturer;
-        public byte iProduct;
-        public byte iSerialNumber;
-        public byte bNumConfigurations;
-    };
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct USB_CONFIGURATION_DESCRIPTOR
-    {
-        public byte bLength;
-        public byte bDescriptorType;
-        public ushort wTotalLength;
-        public byte bNumInterfaces;
-        public byte bConfigurationValue;
-        public byte iConfiguration;
-        public byte bmAttributes;
-        public byte MaxPower;
-    }
-
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct USB_INTERFACE_DESCRIPTOR
-    {
-        public byte bLength;
-        public byte bDescriptorType;
-        public byte bInterfaceNumber;
-        public byte bAlternateSetting;
-        public byte bNumEndpoints;
-        public byte bInterfaceClass;
-        public byte bInterfaceSubClass;
-        public byte bInterfaceProtocol;
-        public byte iInterface;
-    };
-    internal enum USBD_PIPE_TYPE : int
-    {
-        UsbdPipeTypeControl,
-        UsbdPipeTypeIsochronous,
-        UsbdPipeTypeBulk,
-        UsbdPipeTypeInterrupt,
-    }
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct WINUSB_PIPE_INFORMATION
-    {
-        public USBD_PIPE_TYPE PipeType;
-        public byte PipeId;
-        public ushort MaximumPacketSize;
-        public byte Interval;
-    }
-
-    internal enum POLICY_TYPE : int
-    {
-        SHORT_PACKET_TERMINATE = 1,
-        AUTO_CLEAR_STALL,
-        PIPE_TRANSFER_TIMEOUT,
-        IGNORE_SHORT_PACKETS,
-        ALLOW_PARTIAL_READS,
-        AUTO_FLUSH,
-        RAW_IO,
-    }
-
-    internal partial class WinUSBDevice
-    {
-        private const UInt32 DEVICE_SPEED = 1;
-
-        private enum USB_DEVICE_SPEED : int
-        {
-            UsbLowSpeed = 1,
-            UsbFullSpeed,
-            UsbHighSpeed,
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        private struct WINUSB_SETUP_PACKET
-        {
-            public byte RequestType;
-            public byte Request;
-            public ushort Value;
-            public ushort Index;
-            public ushort Length;
-        }
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_ControlTransfer(IntPtr InterfaceHandle, WINUSB_SETUP_PACKET SetupPacket, Byte[] Buffer, UInt32 BufferLength, ref UInt32 LengthTransferred, IntPtr Overlapped);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static unsafe extern bool WinUsb_ControlTransfer(IntPtr InterfaceHandle, WINUSB_SETUP_PACKET SetupPacket, Byte[] Buffer, UInt32 BufferLength, ref UInt32 LengthTransferred, NativeOverlapped* pOverlapped);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_Free(IntPtr InterfaceHandle);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_Initialize(SafeFileHandle DeviceHandle, ref IntPtr InterfaceHandle);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_QueryDeviceInformation(IntPtr InterfaceHandle, UInt32 InformationType, ref UInt32 BufferLength, out byte Buffer);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_QueryInterfaceSettings(IntPtr InterfaceHandle, Byte AlternateInterfaceNumber, out USB_INTERFACE_DESCRIPTOR UsbAltInterfaceDescriptor);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_QueryPipe(IntPtr InterfaceHandle, Byte AlternateInterfaceNumber, Byte PipeIndex, out WINUSB_PIPE_INFORMATION PipeInformation);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static unsafe extern bool WinUsb_ReadPipe(IntPtr InterfaceHandle, byte PipeID, byte* pBuffer, uint BufferLength, out uint LengthTransferred, IntPtr Overlapped);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static unsafe extern bool WinUsb_ReadPipe(IntPtr InterfaceHandle, byte PipeID, byte* pBuffer, uint BufferLength, out uint LengthTransferred, NativeOverlapped* pOverlapped);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_AbortPipe(IntPtr InterfaceHandle, byte PipeID);
-
-        //  Two declarations for WinUsb_SetPipePolicy. 
-        //  Use this one when the returned Value is a Byte (all except PIPE_TRANSFER_TIMEOUT):
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_SetPipePolicy(IntPtr InterfaceHandle, Byte PipeID, UInt32 PolicyType, UInt32 ValueLength, ref byte Value);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_GetPipePolicy(IntPtr InterfaceHandle, Byte PipeID, UInt32 PolicyType, ref UInt32 ValueLength, out byte Value);
-
-        //  Use this alias when the returned Value is a UInt32 (PIPE_TRANSFER_TIMEOUT only):
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_SetPipePolicy(IntPtr InterfaceHandle, Byte PipeID, UInt32 PolicyType, UInt32 ValueLength, ref UInt32 Value);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_GetPipePolicy(IntPtr InterfaceHandle, Byte PipeID, UInt32 PolicyType, ref UInt32 ValueLength, out UInt32 Value);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static unsafe extern bool WinUsb_WritePipe(IntPtr InterfaceHandle, byte PipeID, byte* pBuffer, uint BufferLength, out uint LengthTransferred, IntPtr Overlapped);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static unsafe extern bool WinUsb_WritePipe(IntPtr InterfaceHandle, byte PipeID, byte* pBuffer, uint BufferLength, out uint LengthTransferred, NativeOverlapped* pOverlapped);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        private static unsafe extern bool CancelIo(IntPtr hFile);
-
-        [DllImport("kernel32.dll", SetLastError = true)]
-        private static unsafe extern bool CancelIoEx(IntPtr hFile, NativeOverlapped* pOverlapped);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static unsafe extern bool WinUsb_ResetPipe(IntPtr InterfaceHandle, byte PipeID);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_FlushPipe(IntPtr InterfaceHandle, byte PipeID);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_GetDescriptor(IntPtr InterfaceHandle, byte DescriptorType,
-                        byte Index, UInt16 LanguageID, byte[] Buffer, UInt32 BufferLength, out UInt32 LengthTransfered);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_GetDescriptor(IntPtr InterfaceHandle, byte DescriptorType,
-                        byte Index, UInt16 LanguageID, out USB_DEVICE_DESCRIPTOR deviceDesc, UInt32 BufferLength, out UInt32 LengthTransfered);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_GetDescriptor(IntPtr InterfaceHandle, byte DescriptorType,
-                        byte Index, UInt16 LanguageID, out USB_CONFIGURATION_DESCRIPTOR deviceDesc, UInt32 BufferLength, out UInt32 LengthTransfered);
-
-        [DllImport("winusb.dll", SetLastError = true)]
-        private static extern bool WinUsb_GetAssociatedInterface(IntPtr InterfaceHandle, byte AssociatedInterfaceIndex,
-                    out IntPtr AssociatedInterfaceHandle);
-
-        private const int USB_DEVICE_DESCRIPTOR_TYPE = 0x01;
-        private const int USB_CONFIGURATION_DESCRIPTOR_TYPE = 0x02;
-        private const int USB_STRING_DESCRIPTOR_TYPE = 0x03;
-
-        private const int ERROR_NO_MORE_ITEMS = 259;
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *  
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+/* NOTE: Parts of the code in this file are based on the work of Jan Axelson
+ * See http://www.lvr.com/winusb.htm for more information
+ */
+
+using Microsoft.Win32.SafeHandles;
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+
+namespace MadWizard.WinUSBNet.API
+{
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct USB_DEVICE_DESCRIPTOR
+    {
+        public byte bLength;
+        public byte bDescriptorType;
+        public ushort bcdUSB;
+        public byte bDeviceClass;
+        public byte bDeviceSubClass;
+        public byte bDeviceProtocol;
+        public byte bMaxPacketSize0;
+        public ushort idVendor;
+        public ushort idProduct;
+        public ushort bcdDevice;
+        public byte iManufacturer;
+        public byte iProduct;
+        public byte iSerialNumber;
+        public byte bNumConfigurations;
+    };
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct USB_CONFIGURATION_DESCRIPTOR
+    {
+        public byte bLength;
+        public byte bDescriptorType;
+        public ushort wTotalLength;
+        public byte bNumInterfaces;
+        public byte bConfigurationValue;
+        public byte iConfiguration;
+        public byte bmAttributes;
+        public byte MaxPower;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct USB_INTERFACE_DESCRIPTOR
+    {
+        public byte bLength;
+        public byte bDescriptorType;
+        public byte bInterfaceNumber;
+        public byte bAlternateSetting;
+        public byte bNumEndpoints;
+        public byte bInterfaceClass;
+        public byte bInterfaceSubClass;
+        public byte bInterfaceProtocol;
+        public byte iInterface;
+    };
+    internal enum USBD_PIPE_TYPE : int
+    {
+        UsbdPipeTypeControl,
+        UsbdPipeTypeIsochronous,
+        UsbdPipeTypeBulk,
+        UsbdPipeTypeInterrupt,
+    }
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct WINUSB_PIPE_INFORMATION
+    {
+        public USBD_PIPE_TYPE PipeType;
+        public byte PipeId;
+        public ushort MaximumPacketSize;
+        public byte Interval;
+    }
+
+    internal enum POLICY_TYPE : int
+    {
+        SHORT_PACKET_TERMINATE = 1,
+        AUTO_CLEAR_STALL,
+        PIPE_TRANSFER_TIMEOUT,
+        IGNORE_SHORT_PACKETS,
+        ALLOW_PARTIAL_READS,
+        AUTO_FLUSH,
+        RAW_IO,
+    }
+
+    internal partial class WinUSBDevice
+    {
+        private const UInt32 DEVICE_SPEED = 1;
+
+        private enum USB_DEVICE_SPEED : int
+        {
+            UsbLowSpeed = 1,
+            UsbFullSpeed,
+            UsbHighSpeed,
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+        private struct WINUSB_SETUP_PACKET
+        {
+            public byte RequestType;
+            public byte Request;
+            public ushort Value;
+            public ushort Index;
+            public ushort Length;
+        }
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_ControlTransfer(IntPtr InterfaceHandle, WINUSB_SETUP_PACKET SetupPacket, Byte[] Buffer, UInt32 BufferLength, ref UInt32 LengthTransferred, IntPtr Overlapped);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static unsafe extern bool WinUsb_ControlTransfer(IntPtr InterfaceHandle, WINUSB_SETUP_PACKET SetupPacket, Byte[] Buffer, UInt32 BufferLength, ref UInt32 LengthTransferred, NativeOverlapped* pOverlapped);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_Free(IntPtr InterfaceHandle);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_Initialize(SafeFileHandle DeviceHandle, ref IntPtr InterfaceHandle);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_QueryDeviceInformation(IntPtr InterfaceHandle, UInt32 InformationType, ref UInt32 BufferLength, out byte Buffer);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_QueryInterfaceSettings(IntPtr InterfaceHandle, Byte AlternateInterfaceNumber, out USB_INTERFACE_DESCRIPTOR UsbAltInterfaceDescriptor);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_QueryPipe(IntPtr InterfaceHandle, Byte AlternateInterfaceNumber, Byte PipeIndex, out WINUSB_PIPE_INFORMATION PipeInformation);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static unsafe extern bool WinUsb_ReadPipe(IntPtr InterfaceHandle, byte PipeID, byte* pBuffer, uint BufferLength, out uint LengthTransferred, IntPtr Overlapped);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static unsafe extern bool WinUsb_ReadPipe(IntPtr InterfaceHandle, byte PipeID, byte* pBuffer, uint BufferLength, out uint LengthTransferred, NativeOverlapped* pOverlapped);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_AbortPipe(IntPtr InterfaceHandle, byte PipeID);
+
+        //  Two declarations for WinUsb_SetPipePolicy. 
+        //  Use this one when the returned Value is a Byte (all except PIPE_TRANSFER_TIMEOUT):
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_SetPipePolicy(IntPtr InterfaceHandle, Byte PipeID, UInt32 PolicyType, UInt32 ValueLength, ref byte Value);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_GetPipePolicy(IntPtr InterfaceHandle, Byte PipeID, UInt32 PolicyType, ref UInt32 ValueLength, out byte Value);
+
+        //  Use this alias when the returned Value is a UInt32 (PIPE_TRANSFER_TIMEOUT only):
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_SetPipePolicy(IntPtr InterfaceHandle, Byte PipeID, UInt32 PolicyType, UInt32 ValueLength, ref UInt32 Value);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_GetPipePolicy(IntPtr InterfaceHandle, Byte PipeID, UInt32 PolicyType, ref UInt32 ValueLength, out UInt32 Value);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static unsafe extern bool WinUsb_WritePipe(IntPtr InterfaceHandle, byte PipeID, byte* pBuffer, uint BufferLength, out uint LengthTransferred, IntPtr Overlapped);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static unsafe extern bool WinUsb_WritePipe(IntPtr InterfaceHandle, byte PipeID, byte* pBuffer, uint BufferLength, out uint LengthTransferred, NativeOverlapped* pOverlapped);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static unsafe extern bool CancelIo(IntPtr hFile);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        private static unsafe extern bool CancelIoEx(IntPtr hFile, NativeOverlapped* pOverlapped);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static unsafe extern bool WinUsb_ResetPipe(IntPtr InterfaceHandle, byte PipeID);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_FlushPipe(IntPtr InterfaceHandle, byte PipeID);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_GetDescriptor(IntPtr InterfaceHandle, byte DescriptorType,
+                        byte Index, UInt16 LanguageID, byte[] Buffer, UInt32 BufferLength, out UInt32 LengthTransfered);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_GetDescriptor(IntPtr InterfaceHandle, byte DescriptorType,
+                        byte Index, UInt16 LanguageID, out USB_DEVICE_DESCRIPTOR deviceDesc, UInt32 BufferLength, out UInt32 LengthTransfered);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_GetDescriptor(IntPtr InterfaceHandle, byte DescriptorType,
+                        byte Index, UInt16 LanguageID, out USB_CONFIGURATION_DESCRIPTOR deviceDesc, UInt32 BufferLength, out UInt32 LengthTransfered);
+
+        [DllImport("winusb.dll", SetLastError = true)]
+        private static extern bool WinUsb_GetAssociatedInterface(IntPtr InterfaceHandle, byte AssociatedInterfaceIndex,
+                    out IntPtr AssociatedInterfaceHandle);
+
+        private const int USB_DEVICE_DESCRIPTOR_TYPE = 0x01;
+        private const int USB_CONFIGURATION_DESCRIPTOR_TYPE = 0x02;
+        private const int USB_STRING_DESCRIPTOR_TYPE = 0x03;
+
+        private const int ERROR_NO_MORE_ITEMS = 259;
+    }
+}
diff --git a/WinUSBNet/DeviceNotifyHook.cs b/WPinternals/WinUSBNet/DeviceNotifyHook.cs
similarity index 97%
rename from WinUSBNet/DeviceNotifyHook.cs
rename to WPinternals/WinUSBNet/DeviceNotifyHook.cs
index 4eaeb92..959ac19 100644
--- a/WinUSBNet/DeviceNotifyHook.cs
+++ b/WPinternals/WinUSBNet/DeviceNotifyHook.cs
@@ -1,194 +1,194 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-using System;
-using System.Windows;
-using System.Windows.Interop;
-
-namespace MadWizard.WinUSBNet
-{
-    internal class DeviceNotifyHook : IDisposable
-    {
-        // http://msdn.microsoft.com/en-us/library/system.windows.forms.nativewindow.aspx
-
-        // TODO: disposed exception when disposed
-
-        private readonly USBNotifier _notifier;
-        private Guid _guid;
-        private readonly IntPtr _notifyHandle;
-
-        public DeviceNotifyHook(USBNotifier notifier, Guid guid)
-        {
-            // _parent = parent;
-            _guid = guid;
-            // _parent.HandleCreated += new EventHandler(this.OnHandleCreated);
-            // _parent.HandleDestroyed += new EventHandler(this.OnHandleDestroyed);
-            _notifier = notifier;
-
-            IntPtr hWnd = IntPtr.Zero;
-            if (Application.Current.MainWindow != null)
-            {
-                hWnd = new WindowInteropHelper(Application.Current.MainWindow).Handle;
-            }
-
-            if (hWnd == IntPtr.Zero)
-            {
-                throw new USBException("Main window not loaded yet. Cannot connect with USB yet.");
-            }
-
-            API.DeviceManagement.RegisterForDeviceNotifications(hWnd, _guid, ref _notifyHandle);
-
-            HwndSource source = PresentationSource.FromVisual(Application.Current.MainWindow) as HwndSource;
-            source.AddHook(WndProc);
-        }
-
-        ~DeviceNotifyHook()
-        {
-            Dispose(false);
-        }
-
-        /*
-        // Listen for the control's window creation and then hook into it.
-        private void OnHandleCreated(object sender, EventArgs e)
-        {
-            try
-            {
-                // Window is now created, assign handle to NativeWindow.
-                IntPtr handle = ((Control)sender).Handle;
-                RegisterNotify(handle);
-            }
-            catch (API.APIException ex)
-            {
-                throw new USBException("Failed to register new window handle for device notification.", ex);
-            }
-        }
-
-        private void OnHandleDestroyed(object sender, EventArgs e)
-        {
-            try
-            {
-                // Window was destroyed, release hook.
-                StopNotify();
-            }
-            catch (API.APIException ex)
-            {
-                throw new USBException("Failed to unregister destroyed window handle for device notification.", ex);
-            }
-        }
-
-        private void RegisterNotify(IntPtr handle)
-        {
-            AssignHandle(handle);
-
-            if (_notifyHandle != IntPtr.Zero)
-            {
-                API.DeviceManagement.StopDeviceDeviceNotifications(_notifyHandle);
-                _notifyHandle = IntPtr.Zero;
-            }
-            API.DeviceManagement.RegisterForDeviceNotifications(handle, _guid, ref _notifyHandle);
-        }
-
-        private void StopNotify()
-        {
-            //ReleaseHandle();
-            if (_notifyHandle != IntPtr.Zero)
-            {
-                API.DeviceManagement.StopDeviceDeviceNotifications(_notifyHandle);
-                _notifyHandle = IntPtr.Zero;
-            }
-        }
-
-        protected override void WndProc(ref Message m)
-        {
-            // Listen for operating system messages
-
-            switch (m.Msg)
-            {
-                case API.DeviceManagement.WM_DEVICECHANGE:
-                    _notifier.HandleDeviceChange(m);
-                    break;
-                case WM_NCDESTROY:
-                    // Note: when a control is used, OnHandleDestroyed will be called and the
-                    // handle is already released from NativeWindow. In that case, this
-                    // WM_NCDESTROY message will not be caught here. This is no problem since
-                    // StopNotify is already called. Even if it does, calling it twice does not cause
-                    // problems.
-                    // When a window handle is used instead of a Control the OnHandle events will not
-                    // fire and this handler is necessary to release the handle and stop notifications
-                    // when the window is destroyed.
-                    StopNotify();
-                    break;
-            }
-            base.WndProc(ref m);
-        }
-        */
-
-        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
-        {
-            // Listen for operating system messages
-
-            return msg switch
-            {
-                API.DeviceManagement.WM_DEVICECHANGE => (IntPtr)_notifier.HandleDeviceChange(msg, wParam, lParam),
-                _ => IntPtr.Zero,
-            };
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                // clean managed resources
-
-                // do not clean the notifier here. the notifier owns and will dispose this object.
-            }
-            if (_notifyHandle != IntPtr.Zero)
-            {
-                API.DeviceManagement.StopDeviceDeviceNotifications(_notifyHandle);
-
-                try
-                {
-                    /*
-                    if ((Application.Current != null) && (Application.Current.MainWindow != null))
-                    {
-                        HwndSource source = PresentationSource.FromVisual(Application.Current.MainWindow) as HwndSource;
-                        source.RemoveHook(WndProc);
-                    }
-                    */
-
-                    void RemoveHookAction()
-                    {
-                        if (Application.Current.MainWindow != null)
-                        {
-                            HwndSource source = PresentationSource.FromVisual(Application.Current.MainWindow) as HwndSource;
-                            source.RemoveHook(WndProc);
-                        }
-                    }
-
-                    if (Application.Current != null)
-                    {
-                        if (Application.Current.Dispatcher.Thread.ManagedThreadId == Environment.CurrentManagedThreadId)
-                        {
-                            RemoveHookAction();
-                        }
-                        else
-                        {
-                            Application.Current.Dispatcher.Invoke(RemoveHookAction);
-                        }
-                    }
-                }
-                catch { }
-            }
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+using System;
+using System.Windows;
+using System.Windows.Interop;
+
+namespace MadWizard.WinUSBNet
+{
+    internal class DeviceNotifyHook : IDisposable
+    {
+        // http://msdn.microsoft.com/en-us/library/system.windows.forms.nativewindow.aspx
+
+        // TODO: disposed exception when disposed
+
+        private readonly USBNotifier _notifier;
+        private Guid _guid;
+        private readonly IntPtr _notifyHandle;
+
+        public DeviceNotifyHook(USBNotifier notifier, Guid guid)
+        {
+            // _parent = parent;
+            _guid = guid;
+            // _parent.HandleCreated += new EventHandler(this.OnHandleCreated);
+            // _parent.HandleDestroyed += new EventHandler(this.OnHandleDestroyed);
+            _notifier = notifier;
+
+            IntPtr hWnd = IntPtr.Zero;
+            if (Application.Current.MainWindow != null)
+            {
+                hWnd = new WindowInteropHelper(Application.Current.MainWindow).Handle;
+            }
+
+            if (hWnd == IntPtr.Zero)
+            {
+                throw new USBException("Main window not loaded yet. Cannot connect with USB yet.");
+            }
+
+            API.DeviceManagement.RegisterForDeviceNotifications(hWnd, _guid, ref _notifyHandle);
+
+            HwndSource source = PresentationSource.FromVisual(Application.Current.MainWindow) as HwndSource;
+            source.AddHook(WndProc);
+        }
+
+        ~DeviceNotifyHook()
+        {
+            Dispose(false);
+        }
+
+        /*
+        // Listen for the control's window creation and then hook into it.
+        private void OnHandleCreated(object sender, EventArgs e)
+        {
+            try
+            {
+                // Window is now created, assign handle to NativeWindow.
+                IntPtr handle = ((Control)sender).Handle;
+                RegisterNotify(handle);
+            }
+            catch (API.APIException ex)
+            {
+                throw new USBException("Failed to register new window handle for device notification.", ex);
+            }
+        }
+
+        private void OnHandleDestroyed(object sender, EventArgs e)
+        {
+            try
+            {
+                // Window was destroyed, release hook.
+                StopNotify();
+            }
+            catch (API.APIException ex)
+            {
+                throw new USBException("Failed to unregister destroyed window handle for device notification.", ex);
+            }
+        }
+
+        private void RegisterNotify(IntPtr handle)
+        {
+            AssignHandle(handle);
+
+            if (_notifyHandle != IntPtr.Zero)
+            {
+                API.DeviceManagement.StopDeviceDeviceNotifications(_notifyHandle);
+                _notifyHandle = IntPtr.Zero;
+            }
+            API.DeviceManagement.RegisterForDeviceNotifications(handle, _guid, ref _notifyHandle);
+        }
+
+        private void StopNotify()
+        {
+            //ReleaseHandle();
+            if (_notifyHandle != IntPtr.Zero)
+            {
+                API.DeviceManagement.StopDeviceDeviceNotifications(_notifyHandle);
+                _notifyHandle = IntPtr.Zero;
+            }
+        }
+
+        protected override void WndProc(ref Message m)
+        {
+            // Listen for operating system messages
+
+            switch (m.Msg)
+            {
+                case API.DeviceManagement.WM_DEVICECHANGE:
+                    _notifier.HandleDeviceChange(m);
+                    break;
+                case WM_NCDESTROY:
+                    // Note: when a control is used, OnHandleDestroyed will be called and the
+                    // handle is already released from NativeWindow. In that case, this
+                    // WM_NCDESTROY message will not be caught here. This is no problem since
+                    // StopNotify is already called. Even if it does, calling it twice does not cause
+                    // problems.
+                    // When a window handle is used instead of a Control the OnHandle events will not
+                    // fire and this handler is necessary to release the handle and stop notifications
+                    // when the window is destroyed.
+                    StopNotify();
+                    break;
+            }
+            base.WndProc(ref m);
+        }
+        */
+
+        private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            // Listen for operating system messages
+
+            return msg switch
+            {
+                API.DeviceManagement.WM_DEVICECHANGE => (IntPtr)_notifier.HandleDeviceChange(msg, wParam, lParam),
+                _ => IntPtr.Zero,
+            };
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                // clean managed resources
+
+                // do not clean the notifier here. the notifier owns and will dispose this object.
+            }
+            if (_notifyHandle != IntPtr.Zero)
+            {
+                API.DeviceManagement.StopDeviceDeviceNotifications(_notifyHandle);
+
+                try
+                {
+                    /*
+                    if ((Application.Current != null) && (Application.Current.MainWindow != null))
+                    {
+                        HwndSource source = PresentationSource.FromVisual(Application.Current.MainWindow) as HwndSource;
+                        source.RemoveHook(WndProc);
+                    }
+                    */
+
+                    void RemoveHookAction()
+                    {
+                        if (Application.Current.MainWindow != null)
+                        {
+                            HwndSource source = PresentationSource.FromVisual(Application.Current.MainWindow) as HwndSource;
+                            source.RemoveHook(WndProc);
+                        }
+                    }
+
+                    if (Application.Current != null)
+                    {
+                        if (Application.Current.Dispatcher.Thread.ManagedThreadId == Environment.CurrentManagedThreadId)
+                        {
+                            RemoveHookAction();
+                        }
+                        else
+                        {
+                            Application.Current.Dispatcher.Invoke(RemoveHookAction);
+                        }
+                    }
+                }
+                catch { }
+            }
+        }
+    }
+}
diff --git a/WinUSBNet/USB.cs b/WPinternals/WinUSBNet/USB.cs
similarity index 96%
rename from WinUSBNet/USB.cs
rename to WPinternals/WinUSBNet/USB.cs
index 9d77632..e03063b 100644
--- a/WinUSBNet/USB.cs
+++ b/WPinternals/WinUSBNet/USB.cs
@@ -1,76 +1,76 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-namespace MadWizard.WinUSBNet
-{
-    /// <summary>
-    /// USB base class code enumeration, as defined in the USB specification
-    /// </summary>
-    public enum USBBaseClass
-    {
-        /// <summary>Unknown non-zero class code. Used when the actual class code
-        /// does not match any of the ones defined in this enumeration. </summary>
-        Unknown = -1,
-
-        /// <summary>Base class defined elsewhere (0x00)</summary>
-        None = 0x00,
-
-        /// <summary>Audio base class (0x01)</summary>
-        Audio = 0x01,
-
-        /// <summary>Communications and CDC control base class (0x02)</summary>
-        CommCDC = 0x02,
-
-        /// <summary>HID base class (0x03)</summary>
-        HID = 0x03,
-
-        /// <summary>Physical base class (0x05)</summary>
-        Physical = 0x05,
-
-        /// <summary>Image base class (0x06)</summary>
-        Image = 0x06,
-
-        /// <summary>Printer base class (0x07)</summary>
-        Printer = 0x07,
-
-        /// <summary>Mass storage base class (0x08)</summary>
-        MassStorage = 0x08,
-
-        /// <summary>Hub base class (0x09)</summary>
-        Hub = 0x09,
-
-        /// <summary>CDC data base class (0x0A)</summary>
-        CDCData = 0x0A,
-
-        /// <summary>Smart card base class (0x0B)</summary>
-        SmartCard = 0x0B,
-
-        /// <summary>Content security base class (0x0D)</summary>
-        ContentSecurity = 0x0D,
-
-        /// <summary>Video base class (0x0E)</summary>
-        Video = 0x0E,
-
-        /// <summary>Personal health care base class (0x0F)</summary>
-        PersonalHealthcare = 0x0F,
-
-        /// <summary>Diagnostic device base class (0xDC)</summary>
-        DiagnosticDevice = 0xDC,
-
-        /// <summary>Wireless controller base class (0xE0)</summary>
-        WirelessController = 0xE0,
-
-        /// <summary>Miscellaneous base class (0xEF)</summary>
-        Miscellaneous = 0xEF,
-
-        /// <summary>Application specific base class (0xFE)</summary>
-        ApplicationSpecific = 0xFE,
-
-        /// <summary>Vendor specific base class (0xFF)</summary>
-        VendorSpecific = 0xFF,
-    };
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+namespace MadWizard.WinUSBNet
+{
+    /// <summary>
+    /// USB base class code enumeration, as defined in the USB specification
+    /// </summary>
+    public enum USBBaseClass
+    {
+        /// <summary>Unknown non-zero class code. Used when the actual class code
+        /// does not match any of the ones defined in this enumeration. </summary>
+        Unknown = -1,
+
+        /// <summary>Base class defined elsewhere (0x00)</summary>
+        None = 0x00,
+
+        /// <summary>Audio base class (0x01)</summary>
+        Audio = 0x01,
+
+        /// <summary>Communications and CDC control base class (0x02)</summary>
+        CommCDC = 0x02,
+
+        /// <summary>HID base class (0x03)</summary>
+        HID = 0x03,
+
+        /// <summary>Physical base class (0x05)</summary>
+        Physical = 0x05,
+
+        /// <summary>Image base class (0x06)</summary>
+        Image = 0x06,
+
+        /// <summary>Printer base class (0x07)</summary>
+        Printer = 0x07,
+
+        /// <summary>Mass storage base class (0x08)</summary>
+        MassStorage = 0x08,
+
+        /// <summary>Hub base class (0x09)</summary>
+        Hub = 0x09,
+
+        /// <summary>CDC data base class (0x0A)</summary>
+        CDCData = 0x0A,
+
+        /// <summary>Smart card base class (0x0B)</summary>
+        SmartCard = 0x0B,
+
+        /// <summary>Content security base class (0x0D)</summary>
+        ContentSecurity = 0x0D,
+
+        /// <summary>Video base class (0x0E)</summary>
+        Video = 0x0E,
+
+        /// <summary>Personal health care base class (0x0F)</summary>
+        PersonalHealthcare = 0x0F,
+
+        /// <summary>Diagnostic device base class (0xDC)</summary>
+        DiagnosticDevice = 0xDC,
+
+        /// <summary>Wireless controller base class (0xE0)</summary>
+        WirelessController = 0xE0,
+
+        /// <summary>Miscellaneous base class (0xEF)</summary>
+        Miscellaneous = 0xEF,
+
+        /// <summary>Application specific base class (0xFE)</summary>
+        ApplicationSpecific = 0xFE,
+
+        /// <summary>Vendor specific base class (0xFF)</summary>
+        VendorSpecific = 0xFF,
+    };
 }
\ No newline at end of file
diff --git a/WinUSBNet/USBAsyncResult.cs b/WPinternals/WinUSBNet/USBAsyncResult.cs
similarity index 96%
rename from WinUSBNet/USBAsyncResult.cs
rename to WPinternals/WinUSBNet/USBAsyncResult.cs
index 7eff4a2..c19c163 100644
--- a/WinUSBNet/USBAsyncResult.cs
+++ b/WPinternals/WinUSBNet/USBAsyncResult.cs
@@ -1,127 +1,127 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *  
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-using System;
-using System.Threading;
-namespace MadWizard.WinUSBNet
-{
-    internal class USBAsyncResult : IAsyncResult, IDisposable
-    {
-        private readonly AsyncCallback _userCallback;
-        private bool _completed;
-        private bool _completedSynchronously;
-        private ManualResetEvent _waitEvent;
-        private int _bytesTransfered;
-        private Exception _error;
-
-        public USBAsyncResult(AsyncCallback userCallback, object stateObject)
-        {
-            AsyncState = stateObject;
-            _userCallback = userCallback;
-            _completedSynchronously = false;
-            _completed = false;
-            _waitEvent = null;
-        }
-
-        public object AsyncState { get; }
-
-        public Exception Error
-        {
-            get
-            {
-                lock (this)
-                {
-                    return _error;
-                }
-            }
-        }
-        public int BytesTransfered
-        {
-            get { return _bytesTransfered; }
-        }
-        public WaitHandle AsyncWaitHandle
-        {
-            get
-            {
-                lock (this)
-                {
-                    if (_waitEvent == null)
-                    {
-                        _waitEvent = new ManualResetEvent(_completed);
-                    }
-                }
-                return _waitEvent;
-            }
-        }
-
-        public bool CompletedSynchronously
-        {
-            get
-            {
-                lock (this)
-                {
-                    return _completedSynchronously;
-                }
-            }
-        }
-
-        public bool IsCompleted
-        {
-            get
-            {
-                lock (this)
-                {
-                    return _completed;
-                }
-            }
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        public void OnCompletion(bool completedSynchronously, Exception error, int bytesTransfered, bool synchronousCallback)
-        {
-            lock (this)
-            {
-                _completedSynchronously = completedSynchronously;
-                _completed = true;
-                _error = error;
-                _bytesTransfered = bytesTransfered;
-                _waitEvent?.Set();
-            }
-            if (_userCallback != null)
-            {
-                if (synchronousCallback)
-                {
-                    RunCallback(null);
-                }
-                else
-                {
-                    ThreadPool.QueueUserWorkItem(RunCallback);
-                }
-            }
-        }
-        private void RunCallback(object state)
-        {
-            _userCallback(this);
-        }
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                // Cleanup managed resources
-                lock (this)
-                {
-                    _waitEvent?.Close();
-                }
-            }
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *  
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+using System;
+using System.Threading;
+namespace MadWizard.WinUSBNet
+{
+    internal class USBAsyncResult : IAsyncResult, IDisposable
+    {
+        private readonly AsyncCallback _userCallback;
+        private bool _completed;
+        private bool _completedSynchronously;
+        private ManualResetEvent _waitEvent;
+        private int _bytesTransfered;
+        private Exception _error;
+
+        public USBAsyncResult(AsyncCallback userCallback, object stateObject)
+        {
+            AsyncState = stateObject;
+            _userCallback = userCallback;
+            _completedSynchronously = false;
+            _completed = false;
+            _waitEvent = null;
+        }
+
+        public object AsyncState { get; }
+
+        public Exception Error
+        {
+            get
+            {
+                lock (this)
+                {
+                    return _error;
+                }
+            }
+        }
+        public int BytesTransfered
+        {
+            get { return _bytesTransfered; }
+        }
+        public WaitHandle AsyncWaitHandle
+        {
+            get
+            {
+                lock (this)
+                {
+                    if (_waitEvent == null)
+                    {
+                        _waitEvent = new ManualResetEvent(_completed);
+                    }
+                }
+                return _waitEvent;
+            }
+        }
+
+        public bool CompletedSynchronously
+        {
+            get
+            {
+                lock (this)
+                {
+                    return _completedSynchronously;
+                }
+            }
+        }
+
+        public bool IsCompleted
+        {
+            get
+            {
+                lock (this)
+                {
+                    return _completed;
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        public void OnCompletion(bool completedSynchronously, Exception error, int bytesTransfered, bool synchronousCallback)
+        {
+            lock (this)
+            {
+                _completedSynchronously = completedSynchronously;
+                _completed = true;
+                _error = error;
+                _bytesTransfered = bytesTransfered;
+                _waitEvent?.Set();
+            }
+            if (_userCallback != null)
+            {
+                if (synchronousCallback)
+                {
+                    RunCallback(null);
+                }
+                else
+                {
+                    ThreadPool.QueueUserWorkItem(RunCallback);
+                }
+            }
+        }
+        private void RunCallback(object state)
+        {
+            _userCallback(this);
+        }
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                // Cleanup managed resources
+                lock (this)
+                {
+                    _waitEvent?.Close();
+                }
+            }
+        }
+    }
+}
diff --git a/WinUSBNet/USBDevice.cs b/WPinternals/WinUSBNet/USBDevice.cs
similarity index 98%
rename from WinUSBNet/USBDevice.cs
rename to WPinternals/WinUSBNet/USBDevice.cs
index 4b553e8..146c787 100644
--- a/WinUSBNet/USBDevice.cs
+++ b/WPinternals/WinUSBNet/USBDevice.cs
@@ -1,871 +1,871 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-using System;
-using System.Collections.Generic;
-
-namespace MadWizard.WinUSBNet
-{
-    /// <summary>
-    /// The UsbDevice class represents a single WinUSB device.
-    /// </summary>
-    public class USBDevice : IDisposable
-    {
-        private bool _disposed = false;
-
-        /// <summary>
-        /// Collection of all pipes available on the USB device
-        /// </summary>
-        public USBPipeCollection Pipes
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// The input pipe. Use this pipe to read from the device.
-        /// </summary>
-        public USBPipe InputPipe
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// The output pipe. Use this pipe to write to the device.
-        /// </summary>
-        public USBPipe OutputPipe
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Collection of all interfaces available on the USB device
-        /// </summary>
-        public USBInterfaceCollection Interfaces
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Device descriptor with information about the device
-        /// </summary>
-        public USBDeviceDescriptor Descriptor
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Constructs a new USB device
-        /// </summary>
-        /// <param name="deviceInfo">USB device info of the device to create</param>
-        public USBDevice(USBDeviceInfo deviceInfo)
-            : this(deviceInfo.DevicePath)
-        {
-            // Handled in other constructor
-        }
-
-        /// <summary>
-        /// Disposes the UsbDevice including all unmanaged WinUSB handles. This function
-        /// should be called when the UsbDevice object is no longer in use, otherwise
-        /// unmanaged handles will remain open until the garbage collector finalizes the
-        /// object.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Finalizer for the UsbDevice. Disposes all unmanaged handles.
-        /// </summary>
-        ~USBDevice()
-        {
-            Dispose(false);
-        }
-
-        /// <summary>
-        /// Disposes the object
-        /// </summary>
-        /// <param name="disposing">Indicates whether Dispose was called manually (true) or by
-        /// the garbage collector (false) via the destructor.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (disposing)
-            {
-                InternalDevice?.Dispose();
-            }
-
-            // Clean unmanaged resources here.
-            // (none currently)
-
-            _disposed = true;
-        }
-
-        /// <summary>
-        /// Constructs a new USB device
-        /// </summary>
-        /// <param name="devicePathName">Device path name of the USB device to create</param>
-        public USBDevice(string devicePathName)
-        {
-            try
-            {
-                Descriptor = GetDeviceDescriptor(devicePathName);
-            }
-            catch // (Exception Ex)
-            {
-                //WPinternals.LogFile.LogException(Ex);
-            }
-            InternalDevice = new API.WinUSBDevice();
-            try
-            {
-                InternalDevice.OpenDevice(devicePathName);
-                InitializeInterfaces();
-            }
-            catch (API.APIException e)
-            {
-                InternalDevice.Dispose();
-                throw new USBException("Failed to open device.", e);
-            }
-        }
-
-        internal API.WinUSBDevice InternalDevice { get; } = null;
-
-        private void InitializeInterfaces()
-        {
-            int numInterfaces = InternalDevice.InterfaceCount;
-
-            List<USBPipe> allPipes = new();
-            InputPipe = null;
-            OutputPipe = null;
-
-            USBInterface[] interfaces = new USBInterface[numInterfaces];
-            // UsbEndpoint
-            for (int i = 0; i < numInterfaces; i++)
-            {
-                InternalDevice.GetInterfaceInfo(i, out API.USB_INTERFACE_DESCRIPTOR descriptor, out API.WINUSB_PIPE_INFORMATION[] pipesInfo);
-                USBPipe[] interfacePipes = new USBPipe[pipesInfo.Length];
-                for(int k=0;k<pipesInfo.Length;k++)
-                {
-                    USBPipe pipe = new(this, pipesInfo[k]);
-                    interfacePipes[k] = pipe;
-                    allPipes.Add(pipe);
-                    if (Convert.ToBoolean(pipesInfo[k].PipeId & 0x80) && (InputPipe == null))
-                    {
-                        InputPipe = pipe;
-                    }
-
-                    if (!Convert.ToBoolean(pipesInfo[k].PipeId & 0x80) && (OutputPipe == null))
-                    {
-                        OutputPipe = pipe;
-                    }
-                }
-                // TODO:
-                //if (descriptor.iInterface != 0)
-                //    _wuDevice.GetStringDescriptor(descriptor.iInterface);
-                USBPipeCollection pipeCollection = new(interfacePipes);
-                interfaces[i] = new USBInterface(this, i, descriptor, pipeCollection);
-            }
-            Pipes = new USBPipeCollection(allPipes.ToArray());
-            Interfaces = new USBInterfaceCollection(interfaces);
-        }
-
-        private void CheckControlParams(int value, int index, byte[] buffer, int length)
-        {
-            if (value < ushort.MinValue || value > ushort.MaxValue)
-            {
-                throw new ArgumentOutOfRangeException(nameof(value), "Value parameter out of range.");
-            }
-
-            if (index < ushort.MinValue || index > ushort.MaxValue)
-            {
-                throw new ArgumentOutOfRangeException(nameof(index), "Index parameter out of range.");
-            }
-
-            if (length > buffer.Length)
-            {
-                throw new ArgumentOutOfRangeException(nameof(length), "Length parameter is larger than the size of the buffer.");
-            }
-
-            if (length > ushort.MaxValue)
-            {
-                throw new ArgumentOutOfRangeException(nameof(length), "Length too large");
-            }
-        }
-
-        /// <summary>
-        /// Specifies the timeout in milliseconds for control pipe operations. If a control transfer does not finish within the specified time it will fail.
-        /// When set to zero, no timeout is used. Default value is 5000 milliseconds.
-        /// </summary>
-        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
-        public int ControlPipeTimeout
-        {
-            get
-            {
-                byte PipeID = 0;
-                if (InputPipe != null)
-                {
-                    PipeID = InputPipe.Address;
-                }
-
-                return (int)InternalDevice.GetPipePolicyUInt(0, 0x00, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT);
-            }
-            set
-            {
-                if (value < 0)
-                {
-                    throw new ArgumentOutOfRangeException(nameof(value), "Control pipe timeout cannot be negative.");
-                }
-                //_wuDevice.SetPipePolicy(0, 0x00, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
-                if (InputPipe != null)
-                {
-                    InternalDevice.SetPipePolicy(0, InputPipe.Address, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
-                }
-
-                if (OutputPipe != null)
-                {
-                    InternalDevice.SetPipePolicy(0, OutputPipe.Address, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Initiates a control transfer over the default control endpoint. This method allows both IN and OUT direction transfers, depending
-        /// on the highest bit of the <paramref name="requestType"/> parameter. Alternatively, <see cref="ControlIn(byte,byte,int,int,byte[],int)"/> and
-        /// <see cref="ControlOut(byte,byte,int,int,byte[],int)"/> can be used for control transfers in a specific direction, which is the recommended way because
-        /// it prevents using the wrong direction accidentally. Use the ControlTransfer method when the direction is not known at compile time.
-        /// </summary>
-        /// <param name="requestType">The setup packet request type.</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="buffer">The data to transfer in the data stage of the control. When the transfer is in the IN direction the data received will be
-        /// written to this buffer. For an OUT direction transfer the contents of the buffer are written sent through the pipe.</param>
-        /// <param name="length">Length of the data to transfer. Must be equal to or less than the length of <paramref name="buffer"/>.
-        /// The setup packet's length member will be set to this length.</param>
-        /// <returns>The number of bytes received from the device.</returns>
-        public int ControlTransfer(byte requestType, byte request, int value, int index, byte[] buffer, int length)
-        {
-            // Parameters are int and not ushort because ushort is not CLS compliant.
-            CheckNotDisposed();
-            CheckControlParams(value, index, buffer, length);
-
-            try
-            {
-                return InternalDevice.ControlTransfer(requestType, request, (ushort)value, (ushort)index, (ushort)length, buffer);
-            }
-            catch (API.APIException e)
-            {
-                throw new USBException("Control transfer failed", e);
-            }
-        }
-
-        /// <summary>
-        /// Initiates an asynchronous control transfer over the default control endpoint. This method allows both IN and OUT direction transfers, depending
-        /// on the highest bit of the <paramref name="requestType"/> parameter. Alternatively, <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> and
-        /// <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> can be used for asynchronous control transfers in a specific direction, which is
-        /// the recommended way because it prevents using the wrong direction accidentally. Use the BeginControlTransfer method when the direction is not
-        /// known at compile time. </summary>
-        /// <param name="requestType">The setup packet request type.</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="buffer">The data to transfer in the data stage of the control. When the transfer is in the IN direction the data received will be
-        /// written to this buffer. For an OUT direction transfer the contents of the buffer are written sent through the pipe. Note: This buffer is not allowed
-        /// to change for the duration of the asynchronous operation.</param>
-        /// <param name="length">Length of the data to transfer. Must be equal to or less than the length of <paramref name="buffer"/>. The setup packet's length member will be set to this length.</param>
-        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
-        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
-        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
-        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
-        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
-        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
-        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
-        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
-        /// </remarks>
-        public IAsyncResult BeginControlTransfer(byte requestType, byte request, int value, int index, byte[] buffer, int length, AsyncCallback userCallback, object stateObject)
-        {
-            // Parameters are int and not ushort because ushort is not CLS compliant.
-            CheckNotDisposed();
-            CheckControlParams(value, index, buffer, length);
-
-            USBAsyncResult result = new(userCallback, stateObject);
-
-            try
-            {
-                InternalDevice.ControlTransferOverlapped(requestType, request, (ushort)value, (ushort)index, (ushort)length, buffer, result);
-            }
-            catch (API.APIException e)
-            {
-                result?.Dispose();
-                throw new USBException("Asynchronous control transfer failed", e);
-            }
-            catch (Exception)
-            {
-                result?.Dispose();
-                throw;
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Initiates an asynchronous control transfer over the default control endpoint. This method allows both IN and OUT direction transfers, depending
-        /// on the highest bit of the <paramref name="requestType"/> parameter. Alternatively, <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> and
-        /// <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> can be used for asynchronous control transfers in a specific direction, which is
-        /// the recommended way because it prevents using the wrong direction accidentally. Use the BeginControlTransfer method when the direction is not
-        /// known at compile time. </summary>
-        /// <param name="requestType">The setup packet request type.</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="buffer">The data to transfer in the data stage of the control. When the transfer is in the IN direction the data received will be
-        /// written to this buffer. For an OUT direction transfer the contents of the buffer are written sent through the pipe. The setup packet's length member will
-        /// be set to the length of this buffer. Note: This buffer is not allowed to change for the duration of the asynchronous operation. </param>
-        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
-        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
-        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
-        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
-        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
-        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
-        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
-        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
-        /// </remarks>
-        public IAsyncResult BeginControlTransfer(byte requestType, byte request, int value, int index, byte[] buffer, AsyncCallback userCallback, object stateObject)
-        {
-            return BeginControlTransfer(requestType, request, value, index, buffer, buffer.Length, userCallback, stateObject);
-        }
-
-        /// <summary>
-        /// Waits for a pending asynchronous control transfer to complete.
-        /// </summary>
-        /// <param name="asyncResult">The <see cref="IAsyncResult"/> object representing the asynchronous operation,
-        /// as returned by one of the ControlIn, ControlOut or ControlTransfer methods.</param>
-        /// <returns>The number of bytes transfered during the operation.</returns>
-        /// <remarks>Every asynchronous control transfer must have a matching call to <see cref="EndControlTransfer"/> to dispose
-        /// of any resources used and to retrieve the result of the operation. When the operation was successful the method returns the number
-        /// of bytes that were transfered. If an error occurred during the operation this method will throw the exceptions that would
-        /// otherwise have occurred during the operation. If the operation is not yet finished EndControlTransfer will wait for the
-        /// operation to finish before returning.</remarks>
-        public int EndControlTransfer(IAsyncResult asyncResult)
-        {
-            if (asyncResult == null)
-            {
-                throw new NullReferenceException("asyncResult cannot be null");
-            }
-
-            if (!(asyncResult is USBAsyncResult))
-            {
-                throw new ArgumentException("AsyncResult object was not created by calling one of the BeginControl* methods on this class.");
-            }
-
-            // todo: check duplicate end control
-            USBAsyncResult result = (USBAsyncResult)asyncResult;
-            try
-            {
-                if (!result.IsCompleted)
-                {
-                    result.AsyncWaitHandle.WaitOne();
-                }
-
-                if (result.Error != null)
-                {
-                    throw new USBException("Asynchronous control transfer from pipe has failed.", result.Error);
-                }
-
-                return result.BytesTransfered;
-            }
-            finally
-            {
-                result.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Initiates a control transfer over the default control endpoint. This method allows both IN and OUT direction transfers, depending
-        /// on the highest bit of the <paramref name="requestType"/> parameter). Alternatively, <see cref="ControlIn(byte,byte,int,int,byte[])"/> and
-        /// <see cref="ControlOut(byte,byte,int,int,byte[])"/> can be used for control transfers in a specific direction, which is the recommended way because
-        /// it prevents using the wrong direction accidentally. Use the ControlTransfer method when the direction is not known at compile time.
-        /// </summary>
-        /// <param name="requestType">The setup packet request type.</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="buffer">The data to transfer in the data stage of the control. When the transfer is in the IN direction the data received will be
-        /// written to this buffer. For an OUT direction transfer the contents of the buffer are written sent through the pipe. The length of this
-        /// buffer is used as the number of bytes in the control transfer. The setup packet's length member will be set to this length as well.</param>
-        /// <returns>The number of bytes received from the device.</returns>
-        public int ControlTransfer(byte requestType, byte request, int value, int index, byte[] buffer)
-        {
-            return ControlTransfer(requestType, request, value, index, buffer, buffer.Length);
-        }
-
-        /// <summary>
-        /// Initiates a control transfer without a data stage over the default control endpoint. This method allows both IN and OUT direction transfers, depending
-        /// on the highest bit of the <paramref name="requestType"/> parameter). Alternatively, <see cref="ControlIn(byte,byte,int,int)"/> and
-        /// <see cref="ControlOut(byte,byte,int,int)"/> can be used for control transfers in a specific direction, which is the recommended way because
-        /// it prevents using the wrong direction accidentally. Use the ControlTransfer method when the direction is not known at compile time.
-        /// </summary>
-        /// <param name="requestType">The setup packet request type.</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        public void ControlTransfer(byte requestType, byte request, int value, int index)
-        {
-            // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
-            ControlTransfer(requestType, request, value, index, Array.Empty<byte>(), 0);
-        }
-
-        private void CheckIn(byte requestType)
-        {
-            if ((requestType & 0x80) == 0) // Host to device?
-            {
-                throw new ArgumentException("Request type is not IN.");
-            }
-        }
-
-        private void CheckOut(byte requestType)
-        {
-            if ((requestType & 0x80) == 0x80) // Device to host?
-            {
-                throw new ArgumentException("Request type is not OUT.");
-            }
-        }
-
-        /// <summary>
-        /// Initiates a control transfer over the default control endpoint. The request should have an IN direction (specified by the highest bit
-        /// of the <paramref name="requestType"/> parameter). A buffer to receive the data is automatically created by this method.
-        /// </summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="length">Length of the data to transfer. A buffer will be created with this length and the length member of the setup packet
-        /// will be set to this length.</param>
-        /// <returns>A buffer containing the data transfered.</returns>
-        /// <remarks>This routine initially allocates a buffer to hold the <paramref name="length"/> bytes of data expected from the device.
-        /// If the device responds with less data than expected, this routine will allocate a smaller buffer to copy and return only the bytes actually received.
-        /// </remarks>
-        public byte[] ControlIn(byte requestType, byte request, int value, int index, int length)
-        {
-            CheckIn(requestType);
-            byte[] buffer = new byte[length];
-            int actuallyReceived = ControlTransfer(requestType, request, value, index, buffer, buffer.Length);
-            if (actuallyReceived < length)
-            {
-                byte[] outBuffer = new byte[actuallyReceived];
-                Array.Copy(buffer, 0, outBuffer, 0, actuallyReceived);
-                return outBuffer;
-            }
-            return buffer;
-        }
-
-        /// <summary>
-        /// Initiates a control transfer over the default control endpoint. The request should have an IN direction (specified by the highest bit
-        /// of the <paramref name="requestType"/> parameter).
-        /// </summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="buffer">The buffer that will receive the data transfered.</param>
-        /// <param name="length">Length of the data to transfer. The length member of the setup packet will be set to this length. The buffer specified
-        /// by the <paramref name="buffer"/> parameter should have at least this length.</param>
-        /// <returns>The number of bytes received from the device.</returns>
-        public int ControlIn(byte requestType, byte request, int value, int index, byte[] buffer, int length)
-        {
-            CheckIn(requestType);
-            return ControlTransfer(requestType, request, value, index, buffer, length);
-        }
-
-        /// <summary>
-        /// Initiates a control transfer over the default control endpoint. The request should have an IN direction (specified by the highest bit
-        /// of the <paramref name="requestType"/> parameter). The length of buffer given by the <paramref name="buffer"/> parameter will dictate
-        /// the number of bytes that are transfered and the value of the setup packet's length member.
-        /// </summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="buffer">The buffer that will receive the data transfered. The length of this buffer will be the number of bytes transfered.</param>
-        /// <returns>The number of bytes received from the device.</returns>
-        public int ControlIn(byte requestType, byte request, int value, int index, byte[] buffer)
-        {
-            CheckIn(requestType);
-            return ControlTransfer(requestType, request, value, index, buffer);
-        }
-
-        /// <summary>
-        /// Initiates a control transfer without a data stage over the default control endpoint. The request should have an IN direction (specified by the highest bit
-        /// of the <paramref name="requestType"/> parameter). The setup packets' length member will be set to zero.
-        /// </summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        public void ControlIn(byte requestType, byte request, int value, int index)
-        {
-            CheckIn(requestType);
-            // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
-            ControlTransfer(requestType, request, value, index, Array.Empty<byte>());
-        }
-
-        /// <summary>
-        /// Initiates a control transfer over the default control endpoint. The request should have an OUT direction (specified by the highest bit
-        /// of the <paramref name="requestType"/> parameter).
-        /// </summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the OUT direction (highest bit cleared).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="buffer">A buffer containing the data to transfer in the data stage.</param>
-        /// <param name="length">Length of the data to transfer. Only the first <paramref name="length"/> bytes of <paramref name="buffer"/> will be transfered.
-        /// The setup packet's length parameter is set to this length.</param>
-        public void ControlOut(byte requestType, byte request, int value, int index, byte[] buffer, int length)
-        {
-            CheckOut(requestType);
-            ControlTransfer(requestType, request, value, index, buffer, length);
-        }
-
-        /// <summary>
-        /// Initiates a control transfer over the default control endpoint. The request should have an OUT direction (specified by the highest bit
-        /// of the <paramref name="requestType"/> parameter).
-        /// </summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the OUT direction (highest bit cleared).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="buffer">A buffer containing the data to transfer in the data stage. The complete buffer is transfered. The setup packet's length
-        /// parameter is set to the length of this buffer.</param>
-        public void ControlOut(byte requestType, byte request, int value, int index, byte[] buffer)
-        {
-            CheckOut(requestType);
-            ControlTransfer(requestType, request, value, index, buffer);
-        }
-
-        /// <summary>
-        /// Initiates a control transfer without a data stage over the default control endpoint. The request should have an OUT direction (specified by the highest bit
-        /// of the <paramref name="requestType"/> parameter. The setup packets' length member will be set to zero.
-        /// </summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the OUT direction (highest bit cleared).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        public void ControlOut(byte requestType, byte request, int value, int index)
-        {
-            CheckOut(requestType);
-            // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
-            ControlTransfer(requestType, request, value, index, Array.Empty<byte>());
-        }
-
-        /// <summary>
-        /// Initiates an asynchronous control transfer without a data stage over the default control endpoint. This method allows both IN and OUT direction transfers, depending
-        /// on the highest bit of the <paramref name="requestType"/> parameter. Alternatively, <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> and
-        /// <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> can be used for asynchronous control transfers in a specific direction, which is
-        /// the recommended way because it prevents using the wrong direction accidentally. Use the BeginControlTransfer method when the direction is not
-        /// known at compile time. </summary>
-        /// <param name="requestType">The setup packet request type.</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
-        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
-        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
-        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
-        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
-        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
-        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
-        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
-        /// </remarks>
-        public IAsyncResult BeginControlTransfer(byte requestType, byte request, int value, int index, AsyncCallback userCallback, object stateObject)
-        {
-            // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
-            return BeginControlTransfer(requestType, request, value, index, Array.Empty<byte>(), 0, userCallback, stateObject);
-        }
-
-        /// <summary>
-        /// Initiates an asynchronous control transfer over the default control endpoint.  The request should have an IN direction (specified by the highest bit
-        /// of the <paramref name="requestType"/> parameter).</summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="buffer">The buffer that will receive the data transfered.</param>
-        /// <param name="length">Length of the data to transfer. Must be equal to or less than the length of <paramref name="buffer"/>. The setup packet's length member will be set to this length.</param>
-        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
-        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
-        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
-        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
-        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
-        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
-        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
-        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
-        /// </remarks>
-        public IAsyncResult BeginControlIn(byte requestType, byte request, int value, int index, byte[] buffer, int length, AsyncCallback userCallback, object stateObject)
-        {
-            CheckIn(requestType);
-            return BeginControlTransfer(requestType, request, value, index, buffer, length, userCallback, stateObject);
-        }
-
-        /// <summary>
-        /// Initiates an asynchronous control transfer over the default control endpoint. The request should have an IN direction (specified by the highest bit
-        /// of the <paramref name="requestType"/> parameter).</summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="buffer">The buffer that will receive the data transfered. The setup packet's length member will be set to the length of this buffer.</param>
-        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
-        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
-        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
-        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
-        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
-        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
-        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
-        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
-        /// </remarks>
-        public IAsyncResult BeginControlIn(byte requestType, byte request, int value, int index, byte[] buffer, AsyncCallback userCallback, object stateObject)
-        {
-            CheckIn(requestType);
-            return BeginControlTransfer(requestType, request, value, index, buffer, userCallback, stateObject);
-        }
-
-        /// <summary>
-        /// Initiates an asynchronous control transfer without a data stage over the default control endpoint.
-        /// The request should have an IN direction (specified by the highest bit of the <paramref name="requestType"/> parameter).
-        /// The setup packets' length member will be set to zero.</summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
-        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
-        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
-        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
-        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
-        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
-        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
-        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
-        /// </remarks>
-        public IAsyncResult BeginControlIn(byte requestType, byte request, int value, int index, AsyncCallback userCallback, object stateObject)
-        {
-            CheckIn(requestType);
-            return BeginControlTransfer(requestType, request, value, index, userCallback, stateObject);
-        }
-
-        /// <summary>
-        /// Initiates an asynchronous control transfer over the default control endpoint.  The request should have an OUT direction (specified by the highest bit
-        /// of the <paramref name="requestType"/> parameter).</summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the OUT direction (highest bit cleared).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="buffer">The buffer that contains the data to be transfered.</param>
-        /// <param name="length">Length of the data to transfer. Must be equal to or less than the length of <paramref name="buffer"/>. The setup packet's length member will be set to this length.</param>
-        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
-        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
-        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
-        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
-        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
-        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
-        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
-        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
-        /// </remarks>
-        public IAsyncResult BeginControlOut(byte requestType, byte request, int value, int index, byte[] buffer, int length, AsyncCallback userCallback, object stateObject)
-        {
-            CheckOut(requestType);
-            return BeginControlTransfer(requestType, request, value, index, buffer, length, userCallback, stateObject);
-        }
-
-        /// <summary>
-        /// Initiates an asynchronous control transfer over the default control endpoint. The request should have an OUT direction (specified by the highest bit
-        /// of the <paramref name="requestType"/> parameter).</summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the OUT direction (highest bit cleared).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="buffer">The buffer that contains the data to be transfered. The setup packet's length member will be set to the length of this buffer.</param>
-        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
-        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
-        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
-        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
-        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
-        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
-        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
-        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
-        /// </remarks>
-        public IAsyncResult BeginControlOut(byte requestType, byte request, int value, int index, byte[] buffer, AsyncCallback userCallback, object stateObject)
-        {
-            CheckOut(requestType);
-            return BeginControlTransfer(requestType, request, value, index, buffer, userCallback, stateObject);
-        }
-
-        /// <summary>
-        /// Initiates an asynchronous control transfer without a data stage over the default control endpoint.
-        /// The request should have an OUT direction (specified by the highest bit of the <paramref name="requestType"/> parameter).
-        /// The setup packets' length member will be set to zero.</summary>
-        /// <param name="requestType">The setup packet request type. The request type must specify the OUT direction (highest bit cleared).</param>
-        /// <param name="request">The setup packet device request.</param>
-        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
-        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
-        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
-        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
-        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
-        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
-        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
-        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
-        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
-        /// </remarks>
-        public IAsyncResult BeginControlOut(byte requestType, byte request, int value, int index, AsyncCallback userCallback, object stateObject)
-        {
-            CheckOut(requestType);
-            // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
-            return BeginControlTransfer(requestType, request, value, index, Array.Empty<byte>(), userCallback, stateObject);
-        }
-
-        private void CheckNotDisposed()
-        {
-            if (_disposed)
-            {
-                throw new ObjectDisposedException("USB device object has been disposed.");
-            }
-        }
-
-        /// <summary>
-        /// Finds WinUSB devices with a GUID matching the parameter guidString
-        /// </summary>
-        /// <param name="guidString">The GUID string that the device should match.
-        /// The format of this string may be any format accepted by the constructor
-        /// of the System.Guid class</param>
-        /// <returns>An array of USBDeviceInfo objects representing the
-        /// devices found. When no devices are found an empty array is
-        /// returned.</returns>
-        public static USBDeviceInfo[] GetDevices(string guidString)
-        {
-            return GetDevices(new Guid(guidString));
-        }
-
-        /// <summary>
-        /// Finds WinUSB devices with a GUID matching the parameter guid
-        /// </summary>
-        /// <param name="guid">The GUID that the device should match.</param>
-        /// <returns>An array of USBDeviceInfo objects representing the
-        /// devices found. When no devices are found an empty array is
-        /// returned.</returns>
-        public static USBDeviceInfo[] GetDevices(Guid guid)
-        {
-            API.DeviceDetails[] detailList = API.DeviceManagement.FindDevicesFromGuid(guid);
-
-            USBDeviceInfo[] devices = new USBDeviceInfo[detailList.Length];
-
-            for (int i = 0; i < detailList.Length; i++)
-            {
-                devices[i] = new USBDeviceInfo(detailList[i]);
-            }
-            return devices;
-        }
-
-        /// <summary>
-        /// Finds the first WinUSB device with a GUID matching the parameter guid.
-        /// If multiple WinUSB devices match the GUID only the first one is returned.
-        /// </summary>
-        /// <param name="guid">The GUID that the device should match.</param>
-        /// <returns>An UsbDevice object representing the device if found. If
-        /// no device with the given GUID could be found null is returned.</returns>
-        public static USBDevice GetSingleDevice(Guid guid)
-        {
-            API.DeviceDetails[] detailList = API.DeviceManagement.FindDevicesFromGuid(guid);
-            if (detailList.Length == 0)
-            {
-                return null;
-            }
-
-            return new USBDevice(detailList[0].DevicePath);
-        }
-
-        /// <summary>
-        /// Finds the first WinUSB device with a GUID matching the parameter guidString.
-        /// If multiple WinUSB devices match the GUID only the first one is returned.
-        /// </summary>
-        /// <param name="guidString">The GUID string that the device should match.</param>
-        /// <returns>An UsbDevice object representing the device if found. If
-        /// no device with the given GUID could be found null is returned.</returns>
-        public static USBDevice GetSingleDevice(string guidString)
-        {
-            return GetSingleDevice(new Guid(guidString));
-        }
-
-        private static USBDeviceDescriptor GetDeviceDescriptor(string devicePath)
-        {
-            try
-            {
-                USBDeviceDescriptor descriptor;
-                using (API.WinUSBDevice wuDevice = new())
-                {
-                    wuDevice.OpenDevice(devicePath);
-                    API.USB_DEVICE_DESCRIPTOR deviceDesc = wuDevice.GetDeviceDescriptor();
-
-                    // Get first supported language ID
-                    ushort[] langIDs = wuDevice.GetSupportedLanguageIDs();
-                    ushort langID = 0;
-                    if (langIDs.Length > 0)
-                    {
-                        langID = langIDs[0];
-                    }
-
-                    string manufacturer = null, product = null, serialNumber = null;
-                    byte idx = 0;
-
-                    try
-                    {
-                        idx = deviceDesc.iManufacturer;
-                        if (idx > 0)
-                        {
-                            manufacturer = wuDevice.GetStringDescriptor(idx, langID);
-                        }
-                    }
-                    catch { }
-
-                    try
-                    {
-                        idx = deviceDesc.iProduct;
-                        if (idx > 0)
-                        {
-                            product = wuDevice.GetStringDescriptor(idx, langID);
-                        }
-                    }
-                    catch { }
-
-                    try
-                    {
-                        idx = deviceDesc.iSerialNumber;
-                        if (idx > 0)
-                        {
-                            serialNumber = wuDevice.GetStringDescriptor(idx, langID);
-                        }
-                    }
-                    catch { }
-
-                    descriptor = new USBDeviceDescriptor(devicePath, deviceDesc, manufacturer, product, serialNumber);
-                }
-                return descriptor;
-            }
-            catch (API.APIException e)
-            {
-                throw new USBException("Failed to retrieve device descriptor.", e);
-            }
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+using System;
+using System.Collections.Generic;
+
+namespace MadWizard.WinUSBNet
+{
+    /// <summary>
+    /// The UsbDevice class represents a single WinUSB device.
+    /// </summary>
+    public class USBDevice : IDisposable
+    {
+        private bool _disposed = false;
+
+        /// <summary>
+        /// Collection of all pipes available on the USB device
+        /// </summary>
+        public USBPipeCollection Pipes
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// The input pipe. Use this pipe to read from the device.
+        /// </summary>
+        public USBPipe InputPipe
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// The output pipe. Use this pipe to write to the device.
+        /// </summary>
+        public USBPipe OutputPipe
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Collection of all interfaces available on the USB device
+        /// </summary>
+        public USBInterfaceCollection Interfaces
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Device descriptor with information about the device
+        /// </summary>
+        public USBDeviceDescriptor Descriptor
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Constructs a new USB device
+        /// </summary>
+        /// <param name="deviceInfo">USB device info of the device to create</param>
+        public USBDevice(USBDeviceInfo deviceInfo)
+            : this(deviceInfo.DevicePath)
+        {
+            // Handled in other constructor
+        }
+
+        /// <summary>
+        /// Disposes the UsbDevice including all unmanaged WinUSB handles. This function
+        /// should be called when the UsbDevice object is no longer in use, otherwise
+        /// unmanaged handles will remain open until the garbage collector finalizes the
+        /// object.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Finalizer for the UsbDevice. Disposes all unmanaged handles.
+        /// </summary>
+        ~USBDevice()
+        {
+            Dispose(false);
+        }
+
+        /// <summary>
+        /// Disposes the object
+        /// </summary>
+        /// <param name="disposing">Indicates whether Dispose was called manually (true) or by
+        /// the garbage collector (false) via the destructor.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (_disposed)
+            {
+                return;
+            }
+
+            if (disposing)
+            {
+                InternalDevice?.Dispose();
+            }
+
+            // Clean unmanaged resources here.
+            // (none currently)
+
+            _disposed = true;
+        }
+
+        /// <summary>
+        /// Constructs a new USB device
+        /// </summary>
+        /// <param name="devicePathName">Device path name of the USB device to create</param>
+        public USBDevice(string devicePathName)
+        {
+            try
+            {
+                Descriptor = GetDeviceDescriptor(devicePathName);
+            }
+            catch // (Exception Ex)
+            {
+                //WPinternals.LogFile.LogException(Ex);
+            }
+            InternalDevice = new API.WinUSBDevice();
+            try
+            {
+                InternalDevice.OpenDevice(devicePathName);
+                InitializeInterfaces();
+            }
+            catch (API.APIException e)
+            {
+                InternalDevice.Dispose();
+                throw new USBException("Failed to open device.", e);
+            }
+        }
+
+        internal API.WinUSBDevice InternalDevice { get; } = null;
+
+        private void InitializeInterfaces()
+        {
+            int numInterfaces = InternalDevice.InterfaceCount;
+
+            List<USBPipe> allPipes = new();
+            InputPipe = null;
+            OutputPipe = null;
+
+            USBInterface[] interfaces = new USBInterface[numInterfaces];
+            // UsbEndpoint
+            for (int i = 0; i < numInterfaces; i++)
+            {
+                InternalDevice.GetInterfaceInfo(i, out API.USB_INTERFACE_DESCRIPTOR descriptor, out API.WINUSB_PIPE_INFORMATION[] pipesInfo);
+                USBPipe[] interfacePipes = new USBPipe[pipesInfo.Length];
+                for(int k=0;k<pipesInfo.Length;k++)
+                {
+                    USBPipe pipe = new(this, pipesInfo[k]);
+                    interfacePipes[k] = pipe;
+                    allPipes.Add(pipe);
+                    if (Convert.ToBoolean(pipesInfo[k].PipeId & 0x80) && (InputPipe == null))
+                    {
+                        InputPipe = pipe;
+                    }
+
+                    if (!Convert.ToBoolean(pipesInfo[k].PipeId & 0x80) && (OutputPipe == null))
+                    {
+                        OutputPipe = pipe;
+                    }
+                }
+                // TODO:
+                //if (descriptor.iInterface != 0)
+                //    _wuDevice.GetStringDescriptor(descriptor.iInterface);
+                USBPipeCollection pipeCollection = new(interfacePipes);
+                interfaces[i] = new USBInterface(this, i, descriptor, pipeCollection);
+            }
+            Pipes = new USBPipeCollection(allPipes.ToArray());
+            Interfaces = new USBInterfaceCollection(interfaces);
+        }
+
+        private void CheckControlParams(int value, int index, byte[] buffer, int length)
+        {
+            if (value < ushort.MinValue || value > ushort.MaxValue)
+            {
+                throw new ArgumentOutOfRangeException(nameof(value), "Value parameter out of range.");
+            }
+
+            if (index < ushort.MinValue || index > ushort.MaxValue)
+            {
+                throw new ArgumentOutOfRangeException(nameof(index), "Index parameter out of range.");
+            }
+
+            if (length > buffer.Length)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length), "Length parameter is larger than the size of the buffer.");
+            }
+
+            if (length > ushort.MaxValue)
+            {
+                throw new ArgumentOutOfRangeException(nameof(length), "Length too large");
+            }
+        }
+
+        /// <summary>
+        /// Specifies the timeout in milliseconds for control pipe operations. If a control transfer does not finish within the specified time it will fail.
+        /// When set to zero, no timeout is used. Default value is 5000 milliseconds.
+        /// </summary>
+        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
+        public int ControlPipeTimeout
+        {
+            get
+            {
+                byte PipeID = 0;
+                if (InputPipe != null)
+                {
+                    PipeID = InputPipe.Address;
+                }
+
+                return (int)InternalDevice.GetPipePolicyUInt(0, 0x00, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT);
+            }
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentOutOfRangeException(nameof(value), "Control pipe timeout cannot be negative.");
+                }
+                //_wuDevice.SetPipePolicy(0, 0x00, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
+                if (InputPipe != null)
+                {
+                    InternalDevice.SetPipePolicy(0, InputPipe.Address, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
+                }
+
+                if (OutputPipe != null)
+                {
+                    InternalDevice.SetPipePolicy(0, OutputPipe.Address, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initiates a control transfer over the default control endpoint. This method allows both IN and OUT direction transfers, depending
+        /// on the highest bit of the <paramref name="requestType"/> parameter. Alternatively, <see cref="ControlIn(byte,byte,int,int,byte[],int)"/> and
+        /// <see cref="ControlOut(byte,byte,int,int,byte[],int)"/> can be used for control transfers in a specific direction, which is the recommended way because
+        /// it prevents using the wrong direction accidentally. Use the ControlTransfer method when the direction is not known at compile time.
+        /// </summary>
+        /// <param name="requestType">The setup packet request type.</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="buffer">The data to transfer in the data stage of the control. When the transfer is in the IN direction the data received will be
+        /// written to this buffer. For an OUT direction transfer the contents of the buffer are written sent through the pipe.</param>
+        /// <param name="length">Length of the data to transfer. Must be equal to or less than the length of <paramref name="buffer"/>.
+        /// The setup packet's length member will be set to this length.</param>
+        /// <returns>The number of bytes received from the device.</returns>
+        public int ControlTransfer(byte requestType, byte request, int value, int index, byte[] buffer, int length)
+        {
+            // Parameters are int and not ushort because ushort is not CLS compliant.
+            CheckNotDisposed();
+            CheckControlParams(value, index, buffer, length);
+
+            try
+            {
+                return InternalDevice.ControlTransfer(requestType, request, (ushort)value, (ushort)index, (ushort)length, buffer);
+            }
+            catch (API.APIException e)
+            {
+                throw new USBException("Control transfer failed", e);
+            }
+        }
+
+        /// <summary>
+        /// Initiates an asynchronous control transfer over the default control endpoint. This method allows both IN and OUT direction transfers, depending
+        /// on the highest bit of the <paramref name="requestType"/> parameter. Alternatively, <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> and
+        /// <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> can be used for asynchronous control transfers in a specific direction, which is
+        /// the recommended way because it prevents using the wrong direction accidentally. Use the BeginControlTransfer method when the direction is not
+        /// known at compile time. </summary>
+        /// <param name="requestType">The setup packet request type.</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="buffer">The data to transfer in the data stage of the control. When the transfer is in the IN direction the data received will be
+        /// written to this buffer. For an OUT direction transfer the contents of the buffer are written sent through the pipe. Note: This buffer is not allowed
+        /// to change for the duration of the asynchronous operation.</param>
+        /// <param name="length">Length of the data to transfer. Must be equal to or less than the length of <paramref name="buffer"/>. The setup packet's length member will be set to this length.</param>
+        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
+        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
+        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
+        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
+        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
+        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
+        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
+        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
+        /// </remarks>
+        public IAsyncResult BeginControlTransfer(byte requestType, byte request, int value, int index, byte[] buffer, int length, AsyncCallback userCallback, object stateObject)
+        {
+            // Parameters are int and not ushort because ushort is not CLS compliant.
+            CheckNotDisposed();
+            CheckControlParams(value, index, buffer, length);
+
+            USBAsyncResult result = new(userCallback, stateObject);
+
+            try
+            {
+                InternalDevice.ControlTransferOverlapped(requestType, request, (ushort)value, (ushort)index, (ushort)length, buffer, result);
+            }
+            catch (API.APIException e)
+            {
+                result?.Dispose();
+                throw new USBException("Asynchronous control transfer failed", e);
+            }
+            catch (Exception)
+            {
+                result?.Dispose();
+                throw;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Initiates an asynchronous control transfer over the default control endpoint. This method allows both IN and OUT direction transfers, depending
+        /// on the highest bit of the <paramref name="requestType"/> parameter. Alternatively, <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> and
+        /// <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> can be used for asynchronous control transfers in a specific direction, which is
+        /// the recommended way because it prevents using the wrong direction accidentally. Use the BeginControlTransfer method when the direction is not
+        /// known at compile time. </summary>
+        /// <param name="requestType">The setup packet request type.</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="buffer">The data to transfer in the data stage of the control. When the transfer is in the IN direction the data received will be
+        /// written to this buffer. For an OUT direction transfer the contents of the buffer are written sent through the pipe. The setup packet's length member will
+        /// be set to the length of this buffer. Note: This buffer is not allowed to change for the duration of the asynchronous operation. </param>
+        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
+        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
+        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
+        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
+        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
+        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
+        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
+        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
+        /// </remarks>
+        public IAsyncResult BeginControlTransfer(byte requestType, byte request, int value, int index, byte[] buffer, AsyncCallback userCallback, object stateObject)
+        {
+            return BeginControlTransfer(requestType, request, value, index, buffer, buffer.Length, userCallback, stateObject);
+        }
+
+        /// <summary>
+        /// Waits for a pending asynchronous control transfer to complete.
+        /// </summary>
+        /// <param name="asyncResult">The <see cref="IAsyncResult"/> object representing the asynchronous operation,
+        /// as returned by one of the ControlIn, ControlOut or ControlTransfer methods.</param>
+        /// <returns>The number of bytes transfered during the operation.</returns>
+        /// <remarks>Every asynchronous control transfer must have a matching call to <see cref="EndControlTransfer"/> to dispose
+        /// of any resources used and to retrieve the result of the operation. When the operation was successful the method returns the number
+        /// of bytes that were transfered. If an error occurred during the operation this method will throw the exceptions that would
+        /// otherwise have occurred during the operation. If the operation is not yet finished EndControlTransfer will wait for the
+        /// operation to finish before returning.</remarks>
+        public int EndControlTransfer(IAsyncResult asyncResult)
+        {
+            if (asyncResult == null)
+            {
+                throw new NullReferenceException("asyncResult cannot be null");
+            }
+
+            if (!(asyncResult is USBAsyncResult))
+            {
+                throw new ArgumentException("AsyncResult object was not created by calling one of the BeginControl* methods on this class.");
+            }
+
+            // todo: check duplicate end control
+            USBAsyncResult result = (USBAsyncResult)asyncResult;
+            try
+            {
+                if (!result.IsCompleted)
+                {
+                    result.AsyncWaitHandle.WaitOne();
+                }
+
+                if (result.Error != null)
+                {
+                    throw new USBException("Asynchronous control transfer from pipe has failed.", result.Error);
+                }
+
+                return result.BytesTransfered;
+            }
+            finally
+            {
+                result.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Initiates a control transfer over the default control endpoint. This method allows both IN and OUT direction transfers, depending
+        /// on the highest bit of the <paramref name="requestType"/> parameter). Alternatively, <see cref="ControlIn(byte,byte,int,int,byte[])"/> and
+        /// <see cref="ControlOut(byte,byte,int,int,byte[])"/> can be used for control transfers in a specific direction, which is the recommended way because
+        /// it prevents using the wrong direction accidentally. Use the ControlTransfer method when the direction is not known at compile time.
+        /// </summary>
+        /// <param name="requestType">The setup packet request type.</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="buffer">The data to transfer in the data stage of the control. When the transfer is in the IN direction the data received will be
+        /// written to this buffer. For an OUT direction transfer the contents of the buffer are written sent through the pipe. The length of this
+        /// buffer is used as the number of bytes in the control transfer. The setup packet's length member will be set to this length as well.</param>
+        /// <returns>The number of bytes received from the device.</returns>
+        public int ControlTransfer(byte requestType, byte request, int value, int index, byte[] buffer)
+        {
+            return ControlTransfer(requestType, request, value, index, buffer, buffer.Length);
+        }
+
+        /// <summary>
+        /// Initiates a control transfer without a data stage over the default control endpoint. This method allows both IN and OUT direction transfers, depending
+        /// on the highest bit of the <paramref name="requestType"/> parameter). Alternatively, <see cref="ControlIn(byte,byte,int,int)"/> and
+        /// <see cref="ControlOut(byte,byte,int,int)"/> can be used for control transfers in a specific direction, which is the recommended way because
+        /// it prevents using the wrong direction accidentally. Use the ControlTransfer method when the direction is not known at compile time.
+        /// </summary>
+        /// <param name="requestType">The setup packet request type.</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        public void ControlTransfer(byte requestType, byte request, int value, int index)
+        {
+            // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
+            ControlTransfer(requestType, request, value, index, Array.Empty<byte>(), 0);
+        }
+
+        private void CheckIn(byte requestType)
+        {
+            if ((requestType & 0x80) == 0) // Host to device?
+            {
+                throw new ArgumentException("Request type is not IN.");
+            }
+        }
+
+        private void CheckOut(byte requestType)
+        {
+            if ((requestType & 0x80) == 0x80) // Device to host?
+            {
+                throw new ArgumentException("Request type is not OUT.");
+            }
+        }
+
+        /// <summary>
+        /// Initiates a control transfer over the default control endpoint. The request should have an IN direction (specified by the highest bit
+        /// of the <paramref name="requestType"/> parameter). A buffer to receive the data is automatically created by this method.
+        /// </summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="length">Length of the data to transfer. A buffer will be created with this length and the length member of the setup packet
+        /// will be set to this length.</param>
+        /// <returns>A buffer containing the data transfered.</returns>
+        /// <remarks>This routine initially allocates a buffer to hold the <paramref name="length"/> bytes of data expected from the device.
+        /// If the device responds with less data than expected, this routine will allocate a smaller buffer to copy and return only the bytes actually received.
+        /// </remarks>
+        public byte[] ControlIn(byte requestType, byte request, int value, int index, int length)
+        {
+            CheckIn(requestType);
+            byte[] buffer = new byte[length];
+            int actuallyReceived = ControlTransfer(requestType, request, value, index, buffer, buffer.Length);
+            if (actuallyReceived < length)
+            {
+                byte[] outBuffer = new byte[actuallyReceived];
+                Array.Copy(buffer, 0, outBuffer, 0, actuallyReceived);
+                return outBuffer;
+            }
+            return buffer;
+        }
+
+        /// <summary>
+        /// Initiates a control transfer over the default control endpoint. The request should have an IN direction (specified by the highest bit
+        /// of the <paramref name="requestType"/> parameter).
+        /// </summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="buffer">The buffer that will receive the data transfered.</param>
+        /// <param name="length">Length of the data to transfer. The length member of the setup packet will be set to this length. The buffer specified
+        /// by the <paramref name="buffer"/> parameter should have at least this length.</param>
+        /// <returns>The number of bytes received from the device.</returns>
+        public int ControlIn(byte requestType, byte request, int value, int index, byte[] buffer, int length)
+        {
+            CheckIn(requestType);
+            return ControlTransfer(requestType, request, value, index, buffer, length);
+        }
+
+        /// <summary>
+        /// Initiates a control transfer over the default control endpoint. The request should have an IN direction (specified by the highest bit
+        /// of the <paramref name="requestType"/> parameter). The length of buffer given by the <paramref name="buffer"/> parameter will dictate
+        /// the number of bytes that are transfered and the value of the setup packet's length member.
+        /// </summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="buffer">The buffer that will receive the data transfered. The length of this buffer will be the number of bytes transfered.</param>
+        /// <returns>The number of bytes received from the device.</returns>
+        public int ControlIn(byte requestType, byte request, int value, int index, byte[] buffer)
+        {
+            CheckIn(requestType);
+            return ControlTransfer(requestType, request, value, index, buffer);
+        }
+
+        /// <summary>
+        /// Initiates a control transfer without a data stage over the default control endpoint. The request should have an IN direction (specified by the highest bit
+        /// of the <paramref name="requestType"/> parameter). The setup packets' length member will be set to zero.
+        /// </summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        public void ControlIn(byte requestType, byte request, int value, int index)
+        {
+            CheckIn(requestType);
+            // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
+            ControlTransfer(requestType, request, value, index, Array.Empty<byte>());
+        }
+
+        /// <summary>
+        /// Initiates a control transfer over the default control endpoint. The request should have an OUT direction (specified by the highest bit
+        /// of the <paramref name="requestType"/> parameter).
+        /// </summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the OUT direction (highest bit cleared).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="buffer">A buffer containing the data to transfer in the data stage.</param>
+        /// <param name="length">Length of the data to transfer. Only the first <paramref name="length"/> bytes of <paramref name="buffer"/> will be transfered.
+        /// The setup packet's length parameter is set to this length.</param>
+        public void ControlOut(byte requestType, byte request, int value, int index, byte[] buffer, int length)
+        {
+            CheckOut(requestType);
+            ControlTransfer(requestType, request, value, index, buffer, length);
+        }
+
+        /// <summary>
+        /// Initiates a control transfer over the default control endpoint. The request should have an OUT direction (specified by the highest bit
+        /// of the <paramref name="requestType"/> parameter).
+        /// </summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the OUT direction (highest bit cleared).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="buffer">A buffer containing the data to transfer in the data stage. The complete buffer is transfered. The setup packet's length
+        /// parameter is set to the length of this buffer.</param>
+        public void ControlOut(byte requestType, byte request, int value, int index, byte[] buffer)
+        {
+            CheckOut(requestType);
+            ControlTransfer(requestType, request, value, index, buffer);
+        }
+
+        /// <summary>
+        /// Initiates a control transfer without a data stage over the default control endpoint. The request should have an OUT direction (specified by the highest bit
+        /// of the <paramref name="requestType"/> parameter. The setup packets' length member will be set to zero.
+        /// </summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the OUT direction (highest bit cleared).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        public void ControlOut(byte requestType, byte request, int value, int index)
+        {
+            CheckOut(requestType);
+            // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
+            ControlTransfer(requestType, request, value, index, Array.Empty<byte>());
+        }
+
+        /// <summary>
+        /// Initiates an asynchronous control transfer without a data stage over the default control endpoint. This method allows both IN and OUT direction transfers, depending
+        /// on the highest bit of the <paramref name="requestType"/> parameter. Alternatively, <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> and
+        /// <see cref="BeginControlIn(byte,byte,int,int,byte[],int,AsyncCallback,object)"/> can be used for asynchronous control transfers in a specific direction, which is
+        /// the recommended way because it prevents using the wrong direction accidentally. Use the BeginControlTransfer method when the direction is not
+        /// known at compile time. </summary>
+        /// <param name="requestType">The setup packet request type.</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
+        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
+        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
+        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
+        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
+        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
+        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
+        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
+        /// </remarks>
+        public IAsyncResult BeginControlTransfer(byte requestType, byte request, int value, int index, AsyncCallback userCallback, object stateObject)
+        {
+            // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
+            return BeginControlTransfer(requestType, request, value, index, Array.Empty<byte>(), 0, userCallback, stateObject);
+        }
+
+        /// <summary>
+        /// Initiates an asynchronous control transfer over the default control endpoint.  The request should have an IN direction (specified by the highest bit
+        /// of the <paramref name="requestType"/> parameter).</summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="buffer">The buffer that will receive the data transfered.</param>
+        /// <param name="length">Length of the data to transfer. Must be equal to or less than the length of <paramref name="buffer"/>. The setup packet's length member will be set to this length.</param>
+        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
+        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
+        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
+        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
+        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
+        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
+        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
+        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
+        /// </remarks>
+        public IAsyncResult BeginControlIn(byte requestType, byte request, int value, int index, byte[] buffer, int length, AsyncCallback userCallback, object stateObject)
+        {
+            CheckIn(requestType);
+            return BeginControlTransfer(requestType, request, value, index, buffer, length, userCallback, stateObject);
+        }
+
+        /// <summary>
+        /// Initiates an asynchronous control transfer over the default control endpoint. The request should have an IN direction (specified by the highest bit
+        /// of the <paramref name="requestType"/> parameter).</summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="buffer">The buffer that will receive the data transfered. The setup packet's length member will be set to the length of this buffer.</param>
+        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
+        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
+        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
+        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
+        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
+        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
+        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
+        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
+        /// </remarks>
+        public IAsyncResult BeginControlIn(byte requestType, byte request, int value, int index, byte[] buffer, AsyncCallback userCallback, object stateObject)
+        {
+            CheckIn(requestType);
+            return BeginControlTransfer(requestType, request, value, index, buffer, userCallback, stateObject);
+        }
+
+        /// <summary>
+        /// Initiates an asynchronous control transfer without a data stage over the default control endpoint.
+        /// The request should have an IN direction (specified by the highest bit of the <paramref name="requestType"/> parameter).
+        /// The setup packets' length member will be set to zero.</summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the IN direction (highest bit set).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
+        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
+        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
+        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
+        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
+        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
+        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
+        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
+        /// </remarks>
+        public IAsyncResult BeginControlIn(byte requestType, byte request, int value, int index, AsyncCallback userCallback, object stateObject)
+        {
+            CheckIn(requestType);
+            return BeginControlTransfer(requestType, request, value, index, userCallback, stateObject);
+        }
+
+        /// <summary>
+        /// Initiates an asynchronous control transfer over the default control endpoint.  The request should have an OUT direction (specified by the highest bit
+        /// of the <paramref name="requestType"/> parameter).</summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the OUT direction (highest bit cleared).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="buffer">The buffer that contains the data to be transfered.</param>
+        /// <param name="length">Length of the data to transfer. Must be equal to or less than the length of <paramref name="buffer"/>. The setup packet's length member will be set to this length.</param>
+        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
+        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
+        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
+        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
+        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
+        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
+        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
+        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
+        /// </remarks>
+        public IAsyncResult BeginControlOut(byte requestType, byte request, int value, int index, byte[] buffer, int length, AsyncCallback userCallback, object stateObject)
+        {
+            CheckOut(requestType);
+            return BeginControlTransfer(requestType, request, value, index, buffer, length, userCallback, stateObject);
+        }
+
+        /// <summary>
+        /// Initiates an asynchronous control transfer over the default control endpoint. The request should have an OUT direction (specified by the highest bit
+        /// of the <paramref name="requestType"/> parameter).</summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the OUT direction (highest bit cleared).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="buffer">The buffer that contains the data to be transfered. The setup packet's length member will be set to the length of this buffer.</param>
+        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
+        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
+        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
+        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
+        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
+        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
+        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
+        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
+        /// </remarks>
+        public IAsyncResult BeginControlOut(byte requestType, byte request, int value, int index, byte[] buffer, AsyncCallback userCallback, object stateObject)
+        {
+            CheckOut(requestType);
+            return BeginControlTransfer(requestType, request, value, index, buffer, userCallback, stateObject);
+        }
+
+        /// <summary>
+        /// Initiates an asynchronous control transfer without a data stage over the default control endpoint.
+        /// The request should have an OUT direction (specified by the highest bit of the <paramref name="requestType"/> parameter).
+        /// The setup packets' length member will be set to zero.</summary>
+        /// <param name="requestType">The setup packet request type. The request type must specify the OUT direction (highest bit cleared).</param>
+        /// <param name="request">The setup packet device request.</param>
+        /// <param name="value">The value member in the setup packet. Its meaning depends on the request. Value should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="index">The index member in the setup packet. Its meaning depends on the request. Index should be between zero and 65535 (0xFFFF).</param>
+        /// <param name="userCallback">An optional asynchronous callback, to be called when the control transfer is complete. Can be null if no callback is required.</param>
+        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
+        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous control transfer, which could still be pending.</returns>
+        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
+        /// and must be passed to <see cref="EndControlTransfer"/> to retrieve the result of the operation. For every call to this method a matching call to
+        /// <see cref="EndControlTransfer"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
+        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
+        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
+        /// </remarks>
+        public IAsyncResult BeginControlOut(byte requestType, byte request, int value, int index, AsyncCallback userCallback, object stateObject)
+        {
+            CheckOut(requestType);
+            // TODO: null instead of empty buffer. But overlapped code would have to be fixed for this (no buffer to pin)
+            return BeginControlTransfer(requestType, request, value, index, Array.Empty<byte>(), userCallback, stateObject);
+        }
+
+        private void CheckNotDisposed()
+        {
+            if (_disposed)
+            {
+                throw new ObjectDisposedException("USB device object has been disposed.");
+            }
+        }
+
+        /// <summary>
+        /// Finds WinUSB devices with a GUID matching the parameter guidString
+        /// </summary>
+        /// <param name="guidString">The GUID string that the device should match.
+        /// The format of this string may be any format accepted by the constructor
+        /// of the System.Guid class</param>
+        /// <returns>An array of USBDeviceInfo objects representing the
+        /// devices found. When no devices are found an empty array is
+        /// returned.</returns>
+        public static USBDeviceInfo[] GetDevices(string guidString)
+        {
+            return GetDevices(new Guid(guidString));
+        }
+
+        /// <summary>
+        /// Finds WinUSB devices with a GUID matching the parameter guid
+        /// </summary>
+        /// <param name="guid">The GUID that the device should match.</param>
+        /// <returns>An array of USBDeviceInfo objects representing the
+        /// devices found. When no devices are found an empty array is
+        /// returned.</returns>
+        public static USBDeviceInfo[] GetDevices(Guid guid)
+        {
+            API.DeviceDetails[] detailList = API.DeviceManagement.FindDevicesFromGuid(guid);
+
+            USBDeviceInfo[] devices = new USBDeviceInfo[detailList.Length];
+
+            for (int i = 0; i < detailList.Length; i++)
+            {
+                devices[i] = new USBDeviceInfo(detailList[i]);
+            }
+            return devices;
+        }
+
+        /// <summary>
+        /// Finds the first WinUSB device with a GUID matching the parameter guid.
+        /// If multiple WinUSB devices match the GUID only the first one is returned.
+        /// </summary>
+        /// <param name="guid">The GUID that the device should match.</param>
+        /// <returns>An UsbDevice object representing the device if found. If
+        /// no device with the given GUID could be found null is returned.</returns>
+        public static USBDevice GetSingleDevice(Guid guid)
+        {
+            API.DeviceDetails[] detailList = API.DeviceManagement.FindDevicesFromGuid(guid);
+            if (detailList.Length == 0)
+            {
+                return null;
+            }
+
+            return new USBDevice(detailList[0].DevicePath);
+        }
+
+        /// <summary>
+        /// Finds the first WinUSB device with a GUID matching the parameter guidString.
+        /// If multiple WinUSB devices match the GUID only the first one is returned.
+        /// </summary>
+        /// <param name="guidString">The GUID string that the device should match.</param>
+        /// <returns>An UsbDevice object representing the device if found. If
+        /// no device with the given GUID could be found null is returned.</returns>
+        public static USBDevice GetSingleDevice(string guidString)
+        {
+            return GetSingleDevice(new Guid(guidString));
+        }
+
+        private static USBDeviceDescriptor GetDeviceDescriptor(string devicePath)
+        {
+            try
+            {
+                USBDeviceDescriptor descriptor;
+                using (API.WinUSBDevice wuDevice = new())
+                {
+                    wuDevice.OpenDevice(devicePath);
+                    API.USB_DEVICE_DESCRIPTOR deviceDesc = wuDevice.GetDeviceDescriptor();
+
+                    // Get first supported language ID
+                    ushort[] langIDs = wuDevice.GetSupportedLanguageIDs();
+                    ushort langID = 0;
+                    if (langIDs.Length > 0)
+                    {
+                        langID = langIDs[0];
+                    }
+
+                    string manufacturer = null, product = null, serialNumber = null;
+                    byte idx = 0;
+
+                    try
+                    {
+                        idx = deviceDesc.iManufacturer;
+                        if (idx > 0)
+                        {
+                            manufacturer = wuDevice.GetStringDescriptor(idx, langID);
+                        }
+                    }
+                    catch { }
+
+                    try
+                    {
+                        idx = deviceDesc.iProduct;
+                        if (idx > 0)
+                        {
+                            product = wuDevice.GetStringDescriptor(idx, langID);
+                        }
+                    }
+                    catch { }
+
+                    try
+                    {
+                        idx = deviceDesc.iSerialNumber;
+                        if (idx > 0)
+                        {
+                            serialNumber = wuDevice.GetStringDescriptor(idx, langID);
+                        }
+                    }
+                    catch { }
+
+                    descriptor = new USBDeviceDescriptor(devicePath, deviceDesc, manufacturer, product, serialNumber);
+                }
+                return descriptor;
+            }
+            catch (API.APIException e)
+            {
+                throw new USBException("Failed to retrieve device descriptor.", e);
+            }
+        }
+    }
+}
diff --git a/WinUSBNet/USBDeviceDescriptor.cs b/WPinternals/WinUSBNet/USBDeviceDescriptor.cs
similarity index 96%
rename from WinUSBNet/USBDeviceDescriptor.cs
rename to WPinternals/WinUSBNet/USBDeviceDescriptor.cs
index 99998f2..f4813a4 100644
--- a/WinUSBNet/USBDeviceDescriptor.cs
+++ b/WPinternals/WinUSBNet/USBDeviceDescriptor.cs
@@ -1,132 +1,132 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-using System;
-
-namespace MadWizard.WinUSBNet
-{
-    /// <summary>
-    /// USB device details
-    /// </summary>
-    public class USBDeviceDescriptor
-    {
-        /// <summary>
-        /// Windows path name for the USB device
-        /// </summary>
-        public string PathName { get; }
-
-        /// <summary>
-        /// USB vendor ID (VID) of the device
-        /// </summary>
-        public int VID { get; }
-
-        /// <summary>
-        /// USB product ID (PID) of the device
-        /// </summary>
-        public int PID { get; }
-
-        /// <summary>
-        /// Manufacturer name, or null if not available
-        /// </summary>
-        public string Manufacturer { get; }
-
-        /// <summary>
-        /// Product name, or null if not available
-        /// </summary>
-        public string Product { get; }
-
-        /// <summary>
-        /// Device serial number, or null if not available
-        /// </summary>
-        public string SerialNumber { get; }
-
-        /// <summary>
-        /// Friendly device name, or path name when no
-        /// further device information is available
-        /// </summary>
-        public string FullName
-        {
-            get
-            {
-                if (Manufacturer != null && Product != null)
-                {
-                    return Product + " - " + Manufacturer;
-                }
-                else if (Product != null)
-                {
-                    return Product;
-                }
-                else if (SerialNumber != null)
-                {
-                    return SerialNumber;
-                }
-                else
-                {
-                    return PathName;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Device class code as defined in the interface descriptor
-        /// This property can be used if the class type is not defined
-        /// int the USBBaseClass enumeration
-        /// </summary>
-        public byte ClassValue
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Device subclass code
-        /// </summary>
-        public byte SubClass
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Device protocol code
-        /// </summary>
-        public byte Protocol
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Device class code. If the device class does
-        /// not match any of the USBBaseClass enumeration values
-        /// the value will be USBBaseClass.Unknown
-        /// </summary>
-        public USBBaseClass BaseClass
-        {
-            get;
-        }
-
-        internal USBDeviceDescriptor(string path, API.USB_DEVICE_DESCRIPTOR deviceDesc, string manufacturer, string product, string serialNumber)
-        {
-            PathName = path;
-            VID = deviceDesc.idVendor;
-            PID = deviceDesc.idProduct;
-            Manufacturer = manufacturer;
-            Product = product;
-            SerialNumber = serialNumber;
-
-            ClassValue = deviceDesc.bDeviceClass;
-            SubClass = deviceDesc.bDeviceSubClass;
-            Protocol = deviceDesc.bDeviceProtocol;
-
-            // If interface class is of a known type (USBBaseeClass enum), use this
-            // for the InterfaceClass property.
-            BaseClass = USBBaseClass.Unknown;
-            if (Enum.IsDefined(typeof(USBBaseClass), (int)deviceDesc.bDeviceClass))
-            {
-                BaseClass = (USBBaseClass)deviceDesc.bDeviceClass;
-            }
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+using System;
+
+namespace MadWizard.WinUSBNet
+{
+    /// <summary>
+    /// USB device details
+    /// </summary>
+    public class USBDeviceDescriptor
+    {
+        /// <summary>
+        /// Windows path name for the USB device
+        /// </summary>
+        public string PathName { get; }
+
+        /// <summary>
+        /// USB vendor ID (VID) of the device
+        /// </summary>
+        public int VID { get; }
+
+        /// <summary>
+        /// USB product ID (PID) of the device
+        /// </summary>
+        public int PID { get; }
+
+        /// <summary>
+        /// Manufacturer name, or null if not available
+        /// </summary>
+        public string Manufacturer { get; }
+
+        /// <summary>
+        /// Product name, or null if not available
+        /// </summary>
+        public string Product { get; }
+
+        /// <summary>
+        /// Device serial number, or null if not available
+        /// </summary>
+        public string SerialNumber { get; }
+
+        /// <summary>
+        /// Friendly device name, or path name when no
+        /// further device information is available
+        /// </summary>
+        public string FullName
+        {
+            get
+            {
+                if (Manufacturer != null && Product != null)
+                {
+                    return Product + " - " + Manufacturer;
+                }
+                else if (Product != null)
+                {
+                    return Product;
+                }
+                else if (SerialNumber != null)
+                {
+                    return SerialNumber;
+                }
+                else
+                {
+                    return PathName;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Device class code as defined in the interface descriptor
+        /// This property can be used if the class type is not defined
+        /// int the USBBaseClass enumeration
+        /// </summary>
+        public byte ClassValue
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Device subclass code
+        /// </summary>
+        public byte SubClass
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Device protocol code
+        /// </summary>
+        public byte Protocol
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Device class code. If the device class does
+        /// not match any of the USBBaseClass enumeration values
+        /// the value will be USBBaseClass.Unknown
+        /// </summary>
+        public USBBaseClass BaseClass
+        {
+            get;
+        }
+
+        internal USBDeviceDescriptor(string path, API.USB_DEVICE_DESCRIPTOR deviceDesc, string manufacturer, string product, string serialNumber)
+        {
+            PathName = path;
+            VID = deviceDesc.idVendor;
+            PID = deviceDesc.idProduct;
+            Manufacturer = manufacturer;
+            Product = product;
+            SerialNumber = serialNumber;
+
+            ClassValue = deviceDesc.bDeviceClass;
+            SubClass = deviceDesc.bDeviceSubClass;
+            Protocol = deviceDesc.bDeviceProtocol;
+
+            // If interface class is of a known type (USBBaseeClass enum), use this
+            // for the InterfaceClass property.
+            BaseClass = USBBaseClass.Unknown;
+            if (Enum.IsDefined(typeof(USBBaseClass), (int)deviceDesc.bDeviceClass))
+            {
+                BaseClass = (USBBaseClass)deviceDesc.bDeviceClass;
+            }
+        }
+    }
+}
diff --git a/WinUSBNet/USBDeviceInfo.cs b/WPinternals/WinUSBNet/USBDeviceInfo.cs
similarity index 96%
rename from WinUSBNet/USBDeviceInfo.cs
rename to WPinternals/WinUSBNet/USBDeviceInfo.cs
index 42fe250..f3175d7 100644
--- a/WinUSBNet/USBDeviceInfo.cs
+++ b/WPinternals/WinUSBNet/USBDeviceInfo.cs
@@ -1,91 +1,91 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *  
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-namespace MadWizard.WinUSBNet
-{
-    /// <summary>
-    /// Gives information about a device. This information is retrieved using the setup API, not the
-    /// actual device descriptor. Device description and manufacturer will be the strings specified
-    /// in the .inf file. After a device is opened the actual device descriptor can be read as well.
-    /// </summary>
-    public class USBDeviceInfo
-    {
-        private API.DeviceDetails _details;
-
-        /// <summary>
-        /// Vendor ID (VID) of the USB device
-        /// </summary>
-        public int VID
-        {
-            get
-            {
-                return _details.VID;
-            }
-        }
-
-        /// <summary>
-        /// Product ID (VID) of the USB device
-        /// </summary>
-        public int PID
-        {
-            get
-            {
-                return _details.PID;
-            }
-        }
-
-        /// <summary>
-        /// Manufacturer of the device, as specified in the INF file (not the device descriptor)
-        /// </summary>
-        public string Manufacturer
-        {
-            get
-            {
-                return _details.Manufacturer;
-            }
-        }
-
-        /// <summary>
-        /// Description of the device, as specified in the INF file (not the device descriptor)
-        /// </summary>
-        public string DeviceDescription
-        {
-            get
-            {
-                return _details.DeviceDescription;
-            }
-        }
-
-        /// <summary>
-        /// Device pathname
-        /// </summary>
-        public string DevicePath
-        {
-            get
-            {
-                return _details.DevicePath;
-            }
-        }
-
-        /// <summary>
-        /// BusName
-        /// Heathcliff74
-        /// </summary>
-        public string BusName
-        {
-            get
-            {
-                return _details.BusName;
-            }
-        }
-
-        internal USBDeviceInfo(API.DeviceDetails details)
-        {
-            _details = details;
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *  
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+namespace MadWizard.WinUSBNet
+{
+    /// <summary>
+    /// Gives information about a device. This information is retrieved using the setup API, not the
+    /// actual device descriptor. Device description and manufacturer will be the strings specified
+    /// in the .inf file. After a device is opened the actual device descriptor can be read as well.
+    /// </summary>
+    public class USBDeviceInfo
+    {
+        private API.DeviceDetails _details;
+
+        /// <summary>
+        /// Vendor ID (VID) of the USB device
+        /// </summary>
+        public int VID
+        {
+            get
+            {
+                return _details.VID;
+            }
+        }
+
+        /// <summary>
+        /// Product ID (VID) of the USB device
+        /// </summary>
+        public int PID
+        {
+            get
+            {
+                return _details.PID;
+            }
+        }
+
+        /// <summary>
+        /// Manufacturer of the device, as specified in the INF file (not the device descriptor)
+        /// </summary>
+        public string Manufacturer
+        {
+            get
+            {
+                return _details.Manufacturer;
+            }
+        }
+
+        /// <summary>
+        /// Description of the device, as specified in the INF file (not the device descriptor)
+        /// </summary>
+        public string DeviceDescription
+        {
+            get
+            {
+                return _details.DeviceDescription;
+            }
+        }
+
+        /// <summary>
+        /// Device pathname
+        /// </summary>
+        public string DevicePath
+        {
+            get
+            {
+                return _details.DevicePath;
+            }
+        }
+
+        /// <summary>
+        /// BusName
+        /// Heathcliff74
+        /// </summary>
+        public string BusName
+        {
+            get
+            {
+                return _details.BusName;
+            }
+        }
+
+        internal USBDeviceInfo(API.DeviceDetails details)
+        {
+            _details = details;
+        }
+    }
+}
diff --git a/WinUSBNet/USBException.cs b/WPinternals/WinUSBNet/USBException.cs
similarity index 96%
rename from WinUSBNet/USBException.cs
rename to WPinternals/WinUSBNet/USBException.cs
index 2c9002b..a0f5c89 100644
--- a/WinUSBNet/USBException.cs
+++ b/WPinternals/WinUSBNet/USBException.cs
@@ -1,42 +1,42 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *  
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-using System;
-
-namespace MadWizard.WinUSBNet
-{
-    /// <summary>
-    /// Exception used by WinUSBNet to indicate errors. This is the
-    /// main exception to catch when using the library.
-    /// </summary>
-    public class USBException : Exception
-    {
-        /// <summary>
-        /// Constructs a new USBException with the given message
-        /// </summary>
-        /// <param name="message">The message describing the exception</param>
-        public USBException(string message)
-            : base(message)
-        {
-        }
-
-        /// <summary>
-        /// Constructs a new USBException with the given message and underlying exception
-        /// that caused the USBException.
-        /// </summary>
-        /// <param name="message">The message describing the exception</param>
-        /// <param name="innerException">The underlying exception causing the USBException</param>
-        public USBException(string message, Exception innerException)
-            : base(message, innerException)
-        {
-        }
-
-        public USBException() : base()
-        {
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *  
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+using System;
+
+namespace MadWizard.WinUSBNet
+{
+    /// <summary>
+    /// Exception used by WinUSBNet to indicate errors. This is the
+    /// main exception to catch when using the library.
+    /// </summary>
+    public class USBException : Exception
+    {
+        /// <summary>
+        /// Constructs a new USBException with the given message
+        /// </summary>
+        /// <param name="message">The message describing the exception</param>
+        public USBException(string message)
+            : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Constructs a new USBException with the given message and underlying exception
+        /// that caused the USBException.
+        /// </summary>
+        /// <param name="message">The message describing the exception</param>
+        /// <param name="innerException">The underlying exception causing the USBException</param>
+        public USBException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+
+        public USBException() : base()
+        {
+        }
+    }
+}
diff --git a/WinUSBNet/USBInterface.cs b/WPinternals/WinUSBNet/USBInterface.cs
similarity index 96%
rename from WinUSBNet/USBInterface.cs
rename to WPinternals/WinUSBNet/USBInterface.cs
index 32ade90..d702c13 100644
--- a/WinUSBNet/USBInterface.cs
+++ b/WPinternals/WinUSBNet/USBInterface.cs
@@ -1,144 +1,144 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-using System;
-
-namespace MadWizard.WinUSBNet
-{
-    /// <summary>
-    /// Represents a single USB interface from a USB device
-    /// </summary>
-    public class USBInterface
-    {
-        /// <summary>
-        /// Collection of pipes associated with this interface
-        /// </summary>
-        public USBPipeCollection Pipes
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Interface number from the interface descriptor
-        /// </summary>
-        public int Number
-        {
-            get;
-        }
-
-        /// <summary>
-        /// USB device associated with this interface
-        /// </summary>
-        public USBDevice Device
-        {
-            get;
-        }
-
-        /// <summary>
-        /// First IN direction pipe on this interface
-        /// </summary>
-        public USBPipe InPipe
-        {
-            get;
-        }
-
-        /// <summary>
-        /// First OUT direction pipe on this interface
-        /// </summary>
-        public USBPipe OutPipe
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Interface class code. If the interface class does
-        /// not match any of the USBBaseClass enumeration values
-        /// the value will be USBBaseClass.Unknown
-        /// </summary>
-        public USBBaseClass BaseClass
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Interface class code as defined in the interface descriptor
-        /// This property can be used if the class type is not defined
-        /// int the USBBaseClass enumeration
-        /// </summary>
-        public byte ClassValue
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Interface subclass code
-        /// </summary>
-        public byte SubClass
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Interface protocol code
-        /// </summary>
-        public byte Protocol
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Zero based interface index in WinUSB.
-        /// Note that this is not necessarily the same as the interface *number*
-        /// from the interface descriptor. There might be interfaces within the
-        /// USB device that do not use WinUSB, these are not counted for index.
-        /// </summary>
-        internal int InterfaceIndex
-        {
-            get;
-        }
-
-        internal USBInterface(USBDevice device, int interfaceIndex, API.USB_INTERFACE_DESCRIPTOR rawDesc, USBPipeCollection pipes)
-        {
-            // Set raw class identifiers
-            ClassValue = rawDesc.bInterfaceClass;
-            SubClass = rawDesc.bInterfaceSubClass;
-            Protocol = rawDesc.bInterfaceProtocol;
-
-            Number = rawDesc.bInterfaceNumber;
-            InterfaceIndex = interfaceIndex;
-
-            // If interface class is of a known type (USBBaseClass enum), use this
-            // for the InterfaceClass property.
-            BaseClass = USBBaseClass.Unknown;
-            if (Enum.IsDefined(typeof(USBBaseClass), (int)rawDesc.bInterfaceClass))
-            {
-                BaseClass = (USBBaseClass)rawDesc.bInterfaceClass;
-            }
-
-            Device = device;
-            Pipes = pipes;
-
-            // Handle pipes
-            foreach (USBPipe pipe in pipes)
-            {
-                // Attach pipe to this interface
-                pipe.AttachInterface(this);
-
-                // If first in or out pipe, set InPipe and OutPipe
-                if (pipe.IsIn && InPipe == null)
-                {
-                    InPipe = pipe;
-                }
-
-                if (pipe.IsOut && OutPipe == null)
-                {
-                    OutPipe = pipe;
-                }
-            }
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+using System;
+
+namespace MadWizard.WinUSBNet
+{
+    /// <summary>
+    /// Represents a single USB interface from a USB device
+    /// </summary>
+    public class USBInterface
+    {
+        /// <summary>
+        /// Collection of pipes associated with this interface
+        /// </summary>
+        public USBPipeCollection Pipes
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Interface number from the interface descriptor
+        /// </summary>
+        public int Number
+        {
+            get;
+        }
+
+        /// <summary>
+        /// USB device associated with this interface
+        /// </summary>
+        public USBDevice Device
+        {
+            get;
+        }
+
+        /// <summary>
+        /// First IN direction pipe on this interface
+        /// </summary>
+        public USBPipe InPipe
+        {
+            get;
+        }
+
+        /// <summary>
+        /// First OUT direction pipe on this interface
+        /// </summary>
+        public USBPipe OutPipe
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Interface class code. If the interface class does
+        /// not match any of the USBBaseClass enumeration values
+        /// the value will be USBBaseClass.Unknown
+        /// </summary>
+        public USBBaseClass BaseClass
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Interface class code as defined in the interface descriptor
+        /// This property can be used if the class type is not defined
+        /// int the USBBaseClass enumeration
+        /// </summary>
+        public byte ClassValue
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Interface subclass code
+        /// </summary>
+        public byte SubClass
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Interface protocol code
+        /// </summary>
+        public byte Protocol
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Zero based interface index in WinUSB.
+        /// Note that this is not necessarily the same as the interface *number*
+        /// from the interface descriptor. There might be interfaces within the
+        /// USB device that do not use WinUSB, these are not counted for index.
+        /// </summary>
+        internal int InterfaceIndex
+        {
+            get;
+        }
+
+        internal USBInterface(USBDevice device, int interfaceIndex, API.USB_INTERFACE_DESCRIPTOR rawDesc, USBPipeCollection pipes)
+        {
+            // Set raw class identifiers
+            ClassValue = rawDesc.bInterfaceClass;
+            SubClass = rawDesc.bInterfaceSubClass;
+            Protocol = rawDesc.bInterfaceProtocol;
+
+            Number = rawDesc.bInterfaceNumber;
+            InterfaceIndex = interfaceIndex;
+
+            // If interface class is of a known type (USBBaseClass enum), use this
+            // for the InterfaceClass property.
+            BaseClass = USBBaseClass.Unknown;
+            if (Enum.IsDefined(typeof(USBBaseClass), (int)rawDesc.bInterfaceClass))
+            {
+                BaseClass = (USBBaseClass)rawDesc.bInterfaceClass;
+            }
+
+            Device = device;
+            Pipes = pipes;
+
+            // Handle pipes
+            foreach (USBPipe pipe in pipes)
+            {
+                // Attach pipe to this interface
+                pipe.AttachInterface(this);
+
+                // If first in or out pipe, set InPipe and OutPipe
+                if (pipe.IsIn && InPipe == null)
+                {
+                    InPipe = pipe;
+                }
+
+                if (pipe.IsOut && OutPipe == null)
+                {
+                    OutPipe = pipe;
+                }
+            }
+        }
+    }
+}
diff --git a/WinUSBNet/USBInterfaceCollection.cs b/WPinternals/WinUSBNet/USBInterfaceCollection.cs
similarity index 97%
rename from WinUSBNet/USBInterfaceCollection.cs
rename to WPinternals/WinUSBNet/USBInterfaceCollection.cs
index 356d071..a06e41c 100644
--- a/WinUSBNet/USBInterfaceCollection.cs
+++ b/WPinternals/WinUSBNet/USBInterfaceCollection.cs
@@ -1,163 +1,163 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *  
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace MadWizard.WinUSBNet
-{
-    /// <summary>
-    /// Collection of UsbInterface objects
-    /// </summary>
-    public class USBInterfaceCollection : IEnumerable<USBInterface>
-    {
-        private readonly USBInterface[] _interfaces;
-
-        internal USBInterfaceCollection(USBInterface[] interfaces)
-        {
-            _interfaces = interfaces;
-        }
-
-        private class USBInterfaceEnumerator : IEnumerator<USBInterface>
-        {
-            private int _index;
-            private readonly USBInterface[] _interfaces;
-
-            public USBInterfaceEnumerator(USBInterface[] interfaces)
-            {
-                _interfaces = interfaces;
-                _index = -1;
-            }
-
-            public void Dispose()
-            {
-                // Intentionally empty
-            }
-            private USBInterface GetCurrent()
-            {
-                try
-                {
-                    return _interfaces[_index];
-                }
-                catch (IndexOutOfRangeException)
-                {
-                    throw new InvalidOperationException();
-                }
-            }
-
-            public USBInterface Current
-            {
-                get
-                {
-                    return GetCurrent();
-                }
-            }
-
-            object IEnumerator.Current
-            {
-                get
-                {
-                    return GetCurrent();
-                }
-            }
-
-            public bool MoveNext()
-            {
-                _index++;
-                return _index < _interfaces.Length;
-            }
-
-            public void Reset()
-            {
-                _index = -1;
-            }
-        }
-
-        /// <summary>
-        /// Finds the first interface with that matches the device class
-        /// given by the <paramref name="interfaceClass"/> parameter.
-        /// </summary>
-        /// <param name="interfaceClass">The device class the interface should match</param>
-        /// <returns>The first interface with the given interface class, or null
-        /// if no such interface exists.</returns>
-        public USBInterface Find(USBBaseClass interfaceClass)
-        {
-            for (int i = 0; i < _interfaces.Length; i++)
-            {
-                USBInterface iface = _interfaces[i];
-                if (iface.BaseClass == interfaceClass)
-                {
-                    return iface;
-                }
-            }
-            return null;
-        }
-
-        /// <summary>
-        /// Finds all interfaces matching the device class given by the
-        /// <paramref name="interfaceClass"/> parameter.
-        /// </summary>
-        /// <param name="interfaceClass">The device class the interface should match</param>
-        /// <returns>An array of USBInterface objects matching the device class, or an empty
-        /// array if no interface matches.</returns>
-        public USBInterface[] FindAll(USBBaseClass interfaceClass)
-        {
-            List<USBInterface> matchingInterfaces = new();
-            for (int i = 0; i < _interfaces.Length; i++)
-            {
-                USBInterface iface = _interfaces[i];
-                if (iface.BaseClass == interfaceClass)
-                {
-                    matchingInterfaces.Add(iface);
-                }
-            }
-            return matchingInterfaces.ToArray();
-        }
-
-        /// <summary>
-        /// Returns a typed enumerator that iterates through a collection.
-        /// </summary>
-        /// <returns>The enumerator object that can be used to iterate through the collection.</returns>
-        public IEnumerator<USBInterface> GetEnumerator()
-        {
-            return new USBInterfaceEnumerator(_interfaces);
-        }
-
-        /// <summary>
-        /// Get interface by interface number
-        /// </summary>
-        /// <param name="interfaceNumber">Number of the interface to return. Note: this is the number from the interface descriptor, which
-        /// is not necessarily the same as the interface index.</param>
-        /// <exception cref="IndexOutOfRangeException">Thrown when the given interface number does not exist in the collection.</exception>
-        /// <returns></returns>
-        public USBInterface this[int interfaceNumber]
-        {
-            get
-            {
-                for (int i = 0; i < _interfaces.Length; i++)
-                {
-                    USBInterface iface = _interfaces[i];
-                    if (iface.Number == interfaceNumber)
-                    {
-                        return iface;
-                    }
-                }
-                throw new IndexOutOfRangeException(string.Format("No interface with number {0} exists.", interfaceNumber));
-            }
-        }
-
-        /// <summary>
-        /// Returns an enumerator that iterates through a collection.
-        /// </summary>
-        /// <returns>An IEnumerator object that can be used to iterate through the collection.</returns>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return new USBInterfaceEnumerator(_interfaces);
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *  
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace MadWizard.WinUSBNet
+{
+    /// <summary>
+    /// Collection of UsbInterface objects
+    /// </summary>
+    public class USBInterfaceCollection : IEnumerable<USBInterface>
+    {
+        private readonly USBInterface[] _interfaces;
+
+        internal USBInterfaceCollection(USBInterface[] interfaces)
+        {
+            _interfaces = interfaces;
+        }
+
+        private class USBInterfaceEnumerator : IEnumerator<USBInterface>
+        {
+            private int _index;
+            private readonly USBInterface[] _interfaces;
+
+            public USBInterfaceEnumerator(USBInterface[] interfaces)
+            {
+                _interfaces = interfaces;
+                _index = -1;
+            }
+
+            public void Dispose()
+            {
+                // Intentionally empty
+            }
+            private USBInterface GetCurrent()
+            {
+                try
+                {
+                    return _interfaces[_index];
+                }
+                catch (IndexOutOfRangeException)
+                {
+                    throw new InvalidOperationException();
+                }
+            }
+
+            public USBInterface Current
+            {
+                get
+                {
+                    return GetCurrent();
+                }
+            }
+
+            object IEnumerator.Current
+            {
+                get
+                {
+                    return GetCurrent();
+                }
+            }
+
+            public bool MoveNext()
+            {
+                _index++;
+                return _index < _interfaces.Length;
+            }
+
+            public void Reset()
+            {
+                _index = -1;
+            }
+        }
+
+        /// <summary>
+        /// Finds the first interface with that matches the device class
+        /// given by the <paramref name="interfaceClass"/> parameter.
+        /// </summary>
+        /// <param name="interfaceClass">The device class the interface should match</param>
+        /// <returns>The first interface with the given interface class, or null
+        /// if no such interface exists.</returns>
+        public USBInterface Find(USBBaseClass interfaceClass)
+        {
+            for (int i = 0; i < _interfaces.Length; i++)
+            {
+                USBInterface iface = _interfaces[i];
+                if (iface.BaseClass == interfaceClass)
+                {
+                    return iface;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Finds all interfaces matching the device class given by the
+        /// <paramref name="interfaceClass"/> parameter.
+        /// </summary>
+        /// <param name="interfaceClass">The device class the interface should match</param>
+        /// <returns>An array of USBInterface objects matching the device class, or an empty
+        /// array if no interface matches.</returns>
+        public USBInterface[] FindAll(USBBaseClass interfaceClass)
+        {
+            List<USBInterface> matchingInterfaces = new();
+            for (int i = 0; i < _interfaces.Length; i++)
+            {
+                USBInterface iface = _interfaces[i];
+                if (iface.BaseClass == interfaceClass)
+                {
+                    matchingInterfaces.Add(iface);
+                }
+            }
+            return matchingInterfaces.ToArray();
+        }
+
+        /// <summary>
+        /// Returns a typed enumerator that iterates through a collection.
+        /// </summary>
+        /// <returns>The enumerator object that can be used to iterate through the collection.</returns>
+        public IEnumerator<USBInterface> GetEnumerator()
+        {
+            return new USBInterfaceEnumerator(_interfaces);
+        }
+
+        /// <summary>
+        /// Get interface by interface number
+        /// </summary>
+        /// <param name="interfaceNumber">Number of the interface to return. Note: this is the number from the interface descriptor, which
+        /// is not necessarily the same as the interface index.</param>
+        /// <exception cref="IndexOutOfRangeException">Thrown when the given interface number does not exist in the collection.</exception>
+        /// <returns></returns>
+        public USBInterface this[int interfaceNumber]
+        {
+            get
+            {
+                for (int i = 0; i < _interfaces.Length; i++)
+                {
+                    USBInterface iface = _interfaces[i];
+                    if (iface.Number == interfaceNumber)
+                    {
+                        return iface;
+                    }
+                }
+                throw new IndexOutOfRangeException(string.Format("No interface with number {0} exists.", interfaceNumber));
+            }
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through a collection.
+        /// </summary>
+        /// <returns>An IEnumerator object that can be used to iterate through the collection.</returns>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return new USBInterfaceEnumerator(_interfaces);
+        }
+    }
+}
diff --git a/WinUSBNet/USBNotifier.cs b/WPinternals/WinUSBNet/USBNotifier.cs
similarity index 97%
rename from WinUSBNet/USBNotifier.cs
rename to WPinternals/WinUSBNet/USBNotifier.cs
index a0bbf42..5e0850b 100644
--- a/WinUSBNet/USBNotifier.cs
+++ b/WPinternals/WinUSBNet/USBNotifier.cs
@@ -1,240 +1,240 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-using System;
-
-namespace MadWizard.WinUSBNet
-{
-    /// <summary>
-    /// Delegate for event handler methods handing USB events
-    /// </summary>
-    /// <param name="sender">The source of the event</param>
-    /// <param name="e">Details of the event</param>
-    public delegate void USBEventHandler(object sender, USBEvent e);
-
-    /// <summary>
-    /// Event type enumeration for WinUSB events
-    /// </summary>
-    public enum USBEventType
-    {
-        /// <summary>
-        /// A device has been connected to the system
-        /// </summary>
-        DeviceArrival,
-
-        /// <summary>
-        /// A device has been disconnected from the system
-        /// </summary>
-        DeviceRemoval,
-    }
-
-    /// <summary>
-    /// Contains the details of a USB event
-    /// </summary>
-    public class USBEvent : EventArgs
-    {
-        /// <summary>
-        /// WinUSB interface GUID of the device as specified in the WinUSBNotifier
-        /// </summary>
-        public Guid Guid;
-
-        /// <summary>
-        /// Device pathname that identifies the device
-        /// </summary>
-        public string DevicePath;
-
-        /// <summary>
-        /// Type of event that occurred
-        /// </summary>
-        public USBEventType Type;
-
-        internal USBEvent(USBEventType type, Guid guid, string devicePath)
-        {
-            this.Guid = guid;
-            this.DevicePath = devicePath;
-            this.Type = type;
-        }
-    }
-
-    /// <summary>
-    /// Helper class to receive notifications on USB device changes such as
-    /// connecting or removing a device.
-    /// </summary>
-    public class USBNotifier : IDisposable
-    {
-        private readonly DeviceNotifyHook _hook;
-        private Guid _guid;
-        private readonly WPinternals.AsyncAutoResetEvent NodeChangeEvent = new(false);
-
-        /// <summary>
-        /// Event triggered when a new USB device that matches the USBNotifier's GUID is connected
-        /// </summary>
-        private event EventHandler<USBEvent> _Arrival;
-        public event EventHandler<USBEvent> Arrival
-        {
-            // Heathcliff74 - Also notify currently connected USB devices
-            add
-            {
-                _Arrival -= value;
-                _Arrival += value;
-                foreach (USBDeviceInfo Device in USBDevice.GetDevices(Guid))
-                {
-                    _Arrival(this, new USBEvent(USBEventType.DeviceArrival, Guid, Device.DevicePath));
-                }
-            }
-            remove
-            {
-                _Arrival -= value;
-            }
-        }
-
-        /// <summary>
-        /// Event triggered when a new USB device that matches the USBNotifier's GUID  is disconnected
-        /// </summary>
-        public event EventHandler<USBEvent> Removal;
-
-        /// <summary>
-        /// The interface GUID of devices this USBNotifier will watch
-        /// </summary>
-        public Guid Guid
-        {
-            get
-            {
-                return _guid;
-            }
-        }
-
-        /// <summary>
-        /// Constructs a new USBNotifier that will watch for events on
-        /// devices matching the given interface GUID. A Windows Forms control
-        /// is needed since the notifier relies on window messages.
-        /// </summary>
-        /// <param name="control">A control that will be used internally for device notification messages.
-        /// You can use a Form object for example.</param>
-        /// <param name="guidString">The interface GUID string of the devices to watch.</param>
-        public USBNotifier(string guidString) :
-            this(new Guid(guidString))
-        {
-            // Handled in other constructor
-        }
-
-        /// <summary>
-        /// Constructs a new USBNotifier that will watch for events on
-        /// devices matching the given interface GUID. A Windows Forms control
-        /// is needed since the notifier relies on window messages.
-        /// </summary>
-        /// <param name="control">A control that will be used internally for device notification messages.
-        /// You can use a Form object for example.</param>
-        /// <param name="guid">The interface GUID of the devices to watch.</param>
-        public USBNotifier(Guid guid)
-        {
-            _guid = guid;
-            _hook = new DeviceNotifyHook(this, _guid);
-        }
-
-        /// <summary>
-        /// Triggers the arrival event
-        /// </summary>
-        /// <param name="devicePath">Device pathname of the device that has been connected</param>
-        protected void OnArrival(string devicePath)
-        {
-            _Arrival?.Invoke(this, new USBEvent(USBEventType.DeviceArrival, _guid, devicePath));
-        }
-        /// <summary>
-        /// Triggers the removal event
-        /// </summary>
-        /// <param name="devicePath">Device pathname of the device that has been connected</param>
-        protected void OnRemoval(string devicePath)
-        {
-            Removal?.Invoke(this, new USBEvent(USBEventType.DeviceRemoval, _guid, devicePath));
-        }
-
-        internal int HandleDeviceChange(int msg, IntPtr wParam, IntPtr lParam)
-        {
-            if (msg != API.DeviceManagement.WM_DEVICECHANGE)
-            {
-                throw new USBException("Invalid device change message."); // should not happen
-            }
-
-            //switch ((int)wParam)
-            //{
-            //    case API.DeviceManagement.DBT_DEVICEARRIVAL:
-            //        WPinternals.LogFile.Log(Guid.ToString() + " - DBT_DEVICEARRIVAL", WPinternals.LogType.FileOnly);
-            //        break;
-            //    case API.DeviceManagement.DBT_DEVICEREMOVECOMPLETE:
-            //        WPinternals.LogFile.Log(Guid.ToString() + " - DBT_DEVICEREMOVECOMPLETE", WPinternals.LogType.FileOnly);
-            //        break;
-            //    case API.DeviceManagement.DBT_DEVNODES_CHANGED:
-            //        WPinternals.LogFile.Log(Guid.ToString() + " - DBT_DEVNODES_CHANGED", WPinternals.LogType.FileOnly);
-            //        break;
-            //    case API.DeviceManagement.DBT_QUERYCHANGECONFIG:
-            //        WPinternals.LogFile.Log(Guid.ToString() + " - DBT_QUERYCHANGECONFIG", WPinternals.LogType.FileOnly);
-            //        break;
-            //    default:
-            //        WPinternals.LogFile.Log(Guid.ToString() + " - wParam: 0x" + ((int)wParam).ToString("X8"), WPinternals.LogType.FileOnly);
-            //        break;
-            //}
-
-            if ((int)wParam == API.DeviceManagement.DBT_DEVICEARRIVAL)
-            {
-                string devName = API.DeviceManagement.GetNotifyMessageDeviceName(lParam, _guid);
-                if (devName != null)
-                {
-                    OnArrival(devName);
-                }
-            }
-
-            if ((int)wParam == API.DeviceManagement.DBT_DEVICEREMOVECOMPLETE)
-            {
-                string devName = API.DeviceManagement.GetNotifyMessageDeviceName(lParam, _guid);
-                if (devName != null)
-                {
-                    OnRemoval(devName);
-                }
-            }
-
-            if ((int)wParam == API.DeviceManagement.DBT_DEVNODES_CHANGED)
-            {
-                NodeChangeEvent.Set();
-            }
-
-            if ((int)wParam == API.DeviceManagement.DBT_QUERYCHANGECONFIG)
-            {
-                return 1; // Give permission
-            }
-
-            return 0;
-        }
-
-        public async System.Threading.Tasks.Task WaitForNextNodeChange()
-        {
-            await NodeChangeEvent.WaitAsync(System.Threading.Timeout.InfiniteTimeSpan);
-        }
-
-        /// <summary>
-        /// Disposes the USBNotifier object and frees all resources.
-        /// Call this method when the object is no longer needed.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Disposes the object's resources.
-        /// </summary>
-        /// <param name="disposing">True when dispose is called manually, false when called by the finalizer.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                _hook.Dispose();
-            }
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+using System;
+
+namespace MadWizard.WinUSBNet
+{
+    /// <summary>
+    /// Delegate for event handler methods handing USB events
+    /// </summary>
+    /// <param name="sender">The source of the event</param>
+    /// <param name="e">Details of the event</param>
+    public delegate void USBEventHandler(object sender, USBEvent e);
+
+    /// <summary>
+    /// Event type enumeration for WinUSB events
+    /// </summary>
+    public enum USBEventType
+    {
+        /// <summary>
+        /// A device has been connected to the system
+        /// </summary>
+        DeviceArrival,
+
+        /// <summary>
+        /// A device has been disconnected from the system
+        /// </summary>
+        DeviceRemoval,
+    }
+
+    /// <summary>
+    /// Contains the details of a USB event
+    /// </summary>
+    public class USBEvent : EventArgs
+    {
+        /// <summary>
+        /// WinUSB interface GUID of the device as specified in the WinUSBNotifier
+        /// </summary>
+        public Guid Guid;
+
+        /// <summary>
+        /// Device pathname that identifies the device
+        /// </summary>
+        public string DevicePath;
+
+        /// <summary>
+        /// Type of event that occurred
+        /// </summary>
+        public USBEventType Type;
+
+        internal USBEvent(USBEventType type, Guid guid, string devicePath)
+        {
+            this.Guid = guid;
+            this.DevicePath = devicePath;
+            this.Type = type;
+        }
+    }
+
+    /// <summary>
+    /// Helper class to receive notifications on USB device changes such as
+    /// connecting or removing a device.
+    /// </summary>
+    public class USBNotifier : IDisposable
+    {
+        private readonly DeviceNotifyHook _hook;
+        private Guid _guid;
+        private readonly WPinternals.AsyncAutoResetEvent NodeChangeEvent = new(false);
+
+        /// <summary>
+        /// Event triggered when a new USB device that matches the USBNotifier's GUID is connected
+        /// </summary>
+        private event EventHandler<USBEvent> _Arrival;
+        public event EventHandler<USBEvent> Arrival
+        {
+            // Heathcliff74 - Also notify currently connected USB devices
+            add
+            {
+                _Arrival -= value;
+                _Arrival += value;
+                foreach (USBDeviceInfo Device in USBDevice.GetDevices(Guid))
+                {
+                    _Arrival(this, new USBEvent(USBEventType.DeviceArrival, Guid, Device.DevicePath));
+                }
+            }
+            remove
+            {
+                _Arrival -= value;
+            }
+        }
+
+        /// <summary>
+        /// Event triggered when a new USB device that matches the USBNotifier's GUID  is disconnected
+        /// </summary>
+        public event EventHandler<USBEvent> Removal;
+
+        /// <summary>
+        /// The interface GUID of devices this USBNotifier will watch
+        /// </summary>
+        public Guid Guid
+        {
+            get
+            {
+                return _guid;
+            }
+        }
+
+        /// <summary>
+        /// Constructs a new USBNotifier that will watch for events on
+        /// devices matching the given interface GUID. A Windows Forms control
+        /// is needed since the notifier relies on window messages.
+        /// </summary>
+        /// <param name="control">A control that will be used internally for device notification messages.
+        /// You can use a Form object for example.</param>
+        /// <param name="guidString">The interface GUID string of the devices to watch.</param>
+        public USBNotifier(string guidString) :
+            this(new Guid(guidString))
+        {
+            // Handled in other constructor
+        }
+
+        /// <summary>
+        /// Constructs a new USBNotifier that will watch for events on
+        /// devices matching the given interface GUID. A Windows Forms control
+        /// is needed since the notifier relies on window messages.
+        /// </summary>
+        /// <param name="control">A control that will be used internally for device notification messages.
+        /// You can use a Form object for example.</param>
+        /// <param name="guid">The interface GUID of the devices to watch.</param>
+        public USBNotifier(Guid guid)
+        {
+            _guid = guid;
+            _hook = new DeviceNotifyHook(this, _guid);
+        }
+
+        /// <summary>
+        /// Triggers the arrival event
+        /// </summary>
+        /// <param name="devicePath">Device pathname of the device that has been connected</param>
+        protected void OnArrival(string devicePath)
+        {
+            _Arrival?.Invoke(this, new USBEvent(USBEventType.DeviceArrival, _guid, devicePath));
+        }
+        /// <summary>
+        /// Triggers the removal event
+        /// </summary>
+        /// <param name="devicePath">Device pathname of the device that has been connected</param>
+        protected void OnRemoval(string devicePath)
+        {
+            Removal?.Invoke(this, new USBEvent(USBEventType.DeviceRemoval, _guid, devicePath));
+        }
+
+        internal int HandleDeviceChange(int msg, IntPtr wParam, IntPtr lParam)
+        {
+            if (msg != API.DeviceManagement.WM_DEVICECHANGE)
+            {
+                throw new USBException("Invalid device change message."); // should not happen
+            }
+
+            //switch ((int)wParam)
+            //{
+            //    case API.DeviceManagement.DBT_DEVICEARRIVAL:
+            //        WPinternals.LogFile.Log(Guid.ToString() + " - DBT_DEVICEARRIVAL", WPinternals.LogType.FileOnly);
+            //        break;
+            //    case API.DeviceManagement.DBT_DEVICEREMOVECOMPLETE:
+            //        WPinternals.LogFile.Log(Guid.ToString() + " - DBT_DEVICEREMOVECOMPLETE", WPinternals.LogType.FileOnly);
+            //        break;
+            //    case API.DeviceManagement.DBT_DEVNODES_CHANGED:
+            //        WPinternals.LogFile.Log(Guid.ToString() + " - DBT_DEVNODES_CHANGED", WPinternals.LogType.FileOnly);
+            //        break;
+            //    case API.DeviceManagement.DBT_QUERYCHANGECONFIG:
+            //        WPinternals.LogFile.Log(Guid.ToString() + " - DBT_QUERYCHANGECONFIG", WPinternals.LogType.FileOnly);
+            //        break;
+            //    default:
+            //        WPinternals.LogFile.Log(Guid.ToString() + " - wParam: 0x" + ((int)wParam).ToString("X8"), WPinternals.LogType.FileOnly);
+            //        break;
+            //}
+
+            if ((int)wParam == API.DeviceManagement.DBT_DEVICEARRIVAL)
+            {
+                string devName = API.DeviceManagement.GetNotifyMessageDeviceName(lParam, _guid);
+                if (devName != null)
+                {
+                    OnArrival(devName);
+                }
+            }
+
+            if ((int)wParam == API.DeviceManagement.DBT_DEVICEREMOVECOMPLETE)
+            {
+                string devName = API.DeviceManagement.GetNotifyMessageDeviceName(lParam, _guid);
+                if (devName != null)
+                {
+                    OnRemoval(devName);
+                }
+            }
+
+            if ((int)wParam == API.DeviceManagement.DBT_DEVNODES_CHANGED)
+            {
+                NodeChangeEvent.Set();
+            }
+
+            if ((int)wParam == API.DeviceManagement.DBT_QUERYCHANGECONFIG)
+            {
+                return 1; // Give permission
+            }
+
+            return 0;
+        }
+
+        public async System.Threading.Tasks.Task WaitForNextNodeChange()
+        {
+            await NodeChangeEvent.WaitAsync(System.Threading.Timeout.InfiniteTimeSpan);
+        }
+
+        /// <summary>
+        /// Disposes the USBNotifier object and frees all resources.
+        /// Call this method when the object is no longer needed.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Disposes the object's resources.
+        /// </summary>
+        /// <param name="disposing">True when dispose is called manually, false when called by the finalizer.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                _hook.Dispose();
+            }
+        }
+    }
+}
diff --git a/WinUSBNet/USBPipe.cs b/WPinternals/WinUSBNet/USBPipe.cs
similarity index 97%
rename from WinUSBNet/USBPipe.cs
rename to WPinternals/WinUSBNet/USBPipe.cs
index 2911f12..4bdb08f 100644
--- a/WinUSBNet/USBPipe.cs
+++ b/WPinternals/WinUSBNet/USBPipe.cs
@@ -1,489 +1,489 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-using System;
-
-namespace MadWizard.WinUSBNet
-{
-    /// <summary>
-    /// UsbPipe represents a single pipe on a WinUSB device. A pipe is connected
-    /// to a certain endpoint on the device and has a fixed direction (IN or OUT)
-    /// </summary>
-    public class USBPipe
-    {
-        private API.WINUSB_PIPE_INFORMATION _pipeInfo;
-        private USBInterface _interface = null;
-        private USBPipePolicy _policy;
-
-        private byte[] LastWritten = null;
-
-        /// <summary>
-        /// Endpoint address including the direction in the most significant bit
-        /// </summary>
-        public byte Address
-        {
-            get
-            {
-                return _pipeInfo.PipeId;
-            }
-        }
-
-        /// <summary>
-        /// The USBDevice this pipe is associated with
-        /// </summary>
-        public USBDevice Device { get; }
-
-        /// <summary>
-        /// Maximum packet size for transfers on this endpoint
-        /// </summary>
-        public int MaximumPacketSize
-        {
-            get
-            {
-                return _pipeInfo.MaximumPacketSize;
-            }
-        }
-
-        /// <summary>
-        /// The interface associated with this pipe
-        /// </summary>
-        public USBInterface Interface
-        {
-            get
-            {
-                return _interface;
-            }
-        }
-
-        /// <summary>
-        /// The pipe policy settings for this pipe
-        /// </summary>
-        public USBPipePolicy Policy
-        {
-            get
-            {
-                return _policy;
-            }
-        }
-
-        /// <summary>
-        /// True if the pipe has direction OUT (host to device), false otherwise.
-        /// </summary>
-        public bool IsOut
-        {
-            get
-            {
-                return (_pipeInfo.PipeId & 0x80) == 0;
-            }
-        }
-
-        /// <summary>
-        /// True if the pipe has direction IN (device to host), false otherwise.
-        /// </summary>
-        public bool IsIn
-        {
-            get
-            {
-                return (_pipeInfo.PipeId & 0x80) != 0;
-            }
-        }
-
-        /// <summary>
-        /// Reads data from the pipe into a buffer.
-        /// </summary>
-        /// <param name="buffer">The buffer to read data into. The maximum number of bytes that will be read is specified by the length of the buffer.</param>
-        /// <returns>The number of bytes read from the pipe.</returns>
-        public int Read(byte[] buffer)
-        {
-            return Read(buffer, 0, buffer.Length);
-        }
-
-        /// <summary>
-        /// Reads data from the pipe into a buffer.
-        /// </summary>
-        /// <param name="buffer">The buffer to read data into.</param>
-        /// <param name="offset">The byte offset in <paramref name="buffer"/> from which to begin writing data read from the pipe.</param>
-        /// <param name="length">The maximum number of bytes to read, starting at offset</param>
-        /// <returns>The number of bytes read from the pipe.</returns>
-        public int Read(byte[] buffer, int offset, int length)
-        {
-            CheckReadParams(buffer, offset, length);
-
-            try
-            {
-                Device.InternalDevice.ReadPipe(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length, out uint bytesRead);
-
-                return (int)bytesRead;
-            }
-            catch (API.APIException e)
-            {
-                // throw new USBException("Failed to read from pipe.", e);
-                LogAndThrowException(new USBException("Failed to read from pipe.", e));
-                return 0;
-            }
-        }
-
-        private void CheckReadParams(byte[] buffer, int offset, int length)
-        {
-            if (!IsIn)
-            {
-                // throw new ArgumentOutOfRangeException("Offset of data to read is outside the buffer boundaries.");
-                LogAndThrowException(new ArgumentOutOfRangeException("Offset of data to read is outside the buffer boundaries."));
-            }
-
-            int bufferLength = buffer.Length;
-            if (offset < 0 || offset >= bufferLength)
-            {
-                // throw new ArgumentOutOfRangeException(nameof(offset), "Offset of data to read is outside the buffer boundaries.");
-                LogAndThrowException(new ArgumentOutOfRangeException("Offset of data to read is outside the buffer boundaries."));
-            }
-
-            if (length < 0 || (offset + length) > bufferLength)
-            {
-                // throw new ArgumentOutOfRangeException(nameof(length), "Length of data to read is outside the buffer boundaries.");
-                LogAndThrowException(new ArgumentOutOfRangeException("Length of data to read is outside the buffer boundaries."));
-            }
-        }
-        private void CheckWriteParams(byte[] buffer, int offset, int length)
-        {
-            if (!IsOut)
-            {
-                //throw new NotSupportedException("Cannot write to a pipe with IN direction.");
-                LogAndThrowException(new NotSupportedException("Cannot write to a pipe with IN direction."));
-            }
-
-            int bufferLength = buffer.Length;
-            if (offset < 0 || offset >= bufferLength)
-            {
-                // throw new ArgumentOutOfRangeException(nameof(offset), "Offset of data to write is outside the buffer boundaries.");
-                LogAndThrowException(new ArgumentOutOfRangeException("Offset of data to write is outside the buffer boundaries."));
-            }
-
-            if (length < 0 || (offset + length) > bufferLength)
-            {
-                // throw new ArgumentOutOfRangeException(nameof(length), "Length of data to write is outside the buffer boundaries.");
-                LogAndThrowException(new ArgumentOutOfRangeException("Length of data to write is outside the buffer boundaries."));
-            }
-        }
-
-        /// <summary>Initiates an asynchronous read operation on the pipe. </summary>
-        /// <param name="buffer">Buffer that will receive the data read from the pipe.</param>
-        /// <param name="offset">Byte offset within the buffer at which to begin writing the data received.</param>
-        /// <param name="length">Length of the data to transfer.</param>
-        /// <param name="userCallback">An optional asynchronous callback, to be called when the operation is complete. Can be null if no callback is required.</param>
-        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
-        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous operation, which could still be pending.</returns>
-        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
-        /// and must be passed to <see cref="EndRead"/> to retrieve the result of the operation. For every call to this method a matching call to
-        /// <see cref="EndRead"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
-        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
-        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
-        /// </remarks>
-        public IAsyncResult BeginRead(byte[] buffer, int offset, int length, AsyncCallback userCallback, object stateObject)
-        {
-            CheckReadParams(buffer, offset, length);
-
-            USBAsyncResult result = new(userCallback, stateObject);
-            try
-            {
-                Device.InternalDevice.ReadPipeOverlapped(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length, result);
-            }
-            catch (API.APIException e)
-            {
-                result.Dispose();
-                //throw new USBException("Failed to read from pipe.", e);
-                LogAndThrowException(new USBException("Failed to read from pipe.", e));
-            }
-            catch (Exception e)
-            {
-                result?.Dispose();
-                // throw;
-                LogException(e);
-                throw;
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Waits for a pending asynchronous read operation to complete.
-        /// </summary>
-        /// <param name="asyncResult">The <see cref="IAsyncResult"/> object representing the asynchronous operation,
-        /// as returned by <see cref="BeginRead"/>.</param>
-        /// <returns>The number of bytes transfered during the operation.</returns>
-        /// <remarks>Every call to <see cref="BeginRead"/> must have a matching call to <see cref="EndRead"/> to dispose
-        /// of any resources used and to retrieve the result of the operation. When the operation was successful the method returns the number
-        /// of bytes that were transfered. If an error occurred during the operation this method will throw the exceptions that would
-        /// otherwise have occurred during the operation. If the operation is not yet finished EndWrite will wait for the
-        /// operation to finish before returning.</remarks>
-        public int EndRead(IAsyncResult asyncResult)
-        {
-            if (asyncResult == null)
-            {
-                // throw new NullReferenceException("asyncResult cannot be null");
-                LogAndThrowException(new NullReferenceException("asyncResult cannot be null"));
-            }
-
-            if (!(asyncResult is USBAsyncResult))
-            {
-                // throw new ArgumentException("AsyncResult object was not created by calling BeginRead on this class.");
-                LogAndThrowException(new ArgumentException("AsyncResult object was not created by calling BeginRead on this class."));
-            }
-
-            // todo: check duplicate end reads?
-            USBAsyncResult result = (USBAsyncResult)asyncResult;
-            try
-            {
-                if (!result.IsCompleted)
-                {
-                    result.AsyncWaitHandle.WaitOne();
-                }
-
-                if (result.Error != null)
-                {
-                    // throw new USBException("Asynchronous read from pipe has failed.", result.Error);
-                    LogAndThrowException(new USBException("Asynchronous read from pipe has failed.", result.Error));
-                }
-
-                return result.BytesTransfered;
-            }
-            finally
-            {
-                result.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Writes data from a buffer to the pipe.
-        /// </summary>
-        /// <param name="buffer">The buffer to write data from. The complete buffer will be written to the device.</param>
-        public void Write(byte[] buffer)
-        {
-            Write(buffer, 0, buffer.Length);
-        }
-
-        /// <summary>
-        /// Writes data from a buffer to the pipe.
-        /// </summary>
-        /// <param name="buffer">The buffer to write data from.</param>
-        /// <param name="offset">The byte offset in <paramref name="buffer"/> from which to begin writing.</param>
-        /// <param name="length">The number of bytes to write, starting at offset</param>
-        public void Write(byte[] buffer, int offset, int length)
-        {
-            CheckWriteParams(buffer, offset, length);
-
-            LogLastWrite(buffer, offset, length);
-
-            try
-            {
-                Device.InternalDevice.WritePipe(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length);
-            }
-            catch (API.APIException e)
-            {
-                byte[] SubBuffer = new byte[length < 16 ? length : 16];
-                Array.Copy(buffer, offset, SubBuffer, 0, length < 16 ? length : 16);
-                // throw new USBException("Failed to write to pipe: " + WPinternals.Converter.ConvertHexToString(SubBuffer, ""), e);
-                LogAndThrowException(new USBException("Failed to write to pipe: " + WPinternals.Converter.ConvertHexToString(SubBuffer, ""), e));
-            }
-        }
-
-        /// <summary>Initiates an asynchronous write operation on the pipe. </summary>
-        /// <param name="buffer">Buffer that contains the data to write to the pipe.</param>
-        /// <param name="offset">Byte offset within the buffer from which to begin writing.</param>
-        /// <param name="length">Length of the data to transfer.</param>
-        /// <param name="userCallback">An optional asynchronous callback, to be called when the operation is complete. Can be null if no callback is required.</param>
-        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
-        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous operation, which could still be pending.</returns>
-        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
-        /// and must be passed to <see cref="EndWrite"/> to retrieve the result of the operation. For every call to this method a matching call to
-        /// <see cref="EndWrite"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
-        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
-        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
-        /// </remarks>
-        public IAsyncResult BeginWrite(byte[] buffer, int offset, int length, AsyncCallback userCallback, object stateObject)
-        {
-            CheckWriteParams(buffer, offset, length);
-
-            LogLastWrite(buffer, offset, length);
-
-            USBAsyncResult result = new(userCallback, stateObject);
-            try
-            {
-                Device.InternalDevice.WriteOverlapped(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length, result);
-            }
-            catch (API.APIException e)
-            {
-                result?.Dispose();
-
-                byte[] SubBuffer = new byte[length < 16 ? length : 16];
-                Array.Copy(buffer, offset, SubBuffer, 0, length < 16 ? length : 16);
-                // throw new USBException("Failed to write to pipe: " + WPinternals.Converter.ConvertHexToString(SubBuffer, ""), e);
-                LogAndThrowException(new USBException("Failed to write to pipe: " + WPinternals.Converter.ConvertHexToString(SubBuffer, ""), e));
-            }
-            catch (Exception e)
-            {
-                result?.Dispose();
-                // throw;
-                LogException(e);
-                throw;
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// Waits for a pending asynchronous write operation to complete.
-        /// </summary>
-        /// <param name="asyncResult">The <see cref="IAsyncResult"/> object representing the asynchronous operation,
-        /// as returned by <see cref="BeginWrite"/>.</param>
-        /// <returns>The number of bytes transfered during the operation.</returns>
-        /// <remarks>Every call to <see cref="BeginWrite"/> must have a matching call to <see cref="EndWrite"/> to dispose
-        /// of any resources used and to retrieve the result of the operation. When the operation was successful the method returns the number
-        /// of bytes that were transfered. If an error occurred during the operation this method will throw the exceptions that would
-        /// otherwise have occurred during the operation. If the operation is not yet finished EndWrite will wait for the
-        /// operation to finish before returning.</remarks>
-        public void EndWrite(IAsyncResult asyncResult)
-        {
-            if (asyncResult == null)
-            {
-                // throw new NullReferenceException("asyncResult cannot be null");
-                LogAndThrowException(new NullReferenceException("asyncResult cannot be null"));
-            }
-
-            if (!(asyncResult is USBAsyncResult))
-            {
-                // throw new ArgumentException("AsyncResult object was not created by calling BeginWrite on this class.");
-                LogAndThrowException(new ArgumentException("AsyncResult object was not created by calling BeginWrite on this class."));
-            }
-
-            USBAsyncResult result = (USBAsyncResult)asyncResult;
-            try
-            {
-                // todo: check duplicate end writes?
-
-                if (!result.IsCompleted)
-                {
-                    result.AsyncWaitHandle.WaitOne();
-                }
-
-                if (result.Error != null)
-                {
-                    // throw new USBException("Asynchronous write to pipe has failed.", result.Error);
-                    LogAndThrowException(new USBException("Asynchronous write to pipe has failed.", result.Error));
-                }
-            }
-            finally
-            {
-                result.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Aborts all pending transfers for this pipe.
-        /// </summary>
-        public void Abort()
-        {
-            try
-            {
-                Device.InternalDevice.AbortPipe(Interface.InterfaceIndex, _pipeInfo.PipeId);
-            }
-            catch (API.APIException e)
-            {
-                // throw new USBException("Failed to abort pipe.", e);
-                LogAndThrowException(new USBException("Failed to abort pipe.", e));
-            }
-        }
-
-        /// <summary>
-        /// Resets all pending transfers for this pipe.
-        /// </summary>
-        public void Reset()
-        {
-            try
-            {
-                Device.InternalDevice.ResetPipe(Interface.InterfaceIndex, _pipeInfo.PipeId);
-            }
-            catch (API.APIException e)
-            {
-                // throw new USBException("Failed to reset pipe.", e);
-                LogAndThrowException(new USBException("Failed to reset pipe.", e));
-            }
-        }
-
-        /// <summary>
-        /// Flushes the pipe, discarding any data that is cached. Only available on IN direction pipes.
-        /// </summary>
-        public void Flush()
-        {
-            if (!IsIn)
-            {
-                throw new NotSupportedException("Flush is only supported on IN direction pipes");
-            }
-
-            try
-            {
-                Device.InternalDevice.FlushPipe(Interface.InterfaceIndex, _pipeInfo.PipeId);
-            }
-            catch (API.APIException e)
-            {
-                // throw new USBException("Failed to flush pipe.", e);
-                LogAndThrowException(new USBException("Failed to flush pipe.", e));
-            }
-        }
-
-        internal USBPipe(USBDevice device, API.WINUSB_PIPE_INFORMATION pipeInfo)
-        {
-            _pipeInfo = pipeInfo;
-            Device = device;
-
-            // Policy is not set until interface is attached
-            _policy = null;
-        }
-
-        internal void AttachInterface(USBInterface usbInterface)
-        {
-            _interface = usbInterface;
-
-            // Initialize policy now that interface is set (policy requires interface)
-            _policy = new USBPipePolicy(Device, _interface.InterfaceIndex, _pipeInfo.PipeId);
-        }
-
-        private void LogException(Exception Ex)
-        {
-            WPinternals.LogFile.Log("Error on USB port!", WPinternals.LogType.FileOnly);
-            WPinternals.LogFile.Log("Device: " + Device.Descriptor.FullName, WPinternals.LogType.FileOnly);
-
-            if (IsIn)
-            {
-                LastWritten = Device.OutputPipe.LastWritten;
-            }
-
-            if ((LastWritten == null) && (Ex is USBException) && (Ex.InnerException is API.APIException) &&
-                (((API.APIException)Ex.InnerException).InnerException is System.ComponentModel.Win32Exception) &&
-                (((System.ComponentModel.Win32Exception)Ex.InnerException.InnerException).NativeErrorCode == 0X1F))
-            {
-                WPinternals.LogFile.Log("Failed to communicate on new USB connection", WPinternals.LogType.FileAndConsole);
-            }
-
-            if (LastWritten != null)
-            {
-                WPinternals.LogFile.Log("Last written: " + WPinternals.Converter.ConvertHexToString(LastWritten, ""), WPinternals.LogType.FileOnly);
-            }
-
-            WPinternals.LogFile.LogException(Ex, WPinternals.LogType.FileOnly);
-        }
-
-        private void LogAndThrowException(Exception Ex)
-        {
-            LogException(Ex);
-            throw Ex;
-        }
-        private void LogLastWrite(byte[] Buffer, int Offset, int Length)
-        {
-            LastWritten = new byte[Length < 0x10 ? Length : 0x10];
-            System.Buffer.BlockCopy(Buffer, Offset, LastWritten, 0, LastWritten.Length);
-        }
-    }
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+using System;
+
+namespace MadWizard.WinUSBNet
+{
+    /// <summary>
+    /// UsbPipe represents a single pipe on a WinUSB device. A pipe is connected
+    /// to a certain endpoint on the device and has a fixed direction (IN or OUT)
+    /// </summary>
+    public class USBPipe
+    {
+        private API.WINUSB_PIPE_INFORMATION _pipeInfo;
+        private USBInterface _interface = null;
+        private USBPipePolicy _policy;
+
+        private byte[] LastWritten = null;
+
+        /// <summary>
+        /// Endpoint address including the direction in the most significant bit
+        /// </summary>
+        public byte Address
+        {
+            get
+            {
+                return _pipeInfo.PipeId;
+            }
+        }
+
+        /// <summary>
+        /// The USBDevice this pipe is associated with
+        /// </summary>
+        public USBDevice Device { get; }
+
+        /// <summary>
+        /// Maximum packet size for transfers on this endpoint
+        /// </summary>
+        public int MaximumPacketSize
+        {
+            get
+            {
+                return _pipeInfo.MaximumPacketSize;
+            }
+        }
+
+        /// <summary>
+        /// The interface associated with this pipe
+        /// </summary>
+        public USBInterface Interface
+        {
+            get
+            {
+                return _interface;
+            }
+        }
+
+        /// <summary>
+        /// The pipe policy settings for this pipe
+        /// </summary>
+        public USBPipePolicy Policy
+        {
+            get
+            {
+                return _policy;
+            }
+        }
+
+        /// <summary>
+        /// True if the pipe has direction OUT (host to device), false otherwise.
+        /// </summary>
+        public bool IsOut
+        {
+            get
+            {
+                return (_pipeInfo.PipeId & 0x80) == 0;
+            }
+        }
+
+        /// <summary>
+        /// True if the pipe has direction IN (device to host), false otherwise.
+        /// </summary>
+        public bool IsIn
+        {
+            get
+            {
+                return (_pipeInfo.PipeId & 0x80) != 0;
+            }
+        }
+
+        /// <summary>
+        /// Reads data from the pipe into a buffer.
+        /// </summary>
+        /// <param name="buffer">The buffer to read data into. The maximum number of bytes that will be read is specified by the length of the buffer.</param>
+        /// <returns>The number of bytes read from the pipe.</returns>
+        public int Read(byte[] buffer)
+        {
+            return Read(buffer, 0, buffer.Length);
+        }
+
+        /// <summary>
+        /// Reads data from the pipe into a buffer.
+        /// </summary>
+        /// <param name="buffer">The buffer to read data into.</param>
+        /// <param name="offset">The byte offset in <paramref name="buffer"/> from which to begin writing data read from the pipe.</param>
+        /// <param name="length">The maximum number of bytes to read, starting at offset</param>
+        /// <returns>The number of bytes read from the pipe.</returns>
+        public int Read(byte[] buffer, int offset, int length)
+        {
+            CheckReadParams(buffer, offset, length);
+
+            try
+            {
+                Device.InternalDevice.ReadPipe(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length, out uint bytesRead);
+
+                return (int)bytesRead;
+            }
+            catch (API.APIException e)
+            {
+                // throw new USBException("Failed to read from pipe.", e);
+                LogAndThrowException(new USBException("Failed to read from pipe.", e));
+                return 0;
+            }
+        }
+
+        private void CheckReadParams(byte[] buffer, int offset, int length)
+        {
+            if (!IsIn)
+            {
+                // throw new ArgumentOutOfRangeException("Offset of data to read is outside the buffer boundaries.");
+                LogAndThrowException(new ArgumentOutOfRangeException("Offset of data to read is outside the buffer boundaries."));
+            }
+
+            int bufferLength = buffer.Length;
+            if (offset < 0 || offset >= bufferLength)
+            {
+                // throw new ArgumentOutOfRangeException(nameof(offset), "Offset of data to read is outside the buffer boundaries.");
+                LogAndThrowException(new ArgumentOutOfRangeException("Offset of data to read is outside the buffer boundaries."));
+            }
+
+            if (length < 0 || (offset + length) > bufferLength)
+            {
+                // throw new ArgumentOutOfRangeException(nameof(length), "Length of data to read is outside the buffer boundaries.");
+                LogAndThrowException(new ArgumentOutOfRangeException("Length of data to read is outside the buffer boundaries."));
+            }
+        }
+        private void CheckWriteParams(byte[] buffer, int offset, int length)
+        {
+            if (!IsOut)
+            {
+                //throw new NotSupportedException("Cannot write to a pipe with IN direction.");
+                LogAndThrowException(new NotSupportedException("Cannot write to a pipe with IN direction."));
+            }
+
+            int bufferLength = buffer.Length;
+            if (offset < 0 || offset >= bufferLength)
+            {
+                // throw new ArgumentOutOfRangeException(nameof(offset), "Offset of data to write is outside the buffer boundaries.");
+                LogAndThrowException(new ArgumentOutOfRangeException("Offset of data to write is outside the buffer boundaries."));
+            }
+
+            if (length < 0 || (offset + length) > bufferLength)
+            {
+                // throw new ArgumentOutOfRangeException(nameof(length), "Length of data to write is outside the buffer boundaries.");
+                LogAndThrowException(new ArgumentOutOfRangeException("Length of data to write is outside the buffer boundaries."));
+            }
+        }
+
+        /// <summary>Initiates an asynchronous read operation on the pipe. </summary>
+        /// <param name="buffer">Buffer that will receive the data read from the pipe.</param>
+        /// <param name="offset">Byte offset within the buffer at which to begin writing the data received.</param>
+        /// <param name="length">Length of the data to transfer.</param>
+        /// <param name="userCallback">An optional asynchronous callback, to be called when the operation is complete. Can be null if no callback is required.</param>
+        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
+        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous operation, which could still be pending.</returns>
+        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
+        /// and must be passed to <see cref="EndRead"/> to retrieve the result of the operation. For every call to this method a matching call to
+        /// <see cref="EndRead"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
+        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
+        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
+        /// </remarks>
+        public IAsyncResult BeginRead(byte[] buffer, int offset, int length, AsyncCallback userCallback, object stateObject)
+        {
+            CheckReadParams(buffer, offset, length);
+
+            USBAsyncResult result = new(userCallback, stateObject);
+            try
+            {
+                Device.InternalDevice.ReadPipeOverlapped(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length, result);
+            }
+            catch (API.APIException e)
+            {
+                result.Dispose();
+                //throw new USBException("Failed to read from pipe.", e);
+                LogAndThrowException(new USBException("Failed to read from pipe.", e));
+            }
+            catch (Exception e)
+            {
+                result?.Dispose();
+                // throw;
+                LogException(e);
+                throw;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Waits for a pending asynchronous read operation to complete.
+        /// </summary>
+        /// <param name="asyncResult">The <see cref="IAsyncResult"/> object representing the asynchronous operation,
+        /// as returned by <see cref="BeginRead"/>.</param>
+        /// <returns>The number of bytes transfered during the operation.</returns>
+        /// <remarks>Every call to <see cref="BeginRead"/> must have a matching call to <see cref="EndRead"/> to dispose
+        /// of any resources used and to retrieve the result of the operation. When the operation was successful the method returns the number
+        /// of bytes that were transfered. If an error occurred during the operation this method will throw the exceptions that would
+        /// otherwise have occurred during the operation. If the operation is not yet finished EndWrite will wait for the
+        /// operation to finish before returning.</remarks>
+        public int EndRead(IAsyncResult asyncResult)
+        {
+            if (asyncResult == null)
+            {
+                // throw new NullReferenceException("asyncResult cannot be null");
+                LogAndThrowException(new NullReferenceException("asyncResult cannot be null"));
+            }
+
+            if (!(asyncResult is USBAsyncResult))
+            {
+                // throw new ArgumentException("AsyncResult object was not created by calling BeginRead on this class.");
+                LogAndThrowException(new ArgumentException("AsyncResult object was not created by calling BeginRead on this class."));
+            }
+
+            // todo: check duplicate end reads?
+            USBAsyncResult result = (USBAsyncResult)asyncResult;
+            try
+            {
+                if (!result.IsCompleted)
+                {
+                    result.AsyncWaitHandle.WaitOne();
+                }
+
+                if (result.Error != null)
+                {
+                    // throw new USBException("Asynchronous read from pipe has failed.", result.Error);
+                    LogAndThrowException(new USBException("Asynchronous read from pipe has failed.", result.Error));
+                }
+
+                return result.BytesTransfered;
+            }
+            finally
+            {
+                result.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Writes data from a buffer to the pipe.
+        /// </summary>
+        /// <param name="buffer">The buffer to write data from. The complete buffer will be written to the device.</param>
+        public void Write(byte[] buffer)
+        {
+            Write(buffer, 0, buffer.Length);
+        }
+
+        /// <summary>
+        /// Writes data from a buffer to the pipe.
+        /// </summary>
+        /// <param name="buffer">The buffer to write data from.</param>
+        /// <param name="offset">The byte offset in <paramref name="buffer"/> from which to begin writing.</param>
+        /// <param name="length">The number of bytes to write, starting at offset</param>
+        public void Write(byte[] buffer, int offset, int length)
+        {
+            CheckWriteParams(buffer, offset, length);
+
+            LogLastWrite(buffer, offset, length);
+
+            try
+            {
+                Device.InternalDevice.WritePipe(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length);
+            }
+            catch (API.APIException e)
+            {
+                byte[] SubBuffer = new byte[length < 16 ? length : 16];
+                Array.Copy(buffer, offset, SubBuffer, 0, length < 16 ? length : 16);
+                // throw new USBException("Failed to write to pipe: " + WPinternals.Converter.ConvertHexToString(SubBuffer, ""), e);
+                LogAndThrowException(new USBException("Failed to write to pipe: " + WPinternals.Converter.ConvertHexToString(SubBuffer, ""), e));
+            }
+        }
+
+        /// <summary>Initiates an asynchronous write operation on the pipe. </summary>
+        /// <param name="buffer">Buffer that contains the data to write to the pipe.</param>
+        /// <param name="offset">Byte offset within the buffer from which to begin writing.</param>
+        /// <param name="length">Length of the data to transfer.</param>
+        /// <param name="userCallback">An optional asynchronous callback, to be called when the operation is complete. Can be null if no callback is required.</param>
+        /// <param name="stateObject">A user-provided object that distinguishes this particular asynchronous operation. Can be null if not required.</param>
+        /// <returns>An <see cref="IAsyncResult"/> object representing the asynchronous operation, which could still be pending.</returns>
+        /// <remarks>This method always completes immediately even if the operation is still pending. The <see cref="IAsyncResult"/> object returned represents the operation
+        /// and must be passed to <see cref="EndWrite"/> to retrieve the result of the operation. For every call to this method a matching call to
+        /// <see cref="EndWrite"/> must be made. When <paramref name="userCallback"/> specifies a callback function, this function will be called when the operation is completed. The optional
+        /// <paramref name="stateObject"/> parameter can be used to pass user-defined information to this callback or the <see cref="IAsyncResult"/>. The <see cref="IAsyncResult"/>
+        /// also provides an event handle (<see cref="IAsyncResult.AsyncWaitHandle" />) that will be triggered when the operation is complete as well.
+        /// </remarks>
+        public IAsyncResult BeginWrite(byte[] buffer, int offset, int length, AsyncCallback userCallback, object stateObject)
+        {
+            CheckWriteParams(buffer, offset, length);
+
+            LogLastWrite(buffer, offset, length);
+
+            USBAsyncResult result = new(userCallback, stateObject);
+            try
+            {
+                Device.InternalDevice.WriteOverlapped(Interface.InterfaceIndex, _pipeInfo.PipeId, buffer, offset, length, result);
+            }
+            catch (API.APIException e)
+            {
+                result?.Dispose();
+
+                byte[] SubBuffer = new byte[length < 16 ? length : 16];
+                Array.Copy(buffer, offset, SubBuffer, 0, length < 16 ? length : 16);
+                // throw new USBException("Failed to write to pipe: " + WPinternals.Converter.ConvertHexToString(SubBuffer, ""), e);
+                LogAndThrowException(new USBException("Failed to write to pipe: " + WPinternals.Converter.ConvertHexToString(SubBuffer, ""), e));
+            }
+            catch (Exception e)
+            {
+                result?.Dispose();
+                // throw;
+                LogException(e);
+                throw;
+            }
+            return result;
+        }
+
+        /// <summary>
+        /// Waits for a pending asynchronous write operation to complete.
+        /// </summary>
+        /// <param name="asyncResult">The <see cref="IAsyncResult"/> object representing the asynchronous operation,
+        /// as returned by <see cref="BeginWrite"/>.</param>
+        /// <returns>The number of bytes transfered during the operation.</returns>
+        /// <remarks>Every call to <see cref="BeginWrite"/> must have a matching call to <see cref="EndWrite"/> to dispose
+        /// of any resources used and to retrieve the result of the operation. When the operation was successful the method returns the number
+        /// of bytes that were transfered. If an error occurred during the operation this method will throw the exceptions that would
+        /// otherwise have occurred during the operation. If the operation is not yet finished EndWrite will wait for the
+        /// operation to finish before returning.</remarks>
+        public void EndWrite(IAsyncResult asyncResult)
+        {
+            if (asyncResult == null)
+            {
+                // throw new NullReferenceException("asyncResult cannot be null");
+                LogAndThrowException(new NullReferenceException("asyncResult cannot be null"));
+            }
+
+            if (!(asyncResult is USBAsyncResult))
+            {
+                // throw new ArgumentException("AsyncResult object was not created by calling BeginWrite on this class.");
+                LogAndThrowException(new ArgumentException("AsyncResult object was not created by calling BeginWrite on this class."));
+            }
+
+            USBAsyncResult result = (USBAsyncResult)asyncResult;
+            try
+            {
+                // todo: check duplicate end writes?
+
+                if (!result.IsCompleted)
+                {
+                    result.AsyncWaitHandle.WaitOne();
+                }
+
+                if (result.Error != null)
+                {
+                    // throw new USBException("Asynchronous write to pipe has failed.", result.Error);
+                    LogAndThrowException(new USBException("Asynchronous write to pipe has failed.", result.Error));
+                }
+            }
+            finally
+            {
+                result.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Aborts all pending transfers for this pipe.
+        /// </summary>
+        public void Abort()
+        {
+            try
+            {
+                Device.InternalDevice.AbortPipe(Interface.InterfaceIndex, _pipeInfo.PipeId);
+            }
+            catch (API.APIException e)
+            {
+                // throw new USBException("Failed to abort pipe.", e);
+                LogAndThrowException(new USBException("Failed to abort pipe.", e));
+            }
+        }
+
+        /// <summary>
+        /// Resets all pending transfers for this pipe.
+        /// </summary>
+        public void Reset()
+        {
+            try
+            {
+                Device.InternalDevice.ResetPipe(Interface.InterfaceIndex, _pipeInfo.PipeId);
+            }
+            catch (API.APIException e)
+            {
+                // throw new USBException("Failed to reset pipe.", e);
+                LogAndThrowException(new USBException("Failed to reset pipe.", e));
+            }
+        }
+
+        /// <summary>
+        /// Flushes the pipe, discarding any data that is cached. Only available on IN direction pipes.
+        /// </summary>
+        public void Flush()
+        {
+            if (!IsIn)
+            {
+                throw new NotSupportedException("Flush is only supported on IN direction pipes");
+            }
+
+            try
+            {
+                Device.InternalDevice.FlushPipe(Interface.InterfaceIndex, _pipeInfo.PipeId);
+            }
+            catch (API.APIException e)
+            {
+                // throw new USBException("Failed to flush pipe.", e);
+                LogAndThrowException(new USBException("Failed to flush pipe.", e));
+            }
+        }
+
+        internal USBPipe(USBDevice device, API.WINUSB_PIPE_INFORMATION pipeInfo)
+        {
+            _pipeInfo = pipeInfo;
+            Device = device;
+
+            // Policy is not set until interface is attached
+            _policy = null;
+        }
+
+        internal void AttachInterface(USBInterface usbInterface)
+        {
+            _interface = usbInterface;
+
+            // Initialize policy now that interface is set (policy requires interface)
+            _policy = new USBPipePolicy(Device, _interface.InterfaceIndex, _pipeInfo.PipeId);
+        }
+
+        private void LogException(Exception Ex)
+        {
+            WPinternals.LogFile.Log("Error on USB port!", WPinternals.LogType.FileOnly);
+            WPinternals.LogFile.Log("Device: " + Device.Descriptor.FullName, WPinternals.LogType.FileOnly);
+
+            if (IsIn)
+            {
+                LastWritten = Device.OutputPipe.LastWritten;
+            }
+
+            if ((LastWritten == null) && (Ex is USBException) && (Ex.InnerException is API.APIException) &&
+                (((API.APIException)Ex.InnerException).InnerException is System.ComponentModel.Win32Exception) &&
+                (((System.ComponentModel.Win32Exception)Ex.InnerException.InnerException).NativeErrorCode == 0X1F))
+            {
+                WPinternals.LogFile.Log("Failed to communicate on new USB connection", WPinternals.LogType.FileAndConsole);
+            }
+
+            if (LastWritten != null)
+            {
+                WPinternals.LogFile.Log("Last written: " + WPinternals.Converter.ConvertHexToString(LastWritten, ""), WPinternals.LogType.FileOnly);
+            }
+
+            WPinternals.LogFile.LogException(Ex, WPinternals.LogType.FileOnly);
+        }
+
+        private void LogAndThrowException(Exception Ex)
+        {
+            LogException(Ex);
+            throw Ex;
+        }
+        private void LogLastWrite(byte[] Buffer, int Offset, int Length)
+        {
+            LastWritten = new byte[Length < 0x10 ? Length : 0x10];
+            System.Buffer.BlockCopy(Buffer, Offset, LastWritten, 0, LastWritten.Length);
+        }
+    }
 }
\ No newline at end of file
diff --git a/WinUSBNet/USBPipeCollection.cs b/WPinternals/WinUSBNet/USBPipeCollection.cs
similarity index 96%
rename from WinUSBNet/USBPipeCollection.cs
rename to WPinternals/WinUSBNet/USBPipeCollection.cs
index ec5f832..8b0534d 100644
--- a/WinUSBNet/USBPipeCollection.cs
+++ b/WPinternals/WinUSBNet/USBPipeCollection.cs
@@ -1,136 +1,136 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *  
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-namespace MadWizard.WinUSBNet
-{
-    /// <summary>
-    /// Collection of UsbPipe objects
-    /// </summary>
-    public class USBPipeCollection : IEnumerable<USBPipe>
-    {
-        private readonly Dictionary<byte, USBPipe> _pipes;
-
-        internal USBPipeCollection(USBPipe[] pipes)
-        {
-            _pipes = new Dictionary<byte, USBPipe>(pipes.Length);
-            foreach (USBPipe pipe in pipes)
-            {
-                if (_pipes.ContainsKey(pipe.Address))
-                {
-                    throw new USBException("Duplicate pipe address in endpoint.");
-                }
-
-                _pipes[pipe.Address] = pipe;
-            }
-        }
-
-        /// <summary>
-        /// Returns the pipe from the collection with the given pipe address
-        /// </summary>
-        /// <param name="pipeAddress">Address of the pipe to return</param>
-        /// <returns>The pipe with the given pipe address</returns>
-        /// <exception cref="IndexOutOfRangeException">Thrown if no pipe with the specified address
-        /// is available in the collection.</exception>
-        public USBPipe this[byte pipeAddress]
-        {
-            get
-            {
-                if (!_pipes.TryGetValue(pipeAddress, out USBPipe pipe))
-                {
-                    throw new IndexOutOfRangeException();
-                }
-
-                return pipe;
-            }
-        }
-
-        private class UsbPipeEnumerator : IEnumerator<USBPipe>
-        {
-            private int _index;
-            private readonly USBPipe[] _pipes;
-
-            public UsbPipeEnumerator(USBPipe[] pipes)
-            {
-                _pipes = pipes;
-                _index = -1;
-            }
-
-            public void Dispose()
-            {
-                // Empty
-            }
-            private USBPipe GetCurrent()
-            {
-                try
-                {
-                    return _pipes[_index];
-                }
-                catch (IndexOutOfRangeException)
-                {
-                    throw new InvalidOperationException();
-                }
-            }
-
-            public USBPipe Current
-            {
-                get
-                {
-                    return GetCurrent();
-                }
-            }
-
-            object IEnumerator.Current
-            {
-                get
-                {
-                    return GetCurrent();
-                }
-            }
-
-            public bool MoveNext()
-            {
-                _index++;
-                return _index < _pipes.Length;
-            }
-
-            public void Reset()
-            {
-                _index = -1;
-            }
-        }
-
-        private USBPipe[] GetPipeList()
-        {
-            var values = _pipes.Values;
-            USBPipe[] pipeList = new USBPipe[values.Count];
-            values.CopyTo(pipeList, 0);
-            return pipeList;
-        }
-
-        /// <summary>
-        /// Returns a typed enumerator that iterates through a collection.
-        /// </summary>
-        /// <returns>The enumerator object that can be used to iterate through the collection.</returns>
-        public IEnumerator<USBPipe> GetEnumerator()
-        {
-            return new UsbPipeEnumerator(GetPipeList());
-        }
-
-        /// <summary>
-        /// Returns an enumerator that iterates through a collection.
-        /// </summary>
-        /// <returns>An IEnumerator object that can be used to iterate through the collection.</returns>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return new UsbPipeEnumerator(GetPipeList());
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *  
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace MadWizard.WinUSBNet
+{
+    /// <summary>
+    /// Collection of UsbPipe objects
+    /// </summary>
+    public class USBPipeCollection : IEnumerable<USBPipe>
+    {
+        private readonly Dictionary<byte, USBPipe> _pipes;
+
+        internal USBPipeCollection(USBPipe[] pipes)
+        {
+            _pipes = new Dictionary<byte, USBPipe>(pipes.Length);
+            foreach (USBPipe pipe in pipes)
+            {
+                if (_pipes.ContainsKey(pipe.Address))
+                {
+                    throw new USBException("Duplicate pipe address in endpoint.");
+                }
+
+                _pipes[pipe.Address] = pipe;
+            }
+        }
+
+        /// <summary>
+        /// Returns the pipe from the collection with the given pipe address
+        /// </summary>
+        /// <param name="pipeAddress">Address of the pipe to return</param>
+        /// <returns>The pipe with the given pipe address</returns>
+        /// <exception cref="IndexOutOfRangeException">Thrown if no pipe with the specified address
+        /// is available in the collection.</exception>
+        public USBPipe this[byte pipeAddress]
+        {
+            get
+            {
+                if (!_pipes.TryGetValue(pipeAddress, out USBPipe pipe))
+                {
+                    throw new IndexOutOfRangeException();
+                }
+
+                return pipe;
+            }
+        }
+
+        private class UsbPipeEnumerator : IEnumerator<USBPipe>
+        {
+            private int _index;
+            private readonly USBPipe[] _pipes;
+
+            public UsbPipeEnumerator(USBPipe[] pipes)
+            {
+                _pipes = pipes;
+                _index = -1;
+            }
+
+            public void Dispose()
+            {
+                // Empty
+            }
+            private USBPipe GetCurrent()
+            {
+                try
+                {
+                    return _pipes[_index];
+                }
+                catch (IndexOutOfRangeException)
+                {
+                    throw new InvalidOperationException();
+                }
+            }
+
+            public USBPipe Current
+            {
+                get
+                {
+                    return GetCurrent();
+                }
+            }
+
+            object IEnumerator.Current
+            {
+                get
+                {
+                    return GetCurrent();
+                }
+            }
+
+            public bool MoveNext()
+            {
+                _index++;
+                return _index < _pipes.Length;
+            }
+
+            public void Reset()
+            {
+                _index = -1;
+            }
+        }
+
+        private USBPipe[] GetPipeList()
+        {
+            var values = _pipes.Values;
+            USBPipe[] pipeList = new USBPipe[values.Count];
+            values.CopyTo(pipeList, 0);
+            return pipeList;
+        }
+
+        /// <summary>
+        /// Returns a typed enumerator that iterates through a collection.
+        /// </summary>
+        /// <returns>The enumerator object that can be used to iterate through the collection.</returns>
+        public IEnumerator<USBPipe> GetEnumerator()
+        {
+            return new UsbPipeEnumerator(GetPipeList());
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through a collection.
+        /// </summary>
+        /// <returns>An IEnumerator object that can be used to iterate through the collection.</returns>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return new UsbPipeEnumerator(GetPipeList());
+        }
+    }
+}
diff --git a/WinUSBNet/USBPipePolicy.cs b/WPinternals/WinUSBNet/USBPipePolicy.cs
similarity index 97%
rename from WinUSBNet/USBPipePolicy.cs
rename to WPinternals/WinUSBNet/USBPipePolicy.cs
index 32e61d5..47a5489 100644
--- a/WinUSBNet/USBPipePolicy.cs
+++ b/WPinternals/WinUSBNet/USBPipePolicy.cs
@@ -1,180 +1,180 @@
-/*  WinUSBNet library
- *  (C) 2010 Thomas Bleeker (www.madwizard.org)
- *  
- *  Licensed under the MIT license, see license.txt or:
- *  http://www.opensource.org/licenses/mit-license.php
- */
-
-using System;
-
-namespace MadWizard.WinUSBNet
-{
-    /// <summary>
-    /// Describes the policy for a specific USB pipe
-    /// </summary>
-    public class USBPipePolicy
-    {
-        private readonly byte _pipeID;
-        private readonly int _interfaceIndex;
-        private readonly USBDevice _device;
-
-        internal USBPipePolicy(USBDevice device, int interfaceIndex, byte pipeID)
-        {
-            _pipeID = pipeID;
-            _interfaceIndex = interfaceIndex;
-            _device = device;
-        }
-
-        private void RequireDirectionOut()
-        {
-            // Some policy types only apply specifically to OUT direction pipes
-            if ((_pipeID & 0x80) != 0)
-            {
-                throw new NotSupportedException("This policy type is only allowed on OUT direction pipes.");
-            }
-        }
-
-        private void RequireDirectionIn()
-        {
-            // Some policy types only apply specifically to IN  direction pipes
-            // This function checks for this.
-            if ((_pipeID & 0x80) == 0)
-            {
-                throw new NotSupportedException("This policy type is only allowed on IN direction pipes.");
-            }
-        }
-
-        /// <summary>
-        /// When false, read requests fail when the device returns more data than requested. When true, extra data is
-        /// saved and returned on the next read. Default value is true. Only available on IN direction pipes.
-        /// </summary>
-        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
-        public bool AllowPartialReads
-        {
-            get
-            {
-                RequireDirectionIn();
-                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.ALLOW_PARTIAL_READS);
-            }
-            set
-            {
-                RequireDirectionIn();
-                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.ALLOW_PARTIAL_READS, value);
-            }
-        }
-
-        /// <summary>
-        /// When true, the driver fails stalled data transfers, but the driver clears the stall condition automatically. Default
-        /// value is false.
-        /// </summary>
-        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
-        public bool AutoClearStall
-        {
-            get
-            {
-                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.AUTO_CLEAR_STALL);
-            }
-            set
-            {
-                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.AUTO_CLEAR_STALL, value);
-            }
-        }
-
-        /// <summary>
-        /// If both AllowPartialReads and AutoFlush are true, when the device returns more data than requested by the client it
-        /// will discard the remaining data. Default value is false. Only available on IN direction pipes.
-        /// </summary>
-        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
-        public bool AutoFlush
-        {
-            get
-            {
-                RequireDirectionIn();
-                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.AUTO_FLUSH);
-            }
-            set
-            {
-                RequireDirectionIn();
-                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.AUTO_FLUSH, value);
-            }
-        }
-        /// <summary>
-        /// When true, read operations are completed only when the number of bytes requested by the client has been received. Default value is false.
-        /// Only available on IN direction pipes.
-        /// </summary>
-        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
-        public bool IgnoreShortPackets
-        {
-            get
-            {
-                RequireDirectionIn();
-                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.IGNORE_SHORT_PACKETS);
-            }
-            set
-            {
-                RequireDirectionIn();
-                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.IGNORE_SHORT_PACKETS, value);
-            }
-        }
-
-        /// <summary>
-        /// Specifies the timeout in milliseconds for pipe operations. If an operation does not finish within the specified time it will fail.
-        /// When set to zero, no timeout is used. Default value is zero.
-        /// </summary>
-        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
-        public int PipeTransferTimeout
-        {
-            get
-            {
-                return (int)_device.InternalDevice.GetPipePolicyUInt(_interfaceIndex, _pipeID, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT);
-            }
-            set
-            {
-                if (value < 0)
-                {
-                    throw new ArgumentOutOfRangeException("Pipe transfer timeout cannot be negative.");
-                }
-
-                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
-            }
-        }
-
-        /// <summary>
-        /// When true, read and write operations to the pipe must have a buffer length that is a multiple of the maximum endpoint packet size,
-        /// and the length must be less than the maximum transfer size. With these conditions met, data is sent directly to the USB driver stack,
-        /// bypassing the queuing and error handling of WinUSB.
-        /// Default value is false.
-        /// </summary>
-        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
-        public bool RawIO
-        {
-            get
-            {
-                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.RAW_IO);
-            }
-            set
-            {
-                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.RAW_IO, value);
-            }
-        }
-
-        /// <summary>
-        /// When true, every write request that is a multiple of the maximum packet size for the endpoint is terminated with a zero-length packet.
-        /// Default value is false. Only available on OUT direction pipes.
-        /// </summary>
-        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
-        public bool ShortPacketTerminate
-        {
-            get
-            {
-                RequireDirectionOut();
-                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.SHORT_PACKET_TERMINATE);
-            }
-            set
-            {
-                RequireDirectionOut();
-                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.SHORT_PACKET_TERMINATE, value);
-            }
-        }
-    }
-}
+/*  WinUSBNet library
+ *  (C) 2010 Thomas Bleeker (www.madwizard.org)
+ *  
+ *  Licensed under the MIT license, see license.txt or:
+ *  http://www.opensource.org/licenses/mit-license.php
+ */
+
+using System;
+
+namespace MadWizard.WinUSBNet
+{
+    /// <summary>
+    /// Describes the policy for a specific USB pipe
+    /// </summary>
+    public class USBPipePolicy
+    {
+        private readonly byte _pipeID;
+        private readonly int _interfaceIndex;
+        private readonly USBDevice _device;
+
+        internal USBPipePolicy(USBDevice device, int interfaceIndex, byte pipeID)
+        {
+            _pipeID = pipeID;
+            _interfaceIndex = interfaceIndex;
+            _device = device;
+        }
+
+        private void RequireDirectionOut()
+        {
+            // Some policy types only apply specifically to OUT direction pipes
+            if ((_pipeID & 0x80) != 0)
+            {
+                throw new NotSupportedException("This policy type is only allowed on OUT direction pipes.");
+            }
+        }
+
+        private void RequireDirectionIn()
+        {
+            // Some policy types only apply specifically to IN  direction pipes
+            // This function checks for this.
+            if ((_pipeID & 0x80) == 0)
+            {
+                throw new NotSupportedException("This policy type is only allowed on IN direction pipes.");
+            }
+        }
+
+        /// <summary>
+        /// When false, read requests fail when the device returns more data than requested. When true, extra data is
+        /// saved and returned on the next read. Default value is true. Only available on IN direction pipes.
+        /// </summary>
+        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
+        public bool AllowPartialReads
+        {
+            get
+            {
+                RequireDirectionIn();
+                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.ALLOW_PARTIAL_READS);
+            }
+            set
+            {
+                RequireDirectionIn();
+                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.ALLOW_PARTIAL_READS, value);
+            }
+        }
+
+        /// <summary>
+        /// When true, the driver fails stalled data transfers, but the driver clears the stall condition automatically. Default
+        /// value is false.
+        /// </summary>
+        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
+        public bool AutoClearStall
+        {
+            get
+            {
+                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.AUTO_CLEAR_STALL);
+            }
+            set
+            {
+                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.AUTO_CLEAR_STALL, value);
+            }
+        }
+
+        /// <summary>
+        /// If both AllowPartialReads and AutoFlush are true, when the device returns more data than requested by the client it
+        /// will discard the remaining data. Default value is false. Only available on IN direction pipes.
+        /// </summary>
+        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
+        public bool AutoFlush
+        {
+            get
+            {
+                RequireDirectionIn();
+                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.AUTO_FLUSH);
+            }
+            set
+            {
+                RequireDirectionIn();
+                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.AUTO_FLUSH, value);
+            }
+        }
+        /// <summary>
+        /// When true, read operations are completed only when the number of bytes requested by the client has been received. Default value is false.
+        /// Only available on IN direction pipes.
+        /// </summary>
+        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
+        public bool IgnoreShortPackets
+        {
+            get
+            {
+                RequireDirectionIn();
+                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.IGNORE_SHORT_PACKETS);
+            }
+            set
+            {
+                RequireDirectionIn();
+                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.IGNORE_SHORT_PACKETS, value);
+            }
+        }
+
+        /// <summary>
+        /// Specifies the timeout in milliseconds for pipe operations. If an operation does not finish within the specified time it will fail.
+        /// When set to zero, no timeout is used. Default value is zero.
+        /// </summary>
+        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
+        public int PipeTransferTimeout
+        {
+            get
+            {
+                return (int)_device.InternalDevice.GetPipePolicyUInt(_interfaceIndex, _pipeID, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT);
+            }
+            set
+            {
+                if (value < 0)
+                {
+                    throw new ArgumentOutOfRangeException("Pipe transfer timeout cannot be negative.");
+                }
+
+                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.PIPE_TRANSFER_TIMEOUT, (uint)value);
+            }
+        }
+
+        /// <summary>
+        /// When true, read and write operations to the pipe must have a buffer length that is a multiple of the maximum endpoint packet size,
+        /// and the length must be less than the maximum transfer size. With these conditions met, data is sent directly to the USB driver stack,
+        /// bypassing the queuing and error handling of WinUSB.
+        /// Default value is false.
+        /// </summary>
+        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
+        public bool RawIO
+        {
+            get
+            {
+                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.RAW_IO);
+            }
+            set
+            {
+                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.RAW_IO, value);
+            }
+        }
+
+        /// <summary>
+        /// When true, every write request that is a multiple of the maximum packet size for the endpoint is terminated with a zero-length packet.
+        /// Default value is false. Only available on OUT direction pipes.
+        /// </summary>
+        /// <seealso href="http://msdn.microsoft.com/en-us/library/aa476439.aspx">WinUSB_GetPipePolicy for a more detailed description</seealso>
+        public bool ShortPacketTerminate
+        {
+            get
+            {
+                RequireDirectionOut();
+                return _device.InternalDevice.GetPipePolicyBool(_interfaceIndex, _pipeID, API.POLICY_TYPE.SHORT_PACKET_TERMINATE);
+            }
+            set
+            {
+                RequireDirectionOut();
+                _device.InternalDevice.SetPipePolicy(_interfaceIndex, _pipeID, API.POLICY_TYPE.SHORT_PACKET_TERMINATE, value);
+            }
+        }
+    }
+}
diff --git a/aerobusy.gif b/WPinternals/aerobusy.gif
similarity index 100%
rename from aerobusy.gif
rename to WPinternals/aerobusy.gif
diff --git a/app.config b/WPinternals/app.config
similarity index 100%
rename from app.config
rename to WPinternals/app.config
diff --git a/app.manifest b/WPinternals/app.manifest
similarity index 98%
rename from app.manifest
rename to WPinternals/app.manifest
index 5df180a..42b238e 100644
--- a/app.manifest
+++ b/WPinternals/app.manifest
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
-    <security>
-      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</asmv1:assembly>
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</asmv1:assembly>