From ebaa8c5b0ce26bdf4a4be30955cbaad689e8c900 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Sat, 7 Oct 2023 12:22:45 -0700
Subject: [PATCH] Reverted bad change to web socket client.

---
 src/MainForm.Designer.cs |   3 +-
 src/MainForm.resx        | 568 +++++++++++++--------------------------
 src/WebSocketClient.cs   |  26 +-
 3 files changed, 206 insertions(+), 391 deletions(-)

diff --git a/src/MainForm.Designer.cs b/src/MainForm.Designer.cs
index e24117f..1c8fcd4 100644
--- a/src/MainForm.Designer.cs
+++ b/src/MainForm.Designer.cs
@@ -679,8 +679,7 @@ private void InitializeComponent()
             this.rdpToolStripMenuItem,
             this.sshToolStripMenuItem,
             this.scpToolStripMenuItem,
-            this.wolToolStripMenuItem,
-            });
+            this.wolToolStripMenuItem});
             this.devicesContextMenuStrip.Name = "devicesContextMenuStrip";
             resources.ApplyResources(this.devicesContextMenuStrip, "devicesContextMenuStrip");
             this.devicesContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.devicesContextMenuStrip_Opening);
diff --git a/src/MainForm.resx b/src/MainForm.resx
index 7ce76db..c4635b2 100644
--- a/src/MainForm.resx
+++ b/src/MainForm.resx
@@ -129,13 +129,10 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="connectionSettings.Location" type="System.Drawing.Point, System.Drawing">
-    <value>13, 355</value>
-  </data>
-  <data name="connectionSettings.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>10, 286</value>
   </data>
   <data name="connectionSettings.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 28</value>
+    <value>95, 23</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="connectionSettings.TabIndex" type="System.Int32, mscorlib">
@@ -166,13 +163,10 @@
     <value>NoControl</value>
   </data>
   <data name="installButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>148, 355</value>
-  </data>
-  <data name="installButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>111, 286</value>
   </data>
   <data name="installButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 28</value>
+    <value>95, 23</value>
   </data>
   <data name="installButton.TabIndex" type="System.Int32, mscorlib">
     <value>104</value>
@@ -208,13 +202,10 @@
     <value>NoControl</value>
   </data>
   <data name="stateLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>321, 277</value>
-  </data>
-  <data name="stateLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>241, 225</value>
   </data>
   <data name="stateLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>114, 17</value>
+    <value>88, 13</value>
   </data>
   <data name="stateLabel.TabIndex" type="System.Int32, mscorlib">
     <value>19</value>
@@ -244,13 +235,10 @@
     <value>NoControl</value>
   </data>
   <data name="label28.Location" type="System.Drawing.Point, System.Drawing">
-    <value>317, 217</value>
-  </data>
-  <data name="label28.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>238, 176</value>
   </data>
   <data name="label28.Size" type="System.Drawing.Size, System.Drawing">
-    <value>69, 17</value>
+    <value>53, 13</value>
   </data>
   <data name="label28.TabIndex" type="System.Int32, mscorlib">
     <value>18</value>
@@ -277,13 +265,10 @@
     <value>NoControl</value>
   </data>
   <data name="label27.Location" type="System.Drawing.Point, System.Drawing">
-    <value>317, 166</value>
-  </data>
-  <data name="label27.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>238, 135</value>
   </data>
   <data name="label27.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 17</value>
+    <value>55, 13</value>
   </data>
   <data name="label27.TabIndex" type="System.Int32, mscorlib">
     <value>17</value>
@@ -310,13 +295,10 @@
     <value>NoControl</value>
   </data>
   <data name="label26.Location" type="System.Drawing.Point, System.Drawing">
-    <value>317, 113</value>
-  </data>
-  <data name="label26.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>238, 92</value>
   </data>
   <data name="label26.Size" type="System.Drawing.Size, System.Drawing">
-    <value>50, 17</value>
+    <value>38, 13</value>
   </data>
   <data name="label26.TabIndex" type="System.Int32, mscorlib">
     <value>16</value>
@@ -340,16 +322,13 @@
     <value>Top, Left, Right</value>
   </data>
   <data name="passwordTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>321, 236</value>
-  </data>
-  <data name="passwordTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>241, 192</value>
   </data>
   <data name="passwordTextBox.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
     <value>●</value>
   </data>
   <data name="passwordTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>287, 22</value>
+    <value>214, 20</value>
   </data>
   <data name="passwordTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>102</value>
@@ -373,13 +352,10 @@
     <value>meshcentral.com</value>
   </data>
   <data name="serverNameComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>321, 135</value>
-  </data>
-  <data name="serverNameComboBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>241, 110</value>
   </data>
   <data name="serverNameComboBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>287, 24</value>
+    <value>214, 21</value>
   </data>
   <data name="serverNameComboBox.TabIndex" type="System.Int32, mscorlib">
     <value>100</value>
