Merge branch 'master' of https://github.com/nerdunit/androidsideloader

= Fixed apk drag and drop when install.txt present, apk now installs prior to following install.txt commands.
= Changed OBB procedure for drag and drop to check for com. in directory name prior to running copyObb command.
= Fixed freeze caused by having Wireless ADB enabled but device idle or rebooted.

ADB.cs

@@ -12,8 +12,8 @@ namespace AndroidSideloader
     class ADB
     {
         static Process adb = new Process();
-        public static string adbFolderPath = Environment.CurrentDirectory + "\\adb";
-        public static string adbFilePath = adbFolderPath + "\\adb.exe";
+        public static string adbFolderPath = Properties.Settings.Default.ADBPath;
+        public static string adbFilePath = Properties.Settings.Default.ADBPath + "\\adb.exe";
         public static string DeviceID = "";
 
         public static ProcessOutput RunAdbCommandToString(string command)
@@ -34,6 +34,7 @@ namespace AndroidSideloader
             adb.Start();
             adb.StandardInput.WriteLine(command);
             adb.StandardInput.Flush();
+
             adb.StandardInput.Close();
 
             string output = "";
@@ -46,7 +47,18 @@ namespace AndroidSideloader
             }
             catch { }
 
+            if (command.Contains("connect"))
+            {
+                bool graceful = adb.WaitForExit(5000);  //Wait 7 secs.
+                if (!graceful)
+                {
+                    adb.Kill();
+                }
+            }
+            else
             adb.WaitForExit();
+            if (error.Contains("ADB_VENDOR_KEYS"))
+                    MessageBox.Show("Please check inside your headset for ADB DEBUGGING prompt, check box to \"Always allow from this computer.\" and hit OK.");
             Logger.Log(output);
             Logger.Log(error);
             return new ProcessOutput(output, error);
@@ -102,7 +114,7 @@ namespace AndroidSideloader
             long usedSize = 0;
 
             long freeSize = 0;
-            WakeDevice();
+
             var output = RunAdbCommandToString("shell df").Output.Split('\n');
 
             foreach (string currLine in output)
@@ -142,18 +154,30 @@ namespace AndroidSideloader
 
         public static void WakeDevice()
         {
-            if (!string.IsNullOrEmpty(Properties.Settings.Default.IPAddress))
+            if (Properties.Settings.Default.IPAddress.Contains("connect"))
             {
-                ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress);
+                RunAdbCommandToString(Properties.Settings.Default.IPAddress);
                 string response = ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress).Output;
-                if (response.Contains("refused"))
+
+                RunAdbCommandToString("shell input keyevent KEYCODE_WAKEUP");
+                if (response.Contains("cannot"))
                 {
-                    DialogResult dialogResult = MessageBox.Show("It seems you have rebooted your Quest, Rookie's wireless ADB will persist past PC reboot, but not for Quest reboot.\n\nHave you assigned your Quest a static IP in your router configuration? If you no longer want to use Wireless ADB just hit cancel!", "DEVICE WAS REBOOTED", MessageBoxButtons.YesNoCancel);
+                    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)
-                        return;
-                    if (dialogResult == DialogResult.Yes)
                     {
-                        ADB.WakeDevice();
+                        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)
+                            ADB.WakeDevice();
+                        if (dialogResult2 == DialogResult.OK)
+                        {
+                            Properties.Settings.Default.IPAddress = "";
+                            Properties.Settings.Default.Save();
+                            ADB.WakeDevice();
+                        }
+
+                    }
+                    else if (dialogResult == DialogResult.Yes)
+                    {
                         MessageBox.Show("Connect your Quest to USB so we can reconnect to your saved IP address!");
                         ADB.RunAdbCommandToString("devices");
                         Thread.Sleep(250);
@@ -165,9 +189,8 @@ namespace AndroidSideloader
                         Thread.Sleep(500);
                         ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress);
                     }
-                    if (dialogResult == DialogResult.No)
+                    else if (dialogResult == DialogResult.No)
                     {
-                        ADB.WakeDevice();
                         MessageBox.Show("You must repeat the entire connection process, press OK to begin.", "Reconfigure Wireless ADB", MessageBoxButtons.OK);
                         ADB.RunAdbCommandToString("devices");
                         ADB.RunAdbCommandToString("tcpip 5555");
@@ -180,7 +203,6 @@ namespace AndroidSideloader
                         strArrayOne = input.Split(' ');
                         if (strArrayOne[0].Length > 7)
                         {
-                            ADB.WakeDevice();
                             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);
@@ -192,16 +214,13 @@ namespace AndroidSideloader
                             MessageBox.Show($"Connected!!", "", MessageBoxButtons.OK);
                             Program.form.ChangeTitlebarToDevice();
                         }
-                        else
-                        {
-                            MessageBox.Show("No device connected!");
-                        }
 
+                      
                     }
-
+                    
                 }
             }
