Update packagelist upload message, fixed debug exe from 2.8.3

2.8.3 hotfix for blacklist not updating
Merge pull request #79 from konqiDAM/master
2021-08-19 18:17:04 -04:00 · 2021-08-19 16:32:23 -04:00 · 2021-08-19 15:51:14 -04:00 · 2021-08-19 21:48:13 +02:00 · 2021-08-19 20:00:14 +02:00 · 2021-08-19 19:58:44 +02:00
32 changed files with 11991 additions and 3557 deletions
--- a/ADB.cs
+++ b/ADB.cs
@@ -2,7 +2,9 @@
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Forms;
+using JR.Utils.GUI.Forms;
 using Newtonsoft.Json;

 namespace AndroidSideloader
@@ -12,7 +14,7 @@ namespace AndroidSideloader
    class ADB
    {
        static Process adb = new Process();
-        public static string adbFolderPath = "C:\\RSL\\2.1.1\\ADB";
+        public static string adbFolderPath = "C:\\RSL\\2.8.2\\ADB";
        public static string adbFilePath = adbFolderPath + "\\adb.exe";
        public static string DeviceID = "";
        public static string package = "";
@@ -25,10 +27,14 @@ namespace AndroidSideloader
            {
                command = $" -s {DeviceID} {command}";
            }
-            if (!command.Contains("dumpsys") && !command.Contains("shell pm list packages") && !command.Contains("KEYCODE_WAKEUP")) 
+            if (!command.Contains("dumpsys") && !command.Contains("shell pm list packages") && !command.Contains("KEYCODE_WAKEUP"))
            {
-                string loggedcommand = Utilities.StringUtilities.RemoveEverythingBeforeFirst(command, "adb.exe");
-                Logger.Log($"Running command{loggedcommand}");
+
+                string logcmd = command;
+
+                if (logcmd.Contains(Environment.CurrentDirectory))
+                    logcmd = logcmd.Replace($"{Environment.CurrentDirectory}", $"CurrentDirectory");
+                Logger.Log($"Running command: {logcmd}");
            }
            adb.StartInfo.FileName = adbFilePath;
            adb.StartInfo.Arguments = command;
@@ -61,18 +67,24 @@ namespace AndroidSideloader
                }
            }
            else
-            adb.WaitForExit();
-            if (error.Contains("ADB_VENDOR_KEYS"))
+                adb.WaitForExit();
+            if (error.Contains("ADB_VENDOR_KEYS") && !Properties.Settings.Default.adbdebugwarned)
            {
-                MessageBox.Show("Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.");
-                ADB.WakeDevice();
+                DialogResult dialogResult = FlexibleMessageBox.Show("Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.\nPlease note that even if you have done this\nbefore it will reset itself from time to time.\n\nPress CANCEL if you want to disable this prompt (FOR DEBUGGING ONLY, NOT RECOMMENDED).", "ADB Debugging not enabled.", MessageBoxButtons.OKCancel);
+                if (dialogResult == DialogResult.Cancel)
+                {
+                    Properties.Settings.Default.adbdebugwarned = true;
+                    Properties.Settings.Default.Save();
+                }
+                else
+                    ADB.WakeDevice();
            }
            if (error.Contains("not enough storage space"))
            {
-                MessageBox.Show("There is not enough room on your device to install this package. Please clear AT LEAST 2x the amount of the app you are trying to install.");
+                FlexibleMessageBox.Show("There is not enough room on your device to install this package. Please clear AT LEAST 2x the amount of the app you are trying to install.");
            }
-            if (!output.Contains("version") && !output.Contains("KEYCODE_WAKEUP") && !output.Contains("KEYCODE_WAKEUP") && !output.Contains("Filesystem") && !output.Contains("package:") && !output.Equals(null)) 
-            Logger.Log(output);
+            if (!output.Contains("version") && !output.Contains("KEYCODE_WAKEUP") && !output.Contains("Filesystem") && !output.Contains("package:") && !output.Equals(null))
+                Logger.Log(output);
            Logger.Log(error);
            return new ProcessOutput(output, error);
        }
@@ -82,11 +94,12 @@ namespace AndroidSideloader
            Properties.Settings.Default.ADBFolder = adbFolderPath;
            Properties.Settings.Default.ADBPath = adbFilePath;
            Properties.Settings.Default.Save();
-            

+            string logcmd = command;
+            if (logcmd.Contains(Environment.CurrentDirectory))
+                logcmd = logcmd.Replace($"{Environment.CurrentDirectory}", $"CurrentDirectory");
+            Logger.Log($"Running command: {logcmd}");

-
-            Logger.Log($"Running command {command}");
            adb.StartInfo.FileName = "cmd.exe";
            adb.StartInfo.RedirectStandardError = true;
            adb.StartInfo.RedirectStandardInput = true;
@@ -111,32 +124,52 @@ namespace AndroidSideloader
            catch { }
            if (command.Contains("connect"))
            {
-                bool graceful = adb.WaitForExit(3000); 
+                bool graceful = adb.WaitForExit(3000);
                if (!graceful)
                {
                    adb.Kill();
                }
+                else
+                    adb.WaitForExit();
            }
-            else
-                adb.WaitForExit();
-            if (error.Contains("ADB_VENDOR_KEYS"))
+            else if (command.Contains("install"))
            {
-                MessageBox.Show("Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.");
-                ADB.WakeDevice();
+                bool graceful = adb.WaitForExit(120000);
+                if (!graceful)
+                {
+                    adb.Kill();
+                }
+                else
+                    adb.WaitForExit();
+            }
+   
+            if (error.Contains("ADB_VENDOR_KEYS") && Properties.Settings.Default.adbdebugwarned)
+            {
+                DialogResult dialogResult = FlexibleMessageBox.Show("Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.\nPlease note that even if you have done this\nbefore it will reset itself from time to time.\n\nPress CANCEL if you want to disable this prompt (FOR DEBUGGING ONLY, NOT RECOMMENDED).", "ADB Debugging not enabled.", MessageBoxButtons.OKCancel);
+                if (dialogResult == DialogResult.Cancel)
+                {
+                    Properties.Settings.Default.adbdebugwarned = true;
+                    Properties.Settings.Default.Save();
+                }
+                else
+                    ADB.WakeDevice();
            }
            Logger.Log(output);
            Logger.Log(error);
            return new ProcessOutput(output, error);
        }
-        public static ProcessOutput RunCommandToString(string result, string path)
+        public static ProcessOutput RunCommandToString(string result, string path = "")
        {
            string command = result;
            Properties.Settings.Default.ADBFolder = adbFolderPath;
            Properties.Settings.Default.ADBPath = adbFilePath;
            Properties.Settings.Default.Save();

-            Logger.Log($"Running command {command}");
-            adb.StartInfo.FileName = @"C:\windows\system32\cmd.exe";
+            string logcmd = command;
+            if (logcmd.Contains(Environment.CurrentDirectory))
+                logcmd = logcmd.Replace($"{Environment.CurrentDirectory}", $"CurrentDirectory");
+            Logger.Log($"Running command: {logcmd}");
+            adb.StartInfo.FileName = @"C:\Windows\System32\cmd.exe";
            adb.StartInfo.Arguments = command;
            adb.StartInfo.RedirectStandardError = true;
            adb.StartInfo.RedirectStandardInput = true;
@@ -169,9 +202,16 @@ namespace AndroidSideloader
            }
            else
                adb.WaitForExit();
-            if (error.Contains("ADB_VENDOR_KEYS"))
+            
+            if (error.Contains("ADB_VENDOR_KEYS") && Properties.Settings.Default.adbdebugwarned)
            {
-                MessageBox.Show("Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.");
+                DialogResult dialogResult = FlexibleMessageBox.Show("Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.\nPlease note that even if you have done this\nbefore it will reset itself from time to time.\n\nPress CANCEL if you want to disable this prompt (FOR DEBUGGING ONLY, NOT RECOMMENDED).", "ADB Debugging not enabled.", MessageBoxButtons.OKCancel);
+                if (dialogResult == DialogResult.Cancel)
+                {
+                    Properties.Settings.Default.adbdebugwarned = true;
+                    Properties.Settings.Default.Save();
+                }
+                else
                ADB.WakeDevice();
            }
            Logger.Log(output);
@@ -234,97 +274,98 @@ namespace AndroidSideloader
            return $"Total space: {String.Format("{0:0.00}", (double)totalSize / 1000)}GB\nUsed space: {String.Format("{0:0.00}", (double)usedSize / 1000)}GB\nFree space: {String.Format("{0:0.00}", (double)freeSize / 1000)}GB";
        }

+        public static bool wirelessadbON;
+
        public static void WakeDevice()
        {
            string devicesout = RunAdbCommandToString("shell input keyevent KEYCODE_WAKEUP").Output;
-            if (!devicesout.Contains("found"))
+            if (!devicesout.Contains("found") && !Properties.Settings.Default.nodevicemode)
            {
-                if (Properties.Settings.Default.IPAddress.Contains("connect"))
+                if (wirelessadbON || !String.IsNullOrEmpty(Properties.Settings.Default.IPAddress))
                {
-
                    RunAdbCommandToString(Properties.Settings.Default.IPAddress);
                    string response = RunAdbCommandToString(Properties.Settings.Default.IPAddress).Output;

-                    if (response.Contains("cannot") || String.IsNullOrEmpty(response))
-                    {
-                        DialogResult dialogResult = MessageBox.Show("Either your Quest is idle or you have rebooted the device.\nRSL's wireless ADB will persist on PC reboot but not on Quest reboot.\n\nNOTE: If you haven't rebooted your Quest it may be idle.\n\nTo prevent this press the HOLD button 2x prior to launching RSL. Or\nkeep your Quest plugged into power to keep it permanently \"awake\".\n\nHave you assigned your Quest a static IP in your router configuration?\n\nIf you no longer want to use Wireless ADB or your device was idle please hit CANCEL.", "DEVICE REBOOTED\\IDLE?", MessageBoxButtons.YesNoCancel);
-                        if (dialogResult == DialogResult.Cancel)
+                        if (response.Contains("cannot") || String.IsNullOrEmpty(response))
                        {
-                            DialogResult dialogResult2 = MessageBox.Show("Press OK to remove your stored IP address.\nIf your Quest went idle press the HOLD button on the device twice then press CANCEL to reconnect.", "REMOVE STORED IP?", MessageBoxButtons.OKCancel);
-                            if (dialogResult2 == DialogResult.Cancel)
-                                WakeDevice();
-                            if (dialogResult2 == DialogResult.OK)
+                            DialogResult dialogResult = FlexibleMessageBox.Show("RSL can't connect to your Quest IP, this is usually because you have rebooted your Quest or the Quest IP has changed. Set a static IP to prevent this in the future(recommended)!\n\n\nYES = Static IP is set, do not detect my IP again.\nNO = I have not set a static IP, detect my IP again.\nCANCEL = I want to disable Wireless ADB.", "DEVICE REBOOTED/IP HAS CHANGED!", MessageBoxButtons.YesNoCancel);
+                            if (dialogResult == DialogResult.Cancel)
                            {
+                                wirelessadbON = false;
                                Properties.Settings.Default.IPAddress = "";
                                Properties.Settings.Default.Save();
-                                WakeDevice();
+
+
                            }
-
-                        }
-                        else if (dialogResult == DialogResult.Yes)
-                        {
-                            MessageBox.Show("Connect your Quest to USB so we can reconnect to your saved IP address!");
-                            RunAdbCommandToString("devices");
-                            Thread.Sleep(250);
-                            RunAdbCommandToString("disconnect");
-                            Thread.Sleep(50);
-                            RunAdbCommandToString("connect");
-                            Thread.Sleep(50);
-                            RunAdbCommandToString("tcpip 5555");
-                            Thread.Sleep(500);
-                            RunAdbCommandToString(Properties.Settings.Default.IPAddress);
-                            MessageBox.Show($"Connected! We can now automatically enable wake on wifi. This makes it so Rookie can work wirelessly even if the device has entered \"sleep mode\". This setting is NOT permanent and resets upon Quest reboot just like wireless ADB functionality.\n\n After testing with this setting off and on the difference in battery usage seems nonexistent. We recommend this setting for the majority of users for ease of use purposes. If you click NO you must keep your Quest connected to a charger OR wake your device and then put it back on hold before using Rookie wirelessly. Do you want to enable wake on wifi?", "Enable Wake on Wifi?", MessageBoxButtons.YesNo);
-                            if (dialogResult == DialogResult.Yes)
+                            else if (dialogResult == DialogResult.Yes)
                            {
-
-                                RunAdbCommandToString("shell settings put global wifi_wakeup_available 1");
-                                RunAdbCommandToString("shell settings put global wifi_wakeup_enabled 1");
-                            }
-                            if (dialogResult == DialogResult.No)
-                            {
-
-                                Program.form.ChangeTitlebarToDevice();
-                                return;
-                            }
-                        }
-                        else if (dialogResult == DialogResult.No)
-                        {
-                            MessageBox.Show("You must repeat the entire connection process, press OK to begin.", "Reconfigure Wireless ADB", MessageBoxButtons.OK);
-                            RunAdbCommandToString("devices");
-                            RunAdbCommandToString("tcpip 5555");
-                            MessageBox.Show("Press OK to get your Quest's local IP address.", "Obtain local IP address", MessageBoxButtons.OK);
-                            Thread.Sleep(1000);
-                            string input = RunAdbCommandToString("shell ip route").Output;
-
-                            Properties.Settings.Default.WirelessADB = true;
-                            Properties.Settings.Default.Save();
-                            string[] strArrayOne = new string[] { "" };
-                            strArrayOne = input.Split(' ');
-                            if (strArrayOne[0].Length > 7)
-                            {
-                                string IPaddr = strArrayOne[8];
-                                string IPcmnd = "connect " + IPaddr + ":5555";
-                                MessageBox.Show($"Your Quest's local IP address is: {IPaddr}\n\nPlease disconnect your Quest then wait 2 seconds.\nOnce it is disconnected hit OK", "", MessageBoxButtons.OK);
-                                Thread.Sleep(2000);
-                                ADB.RunAdbCommandToString(IPcmnd);
-                                Properties.Settings.Default.IPAddress = IPcmnd;
-                                Properties.Settings.Default.Save();
-
-                                MessageBox.Show($"Connected! We can now automatically disable the Quest wifi chip from falling asleep. This makes it so Rookie can work wirelessly even if the device has entered \"sleep mode\". This setting is NOT permanent and resets upon Quest reboot, just like wireless ADB functionality.\n\nNOTE: This may cause the device battery to drain while it is in sleep mode at a very slightly increased rate. We recommend this setting for the majority of users for ease of use purposes. If you click NO you must keep your Quest connected to a charger or wake your device and then put it back on hold before using Rookie wirelessly. Do you want us to stop sleep mode from disabling wireless ADB?", "", MessageBoxButtons.YesNo);
+                                FlexibleMessageBox.Show("Connect your Quest to USB so we can reconnect to your saved IP address!");
+                                RunAdbCommandToString("devices");
+                                Thread.Sleep(250);
+                                RunAdbCommandToString("disconnect");
+                                Thread.Sleep(50);
+                                RunAdbCommandToString("connect");
+                                Thread.Sleep(50);
+                                RunAdbCommandToString("tcpip 5555");
+                                Thread.Sleep(500);
+                                RunAdbCommandToString(Properties.Settings.Default.IPAddress);
+                                MessageBox.Show($"Connected! We can now automatically enable wake on wifi.\n(This makes it so Rookie can work wirelessly even if the device has entered \"sleep mode\" at extremely little battery cost (~1% per full charge))", "Enable Wake on Wifi?", MessageBoxButtons.YesNo);
                                if (dialogResult == DialogResult.Yes)
                                {

-                                    ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_available 1");
-                                    ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_enabled 1");
+                                    RunAdbCommandToString("shell settings put global wifi_wakeup_available 1");
+                                    RunAdbCommandToString("shell settings put global wifi_wakeup_enabled 1");
+                                    Program.form.ChangeTitlebarToDevice();
+                                    return;
+                                }
+                                if (dialogResult == DialogResult.No)
+                                {
+
+                                    Program.form.ChangeTitlebarToDevice();
+                                    return;
                                }
-                                Program.form.ChangeTitlebarToDevice();
                            }
+                            else if (dialogResult == DialogResult.No)
+                            {
+                                FlexibleMessageBox.Show("You must repeat the entire connection process, press OK to begin.", "Reconfigure Wireless ADB", MessageBoxButtons.OK);
+                                RunAdbCommandToString("devices");
+                                RunAdbCommandToString("tcpip 5555");
+                                FlexibleMessageBox.Show("Press OK to get your Quest's local IP address.", "Obtain local IP address", MessageBoxButtons.OK);
+                                Thread.Sleep(1000);
+                                string input = RunAdbCommandToString("shell ip route").Output;

+                                Properties.Settings.Default.WirelessADB = true;
+                                Properties.Settings.Default.Save();
+                                string[] strArrayOne = new string[] { "" };
+                                strArrayOne = input.Split(' ');
+                                if (strArrayOne[0].Length > 7)
+                                {
+                                    string IPaddr = strArrayOne[8];
+                                    string IPcmnd = "connect " + IPaddr + ":5555";
+                                    FlexibleMessageBox.Show($"Your Quest's local IP address is: {IPaddr}\n\nPlease disconnect your Quest then wait 2 seconds.\nOnce it is disconnected hit OK", "", MessageBoxButtons.OK);
+                                    Thread.Sleep(2000);
+                                    ADB.RunAdbCommandToString(IPcmnd);
+                                    Properties.Settings.Default.IPAddress = IPcmnd;
+                                    Properties.Settings.Default.Save();
+
+                                    MessageBox.Show($"Connected! We can now automatically enable wake on wifi.\n(This makes it so Rookie can work wirelessly even if the device has entered \"sleep mode\" at extremely little battery cost (~1% per full charge))", "Enable Wake on Wifi?", MessageBoxButtons.YesNo);
+                                    if (dialogResult == DialogResult.Yes)
+                                    {
+
+                                        ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_available 1");
+                                        ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_enabled 1");
+                                        Program.form.ChangeTitlebarToDevice();
+                                        return;
+                                    }
+                          
+                                }
+
+                            }
                        }
-                    }
-
+                    
                }
            }
+
        }