@@ -400,13 +376,10 @@
     <value>Top, Left, Right</value>
   </data>
   <data name="userNameTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>321, 186</value>
-  </data>
-  <data name="userNameTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>241, 151</value>
   </data>
   <data name="userNameTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>287, 22</value>
+    <value>214, 20</value>
   </data>
   <data name="userNameTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>101</value>
@@ -430,13 +403,10 @@
     <value>NoControl</value>
   </data>
   <data name="licenseLinkLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>235, 323</value>
-  </data>
-  <data name="licenseLinkLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>174, 260</value>
   </data>
   <data name="licenseLinkLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>404, 16</value>
+    <value>303, 13</value>
   </data>
   <data name="licenseLinkLabel.TabIndex" type="System.Int32, mscorlib">
     <value>103</value>
@@ -469,13 +439,10 @@
     <value>NoControl</value>
   </data>
   <data name="versionLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 323</value>
-  </data>
-  <data name="versionLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>3, 260</value>
   </data>
   <data name="versionLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>47, 17</value>
+    <value>37, 13</value>
   </data>
   <data name="versionLabel.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
@@ -502,13 +469,10 @@
     <value>NoControl</value>
   </data>
   <data name="nextButton1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>499, 355</value>
-  </data>
-  <data name="nextButton1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>372, 286</value>
   </data>
   <data name="nextButton1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 28</value>
+    <value>95, 23</value>
   </data>
   <data name="nextButton1.TabIndex" type="System.Int32, mscorlib">
     <value>105</value>
@@ -535,13 +499,10 @@
     <value>NoControl</value>
   </data>
   <data name="pictureBox3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 345</value>
-  </data>
-  <data name="pictureBox3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>0, 278</value>
   </data>
   <data name="pictureBox3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>640, 49</value>
+    <value>478, 40</value>
   </data>
   <data name="pictureBox3.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -568,13 +529,10 @@
     <value>NoControl</value>
   </data>
   <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 11</value>
-  </data>
-  <data name="label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>12, 9</value>
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>608, 69</value>
+    <value>454, 56</value>
   </data>
   <data name="label1.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -601,13 +559,10 @@
     <value>NoControl</value>
   </data>
   <data name="pictureBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>20, 84</value>
-  </data>
-  <data name="pictureBox2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>15, 68</value>
   </data>
   <data name="pictureBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>292, 212</value>
+    <value>217, 170</value>
   </data>
   <data name="pictureBox2.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>Zoom</value>
@@ -631,13 +586,10 @@
     <value>Fill</value>
   </data>
   <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 4</value>
-  </data>
-  <data name="panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>3, 3</value>
   </data>
   <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>640, 392</value>
+    <value>478, 316</value>
   </data>
   <data name="panel1.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -655,16 +607,13 @@
     <value>0</value>
   </data>
   <data name="tabPage1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 28</value>
-  </data>
-  <data name="tabPage1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>4, 25</value>
   </data>
   <data name="tabPage1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>3, 3, 3, 3</value>
   </data>
   <data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>648, 400</value>
+    <value>484, 322</value>
   </data>
   <data name="tabPage1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -688,13 +637,10 @@
     <value>NoControl</value>
   </data>
   <data name="msgTokenButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>320, 216</value>
-  </data>
-  <data name="msgTokenButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>240, 176</value>
   </data>
   <data name="msgTokenButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 28</value>
+    <value>95, 23</value>
   </data>
   <data name="msgTokenButton.TabIndex" type="System.Int32, mscorlib">
     <value>207</value>
@@ -724,13 +670,10 @@
     <value>NoControl</value>
   </data>
   <data name="tokenRememberCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>321, 272</value>
-  </data>
-  <data name="tokenRememberCheckBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>241, 221</value>
   </data>
   <data name="tokenRememberCheckBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 21</value>
+    <value>131, 17</value>
   </data>
   <data name="tokenRememberCheckBox.TabIndex" type="System.Int32, mscorlib">
     <value>204</value>
@@ -757,13 +700,10 @@
     <value>NoControl</value>
   </data>
   <data name="emailTokenButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>321, 180</value>
-  </data>
-  <data name="emailTokenButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>241, 146</value>
   </data>
   <data name="emailTokenButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 28</value>
+    <value>95, 23</value>
   </data>
   <data name="emailTokenButton.TabIndex" type="System.Int32, mscorlib">
     <value>202</value>
@@ -790,13 +730,10 @@
     <value>NoControl</value>
   </data>
   <data name="smsTokenButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>456, 180</value>
-  </data>
-  <data name="smsTokenButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>342, 146</value>
   </data>
   <data name="smsTokenButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 28</value>
+    <value>95, 23</value>
   </data>
   <data name="smsTokenButton.TabIndex" type="System.Int32, mscorlib">
     <value>203</value>
@@ -826,13 +763,10 @@
     <value>NoControl</value>
   </data>
   <data name="tokenEmailSentLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>317, 186</value>