-            RunAdbCommandToString("shell input keyevent KEYCODE_WAKEUP");
+
         }
         public static ProcessOutput Sideload(string path, string packagename = "")
         {
@@ -239,9 +258,7 @@ namespace AndroidSideloader
                     {
                         MessageBox.Show($"Trying to backup save to Documents\\Rookie Backups\\{date_str}(year.month.date)\\{packagename}\\data", "Save files found", MessageBoxButtons.OK);
                         Directory.CreateDirectory(CurrBackups);
-                        String CurrbackupPaths = CurrBackups + "\\" + packagename + "\\data";
-                        Directory.CreateDirectory(CurrbackupPaths);
-                        ADB.RunAdbCommandToString($"pull \"/sdcard/Android/data/{packagename} \" \"{CurrbackupPaths}\"");
+                        ADB.RunAdbCommandToString($"pull \"/sdcard/Android/data/{packagename} \" \"{CurrBackups}\"");
                     }
                     else
                     {

MainForm.Designer.cs

@@ -95,10 +95,9 @@
             this.m_combo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.m_combo.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.m_combo.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.m_combo.Location = new System.Drawing.Point(303, 10);
-            this.m_combo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.m_combo.Location = new System.Drawing.Point(227, 8);
             this.m_combo.Name = "m_combo";
-            this.m_combo.Size = new System.Drawing.Size(992, 28);
+            this.m_combo.Size = new System.Drawing.Size(745, 24);
             this.m_combo.TabIndex = 0;
             this.m_combo.Text = "Select an app to uninstall...";
             // 
@@ -113,11 +112,10 @@
             this.startsideloadbutton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.startsideloadbutton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.startsideloadbutton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.startsideloadbutton.Location = new System.Drawing.Point(0, 170);
-            this.startsideloadbutton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.startsideloadbutton.Location = new System.Drawing.Point(0, 140);
             this.startsideloadbutton.Name = "startsideloadbutton";
-            this.startsideloadbutton.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.startsideloadbutton.Size = new System.Drawing.Size(291, 34);
+            this.startsideloadbutton.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.startsideloadbutton.Size = new System.Drawing.Size(218, 28);
             this.startsideloadbutton.TabIndex = 5;
             this.startsideloadbutton.Text = "Sideload APK";
             this.startsideloadbutton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -137,9 +135,8 @@
             this.devicesbutton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.devicesbutton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.devicesbutton.Location = new System.Drawing.Point(0, 0);
-            this.devicesbutton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.devicesbutton.Name = "devicesbutton";
-            this.devicesbutton.Size = new System.Drawing.Size(291, 34);
+            this.devicesbutton.Size = new System.Drawing.Size(218, 28);
             this.devicesbutton.TabIndex = 0;
             this.devicesbutton.Text = "RECONNECT DEVICE";
             this.devicesbutton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -158,10 +155,9 @@
             this.obbcopybutton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.obbcopybutton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.obbcopybutton.Location = new System.Drawing.Point(0, 0);
-            this.obbcopybutton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.obbcopybutton.Name = "obbcopybutton";
-            this.obbcopybutton.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.obbcopybutton.Size = new System.Drawing.Size(291, 34);
+            this.obbcopybutton.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.obbcopybutton.Size = new System.Drawing.Size(218, 28);
             this.obbcopybutton.TabIndex = 0;
             this.obbcopybutton.Text = "Copy OBB";
             this.obbcopybutton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -179,11 +175,10 @@
             this.backupbutton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.backupbutton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.backupbutton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.backupbutton.Location = new System.Drawing.Point(0, 34);
-            this.backupbutton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.backupbutton.Location = new System.Drawing.Point(0, 28);
             this.backupbutton.Name = "backupbutton";
-            this.backupbutton.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.backupbutton.Size = new System.Drawing.Size(291, 34);
+            this.backupbutton.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.backupbutton.Size = new System.Drawing.Size(218, 28);
             this.backupbutton.TabIndex = 1;
             this.backupbutton.Text = "Backup Gamedata";
             this.backupbutton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -202,10 +197,9 @@
             this.restorebutton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.restorebutton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.restorebutton.Location = new System.Drawing.Point(0, 0);
-            this.restorebutton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.restorebutton.Name = "restorebutton";
-            this.restorebutton.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.restorebutton.Size = new System.Drawing.Size(291, 34);
+            this.restorebutton.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.restorebutton.Size = new System.Drawing.Size(218, 28);
             this.restorebutton.TabIndex = 0;
             this.restorebutton.Text = "Restore Gamedata";
             this.restorebutton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -223,11 +217,10 @@
             this.getApkButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.getApkButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.getApkButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.getApkButton.Location = new System.Drawing.Point(0, 68);
-            this.getApkButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.getApkButton.Location = new System.Drawing.Point(0, 56);
             this.getApkButton.Name = "getApkButton";
-            this.getApkButton.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.getApkButton.Size = new System.Drawing.Size(291, 34);
+            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.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -245,11 +238,10 @@
             this.uninstallAppButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.uninstallAppButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.uninstallAppButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.uninstallAppButton.Location = new System.Drawing.Point(0, 102);
-            this.uninstallAppButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.uninstallAppButton.Location = new System.Drawing.Point(0, 84);
             this.uninstallAppButton.Name = "uninstallAppButton";
-            this.uninstallAppButton.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.uninstallAppButton.Size = new System.Drawing.Size(291, 34);
+            this.uninstallAppButton.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.uninstallAppButton.Size = new System.Drawing.Size(218, 28);
             this.uninstallAppButton.TabIndex = 3;
             this.uninstallAppButton.Text = "Uninstall Selected App";
             this.uninstallAppButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -267,11 +259,10 @@
             this.sideloadFolderButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.sideloadFolderButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.sideloadFolderButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.sideloadFolderButton.Location = new System.Drawing.Point(0, 136);
-            this.sideloadFolderButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.sideloadFolderButton.Location = new System.Drawing.Point(0, 112);
             this.sideloadFolderButton.Name = "sideloadFolderButton";
-            this.sideloadFolderButton.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.sideloadFolderButton.Size = new System.Drawing.Size(291, 34);
+            this.sideloadFolderButton.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.sideloadFolderButton.Size = new System.Drawing.Size(218, 28);
             this.sideloadFolderButton.TabIndex = 4;
             this.sideloadFolderButton.Text = "Sideload Folder (recursive)";
             this.sideloadFolderButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -284,10 +275,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.progressBar.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
             this.progressBar.ForeColor = System.Drawing.Color.Purple;
-            this.progressBar.Location = new System.Drawing.Point(304, 615);
-            this.progressBar.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.progressBar.Location = new System.Drawing.Point(228, 500);
             this.progressBar.Name = "progressBar";
-            this.progressBar.Size = new System.Drawing.Size(489, 31);
+            this.progressBar.Size = new System.Drawing.Size(367, 25);
             this.progressBar.TabIndex = 7;
             // 
             // copyBulkObbButton
@@ -301,11 +291,10 @@
             this.copyBulkObbButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.copyBulkObbButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.copyBulkObbButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.copyBulkObbButton.Location = new System.Drawing.Point(0, 34);
-            this.copyBulkObbButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.copyBulkObbButton.Location = new System.Drawing.Point(0, 28);
             this.copyBulkObbButton.Name = "copyBulkObbButton";
-            this.copyBulkObbButton.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.copyBulkObbButton.Size = new System.Drawing.Size(291, 34);
+            this.copyBulkObbButton.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.copyBulkObbButton.Size = new System.Drawing.Size(218, 28);
             this.copyBulkObbButton.TabIndex = 1;
             this.copyBulkObbButton.Text = "Recursive Copy OBB";
             this.copyBulkObbButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -323,10 +312,9 @@
             this.downloadInstallGameButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.downloadInstallGameButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.downloadInstallGameButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.downloadInstallGameButton.Location = new System.Drawing.Point(801, 613);
-            this.downloadInstallGameButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.downloadInstallGameButton.Location = new System.Drawing.Point(601, 498);
             this.downloadInstallGameButton.Name = "downloadInstallGameButton";
-            this.downloadInstallGameButton.Size = new System.Drawing.Size(495, 37);
+            this.downloadInstallGameButton.Size = new System.Drawing.Size(371, 30);
             this.downloadInstallGameButton.TabIndex = 8;
             this.downloadInstallGameButton.Text = "Download and Install Game/Add to Queue";
             this.downloadInstallGameButton.UseVisualStyleBackColor = false;
@@ -353,9 +341,9 @@
             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(3, 2, 3, 2);
+            this.panel1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(291, 954);
+            this.panel1.Size = new System.Drawing.Size(218, 775);
             this.panel1.TabIndex = 73;
             // 
             // downloadingLabel
@@ -364,10 +352,9 @@
             this.downloadingLabel.BackColor = System.Drawing.SystemColors.WindowText;
             this.downloadingLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
             this.downloadingLabel.ForeColor = System.Drawing.SystemColors.Control;
-            this.downloadingLabel.Location = new System.Drawing.Point(16, 879);
-            this.downloadingLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.downloadingLabel.Location = new System.Drawing.Point(12, 714);
             this.downloadingLabel.Name = "downloadingLabel";
-            this.downloadingLabel.Size = new System.Drawing.Size(126, 24);
+            this.downloadingLabel.Size = new System.Drawing.Size(98, 18);
             this.downloadingLabel.TabIndex = 83;
             this.downloadingLabel.Text = "Downloading:";
             // 
@@ -377,10 +364,9 @@
             this.StorageLabel.BackColor = System.Drawing.SystemColors.WindowText;
             this.StorageLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F);
             this.StorageLabel.ForeColor = System.Drawing.SystemColors.Control;
-            this.StorageLabel.Location = new System.Drawing.Point(16, 783);
-            this.StorageLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.StorageLabel.Location = new System.Drawing.Point(12, 636);
             this.StorageLabel.Name = "StorageLabel";
-            this.StorageLabel.Size = new System.Drawing.Size(140, 24);
+            this.StorageLabel.Size = new System.Drawing.Size(111, 18);
             this.StorageLabel.TabIndex = 83;
             this.StorageLabel.Text = "Device storage:";
             // 
@@ -396,10 +382,9 @@
             this.aboutBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.aboutBtn.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.aboutBtn.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.aboutBtn.Location = new System.Drawing.Point(0, 732);
-            this.aboutBtn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.aboutBtn.Location = new System.Drawing.Point(0, 596);
             this.aboutBtn.Name = "aboutBtn";
-            this.aboutBtn.Size = new System.Drawing.Size(291, 34);
+            this.aboutBtn.Size = new System.Drawing.Size(218, 28);
             this.aboutBtn.TabIndex = 5;
             this.aboutBtn.Text = "ABOUT";
             this.aboutBtn.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -418,10 +403,9 @@
             this.settingsButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.settingsButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.settingsButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.settingsButton.Location = new System.Drawing.Point(0, 698);
-            this.settingsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.settingsButton.Location = new System.Drawing.Point(0, 568);
             this.settingsButton.Name = "settingsButton";
-            this.settingsButton.Size = new System.Drawing.Size(291, 34);
+            this.settingsButton.Size = new System.Drawing.Size(218, 28);
             this.settingsButton.TabIndex = 4;
             this.settingsButton.Text = "SETTINGS";
             this.settingsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -439,10 +423,10 @@
             this.otherContainer.Controls.Add(this.ADBWirelessEnable);
             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, 492);
