Merge pull request #49 from ZestyTS/Final

Version 3.Z
2024-09-20 05:41:54 +00:00 · 2023-10-05 15:06:42 -07:00 · 2023-10-05 15:06:42 -07:00 · d4a5c91c0f
commit d4a5c91c0f
parent ffda8a1f37 5fa09d8f83
26 changed files with 2466 additions and 1193 deletions
--- a/WPF.sln
+++ b/WPF.sln
@ -1,32 +1,20 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.2.32630.192
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29806.167
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UWUVCI AIO WPF", "UWUVCI AIO WPF\UWUVCI AIO WPF.csproj", "{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UWUVCI AIO WPF", "UWUVCI AIO WPF\UWUVCI AIO WPF.csproj", "{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x64.ActiveCfg = Debug|x64
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x64.Build.0 = Debug|x64
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x86.ActiveCfg = Debug|x86
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x86.Build.0 = Debug|x86
 		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x64.ActiveCfg = Release|x64
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x64.Build.0 = Release|x64
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x86.ActiveCfg = Release|x86
-		{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/WPF/App.config
+++ b/WPF/App.config
@ -49,9 +49,9 @@
            <setting name="gczw" serializeAs="String">
                <value>False</value>
            </setting>
-            <setting name="Ancast" serializeAs="String">
-                <value />
-            </setting>
+			<setting name="Ancast" serializeAs="String">
+				<value />
+			</setting>
        </UWUVCI_AIO_WPF.Properties.Settings>
    </userSettings>
  <runtime>
--- a/WPF/App.xaml.cs
+++ b/WPF/App.xaml.cs
@ -105,7 +105,7 @@ namespace UWUVCI_AIO_WPF
 				{
 					
 					//wnd.is32();
-					Custom_Message cm = new Custom_Message("Warning", "Some features may cause issues on a 32Bit System. Upgrading to 64Bit would be recommended.\nDue to an Issue with packing on 32Bit Systems, you need Java installed for packing. \nReport any issues in the UWUVCI Discord, or ping @NicoAICP in #wiiu-assistance in the Nintendo Homebrew discord. ");
+					Custom_Message cm = new Custom_Message("Warning", "Some features may cause issues on a 32Bit System. Upgrading to 64Bit would be recommended.\nDue to an Issue with packing on 32Bit Systems, you need Java installed for packing. \nReport any issues in the UWUVCI Discord, or ping @NicoAICP or @ZestyTS in #wiiu-assistance in the Nintendo Homebrew discord. ");
 					cm.ShowDialog();
 				}
 				
--- a/WPF/Classes/BootImage.cs
+++ b/WPF/Classes/BootImage.cs
@ -128,7 +128,7 @@ namespace UWUVCI_AIO_WPF.Classes
                //if rectangle isn't able to get set then H4V3 should be used.
                rectangle = _rectangleH4V3;
            }
-            
+
            if (TitleScreen != null)
                g.DrawImage(TitleScreen, rectangle);
            else
@ -141,11 +141,12 @@ namespace UWUVCI_AIO_WPF.Classes

            if (!string.IsNullOrEmpty(NameLine1) || !string.IsNullOrEmpty(NameLine2))
            {
-                var regex= "^[a-zA-Z0-9\\d\\s\\.\\'\\&\\\\(\\)\\-\\:\\;\\.\\,\\?\\^\\¿]*$";
+                var regex = "^[a-zA-Z0-9\\d\\s\\.\\'\\&\\\\(\\)\\-\\:\\;\\.\\,\\?\\^\\¿]*$";
                var match = Regex.Match(NameLine1, regex);
                var match2 = Regex.Match(NameLine2, regex);
                if (!match.Success || !match2.Success)
-                    isNotEnglish = true;
+                    if (!NameLine1.Contains("é") || !NameLine2.Contains("é"))
+                        isNotEnglish = true;

                Pen outlineBold = new Pen(Color.FromArgb(222, 222, 222), 5.0F);
                Pen shadowBold = new Pen(Color.FromArgb(190, 190, 190), 7.0F);
@ -207,11 +208,11 @@ namespace UWUVCI_AIO_WPF.Classes
                    pStr = "Players: " + pStr;

                GraphicsPath p = new GraphicsPath();
-                
+
                p.AddString(pStr, font.FontFamily,
                (int)(FontStyle.Regular),
                g.DpiY * 25.0F / 72.0F, new Rectangle(586, 496, 600, 40), format);
-                
+
                g.DrawPath(shadow, p);
                g.DrawPath(outline, p);
                g.FillPath(brush, p);
--- a/WPF/Classes/Injection.cs
+++ b/WPF/Classes/Injection.cs
--- a/WPF/Classes/KeyFile.cs
+++ b/WPF/Classes/KeyFile.cs
@ -33,7 +33,7 @@ namespace UWUVCI_AIO_WPF.Classes
        public static void ExportFile(List<TKeys> precomp, GameConsoles console)
        {
            CheckAndFixFolder("bin\\keys");
-            Stream createConfigStream = new FileStream(Path.Combine(Directory.GetCurrentDirectory(), $@"bin\keys\{console.ToString().ToLower()}.vck"), FileMode.Create, FileAccess.Write);
+            Stream createConfigStream = new FileStream($@"bin\keys\{console.ToString().ToLower()}.vck", FileMode.Create, FileAccess.Write);
            GZipStream compressedStream = new GZipStream(createConfigStream, CompressionMode.Compress);
            IFormatter formatter = new BinaryFormatter();
            formatter.Serialize(compressedStream, precomp);
--- a/WPF/Classes/ToolCheck.cs
+++ b/WPF/Classes/ToolCheck.cs
@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
 using System.Net;
@ -10,15 +11,18 @@ namespace UWUVCI_AIO_WPF.Classes
 {
    class ToolCheck
    {
-        static string FolderName = new FileInfo(System.Reflection.Assembly.GetEntryAssembly().Location).DirectoryName + "\\bin\\Tools";
-        public static string backupulr = @"https://github.com/Hotbrawl20/UWUVCI-Tools/raw/master/" + (Environment.Is64BitProcess ? "x64/" : "");
+        static string FolderName = "bin\\Tools";
+        public static string backupulr = @"https://github.com/Hotbrawl20/UWUVCI-Tools/raw/master/";
        public static string[] ToolNames =
        {
+            "CDecrypt.exe",
+            "CNUSPACKER.exe",
            "N64Converter.exe",
            "png2tga.exe",
            "psb.exe",
            "RetroInject.exe",
            "tga_verify.exe",
+            "WiiUDownloader.exe",
            "wiiurpxtool.exe",
            "INICreator.exe",
            "blank.ini",
@ -26,6 +30,7 @@ namespace UWUVCI_AIO_WPF.Classes
            "BuildPcePkg.exe",
            "BuildTurboCdPcePkg.exe",
            "goomba.gba",
+            "nfs2iso2nfs.exe",
            "nintendont.dol",
            "nintendont_force.dol",
            "GetExtTypePatcher.exe",
@ -59,45 +64,48 @@ namespace UWUVCI_AIO_WPF.Classes

        public static bool DoesToolsFolderExist()
        {
-            return Directory.Exists(FolderName);
+            if (Directory.Exists(FolderName))
+            {
+                return true;
+            }
+            return false;
        }

-        public static bool IsToolRightAsync(string name)
+        public static bool IsToolRight(string name)
        {
-            var result = false;
-            string md5Name = name + ".md5";
-            string md5Path = FolderName + "\\" + md5Name;
-            string filePath = FolderName + "\\" + name;
-
-            if (!File.Exists(filePath))
-                return result;
-
-            using (var webClient = new WebClient())
-                webClient.DownloadFile(backupulr + md5Name, md5Path);
-
+            bool ret = false;
            var md5 = "";
-            using (var sr = new StreamReader(md5Path))
-                md5 = sr.ReadLine();
+            using (WebClient client = new WebClient())
+            {
+                client.DownloadFile(backupulr + name + ".md5", name + ".md5");
+                using (StreamReader sr = new StreamReader(name + ".md5"))
+                    md5 = sr.ReadLine();
+            }

-            result = CalculateMD5(filePath) == md5.ToLower();
+            if(CalculateMD5(name) == md5)
+            {
+                ret = true;
+            }

-            File.Delete(md5Path);
-
-            return result;
+            File.Delete(name + ".md5");
+            return ret;
        }
        static string CalculateMD5(string filename)
        {
-            var ret = "";
-            using var md5 = MD5.Create();
-            using (var stream = File.OpenRead(filename))
-                ret = BitConverter.ToString(md5.ComputeHash(stream)).Replace("-", "").ToLower();
-
-            return ret;
+            using (var md5 = MD5.Create())
+            {
+                using (var stream = File.OpenRead(filename))
+                {
+                    string ret = BitConverter.ToString(md5.ComputeHash(stream)).Replace("-", "").ToLower();
+                    stream.Close();
+                    return ret;
+                }
+            }
        }
        public static List<MissingTool> CheckForMissingTools()
        {
            List<MissingTool> ret = new List<MissingTool>();
-            foreach (string s in ToolNames)
+            foreach(string s in ToolNames)
            {
                string path = $@"{FolderName}\{s}";
                if (!DoesToolExist(path))
--- a/WPF/FodyWeavers.xsd
+++ b/WPF/FodyWeavers.xsd
@ -17,16 +17,6 @@
                  <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
                </xs:annotation>
              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
-                </xs:annotation>
-              </xs:element>
-              <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
-                <xs:annotation>
-                  <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
-                </xs:annotation>
-              </xs:element>
              <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
                <xs:annotation>
                  <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
@ -53,16 +43,6 @@
                <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
              </xs:annotation>
            </xs:attribute>
-            <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
            <xs:attribute name="DisableCompression" type="xs:boolean">
              <xs:annotation>
                <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
@ -93,16 +73,6 @@
                <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
              </xs:annotation>
            </xs:attribute>
-            <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
            <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
              <xs:annotation>
                <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
--- a/WPF/Models/MainViewModel.cs
+++ b/WPF/Models/MainViewModel.cs
--- a/WPF/Properties/AssemblyInfo.cs
+++ b/WPF/Properties/AssemblyInfo.cs
@ -51,5 +51,5 @@ using System.Windows;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.99.2.0")]
-[assembly: AssemblyFileVersion("3.99.2.0")]
+[assembly: AssemblyVersion("3.99.9.2")]
+[assembly: AssemblyFileVersion("3.99.9.2")]
--- a/WPF/Properties/Settings.Designer.cs
+++ b/WPF/Properties/Settings.Designer.cs
@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------

@ -12,7 +12,7 @@ namespace UWUVCI_AIO_WPF.Properties {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@ -178,16 +178,18 @@ namespace UWUVCI_AIO_WPF.Properties {
                this["gczw"] = value;
            }
        }
-        
        [global::System.Configuration.UserScopedSettingAttribute()]
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
        [global::System.Configuration.DefaultSettingValueAttribute("")]
-        public string Ancast {
-            get {
-                return ((string)(this["Ancast"]));
+        public string Ancast
+        {
+            get
+            {
+                return ((string)(this["ancast"]));
            }
-            set {
-                this["Ancast"] = value;
+            set
+            {
+                this["ancast"] = value;
            }
        }
    }
--- a/WPF/UI/Frames/InjectFrames/Bases/NonCustomBaseFrame.xaml.cs
+++ b/WPF/UI/Frames/InjectFrames/Bases/NonCustomBaseFrame.xaml.cs
@ -91,17 +91,26 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Bases
                if (info[0])
                {
                    mvm.BaseDownloaded = true;
-                    if (mvm.RomSet) 
-                        mvm.CanInject = true;
+                    if (mvm.RomSet) mvm.CanInject = true;
                }
                else
+                {
                    mvm.BaseDownloaded = false;
-            }   
+                   
+                }
+            }
+            
        }
+
        private void btnDwnlnd_Click(object sender, RoutedEventArgs e)
        {
-            mvm.Download();
-            checkStuff(mvm.getInfoOfBase(Base));
+            
+                mvm.Download();
+            Thread.Sleep(500);
+                checkStuff(mvm.getInfoOfBase(Base));
+         
+           
+            
        }

        private void btnDwnlnd_Copy_Click(object sender, RoutedEventArgs e)
--- a/WPF/UI/Frames/InjectFrames/Configurations/WiiConfig.xaml
+++ b/WPF/UI/Frames/InjectFrames/Configurations/WiiConfig.xaml
@ -54,7 +54,7 @@
            <RadioButton x:Name="RF_tn" Content="To NTSC" Click="RF_tp_Click" HorizontalAlignment="Left" VerticalAlignment="Top" GroupName="RF" Width="85" ToolTip="Change Game Region to NTSC" Margin="0,6,0,0"/>
            <RadioButton x:Name="RF_tj" Content="To JPN" Click="RF_tp_Click" HorizontalAlignment="Left" VerticalAlignment="Top" GroupName="RF" Width="82" ToolTip="Change Game Region to JPN" Margin="0,6,0,0"/>
        </StackPanel>
-        <TextBox materialDesign:HintAssist.Hint="WIIU ANCAST KEY" Style="{StaticResource MaterialDesignFloatingHintTextBox}" Margin="10,460,395,5" Background="{x:Null}" Foreground="Black" SelectionBrush="#FF00C3D7" CaretBrush="#FF21C3F3" FontSize="18" Text="{Binding ancastKey}" x:Name="ancastKey" MaxLength="250" IsTabStop="False"/>
-        <Button Content="Get From OTP" HorizontalAlignment="Left" Margin="257,473,0,0" VerticalAlignment="Top" Width="127" Click="ancast_OTP" Focusable="False" IsTabStop="False"/>
+        <TextBox materialDesign:HintAssist.Hint="WIIU ANCAST KEY" Style="{StaticResource MaterialDesignFloatingHintTextBox}" Margin="10,460,395,5" Background="{x:Null}" Foreground="Black" SelectionBrush="#FF00C3D7" CaretBrush="#FF21C3F3" FontSize="18" Text="{Binding ancastKey}" x:Name="ancastKey" MaxLength="250" IsTabStop="False" IsEnabled="False"/>
+        <Button Content="Get From OTP" HorizontalAlignment="Left" Margin="257,473,0,0" VerticalAlignment="Top" Width="127" Click="ancast_OTP" Focusable="False" IsTabStop="False" x:Name="ancast_Button" IsEnabled="False"/>
    </Grid>
 </Page>
--- a/WPF/UI/Frames/InjectFrames/Configurations/WiiConfig.xaml.cs
+++ b/WPF/UI/Frames/InjectFrames/Configurations/WiiConfig.xaml.cs
@ -2,15 +2,20 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Reflection;
+using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
 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.Shell;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
 using UWUVCI_AIO_WPF.Properties;
 using UWUVCI_AIO_WPF.UI.Windows;
 using WiiUDownloaderLibrary;
@ -112,6 +117,9 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
        private void Set_Rom_Path(object sender, RoutedEventArgs e)
        {
            string path = mvm.GetFilePath(true, false);
+            ancast_Button.IsEnabled = false;
+            ancastKey.Text = "";
+            ancastKey.IsEnabled = false;
            if (!CheckIfNull(path))

            {
@ -143,9 +151,8 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
                        reader.Close();
                    }
                }
-
-                isok = true;
-
+                
+                
                if (isok)
                {
                    motepass.IsEnabled = false;
@ -171,7 +178,6 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
                    gamepad.ItemsSource = gpEmu;
                    mvm.RomPath = path;
                    mvm.RomSet = true;
-                    ancastKey.Text = Settings.Default.Ancast;
                    if (mvm.BaseDownloaded)
                    {
                        mvm.CanInject = true;
@ -200,6 +206,8 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
                    }
                    else if (path.ToLower().Contains(".dol"))
                    {
+                        ancastKey.IsEnabled = true;
+                        ancast_Button.IsEnabled = true;
                        mvm.NKITFLAG = false;
                        trimn.IsEnabled = false;
                        trimn.IsChecked = false;
@ -255,12 +263,8 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
                    }
                    cm.ShowDialog();
                }
-
            }
-
-
        }
-
        public string ReadAncastFromOtp()
        {
            var ret = "";
@ -345,7 +349,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations

                var sourceData = ancastKey.Text;
                var tempSource = Encoding.ASCII.GetBytes(sourceData);
-                var tmpHash = MD5.Create().ComputeHash(tempSource); 
+                var tmpHash = MD5.Create().ComputeHash(tempSource);
                var hash = BitConverter.ToString(tmpHash);

                if (hash == "31-8D-1F-9D-98-FB-08-E7-7C-7F-E1-77-AA-49-05-43")
@ -367,7 +371,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations

                        foreach (var titleId in titleIds)
                        {
-                            Task.Run(() => WiiUDownloaderLibrary.Downloader.DownloadAsync(titleId, downloadPath)).GetAwaiter().GetResult();
+                            Task.Run(() => Downloader.DownloadAsync(titleId, downloadPath)).GetAwaiter().GetResult();
                            mvm.Progress += 5;
                        }

@ -385,6 +389,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations

                        mvm.Progress += 5;

+                        var currentDir = Directory.GetCurrentDirectory();
                        Directory.SetCurrentDirectory(c2wPath);
                        using (Process c2w = new Process())
                        {
@ -393,7 +398,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
                            c2w.Start();
                            c2w.WaitForExit();
                        }
-                        Directory.SetCurrentDirectory(new FileInfo(Assembly.GetEntryAssembly().Location).DirectoryName);
+                        Directory.SetCurrentDirectory(currentDir);

                        File.Copy(System.IO.Path.Combine(c2wPath, "c2p.img"), imgFileCode, true);
                        mvm.Progress = 100;
@ -426,7 +431,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations
                File.Delete(imgFileCode);
                try
                {
-                    Directory.Delete(System.IO.Path.Combine(c2wPath, "code"),true);
+                    Directory.Delete(System.IO.Path.Combine(c2wPath, "code"), true);
                }
                catch { }
            }
@ -1067,7 +1072,6 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Configurations

            }
        }
-
        private void ancast_OTP(object sender, RoutedEventArgs e)
        {
            ancastKey.Text = ReadAncastFromOtp();
--- a/WPF/UI/Frames/SettingsFrame.xaml
+++ b/WPF/UI/Frames/SettingsFrame.xaml
@ -46,7 +46,7 @@
        <Ellipse Fill="#FF2196F3" HorizontalAlignment="Left" Height="21" Margin="12,7,0,0" VerticalAlignment="Top" Width="17"/>
        <Ellipse Fill="#FF2196F3" HorizontalAlignment="Left" Height="21" Margin="12,7,0,0" VerticalAlignment="Top" Width="17"/>
        <Border BorderBrush="#FF2196F3" BorderThickness="1" HorizontalAlignment="Left" Height="33" Margin="12,6,0,0" VerticalAlignment="Top" Width="1108" CornerRadius="5" Background="#FF2196F3"/>
-        <Label Content="v3.99.2" HorizontalAlignment="Left" Margin="1075,10,0,0" VerticalAlignment="Top" Foreground="#DDFFFFFF" Width="81" Height="24"/>
+        <Label Content="v3.F.F" HorizontalAlignment="Left" Margin="1075,10,0,0" VerticalAlignment="Top" Foreground="#DDFFFFFF" Width="81" Height="24"/>
        <Button HorizontalAlignment="Left" Margin="32,522,0,0" VerticalAlignment="Top" Width="74" Click="Button_Click_13" IsTabStop="False" Height="58" ToolTip="Support UWUVCI on Ko-Fi">
            <Image HorizontalAlignment="Left" Height="46" VerticalAlignment="Top" Width="46" Source="/UI/Images/61e111774d3a2f67c827cd25_Frame 5.png" />
        </Button>
--- a/WPF/UI/Frames/SettingsFrame.xaml.cs
+++ b/WPF/UI/Frames/SettingsFrame.xaml.cs
@ -15,7 +15,6 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using UWUVCI_AIO_WPF.UI.Windows;
-using static System.Net.WebRequestMethods;


 namespace UWUVCI_AIO_WPF.UI.Frames
@ -25,12 +24,12 @@ namespace UWUVCI_AIO_WPF.UI.Frames
    /// </summary>
    public partial class SettingsFrame : Page, IDisposable
    {
-        MainWindow parent;
+        MainWindow parent; 
        public SettingsFrame(MainWindow mw)
        {
            InitializeComponent();
            parent = mw;
-            // spm.Content += "\nThis will most likely fix the Injection Process, if it's stuck before it shows Copy Base";
+           // spm.Content += "\nThis will most likely fix the Injection Process, if it's stuck before it shows Copy Base";
        }
        public void Dispose()
        {
@ -39,8 +38,8 @@ namespace UWUVCI_AIO_WPF.UI.Frames

        private void Button_Click(object sender, RoutedEventArgs e)
        {
-            /* TitleKeys tk = new TitleKeys();
-             tk.ShowDialog();*/
+           /* TitleKeys tk = new TitleKeys();
+            tk.ShowDialog();*/
        }

        private void Button_Click_1(object sender, RoutedEventArgs e)
@ -57,7 +56,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames
        private void Button_Click_3(object sender, RoutedEventArgs e)
        {
            MainViewModel mvm = FindResource("mvm") as MainViewModel;
-            mvm.UpdateBaseAsync();
+            mvm.UpdateBases();
        }

        private void Button_Click_4(object sender, RoutedEventArgs e)
@ -67,12 +66,12 @@ namespace UWUVCI_AIO_WPF.UI.Frames
            {
                Process.Start(@"bin\Tools\INICreator.exe");
            }
-
+                
        }

        private void Button_Click_5(object sender, RoutedEventArgs e)
        {
-            Custom_Message cm = new Custom_Message("Credits", "UWUVCI AIO - NicoAICP, Morilli, ZestyTS\nBeta Testers/Contributors - wowjinxy, Danis, Adolfobenjaminv\n\nBuildPcePkg & BuildTurboCDPcePkg - JohnnyGo\nCdecrypt -  crediar\nCNUSPACKER - NicoAICP, Morilli\nINICreator - NicoAICP\nN64Converter - Morilli\npng2tga - Easy2Convert\ninject_gba_c (psb) - Morilli\nRetroInject_C - Morilli\ntga_verify - Morilli\nWiiUDownloader - Morilli, ZestyTS\nwiiurpxtool - 0CHB0\nGoomba - FluBBa\nDarkFilter Removal N64 - MelonSpeedruns, ZestyTS\nNintendont SD Card Menu - TeconMoon\nwit - Wiimm\nGetExtTypePatcher - Fix94\nnfs2iso2nfs - sabykos, piratesephiroth, Fix94, ZestyTS, and many more\nWii-VMC - wanikoko\nIcon/TV Bootimages - Flump, ZestyTS\nNKit - Nanook\nImage Creation Base - Phacox\nWiiGameLanguage Patcher - ReturnerS\nChangeAspectRatio - andot\nvWii Title Forwarder - Fix94");
+            Custom_Message cm = new Custom_Message("Credits", "UWUVCI AIO - NicoAICP, Morilli, ZestyTS\nBeta Testers/Contributors - wowjinxy, Danis, Adolfobenjaminv\n\nBuildPcePkg & BuildTurboCDPcePkg - JohnnyGo\nCdecrypt -  crediar\nCNUSPACKER - NicoAICP, Morilli\nINICreator - NicoAICP\nN64Converter - Morilli\npng2tga - Easy2Convert\ninject_gba_c (psb) - Morilli\nRetroInject_C - Morilli\ntga_verify - Morilli\nWiiUDownloader - Morilli\nwiiurpxtool - 0CHB0\nGoomba - FluBBa\nDarkFilter Removal N64 - MelonSpeedruns, ZestyTS\nNintendont SD Card Menu - TeconMoon\nwit - Wiimm\nGetExtTypePatcher - Fix94\nnfs2iso2nfs - sabykos, piratesephiroth, Fix94 and many more\nWii-VMC - wanikoko\nIcon/TV Bootimages - Flump, ZestyTS\nNKit - Nanook\nImage Creation Base - Phacox\nWiiGameLanguage Patcher - ReturnerS\nChangeAspectRatio - andot\nvWii Title Forwarder - Fix94");
            try
            {
                cm.Owner = (FindResource("mvm") as MainViewModel).mw;
@ -87,13 +86,13 @@ namespace UWUVCI_AIO_WPF.UI.Frames
        private void Button_Click_6(object sender, RoutedEventArgs e)
        {
            MainViewModel mvm = FindResource("mvm") as MainViewModel;
-            mvm.UpdateAsync(true);
+            mvm.Update(true);
        }

        private void Button_Click_7(object sender, RoutedEventArgs e)
        {
            MainViewModel mvm = FindResource("mvm") as MainViewModel;
-            mvm.UpdateToolsAsync();
+            mvm.UpdateTools();
        }

        private void Button_Click_8(object sender, RoutedEventArgs e)
@ -109,7 +108,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames
            {
                Process.Start(@"bin\Tools\NintendontConfig.exe");
            }
-
+                
        }

        private void Button_Click_10(object sender, RoutedEventArgs e)
@ -144,12 +143,7 @@ namespace UWUVCI_AIO_WPF.UI.Frames

        private void Button_Click_13(object sender, RoutedEventArgs e)
        {
-            Process.Start(new ProcessStartInfo()
-            {
-                FileName = "https://ko-fi.com/zestyts",
-                UseShellExecute = true,
-                Verb = "open"
-            });
+            Process.Start("https://ko-fi.com/zestyts");
        }
    }
 }
--- a/WPF/UI/Frames/StartFrame.xaml
+++ b/WPF/UI/Frames/StartFrame.xaml
@ -7,8 +7,9 @@
      mc:Ignorable="d" 
      d:DesignHeight="480" d:DesignWidth="1130"
      Title="SettingsFrame" >
+
    <Grid>
-        <TextBlock x:Name="tb" Margin="10,172,10,192" TextWrapping="Wrap" Text="Welcome to UWUVCI AIO v3.99.2. To start Injecting select a Console to your left." FontSize="20" Height="116" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center" Width="1110" />
+        <TextBlock x:Name="tb" Margin="10,172,10,192" TextWrapping="Wrap" Text="Welcome to UWUVCI AIO v3.F.F. To start Injecting select a Console to your left." FontSize="20" Height="116" HorizontalAlignment="Center" VerticalAlignment="Center" TextAlignment="Center" Width="1110" />
        <TextBlock Margin="15,505,15,0" HorizontalAlignment="Right" VerticalAlignment="Top" Text="Support MAC Development" TextAlignment="Right"></TextBlock>
        <Button HorizontalAlignment="Right" Margin="15,525,15,0" VerticalAlignment="Top" Width="74" Click="Button_Click" IsTabStop="False" Height="58" ToolTip="Support UWUVCI MAC Development on Ko-Fi">
            <Image HorizontalAlignment="Left" Height="46" VerticalAlignment="Top" Width="46" Source="/UI/Images/61e111774d3a2f67c827cd25_Frame 5.png" />
@ -17,6 +18,6 @@
        <Button HorizontalAlignment="Left" Margin="15,525,15,0" VerticalAlignment="Top" Width="74" Click="Button_Click2" IsTabStop="False" Height="58" ToolTip="Support UWUVCI on Ko-Fi">
            <Image HorizontalAlignment="Left" Height="46" VerticalAlignment="Top" Width="46" Source="/UI/Images/61e111774d3a2f67c827cd25_Frame 5.png" />
        </Button>
+
    </Grid>
-   
 </Page>
--- a/WPF/UI/Frames/StartFrame.xaml.cs
+++ b/WPF/UI/Frames/StartFrame.xaml.cs
@ -17,20 +17,11 @@ namespace UWUVCI_AIO_WPF.UI.Frames

        private void Button_Click(object sender, RoutedEventArgs e)
        {
-            OpenKofiLink("uwuvci");
+            Process.Start("https://ko-fi.com/uwuvci");
        }
        private void Button_Click2(object sender, RoutedEventArgs e)
        {
-            OpenKofiLink("zestyts");
-        }
-        private void OpenKofiLink(string urlSuffix)
-        {
-            Process.Start(new ProcessStartInfo()
-            {
-                FileName = "https://ko-fi.com/" + urlSuffix,
-                UseShellExecute = true,
-                Verb = "open"
-            });
+            Process.Start("https://ko-fi.com/zestyts");
        }
    }
 }
--- a/WPF/UI/Frames/Teaser.xaml.cs
+++ b/WPF/UI/Frames/Teaser.xaml.cs
@ -29,7 +29,6 @@ namespace UWUVCI_AIO_WPF.UI.Frames

        private void tb_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
        {
-            //Process.Start("https://www.reddit.com/r/WiiUHacks/comments/jchcls/poc_retroarch_autoboot_starts_rom_automatically/");
            var cm = new Custom_Message("Soon™", "Coming Soon™ to a UWUVCI Prime Near You!");
            cm.ShowDialog();
        }
--- a/WPF/UI/Windows/Custom
+++ b/WPF/UI/Windows/Custom
@ -110,24 +110,15 @@ namespace UWUVCI_AIO_WPF.UI.Windows

        private void Folder_Click(object sender, RoutedEventArgs e)
        {
-            var filePath = "";
            try
            {
-                filePath = path;
-                if (File.Exists(filePath)) 
-                    filePath = new FileInfo(filePath).DirectoryName;
-
-                Process.Start(new ProcessStartInfo()
-                {
-                    FileName = filePath,
-                    UseShellExecute = true,
-                    Verb = "open"
-                });
+                if (File.Exists(path)) path = new FileInfo(path).DirectoryName;
+                Process.Start(path);
                Close();
            }
            catch (Exception)
            {
-                Custom_Message cm = new Custom_Message("An Error occured", "An error occured opening the folder. Please make sure the Output Path exists.\n\nFile path: " + filePath);
+                Custom_Message cm = new Custom_Message("An Error occured", "An error occured opening the folder. Please make sure the Output Path exists.");
                try
                {
                    cm.Owner = (FindResource("mvm") as MainViewModel).mw;
@ -166,7 +157,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows
            Close();
            var containNintendont = Message.Content.ToString().ToLower().Contains("nintendont");

-            SDSetup sd = new SDSetup(containNintendont, path);
+            SDSetup sd = new SDSetup(containNintendont ? true : false, path);
            try
            {
                sd.Owner = (FindResource("mvm") as MainViewModel).mw;
--- a/WPF/UI/Windows/DownloadWait.xaml.cs
+++ b/WPF/UI/Windows/DownloadWait.xaml.cs
@ -12,6 +12,12 @@ namespace UWUVCI_AIO_WPF.UI.Windows
    {
        MainViewModel mvm;
        DispatcherTimer timer = new DispatcherTimer();
+
+        //These variables are for handling a better progress bar
+        private TimeSpan remainingTime;
+        private int motion = 1;
+        private double accumulatedProgress = 0.0;
+        private double progressIncrementPerSecond = 0.0;
        public DownloadWait(string doing, string msg, MainViewModel mvm)
        {
            try
@ -38,9 +44,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows
            try
            {
                if (Owner?.GetType() != typeof(MainWindow))
-                {
                    WindowStartupLocation = WindowStartupLocation.CenterScreen;
-                }
            }
            catch (Exception)
            {
@ -54,36 +58,108 @@ namespace UWUVCI_AIO_WPF.UI.Windows
            timer.Tick += timer_Tick;
            
        }
+
+        public DownloadWait(string doing, TimeSpan estimatedTime, MainViewModel mvm)
+        {
+            // Initialization same as original constructor
+            try
+            {
+                if (Owner?.GetType() == typeof(MainWindow))
+                    WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            }
+            catch (Exception)
+            {
+                WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            }
+            this.mvm = mvm;
+            InitializeComponent();
+            Key.Text = doing;
+
+            // Handle estimated time
+            if (estimatedTime != TimeSpan.MaxValue)
+                remainingTime = estimatedTime;
+            else
+                // Can't estimate, just starting with zero
+                remainingTime = TimeSpan.Zero; 
+
+            timer.Interval = TimeSpan.FromSeconds(1);
+            timer.Tick += timer_Tick;
+            timer.Start();
+        }
        private void Window_Minimize(object sender, RoutedEventArgs e)
        {
            WindowState = WindowState.Minimized;
        }
+
        private void timer_Tick(object sender, EventArgs e)
        {
            msgT.Text = mvm.msg;
            pb.Value = mvm.Progress;
+
            if (Key.Text.Contains("Downloading Base"))
            {
-                if (mvm.Progress < 70)
+                if (mvm.Progress >= 96)
                {
-                    mvm.Progress += 1;
+                    msgT.Text += $"Verifying download...";
+                    
+                    if (motion == 6)
+                        motion = 1;
+
+                    for (var i = 0; i < motion; i++)
+                        msgT.Text += ".";
+
+                    motion++;
+                }
+                // Check if remainingTime has been initialized (i.e., not zero)
+                else if (remainingTime != TimeSpan.Zero)
+                {
+                    if (remainingTime.TotalSeconds > 0)
+                    {
+                        msgT.Text += $"Estimated time remaining: {remainingTime.Minutes} minutes {remainingTime.Seconds} seconds";
+
+                        if (mvm.Progress < 95)
+                        {
+                            // Calculate the progress increment if not already calculated
+                            if (progressIncrementPerSecond == 0.0)
+                                progressIncrementPerSecond = (95 - mvm.Progress) / remainingTime.TotalSeconds;
+
+                            accumulatedProgress += progressIncrementPerSecond;
+
+                            while (accumulatedProgress >= 1)
+                            {
+                                mvm.Progress++;
+                                accumulatedProgress--;
+                            }
+
+                            remainingTime = remainingTime.Add(TimeSpan.FromSeconds(-1));
+                        }
+                    }
+                    else
+                    {
+                        msgT.Text += $"Completing download, eta not available";
+
+                        if (motion == 6)
+                            motion = 1;
+
+                        for (var i = 0; i < motion; i++)
+                            msgT.Text += ".";
+
+                        motion++;
+                    }
+                }
+                else
+                {
+                    if (mvm.Progress < 95)
+                        mvm.Progress += 1;
                }
            }
-            else if (Key.Text.Contains("Injecting Game")) {
-                if (mvm.Progress < 79)
-                    mvm.Progress += 1;
-            }
-            else if (Key.Text.Contains("Downloading Tools")) { }
-            else
-                mvm.Progress += 1;
-
-            if(mvm.Progress >= 100)
+            if (mvm.Progress == 100)
            {
                timer.Stop();
                Close();
-                
            }
        }
+
        public void changeOwner(MainWindow ow)
        {
            Owner = ow;
--- a/WPF/UI/Windows/IMG_Message.xaml.cs
+++ b/WPF/UI/Windows/IMG_Message.xaml.cs
@ -306,7 +306,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows
            string inip = "";
            string btsndp = "";
            string exten = "";
-            string linkbase = "https://raw.githubusercontent.com/Flumpster/UWUVCI-Images/master/";
+            string linkbase = "https://raw.githubusercontent.com/UWUVCI-PRIME/UWUVCI-IMAGES/master/";
            if (console == GameConsoles.N64)
            {
                if (RemoteFileExists(linkbase+repoid+"/game.ini"))
@ -395,7 +395,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows
            string inip = "";
            string btsndp = "";
            string exten = "";
-            string linkbase = "https://raw.githubusercontent.com/Flumpster/UWUVCI-Images/master/";
+            string linkbase = "https://raw.githubusercontent.com/UWUVCI-PRIME/UWUVCI-IMAGES/master/";
            if (console == GameConsoles.N64)
            {
                if (RemoteFileExists(linkbase + repoid + "/game.ini"))
--- a/WPF/UI/Windows/TitleKeys.xaml.cs
+++ b/WPF/UI/Windows/TitleKeys.xaml.cs
@ -156,7 +156,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows
      
        private void wb_Navigating(object sender, System.Windows.Navigation.NavigatingCancelEventArgs e)
        {
-            if (!e.Uri.ToString().Contains("flumpster"))
+            if (!e.Uri.ToString().Contains("UWUVCI-PRIME"))
            {
                e.Cancel = true;

--- a/WPF.csproj
+++ b/WPF.csproj
@ -1,7 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}</ProjectGuid>
    <OutputType>WinExe</OutputType>
+    <RootNamespace>UWUVCI_AIO_WPF</RootNamespace>
+    <AssemblyName>UWUVCI AIO WPF</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
    <IsWebBootstrapper>false</IsWebBootstrapper>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
@ -17,11 +32,26 @@
    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <UseWindowsForms>True</UseWindowsForms>
-    <UseWPF>true</UseWPF>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-    <Platforms>AnyCPU</Platforms>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <PropertyGroup>
    <SignManifests>false</SignManifests>
@ -36,18 +66,367 @@
    <StartupObject>UWUVCI_AIO_WPF.App</StartupObject>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="AutoUpdater.NET, Version=1.6.3.0, Culture=neutral, PublicKeyToken=501435c91b35f4bc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autoupdater.NET.Official.1.6.3\lib\net45\AutoUpdater.NET.dll</HintPath>
+    </Reference>
+    <Reference Include="Costura, Version=4.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll</HintPath>
+    </Reference>
+    <Reference Include="CSharpDecrypt, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\CDecryptSharp.1.0.4\lib\CSharpDecrypt.dll</HintPath>
+    </Reference>
    <Reference Include="GameBaseClassLibrary">
-      <HintPath>..\GameBaseClassLibrary.dll</HintPath>
+      <HintPath>..\..\..\uwuvci_installer_creator\{app}\GameBaseClassLibrary.dll</HintPath>
    </Reference>
-    <Reference Include="nfs2iso2nfs">
-      <HintPath>nfs2iso2nfs.dll</HintPath>
+    <Reference Include="GMWare.M2, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\GMWare.M2.1.1.2\lib\netstandard2.0\GMWare.M2.dll</HintPath>
    </Reference>
-    <Reference Include="WiiUDownloaderLibrary">
-      <HintPath>WiiUDownloaderLibrary.dll</HintPath>
+    <Reference Include="Json.Net, Version=1.0.33.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Json.Net.1.0.33\lib\netstandard2.0\Json.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignColors, Version=1.2.7.1979, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignColors.1.2.7\lib\net45\MaterialDesignColors.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignThemes.Wpf, Version=2.6.0.325, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignThemes.2.6.0\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="McMaster.Extensions.CommandLineUtils, Version=2.4.2.0, Culture=neutral, PublicKeyToken=6f71cb76b82f055d, processorArchitecture=MSIL">
+      <HintPath>..\packages\McMaster.Extensions.CommandLineUtils.2.4.2\lib\net45\McMaster.Extensions.CommandLineUtils.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
+    </Reference>
+    <Reference Include="NAudio, Version=1.10.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\NAudio.1.10.0\lib\net35\NAudio.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Octokit, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Octokit.1.0.0\lib\net46\Octokit.dll</HintPath>
+    </Reference>
+    <Reference Include="Pfim, Version=0.10.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Pfim.0.10.3\lib\netstandard2.0\Pfim.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Management" />
+    <Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WiiUDownloaderLibrary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WiiUDownloader.1.0.6\lib\WiiUDownloaderLibrary.dll</HintPath>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="Zstandard.Net, Version=1.1.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Zstandard.Net.1.1.7\lib\net45\Zstandard.Net.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="AssemblyInfo1.cs" />
+    <Compile Include="Classes\BootImage.cs" />
+    <Compile Include="Classes\KeyFile.cs" />
+    <Compile Include="Classes\MenuIconImage - Kopieren.cs" />
+    <Compile Include="Classes\MenuIconImage.cs" />
+    <Compile Include="Classes\TKeys.cs" />
+    <Compile Include="Classes\ToolCheck.cs" />
+    <Compile Include="UI\Done.xaml.cs">
+      <DependentUpon>Done.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\InjectFrames\Configurations\OtherConfigs - Kopieren - Kopieren %282%29.xaml.cs">
+      <DependentUpon>OtherConfigs - Kopieren - Kopieren %282%29.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\InjectFrames\Configurations\OtherConfigs - Kopieren - Kopieren.xaml.cs">
+      <DependentUpon>OtherConfigs - Kopieren - Kopieren.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\InjectFrames\Configurations\OtherConfigs - Kopieren.xaml.cs">
+      <DependentUpon>OtherConfigs - Kopieren.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\InjectFrames\Configurations\WiiConfig.xaml.cs">
+      <DependentUpon>WiiConfig.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\KeyFrame\TKFrame.xaml.cs">
+      <DependentUpon>TKFrame.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\Path\Paths.xaml.cs">
+      <DependentUpon>Paths.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\Teaser.xaml.cs">
+      <DependentUpon>Teaser.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\Custom Message - Kopieren.xaml.cs">
+      <DependentUpon>Custom Message - Kopieren.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\Custom Message.xaml.cs">
+      <DependentUpon>Custom Message.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\DownloadWait - Kopieren.xaml.cs">
+      <DependentUpon>DownloadWait - Kopieren.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\DownloadWait.xaml.cs">
+      <DependentUpon>DownloadWait.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\EnterKey.xaml.cs">
+      <DependentUpon>EnterKey.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\ImageCreator - Kopieren - Kopieren %282%29.xaml.cs">
+      <DependentUpon>ImageCreator - Kopieren - Kopieren %282%29.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\ImageCreator - Kopieren - Kopieren.xaml.cs">
+      <DependentUpon>ImageCreator - Kopieren - Kopieren.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\ImageCreator - Kopieren.xaml.cs">
+      <DependentUpon>ImageCreator - Kopieren.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\ImageCreator.xaml.cs">
+      <DependentUpon>ImageCreator.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\IMG_Message - Kopieren - Kopieren - Kopieren.xaml.cs">
+      <DependentUpon>IMG_Message - Kopieren - Kopieren - Kopieren.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\IMG_Message - Kopieren - Kopieren.xaml.cs">
+      <DependentUpon>IMG_Message - Kopieren - Kopieren.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\IMG_Message - Kopieren.xaml.cs">
+      <DependentUpon>IMG_Message - Kopieren.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\IMG_Message.xaml.cs">
+      <DependentUpon>IMG_Message.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\TitleKeys - Kopieren.xaml.cs">
+      <DependentUpon>TitleKeys - Kopieren.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\TitleKeys.xaml.cs">
+      <DependentUpon>TitleKeys.xaml</DependentUpon>
+    </Compile>
+    <Page Include="UI\Done.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Frames\InjectFrame.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Frames\InjectFrames\Bases\BaseContainerFrame.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Frames\InjectFrames\Bases\CustomBaseFrame.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Frames\InjectFrames\Bases\NonCustomBaseFrame.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Frames\InjectFrames\Configurations\N64Config.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Frames\InjectFrames\Configurations\OtherConfigs - Kopieren - Kopieren %282%29.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UI\Frames\InjectFrames\Configurations\OtherConfigs - Kopieren - Kopieren.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UI\Frames\InjectFrames\Configurations\OtherConfigs - Kopieren.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UI\Frames\InjectFrames\Configurations\OtherConfigs.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Frames\InjectFrames\Configurations\WiiConfig.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Frames\KeyFrame\TKFrame.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Frames\Path\Paths.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Frames\SettingsFrame.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Frames\StartFrame.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Frames\Teaser.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Windows\Custom Message - Kopieren.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Windows\Custom Message.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Windows\DownloadWait - Kopieren.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UI\Windows\DownloadWait.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Windows\EnterKey.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Windows\ImageCreator - Kopieren - Kopieren %282%29.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UI\Windows\ImageCreator - Kopieren - Kopieren.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UI\Windows\ImageCreator - Kopieren.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UI\Windows\ImageCreator.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Windows\IMG_Message - Kopieren - Kopieren - Kopieren.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UI\Windows\IMG_Message - Kopieren - Kopieren.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UI\Windows\IMG_Message - Kopieren.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UI\Windows\IMG_Message.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Windows\MenuWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Classes\Injection.cs" />
+    <Compile Include="Classes\N64Conf.cs" />
+    <Compile Include="Classes\PNGTGA.cs" />
+    <Compile Include="Classes\GameConfig.cs" />
+    <Compile Include="Models\BaseModel.cs" />
+    <Compile Include="Models\MainViewModel.cs" />
+    <Compile Include="UI\Frames\InjectFrame.xaml.cs">
+      <DependentUpon>InjectFrame.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\InjectFrames\Bases\BaseContainerFrame.xaml.cs">
+      <DependentUpon>BaseContainerFrame.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\InjectFrames\Bases\CustomBaseFrame.xaml.cs">
+      <DependentUpon>CustomBaseFrame.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\InjectFrames\Bases\NonCustomBaseFrame.xaml.cs">
+      <DependentUpon>NonCustomBaseFrame.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\InjectFrames\Configurations\N64Config.xaml.cs">
+      <DependentUpon>N64Config.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\InjectFrames\Configurations\OtherConfigs.xaml.cs">
+      <DependentUpon>OtherConfigs.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\SettingsFrame.xaml.cs">
+      <DependentUpon>SettingsFrame.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Frames\StartFrame.xaml.cs">
+      <DependentUpon>StartFrame.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UI\Windows\MenuWindow.xaml.cs">
+      <DependentUpon>MenuWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Page Include="UI\Windows\TitleKeys - Kopieren.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="UI\Windows\TitleKeys.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
    <Resource Include="Font\font.otf" />
+    <None Include="app.manifest" />
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
  </ItemGroup>
  <ItemGroup>
    <Resource Include="UI\Images\bg maybe wpf.png" />
@ -120,6 +499,135 @@
  <ItemGroup>
    <Resource Include="b.ico" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GBC.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GCN.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\MSX.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\N64.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\NDS.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\NES.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\SNES-PAL.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TG16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TGCD.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GBA.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\newgameboy.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\SNES-USA.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\SFAM.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\WII.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\mario.mp3" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\WiiIcon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Wii2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\WIIWARE.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\homebrew3.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\HBICON.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GCN ICON2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\wii3New.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GCN ICON3.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\NDS Alt1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\N64 alt1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\bootLogoTex.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\SNES alt1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\N64 alt2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\NDS alt2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\SNES alt2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\MSX alt1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\MSX alt2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TGFX alt1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TGFX alt2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GBA alt1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GBA alt2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GB alt1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GB alt2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\NES alt1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\NES alt2.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GBC alt1.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\GBC alt2.png" />
+  </ItemGroup>
  <ItemGroup>
    <Resource Include="UI\Images\rarch.png" />
  </ItemGroup>
@ -157,59 +665,15 @@
  <ItemGroup>
    <Resource Include="UI\Images\61e111774d3a2f67c827cd25_Frame 5.png" />
  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="CDecryptSharp" Version="1.0.4" />
-    <PackageReference Include="CNUSPACKER" Version="1.0.3" />
-    <PackageReference Include="Downloader" Version="2.3.7" />
-    <PackageReference Include="GMWare.M2" Version="1.1.2" />
-    <PackageReference Include="Json.Net" Version="1.0.33" />
-    <PackageReference Include="MaterialDesignThemes" Version="2.5.1" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.0.1" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="NAudio" Version="2.1.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="nfs2iso2nfs" Version="1.0.0" />
-    <PackageReference Include="Octokit" Version="2.0.0" />
-    <PackageReference Include="Pfim" Version="0.10.3" />
-    <PackageReference Include="SharpZipLib" Version="1.3.3" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
-    <PackageReference Include="WiiUDownloader" Version="1.0.5" />
-    <PackageReference Include="WindowsAPICodePack-Core" Version="1.1.2" />
-    <PackageReference Include="WindowsAPICodePack-Shell" Version="1.1.1" />
-    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Autoupdater.NET.Official" Version="1.7.4" />
-    <PackageReference Include="Costura.Fody" Version="5.7.0" />
-    <PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Remove="Settings.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="Accessibility">
-      <WrapperTool>tlbimp</WrapperTool>
-      <VersionMinor>1</VersionMinor>
-      <VersionMajor>1</VersionMajor>
-      <Guid>1ea4dbf0-3c3b-11cf-810c-00aa00389b71</Guid>
-      <Lcid>0</Lcid>
-      <Isolated>false</Isolated>
-      <EmbedInteropTypes>true</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Properties\Settings.Designer.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props'))" />
+    <Error Condition="!Exists('..\packages\Fody.6.3.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.3.0\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Zstandard.Net.1.1.7\build\Zstandard.Net.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Zstandard.Net.1.1.7\build\Zstandard.Net.targets'))" />
+  </Target>
+  <Import Project="..\packages\Fody.6.3.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.3.0\build\Fody.targets')" />
+  <Import Project="..\packages\Zstandard.Net.1.1.7\build\Zstandard.Net.targets" Condition="Exists('..\packages\Zstandard.Net.1.1.7\build\Zstandard.Net.targets')" />
 </Project>
--- a/WPF/packages.config
+++ b/WPF/packages.config
@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Autoupdater.NET.Official" version="1.6.3" targetFramework="net46" />
+  <package id="CDecryptSharp" version="1.0.4" targetFramework="net472" />
+  <package id="Costura.Fody" version="4.1.0" targetFramework="net46" />
+  <package id="Fody" version="6.3.0" targetFramework="net46" developmentDependency="true" />
+  <package id="GMWare.M2" version="1.1.2" targetFramework="net48" />
+  <package id="Json.Net" version="1.0.33" targetFramework="net472" />
+  <package id="MaterialDesignColors" version="1.2.7" targetFramework="net46" />
+  <package id="MaterialDesignThemes" version="2.6.0" targetFramework="net472" />
+  <package id="McMaster.Extensions.CommandLineUtils" version="2.4.2" targetFramework="net48" />
+  <package id="NAudio" version="1.10.0" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
+  <package id="Octokit" version="1.0.0" targetFramework="net472" />
+  <package id="Pfim" version="0.10.3" targetFramework="net472" />
+  <package id="SharpZipLib" version="1.3.3" targetFramework="net48" />
+  <package id="System.Buffers" version="4.5.0" targetFramework="net48" />
+  <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net48" />
+  <package id="System.ValueTuple" version="4.4.0" targetFramework="net48" />
+  <package id="WiiUDownloader" version="1.0.6" targetFramework="net472" />
+  <package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net46" />
+  <package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net46" />
+  <package id="Zstandard.Net" version="1.1.7" targetFramework="net48" />
+</packages>
--- a/WiiUDownloaderLibrary.dll
+++ b/WiiUDownloaderLibrary.dll