-  </data>
-  <data name="tokenEmailSentLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>238, 151</value>
   </data>
   <data name="tokenEmailSentLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 17</value>
+    <value>55, 13</value>
   </data>
   <data name="tokenEmailSentLabel.TabIndex" type="System.Int32, mscorlib">
     <value>21</value>
@@ -862,13 +796,10 @@
     <value>NoControl</value>
   </data>
   <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>317, 128</value>
-  </data>
-  <data name="label3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>238, 104</value>
   </data>
   <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>48, 17</value>
+    <value>38, 13</value>
   </data>
   <data name="label3.TabIndex" type="System.Int32, mscorlib">
     <value>19</value>
@@ -892,13 +823,10 @@
     <value>Top, Left, Right</value>
   </data>
   <data name="tokenTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>321, 148</value>
-  </data>
-  <data name="tokenTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>241, 120</value>
   </data>
   <data name="tokenTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>287, 22</value>
+    <value>214, 20</value>
   </data>
   <data name="tokenTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>201</value>
@@ -922,13 +850,10 @@
     <value>NoControl</value>
   </data>
   <data name="pictureBox6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>20, 84</value>
-  </data>
-  <data name="pictureBox6.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>15, 68</value>
   </data>
   <data name="pictureBox6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>292, 212</value>
+    <value>217, 170</value>
   </data>
   <data name="pictureBox6.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>Zoom</value>
@@ -955,13 +880,10 @@
     <value>NoControl</value>
   </data>
   <data name="backButton2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>363, 355</value>
-  </data>
-  <data name="backButton2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>270, 286</value>
   </data>
   <data name="backButton2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 28</value>
+    <value>95, 23</value>
   </data>
   <data name="backButton2.TabIndex" type="System.Int32, mscorlib">
     <value>205</value>
@@ -988,13 +910,10 @@
     <value>NoControl</value>
   </data>
   <data name="nextButton2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>499, 355</value>
-  </data>
-  <data name="nextButton2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>372, 286</value>
   </data>
   <data name="nextButton2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 28</value>
+    <value>95, 23</value>
   </data>
   <data name="nextButton2.TabIndex" type="System.Int32, mscorlib">
     <value>206</value>
@@ -1021,13 +940,10 @@
     <value>NoControl</value>
   </data>
   <data name="pictureBox4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 345</value>
-  </data>
-  <data name="pictureBox4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>0, 278</value>
   </data>
   <data name="pictureBox4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>640, 49</value>
+    <value>478, 40</value>
   </data>
   <data name="pictureBox4.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -1054,13 +970,10 @@
     <value>NoControl</value>
   </data>
   <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 11</value>
-  </data>
-  <data name="label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>12, 9</value>
   </data>
   <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>608, 69</value>
+    <value>454, 56</value>
   </data>
   <data name="label2.TabIndex" type="System.Int32, mscorlib">
     <value>6</value>
@@ -1084,13 +997,10 @@
     <value>Fill</value>
   </data>
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 4</value>
-  </data>
-  <data name="panel2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>3, 3</value>
   </data>
   <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>640, 392</value>
+    <value>478, 316</value>
   </data>
   <data name="panel2.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -1108,16 +1018,13 @@
     <value>0</value>
   </data>
   <data name="tabPage2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 28</value>
-  </data>
-  <data name="tabPage2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>4, 25</value>
   </data>
   <data name="tabPage2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>3, 3, 3, 3</value>
   </data>
   <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>648, 400</value>
+    <value>484, 322</value>
   </data>
   <data name="tabPage2.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -1147,13 +1054,10 @@
     <value>NoControl</value>
   </data>
   <data name="rememberCertCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>277, 319</value>
-  </data>
-  <data name="rememberCertCheckBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>208, 256</value>
   </data>
   <data name="rememberCertCheckBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>190, 21</value>
+    <value>145, 17</value>
   </data>
   <data name="rememberCertCheckBox.TabIndex" type="System.Int32, mscorlib">
     <value>302</value>
@@ -1177,10 +1081,7 @@
     <value>Top, Bottom, Left, Right</value>
   </data>
   <data name="certDetailsTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>20, 101</value>
-  </data>
-  <data name="certDetailsTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>15, 82</value>
   </data>
   <data name="certDetailsTextBox.Multiline" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1189,7 +1090,7 @@
     <value>Vertical</value>
   </data>
   <data name="certDetailsTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>602, 202</value>
+    <value>450, 162</value>
   </data>
   <data name="certDetailsTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>25</value>
@@ -1213,13 +1114,10 @@
     <value>NoControl</value>
   </data>
   <data name="certDetailsButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>19, 313</value>
-  </data>
-  <data name="certDetailsButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>14, 251</value>
   </data>
   <data name="certDetailsButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>251, 28</value>
+    <value>188, 23</value>
   </data>
   <data name="certDetailsButton.TabIndex" type="System.Int32, mscorlib">
     <value>301</value>