-            this.otherContainer.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.otherContainer.Location = new System.Drawing.Point(0, 401);
+            this.otherContainer.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.otherContainer.Name = "otherContainer";
-            this.otherContainer.Size = new System.Drawing.Size(291, 206);
+            this.otherContainer.Size = new System.Drawing.Size(218, 167);
             this.otherContainer.TabIndex = 80;
             // 
             // InstallQUset
@@ -456,11 +440,10 @@
             this.InstallQUset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.InstallQUset.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.InstallQUset.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.InstallQUset.Location = new System.Drawing.Point(0, 170);
-            this.InstallQUset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.InstallQUset.Location = new System.Drawing.Point(0, 140);
             this.InstallQUset.Name = "InstallQUset";
-            this.InstallQUset.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.InstallQUset.Size = new System.Drawing.Size(291, 34);
+            this.InstallQUset.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.InstallQUset.Size = new System.Drawing.Size(218, 28);
             this.InstallQUset.TabIndex = 5;
             this.InstallQUset.Text = "Install QU Setting";
             this.InstallQUset.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -478,11 +461,10 @@
             this.removeQUSetting.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.removeQUSetting.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.removeQUSetting.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.removeQUSetting.Location = new System.Drawing.Point(0, 136);
-            this.removeQUSetting.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.removeQUSetting.Location = new System.Drawing.Point(0, 112);
             this.removeQUSetting.Name = "removeQUSetting";
-            this.removeQUSetting.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.removeQUSetting.Size = new System.Drawing.Size(291, 34);
+            this.removeQUSetting.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.removeQUSetting.Size = new System.Drawing.Size(218, 28);
             this.removeQUSetting.TabIndex = 4;
             this.removeQUSetting.Text = "Remove QU Setting";
             this.removeQUSetting.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -500,11 +482,10 @@
             this.ThemeChangerButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.ThemeChangerButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.ThemeChangerButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.ThemeChangerButton.Location = new System.Drawing.Point(0, 102);
-            this.ThemeChangerButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ThemeChangerButton.Location = new System.Drawing.Point(0, 84);
             this.ThemeChangerButton.Name = "ThemeChangerButton";
-            this.ThemeChangerButton.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.ThemeChangerButton.Size = new System.Drawing.Size(291, 34);
+            this.ThemeChangerButton.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.ThemeChangerButton.Size = new System.Drawing.Size(218, 28);
             this.ThemeChangerButton.TabIndex = 3;
             this.ThemeChangerButton.Text = "Theme Changer";
             this.ThemeChangerButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -522,11 +503,10 @@
             this.QuestOptionsButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.QuestOptionsButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.QuestOptionsButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.QuestOptionsButton.Location = new System.Drawing.Point(0, 68);
-            this.QuestOptionsButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.QuestOptionsButton.Location = new System.Drawing.Point(0, 56);
             this.QuestOptionsButton.Name = "QuestOptionsButton";
-            this.QuestOptionsButton.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.QuestOptionsButton.Size = new System.Drawing.Size(291, 34);
+            this.QuestOptionsButton.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.QuestOptionsButton.Size = new System.Drawing.Size(218, 28);
             this.QuestOptionsButton.TabIndex = 2;
             this.QuestOptionsButton.Text = "Quest Options";
             this.QuestOptionsButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -544,11 +524,10 @@
             this.ADBWirelessDisable.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.ADBWirelessDisable.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.ADBWirelessDisable.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.ADBWirelessDisable.Location = new System.Drawing.Point(0, 34);
-            this.ADBWirelessDisable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.ADBWirelessDisable.Location = new System.Drawing.Point(0, 28);
             this.ADBWirelessDisable.Name = "ADBWirelessDisable";
-            this.ADBWirelessDisable.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.ADBWirelessDisable.Size = new System.Drawing.Size(291, 34);
+            this.ADBWirelessDisable.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.ADBWirelessDisable.Size = new System.Drawing.Size(218, 28);
             this.ADBWirelessDisable.TabIndex = 1;
             this.ADBWirelessDisable.Text = "Disable WIreless ADB";
             this.ADBWirelessDisable.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -567,10 +546,9 @@
             this.ADBWirelessEnable.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.ADBWirelessEnable.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.ADBWirelessEnable.Location = new System.Drawing.Point(0, 0);
-            this.ADBWirelessEnable.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.ADBWirelessEnable.Name = "ADBWirelessEnable";
-            this.ADBWirelessEnable.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.ADBWirelessEnable.Size = new System.Drawing.Size(291, 34);
+            this.ADBWirelessEnable.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.ADBWirelessEnable.Size = new System.Drawing.Size(218, 28);
             this.ADBWirelessEnable.TabIndex = 0;
             this.ADBWirelessEnable.Text = "Enable Wireless ADB";
             this.ADBWirelessEnable.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -589,11 +567,11 @@
             this.otherDrop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             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, 458);
-            this.otherDrop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.otherDrop.Location = new System.Drawing.Point(0, 373);
+            this.otherDrop.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.otherDrop.Name = "otherDrop";
-            this.otherDrop.Padding = new System.Windows.Forms.Padding(9, 0, 0, 0);
-            this.otherDrop.Size = new System.Drawing.Size(291, 34);
+            this.otherDrop.Padding = new System.Windows.Forms.Padding(7, 0, 0, 0);
+            this.otherDrop.Size = new System.Drawing.Size(218, 28);
             this.otherDrop.TabIndex = 3;
             this.otherDrop.Text = "> OTHER";
             this.otherDrop.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -607,10 +585,10 @@
             this.backupContainer.Controls.Add(this.restorebutton);
             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, 384);
