diff --git a/BetterJoyForCemu/App.config b/BetterJoyForCemu/App.config
index 84327c2..5bd8a1b 100644
--- a/BetterJoyForCemu/App.config
+++ b/BetterJoyForCemu/App.config
@@ -53,7 +53,7 @@
         <!-- Determines whether or not to use HidGuardian (improves compatibility with other programs, like Steam, when set to "false") -->
         <!-- When "true", BetterJoy will hide the Pro/Joycons from other programs to prevent glitching out on exit and to prevent DI/XI clashes in certain programs -->
         <!-- Default: false -->
-        <add key="UseHIDG" value="true" />
+        <add key="UseHIDG" value="false" />
 
         <!-- Determines whether or not to enable (experimental - currently default controller to pro) support for 3rd-party controllers. Adds a "Calibrate" button. -->
         <!-- When "true", click "Calibrate" button once to get gyro calibrate data. -->
@@ -96,7 +96,7 @@
         <add key="AutoPowerOff" value="false" />
         <!-- Automatically power off controllers after a period of inactivity (in minutes) -->
         <!-- Default: 30 (-1 indicates infinite time) -->
-        <add key="PowerOffInactivity" value="30" />
+        <add key="PowerOffInactivity" value="-1" />
         <!-- Power off controllers when Capture (left only) or Home (right only or combined) buttons are pressed for a long interval (2s) -->
         <!-- Default: true -->
         <add key="HomeLongPowerOff" value="true" />
diff --git a/BetterJoyForCemu/Joycon.cs b/BetterJoyForCemu/Joycon.cs
index a68a34c..f4a713c 100644
--- a/BetterJoyForCemu/Joycon.cs
+++ b/BetterJoyForCemu/Joycon.cs
@@ -359,6 +359,12 @@ namespace BetterJoyForCemu {
                 HIDapi.hid_write(handle, a, new UIntPtr(2));
                 HIDapi.hid_read_timeout(handle, a, new UIntPtr(64), 100);
 
+                if (a[0] != 0x81) { // can occur when USB connection isn't closed properly
+                    form.AppendTextBox("Resetting USB connection.\r\n");
+                    Subcommand(0x06, new byte[] { 0x01 }, 1);
+                    throw new Exception("reset_usb");
+                }
+
                 if (a[3] == 0x3) {
                     PadMacAddress = new PhysicalAddress(new byte[] { a[9], a[8], a[7], a[6], a[5], a[4] });
                 }
@@ -466,6 +472,12 @@ namespace BetterJoyForCemu {
                     }
                 }
             }