@@ -1249,13 +1147,10 @@
     <value>NoControl</value>
   </data>
   <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 7</value>
-  </data>
-  <data name="label4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>8, 6</value>
   </data>
   <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>627, 27</value>
+    <value>468, 22</value>
   </data>
   <data name="label4.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
@@ -1285,13 +1180,10 @@
     <value>NoControl</value>
   </data>
   <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>16, 42</value>
-  </data>
-  <data name="label5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>12, 34</value>
   </data>
   <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>608, 55</value>
+    <value>454, 45</value>
   </data>
   <data name="label5.TabIndex" type="System.Int32, mscorlib">
     <value>22</value>
@@ -1318,13 +1210,10 @@
     <value>NoControl</value>
   </data>
   <data name="backButton3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>371, 362</value>
-  </data>
-  <data name="backButton3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>276, 291</value>
   </data>
   <data name="backButton3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 28</value>
+    <value>95, 23</value>
   </data>
   <data name="backButton3.TabIndex" type="System.Int32, mscorlib">
     <value>303</value>
@@ -1351,13 +1240,10 @@
     <value>NoControl</value>
   </data>
   <data name="nextButton3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>507, 362</value>
-  </data>
-  <data name="nextButton3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>378, 291</value>
   </data>
   <data name="nextButton3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 28</value>
+    <value>95, 23</value>
   </data>
   <data name="nextButton3.TabIndex" type="System.Int32, mscorlib">
     <value>304</value>
@@ -1384,13 +1270,10 @@
     <value>NoControl</value>
   </data>
   <data name="pictureBox5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 351</value>
-  </data>
-  <data name="pictureBox5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>0, 282</value>
   </data>
   <data name="pictureBox5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>648, 49</value>
+    <value>484, 40</value>
   </data>
   <data name="pictureBox5.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -1416,11 +1299,8 @@
   <data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="panel3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
-  </data>
   <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>648, 400</value>
+    <value>484, 322</value>
   </data>
   <data name="panel3.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -1438,13 +1318,10 @@
     <value>0</value>
   </data>
   <data name="tabPage3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 28</value>
-  </data>
-  <data name="tabPage3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>4, 25</value>
   </data>
   <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>648, 400</value>
+    <value>484, 322</value>
   </data>
   <data name="tabPage3.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -1474,49 +1351,49 @@
     <value>613, 17</value>
   </metadata>
   <data name="showGroupNamesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>218, 26</value>
+    <value>185, 22</value>
   </data>
   <data name="showGroupNamesToolStripMenuItem.Text" xml:space="preserve">
     <value>Show &amp;Group Names</value>
   </data>
   <data name="showOfflineDevicesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>218, 26</value>
+    <value>185, 22</value>
   </data>
   <data name="showOfflineDevicesToolStripMenuItem.Text" xml:space="preserve">
     <value>Show &amp;Offline Devices</value>
   </data>
   <data name="toolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>215, 6</value>
+    <value>182, 6</value>
   </data>
   <data name="sortByNameToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>218, 26</value>
+    <value>185, 22</value>
   </data>
   <data name="sortByNameToolStripMenuItem.Text" xml:space="preserve">
     <value>Sort by &amp;Name</value>
   </data>
   <data name="sortByGroupToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>218, 26</value>
+    <value>185, 22</value>
   </data>
   <data name="sortByGroupToolStripMenuItem.Text" xml:space="preserve">
     <value>Sort by G&amp;roup</value>
   </data>
   <data name="toolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>215, 6</value>
+    <value>182, 6</value>
   </data>
   <data name="settingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>218, 26</value>
+    <value>185, 22</value>
   </data>
   <data name="settingsToolStripMenuItem.Text" xml:space="preserve">
     <value>S&amp;ettings...</value>
   </data>
   <data name="customAppsToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>218, 26</value>
+    <value>185, 22</value>
   </data>
   <data name="customAppsToolStripMenuItem1.Text" xml:space="preserve">
     <value>&amp;Custom Apps...</value>
   </data>
   <data name="mainContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>219, 172</value>
+    <value>186, 148</value>
   </data>
   <data name="&gt;&gt;mainContextMenuStrip.Name" xml:space="preserve">
     <value>mainContextMenuStrip</value>
@@ -1531,13 +1408,10 @@
     <value>NoControl</value>
   </data>
   <data name="menuLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>608, 2</value>
-  </data>
-  <data name="menuLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>454, 2</value>
   </data>
   <data name="menuLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>31, 31</value>
+    <value>25, 25</value>
   </data>
   <data name="menuLabel.TabIndex" type="System.Int32, mscorlib">
     <value>403</value>
@@ -1561,13 +1435,10 @@
     <value>Top, Right</value>
   </data>
   <data name="searchTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>411, 6</value>
-  </data>
-  <data name="searchTextBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>306, 5</value>
   </data>
   <data name="searchTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>193, 22</value>
+    <value>146, 20</value>
   </data>
   <data name="searchTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>402</value>