-            this.backupContainer.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.backupContainer.Location = new System.Drawing.Point(0, 313);
+            this.backupContainer.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.backupContainer.Name = "backupContainer";
-            this.backupContainer.Size = new System.Drawing.Size(291, 74);
+            this.backupContainer.Size = new System.Drawing.Size(218, 60);
             this.backupContainer.TabIndex = 76;
             // 
             // backupDrop
@@ -625,11 +603,11 @@
             this.backupDrop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             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, 350);
-            this.backupDrop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.backupDrop.Location = new System.Drawing.Point(0, 285);
+            this.backupDrop.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.backupDrop.Name = "backupDrop";
-            this.backupDrop.Padding = new System.Windows.Forms.Padding(9, 0, 0, 0);
-            this.backupDrop.Size = new System.Drawing.Size(291, 34);
+            this.backupDrop.Padding = new System.Windows.Forms.Padding(7, 0, 0, 0);
+            this.backupDrop.Size = new System.Drawing.Size(218, 28);
             this.backupDrop.TabIndex = 2;
             this.backupDrop.Text = "> BACKUP";
             this.backupDrop.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -649,10 +627,10 @@
             this.sideloadContainer.Controls.Add(this.obbcopybutton);
             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, 68);
-            this.sideloadContainer.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.sideloadContainer.Location = new System.Drawing.Point(0, 56);
+            this.sideloadContainer.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.sideloadContainer.Name = "sideloadContainer";
-            this.sideloadContainer.Size = new System.Drawing.Size(291, 282);
+            this.sideloadContainer.Size = new System.Drawing.Size(218, 229);
             this.sideloadContainer.TabIndex = 74;
             // 
             // UpdateGamesButton
@@ -666,11 +644,10 @@
             this.UpdateGamesButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.UpdateGamesButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.UpdateGamesButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.UpdateGamesButton.Location = new System.Drawing.Point(0, 238);
-            this.UpdateGamesButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.UpdateGamesButton.Location = new System.Drawing.Point(0, 196);
             this.UpdateGamesButton.Name = "UpdateGamesButton";
-            this.UpdateGamesButton.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.UpdateGamesButton.Size = new System.Drawing.Size(291, 34);
+            this.UpdateGamesButton.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.UpdateGamesButton.Size = new System.Drawing.Size(218, 28);
             this.UpdateGamesButton.TabIndex = 7;
             this.UpdateGamesButton.Text = "Refresh Update List";
             this.UpdateGamesButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -688,11 +665,10 @@
             this.listApkButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.listApkButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.listApkButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.listApkButton.Location = new System.Drawing.Point(0, 204);
-            this.listApkButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.listApkButton.Location = new System.Drawing.Point(0, 168);
             this.listApkButton.Name = "listApkButton";
-            this.listApkButton.Padding = new System.Windows.Forms.Padding(31, 0, 0, 0);
-            this.listApkButton.Size = new System.Drawing.Size(291, 34);
+            this.listApkButton.Padding = new System.Windows.Forms.Padding(23, 0, 0, 0);
+            this.listApkButton.Size = new System.Drawing.Size(218, 28);
             this.listApkButton.TabIndex = 6;
             this.listApkButton.Text = "Refresh All";
             this.listApkButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -711,11 +687,11 @@
             this.sideloadDrop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             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, 34);
-            this.sideloadDrop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.sideloadDrop.Location = new System.Drawing.Point(0, 28);
+            this.sideloadDrop.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.sideloadDrop.Name = "sideloadDrop";
-            this.sideloadDrop.Padding = new System.Windows.Forms.Padding(9, 0, 0, 0);
-            this.sideloadDrop.Size = new System.Drawing.Size(291, 34);
+            this.sideloadDrop.Padding = new System.Windows.Forms.Padding(7, 0, 0, 0);
+            this.sideloadDrop.Size = new System.Drawing.Size(218, 28);
             this.sideloadDrop.TabIndex = 1;
             this.sideloadDrop.Text = "> SIDELOAD";
             this.sideloadDrop.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -729,9 +705,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(17, 805);
+            this.diskLabel.Location = new System.Drawing.Point(13, 654);
+            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(72, 16);
             this.diskLabel.TabIndex = 7;
             this.diskLabel.Text = "Disk Label";
             // 
@@ -742,9 +719,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(16, 902);
+            this.speedLabel.Location = new System.Drawing.Point(12, 733);
+            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(135, 16);
             this.speedLabel.TabIndex = 76;
             this.speedLabel.Text = "DLS: Speed in MBPS";
             // 
@@ -755,9 +733,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(16, 924);
+            this.etaLabel.Location = new System.Drawing.Point(12, 751);
+            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(131, 16);
             this.etaLabel.TabIndex = 75;
             this.etaLabel.Text = "ETA: HH:MM:SS Left";
             // 
@@ -770,10 +749,9 @@
             this.freeDisclaimer.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.freeDisclaimer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.freeDisclaimer.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.freeDisclaimer.Location = new System.Drawing.Point(383, 768);
-            this.freeDisclaimer.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.freeDisclaimer.Location = new System.Drawing.Point(287, 624);
             this.freeDisclaimer.Name = "freeDisclaimer";
-            this.freeDisclaimer.Size = new System.Drawing.Size(294, 50);
+            this.freeDisclaimer.Size = new System.Drawing.Size(246, 40);
             this.freeDisclaimer.TabIndex = 79;
             this.freeDisclaimer.Text = "This app is FREE!! \r\nClick here to go to the github.";
             this.freeDisclaimer.TextAlign = System.Drawing.ContentAlignment.TopCenter;
@@ -791,11 +769,11 @@
             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.Location = new System.Drawing.Point(801, 651);
-            this.gamesQueListBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gamesQueListBox.ItemHeight = 16;
+            this.gamesQueListBox.Location = new System.Drawing.Point(601, 530);
+            this.gamesQueListBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.gamesQueListBox.Name = "gamesQueListBox";
-            this.gamesQueListBox.Size = new System.Drawing.Size(495, 122);
+            this.gamesQueListBox.Size = new System.Drawing.Size(372, 114);
             this.gamesQueListBox.TabIndex = 9;
             this.gamesQueListBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.gamesQueListBox_MouseClick);
             // 
@@ -811,10 +789,10 @@
             this.devicesComboBox.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.devicesComboBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.devicesComboBox.FormattingEnabled = true;
-            this.devicesComboBox.Location = new System.Drawing.Point(303, 48);
-            this.devicesComboBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.devicesComboBox.Location = new System.Drawing.Point(227, 39);
+            this.devicesComboBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.devicesComboBox.Name = "devicesComboBox";
-            this.devicesComboBox.Size = new System.Drawing.Size(273, 28);
+            this.devicesComboBox.Size = new System.Drawing.Size(206, 24);
             this.devicesComboBox.TabIndex = 1;
             this.devicesComboBox.Text = "Select your device";
             this.devicesComboBox.SelectedIndexChanged += new System.EventHandler(this.devicesComboBox_SelectedIndexChanged);
@@ -830,10 +808,10 @@
             this.remotesList.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.remotesList.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.remotesList.FormattingEnabled = true;