@@ -333,41 +374,41 @@ namespace AndroidSideloader

            WakeDevice();
            ProcessOutput ret = new ProcessOutput();
-            Program.form.ChangeTitle($"Sideloading {Path.GetFileName(path)}");
            ret += RunAdbCommandToString($"install -g -r \"{path}\"");
            string out2 = ret.Output + ret.Error;
            if (out2.Contains("failed"))
            {
                string BackupFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), $"Rookie Backups");
-                if (out2.Contains("offline"))
+                Logger.Log(out2);
+                if (out2.Contains("offline") && !Properties.Settings.Default.nodevicemode)
                {
-                    DialogResult dialogResult2 = MessageBox.Show("Device is offline. Press Yes to reconnect, or if you don't wish to connect and just want to download the game (requires unchecking \"Delete games after install\" from settings menu) then press No.", "Device offline.", MessageBoxButtons.YesNoCancel);
+                    DialogResult dialogResult2 = FlexibleMessageBox.Show("Device is offline. Press Yes to reconnect, or if you don't wish to connect and just want to download the game (requires unchecking \"Delete games after install\" from settings menu) then press No.", "Device offline.", MessageBoxButtons.YesNoCancel);
                    if (dialogResult2 == DialogResult.Yes)
                        ADB.WakeDevice();
                }
-                if (out2.Contains($"INSTALL_FAILED_UPDATE_INCOMPATIBLE") || out2.Contains("INSTALL_FAILED_VERSION_DOWNGRADE"))
+                if (out2.Contains($"INSTALL_FAILED_UPDATE_INCOMPATIBLE") || out2.Contains("INSTALL_FAILED_VERSION_DOWNGRADE") || out2.Contains("signatures do not match") || out2.Contains("failed to install"))
                {
                    ret.Error = string.Empty;
                    ret.Output = string.Empty;


-                    MessageBox.Show($"In place upgrade for {packagename} failed.  We will need to upgrade by uninstalling, and keeping savedata isn't guaranteed.  Continue?", "UPGRADE FAILED!", MessageBoxButtons.OKCancel);
+                    FlexibleMessageBox.Show($"In place upgrade for {packagename} failed.  We will need to upgrade by uninstalling, and keeping savedata isn't guaranteed.  Continue?", "UPGRADE FAILED!", MessageBoxButtons.OKCancel);

                    string date_str = DateTime.Today.ToString("yyyy.MM.dd");
                    string CurrBackups = Path.Combine(BackupFolder, date_str);


-                    MessageBox.Show($"Searching for save files...", "Searching!", MessageBoxButtons.OK);
+                    FlexibleMessageBox.Show($"Searching for save files...", "Searching!", MessageBoxButtons.OK);
                    if (Directory.Exists($"/sdcard/Android/data/{packagename}"))
                    {
-                        MessageBox.Show($"Trying to backup save to Documents\\Rookie Backups\\{date_str}(YYYY.MM.DD)\\{packagename}", "Save files found", MessageBoxButtons.OK);
+                        FlexibleMessageBox.Show($"Trying to backup save to Documents\\Rookie Backups\\{date_str}(YYYY.MM.DD)\\{packagename}", "Save files found", MessageBoxButtons.OK);
                        Directory.CreateDirectory(CurrBackups);
                        ADB.RunAdbCommandToString($"pull \"/sdcard/Android/data/{packagename}\" \"{CurrBackups}\"");
                    }
                    else
                    {
-                        DialogResult dialogResult = MessageBox.Show($"No savedata found! Continue with the uninstall!", "None Found", MessageBoxButtons.OK);
-                        if (dialogResult == DialogResult.Cancel) 
+                        DialogResult dialogResult = FlexibleMessageBox.Show($"No savedata found! Continue with the uninstall!", "None Found", MessageBoxButtons.OK);
+                        if (dialogResult == DialogResult.Cancel)
                        {
                            return ret;
                        }
@@ -379,13 +420,15 @@ namespace AndroidSideloader
                }
                ret += RunAdbCommandToString($"install -g -r \"{path}\"");
            }
-            string gamenameforQU = Sideloader.PackageNametoGameName(packagename); 
-            if (File.Exists($"{Properties.Settings.Default.MainDir}\\Config.Json") && gamenameforQU.Contains("-QU") || path.Contains("-QU"))
+            string gamenameforQU = Sideloader.PackageNametoGameName(packagename);
+            if (Properties.Settings.Default.QUturnedon)
            {
-                string gameName = packagename;
-                packagename = Sideloader.gameNameToPackageName(gameName);
+                if (gamenameforQU.Contains("-QU") || path.Contains("-QU"))
+                {
+                    string gameName = packagename;
+                    packagename = Sideloader.gameNameToPackageName(gameName);

-                Program.form.ChangeTitle("Pushing Custom QU S3 Config.JSON.");
+                    Program.form.ChangeTitle("Pushing Custom QU S3 Config.JSON.");
                    if (!Directory.Exists($"/sdcard/android/data/{packagename}"))
                        RunAdbCommandToString($"shell mkdir /sdcard/android/data/{packagename}");
                    if (!Directory.Exists($"/sdcard/android/data/{packagename}/private"))
@@ -410,8 +453,10 @@ namespace AndroidSideloader
                    File.WriteAllText($"{Properties.Settings.Default.MainDir}\\delete_settings", blank);
                    ret += ADB.RunAdbCommandToString($"push \"{Properties.Settings.Default.MainDir}\\delete_settings\" /sdcard/android/data/{packagename}/private/delete_settings");
                    ret += ADB.RunAdbCommandToString($"push \"{Properties.Settings.Default.MainDir}\\config.json\" /sdcard/android/data/{packagename}/private/config.json");
-            
-        }
+                }
+            }
+
+
            Program.form.ChangeTitle("");
            return ret;
        }
@@ -419,7 +464,9 @@ namespace AndroidSideloader
        public static ProcessOutput CopyOBB(string path)
        {
            WakeDevice();
-            if (Path.GetDirectoryName(path).Contains(".") && !Path.GetDirectoryName(path).Contains("_data") || path.Contains("."))
+
+            string folder = Path.GetFileName(path);
+            if (!folder.Contains("+") && !folder.Contains("_") && folder.Contains("."))
            {
             return RunAdbCommandToString($"push \"{path}\" \"/sdcard/Android/obb\"");
            }
--- a/v2.1HF.exe
+++ b/v2.1HF.exe
--- a/AndroidSideloader.csproj
+++ b/AndroidSideloader.csproj
@@ -15,6 +15,7 @@
    <Deterministic>true</Deterministic>
    <NuGetPackageImportStamp>
    </NuGetPackageImportStamp>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
    <PublishUrl>publish\</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Disk</InstallFrom>
@@ -27,7 +28,6 @@
    <MapFileExtensions>true</MapFileExtensions>
    <ApplicationRevision>0</ApplicationRevision>
    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
@@ -146,6 +146,7 @@
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Core" />
+    <Reference Include="System.Management" />
    <Reference Include="System.Xml.Linq" />
    <Reference Include="System.Data.DataSetExtensions" />
    <Reference Include="Microsoft.CSharp" />
@@ -210,6 +211,7 @@
    <Compile Include="SelectFolder.cs" />
    <Compile Include="Utilities\StringUtilities.cs" />
    <Compile Include="Utilities\GeneralUtilities.cs" />
+    <Compile Include="Utilities\UploadGame.cs" />
    <EmbeddedResource Include="MainForm.resx">
      <DependentUpon>MainForm.cs</DependentUpon>
      <SubType>Designer</SubType>
@@ -260,6 +262,13 @@
  <ItemGroup>
    <Content Include="changelog.txt" />
    <Content Include="icon.ico" />
+    <Content Include="ChangelogHistory.txt" />
+    <None Include="Resources\battery11.png" />
+    <None Include="Resources\battery.png" />
+    <None Include="Resources\battery1.png" />
+    <None Include="Resources\ajax-loader.gif" />
+    <Content Include="Resources\bluekey.png" />
+    <Content Include="Resources\redkey.png" />
    <None Include="Resources\greenkey.png" />
    <None Include="Resources\orangekey.png" />
    <None Include="Resources\SearchGlass.PNG" />
--- a/App.config
+++ b/App.config
@@ -51,7 +51,7 @@
                <value>White</value>
            </setting>
            <setting name="FontStyle" serializeAs="String">
-                <value>Microsoft Sans Serif, 12pt</value>
+                <value>Microsoft Sans Serif, 11pt</value>
            </setting>
            <setting name="BackPicturePath" serializeAs="String">
                <value />
@@ -143,6 +143,27 @@
            <setting name="CurrentCrashName" serializeAs="String">
                <value />
            </setting>
+            <setting name="QUturnedon" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="QblindOn" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="adbdebugwarned" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="nodevicemode" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="BMBFchecked" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="GamesList" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="UploadedGameList" serializeAs="String">
+                <value>False</value>
+            </setting>
        </AndroidSideloader.Properties.Settings>
        <AndroidADB.Sideloader.Properties.Settings>
            <setting name="checkForUpdates" serializeAs="String">
--- a/ChangelogHistory.txt
+++ b/ChangelogHistory.txt
--- a/FlexibleMessageBox.cs
+++ b/FlexibleMessageBox.cs
@@ -380,6 +380,7 @@ namespace JR.Utils.GUI.Forms
                // 
                // FlexibleMessageBoxForm
                // 
+                this.TopMost = true;
                this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
                this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
                this.ClientSize = new System.Drawing.Size(260, 102);
--- a/MainForm.Designer.cs
+++ b/MainForm.Designer.cs
@@ -41,6 +41,10 @@
            this.copyBulkObbButton = new System.Windows.Forms.Button();
            this.downloadInstallGameButton = new System.Windows.Forms.Button();
            this.panel1 = new System.Windows.Forms.Panel();
+            this.ULLabel = new System.Windows.Forms.Label();
+            this.ULGif = new System.Windows.Forms.PictureBox();
+            this.BatteryLbl = new System.Windows.Forms.Label();
+            this.pictureBox5 = new System.Windows.Forms.PictureBox();
            this.downloadingLabel = new System.Windows.Forms.Label();
            this.aboutBtn = new System.Windows.Forms.Button();
            this.settingsButton = new System.Windows.Forms.Button();
@@ -78,10 +82,6 @@
            this.label3 = new System.Windows.Forms.Label();
            this.label4 = new System.Windows.Forms.Label();
            this.label5 = new System.Windows.Forms.Label();
-            this.pictureBox3 = new System.Windows.Forms.PictureBox();
-            this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            this.gamesPictureBox = new System.Windows.Forms.PictureBox();
-            this.pictureBox4 = new System.Windows.Forms.PictureBox();
            this.label6 = new System.Windows.Forms.Label();
            this.label7 = new System.Windows.Forms.Label();
            this.label8 = new System.Windows.Forms.Label();
@@ -89,20 +89,25 @@
            this.ADBcommandbox = new System.Windows.Forms.TextBox();
            this.label11 = new System.Windows.Forms.Label();
            this.label9 = new System.Windows.Forms.Label();
+            this.pictureBox4 = new System.Windows.Forms.PictureBox();
+            this.pictureBox3 = new System.Windows.Forms.PictureBox();
+            this.pictureBox2 = new System.Windows.Forms.PictureBox();
+            this.gamesPictureBox = new System.Windows.Forms.PictureBox();
            this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.ULGif)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();
            this.otherContainer.SuspendLayout();
            this.backupContainer.SuspendLayout();
            this.sideloadContainer.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gamesPictureBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();
            this.SuspendLayout();
            // 
            // m_combo
            // 