@@ -1603,13 +1474,10 @@
     <value>NoControl</value>
   </data>
   <data name="cancelAutoCloseButton1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 226</value>
-  </data>
-  <data name="cancelAutoCloseButton1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>6, 180</value>
   </data>
   <data name="cancelAutoCloseButton1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>224, 43</value>
+    <value>168, 35</value>
   </data>
   <data name="cancelAutoCloseButton1.TabIndex" type="System.Int32, mscorlib">
     <value>405</value>
@@ -1651,88 +1519,88 @@
     <value>Segoe UI, 9pt, style=Bold</value>
   </data>
   <data name="addMapToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 24</value>
+    <value>170, 22</value>
   </data>
   <data name="addMapToolStripMenuItem.Text" xml:space="preserve">
     <value>Add &amp;Map...</value>
   </data>
   <data name="addRelayMapToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 24</value>
+    <value>170, 22</value>
   </data>
   <data name="addRelayMapToolStripMenuItem.Text" xml:space="preserve">
     <value>Add &amp;Relay Map...</value>
   </data>
   <data name="toolStripMenuItem3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 6</value>
+    <value>167, 6</value>
   </data>
   <data name="askConsentBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>204, 26</value>
+    <value>171, 22</value>
   </data>
   <data name="askConsentBarToolStripMenuItem.Text" xml:space="preserve">
     <value>Ask Consent + Bar</value>
   </data>
   <data name="askConsentToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>204, 26</value>
+    <value>171, 22</value>
   </data>
   <data name="askConsentToolStripMenuItem.Text" xml:space="preserve">
     <value>Ask Consent</value>
   </data>
   <data name="privacyBarToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>204, 26</value>
+    <value>171, 22</value>
   </data>
   <data name="privacyBarToolStripMenuItem.Text" xml:space="preserve">
     <value>Privacy Bar</value>
   </data>
   <data name="remoteDesktopToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 24</value>
+    <value>170, 22</value>
   </data>
   <data name="remoteDesktopToolStripMenuItem.Text" xml:space="preserve">
     <value>Remote Desktop...</value>
   </data>
   <data name="remoteFilesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 24</value>
+    <value>170, 22</value>
   </data>
   <data name="remoteFilesToolStripMenuItem.Text" xml:space="preserve">
     <value>Remote Files...</value>
   </data>
-  <data name="wolToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 24</value>
-  </data>
-  <data name="wolToolStripMenuItem.Text" xml:space="preserve">
-    <value>Wake Up...</value>
-  </data>
   <data name="httpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 24</value>
+    <value>170, 22</value>
   </data>
   <data name="httpToolStripMenuItem.Text" xml:space="preserve">
     <value>HTTP</value>
   </data>
   <data name="httpsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 24</value>
+    <value>170, 22</value>
   </data>
   <data name="httpsToolStripMenuItem.Text" xml:space="preserve">
     <value>HTTPS</value>
   </data>
   <data name="rdpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 24</value>
+    <value>170, 22</value>
   </data>
   <data name="rdpToolStripMenuItem.Text" xml:space="preserve">
     <value>RDP</value>
   </data>
   <data name="sshToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 24</value>
+    <value>170, 22</value>
   </data>
   <data name="sshToolStripMenuItem.Text" xml:space="preserve">
     <value>SSH</value>
   </data>
   <data name="scpToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 24</value>
+    <value>170, 22</value>
   </data>
   <data name="scpToolStripMenuItem.Text" xml:space="preserve">
     <value>SCP</value>
   </data>
+  <data name="wolToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>170, 22</value>
+  </data>
+  <data name="wolToolStripMenuItem.Text" xml:space="preserve">
+    <value>Wake Up...</value>
+  </data>
   <data name="devicesContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>199, 226</value>
+    <value>171, 230</value>
   </data>
   <data name="&gt;&gt;devicesContextMenuStrip.Name" xml:space="preserve">
     <value>devicesContextMenuStrip</value>
@@ -1748,7 +1616,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADg
-        HQAAAk1TRnQBSQFMAgEBEAEAASgBAQEoAQEBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        HQAAAk1TRnQBSQFMAgEBEAEAATABAQEwAQEBEAEAARABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgDAAFA
         AwABUAMAAQEBAAEYBgABPP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AJYAA/0D+AP3A/sD/yEAA/0D+gP5
         A/wD/xgAAfoB+wH6A/4qAAP9A/8tAAP7A88D1QPbA88D1AO+A9QYAAP8A90D4APjA90D4APUA+MSAAP8
         AZEBjwF9AU4BaAEhAfQB9QH0JAAD/gPRA8YD+ioAAcYCxwHPAtAB2ALZA90DywPBA68DmgP3FQAD2APd
@@ -1879,13 +1747,10 @@
 </value>
   </data>
   <data name="devicesListView.Location" type="System.Drawing.Point, System.Drawing">