-            this.remotesList.Location = new System.Drawing.Point(707, 48);
-            this.remotesList.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.remotesList.Location = new System.Drawing.Point(530, 39);
+            this.remotesList.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.remotesList.Name = "remotesList";
-            this.remotesList.Size = new System.Drawing.Size(273, 28);
+            this.remotesList.Size = new System.Drawing.Size(206, 24);
             this.remotesList.TabIndex = 3;
             this.remotesList.Text = "Select a mirror";
             this.remotesList.SelectedIndexChanged += new System.EventHandler(this.remotesList_SelectedIndexChanged);
@@ -848,10 +826,9 @@
             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(303, 87);
-            this.gamesListView.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gamesListView.Location = new System.Drawing.Point(227, 71);
             this.gamesListView.Name = "gamesListView";
-            this.gamesListView.Size = new System.Drawing.Size(992, 520);
+            this.gamesListView.Size = new System.Drawing.Size(745, 423);
             this.gamesListView.TabIndex = 6;
             this.gamesListView.UseCompatibleStateImageBehavior = false;
             this.gamesListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.listView1_ColumnClick);
@@ -868,10 +845,9 @@
             this.searchTextBox.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             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(988, 49);
-            this.searchTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.searchTextBox.Location = new System.Drawing.Point(741, 40);
             this.searchTextBox.Name = "searchTextBox";
-            this.searchTextBox.Size = new System.Drawing.Size(307, 25);
+            this.searchTextBox.Size = new System.Drawing.Size(231, 22);
             this.searchTextBox.TabIndex = 5;
             this.searchTextBox.Text = "Search";
             this.searchTextBox.TextChanged += new System.EventHandler(this.searchTextBox_TextChanged);
@@ -880,25 +856,23 @@
             // 
             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(304, 651);
-            this.gamesPictureBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.gamesPictureBox.Location = new System.Drawing.Point(228, 529);
             this.gamesPictureBox.Name = "gamesPictureBox";
-            this.gamesPictureBox.Size = new System.Drawing.Size(489, 263);
+            this.gamesPictureBox.Size = new System.Drawing.Size(367, 214);
             this.gamesPictureBox.TabIndex = 84;
             this.gamesPictureBox.TabStop = false;
             // 
             // gamesQueueLabel
             // 
-            this.gamesQueueLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.gamesQueueLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.gamesQueueLabel.AutoSize = true;
             this.gamesQueueLabel.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             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(796, 773);
-            this.gamesQueueLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.gamesQueueLabel.Location = new System.Drawing.Point(597, 628);
             this.gamesQueueLabel.Name = "gamesQueueLabel";
-            this.gamesQueueLabel.Size = new System.Drawing.Size(113, 20);
+            this.gamesQueueLabel.Size = new System.Drawing.Size(95, 16);
             this.gamesQueueLabel.TabIndex = 86;
             this.gamesQueueLabel.Text = "Games Queue";
             // 
@@ -914,10 +888,9 @@
             this.MountButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.MountButton.Font = global::AndroidSideloader.Properties.Settings.Default.FontStyle;
             this.MountButton.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.MountButton.Location = new System.Drawing.Point(584, 48);
-            this.MountButton.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.MountButton.Location = new System.Drawing.Point(438, 39);
             this.MountButton.Name = "MountButton";
-            this.MountButton.Size = new System.Drawing.Size(116, 32);
+            this.MountButton.Size = new System.Drawing.Size(87, 26);
             this.MountButton.TabIndex = 2;
             this.MountButton.Text = "Mount";
             this.MountButton.UseVisualStyleBackColor = false;
@@ -931,10 +904,9 @@
             this.ProgressText.BackColor = System.Drawing.Color.Transparent;
             this.ProgressText.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.ProgressText.ForeColor = System.Drawing.Color.White;
-            this.ProgressText.Location = new System.Drawing.Point(300, 924);
-            this.ProgressText.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.ProgressText.Location = new System.Drawing.Point(225, 751);
             this.ProgressText.Name = "ProgressText";
-            this.ProgressText.Size = new System.Drawing.Size(0, 24);
+            this.ProgressText.Size = new System.Drawing.Size(0, 18);
             this.ProgressText.TabIndex = 88;
             // 
             // notesRichTextBox
@@ -947,13 +919,12 @@
             this.notesRichTextBox.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.notesRichTextBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.notesRichTextBox.HideSelection = false;
-            this.notesRichTextBox.Location = new System.Drawing.Point(801, 802);
-            this.notesRichTextBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.notesRichTextBox.Location = new System.Drawing.Point(601, 647);
             this.notesRichTextBox.Name = "notesRichTextBox";
             this.notesRichTextBox.ReadOnly = true;
             this.notesRichTextBox.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.Vertical;
             this.notesRichTextBox.ShowSelectionMargin = true;
-            this.notesRichTextBox.Size = new System.Drawing.Size(493, 111);
+            this.notesRichTextBox.Size = new System.Drawing.Size(371, 96);
             this.notesRichTextBox.TabIndex = 10;
             this.notesRichTextBox.Text = "";
             // 
@@ -964,10 +935,9 @@
             this.DragDropLbl.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             this.DragDropLbl.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.DragDropLbl.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
-            this.DragDropLbl.Location = new System.Drawing.Point(299, 746);
-            this.DragDropLbl.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.DragDropLbl.Location = new System.Drawing.Point(224, 606);
             this.DragDropLbl.Name = "DragDropLbl";
-            this.DragDropLbl.Size = new System.Drawing.Size(394, 69);
+            this.DragDropLbl.Size = new System.Drawing.Size(320, 55);
             this.DragDropLbl.TabIndex = 25;
             this.DragDropLbl.Text = "DragDropLBL";
             this.DragDropLbl.Visible = false;
@@ -975,16 +945,15 @@
             // 
             // label1
             // 