+
+            if (battery <= 1) {
+                form.notifyIcon.Visible = true;
+                form.notifyIcon.BalloonTipText = String.Format("Controller {0} ({1}) - low battery notification!", PadId, isPro ? "Pro Controller" : (isSnes ? "SNES Controller" : (isLeft ? "Joycon Left" : "Joycon Right")));
+                form.notifyIcon.ShowBalloonTip(0);
+            }
         }
 
         public void SetFilterCoeff(float a) {
@@ -1033,7 +1045,6 @@ namespace BetterJoyForCemu {
             HIDapi.hid_write(handle, buf_, new UIntPtr(len + 11));
             int tries = 0;
             do {
-
                 int res = HIDapi.hid_read_timeout(handle, response, new UIntPtr(report_len), 100);
                 if (res < 1) DebugPrint("No response.", DebugType.COMMS);
                 else if (print) { PrintArray(response, DebugType.COMMS, report_len - 1, 1, "Response ID 0x" + string.Format("{0:X2}", response[0]) + ". Data: 0x{0:S}"); }
diff --git a/BetterJoyForCemu/MainForm.Designer.cs b/BetterJoyForCemu/MainForm.Designer.cs
index 30b1359..df0448d 100644
--- a/BetterJoyForCemu/MainForm.Designer.cs
+++ b/BetterJoyForCemu/MainForm.Designer.cs
@@ -23,356 +23,356 @@
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent() {
-			this.components = new System.ComponentModel.Container();
-			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
-			this.console = new System.Windows.Forms.TextBox();
-			this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
-			this.contextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.version_lbl = new System.Windows.Forms.Label();
-			this.passiveScanBox = new System.Windows.Forms.CheckBox();
-			this.donationLink = new System.Windows.Forms.LinkLabel();
-			this.conCntrls = new System.Windows.Forms.GroupBox();
-			this.loc4 = new System.Windows.Forms.Button();
-			this.loc3 = new System.Windows.Forms.Button();
-			this.loc2 = new System.Windows.Forms.Button();
-			this.loc1 = new System.Windows.Forms.Button();
-			this.con4 = new System.Windows.Forms.Button();
-			this.con3 = new System.Windows.Forms.Button();
-			this.con2 = new System.Windows.Forms.Button();
-			this.con1 = new System.Windows.Forms.Button();
-			this.btnTip = new System.Windows.Forms.ToolTip(this.components);
-			this.foldLbl = new System.Windows.Forms.Label();
-			this.startInTrayBox = new System.Windows.Forms.CheckBox();
-			this.btn_open3rdP = new System.Windows.Forms.Button();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.settingsTable = new System.Windows.Forms.TableLayoutPanel();
-			this.rightPanel = new System.Windows.Forms.Panel();
-			this.settingsApply = new System.Windows.Forms.Button();
-			this.AutoCalibrate = new System.Windows.Forms.Button();
-			this.btn_reassign_open = new System.Windows.Forms.Button();
-			this.contextMenu.SuspendLayout();
-			this.conCntrls.SuspendLayout();
-			this.groupBox1.SuspendLayout();
-			this.rightPanel.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// console
-			// 
-			this.console.Location = new System.Drawing.Point(12, 132);
-			this.console.Multiline = true;
-			this.console.Name = "console";
-			this.console.ReadOnly = true;
-			this.console.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-			this.console.Size = new System.Drawing.Size(262, 100);
-			this.console.TabIndex = 2;
-			// 
-			// notifyIcon
-			// 
-			this.notifyIcon.BalloonTipText = "Double click the tray icon to maximise";
-			this.notifyIcon.BalloonTipTitle = "BetterJoy";
-			this.notifyIcon.ContextMenuStrip = this.contextMenu;
-			this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));
-			this.notifyIcon.Text = "BetterJoy";
-			this.notifyIcon.Visible = true;
-			this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);
-			// 
-			// contextMenu
-			// 
-			this.contextMenu.ImageScalingSize = new System.Drawing.Size(24, 24);
-			this.contextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
+            this.console = new System.Windows.Forms.TextBox();
+            this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
+            this.contextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.version_lbl = new System.Windows.Forms.Label();
+            this.passiveScanBox = new System.Windows.Forms.CheckBox();
+            this.donationLink = new System.Windows.Forms.LinkLabel();
+            this.conCntrls = new System.Windows.Forms.GroupBox();
+            this.loc4 = new System.Windows.Forms.Button();
+            this.loc3 = new System.Windows.Forms.Button();
+            this.loc2 = new System.Windows.Forms.Button();
+            this.loc1 = new System.Windows.Forms.Button();
+            this.con4 = new System.Windows.Forms.Button();
+            this.con3 = new System.Windows.Forms.Button();
+            this.con2 = new System.Windows.Forms.Button();
+            this.con1 = new System.Windows.Forms.Button();
+            this.btnTip = new System.Windows.Forms.ToolTip(this.components);
+            this.foldLbl = new System.Windows.Forms.Label();
+            this.startInTrayBox = new System.Windows.Forms.CheckBox();
+            this.btn_open3rdP = new System.Windows.Forms.Button();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.settingsTable = new System.Windows.Forms.TableLayoutPanel();
+            this.rightPanel = new System.Windows.Forms.Panel();
+            this.settingsApply = new System.Windows.Forms.Button();
+            this.AutoCalibrate = new System.Windows.Forms.Button();
+            this.btn_reassign_open = new System.Windows.Forms.Button();
+            this.contextMenu.SuspendLayout();
+            this.conCntrls.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.rightPanel.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // console
+            // 
+            this.console.Location = new System.Drawing.Point(12, 132);
+            this.console.Multiline = true;
+            this.console.Name = "console";
+            this.console.ReadOnly = true;
+            this.console.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.console.Size = new System.Drawing.Size(262, 100);
+            this.console.TabIndex = 2;
+            // 
+            // notifyIcon
+            // 
+            this.notifyIcon.BalloonTipText = "Double click the tray icon to maximise!";
+            this.notifyIcon.BalloonTipTitle = "BetterJoy";
+            this.notifyIcon.ContextMenuStrip = this.contextMenu;
+            this.notifyIcon.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon.Icon")));
+            this.notifyIcon.Text = "BetterJoy";
+            this.notifyIcon.Visible = true;
+            this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);
+            // 
+            // contextMenu
+            // 
+            this.contextMenu.ImageScalingSize = new System.Drawing.Size(24, 24);
+            this.contextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.exitToolStripMenuItem});
-			this.contextMenu.Name = "contextMenu";
-			this.contextMenu.Size = new System.Drawing.Size(94, 26);
-			// 
-			// exitToolStripMenuItem
-			// 
-			this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
-			this.exitToolStripMenuItem.Size = new System.Drawing.Size(93, 22);
-			this.exitToolStripMenuItem.Text = "Exit";
-			this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
-			// 
-			// version_lbl
-			// 
-			this.version_lbl.AutoSize = true;
-			this.version_lbl.Location = new System.Drawing.Point(246, 239);
-			this.version_lbl.Name = "version_lbl";
-			this.version_lbl.Size = new System.Drawing.Size(28, 13);
-			this.version_lbl.TabIndex = 2;
-			this.version_lbl.Text = "v6.4";
-			// 
-			// passiveScanBox
-			// 
-			this.passiveScanBox.AutoSize = true;
-			this.passiveScanBox.Checked = true;
-			this.passiveScanBox.CheckState = System.Windows.Forms.CheckState.Checked;
-			this.passiveScanBox.Location = new System.Drawing.Point(12, 238);
-			this.passiveScanBox.Name = "passiveScanBox";
-			this.passiveScanBox.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-			this.passiveScanBox.Size = new System.Drawing.Size(91, 17);
-			this.passiveScanBox.TabIndex = 4;
-			this.passiveScanBox.Text = "Passive Scan";
-			this.passiveScanBox.UseVisualStyleBackColor = true;
-			this.passiveScanBox.CheckedChanged += new System.EventHandler(this.passiveScanBox_CheckedChanged);
-			// 
-			// donationLink
-			// 
-			this.donationLink.AutoSize = true;
-			this.donationLink.Location = new System.Drawing.Point(196, 239);
-			this.donationLink.Name = "donationLink";
-			this.donationLink.Size = new System.Drawing.Size(42, 13);
-			this.donationLink.TabIndex = 5;
-			this.donationLink.TabStop = true;
-			this.donationLink.Text = "Donate";
-			this.donationLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
-			// 
-			// conCntrls
-			// 
-			this.conCntrls.Controls.Add(this.loc4);
-			this.conCntrls.Controls.Add(this.loc3);
-			this.conCntrls.Controls.Add(this.loc2);
-			this.conCntrls.Controls.Add(this.loc1);
-			this.conCntrls.Controls.Add(this.con4);
-			this.conCntrls.Controls.Add(this.con3);
-			this.conCntrls.Controls.Add(this.con2);
-			this.conCntrls.Controls.Add(this.con1);
-			this.conCntrls.Location = new System.Drawing.Point(12, 12);
-			this.conCntrls.Name = "conCntrls";
-			this.conCntrls.Size = new System.Drawing.Size(262, 100);
-			this.conCntrls.TabIndex = 0;
-			this.conCntrls.TabStop = false;
-			this.conCntrls.Text = "Connected Controllers";
-			// 
-			// loc4
-			// 
-			this.loc4.Location = new System.Drawing.Point(198, 80);
-			this.loc4.Name = "loc4";
-			this.loc4.Size = new System.Drawing.Size(58, 20);
-			this.loc4.TabIndex = 7;
-			this.loc4.Text = "Locate";
-			this.loc4.UseVisualStyleBackColor = true;
-			// 
-			// loc3
-			// 
-			this.loc3.Location = new System.Drawing.Point(134, 80);
-			this.loc3.Name = "loc3";
-			this.loc3.Size = new System.Drawing.Size(58, 20);
-			this.loc3.TabIndex = 6;
-			this.loc3.Text = "Locate";
-			this.loc3.UseVisualStyleBackColor = true;
-			// 
-			// loc2
-			// 
-			this.loc2.Location = new System.Drawing.Point(70, 80);
-			this.loc2.Name = "loc2";
-			this.loc2.Size = new System.Drawing.Size(58, 20);
-			this.loc2.TabIndex = 5;
-			this.loc2.Text = "Locate";
-			this.loc2.UseVisualStyleBackColor = true;
-			// 
-			// loc1
-			// 
-			this.loc1.Location = new System.Drawing.Point(6, 80);
-			this.loc1.Name = "loc1";
-			this.loc1.Size = new System.Drawing.Size(58, 20);
-			this.loc1.TabIndex = 4;
-			this.loc1.Text = "Locate";
-			this.loc1.UseVisualStyleBackColor = true;
-			// 
-			// con4
-			// 
-			this.con4.BackgroundImage = global::BetterJoyForCemu.Properties.Resources.cross;
-			this.con4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.con4.Enabled = false;
-			this.con4.Location = new System.Drawing.Point(198, 20);
-			this.con4.Name = "con4";
-			this.con4.Size = new System.Drawing.Size(58, 59);
-			this.con4.TabIndex = 3;
-			this.con4.TabStop = false;
-			this.con4.UseVisualStyleBackColor = true;
-			// 
-			// con3
-			// 
-			this.con3.BackgroundImage = global::BetterJoyForCemu.Properties.Resources.cross;
-			this.con3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.con3.Enabled = false;
-			this.con3.Location = new System.Drawing.Point(134, 20);
-			this.con3.Name = "con3";
-			this.con3.Size = new System.Drawing.Size(58, 59);
-			this.con3.TabIndex = 2;
-			this.con3.TabStop = false;
-			this.con3.UseVisualStyleBackColor = true;
-			// 
-			// con2
-			// 
-			this.con2.BackgroundImage = global::BetterJoyForCemu.Properties.Resources.cross;
-			this.con2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.con2.Enabled = false;
-			this.con2.Location = new System.Drawing.Point(70, 20);
-			this.con2.Name = "con2";
-			this.con2.Size = new System.Drawing.Size(58, 59);
-			this.con2.TabIndex = 1;
-			this.con2.TabStop = false;
-			this.con2.UseVisualStyleBackColor = true;
-			// 
-			// con1
-			// 
-			this.con1.BackgroundImage = global::BetterJoyForCemu.Properties.Resources.cross;
-			this.con1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.con1.Enabled = false;
-			this.con1.Location = new System.Drawing.Point(6, 20);
-			this.con1.Name = "con1";
-			this.con1.Size = new System.Drawing.Size(58, 59);
-			this.con1.TabIndex = 0;
-			this.con1.TabStop = false;
-			this.btnTip.SetToolTip(this.con1, "Click on Joycons to join/split them");
-			this.con1.UseVisualStyleBackColor = true;
-			// 
-			// foldLbl
-			// 
-			this.foldLbl.Location = new System.Drawing.Point(274, 20);
-			this.foldLbl.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
-			this.foldLbl.Name = "foldLbl";
-			this.foldLbl.Size = new System.Drawing.Size(13, 231);
-			this.foldLbl.TabIndex = 12;
-			this.foldLbl.Text = ">";
-			this.foldLbl.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			this.btnTip.SetToolTip(this.foldLbl, "Config");
-			this.foldLbl.Click += new System.EventHandler(this.foldLbl_Click);
-			// 
-			// startInTrayBox
-			// 
-			this.startInTrayBox.AutoSize = true;
-			this.startInTrayBox.Location = new System.Drawing.Point(107, 238);
-			this.startInTrayBox.Name = "startInTrayBox";
-			this.startInTrayBox.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-			this.startInTrayBox.Size = new System.Drawing.Size(83, 17);
-			this.startInTrayBox.TabIndex = 6;
-			this.startInTrayBox.Text = "Start in Tray";
-			this.startInTrayBox.UseVisualStyleBackColor = true;
-			this.startInTrayBox.CheckedChanged += new System.EventHandler(this.startInTrayBox_CheckedChanged);
-			// 
-			// btn_open3rdP
-			// 
-			this.btn_open3rdP.Location = new System.Drawing.Point(93, 112);
-			this.btn_open3rdP.Name = "btn_open3rdP";
-			this.btn_open3rdP.Size = new System.Drawing.Size(86, 20);
-			this.btn_open3rdP.TabIndex = 7;
-			this.btn_open3rdP.Text = "Add Controllers";
-			this.btn_open3rdP.UseVisualStyleBackColor = true;
-			this.btn_open3rdP.Click += new System.EventHandler(this.btn_open3rdP_Click);
-			// 
-			// groupBox1
-			// 
-			this.groupBox1.Controls.Add(this.settingsTable);
-			this.groupBox1.Location = new System.Drawing.Point(3, 11);
-			this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
-			this.groupBox1.Size = new System.Drawing.Size(227, 242);
-			this.groupBox1.TabIndex = 9;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Config";
-			// 
-			// settingsTable
-			// 
-			this.settingsTable.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.contextMenu.Name = "contextMenu";
+            this.contextMenu.Size = new System.Drawing.Size(94, 26);
+            // 
+            // exitToolStripMenuItem
+            // 
+            this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
+            this.exitToolStripMenuItem.Size = new System.Drawing.Size(93, 22);
+            this.exitToolStripMenuItem.Text = "Exit";
+            this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
+            // 
+            // version_lbl
+            // 
+            this.version_lbl.AutoSize = true;
+            this.version_lbl.Location = new System.Drawing.Point(246, 239);
+            this.version_lbl.Name = "version_lbl";
+            this.version_lbl.Size = new System.Drawing.Size(28, 13);
+            this.version_lbl.TabIndex = 2;
+            this.version_lbl.Text = "v6.4";
+            // 
+            // passiveScanBox
+            // 
+            this.passiveScanBox.AutoSize = true;
+            this.passiveScanBox.Checked = true;
+            this.passiveScanBox.CheckState = System.Windows.Forms.CheckState.Checked;
+            this.passiveScanBox.Location = new System.Drawing.Point(12, 238);
+            this.passiveScanBox.Name = "passiveScanBox";
+            this.passiveScanBox.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+            this.passiveScanBox.Size = new System.Drawing.Size(91, 17);
+            this.passiveScanBox.TabIndex = 4;
+            this.passiveScanBox.Text = "Passive Scan";
+            this.passiveScanBox.UseVisualStyleBackColor = true;
+            this.passiveScanBox.CheckedChanged += new System.EventHandler(this.passiveScanBox_CheckedChanged);
+            // 
+            // donationLink
+            // 
+            this.donationLink.AutoSize = true;
+            this.donationLink.Location = new System.Drawing.Point(196, 239);
+            this.donationLink.Name = "donationLink";
+            this.donationLink.Size = new System.Drawing.Size(42, 13);
+            this.donationLink.TabIndex = 5;
+            this.donationLink.TabStop = true;
+            this.donationLink.Text = "Donate";
+            this.donationLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
+            // 
+            // conCntrls
+            // 
+            this.conCntrls.Controls.Add(this.loc4);
+            this.conCntrls.Controls.Add(this.loc3);
+            this.conCntrls.Controls.Add(this.loc2);
+            this.conCntrls.Controls.Add(this.loc1);
+            this.conCntrls.Controls.Add(this.con4);
+            this.conCntrls.Controls.Add(this.con3);
+            this.conCntrls.Controls.Add(this.con2);
+            this.conCntrls.Controls.Add(this.con1);
+            this.conCntrls.Location = new System.Drawing.Point(12, 12);
+            this.conCntrls.Name = "conCntrls";
+            this.conCntrls.Size = new System.Drawing.Size(262, 100);
+            this.conCntrls.TabIndex = 0;
+            this.conCntrls.TabStop = false;
+            this.conCntrls.Text = "Connected Controllers";
+            // 
+            // loc4
+            // 
+            this.loc4.Location = new System.Drawing.Point(198, 80);
+            this.loc4.Name = "loc4";
+            this.loc4.Size = new System.Drawing.Size(58, 20);
+            this.loc4.TabIndex = 7;
+            this.loc4.Text = "Locate";
+            this.loc4.UseVisualStyleBackColor = true;
+            // 
+            // loc3
+            // 
+            this.loc3.Location = new System.Drawing.Point(134, 80);
+            this.loc3.Name = "loc3";
+            this.loc3.Size = new System.Drawing.Size(58, 20);
+            this.loc3.TabIndex = 6;
+            this.loc3.Text = "Locate";
+            this.loc3.UseVisualStyleBackColor = true;
+            // 
+            // loc2
+            // 
+            this.loc2.Location = new System.Drawing.Point(70, 80);
+            this.loc2.Name = "loc2";
+            this.loc2.Size = new System.Drawing.Size(58, 20);
+            this.loc2.TabIndex = 5;
+            this.loc2.Text = "Locate";
+            this.loc2.UseVisualStyleBackColor = true;
+            // 
+            // loc1
+            // 
+            this.loc1.Location = new System.Drawing.Point(6, 80);
+            this.loc1.Name = "loc1";
+            this.loc1.Size = new System.Drawing.Size(58, 20);
+            this.loc1.TabIndex = 4;
+            this.loc1.Text = "Locate";
+            this.loc1.UseVisualStyleBackColor = true;
+            // 
+            // con4
+            // 
+            this.con4.BackgroundImage = global::BetterJoyForCemu.Properties.Resources.cross;
+            this.con4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.con4.Enabled = false;
+            this.con4.Location = new System.Drawing.Point(198, 20);
+            this.con4.Name = "con4";
+            this.con4.Size = new System.Drawing.Size(58, 59);
+            this.con4.TabIndex = 3;
+            this.con4.TabStop = false;
+            this.con4.UseVisualStyleBackColor = true;
+            // 
+            // con3
+            // 
+            this.con3.BackgroundImage = global::BetterJoyForCemu.Properties.Resources.cross;
+            this.con3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.con3.Enabled = false;
+            this.con3.Location = new System.Drawing.Point(134, 20);
+            this.con3.Name = "con3";
+            this.con3.Size = new System.Drawing.Size(58, 59);
+            this.con3.TabIndex = 2;
+            this.con3.TabStop = false;
+            this.con3.UseVisualStyleBackColor = true;
+            // 
+            // con2
+            // 
+            this.con2.BackgroundImage = global::BetterJoyForCemu.Properties.Resources.cross;
+            this.con2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.con2.Enabled = false;
+            this.con2.Location = new System.Drawing.Point(70, 20);
+            this.con2.Name = "con2";
+            this.con2.Size = new System.Drawing.Size(58, 59);
+            this.con2.TabIndex = 1;
+            this.con2.TabStop = false;
+            this.con2.UseVisualStyleBackColor = true;
+            // 
+            // con1
+            // 
+            this.con1.BackgroundImage = global::BetterJoyForCemu.Properties.Resources.cross;
+            this.con1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.con1.Enabled = false;
+            this.con1.Location = new System.Drawing.Point(6, 20);
+            this.con1.Name = "con1";
+            this.con1.Size = new System.Drawing.Size(58, 59);
+            this.con1.TabIndex = 0;
+            this.con1.TabStop = false;
+            this.btnTip.SetToolTip(this.con1, "Click on Joycons to join/split them");
+            this.con1.UseVisualStyleBackColor = true;
+            // 
+            // foldLbl
+            // 
+            this.foldLbl.Location = new System.Drawing.Point(274, 20);
+            this.foldLbl.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+            this.foldLbl.Name = "foldLbl";
+            this.foldLbl.Size = new System.Drawing.Size(13, 231);
+            this.foldLbl.TabIndex = 12;
+            this.foldLbl.Text = ">";
+            this.foldLbl.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.btnTip.SetToolTip(this.foldLbl, "Config");
+            this.foldLbl.Click += new System.EventHandler(this.foldLbl_Click);
+            // 
+            // startInTrayBox
+            // 
+            this.startInTrayBox.AutoSize = true;
+            this.startInTrayBox.Location = new System.Drawing.Point(107, 238);
+            this.startInTrayBox.Name = "startInTrayBox";
+            this.startInTrayBox.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
+            this.startInTrayBox.Size = new System.Drawing.Size(83, 17);
+            this.startInTrayBox.TabIndex = 6;
+            this.startInTrayBox.Text = "Start in Tray";
+            this.startInTrayBox.UseVisualStyleBackColor = true;
+            this.startInTrayBox.CheckedChanged += new System.EventHandler(this.startInTrayBox_CheckedChanged);
+            // 
+            // btn_open3rdP
+            // 
+            this.btn_open3rdP.Location = new System.Drawing.Point(93, 112);
+            this.btn_open3rdP.Name = "btn_open3rdP";
+            this.btn_open3rdP.Size = new System.Drawing.Size(86, 20);
+            this.btn_open3rdP.TabIndex = 7;
+            this.btn_open3rdP.Text = "Add Controllers";
+            this.btn_open3rdP.UseVisualStyleBackColor = true;
+            this.btn_open3rdP.Click += new System.EventHandler(this.btn_open3rdP_Click);
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.settingsTable);
+            this.groupBox1.Location = new System.Drawing.Point(3, 11);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
+            this.groupBox1.Size = new System.Drawing.Size(227, 242);
+            this.groupBox1.TabIndex = 9;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Config";
+            // 
+            // settingsTable
+            // 
+            this.settingsTable.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
-			this.settingsTable.AutoScroll = true;
-			this.settingsTable.ColumnCount = 2;
-			this.settingsTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 58.90411F));
-			this.settingsTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 41.09589F));
-			this.settingsTable.Location = new System.Drawing.Point(4, 17);
-			this.settingsTable.Margin = new System.Windows.Forms.Padding(2);
-			this.settingsTable.Name = "settingsTable";
-			this.settingsTable.RowCount = 1;
-			this.settingsTable.RowStyles.Add(new System.Windows.Forms.RowStyle());
-			this.settingsTable.Size = new System.Drawing.Size(219, 219);
-			this.settingsTable.TabIndex = 1;
-			// 
-			// rightPanel
-			// 
-			this.rightPanel.Controls.Add(this.settingsApply);
-			this.rightPanel.Controls.Add(this.groupBox1);
-			this.rightPanel.Location = new System.Drawing.Point(289, 1);
-			this.rightPanel.Margin = new System.Windows.Forms.Padding(2, 2, 12, 2);
-			this.rightPanel.Name = "rightPanel";
-			this.rightPanel.Size = new System.Drawing.Size(231, 273);
-			this.rightPanel.TabIndex = 11;
-			this.rightPanel.Visible = false;
-			// 
-			// settingsApply
-			// 
-			this.settingsApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.settingsApply.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.settingsApply.Location = new System.Drawing.Point(165, 252);
-			this.settingsApply.Margin = new System.Windows.Forms.Padding(2);
-			this.settingsApply.Name = "settingsApply";
-			this.settingsApply.Size = new System.Drawing.Size(61, 21);
-			this.settingsApply.TabIndex = 10;
-			this.settingsApply.Text = "Apply";
-			this.settingsApply.UseVisualStyleBackColor = true;
-			this.settingsApply.Click += new System.EventHandler(this.settingsApply_Click);
-			// 
-			// AutoCalibrate
-			// 
-			this.AutoCalibrate.Location = new System.Drawing.Point(203, 112);
-			this.AutoCalibrate.Name = "AutoCalibrate";
-			this.AutoCalibrate.Size = new System.Drawing.Size(71, 20);
-			this.AutoCalibrate.TabIndex = 8;
-			this.AutoCalibrate.Text = "Calibrate";
-			this.AutoCalibrate.UseVisualStyleBackColor = true;
-			this.AutoCalibrate.Click += new System.EventHandler(this.StartCalibrate);
-			// 
-			// btn_reassign_open
-			// 
-			this.btn_reassign_open.Location = new System.Drawing.Point(12, 112);
-			this.btn_reassign_open.Name = "btn_reassign_open";
-			this.btn_reassign_open.Size = new System.Drawing.Size(75, 20);
-			this.btn_reassign_open.TabIndex = 13;
-			this.btn_reassign_open.Text = "Map Buttons";
-			this.btn_reassign_open.UseVisualStyleBackColor = true;
-			this.btn_reassign_open.Click += new System.EventHandler(this.btn_reassign_open_Click);
-			// 
-			// MainForm
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.AutoSize = true;
-			this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-			this.ClientSize = new System.Drawing.Size(284, 261);
-			this.Controls.Add(this.btn_reassign_open);
-			this.Controls.Add(this.foldLbl);
-			this.Controls.Add(this.rightPanel);
-			this.Controls.Add(this.AutoCalibrate);
-			this.Controls.Add(this.btn_open3rdP);
-			this.Controls.Add(this.startInTrayBox);
-			this.Controls.Add(this.conCntrls);
-			this.Controls.Add(this.donationLink);
-			this.Controls.Add(this.passiveScanBox);
-			this.Controls.Add(this.version_lbl);
-			this.Controls.Add(this.console);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-			this.MaximizeBox = false;
-			this.Name = "MainForm";
-			this.Text = "BetterJoy";
-			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
-			this.Load += new System.EventHandler(this.MainForm_Load);
-			this.Resize += new System.EventHandler(this.MainForm_Resize);
-			this.contextMenu.ResumeLayout(false);
-			this.conCntrls.ResumeLayout(false);
-			this.groupBox1.ResumeLayout(false);
-			this.rightPanel.ResumeLayout(false);
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.settingsTable.AutoScroll = true;
+            this.settingsTable.ColumnCount = 2;
+            this.settingsTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 58.90411F));
+            this.settingsTable.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 41.09589F));
+            this.settingsTable.Location = new System.Drawing.Point(4, 17);
+            this.settingsTable.Margin = new System.Windows.Forms.Padding(2);
+            this.settingsTable.Name = "settingsTable";
+            this.settingsTable.RowCount = 1;
+            this.settingsTable.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.settingsTable.Size = new System.Drawing.Size(219, 219);
+            this.settingsTable.TabIndex = 1;
+            // 
+            // rightPanel
+            // 
+            this.rightPanel.Controls.Add(this.settingsApply);
+            this.rightPanel.Controls.Add(this.groupBox1);
+            this.rightPanel.Location = new System.Drawing.Point(289, 1);
+            this.rightPanel.Margin = new System.Windows.Forms.Padding(2, 2, 12, 2);
+            this.rightPanel.Name = "rightPanel";
+            this.rightPanel.Size = new System.Drawing.Size(231, 273);
+            this.rightPanel.TabIndex = 11;
+            this.rightPanel.Visible = false;
+            // 
+            // settingsApply
+            // 
+            this.settingsApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.settingsApply.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.settingsApply.Location = new System.Drawing.Point(165, 252);
+            this.settingsApply.Margin = new System.Windows.Forms.Padding(2);
+            this.settingsApply.Name = "settingsApply";
+            this.settingsApply.Size = new System.Drawing.Size(61, 21);
+            this.settingsApply.TabIndex = 10;
+            this.settingsApply.Text = "Apply";
+            this.settingsApply.UseVisualStyleBackColor = true;
+            this.settingsApply.Click += new System.EventHandler(this.settingsApply_Click);
+            // 
+            // AutoCalibrate
+            // 
+            this.AutoCalibrate.Location = new System.Drawing.Point(203, 112);
+            this.AutoCalibrate.Name = "AutoCalibrate";
+            this.AutoCalibrate.Size = new System.Drawing.Size(71, 20);
+            this.AutoCalibrate.TabIndex = 8;
+            this.AutoCalibrate.Text = "Calibrate";
+            this.AutoCalibrate.UseVisualStyleBackColor = true;
+            this.AutoCalibrate.Click += new System.EventHandler(this.StartCalibrate);
+            // 
+            // btn_reassign_open
+            // 
+            this.btn_reassign_open.Location = new System.Drawing.Point(12, 112);
+            this.btn_reassign_open.Name = "btn_reassign_open";
+            this.btn_reassign_open.Size = new System.Drawing.Size(75, 20);
+            this.btn_reassign_open.TabIndex = 13;
+            this.btn_reassign_open.Text = "Map Buttons";
+            this.btn_reassign_open.UseVisualStyleBackColor = true;
+            this.btn_reassign_open.Click += new System.EventHandler(this.btn_reassign_open_Click);
+            // 
+            // MainForm
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.AutoSize = true;
+            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.ClientSize = new System.Drawing.Size(284, 261);
+            this.Controls.Add(this.btn_reassign_open);
+            this.Controls.Add(this.foldLbl);
+            this.Controls.Add(this.rightPanel);
+            this.Controls.Add(this.AutoCalibrate);
+            this.Controls.Add(this.btn_open3rdP);
+            this.Controls.Add(this.startInTrayBox);
+            this.Controls.Add(this.conCntrls);
+            this.Controls.Add(this.donationLink);
+            this.Controls.Add(this.passiveScanBox);
+            this.Controls.Add(this.version_lbl);
+            this.Controls.Add(this.console);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.MaximizeBox = false;
+            this.Name = "MainForm";
+            this.Text = "BetterJoy";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing);
+            this.Load += new System.EventHandler(this.MainForm_Load);
+            this.Resize += new System.EventHandler(this.MainForm_Resize);
+            this.contextMenu.ResumeLayout(false);
+            this.conCntrls.ResumeLayout(false);
+            this.groupBox1.ResumeLayout(false);
+            this.rightPanel.ResumeLayout(false);
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
 
         public System.Windows.Forms.TextBox console;