-    <value>13, 5</value>
-  </data>
-  <data name="devicesListView.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>10, 4</value>
   </data>
   <data name="devicesListView.Size" type="System.Drawing.Size, System.Drawing">
-    <value>593, 258</value>
+    <value>446, 210</value>
   </data>
   <data name="devicesListView.TabIndex" type="System.Int32, mscorlib">
     <value>404</value>
@@ -1897,7 +1762,7 @@
     <value>devicesListView</value>
   </data>
   <data name="&gt;&gt;devicesListView.Type" xml:space="preserve">
-    <value>MeshCentralRouter.ListViewExtended, MeshCentralRouter, Version=1.8.8332.12419, Culture=neutral, PublicKeyToken=null</value>
+    <value>MeshCentralRouter.ListViewExtended, MeshCentralRouter, Version=1.8.8680.22147, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;devicesListView.Parent" xml:space="preserve">
     <value>devicesPanel</value>
@@ -1915,13 +1780,10 @@
     <value>NoControl</value>
   </data>
   <data name="noSearchResultsLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 108</value>
-  </data>
-  <data name="noSearchResultsLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>2, 88</value>
   </data>
   <data name="noSearchResultsLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>490, 64</value>
+    <value>362, 52</value>
   </data>
   <data name="noSearchResultsLabel.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -1957,13 +1819,10 @@
     <value>NoControl</value>
   </data>
   <data name="noDevicesLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 108</value>
-  </data>
-  <data name="noDevicesLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>2, 88</value>
   </data>
   <data name="noDevicesLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>490, 64</value>
+    <value>362, 52</value>
   </data>
   <data name="noDevicesLabel.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -1989,11 +1848,8 @@
   <data name="devicesPanel.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="devicesPanel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
-  </data>
   <data name="devicesPanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>628, 305</value>
+    <value>470, 248</value>
   </data>
   <data name="devicesPanel.TabIndex" type="System.Int32, mscorlib">
     <value>50</value>
@@ -2011,16 +1867,13 @@
     <value>0</value>
   </data>
   <data name="devicesTabPage.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 28</value>
-  </data>
-  <data name="devicesTabPage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>4, 25</value>
   </data>
   <data name="devicesTabPage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>3, 3, 3, 3</value>
   </data>
   <data name="devicesTabPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>632, 315</value>
+    <value>470, 250</value>
   </data>
   <data name="devicesTabPage.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -2047,13 +1900,10 @@
     <value>NoControl</value>
   </data>
   <data name="cancelAutoCloseButton2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 221</value>
-  </data>
-  <data name="cancelAutoCloseButton2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>4, 182</value>
   </data>
   <data name="cancelAutoCloseButton2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>224, 43</value>
+    <value>168, 35</value>
   </data>
   <data name="cancelAutoCloseButton2.TabIndex" type="System.Int32, mscorlib">
     <value>55</value>
@@ -2092,13 +1942,10 @@
     <value>NoControl</value>
   </data>
   <data name="noMapLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 97</value>
-  </data>
-  <data name="noMapLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 0, 4, 0</value>
+    <value>6, 79</value>
   </data>
   <data name="noMapLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>586, 64</value>
+    <value>436, 52</value>
   </data>
   <data name="noMapLabel.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -2126,11 +1973,8 @@ Click "Add" to get started.</value>
   <data name="mapPanel.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="mapPanel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
-  </data>
   <data name="mapPanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>628, 268</value>
+    <value>472, 221</value>
   </data>
   <data name="mapPanel.TabIndex" type="System.Int32, mscorlib">
     <value>49</value>
@@ -2154,13 +1998,10 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="settingsPictureBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>1, 275</value>
-  </data>
-  <data name="settingsPictureBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>1, 226</value>
   </data>
   <data name="settingsPictureBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>27, 25</value>
+    <value>20, 20</value>
   </data>
   <data name="settingsPictureBox.TabIndex" type="System.Int32, mscorlib">
     <value>54</value>
@@ -2184,13 +2025,10 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="helpPictureBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>320, 275</value>
-  </data>
-  <data name="helpPictureBox.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>240, 226</value>
   </data>
   <data name="helpPictureBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>27, 25</value>
+    <value>20, 20</value>
   </data>
   <data name="helpPictureBox.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -2217,13 +2055,10 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="addButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>496, 271</value>
-  </data>
-  <data name="addButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>372, 223</value>
   </data>
   <data name="addButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>133, 28</value>
+    <value>100, 23</value>
   </data>
   <data name="addButton.TabIndex" type="System.Int32, mscorlib">
     <value>50</value>
@@ -2253,13 +2088,10 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="addRelayButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>355, 271</value>
-  </data>
-  <data name="addRelayButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>266, 223</value>
   </data>
   <data name="addRelayButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>133, 28</value>
+    <value>100, 23</value>
   </data>
   <data name="addRelayButton.TabIndex" type="System.Int32, mscorlib">
     <value>52</value>
@@ -2280,16 +2112,13 @@ Click "Add" to get started.</value>
     <value>5</value>
   </data>
   <data name="portMapTabPage.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 28</value>