-            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label1.AutoSize = true;
             this.label1.DataBindings.Add(new System.Windows.Forms.Binding("ForeColor", global::AndroidSideloader.Properties.Settings.Default, "FontColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
             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(797, 898);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(598, 730);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(97, 20);
+            this.label1.Size = new System.Drawing.Size(81, 16);
             this.label1.TabIndex = 86;
             this.label1.Text = "Install Notes";
             // 
@@ -998,10 +967,9 @@
             this.pictureBox1.ErrorImage = null;
             this.pictureBox1.ImageLocation = global::AndroidSideloader.Properties.Settings.Default.BackPicturePath;
             this.pictureBox1.InitialImage = null;
-            this.pictureBox1.Location = new System.Drawing.Point(289, -1);
-            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pictureBox1.Location = new System.Drawing.Point(217, -1);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(1019, 950);
+            this.pictureBox1.Size = new System.Drawing.Size(764, 772);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureBox1.TabIndex = 74;
             this.pictureBox1.TabStop = false;
@@ -1009,10 +977,10 @@
             // MainForm
             // 
             this.AllowDrop = true;
-            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(1307, 954);
+            this.ClientSize = new System.Drawing.Size(980, 775);
             this.Controls.Add(this.freeDisclaimer);
             this.Controls.Add(this.DragDropLbl);
             this.Controls.Add(this.MountButton);
@@ -1032,7 +1000,6 @@
             this.Controls.Add(this.ProgressText);
             this.Controls.Add(this.pictureBox1);
             this.DataBindings.Add(new System.Windows.Forms.Binding("BackColor", global::AndroidSideloader.Properties.Settings.Default, "BackColor", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.MaximizeBox = false;
             this.Name = "MainForm";
             this.ShowIcon = false;

MainForm.cs

@@ -105,13 +105,12 @@ namespace AndroidSideloader
             FlexibleMessageBox.Show(this, message);
         }
 
-        private List<string> Devices = new List<string>();
+        public List<string> Devices = new List<string>();
 
         public async Task<int> CheckForDevice()
         {
 
             Devices.Clear();
-            ADB.WakeDevice();
             string output = string.Empty;
             ADB.DeviceID = GetDeviceID();
             Thread t1 = new Thread(() =>
@@ -168,16 +167,13 @@ namespace AndroidSideloader
 
         private async void obbcopybutton_Click(object sender, EventArgs e)
         {
-            ADB.WakeDevice();
             ProcessOutput output = new ProcessOutput("", "");
             var dialog = new FolderSelectDialog
             {
                 Title = "Select your obb folder"
             };
             if (Properties.Settings.Default.IPAddress.Contains("connect"))
-            {
-                ADB.RunAdbCommandToString(Properties.Settings.Default.IPAddress);
-            }
+                ADB.WakeDevice();
             if (dialog.Show(Handle))
             {
                 Thread t1 = new Thread(() =>
@@ -198,30 +194,29 @@ namespace AndroidSideloader
 
         public void ChangeTitlebarToDevice()
         {
-
-            ADB.WakeDevice();
-            if (!Devices.Contains("unauthorized"))
+            if (Devices[0].Length > 1 && Devices.Contains("unauthorized") || Devices.Contains("ADB_VENDOR_KEYS"))
             {
-                if (Devices[0].Length > 1 && Devices[0].Contains("unauthorized"))
+                DeviceConnected = false;
+                this.Invoke(() =>
                 {
-                    DeviceConnected = false;
-                    this.Invoke(() =>
+                    this.Text = "Device Not Authorized";
+                    DialogResult dialogResult = MessageBox.Show("Device not authorized, check device screen for ALLOW USB DEBUGGING prompt, check \"Always allow\" box and hit OK.", "Not Authorized", MessageBoxButtons.RetryCancel);
+                    if (dialogResult == DialogResult.Retry)
                     {
-                        this.Text = "Device Not Authorized";
-                        DialogResult dialogResult = MessageBox.Show("Device not authorized, be sure to authorize computer on device.", "Not Authorized", MessageBoxButtons.RetryCancel);
-                        if (dialogResult == DialogResult.Retry)
-                        {
-                            devicesbutton.PerformClick();
-                            ;
-                        }
-                        else
-                        {
-                            return;
-                        }
+                        devicesbutton.PerformClick();
+                        
+                    }
+                    else
+                    {
+                        return;
+                    }
 
-                    });
-                }
-                else if (Devices[0].Length > 1)
+                });
+            }
+            if (!Devices.Contains("unauthorized"))
+            { 
+
+                if (Devices[0].Length > 1)
                 {
                     this.Invoke(() => { this.Text = "Device Connected with ID | " + Devices[0].Replace("device", ""); });
                     DeviceConnected = true;
@@ -245,13 +240,11 @@ namespace AndroidSideloader
 
                     });
             }
+            
         }
 
         public async void showAvailableSpace()
         {
-            ADB.WakeDevice();
-
-
             string AvailableSpace = string.Empty;
             ADB.DeviceID = GetDeviceID();
             Thread t1 = new Thread(() =>
@@ -268,7 +261,6 @@ namespace AndroidSideloader
 
         public string GetDeviceID()
         {
-            ADB.WakeDevice();
             string deviceId = string.Empty;
             int index = -1;
             devicesComboBox.Invoke(() => { index = devicesComboBox.SelectedIndex; });
@@ -299,12 +291,13 @@ namespace AndroidSideloader
 
         private async void Form1_Load(object sender, EventArgs e)
         {
-            ADB.WakeDevice();
-                Properties.Settings.Default.ADBPath = $"\"{Environment.CurrentDirectory}" + "\\adb\\adb.exe\"";
-                Properties.Settings.Default.MainDir = Environment.CurrentDirectory;
-                Properties.Settings.Default.Save();
-   
-
+            if (Directory.Exists($"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\\SideQuest\\platform-tools"))
+                Properties.Settings.Default.ADBPath = $"{Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)}\\SideQuest\\platform-tools";
+            else
+                Properties.Settings.Default.ADBPath = Environment.CurrentDirectory + "\\adb";
+            Properties.Settings.Default.MainDir = Environment.CurrentDirectory;
+            Properties.Settings.Default.Save();
+            ADB.RunAdbCommandToString("kill-server");
             if (File.Exists(Sideloader.CrashLogPath))
             {
                 DialogResult dialogResult = FlexibleMessageBox.Show(this, $@"Looks like sideloader crashed last time, please make an issue at https://github.com/nerdunit/androidsideloader/issues
@@ -360,6 +353,7 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
                 ADB.WakeDevice();
                 await CheckForDevice();
                 ChangeTitlebarToDevice();
+                ADB.RunAdbCommandToString("shell svc usb setFunctions mtp true");
             }
             catch { }
         }
@@ -438,7 +432,10 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
                 string path = dialog.FileName;
                 Thread t1 = new Thread(() =>
                 {
-                    output += ADB.RunAdbCommandToString($"push \"{path}\" /sdcard/Android/");
+                    if (path.Contains("com."))
+                        output += ADB.RunAdbCommandToString($"push \"{path}\" /sdcard/Android/data/");
+                    if (path.Contains("data"))
+                        output += ADB.RunAdbCommandToString($"push \"{path}\" /sdcard/Android/");
                 });
                 t1.IsBackground = true;
                 t1.Start();
@@ -453,7 +450,6 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
 
         private string listapps()
         {
-            ADB.WakeDevice();
             ADB.DeviceID = GetDeviceID();
             return ADB.RunAdbCommandToString("shell pm list packages -3").Output;
         }
@@ -528,7 +524,7 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
             ADB.WakeDevice();
             if (m_combo.SelectedIndex == -1)
             {
-                FlexibleMessageBox.Show("Please select an app first");
+                FlexibleMessageBox.Show("Please select an app first ");
                 return;
             }
             string date_str = DateTime.Today.ToString("yyyy.MM.dd");
@@ -537,12 +533,10 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
 
             string GameName = m_combo.SelectedItem.ToString();
             string packagename = Sideloader.gameNameToPackageName(GameName);
-            MessageBox.Show($"If savedata is found it will be saved to Documents\\Rookie Backups\\{date_str}(year.month.date)\\{packagename}\\data", "Attempting Backup...", MessageBoxButtons.OK);
+            MessageBox.Show($"If savedata is found it will be saved to Documents\\Rookie Backups\\{date_str}(year.month.date)\\{packagename}", "Attempting Backup...", MessageBoxButtons.OK);
 
             Directory.CreateDirectory(CurrBackups);
-            String CurrbackupPaths = CurrBackups + "\\" + packagename + "\\data";
-            Directory.CreateDirectory(CurrbackupPaths);
-            ADB.RunAdbCommandToString($"pull \"/sdcard/Android/data/{packagename}\" \"{CurrbackupPaths}\"");
+            ADB.RunAdbCommandToString($"pull \"/sdcard/Android/data/{packagename}\" \"{CurrBackups}\"");
             DialogResult dialogResult = MessageBox.Show($"Please check to see if we automatically found savedata in Documents\\Rookie Backups.\nIf there are no new files there is recommended that you do a full backup via Backup Gamedata before continuing.\nNOTE: Some games do not allow backup of savedata.\nContinue with the uninstall?", "Check for backup.", MessageBoxButtons.OKCancel);
             if (dialogResult == DialogResult.Cancel)
             {
@@ -642,17 +636,16 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
                     //if is directory
                     string dir = Path.GetDirectoryName(data);
                     string path = $"{dir}\\Install.txt";
-                    if (Directory.Exists(data))
+                    if (data.StartsWith("com."))
                     {
                         output += ADB.CopyOBB(data);
                         string extension = Path.GetExtension(data);
                         if (extension == ".apk")
                         {
-
+                            output += ADB.Sideload(data);
                             if (File.Exists($"{Environment.CurrentDirectory}\\Install.txt"))
                             {
-                                
-
+                            
                                 DialogResult dialogResult = MessageBox.Show("Special instructions have been found with this file, would you like to run them automatically?", "Special Instructions found!", MessageBoxButtons.OKCancel);
                                 if (dialogResult == DialogResult.Cancel)
                                     return;
@@ -664,6 +657,7 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
                                 if (output.Error.Contains("reserved"))
                                     output.Output = "";
                                 ChangeTitle("Done.");
+                               
                             }
                     }
                     string[] files = Directory.GetFiles(data);
@@ -690,6 +684,8 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
                         string extension = Path.GetExtension(data);
                         if (extension == ".apk")
                         {
+                            output += ADB.Sideload(data);
+
                             if (File.Exists($"{dir}\\Install.txt"))
                             {
                     
@@ -703,10 +699,6 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
                                     ChangeTitle("Done.");
                                 }
                             }
-                            else
-                            {
-                                output += ADB.Sideload(data);
-                            }
                         }
                         else if (extension == ".obb")
                         {
@@ -761,7 +753,6 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
         }
         private void initListView()
         {
-            ADB.WakeDevice();
             gamesListView.Items.Clear();
             gamesListView.Columns.Clear();
             if (!File.Exists("installedPackages.json"))
@@ -890,8 +881,6 @@ Do you want to delete the {Sideloader.CrashLogPath} (if you press yes, this mess
 
         private void initMirrors(bool random)
         {
-            ADB.WakeDevice();
-
             int index = 0;
             remotesList.Invoke(() => { index = remotesList.SelectedIndex; remotesList.Items.Clear(); });
 
@@ -1336,6 +1325,7 @@ without him none of this would be possible
         private void Form1_FormClosing(object sender, FormClosingEventArgs e)
         {
             RCLONE.killRclone();
+            ADB.RunAdbCommandToString("kill-server");
         }
 
         private void ADBWirelessDisable_Click(object sender, EventArgs e)
@@ -1533,15 +1523,12 @@ without him none of this would be possible
         {
             ADB.WakeDevice();
 
-            if (DeviceConnected)
-            {
-                if (ADB.DeviceID.Contains(":5555"))
-                    MessageBox.Show("Mounting does not work with Wireless ADB, you must plug Quest into PC to mount.");
-                
-                ADB.RunAdbCommandToString("shell svc usb setFunctions mtp true");
+
+            if (ADB.DeviceID.Contains(":5555")) {
+                MessageBox.Show("Mounting does not work with Wireless ADB, you must plug Quest into PC to mount.");
             }
-            else
-                FlexibleMessageBox.Show("You must connect a device before mounting!");
+             
+            ADB.RunAdbCommandToString("shell svc usb setFunctions mtp true");
         }
 
         private void freeDisclaimer_Click(object sender, EventArgs e)

QuestForm.Designer.cs

@@ -332,7 +332,7 @@ namespace AndroidSideloader
             "4"});
             this.CPUComboBox.Location = new System.Drawing.Point(13, 126);
             this.CPUComboBox.Name = "CPUComboBox";
-            this.CPUComboBox.Size = new System.Drawing.Size(345, 21);
+            this.CPUComboBox.Size = new System.Drawing.Size(345, 24);
             this.CPUComboBox.TabIndex = 2;
             this.CPUComboBox.Text = "Select CPU level (0 for default)";
             // 
@@ -354,7 +354,7 @@ namespace AndroidSideloader
             "4"});
             this.GPUComboBox.Location = new System.Drawing.Point(13, 97);
             this.GPUComboBox.Name = "GPUComboBox";
-            this.GPUComboBox.Size = new System.Drawing.Size(345, 21);
+            this.GPUComboBox.Size = new System.Drawing.Size(345, 24);
             this.GPUComboBox.TabIndex = 1;
             this.GPUComboBox.Text = "Select GPU level (0 for default)";
             // 
@@ -368,7 +368,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(44, 15);
+            this.label7.Size = new System.Drawing.Size(49, 16);
             this.label7.TabIndex = 3;
             this.label7.Text = "Fov - X";
             this.label7.Visible = false;
@@ -384,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(43, 15);
+            this.label8.Size = new System.Drawing.Size(50, 16);
             this.label8.TabIndex = 3;
             this.label8.Text = "Fov - Y";
             this.label8.Visible = false;
@@ -400,7 +400,7 @@ namespace AndroidSideloader
             this.label9.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.label9.Location = new System.Drawing.Point(11, 583);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(79, 15);
+            this.label9.Size = new System.Drawing.Size(87, 16);
             this.label9.TabIndex = 3;
             this.label9.Text = "Refresh Rate";
             this.label9.Visible = false;
@@ -415,7 +415,7 @@ namespace AndroidSideloader
             this.label6.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.label6.Location = new System.Drawing.Point(13, 484);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(142, 15);
+            this.label6.Size = new System.Drawing.Size(153, 16);
             this.label6.TabIndex = 3;
             this.label6.Text = "Enter Custom Username";
             this.label6.Visible = false;
@@ -431,7 +431,7 @@ namespace AndroidSideloader
             this.label5.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.label5.Location = new System.Drawing.Point(12, 434);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(278, 15);
+            this.label5.Size = new System.Drawing.Size(301, 16);
             this.label5.TabIndex = 3;
             this.label5.Text = "Custom Resolution Width (Height auto calculated)";
             this.label5.Visible = false;
@@ -447,7 +447,7 @@ namespace AndroidSideloader
             this.ResolutionLabel.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.ResolutionLabel.Location = new System.Drawing.Point(11, 183);
             this.ResolutionLabel.Name = "ResolutionLabel";
-            this.ResolutionLabel.Size = new System.Drawing.Size(163, 15);
+            this.ResolutionLabel.Size = new System.Drawing.Size(177, 16);
             this.ResolutionLabel.TabIndex = 3;
             this.ResolutionLabel.Text = "Resolution (p eye, 0=default)";
             // 
@@ -461,7 +461,7 @@ namespace AndroidSideloader
             this.FOVy.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.FOVy.Location = new System.Drawing.Point(191, 507);
             this.FOVy.Name = "FOVy";
-            this.FOVy.Size = new System.Drawing.Size(167, 20);
+            this.FOVy.Size = new System.Drawing.Size(167, 22);
             this.FOVy.TabIndex = 12;
             this.FOVy.Text = "0";
             this.FOVy.Visible = false;
@@ -477,7 +477,7 @@ namespace AndroidSideloader
             this.FOVx.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.FOVx.Location = new System.Drawing.Point(13, 507);
             this.FOVx.Name = "FOVx";
-            this.FOVx.Size = new System.Drawing.Size(169, 20);
+            this.FOVx.Size = new System.Drawing.Size(169, 22);
             this.FOVx.TabIndex = 11;
             this.FOVx.Text = "0";
             this.FOVx.Visible = false;
@@ -493,7 +493,7 @@ namespace AndroidSideloader
             this.UsrBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.UsrBox.Location = new System.Drawing.Point(13, 459);
             this.UsrBox.Name = "UsrBox";
-            this.UsrBox.Size = new System.Drawing.Size(345, 20);
+            this.UsrBox.Size = new System.Drawing.Size(345, 22);
             this.UsrBox.TabIndex = 10;
             this.UsrBox.Text = "0";
             this.UsrBox.Visible = false;
@@ -509,7 +509,7 @@ namespace AndroidSideloader
             this.ResBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.ResBox.Location = new System.Drawing.Point(13, 409);
             this.ResBox.Name = "ResBox";
-            this.ResBox.Size = new System.Drawing.Size(345, 20);
+            this.ResBox.Size = new System.Drawing.Size(345, 22);
             this.ResBox.TabIndex = 9;
             this.ResBox.Text = "0";
             this.ResBox.Visible = false;
@@ -525,7 +525,7 @@ namespace AndroidSideloader
             this.TextureResTextBox.ForeColor = global::AndroidSideloader.Properties.Settings.Default.FontColor;
             this.TextureResTextBox.Location = new System.Drawing.Point(13, 155);
             this.TextureResTextBox.Name = "TextureResTextBox";
-            this.TextureResTextBox.Size = new System.Drawing.Size(169, 20);
+            this.TextureResTextBox.Size = new System.Drawing.Size(169, 22);
             this.TextureResTextBox.TabIndex = 3;
             this.TextureResTextBox.Text = "0";
             // 
@@ -581,7 +581,7 @@ namespace AndroidSideloader
             "120"});
             this.QURfrRt.Location = new System.Drawing.Point(12, 555);
             this.QURfrRt.Name = "QURfrRt";
-            this.QURfrRt.Size = new System.Drawing.Size(170, 21);
+            this.QURfrRt.Size = new System.Drawing.Size(170, 24);
             this.QURfrRt.TabIndex = 13;
             this.QURfrRt.Text = "0";
             this.QURfrRt.Visible = false;
@@ -603,7 +603,7 @@ namespace AndroidSideloader
             "120"});
             this.RefreshRateComboBox.Location = new System.Drawing.Point(13, 68);
             this.RefreshRateComboBox.Name = "RefreshRateComboBox";
-            this.RefreshRateComboBox.Size = new System.Drawing.Size(345, 21);
+            this.RefreshRateComboBox.Size = new System.Drawing.Size(345, 24);
             this.RefreshRateComboBox.TabIndex = 0;
             this.RefreshRateComboBox.Text = "Select refresh rate";
             // 
@@ -649,8 +649,8 @@ namespace AndroidSideloader
             this.Controls.Add(this.button1);
             this.Controls.Add(this.QURfrRt);
             this.Controls.Add(this.RefreshRateComboBox);
-            this.MaximumSize = new System.Drawing.Size(386, 808);
-            this.MinimumSize = new System.Drawing.Size(386, 608);
+            this.MaximumSize = new System.Drawing.Size(386, 776);
+            this.MinimumSize = new System.Drawing.Size(386, 776);
             this.Name = "QuestForm";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

Updater.cs

@@ -17,7 +17,7 @@ namespace AndroidSideloader
         private static string RawGitHubUrl;
         private static string GitHubUrl;
 
-        static readonly public string LocalVersion = "2.1.1";
+        static readonly public string LocalVersion = "2.1.2";
         public static string currentVersion = string.Empty;
         public static string changelog = string.Empty;
 

changelog.txt

@@ -1,6 +1,37 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+2.1.2
+
++ Updated logic to use SideQuest adb.exe if present on system, if not RSL will use local adb.exe. This will keep adb.exe up to date as long as SQ is up to date and should fix any adb version issues that were preventing obb's from copying correctly.
++ Added adb kill-server command to launch and exit of RSL. No more adb.exe running in background forever.
+= After PC reboot wireless ADB message should only pop up once or twice now (depending on outside factors) instead of 5x, user can press cancel then "wake" quest before pressing cancel again to reconnect wireless ADB in case of device just being idle, not rebooted.
+= Fixed install.txt not installing APK before following install.txt commands when using Drag and Drop install.
+= Uninstall will now backup saves to
+Documents\Rookie Backups\<Today'sDate>\<PackageName> (e.g.: com.beatgames.beatsaber). 
+Restore process now looks for either data folder (the folder that a full backup of entire Quest will be contained in) or PackageName folder (they all start with com. so if it finds that it will restore it to the appropriate location). Previously RSL would backup individual saves to  
+Documents\Rookie Backups\PackageName\data\PackageName.
+= OBB folders will automatically be copied when drag and dropping even if the folder contains no OBB files.
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAEBCAAdFiEEKjgtlwMyrpVu4TGfx/Rql1VoczcFAmDLArAACgkQx/Rql1Vo
+czfF5w/+JLiuayS6i7qwK04rxkin8xv81YqPDnfnroOXVtmEZwj70C/474yvK1EA
+ntWdc8guKzqSS5E7aaUEttS8r8xh6h+ZNp1EPHuQqcRkn0BJZqzk4CFT9ZxHRrD1
+UPuo8mlWa27+sEGEywNwasVDFkB4lMNL5cv0OWXxvMwAbaIP5gneITYBA6KzIp3L
+WVnHyqkRGAz6pGHsdoCXurOBdiXs9IEt6TPgZTmjFAbysewEvjIodtfgThHZKSbp
+XQZwMiY0GbSYJWTGWT3wcbi6TE5p7oTb9CbD6a6n8iuCeaRppkMVqvFIik6vDREJ
+4mRsvehM1RWV5b/v9bWi+5Pz0A8+hWxX+VjlgIQD1hLSMHbbpG4vzwRORl0/u8Bc
+H+XZOb7jun0Aiswqm49QPUAYSGqKhKuWkL4Eu2JDL6Fyq0ukmC85/w7MQUt1JF01
+0dGT/QzjOyPfZYuAyPwrBr8MJ9pyn/3gC6XAKFgMEjmOnqM4Ab2P3aXlg+NwvtDB
+8g6lbPxhqDuO49NyZZzhChXURE8ndOIgR9sSLfMjgYs5NaK6ZydNJiV8VRPjx+/J
+wXpPQLhHxP2Onu9c8SFRt1Lf6M01uRmH2dO7LbSxVjh+V+WyDGoPZt0kUMXpa9LJ
+l5S1MO+qe8akmXgoOCXnQYBOniS9iQqg4nmUK4PF7nssahQ6nG0=
+=Le5S
+-----END PGP SIGNATURE-----
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 RSL 2.1.1
 
 = Fixed QUSettings not working issue.(unused fields in QUSettings MUST have 0's in them or it will not work, reset/clear all fields button now reflect this.)

version

@@ -1 +1 @@
-2.1HF2
+v2.1.2