-        private System.Windows.Forms.NotifyIcon notifyIcon;
+        public System.Windows.Forms.NotifyIcon notifyIcon;
         private System.Windows.Forms.Label version_lbl;
         private System.Windows.Forms.ContextMenuStrip contextMenu;
         private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
diff --git a/BetterJoyForCemu/MainForm.cs b/BetterJoyForCemu/MainForm.cs
index 958a880..49504f9 100644
--- a/BetterJoyForCemu/MainForm.cs
+++ b/BetterJoyForCemu/MainForm.cs
@@ -61,7 +61,8 @@ namespace BetterJoyForCemu {
         private void HideToTray() {
             this.WindowState = FormWindowState.Minimized;
             notifyIcon.Visible = true;
-            notifyIcon.ShowBalloonTip(1);
+            notifyIcon.BalloonTipText = "Double click the tray icon to maximise!";
+            notifyIcon.ShowBalloonTip(0);
             this.ShowInTaskbar = false;
             this.Hide();
         }
diff --git a/BetterJoyForCemu/Program.cs b/BetterJoyForCemu/Program.cs
index 2781561..9867bd5 100644
--- a/BetterJoyForCemu/Program.cs
+++ b/BetterJoyForCemu/Program.cs
@@ -24,7 +24,6 @@ namespace BetterJoyForCemu {
         public bool EnableLocalize = false;
 
         private const ushort vendor_id = 0x57e;
-        private const ushort vendor_id_ = 0x057e;
         private const ushort product_l = 0x2006;
         private const ushort product_r = 0x2007;
         private const ushort product_pro = 0x2009;