-  </data>
-  <data name="portMapTabPage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>4, 25</value>
   </data>
   <data name="portMapTabPage.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>3, 3, 3, 3</value>
   </data>
   <data name="portMapTabPage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>632, 315</value>
+    <value>472, 253</value>
   </data>
   <data name="portMapTabPage.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -2310,13 +2139,10 @@ Click "Add" to get started.</value>
     <value>1</value>
   </data>
   <data name="devicesTabControl.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 4</value>
-  </data>
-  <data name="devicesTabControl.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>3, 3</value>
   </data>
   <data name="devicesTabControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>640, 347</value>
+    <value>478, 279</value>
   </data>
   <data name="devicesTabControl.TabIndex" type="System.Int32, mscorlib">
     <value>401</value>
@@ -2340,13 +2166,10 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="openWebSiteButton.Location" type="System.Drawing.Point, System.Drawing">
-    <value>13, 362</value>
-  </data>
-  <data name="openWebSiteButton.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>10, 291</value>
   </data>
   <data name="openWebSiteButton.Size" type="System.Drawing.Size, System.Drawing">
-    <value>145, 28</value>
+    <value>109, 23</value>
   </data>
   <data name="openWebSiteButton.TabIndex" type="System.Int32, mscorlib">
     <value>406</value>
@@ -2376,13 +2199,10 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="backButton5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>371, 362</value>
-  </data>
-  <data name="backButton5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>276, 291</value>
   </data>
   <data name="backButton5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 28</value>
+    <value>95, 23</value>
   </data>
   <data name="backButton5.TabIndex" type="System.Int32, mscorlib">
     <value>407</value>
@@ -2409,13 +2229,10 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="nextButton5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>507, 362</value>
-  </data>
-  <data name="nextButton5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>378, 291</value>
   </data>
   <data name="nextButton5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>127, 28</value>
+    <value>95, 23</value>
   </data>
   <data name="nextButton5.TabIndex" type="System.Int32, mscorlib">
     <value>408</value>
@@ -2442,13 +2259,10 @@ Click "Add" to get started.</value>
     <value>NoControl</value>
   </data>
   <data name="pictureBox7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 351</value>
-  </data>
-  <data name="pictureBox7.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>0, 282</value>
   </data>
   <data name="pictureBox7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>648, 49</value>
+    <value>484, 40</value>
   </data>
   <data name="pictureBox7.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>StretchImage</value>
@@ -2474,11 +2288,8 @@ Click "Add" to get started.</value>
   <data name="panel4.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="panel4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
-  </data>
   <data name="panel4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>648, 400</value>
+    <value>484, 322</value>
   </data>
   <data name="panel4.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -2496,13 +2307,10 @@ Click "Add" to get started.</value>
     <value>0</value>
   </data>
   <data name="tabPage5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 28</value>
-  </data>
-  <data name="tabPage5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>4, 25</value>
   </data>
   <data name="tabPage5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>648, 400</value>
+    <value>484, 322</value>
   </data>
   <data name="tabPage5.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -2532,7 +2340,7 @@ Click "Add" to get started.</value>
     <value>0, 0, 0, 0</value>
   </data>
   <data name="mainTabControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>656, 432</value>
+    <value>492, 351</value>
   </data>
   <data name="mainTabControl.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -2556,13 +2364,10 @@ Click "Add" to get started.</value>
     <value>Fill</value>
   </data>
   <data name="mainPanel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 80</value>
-  </data>
-  <data name="mainPanel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
+    <value>0, 65</value>
   </data>
   <data name="mainPanel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>656, 432</value>
+    <value>492, 351</value>
   </data>
   <data name="mainPanel.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
@@ -2588,11 +2393,8 @@ Click "Add" to get started.</value>
   <data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="pictureBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
-  </data>
   <data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>656, 80</value>
+    <value>492, 65</value>
   </data>
   <data name="pictureBox1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
     <value>Zoom</value>
@@ -2618,11 +2420,8 @@ Click "Add" to get started.</value>
   <data name="panel5.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="panel5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
-  </data>
   <data name="panel5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>656, 512</value>
+    <value>492, 416</value>
   </data>
   <data name="panel5.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -2652,22 +2451,22 @@ Click "Add" to get started.</value>
     <value>418, 17</value>
   </metadata>
   <data name="openToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>123, 24</value>
+    <value>112, 22</value>
   </data>
   <data name="openToolStripMenuItem.Text" xml:space="preserve">
     <value>&amp;Open...</value>
   </data>
   <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 6</value>
+    <value>109, 6</value>
   </data>
   <data name="exitToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>123, 24</value>
+    <value>112, 22</value>
   </data>
   <data name="exitToolStripMenuItem.Text" xml:space="preserve">
     <value>E&amp;xit</value>
   </data>
   <data name="trayIconContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>124, 58</value>