-            this.m_combo.Anchor = System.Windows.Forms.AnchorStyles.Top;
            this.m_combo.BackColor = global::AndroidSideloader.Properties.Settings.Default.ComboBoxColor;
            this.m_combo.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "ComboBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.m_combo.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
@@ -112,9 +117,9 @@
            this.m_combo.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
            this.m_combo.Location = new System.Drawing.Point(227, 8);
            this.m_combo.Name = "m_combo";
-            this.m_combo.Size = new System.Drawing.Size(353, 28);
+            this.m_combo.Size = new System.Drawing.Size(353, 26);
            this.m_combo.TabIndex = 0;
-            this.m_combo.Text = "Select an app to uninstall...";
+            this.m_combo.Text = "Select an app to uninstall or extract...";
            // 
            // startsideloadbutton
            // 
@@ -237,7 +242,7 @@
            this.getApkButton.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
            this.getApkButton.Size = new System.Drawing.Size(218, 28);
            this.getApkButton.TabIndex = 2;
-            this.getApkButton.Text = "Extract Apk from device";
+            this.getApkButton.Text = "Upload Selected App";
            this.getApkButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
            this.getApkButton.UseVisualStyleBackColor = false;
            this.getApkButton.Click += new System.EventHandler(this.getApkButton_Click);
@@ -334,11 +339,17 @@
            this.downloadInstallGameButton.Text = "Download and Install Game/Add to Queue";
            this.downloadInstallGameButton.UseVisualStyleBackColor = false;
            this.downloadInstallGameButton.Click += new System.EventHandler(this.downloadInstallGameButton_Click);
+            this.downloadInstallGameButton.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
+            this.downloadInstallGameButton.DragEnter += new System.Windows.Forms.DragEventHandler(this.Form1_DragEnter);
            // 
            // panel1
            // 
            this.panel1.AutoScroll = true;
            this.panel1.BackColor = global::AndroidSideloader.Properties.Settings.Default.ButtonColor;
+            this.panel1.Controls.Add(this.ULLabel);
+            this.panel1.Controls.Add(this.ULGif);
+            this.panel1.Controls.Add(this.BatteryLbl);
+            this.panel1.Controls.Add(this.pictureBox5);
            this.panel1.Controls.Add(this.downloadingLabel);
            this.panel1.Controls.Add(this.aboutBtn);
            this.panel1.Controls.Add(this.settingsButton);
@@ -355,11 +366,58 @@
            this.panel1.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "ButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.panel1.Margin = new System.Windows.Forms.Padding(2);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(218, 721);
            this.panel1.TabIndex = 73;
            // 
+            // ULLabel
+            // 
+            this.ULLabel.AutoSize = true;
+            this.ULLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.ULLabel.ForeColor = System.Drawing.Color.Snow;
+            this.ULLabel.Location = new System.Drawing.Point(154, 683);
+            this.ULLabel.Name = "ULLabel";
+            this.ULLabel.Size = new System.Drawing.Size(64, 13);
+            this.ULLabel.TabIndex = 87;
+            this.ULLabel.Text = "Uploading";
+            this.ULLabel.Visible = false;
+            // 
+            // ULGif
+            // 
+            this.ULGif.Enabled = false;
+            this.ULGif.Image = global::AndroidSideloader.Properties.Resources.ajax_loader;
+            this.ULGif.Location = new System.Drawing.Point(178, 699);
+            this.ULGif.Name = "ULGif";
+            this.ULGif.Size = new System.Drawing.Size(34, 17);
+            this.ULGif.TabIndex = 86;
+            this.ULGif.TabStop = false;
+            this.ULGif.Visible = false;
+            // 
+            // BatteryLbl
+            // 
+            this.BatteryLbl.AutoSize = true;
+            this.BatteryLbl.BackColor = System.Drawing.Color.Transparent;
+            this.BatteryLbl.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.BatteryLbl.ForeColor = System.Drawing.SystemColors.ControlLightLight;
+            this.BatteryLbl.Location = new System.Drawing.Point(156, 580);
+            this.BatteryLbl.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.BatteryLbl.Name = "BatteryLbl";
+            this.BatteryLbl.Size = new System.Drawing.Size(47, 17);
+            this.BatteryLbl.TabIndex = 84;
+            this.BatteryLbl.Text = "N/A%";
+            // 
+            // pictureBox5
+            // 
+            this.pictureBox5.BackColor = System.Drawing.Color.Transparent;
+            this.pictureBox5.Image = global::AndroidSideloader.Properties.Resources.battery11;
+            this.pictureBox5.Location = new System.Drawing.Point(155, 576);
+            this.pictureBox5.Margin = new System.Windows.Forms.Padding(2);
+            this.pictureBox5.Name = "pictureBox5";
+            this.pictureBox5.Size = new System.Drawing.Size(55, 29);
+            this.pictureBox5.TabIndex = 85;
+            this.pictureBox5.TabStop = false;
+            // 
            // downloadingLabel
            // 
            this.downloadingLabel.AutoSize = true;
@@ -425,7 +483,7 @@
            this.otherContainer.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.otherContainer.Dock = System.Windows.Forms.DockStyle.Top;
            this.otherContainer.Location = new System.Drawing.Point(0, 401);
-            this.otherContainer.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.otherContainer.Margin = new System.Windows.Forms.Padding(2);
            this.otherContainer.Name = "otherContainer";
            this.otherContainer.Size = new System.Drawing.Size(218, 167);
            this.otherContainer.TabIndex = 80;
@@ -569,7 +627,7 @@
            this.otherDrop.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.otherDrop.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
            this.otherDrop.Location = new System.Drawing.Point(0, 373);
-            this.otherDrop.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.otherDrop.Margin = new System.Windows.Forms.Padding(2);
            this.otherDrop.Name = "otherDrop";
            this.otherDrop.Padding = new System.Windows.Forms.Padding(7, 0, 0, 0);
            this.otherDrop.Size = new System.Drawing.Size(218, 28);
@@ -587,7 +645,7 @@
            this.backupContainer.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.backupContainer.Dock = System.Windows.Forms.DockStyle.Top;
            this.backupContainer.Location = new System.Drawing.Point(0, 313);
-            this.backupContainer.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.backupContainer.Margin = new System.Windows.Forms.Padding(2);
            this.backupContainer.Name = "backupContainer";
            this.backupContainer.Size = new System.Drawing.Size(218, 60);
            this.backupContainer.TabIndex = 76;
@@ -605,7 +663,7 @@
            this.backupDrop.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.backupDrop.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
            this.backupDrop.Location = new System.Drawing.Point(0, 285);
-            this.backupDrop.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.backupDrop.Margin = new System.Windows.Forms.Padding(2);
            this.backupDrop.Name = "backupDrop";
            this.backupDrop.Padding = new System.Windows.Forms.Padding(7, 0, 0, 0);
            this.backupDrop.Size = new System.Drawing.Size(218, 28);
@@ -629,7 +687,7 @@
            this.sideloadContainer.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.sideloadContainer.Dock = System.Windows.Forms.DockStyle.Top;
            this.sideloadContainer.Location = new System.Drawing.Point(0, 56);
-            this.sideloadContainer.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.sideloadContainer.Margin = new System.Windows.Forms.Padding(2);
            this.sideloadContainer.Name = "sideloadContainer";
            this.sideloadContainer.Size = new System.Drawing.Size(218, 229);
            this.sideloadContainer.TabIndex = 74;
@@ -689,7 +747,7 @@
            this.sideloadDrop.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.sideloadDrop.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
            this.sideloadDrop.Location = new System.Drawing.Point(0, 28);
-            this.sideloadDrop.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.sideloadDrop.Margin = new System.Windows.Forms.Padding(2);
            this.sideloadDrop.Name = "sideloadDrop";
            this.sideloadDrop.Padding = new System.Windows.Forms.Padding(7, 0, 0, 0);
            this.sideloadDrop.Size = new System.Drawing.Size(218, 28);
@@ -706,10 +764,10 @@
            this.diskLabel.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.diskLabel.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.diskLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.diskLabel.Location = new System.Drawing.Point(3, 624);
+            this.diskLabel.Location = new System.Drawing.Point(7, 622);
            this.diskLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
            this.diskLabel.Name = "diskLabel";
-            this.diskLabel.Size = new System.Drawing.Size(83, 20);
+            this.diskLabel.Size = new System.Drawing.Size(77, 18);
            this.diskLabel.TabIndex = 7;
            this.diskLabel.Text = "Disk Label";
            // 
@@ -720,10 +778,10 @@
            this.speedLabel.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.speedLabel.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.speedLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.speedLabel.Location = new System.Drawing.Point(0, 681);
+            this.speedLabel.Location = new System.Drawing.Point(7, 680);
            this.speedLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
            this.speedLabel.Name = "speedLabel";
-            this.speedLabel.Size = new System.Drawing.Size(161, 20);
+            this.speedLabel.Size = new System.Drawing.Size(149, 18);
            this.speedLabel.TabIndex = 76;
            this.speedLabel.Text = "DLS: Speed in MBPS";
            // 
@@ -734,10 +792,10 @@
            this.etaLabel.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.etaLabel.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.etaLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.etaLabel.Location = new System.Drawing.Point(0, 698);
+            this.etaLabel.Location = new System.Drawing.Point(7, 699);
            this.etaLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
            this.etaLabel.Name = "etaLabel";
-            this.etaLabel.Size = new System.Drawing.Size(160, 20);
+            this.etaLabel.Size = new System.Drawing.Size(148, 18);
            this.etaLabel.TabIndex = 75;
            this.etaLabel.Text = "ETA: HH:MM:SS Left";
            // 
@@ -760,6 +818,7 @@
            // 
            // gamesQueListBox
            // 
+            this.gamesQueListBox.AllowDrop = true;
            this.gamesQueListBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
            | System.Windows.Forms.AnchorStyles.Right)));
            this.gamesQueListBox.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor;
@@ -770,17 +829,18 @@
            this.gamesQueListBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.gamesQueListBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
            this.gamesQueListBox.FormattingEnabled = true;
-            this.gamesQueListBox.ItemHeight = 20;
+            this.gamesQueListBox.ItemHeight = 18;
            this.gamesQueListBox.Location = new System.Drawing.Point(601, 475);
-            this.gamesQueListBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.gamesQueListBox.Margin = new System.Windows.Forms.Padding(2);
            this.gamesQueListBox.Name = "gamesQueListBox";
-            this.gamesQueListBox.Size = new System.Drawing.Size(369, 142);
+            this.gamesQueListBox.Size = new System.Drawing.Size(369, 146);
            this.gamesQueListBox.TabIndex = 9;
            this.gamesQueListBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.gamesQueListBox_MouseClick);
+            this.gamesQueListBox.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
+            this.gamesQueListBox.DragEnter += new System.Windows.Forms.DragEventHandler(this.Form1_DragEnter);
            // 
            // devicesComboBox
            // 
-            this.devicesComboBox.Anchor = System.Windows.Forms.AnchorStyles.Top;
            this.devicesComboBox.BackColor = global::AndroidSideloader.Properties.Settings.Default.ComboBoxColor;
            this.devicesComboBox.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "ComboBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.devicesComboBox.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
@@ -790,16 +850,15 @@
            this.devicesComboBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
            this.devicesComboBox.FormattingEnabled = true;
            this.devicesComboBox.Location = new System.Drawing.Point(227, 39);
-            this.devicesComboBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.devicesComboBox.Margin = new System.Windows.Forms.Padding(2);
            this.devicesComboBox.Name = "devicesComboBox";
-            this.devicesComboBox.Size = new System.Drawing.Size(161, 28);
+            this.devicesComboBox.Size = new System.Drawing.Size(161, 26);
            this.devicesComboBox.TabIndex = 1;
            this.devicesComboBox.Text = "Select your device";
            this.devicesComboBox.SelectedIndexChanged += new System.EventHandler(this.devicesComboBox_SelectedIndexChanged);
            // 
            // remotesList
            // 