+    <value>113, 54</value>
   </data>
   <data name="&gt;&gt;trayIconContextMenuStrip.Name" xml:space="preserve">
     <value>trayIconContextMenuStrip</value>
@@ -4379,34 +4178,34 @@ Click "Add" to get started.</value>
     <value>905, 17</value>
   </metadata>
   <data name="openMappingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>193, 24</value>
+    <value>168, 22</value>
   </data>
   <data name="openMappingsToolStripMenuItem.Text" xml:space="preserve">
     <value>&amp;Open Mappings...</value>
   </data>
   <data name="saveMappingsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>193, 24</value>
+    <value>168, 22</value>
   </data>
   <data name="saveMappingsToolStripMenuItem.Text" xml:space="preserve">
     <value>&amp;Save Mappings...</value>
   </data>
   <data name="toolStripMenuItem5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>190, 6</value>
+    <value>165, 6</value>
   </data>
   <data name="settingsToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>193, 24</value>
+    <value>168, 22</value>
   </data>
   <data name="settingsToolStripMenuItem1.Text" xml:space="preserve">
     <value>S&amp;ettings...</value>
   </data>
   <data name="customAppsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>193, 24</value>
+    <value>168, 22</value>
   </data>
   <data name="customAppsToolStripMenuItem.Text" xml:space="preserve">
     <value>&amp;Custom Apps...</value>
   </data>
   <data name="mappingsContextMenuStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 106</value>
+    <value>169, 98</value>
   </data>
   <data name="&gt;&gt;mappingsContextMenuStrip.Name" xml:space="preserve">
     <value>mappingsContextMenuStrip</value>
@@ -4436,10 +4235,10 @@ Click "Add" to get started.</value>
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>8, 16</value>
+    <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>656, 512</value>
+    <value>492, 416</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -6135,9 +5934,6 @@ Click "Add" to get started.</value>
         AADAPwAAwD8AAMA/AADAPwAA
 </value>
   </data>
-  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>4, 4, 4, 4</value>
-  </data>
   <data name="$this.Text" xml:space="preserve">
     <value> MeshCentral Router</value>
   </data>
@@ -6249,12 +6045,6 @@ Click "Add" to get started.</value>
   <data name="&gt;&gt;remoteFilesToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;wolToolStripMenuItem.Name" xml:space="preserve">
-    <value>wolToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;wolToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;httpToolStripMenuItem.Name" xml:space="preserve">
     <value>httpToolStripMenuItem</value>
   </data>
@@ -6285,6 +6075,12 @@ Click "Add" to get started.</value>
   <data name="&gt;&gt;scpToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;wolToolStripMenuItem.Name" xml:space="preserve">
+    <value>wolToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;wolToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;devicesImageList.Name" xml:space="preserve">
     <value>devicesImageList</value>
   </data>
diff --git a/src/WebSocketClient.cs b/src/WebSocketClient.cs
index 4abffe3..6c0eb0d 100644
--- a/src/WebSocketClient.cs
+++ b/src/WebSocketClient.cs
@@ -209,9 +209,30 @@ public bool Start(Uri url, string tlsCertFingerprint, string tlsCertFingerprint2
             else
             {
                 // Use C# coded websockets
-                Uri proxyUri = Win32Api.GetProxy(url);
+                Uri proxyUri = null;
                 Log("Websocket Start, URL=" + ((url == null) ? "(NULL)" : url.ToString()));
 
+                // Check if we need to use a HTTP proxy (Auto-proxy way)
+                try
+                {
+                    RegistryKey registryKey = Registry.CurrentUser.OpenSubKey("Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings", true);
+                    Object x = registryKey.GetValue("AutoConfigURL", null);
+                    if ((x != null) && (x.GetType() == typeof(string)))
+                    {
+                        string proxyStr = GetProxyForUrlUsingPac("http" + ((url.Port == 80) ? "" : "s") + "://" + url.Host + ":" + url.Port, x.ToString());
+                        if (proxyStr != null) { proxyUri = new Uri("http://" + proxyStr); }
+                    }
+                }
+                catch (Exception) { proxyUri = null; }
+
+                // Check if we need to use a HTTP proxy (Normal way)
+                if (proxyUri == null)
+                {
+                    var proxy = System.Net.HttpWebRequest.GetSystemWebProxy();
+                    proxyUri = proxy.GetProxy(url);
+                    if ((url.Host.ToLower() == proxyUri.Host.ToLower()) && (url.Port == proxyUri.Port)) { proxyUri = null; }
+                }
+
                 if (proxyUri != null)
                 {
                     // Proxy in use
@@ -267,8 +288,7 @@ private void OnConnectSink(IAsyncResult ar)
             {
                 // Send proxy connection request
                 wsrawstream = wsclient.GetStream();
-                Uri proxyUri = Win32Api.GetProxy(url);
-                string userCreds = proxyUri.UserInfo;
+
                 string basicAuth = "";
                 if (proxyUri?.UserInfo != null)
                 {