-            this.remotesList.Anchor = System.Windows.Forms.AnchorStyles.Top;
            this.remotesList.BackColor = global::AndroidSideloader.Properties.Settings.Default.ComboBoxColor;
            this.remotesList.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "ComboBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.remotesList.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
@@ -809,9 +868,9 @@
            this.remotesList.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
            this.remotesList.FormattingEnabled = true;
            this.remotesList.Location = new System.Drawing.Point(527, 39);
-            this.remotesList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.remotesList.Margin = new System.Windows.Forms.Padding(2);
            this.remotesList.Name = "remotesList";
-            this.remotesList.Size = new System.Drawing.Size(53, 28);
+            this.remotesList.Size = new System.Drawing.Size(53, 26);
            this.remotesList.TabIndex = 3;
            this.remotesList.SelectedIndexChanged += new System.EventHandler(this.remotesList_SelectedIndexChanged);
            // 
@@ -825,13 +884,15 @@
            this.gamesListView.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.gamesListView.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
            this.gamesListView.HideSelection = false;
-            this.gamesListView.Location = new System.Drawing.Point(224, 65);
+            this.gamesListView.Location = new System.Drawing.Point(224, 71);
            this.gamesListView.Name = "gamesListView";
-            this.gamesListView.Size = new System.Drawing.Size(746, 366);
+            this.gamesListView.Size = new System.Drawing.Size(746, 360);
            this.gamesListView.TabIndex = 6;
            this.gamesListView.UseCompatibleStateImageBehavior = false;
            this.gamesListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listView1_ColumnClick);
            this.gamesListView.SelectedIndexChanged += new System.EventHandler(this.gamesListView_SelectedIndexChanged);
+            this.gamesListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
+            this.gamesListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.Form1_DragEnter);
            this.gamesListView.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.gamesListView_KeyPress);
            this.gamesListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.gamesListView_MouseDoubleClick);
            // 
@@ -848,13 +909,14 @@
            this.searchTextBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.searchTextBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
            this.searchTextBox.Location = new System.Drawing.Point(484, 250);
+            this.searchTextBox.MaximumSize = new System.Drawing.Size(231, 26);
+            this.searchTextBox.MinimumSize = new System.Drawing.Size(231, 26);
            this.searchTextBox.Name = "searchTextBox";
-            this.searchTextBox.Size = new System.Drawing.Size(231, 26);
+            this.searchTextBox.Size = new System.Drawing.Size(231, 24);
            this.searchTextBox.TabIndex = 5;
            this.searchTextBox.Text = "Search";
            this.searchTextBox.Visible = false;
            this.searchTextBox.TextChanged += new System.EventHandler(this.searchTextBox_TextChanged);
-            this.searchTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.searchTextBox_KeyPress);
            this.searchTextBox.Leave += new System.EventHandler(this.searchTextBox_Leave);
            // 
            // gamesQueueLabel
@@ -865,15 +927,14 @@
            this.gamesQueueLabel.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.gamesQueueLabel.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.gamesQueueLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.gamesQueueLabel.Location = new System.Drawing.Point(597, 599);
+            this.gamesQueueLabel.Location = new System.Drawing.Point(597, 601);
            this.gamesQueueLabel.Name = "gamesQueueLabel";
-            this.gamesQueueLabel.Size = new System.Drawing.Size(113, 20);
+            this.gamesQueueLabel.Size = new System.Drawing.Size(52, 18);
            this.gamesQueueLabel.TabIndex = 86;
-            this.gamesQueueLabel.Text = "Games Queue";
+            this.gamesQueueLabel.Text = "Queue";
            // 
            // MountButton
            // 
-            this.MountButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
            this.MountButton.BackColor = global::AndroidSideloader.Properties.Settings.Default.SubButtonColor;
            this.MountButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
            this.MountButton.Cursor = System.Windows.Forms.Cursors.Default;
@@ -921,7 +982,7 @@
            this.notesRichTextBox.ShowSelectionMargin = true;
            this.notesRichTextBox.Size = new System.Drawing.Size(369, 67);
            this.notesRichTextBox.TabIndex = 10;
-            this.notesRichTextBox.Text = "";
+            this.notesRichTextBox.Text = "\n\n\n                                   TIP: PRESS F1 TO SEE A LIST OF SHORTCUTS";
            // 
            // DragDropLbl
            // 
@@ -945,11 +1006,11 @@
            this.label1.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.label1.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.label1.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.label1.Location = new System.Drawing.Point(598, 677);
+            this.label1.Location = new System.Drawing.Point(597, 674);
            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(97, 20);
+            this.label1.Size = new System.Drawing.Size(48, 18);
            this.label1.TabIndex = 86;
-            this.label1.Text = "Install Notes";
+            this.label1.Text = "Notes";
            // 
            // pictureBox1
            // 
@@ -972,7 +1033,7 @@
            // label2
            // 
            this.label2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(45)))), ((int)(((byte)(45)))), ((int)(((byte)(45)))));
-            this.label2.Location = new System.Drawing.Point(465, 196);
+            this.label2.Location = new System.Drawing.Point(464, 196);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(271, 120);
            this.label2.TabIndex = 89;
@@ -1002,71 +1063,29 @@
            this.label4.AutoSize = true;
            this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
            this.label4.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.label4.Location = new System.Drawing.Point(532, 284);
+            this.label4.Location = new System.Drawing.Point(506, 283);
            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(132, 17);
+            this.label4.Size = new System.Drawing.Size(183, 17);
            this.label4.TabIndex = 90;
-            this.label4.Text = "Shorcut: CTRL+F";
+            this.label4.Text = "Shorcuts: CTRL+F or F2";
            this.label4.TextAlign = System.Drawing.ContentAlignment.TopCenter;
            this.label4.Visible = false;
            // 
            // label5
            // 
-            this.label5.Anchor = System.Windows.Forms.AnchorStyles.Top;
            this.label5.AutoSize = true;
            this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
            this.label5.ForeColor = System.Drawing.SystemColors.ControlLightLight;
            this.label5.Location = new System.Drawing.Point(692, 11);
            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(99, 17);
+            this.label5.Size = new System.Drawing.Size(105, 17);
            this.label5.TabIndex = 90;
-            this.label5.Text = "Search apps";
+            this.label5.Text = "Quick Search";
            this.label5.TextAlign = System.Drawing.ContentAlignment.TopCenter;
            // 
-            // pictureBox3
-            // 
-            this.pictureBox3.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.pictureBox3.Image = global::AndroidSideloader.Properties.Resources.orangekey;
-            this.pictureBox3.Location = new System.Drawing.Point(803, 10);
-            this.pictureBox3.Name = "pictureBox3";
-            this.pictureBox3.Size = new System.Drawing.Size(21, 20);
-            this.pictureBox3.TabIndex = 92;
-            this.pictureBox3.TabStop = false;
-            // 
-            // pictureBox2
-            // 
-            this.pictureBox2.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.pictureBox2.Image = global::AndroidSideloader.Properties.Resources.SearchGlass;
-            this.pictureBox2.Location = new System.Drawing.Point(731, 37);
-            this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(28, 24);
-            this.pictureBox2.TabIndex = 91;
-            this.pictureBox2.TabStop = false;
-            this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click);
-            // 
-            // gamesPictureBox
-            // 
-            this.gamesPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.gamesPictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
-            this.gamesPictureBox.Location = new System.Drawing.Point(224, 472);
-            this.gamesPictureBox.Name = "gamesPictureBox";
-            this.gamesPictureBox.Size = new System.Drawing.Size(371, 214);
-            this.gamesPictureBox.TabIndex = 84;
-            this.gamesPictureBox.TabStop = false;
-            // 
-            // pictureBox4
-            // 
-            this.pictureBox4.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.pictureBox4.Image = global::AndroidSideloader.Properties.Resources.greenkey;
-            this.pictureBox4.Location = new System.Drawing.Point(803, 39);
-            this.pictureBox4.Name = "pictureBox4";
-            this.pictureBox4.Size = new System.Drawing.Size(21, 20);
-            this.pictureBox4.TabIndex = 92;
-            this.pictureBox4.TabStop = false;
-            // 
            // label6
            // 
-            this.label6.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
            this.label6.AutoSize = true;
            this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
            this.label6.ForeColor = System.Drawing.SystemColors.ControlLightLight;
@@ -1079,7 +1098,7 @@
            // 
            // label7
            // 
-            this.label7.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
            this.label7.AutoSize = true;
            this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
            this.label7.ForeColor = System.Drawing.SystemColors.ControlLightLight;
@@ -1092,7 +1111,6 @@
            // 
            // label8
            // 
-            this.label8.Anchor = System.Windows.Forms.AnchorStyles.Top;
            this.label8.AutoSize = true;
            this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold);
            this.label8.ForeColor = System.Drawing.SystemColors.ControlLightLight;
@@ -1112,7 +1130,7 @@
            this.EnterInstallBox.ForeColor = System.Drawing.SystemColors.ControlLightLight;
            this.EnterInstallBox.Location = new System.Drawing.Point(593, 7);
            this.EnterInstallBox.Name = "EnterInstallBox";
-            this.EnterInstallBox.Size = new System.Drawing.Size(86, 58);
+            this.EnterInstallBox.Size = new System.Drawing.Size(80, 54);
            this.EnterInstallBox.TabIndex = 93;
            this.EnterInstallBox.Text = "  Install w/ \r\n Enter Key";
            this.EnterInstallBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1131,9 +1149,11 @@
            this.ADBcommandbox.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.ADBcommandbox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.ADBcommandbox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.ADBcommandbox.Location = new System.Drawing.Point(485, 251);
+            this.ADBcommandbox.Location = new System.Drawing.Point(485, 250);
+            this.ADBcommandbox.MaximumSize = new System.Drawing.Size(231, 26);
+            this.ADBcommandbox.MinimumSize = new System.Drawing.Size(231, 26);
            this.ADBcommandbox.Name = "ADBcommandbox";
-            this.ADBcommandbox.Size = new System.Drawing.Size(231, 26);
+            this.ADBcommandbox.Size = new System.Drawing.Size(231, 24);
            this.ADBcommandbox.TabIndex = 5;
            this.ADBcommandbox.Visible = false;
            this.ADBcommandbox.TextChanged += new System.EventHandler(this.searchTextBox_TextChanged);
@@ -1173,6 +1193,48 @@
            this.label9.TextAlign = System.Drawing.ContentAlignment.TopCenter;
            this.label9.Visible = false;
            // 
+            // pictureBox4
+            // 
+            this.pictureBox4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.pictureBox4.Image = global::AndroidSideloader.Properties.Resources.greenkey;
+            this.pictureBox4.Location = new System.Drawing.Point(803, 39);
+            this.pictureBox4.Name = "pictureBox4";
+            this.pictureBox4.Size = new System.Drawing.Size(21, 20);
+            this.pictureBox4.TabIndex = 92;
+            this.pictureBox4.TabStop = false;
+            // 
+            // pictureBox3
+            // 
+            this.pictureBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.pictureBox3.Image = global::AndroidSideloader.Properties.Resources.orangekey;
+            this.pictureBox3.Location = new System.Drawing.Point(803, 10);
+            this.pictureBox3.Name = "pictureBox3";
+            this.pictureBox3.Size = new System.Drawing.Size(21, 20);
+            this.pictureBox3.TabIndex = 92;
+            this.pictureBox3.TabStop = false;
+            // 
+            // pictureBox2
+            // 
+            this.pictureBox2.Image = global::AndroidSideloader.Properties.Resources.SearchGlass;
+            this.pictureBox2.Location = new System.Drawing.Point(731, 37);
+            this.pictureBox2.Name = "pictureBox2";
+            this.pictureBox2.Size = new System.Drawing.Size(28, 24);
+            this.pictureBox2.TabIndex = 91;
+            this.pictureBox2.TabStop = false;
+            this.pictureBox2.Click += new System.EventHandler(this.pictureBox2_Click);
+            // 
+            // gamesPictureBox
+            // 
+            this.gamesPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.gamesPictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.gamesPictureBox.Location = new System.Drawing.Point(224, 474);
+            this.gamesPictureBox.Name = "gamesPictureBox";
+            this.gamesPictureBox.Size = new System.Drawing.Size(371, 214);
+            this.gamesPictureBox.TabIndex = 84;
+            this.gamesPictureBox.TabStop = false;
+            this.gamesPictureBox.DragDrop += new System.Windows.Forms.DragEventHandler(this.Form1_DragDrop);
+            this.gamesPictureBox.DragEnter += new System.Windows.Forms.DragEventHandler(this.Form1_DragEnter);
+            // 
            // MainForm
            // 
            this.AllowDrop = true;
@@ -1180,6 +1242,7 @@
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor;
            this.ClientSize = new System.Drawing.Size(980, 721);
+            this.Controls.Add(this.label4);
            this.Controls.Add(this.EnterInstallBox);
            this.Controls.Add(this.ProgressText);
            this.Controls.Add(this.pictureBox4);
@@ -1190,7 +1253,6 @@
            this.Controls.Add(this.label8);
            this.Controls.Add(this.label5);
            this.Controls.Add(this.label11);
-            this.Controls.Add(this.label4);
            this.Controls.Add(this.ADBcommandbox);
            this.Controls.Add(this.searchTextBox);
            this.Controls.Add(this.label9);
@@ -1226,14 +1288,16 @@
            this.DragLeave += new System.EventHandler(this.Form1_DragLeave);
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.ULGif)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();
            this.otherContainer.ResumeLayout(false);
            this.backupContainer.ResumeLayout(false);
            this.sideloadContainer.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gamesPictureBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();
            this.ResumeLayout(false);
            this.PerformLayout();

@@ -1269,7 +1333,6 @@
        private System.Windows.Forms.Button ADBWirelessDisable;
        private System.Windows.Forms.Label freeDisclaimer;
        private System.Windows.Forms.ComboBox devicesComboBox;
-        private System.Windows.Forms.ComboBox remotesList;
        private System.Windows.Forms.Button QuestOptionsButton;
        private System.Windows.Forms.Button ThemeChangerButton;
        private System.Windows.Forms.ListBox gamesQueListBox;
@@ -1301,6 +1364,11 @@
        private System.Windows.Forms.TextBox ADBcommandbox;
        private System.Windows.Forms.Label label11;
        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.Label BatteryLbl;
+        private System.Windows.Forms.PictureBox pictureBox5;
+        public System.Windows.Forms.ComboBox remotesList;
+        private System.Windows.Forms.PictureBox ULGif;
+        private System.Windows.Forms.Label ULLabel;
    }
 }

--- a/MainForm.cs
+++ b/MainForm.cs
--- a/Properties/Resources.Designer.cs
+++ b/Properties/Resources.Designer.cs
@@ -60,6 +60,56 @@ namespace AndroidSideloader.Properties {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap ajax_loader {
+            get {
+                object obj = ResourceManager.GetObject("ajax-loader", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap battery {
+            get {
+                object obj = ResourceManager.GetObject("battery", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap battery1 {
+            get {
+                object obj = ResourceManager.GetObject("battery1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap battery11 {
+            get {
+                object obj = ResourceManager.GetObject("battery11", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap bluekey {
+            get {
+                object obj = ResourceManager.GetObject("bluekey", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized resource of type System.Drawing.Bitmap.
        /// </summary>
@@ -80,6 +130,16 @@ namespace AndroidSideloader.Properties {
            }
        }
        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap redkey {
+            get {
+                object obj = ResourceManager.GetObject("redkey", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
        /// <summary>
        ///   Looks up a localized resource of type System.Drawing.Bitmap.
        /// </summary>
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -118,13 +118,31 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="orangekey" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\orangekey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="greenkey" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\greenkey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="battery1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\battery11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="battery" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\battery.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="battery11" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\battery1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="SearchGlass" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\SearchGlass.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="orangekey" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\orangekey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="bluekey" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bluekey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="redkey" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\redkey.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ajax-loader" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ajax-loader.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
 </root>
--- a/Properties/Settings.Designer.cs
+++ b/Properties/Settings.Designer.cs
@@ -181,7 +181,7 @@ namespace AndroidSideloader.Properties {
        
        [global::System.Configuration.UserScopedSettingAttribute()]
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Microsoft Sans Serif, 12pt")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Microsoft Sans Serif, 11pt")]
        public global::System.Drawing.Font FontStyle {
            get {
                return ((global::System.Drawing.Font)(this["FontStyle"]));
@@ -550,5 +550,89 @@ namespace AndroidSideloader.Properties {
                this["CurrentCrashName"] = value;
            }
        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool QUturnedon {
+            get {
+                return ((bool)(this["QUturnedon"]));
+            }
+            set {
+                this["QUturnedon"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool QblindOn {
+            get {
+                return ((bool)(this["QblindOn"]));
+            }
+            set {
+                this["QblindOn"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool adbdebugwarned {
+            get {
+                return ((bool)(this["adbdebugwarned"]));
+            }
+            set {
+                this["adbdebugwarned"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool nodevicemode {
+            get {
+                return ((bool)(this["nodevicemode"]));
+            }
+            set {
+                this["nodevicemode"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        public bool BMBFchecked {
+            get {
+                return ((bool)(this["BMBFchecked"]));
+            }
+            set {
+                this["BMBFchecked"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("")]
+        public string GamesList {
+            get {
+                return ((string)(this["GamesList"]));
+            }
+            set {
+                this["GamesList"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool UploadedGameList {
+            get {
+                return ((bool)(this["UploadedGameList"]));
+            }
+            set {
+                this["UploadedGameList"] = value;
+            }
+        }
    }
 }
--- a/Properties/Settings.settings
+++ b/Properties/Settings.settings
@@ -42,7 +42,7 @@
      <Value Profile="(Default)">White</Value>
    </Setting>
    <Setting Name="FontStyle" Type="System.Drawing.Font" Scope="User">
-      <Value Profile="(Default)">Microsoft Sans Serif, 12pt</Value>
+      <Value Profile="(Default)">Microsoft Sans Serif, 11pt</Value>
    </Setting>
    <Setting Name="BackPicturePath" Type="System.String" Scope="User">
      <Value Profile="(Default)" />
@@ -134,5 +134,26 @@
    <Setting Name="CurrentCrashName" Type="System.String" Scope="User">
      <Value Profile="(Default)" />
    </Setting>
+    <Setting Name="QUturnedon" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="QblindOn" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="adbdebugwarned" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="nodevicemode" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="BMBFchecked" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="GamesList" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="UploadedGameList" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
  </Settings>
 </SettingsFile>
--- a/QuestForm.Designer.cs
+++ b/QuestForm.Designer.cs
@@ -68,6 +68,7 @@ namespace AndroidSideloader
            this.button1 = new System.Windows.Forms.Button();
            this.QURfrRt = new System.Windows.Forms.ComboBox();
            this.RefreshRateComboBox = new System.Windows.Forms.ComboBox();
+            this.WifiWake = new System.Windows.Forms.Button();
            this.SuspendLayout();
            // 
            // label1
@@ -127,9 +128,9 @@ namespace AndroidSideloader
            this.ResetQU.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.ResetQU.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.5F);
            this.ResetQU.ForeColor = System.Drawing.SystemColors.ControlLight;
-            this.ResetQU.Location = new System.Drawing.Point(191, 555);
+            this.ResetQU.Location = new System.Drawing.Point(189, 555);
            this.ResetQU.Name = "ResetQU";
-            this.ResetQU.Size = new System.Drawing.Size(167, 23);
+            this.ResetQU.Size = new System.Drawing.Size(168, 28);
            this.ResetQU.TabIndex = 14;
            this.ResetQU.Text = "RESET ALL FIELDS";
            this.ResetQU.UseVisualStyleBackColor = false;
@@ -144,7 +145,7 @@ namespace AndroidSideloader
            this.deleteButton.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
            this.deleteButton.Location = new System.Drawing.Point(13, 606);
            this.deleteButton.Name = "deleteButton";
-            this.deleteButton.Size = new System.Drawing.Size(169, 25);
+            this.deleteButton.Size = new System.Drawing.Size(167, 25);
            this.deleteButton.TabIndex = 15;
            this.deleteButton.Text = "DELETE SAVED SETTINGS";
            this.deleteButton.UseVisualStyleBackColor = false;
@@ -157,7 +158,7 @@ namespace AndroidSideloader
            this.questPics.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.questPics.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.5F);
            this.questPics.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
-            this.questPics.Location = new System.Drawing.Point(17, 265);
+            this.questPics.Location = new System.Drawing.Point(15, 265);
            this.questPics.Name = "questPics";
            this.questPics.Size = new System.Drawing.Size(165, 25);
            this.questPics.TabIndex = 5;
@@ -171,7 +172,7 @@ namespace AndroidSideloader
            this.questVids.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.questVids.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.5F);
            this.questVids.ForeColor = System.Drawing.SystemColors.ButtonHighlight;
-            this.questVids.Location = new System.Drawing.Point(191, 265);
+            this.questVids.Location = new System.Drawing.Point(189, 265);
            this.questVids.Name = "questVids";
            this.questVids.Size = new System.Drawing.Size(167, 25);
            this.questVids.TabIndex = 6;
@@ -242,11 +243,11 @@ namespace AndroidSideloader
            this.label13.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
            this.label13.ForeColor = System.Drawing.Color.LightSteelBlue;
-            this.label13.Location = new System.Drawing.Point(54, 678);
+            this.label13.Location = new System.Drawing.Point(53, 678);
            this.label13.Name = "label13";
-            this.label13.Size = new System.Drawing.Size(262, 16);
+            this.label13.Size = new System.Drawing.Size(265, 16);
            this.label13.TabIndex = 6;
-            this.label13.Text = "*For games that dont work with QU settings.";
+            this.label13.Text = "*For games that don\'t work with QU settings.";
            this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
            // 
            // DeleteShots
@@ -287,7 +288,7 @@ namespace AndroidSideloader
            // 
            this.label14.BackColor = System.Drawing.Color.White;
            this.label14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
-            this.label14.Location = new System.Drawing.Point(-15, 208);
+            this.label14.Location = new System.Drawing.Point(-15, 211);
            this.label14.Name = "label14";
            this.label14.Size = new System.Drawing.Size(394, 3);
            this.label14.TabIndex = 17;
@@ -330,9 +331,9 @@ namespace AndroidSideloader
            "2",
            "3",
            "4"});
-            this.CPUComboBox.Location = new System.Drawing.Point(13, 126);
+            this.CPUComboBox.Location = new System.Drawing.Point(13, 123);
            this.CPUComboBox.Name = "CPUComboBox";
-            this.CPUComboBox.Size = new System.Drawing.Size(345, 28);
+            this.CPUComboBox.Size = new System.Drawing.Size(346, 28);
            this.CPUComboBox.TabIndex = 2;
            this.CPUComboBox.Text = "Select CPU level (0 for default)";
            // 
@@ -352,9 +353,9 @@ namespace AndroidSideloader
            "2",
            "3",
            "4"});
-            this.GPUComboBox.Location = new System.Drawing.Point(13, 97);
+            this.GPUComboBox.Location = new System.Drawing.Point(13, 94);
            this.GPUComboBox.Name = "GPUComboBox";
-            this.GPUComboBox.Size = new System.Drawing.Size(345, 28);
+            this.GPUComboBox.Size = new System.Drawing.Size(346, 28);
            this.GPUComboBox.TabIndex = 1;
            this.GPUComboBox.Text = "Select GPU level (0 for default)";
            // 
@@ -368,7 +369,7 @@ namespace AndroidSideloader
            this.label7.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
            this.label7.Location = new System.Drawing.Point(13, 532);
            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(66, 20);
+            this.label7.Size = new System.Drawing.Size(59, 20);
            this.label7.TabIndex = 3;
            this.label7.Text = "Fov - X";
            this.label7.Visible = false;
@@ -383,7 +384,7 @@ namespace AndroidSideloader
            this.label8.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
            this.label8.Location = new System.Drawing.Point(191, 532);
            this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(66, 20);
+            this.label8.Size = new System.Drawing.Size(59, 20);
            this.label8.TabIndex = 3;
            this.label8.Text = "Fov - Y";
            this.label8.Visible = false;
@@ -396,9 +397,9 @@ namespace AndroidSideloader
            this.label9.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.label9.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.label9.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.label9.Location = new System.Drawing.Point(11, 583);
+            this.label9.Location = new System.Drawing.Point(12, 583);
            this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(117, 20);
+            this.label9.Size = new System.Drawing.Size(105, 20);
            this.label9.TabIndex = 3;
            this.label9.Text = "Refresh Rate";
            this.label9.Visible = false;
@@ -411,9 +412,9 @@ namespace AndroidSideloader
            this.label6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.label6.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.label6.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.label6.Location = new System.Drawing.Point(13, 484);
+            this.label6.Location = new System.Drawing.Point(93, 484);
            this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(206, 20);
+            this.label6.Size = new System.Drawing.Size(185, 20);
            this.label6.TabIndex = 3;
            this.label6.Text = "Enter Custom Username";
            this.label6.Visible = false;
@@ -426,9 +427,9 @@ namespace AndroidSideloader
            this.label5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.label5.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.label5.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.label5.Location = new System.Drawing.Point(12, 434);
+            this.label5.Location = new System.Drawing.Point(16, 434);
            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(410, 20);
+            this.label5.Size = new System.Drawing.Size(362, 20);
            this.label5.TabIndex = 3;
            this.label5.Text = "Custom Resolution Width (Height auto calculated)";
            this.label5.Visible = false;
@@ -441,11 +442,11 @@ namespace AndroidSideloader
            this.ResolutionLabel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.ResolutionLabel.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.ResolutionLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.ResolutionLabel.Location = new System.Drawing.Point(11, 183);
+            this.ResolutionLabel.Location = new System.Drawing.Point(9, 180);
            this.ResolutionLabel.Name = "ResolutionLabel";
-            this.ResolutionLabel.Size = new System.Drawing.Size(241, 20);
+            this.ResolutionLabel.Size = new System.Drawing.Size(166, 20);
            this.ResolutionLabel.TabIndex = 3;
-            this.ResolutionLabel.Text = "Resolution (p eye, 0=default)";
+            this.ResolutionLabel.Text = "Resolution (0=default)";
            // 
            // FOVy
            // 
@@ -455,9 +456,9 @@ namespace AndroidSideloader
            this.FOVy.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.FOVy.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.FOVy.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.FOVy.Location = new System.Drawing.Point(191, 507);
+            this.FOVy.Location = new System.Drawing.Point(189, 507);
            this.FOVy.Name = "FOVy";
-            this.FOVy.Size = new System.Drawing.Size(167, 26);
+            this.FOVy.Size = new System.Drawing.Size(169, 26);
            this.FOVy.TabIndex = 12;
            this.FOVy.Text = "0";
            this.FOVy.Visible = false;
@@ -519,9 +520,9 @@ namespace AndroidSideloader
            this.TextureResTextBox.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.TextureResTextBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.TextureResTextBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.TextureResTextBox.Location = new System.Drawing.Point(13, 155);
+            this.TextureResTextBox.Location = new System.Drawing.Point(13, 152);
            this.TextureResTextBox.Name = "TextureResTextBox";
-            this.TextureResTextBox.Size = new System.Drawing.Size(169, 26);
+            this.TextureResTextBox.Size = new System.Drawing.Size(167, 26);
            this.TextureResTextBox.TabIndex = 3;
            this.TextureResTextBox.Text = "0";
            // 
@@ -534,9 +535,9 @@ namespace AndroidSideloader
            this.QUEnable.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.QUEnable.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.QUEnable.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.QUEnable.Location = new System.Drawing.Point(191, 606);
+            this.QUEnable.Location = new System.Drawing.Point(189, 606);
            this.QUEnable.Name = "QUEnable";
-            this.QUEnable.Size = new System.Drawing.Size(169, 25);
+            this.QUEnable.Size = new System.Drawing.Size(170, 25);
            this.QUEnable.TabIndex = 16;
            this.QUEnable.Text = "APPLY";
            this.QUEnable.UseVisualStyleBackColor = false;
@@ -552,9 +553,9 @@ namespace AndroidSideloader
            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.button1.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.button1.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.button1.Location = new System.Drawing.Point(191, 155);
+            this.button1.Location = new System.Drawing.Point(189, 152);
            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(167, 25);
+            this.button1.Size = new System.Drawing.Size(169, 25);
            this.button1.TabIndex = 4;
            this.button1.Text = "APPLY";
            this.button1.UseVisualStyleBackColor = false;
@@ -575,7 +576,7 @@ namespace AndroidSideloader
            "72",
            "90",
            "120"});
-            this.QURfrRt.Location = new System.Drawing.Point(12, 555);
+            this.QURfrRt.Location = new System.Drawing.Point(13, 555);
            this.QURfrRt.Name = "QURfrRt";
            this.QURfrRt.Size = new System.Drawing.Size(170, 28);
            this.QURfrRt.TabIndex = 13;
@@ -597,12 +598,29 @@ namespace AndroidSideloader
            "72",
            "90",
            "120"});
-            this.RefreshRateComboBox.Location = new System.Drawing.Point(13, 68);
+            this.RefreshRateComboBox.Location = new System.Drawing.Point(13, 65);
            this.RefreshRateComboBox.Name = "RefreshRateComboBox";
-            this.RefreshRateComboBox.Size = new System.Drawing.Size(345, 28);
+            this.RefreshRateComboBox.Size = new System.Drawing.Size(346, 28);
            this.RefreshRateComboBox.TabIndex = 0;
            this.RefreshRateComboBox.Text = "Select refresh rate";
            // 
+            // WifiWake
+            // 
+            this.WifiWake.BackColor = global::AndroidSideloader.Properties.Settings.Default.SubButtonColor;
+            this.WifiWake.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.WifiWake.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.WifiWake.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "SubButtonColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.WifiWake.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.WifiWake.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
+            this.WifiWake.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
+            this.WifiWake.Location = new System.Drawing.Point(189, 180);
+            this.WifiWake.Name = "WifiWake";
+            this.WifiWake.Size = new System.Drawing.Size(170, 25);
+            this.WifiWake.TabIndex = 4;
+            this.WifiWake.Text = "ENABLE WIFI WAKE";
+            this.WifiWake.UseVisualStyleBackColor = false;
+            this.WifiWake.Click += new System.EventHandler(this.WifiWake_Click);
+            // 
            // QuestForm
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -642,15 +660,19 @@ namespace AndroidSideloader
            this.Controls.Add(this.ResBox);
            this.Controls.Add(this.TextureResTextBox);
            this.Controls.Add(this.QUEnable);
+            this.Controls.Add(this.WifiWake);
            this.Controls.Add(this.button1);
            this.Controls.Add(this.QURfrRt);
            this.Controls.Add(this.RefreshRateComboBox);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
            this.MaximumSize = new System.Drawing.Size(386, 776);
            this.MinimumSize = new System.Drawing.Size(386, 776);
            this.Name = "QuestForm";
            this.ShowIcon = false;
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
            this.Text = "Quest settings";
+            this.TopMost = true;
            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.QuestForm_FormClosed);
            this.Load += new System.EventHandler(this.QuestForm_Load);
            this.ResumeLayout(false);
@@ -696,6 +718,7 @@ namespace AndroidSideloader
        private Label label14;
        private Label label15;
        private Label label16;
+        private Button WifiWake;
    }

 }
--- a/QuestForm.cs
+++ b/QuestForm.cs
@@ -107,6 +107,7 @@ namespace AndroidSideloader
                FOVy.Text = Properties.Settings.Default.QUy;
                FOVx.Text = Properties.Settings.Default.QUx;
                QURfrRt.SelectedValue = Properties.Settings.Default.QUhz;
+                Properties.Settings.Default.QUturnedon = true;
            }
            else if (!QUon.Checked)
            {
@@ -124,9 +125,10 @@ namespace AndroidSideloader
                label9.Visible = false;
                label10.Visible = false;
                deleteButton.Visible = false;
-                
+                Properties.Settings.Default.QUturnedon = false;
                MessageBox.Show("Ok, Deleted your custom settings file.\nIf you would like to re-enable return here and apply settings again");
-                File.Delete($"{Properties.Settings.Default.MainDir}\\Config.Json");
+                File.Delete($"{Environment.CurrentDirectory}\\Config.Json");
+                File.Delete($"{Environment.CurrentDirectory}\\delete_settings");
            }

        }
@@ -146,7 +148,7 @@ namespace AndroidSideloader
            MessageBox.Show("OK, any -QU packages installed will have these settings applied!\nTo delete settings: goto main app window, select a game with top menu, and click \"Remove QU Setting\"");
            if (QUon.Checked)
            {
-
+                Properties.Settings.Default.QUturnedon = true;
                Random r = new Random();

                int x = r.Next(999999999);
@@ -170,6 +172,10 @@ namespace AndroidSideloader
                string boff = Properties.Settings.Default.QUStringF + Properties.Settings.Default.QUString;
                File.WriteAllText($"{Properties.Settings.Default.MainDir}\\config.json", boff);
            }
+            else
+            {
+                Properties.Settings.Default.QUturnedon = false;
+            }
            


@@ -324,5 +330,11 @@ namespace AndroidSideloader
            return base.ProcessDialogKey(keyData);
        }

+        private void WifiWake_Click(object sender, EventArgs e)
+        {
+            ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_available 1");
+            ADB.RunAdbCommandToString("shell settings put global wifi_wakeup_enabled 1");
+            MessageBox.Show("Wake on Wifi enabled!\n\nNOTE: This requires having wireless ADB enabled to work. (Obviously)");
+        }
    }
 }
--- a/RCLONE.cs
+++ b/RCLONE.cs
@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.Text;
 using System.IO;
 using System.Windows.Forms;
+using JR.Utils.GUI.Forms;

 namespace AndroidSideloader
 {
@@ -37,9 +38,6 @@ namespace AndroidSideloader
        {
            if (!MainForm.HasInternet) return new ProcessOutput("", "No internet");

-            //Set the password for rclone configs
-            Environment.SetEnvironmentVariable("RCLONE_CRYPT_REMOTE", rclonepw);
-            Environment.SetEnvironmentVariable("RCLONE_CONFIG_PASS", rclonepw);
            ProcessOutput prcoutput = new ProcessOutput();
            //Rclone output is unicode, else it will show garbage instead of unicode characters
            rclone.StartInfo.StandardOutputEncoding = Encoding.UTF8;
@@ -60,8 +58,12 @@ namespace AndroidSideloader
            //set rclonepw
            if (rclonepw.Length > 0)
                command += " --ask-password=false";
-
-            Logger.Log($"Running Rclone command: {command}");
+            string logcmd = Utilities.StringUtilities.RemoveEverythingBeforeFirst(command, "rclone.exe");
+            if (logcmd.Contains($"\"{Properties.Settings.Default.CurrentLogPath}\""))
+                logcmd = logcmd.Replace($"\"{Properties.Settings.Default.CurrentLogPath}\"", $"\"{Properties.Settings.Default.CurrentLogName}\"");
+            if (logcmd.Contains(Environment.CurrentDirectory))
+                logcmd = logcmd.Replace($"{Environment.CurrentDirectory}", $"CurrentDirectory");
+            Logger.Log($"Running Rclone command: {logcmd}");

            rclone.StartInfo.FileName = Environment.CurrentDirectory + "\\rclone\\rclone.exe";
            rclone.StartInfo.Arguments = command;
@@ -85,7 +87,7 @@ namespace AndroidSideloader
            rclone.WaitForExit();

            //if there is one of these errors, we switch the mirrors
-            if (error.Contains("cannot fetch token") || error.Contains("authError") || (error.Contains("quota") || error.Contains("exceeded")))
+            if (error.Contains("400 Bad Request") || error.Contains("cannot fetch token") || error.Contains("authError") || error.Contains("quota") || error.Contains("exceeded") || error.Contains("directory not found") || error.Contains("couldn't list"))
            {
                string oldRemote = MainForm.currentRemote;
                try
@@ -106,8 +108,10 @@ namespace AndroidSideloader
            if (!output.Contains("Game Name;Release Name;") && !output.Contains("package:"))
            Logger.Log($"Rclone error: {error}\nRclone Output: {output}");
            if (error.Contains("There is not enough space"))
-                MessageBox.Show("There isn't enough space on your PC to properly install this game. Please have at least 2x the size of the game you are trying to download/install available on the drive where Rookie is installed.", "NOT ENOUGH SPACE");
-                return prcoutput;
+            {
+                FlexibleMessageBox.Show("There isn't enough space on your PC to properly install this game. Please have at least 2x the size of the game you are trying to download/install available on the drive where Rookie is installed.", "NOT ENOUGH SPACE");
+            }
+            return prcoutput;

        }
    }
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
 # androidsideloader

+!IMPORTANT!
+This app may be buggy and have problems, I will recode it from scratch when MAUI will be released (This september) and a linux port will be available, making RSL cross-platform.
+
 This app might get detected as malware, however both the sideloader and the sideloader launcher are open source

 https://www.virustotal.com/gui/file/977105693610cf360fc29339b918e224180ba393ba05a64b6255af3845cbf376/relations
@@ -15,4 +18,4 @@ Special thanks to
 - [rclone](https://rclone.org/) team for [rclone](https://rclone.org/) :D
 - [erike](https://stackoverflow.com/users/57611/erike) for the folder browser dialog code
 - Serge Weinstock for developing SergeUtils, which is used to search the combo box
- - https://www.c-sharpcorner.com/members/mike-gold2 for the scrollable message box
+ - https://www.c-sharpcorner.com/members/mike-gold2 for the scrollable message box
--- a/Resources/ajax-loader.gif
+++ b/Resources/ajax-loader.gif
--- a/Resources/battery.png
+++ b/Resources/battery.png
--- a/Resources/battery1.png
+++ b/Resources/battery1.png
--- a/Resources/battery11.png
+++ b/Resources/battery11.png
--- a/Resources/bluekey.png
+++ b/Resources/bluekey.png
--- a/Resources/nouns.txt
+++ b/Resources/nouns.txt
--- a/Resources/redkey.png
+++ b/Resources/redkey.png
--- a/SettingsForm.Designer.cs
+++ b/SettingsForm.Designer.cs
@@ -45,6 +45,9 @@
            this.DebugID = new System.Windows.Forms.TextBox();
            this.label2 = new System.Windows.Forms.Label();
            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.CblindBox = new System.Windows.Forms.CheckBox();
+            this.nodevicemodeBox = new System.Windows.Forms.CheckBox();
+            this.bmbfBox = new System.Windows.Forms.CheckBox();
            this.SuspendLayout();
            // 
            // checkForUpdatesCheckBox
@@ -52,10 +55,9 @@
            this.checkForUpdatesCheckBox.AutoSize = true;
            this.checkForUpdatesCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.checkForUpdatesCheckBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.checkForUpdatesCheckBox.Location = new System.Drawing.Point(17, 16);
-            this.checkForUpdatesCheckBox.Margin = new System.Windows.Forms.Padding(4);
+            this.checkForUpdatesCheckBox.Location = new System.Drawing.Point(12, 12);
            this.checkForUpdatesCheckBox.Name = "checkForUpdatesCheckBox";
-            this.checkForUpdatesCheckBox.Size = new System.Drawing.Size(193, 29);
+            this.checkForUpdatesCheckBox.Size = new System.Drawing.Size(148, 22);
            this.checkForUpdatesCheckBox.TabIndex = 0;
            this.checkForUpdatesCheckBox.Text = "Check for updates";
            this.checkForUpdatesCheckBox.UseVisualStyleBackColor = true;
@@ -70,10 +72,9 @@
            this.applyButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.applyButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.applyButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.applyButton.Location = new System.Drawing.Point(16, 219);
-            this.applyButton.Margin = new System.Windows.Forms.Padding(4);
+            this.applyButton.Location = new System.Drawing.Point(67, 280);
            this.applyButton.Name = "applyButton";
-            this.applyButton.Size = new System.Drawing.Size(135, 38);
+            this.applyButton.Size = new System.Drawing.Size(101, 31);
            this.applyButton.TabIndex = 5;
            this.applyButton.Text = "Apply";
            this.applyButton.UseVisualStyleBackColor = false;
@@ -84,10 +85,9 @@
            this.enableMessageBoxesCheckBox.AutoSize = true;
            this.enableMessageBoxesCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.enableMessageBoxesCheckBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.enableMessageBoxesCheckBox.Location = new System.Drawing.Point(17, 44);
-            this.enableMessageBoxesCheckBox.Margin = new System.Windows.Forms.Padding(4);
+            this.enableMessageBoxesCheckBox.Location = new System.Drawing.Point(12, 39);
            this.enableMessageBoxesCheckBox.Name = "enableMessageBoxesCheckBox";
-            this.enableMessageBoxesCheckBox.Size = new System.Drawing.Size(404, 29);
+            this.enableMessageBoxesCheckBox.Size = new System.Drawing.Size(309, 22);
            this.enableMessageBoxesCheckBox.TabIndex = 1;
            this.enableMessageBoxesCheckBox.Text = "Enable Message Boxes on task completed";
            this.enableMessageBoxesCheckBox.UseVisualStyleBackColor = true;
@@ -102,10 +102,9 @@
            this.resetSettingsButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.resetSettingsButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.resetSettingsButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.resetSettingsButton.Location = new System.Drawing.Point(159, 219);
-            this.resetSettingsButton.Margin = new System.Windows.Forms.Padding(4);
+            this.resetSettingsButton.Location = new System.Drawing.Point(174, 280);
            this.resetSettingsButton.Name = "resetSettingsButton";
-            this.resetSettingsButton.Size = new System.Drawing.Size(135, 38);
+            this.resetSettingsButton.Size = new System.Drawing.Size(101, 31);
            this.resetSettingsButton.TabIndex = 4;
            this.resetSettingsButton.Text = "Reset Settings";
            this.resetSettingsButton.UseVisualStyleBackColor = false;
@@ -116,10 +115,9 @@
            this.deleteAfterInstallCheckBox.AutoSize = true;
            this.deleteAfterInstallCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.deleteAfterInstallCheckBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.deleteAfterInstallCheckBox.Location = new System.Drawing.Point(17, 73);
-            this.deleteAfterInstallCheckBox.Margin = new System.Windows.Forms.Padding(4);
+            this.deleteAfterInstallCheckBox.Location = new System.Drawing.Point(12, 65);
            this.deleteAfterInstallCheckBox.Name = "deleteAfterInstallCheckBox";
-            this.deleteAfterInstallCheckBox.Size = new System.Drawing.Size(378, 29);
+            this.deleteAfterInstallCheckBox.Size = new System.Drawing.Size(288, 22);
            this.deleteAfterInstallCheckBox.TabIndex = 3;
            this.deleteAfterInstallCheckBox.Text = "Delete games after download and install";
            this.deleteAfterInstallCheckBox.UseVisualStyleBackColor = true;
@@ -130,10 +128,9 @@
            this.updateConfigCheckBox.AutoSize = true;
            this.updateConfigCheckBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.updateConfigCheckBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.updateConfigCheckBox.Location = new System.Drawing.Point(17, 102);
-            this.updateConfigCheckBox.Margin = new System.Windows.Forms.Padding(4);
+            this.updateConfigCheckBox.Location = new System.Drawing.Point(12, 92);
            this.updateConfigCheckBox.Name = "updateConfigCheckBox";
-            this.updateConfigCheckBox.Size = new System.Drawing.Size(272, 29);
+            this.updateConfigCheckBox.Size = new System.Drawing.Size(208, 22);
            this.updateConfigCheckBox.TabIndex = 6;
            this.updateConfigCheckBox.Text = "Update config automatically";
            this.updateConfigCheckBox.UseVisualStyleBackColor = true;
@@ -144,10 +141,9 @@
            this.userJsonOnGameInstall.AutoSize = true;
            this.userJsonOnGameInstall.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.userJsonOnGameInstall.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.userJsonOnGameInstall.Location = new System.Drawing.Point(17, 130);
-            this.userJsonOnGameInstall.Margin = new System.Windows.Forms.Padding(4);
+            this.userJsonOnGameInstall.Location = new System.Drawing.Point(12, 119);
            this.userJsonOnGameInstall.Name = "userJsonOnGameInstall";
-            this.userJsonOnGameInstall.Size = new System.Drawing.Size(315, 29);
+            this.userJsonOnGameInstall.Size = new System.Drawing.Size(243, 22);
            this.userJsonOnGameInstall.TabIndex = 9;
            this.userJsonOnGameInstall.Text = "Push random user.json on install";
            this.userJsonOnGameInstall.UseVisualStyleBackColor = true;
@@ -161,10 +157,9 @@
            this.BandwithTextbox.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "TextBoxColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.BandwithTextbox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.BandwithTextbox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.BandwithTextbox.Location = new System.Drawing.Point(16, 181);
-            this.BandwithTextbox.Margin = new System.Windows.Forms.Padding(4);
+            this.BandwithTextbox.Location = new System.Drawing.Point(52, 248);
            this.BandwithTextbox.Name = "BandwithTextbox";
-            this.BandwithTextbox.Size = new System.Drawing.Size(235, 30);
+            this.BandwithTextbox.Size = new System.Drawing.Size(177, 24);
            this.BandwithTextbox.TabIndex = 11;
            // 
            // label1
@@ -172,10 +167,9 @@
            this.label1.AutoSize = true;
            this.label1.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.label1.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
-            this.label1.Location = new System.Drawing.Point(13, 156);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(40, 225);
            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(322, 25);
+            this.label1.Size = new System.Drawing.Size(245, 18);
            this.label1.TabIndex = 12;
            this.label1.Text = "Download speed limiter, 0 to disable";
            // 
@@ -194,10 +188,9 @@
            "K",
            "M",
            "G"});
-            this.BandwithComboBox.Location = new System.Drawing.Point(260, 180);
-            this.BandwithComboBox.Margin = new System.Windows.Forms.Padding(4);
+            this.BandwithComboBox.Location = new System.Drawing.Point(235, 248);
            this.BandwithComboBox.Name = "BandwithComboBox";
-            this.BandwithComboBox.Size = new System.Drawing.Size(72, 33);
+            this.BandwithComboBox.Size = new System.Drawing.Size(55, 26);
            this.BandwithComboBox.TabIndex = 13;
            // 
            // DebugLogCopy
@@ -209,10 +202,9 @@
            this.DebugLogCopy.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.DebugLogCopy.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.DebugLogCopy.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.DebugLogCopy.Location = new System.Drawing.Point(16, 274);
-            this.DebugLogCopy.Margin = new System.Windows.Forms.Padding(4);
+            this.DebugLogCopy.Location = new System.Drawing.Point(29, 325);
            this.DebugLogCopy.Name = "DebugLogCopy";
-            this.DebugLogCopy.Size = new System.Drawing.Size(380, 38);
+            this.DebugLogCopy.Size = new System.Drawing.Size(285, 31);
            this.DebugLogCopy.TabIndex = 5;
            this.DebugLogCopy.Text = "Send DebugLog to server.";
            this.DebugLogCopy.UseVisualStyleBackColor = false;
@@ -221,9 +213,10 @@
            // crashlogID
            // 
            this.crashlogID.AutoSize = true;
-            this.crashlogID.Location = new System.Drawing.Point(17, 410);
+            this.crashlogID.Location = new System.Drawing.Point(13, 441);
+            this.crashlogID.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
            this.crashlogID.Name = "crashlogID";
-            this.crashlogID.Size = new System.Drawing.Size(0, 17);
+            this.crashlogID.Size = new System.Drawing.Size(0, 13);
            this.crashlogID.TabIndex = 15;
            // 
            // button1
@@ -235,10 +228,9 @@
            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.button1.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
            this.button1.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.button1.Location = new System.Drawing.Point(16, 317);
-            this.button1.Margin = new System.Windows.Forms.Padding(4);
+            this.button1.Location = new System.Drawing.Point(29, 360);
            this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(380, 38);
+            this.button1.Size = new System.Drawing.Size(285, 31);
            this.button1.TabIndex = 5;
            this.button1.Text = "Reset Debug Log";
            this.button1.UseVisualStyleBackColor = false;
@@ -247,9 +239,10 @@
            // debuglogID
            // 
            this.debuglogID.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
-            this.debuglogID.Location = new System.Drawing.Point(16, 411);
+            this.debuglogID.Location = new System.Drawing.Point(29, 436);
+            this.debuglogID.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
            this.debuglogID.Name = "debuglogID";
-            this.debuglogID.Size = new System.Drawing.Size(380, 59);
+            this.debuglogID.Size = new System.Drawing.Size(285, 48);
            this.debuglogID.TabIndex = 14;
            this.debuglogID.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
            // 
@@ -261,11 +254,12 @@
            this.DebugID.Cursor = System.Windows.Forms.Cursors.Default;
            this.DebugID.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold);
            this.DebugID.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.DebugID.Location = new System.Drawing.Point(16, 375);
+            this.DebugID.Location = new System.Drawing.Point(29, 407);
+            this.DebugID.Margin = new System.Windows.Forms.Padding(2);
            this.DebugID.Name = "DebugID";
            this.DebugID.ReadOnly = true;
            this.DebugID.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal;
-            this.DebugID.Size = new System.Drawing.Size(380, 27);
+            this.DebugID.Size = new System.Drawing.Size(285, 21);
            this.DebugID.TabIndex = 16;
            this.DebugID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
            this.DebugID.Click += new System.EventHandler(this.DebugID_Click);
@@ -273,12 +267,13 @@
            // label2
            // 
            this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11F);
-            this.label2.Location = new System.Drawing.Point(16, 498);
+            this.label2.Location = new System.Drawing.Point(29, 507);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(379, 106);
+            this.label2.Size = new System.Drawing.Size(284, 86);
            this.label2.TabIndex = 14;
-            this.label2.Text = "This is your most recent CrashLogID. Click on the CrashLogID to copy it to your" +
-    " clipboard.";
+            this.label2.Text = "This is your most recent CrashLogID. Click on the CrashLogID to copy it to your c" +
+    "lipboard.";
            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
            // 
            // textBox1
@@ -289,21 +284,62 @@
            this.textBox1.Cursor = System.Windows.Forms.Cursors.Default;
            this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Bold);
            this.textBox1.ForeColor = System.Drawing.SystemColors.ControlLightLight;
-            this.textBox1.Location = new System.Drawing.Point(16, 477);
+            this.textBox1.Location = new System.Drawing.Point(29, 490);
+            this.textBox1.Margin = new System.Windows.Forms.Padding(2);
            this.textBox1.Name = "textBox1";
            this.textBox1.ReadOnly = true;
            this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Horizontal;
-            this.textBox1.Size = new System.Drawing.Size(380, 27);
+            this.textBox1.Size = new System.Drawing.Size(285, 21);
            this.textBox1.TabIndex = 16;
            this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
            this.textBox1.Click += new System.EventHandler(this.textBox1_Click);
            // 
+            // CblindBox
+            // 
+            this.CblindBox.AutoSize = true;
+            this.CblindBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.CblindBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
+            this.CblindBox.Location = new System.Drawing.Point(12, 145);
+            this.CblindBox.Name = "CblindBox";
+            this.CblindBox.Size = new System.Drawing.Size(182, 22);
+            this.CblindBox.TabIndex = 9;
+            this.CblindBox.Text = "Enable colorblind mode";
+            this.CblindBox.UseVisualStyleBackColor = true;
+            this.CblindBox.CheckedChanged += new System.EventHandler(this.CblindBox_CheckedChanged);
+            this.CblindBox.Click += new System.EventHandler(this.CblindBox_Click);
+            // 
+            // nodevicemodeBox
+            // 
+            this.nodevicemodeBox.AutoSize = true;
+            this.nodevicemodeBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.nodevicemodeBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
+            this.nodevicemodeBox.Location = new System.Drawing.Point(12, 196);
+            this.nodevicemodeBox.Name = "nodevicemodeBox";
+            this.nodevicemodeBox.Size = new System.Drawing.Size(181, 22);
+            this.nodevicemodeBox.TabIndex = 9;
+            this.nodevicemodeBox.Text = "Enable no device mode";
+            this.nodevicemodeBox.UseVisualStyleBackColor = true;
+            this.nodevicemodeBox.CheckedChanged += new System.EventHandler(this.nodevicemodeBox_CheckedChanged);
+            // 
+            // bmbfBox
+            // 
+            this.bmbfBox.AutoSize = true;
+            this.bmbfBox.DataBindings.Add(new System.Windows.Forms.Binding("Font", global::AndroidSideloader.Properties.Settings.Default, "FontStyle", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.bmbfBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
+            this.bmbfBox.Location = new System.Drawing.Point(12, 170);
+            this.bmbfBox.Name = "bmbfBox";
+            this.bmbfBox.Size = new System.Drawing.Size(281, 22);
+            this.bmbfBox.TabIndex = 9;
+            this.bmbfBox.Text = "Enable BMBF song zips drag and drop";
+            this.bmbfBox.UseVisualStyleBackColor = true;
+            this.bmbfBox.CheckedChanged += new System.EventHandler(this.bmbfBox_CheckedChanged);
+            // 
            // SettingsForm
            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.BackColor = global::AndroidSideloader.Properties.Settings.Default.BackColor;
-            this.ClientSize = new System.Drawing.Size(417, 606);
+            this.ClientSize = new System.Drawing.Size(342, 606);
            this.Controls.Add(this.textBox1);
            this.Controls.Add(this.DebugID);
            this.Controls.Add(this.crashlogID);
@@ -312,6 +348,9 @@
            this.Controls.Add(this.BandwithComboBox);
            this.Controls.Add(this.label1);
            this.Controls.Add(this.BandwithTextbox);
+            this.Controls.Add(this.bmbfBox);
+            this.Controls.Add(this.nodevicemodeBox);
+            this.Controls.Add(this.CblindBox);
            this.Controls.Add(this.userJsonOnGameInstall);
            this.Controls.Add(this.updateConfigCheckBox);
            this.Controls.Add(this.deleteAfterInstallCheckBox);
@@ -324,10 +363,11 @@
            this.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "BackColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
            this.ForeColor = System.Drawing.Color.White;
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.Margin = new System.Windows.Forms.Padding(4);
+            this.MaximizeBox = false;
            this.Name = "SettingsForm";
            this.ShowIcon = false;
            this.Text = "Settings";
+            this.TopMost = true;
            this.Load += new System.EventHandler(this.SettingsForm_Load);
            this.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.SettingsForm_KeyPress);
            this.Leave += new System.EventHandler(this.SettingsForm_Leave);
@@ -355,5 +395,8 @@
        private System.Windows.Forms.TextBox DebugID;
        public System.Windows.Forms.Label label2;
        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.CheckBox CblindBox;
+        private System.Windows.Forms.CheckBox nodevicemodeBox;
+        private System.Windows.Forms.CheckBox bmbfBox;
    }
 }
--- a/SettingsForm.cs
+++ b/SettingsForm.cs
@@ -27,11 +27,15 @@ namespace AndroidSideloader
        //Init form objects with values from settings
        private void intSettings()
        {
+            CblindBox.Checked = Properties.Settings.Default.QblindOn;
            checkForUpdatesCheckBox.Checked = Properties.Settings.Default.checkForUpdates;
            enableMessageBoxesCheckBox.Checked = Properties.Settings.Default.enableMessageBoxes;
            deleteAfterInstallCheckBox.Checked = Properties.Settings.Default.deleteAllAfterInstall;
            updateConfigCheckBox.Checked = Properties.Settings.Default.autoUpdateConfig;
            userJsonOnGameInstall.Checked = Properties.Settings.Default.userJsonOnGameInstall;
+            nodevicemodeBox.Checked = Properties.Settings.Default.nodevicemode;
+            bmbfBox.Checked = Properties.Settings.Default.BMBFchecked;
+
            if (Properties.Settings.Default.BandwithLimit.Length > 1)
            {
                BandwithTextbox.Text = Properties.Settings.Default.BandwithLimit.Remove(Properties.Settings.Default.BandwithLimit.Length - 1);
@@ -74,9 +78,9 @@ namespace AndroidSideloader
                File.Delete($"{Environment.CurrentDirectory}\\debuglog.txt");


-            if (File.Exists($"{Environment.CurrentDirectory}\\notes\\nouns.txt"))
+            if (File.Exists($"{Environment.CurrentDirectory}\\nouns\\nouns.txt"))
            {
-                string[] lines = File.ReadAllLines($"{Environment.CurrentDirectory}\\notes\\nouns.txt");
+                string[] lines = File.ReadAllLines($"{Environment.CurrentDirectory}\\nouns\\nouns.txt");
                Random r = new Random();
                int x = r.Next(6806);
                int y = r.Next(6806);
@@ -193,6 +197,32 @@ namespace AndroidSideloader
                MessageBox.Show("CrashLogID copied to clipboard! Paste it to a moderator/helper for assistance!");
            }
        }
+
+        private void CblindBox_CheckedChanged(object sender, EventArgs e)
+        {
+
+            Properties.Settings.Default.QblindOn = CblindBox.Checked;
+            Properties.Settings.Default.Save();
+            
+        }
+
+        private void CblindBox_Click(object sender, EventArgs e)
+        {
+            if (CblindBox.Checked)
+                MessageBox.Show("You must restart Rookie's Sideloader OR click Refresh Updates List for changes to take effect.\n\nNOTE: Colors in the legend at the top right of the main window of Rookie won't update until you restart the program.");
+        }
+
+        private void nodevicemodeBox_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.nodevicemode = nodevicemodeBox.Checked;
+            Properties.Settings.Default.Save();
+        }
+
+        private void bmbfBox_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.BMBFchecked = bmbfBox.Checked;
+            Properties.Settings.Default.Save();
+        }
    }
 }

--- a/Sideloader.cs
+++ b/Sideloader.cs
@@ -35,10 +35,7 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
        }

        //List of all installed package names from connected device
-        public static Dictionary<string, string> InstalledPackages = new Dictionary<string, string>(); //Packagename and Version
-        //public static List<string> InstalledPackageNames = new List<string>();
-
-        //Remove folder from device
+        //public static List<string> InstalledPackageNames = new List<string>();        //Remove folder from device
        public static ProcessOutput RemoveFolder(string path)
        {
            ADB.WakeDevice();
@@ -62,7 +59,7 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
                {
                    Program.form.ChangeTitle($"Running {cmd}");
                    Logger.Log($"Logging command: {cmd} from file: {path}");
-                    output += ADB.RunCommandToString(cmd, path);
+                    ADB.RunCommandToString(cmd, path);
                }
                if (cmd.StartsWith("adb"))
                {
@@ -170,6 +167,7 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
        //Extracts apk from device, saves it by package name to sideloader folder
        public static ProcessOutput getApk(string GameName)
        {
+
            ADB.WakeDevice();
            ProcessOutput output = new ProcessOutput("", "");

@@ -182,16 +180,18 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
            apkPath = apkPath.Remove(apkPath.Length - 1);
            apkPath = apkPath.Remove(0, 8); //remove package:
            apkPath = apkPath.Remove(apkPath.Length - 1);
-
+            if (File.Exists($"{Properties.Settings.Default.ADBFolder}\\base.apk"))
+                File.Delete($"{Properties.Settings.Default.ADBFolder}\\base.apk");
+            if (File.Exists($"{Properties.Settings.Default.MainDir}\\{packageName}\\{packageName}.apk"))
+                File.Delete($"{Properties.Settings.Default.MainDir}\\{packageName}\\{packageName}.apk");
            output += ADB.RunAdbCommandToString("pull " + apkPath); //pull apk
+           
+            if (Directory.Exists($"{Properties.Settings.Default.MainDir}\\{packageName}"))
+                Directory.Delete($"{Properties.Settings.Default.MainDir}\\{packageName}", true);

+            Directory.CreateDirectory($"{Properties.Settings.Default.MainDir}\\{packageName}");

-            if (File.Exists(Properties.Settings.Default.MainDir + "\\" + packageName + ".apk"))
-                File.Delete(Properties.Settings.Default.MainDir + "\\" + packageName + ".apk");
-
-            MessageBox.Show("APK is named" + packageName + ".apk. Opening containing folder now.");
-            File.Move(Properties.Settings.Default.ADBFolder + "\\base.apk", Environment.CurrentDirectory + "\\" + packageName + ".apk");
-
+            File.Move($"{Properties.Settings.Default.ADBFolder}\\base.apk", $"{Properties.Settings.Default.MainDir}\\{packageName}\\{packageName}.apk");
            return output;
        }

@@ -229,6 +229,17 @@ And all of them added to PATH, without ANY of them, the spoofer won't work!";
            return gameName;
        }

+        public static string PackageNameToSimpleName(string gameName)
+        {
+            foreach (string[] game in SideloaderRCLONE.games)
+            {
+                if (gameName.Contains(game[SideloaderRCLONE.PackageNameIndex]))
+                    return game[SideloaderRCLONE.GameNameIndex];
+            }
+            return gameName;
+        }
+
+
        //Downloads the required files
        public static void downloadFiles()
        {
--- a/Sideloader/RCLONE.cs
+++ b/Sideloader/RCLONE.cs
@@ -7,6 +7,15 @@ using Newtonsoft.Json;

 namespace AndroidSideloader
 {
+    class rcloneFolder
+    {
+        public string Path { get; set; }
+        public string Name { get; set; }
+        public string Size { get; set; }
+        public string ModTime { get; set; }
+
+    }
+
    class SideloaderRCLONE
    {
        public static List<string> RemotesList = new List<string>();
@@ -32,12 +41,18 @@ namespace AndroidSideloader
         */
        public static List<string[]> games = new List<string[]>();

+        public static string Nouns = Environment.CurrentDirectory + "\\nouns";
        public static string ThumbnailsFolder = Environment.CurrentDirectory + "\\thumbnails";
        public static string NotesFolder = Environment.CurrentDirectory + "\\notes";

+        public static void UpdateNouns(string remote)
+        {
+            RCLONE.runRcloneCommand($"sync \"{remote}:{RcloneGamesFolder}/.meta/nouns\" \"{Nouns}\"");
+        }
+
        public static void UpdateGamePhotos(string remote)
        {
-            RCLONE.runRcloneCommand($"sync \"{remote}:{RcloneGamesFolder}/.meta/thumbnails\" \"{ThumbnailsFolder}\"");  
+            RCLONE.runRcloneCommand($"sync \"{remote}:{RcloneGamesFolder}/.meta/thumbnails\" \"{ThumbnailsFolder}\"");
        }

        public static void UpdateGameNotes(string remote)
@@ -68,24 +83,54 @@ namespace AndroidSideloader

        public static void initGames(string remote)
        {
+            if (remote.Contains("08"))
+                Program.form.SwitchMirrors();
            gameProperties.Clear();
            games.Clear();
            string tempGameList = RCLONE.runRcloneCommand($"cat \"{remote}:{RcloneGamesFolder}/GameList.txt\"").Output;
            if (MainForm.debugMode)
+            {
                File.WriteAllText("GamesList.txt", tempGameList);
+            }
            string gamePropertiesLine = Utilities.StringUtilities.RemoveEverythingAfterFirst(tempGameList, "\n");

            foreach (string gameProperty in gamePropertiesLine.Split(';'))
            {
                gameProperties.Add(gameProperty);
            }
+            gameProperties.Add("Last Updated");
+

            tempGameList = Utilities.StringUtilities.RemoveEverythingBeforeFirst(tempGameList, "\n");

+            List<rcloneFolder> gameFolders = JsonConvert.DeserializeObject<List<rcloneFolder>>(RCLONE.runRcloneCommand($"lsjson \"{remote}:{RcloneGamesFolder}\"").Output);
+            if (gameFolders == null || gameFolders.Count < 1)
+            {
+                Program.form.SwitchMirrors();
+                gameFolders = JsonConvert.DeserializeObject<List<rcloneFolder>>(RCLONE.runRcloneCommand($"lsjson \"{remote}:{RcloneGamesFolder}\"").Output);
+            }
+
+
            foreach (string game in tempGameList.Split('\n'))
            {
                if (game.Length > 1)
-                    games.Add(game.Split(';'));
+                {
+                    string[] splitGame = game.Split(';');
+
+                    //gameFolder.find();
+                    Array.Resize(ref splitGame, splitGame.Length + 1);
+
+                    var gameSynced = gameFolders.Exists((predicate) => predicate.Path == splitGame[1]);
+                    if (gameSynced)
+                    {
+                        var gameFolder = gameFolders.Find((predicate) => predicate.Path == splitGame[1]);
+                        //splitGame[6] = gameFolder.ModTime;
+                        string gametime = Utilities.StringUtilities.RemoveEverythingAfterLast(gameFolder.ModTime, ":");
+                        gametime = gametime.Replace("T", " ");
+                        splitGame[splitGame.Length - 1] = gametime;
+                        games.Add(splitGame);
+                    }
+                }
            }

            //Output
@@ -94,12 +139,20 @@ namespace AndroidSideloader
            //{
            //    Console.WriteLine($"gameProperty: {s}");
            //}
+
+
+
            foreach (string[] s in games)
            {
-                string output = "";
-                for (int i = 0; i < gameProperties.Count; i++)
-                    output += s[i] + " ";
+                //string output = "";
+                //for (int i = 0; i < gameProperties.Count; i++)
+                //    output += s[i] + " ";
+
            }
+
+
+
+
        }

 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
--- a/Sideloader/Utilities.cs
+++ b/Sideloader/Utilities.cs
@@ -1,4 +1,8 @@
-using System.IO;
+using System;
+using System.IO;
+using System.Management;
+using System.Security.Cryptography;
+using System.Text;

 namespace AndroidSideloader
 {
@@ -13,5 +17,47 @@ namespace AndroidSideloader
                    return true;
            return false;
        }
+        public static string UUID()
+        {
+            StringBuilder sb = new StringBuilder();
+
+            ManagementObjectSearcher searcher = new ManagementObjectSearcher("root\\CIMV2",
+                "SELECT * FROM Win32_Processor");
+
+            foreach (ManagementObject queryObj in searcher.Get())
+            {
+                sb.Append(queryObj["NumberOfCores"]);
+                sb.Append(queryObj["ProcessorId"]);
+                sb.Append(queryObj["Name"]);
+                sb.Append(queryObj["SocketDesignation"]);
+            }
+
+            searcher = new ManagementObjectSearcher("root\\CIMV2",
+                "SELECT * FROM Win32_BIOS");
+
+            foreach (ManagementObject queryObj in searcher.Get())
+            {
+                sb.Append(queryObj["Manufacturer"]);
+                sb.Append(queryObj["Name"]);
+                sb.Append(queryObj["Version"]);
+
+            }
+
+            searcher = new ManagementObjectSearcher("root\\CIMV2",
+                "SELECT * FROM Win32_BaseBoard");
+
+            foreach (ManagementObject queryObj in searcher.Get())
+            {
+                sb.Append(queryObj["Product"]);
+            }
+
+            var bytes = Encoding.ASCII.GetBytes(sb.ToString());
+            SHA256Managed sha = new SHA256Managed();
+
+            byte[] hash = sha.ComputeHash(bytes);
+
+            return BitConverter.ToString(hash).Replace("-", "");
+        }
+
    }
 }
--- a/Updater.cs
+++ b/Updater.cs
@@ -17,7 +17,7 @@ namespace AndroidSideloader
        private static string RawGitHubUrl;
        private static string GitHubUrl;

-        static readonly public string LocalVersion = "2.4.2";
+        static readonly public string LocalVersion = "2.8.4";
        public static string currentVersion = string.Empty;
        public static string changelog = string.Empty;

--- a/Utilities/UploadGame.cs
+++ b/Utilities/UploadGame.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AndroidSideloader.Utilities
+{
+    class UploadGame
+    {
+        private string uploadcommand;
+        public string Uploadcommand
+        {
+            get => uploadcommand;
+            set => uploadcommand = value;
+        }   
+        private string pckgcommand;
+        public string Pckgcommand
+        {
+            get => pckgcommand;
+            set => pckgcommand = value;
+        }
+        private string uploadgamename;
+        public string Uploadgamename
+        {
+            get => uploadgamename;
+            set => uploadgamename = value;
+        }
+        private ulong uploadversion;
+        public ulong Uploadversion
+        {
+            get => uploadversion;
+            set => uploadversion = value;
+        }
+    }
+}
--- a/changelog.txt
+++ b/changelog.txt
--- a/2
+++ b/2
@@ -1 +1 @@
-2.4.1
+2.8.4
@@ -1 +1 @@
 .4.1
 .8.4