From 56f36e5b800db7b259d9f365947a8a23525bafa3 Mon Sep 17 00:00:00 2001
From: Cale-Torino <cale@techrad.co.za>
Date: Mon, 7 Mar 2022 12:18:19 +0200
Subject: [PATCH] Improved WinForms Classes; fixed form drag;added using(){}

---
 ...Manager_WPF.csproj.AssemblyReference.cache | Bin 0 -> 1886 bytes
 WinForms/.vs/FreeTAKServer_Manager/v16/.suo   | Bin 122368 -> 117760 bytes
 .../Classes/CMD_Class.cs                      |   2 +-
 .../Classes/CMD_PID_Class.cs                  |   8 +-
 .../Classes/EncryptionClass.cs                |   2 +-
 .../Classes/LoggerClass.cs                    |   7 +-
 .../Classes/RunUpdateExeClass.cs              |   2 +-
 .../FreeTAKServer_Manager/Forms/About_Form.cs |  11 +-
 .../Forms/EmailSetup_Form.cs                  |  11 +-
 .../Forms/FreeTAKServer_API_Form.cs           |   5 +-
 .../Forms/MainForm.Designer.cs                |   7 +-
 .../FreeTAKServer_Manager/Forms/MainForm.cs   | 139 ++++++++++--------
 .../Forms/ReadMe_Form.cs                      |   3 +-
 .../Forms/TelegramAPIForm.cs                  |   5 +-
 .../Properties/AssemblyInfo.cs                |   4 +-
 .../FreeTAKServer_Manager/Updater/gup.xml     |   2 +-
 16 files changed, 106 insertions(+), 102 deletions(-)
 create mode 100644 WPF/FreeTAKServer_Manager_WPF/obj/Release/FreeTAKServer_Manager_WPF.csproj.AssemblyReference.cache

diff --git a/WPF/FreeTAKServer_Manager_WPF/obj/Release/FreeTAKServer_Manager_WPF.csproj.AssemblyReference.cache b/WPF/FreeTAKServer_Manager_WPF/obj/Release/FreeTAKServer_Manager_WPF.csproj.AssemblyReference.cache
new file mode 100644
index 0000000000000000000000000000000000000000..26d190d53de2045590e49ce45ada18f1cc4a9c07
GIT binary patch
literal 1886
zcmcJQ%Sr<=6ow}|ap5y`Bj_enE8cc?Y;j>r=?Lv2AnDAh4Q3L}Irg&hA$+zjeHUk>
zRCk%p*#rWC|Kq=qL3f;`LL4PYB6NDIM!~-XUAFqh0=7=p*O#Yi408zJa%kNlLOHVr
zPz_8TJo-7Qe)S$!KD;V9>^=S6mKX9$o~sgbAFP?l!df9Jo#gX-a{RSDs3i}pM{U_@
zcg}7S@yw#1ZIGahs~4Q=_nLGZVZn)zLH-d8ZQ>X?C&sk2aRS3au&=C4vxN?CaSql%
zY9}6zdyiu*S?t&i<F}gikpcDA1P+aN7>8o@W(Xu7h#Ex1I@_sk(pDaXiE)KrVOJx>
k!{8arC;);ZO;saO9~y8tmZtva*#9qaQ+RUO&8CqbKSWhwQ2+n{

literal 0
HcmV?d00001

diff --git a/WinForms/.vs/FreeTAKServer_Manager/v16/.suo b/WinForms/.vs/FreeTAKServer_Manager/v16/.suo
index aff6480d5f7a97491b057449f5d20de921cf28b4..13045920055b9a03914163e13821c8b0e6fc6fce 100644
GIT binary patch
delta 5197
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
bGH1M$J|bh}gsXGn|Ni+~`%{I)RB!qhwFg&-

delta 6074
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

diff --git a/WinForms/FreeTAKServer_Manager/Classes/CMD_Class.cs b/WinForms/FreeTAKServer_Manager/Classes/CMD_Class.cs
index 563ed48..254eecd 100644
--- a/WinForms/FreeTAKServer_Manager/Classes/CMD_Class.cs
+++ b/WinForms/FreeTAKServer_Manager/Classes/CMD_Class.cs
@@ -6,7 +6,7 @@ namespace FreeTAKServer_Manager
 {
 
 
-    class CMD_Class
+    public static class CMD_Class
     {
         public static class CMD_Instance
         {
diff --git a/WinForms/FreeTAKServer_Manager/Classes/CMD_PID_Class.cs b/WinForms/FreeTAKServer_Manager/Classes/CMD_PID_Class.cs
index fc27c28..e4da286 100644
--- a/WinForms/FreeTAKServer_Manager/Classes/CMD_PID_Class.cs
+++ b/WinForms/FreeTAKServer_Manager/Classes/CMD_PID_Class.cs
@@ -1,10 +1,8 @@
 namespace FreeTAKServer_Manager
 {
-    static class CMD_PID_Class
+    public static class CMD_PID_Class
     {
-        public static int _ServerPIDVar//Server cmd windo PID var
-        { get; set; }
-        public static int _UIPIDVar//UI cmd window PID var
-        { get; set; }
+        public static int _ServerPIDVar { get; set; }//Server cmd windo PID var
+        public static int _UIPIDVar { get; set; }//UI cmd window PID var
     }
 }
diff --git a/WinForms/FreeTAKServer_Manager/Classes/EncryptionClass.cs b/WinForms/FreeTAKServer_Manager/Classes/EncryptionClass.cs
index e5a9af4..c55c0a9 100644
--- a/WinForms/FreeTAKServer_Manager/Classes/EncryptionClass.cs
+++ b/WinForms/FreeTAKServer_Manager/Classes/EncryptionClass.cs
@@ -5,7 +5,7 @@
 
 namespace FreeTAKServer_Manager
 {
-    class EncryptionClass
+    public static class EncryptionClass
     {
         static byte[] entropy = Encoding.Unicode.GetBytes("15021375505qpwoeirutyalskdjfhgmznxbcv");//salt
 
diff --git a/WinForms/FreeTAKServer_Manager/Classes/LoggerClass.cs b/WinForms/FreeTAKServer_Manager/Classes/LoggerClass.cs
index 600721d..f21248c 100644
--- a/WinForms/FreeTAKServer_Manager/Classes/LoggerClass.cs
+++ b/WinForms/FreeTAKServer_Manager/Classes/LoggerClass.cs
@@ -4,10 +4,9 @@
 
 namespace FreeTAKServer_Manager
 {
-    class LoggerClass
+    public static class LoggerClass
     {
-        public static class Logger
-        {
+
             //Create logfile log. file
             private static string LogFile = Application.StartupPath + @"\Logs\FreeTAKServer_Manager_" + DateTime.Now.ToString("yyyy-dd-M--HH-mm-ss") + ".log";
 
@@ -38,6 +37,6 @@ public static void DeleteLog()
                     return;
                 }
             }
-        }
+        
     }
 }
diff --git a/WinForms/FreeTAKServer_Manager/Classes/RunUpdateExeClass.cs b/WinForms/FreeTAKServer_Manager/Classes/RunUpdateExeClass.cs
index a685b39..94f9bc1 100644
--- a/WinForms/FreeTAKServer_Manager/Classes/RunUpdateExeClass.cs
+++ b/WinForms/FreeTAKServer_Manager/Classes/RunUpdateExeClass.cs
@@ -4,7 +4,7 @@
 
 namespace FreeTAKServer_Manager
 {
-    class RunUpdateExeClass
+    public static class RunUpdateExeClass
     {
         public static void RunExeActions()
         {
diff --git a/WinForms/FreeTAKServer_Manager/Forms/About_Form.cs b/WinForms/FreeTAKServer_Manager/Forms/About_Form.cs
index 3fb7dd2..08a0d80 100644
--- a/WinForms/FreeTAKServer_Manager/Forms/About_Form.cs
+++ b/WinForms/FreeTAKServer_Manager/Forms/About_Form.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Net.Http;
 using System.Windows.Forms;
-using static FreeTAKServer_Manager.LoggerClass;
 
 namespace FreeTAKServer_Manager
 {
@@ -37,12 +36,12 @@ private void Checkforupdate_button_Click(object sender, EventArgs e)
                 {
                     backgroundWorker1.RunWorkerAsync();
                 }
-                Logger.WriteLine(" *** Ran UpdateExe:" + Environment.NewLine + " [About_Form] ***");
+                LoggerClass.WriteLine(" *** Ran UpdateExe:" + Environment.NewLine + " [About_Form] ***");
            }
            catch (Exception ex)
            {
              MessageBox.Show(ex.Message, "Could not check for update", MessageBoxButtons.OK, MessageBoxIcon.Error);
-             Logger.WriteLine(" *** Error:" + ex.Message + " [About_Form] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [About_Form] ***");
              return;
            }
         }
@@ -75,8 +74,8 @@ private async void backgroundWorker1_RunWorkerCompleted(object sender, System.Co
                             //Read the result and display in Textbox
                             string result = await content.ReadAsStringAsync();//Result string JSON
                             string reasonPhrase = response.ReasonPhrase;//Reason OK, FAIL etc.
-                            Logger.WriteLine(" *** result:" + result + " [About_Form] ***");
-                            Logger.WriteLine(" *** reasonPhrase:" + reasonPhrase + " [About_Form] ***");
+                            LoggerClass.WriteLine(" *** result:" + result + " [About_Form] ***");
+                            LoggerClass.WriteLine(" *** reasonPhrase:" + reasonPhrase + " [About_Form] ***");
                             MessageBox.Show(result, "Updater", MessageBoxButtons.OK, MessageBoxIcon.Information);
                             return;
                         }
@@ -85,7 +84,7 @@ private async void backgroundWorker1_RunWorkerCompleted(object sender, System.Co
                 catch (Exception ex)
                 {
                     MessageBox.Show(ex.Message, "Could not test API", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                    LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                     return;
                 }
             }
diff --git a/WinForms/FreeTAKServer_Manager/Forms/EmailSetup_Form.cs b/WinForms/FreeTAKServer_Manager/Forms/EmailSetup_Form.cs
index 787445c..f849469 100644
--- a/WinForms/FreeTAKServer_Manager/Forms/EmailSetup_Form.cs
+++ b/WinForms/FreeTAKServer_Manager/Forms/EmailSetup_Form.cs
@@ -3,7 +3,6 @@
 using System.Net.Mail;
 using System.Security;
 using System.Windows.Forms;
-using static FreeTAKServer_Manager.LoggerClass;
 
 namespace FreeTAKServer_Manager
 {
@@ -57,12 +56,12 @@ private void SendEmail()
 
                     SmtpServer.Send(mail);
                     MessageBox.Show("Normal mail Sent", "Mail Status", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    Logger.WriteLine(" *** Auto Get Python Path Error. Attempting Manual Path Entry [MainForm] ***");
+                LoggerClass.WriteLine(" *** Auto Get Python Path Error. Attempting Manual Path Entry [MainForm] ***");
             }
             catch (Exception ex)
             {
                 MessageBox.Show(ex.Message, "Email could not be tested", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                Logger.WriteLine(" *** Error:" + ex.Message + " [EmailSetup_Form] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [EmailSetup_Form] ***");
             }
         }
 
@@ -86,7 +85,7 @@ private void Savesettings_button_Click(object sender, EventArgs e)
                     Username_textBox.Enabled = true;
                     Password_textBox.Enabled = true;
                     Savesettings_button.Text = "Save Settings";//Change button text
-                    Logger.WriteLine(" *** Editing email settings [EmailSetup_Form] ***");
+                    LoggerClass.WriteLine(" *** Editing email settings [EmailSetup_Form] ***");
                 }
                 catch (Exception ex)
                 {
@@ -98,7 +97,7 @@ private void Savesettings_button_Click(object sender, EventArgs e)
                     Username_textBox.Enabled = false;
                     Password_textBox.Enabled = false;
                     MessageBox.Show(ex.Message, "", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    Logger.WriteLine(" *** Error:" + ex.Message + " [EmailSetup_Form] ***");
+                    LoggerClass.WriteLine(" *** Error:" + ex.Message + " [EmailSetup_Form] ***");
                     Savesettings_button.Text = "Edit Settings";//Change button text
                     return;
                 }
@@ -124,7 +123,7 @@ private void Savesettings_button_Click(object sender, EventArgs e)
                 Username_textBox.Enabled = false;
                 Password_textBox.Enabled = false;
                 Savesettings_button.Text = "Edit Settings";//Change button text
-                Logger.WriteLine(" *** Saved email settings [EmailSetup_Form] ***");
+                LoggerClass.WriteLine(" *** Saved email settings [EmailSetup_Form] ***");
             }
         }
     }
diff --git a/WinForms/FreeTAKServer_Manager/Forms/FreeTAKServer_API_Form.cs b/WinForms/FreeTAKServer_Manager/Forms/FreeTAKServer_API_Form.cs
index fe0a701..9354f04 100644
--- a/WinForms/FreeTAKServer_Manager/Forms/FreeTAKServer_API_Form.cs
+++ b/WinForms/FreeTAKServer_Manager/Forms/FreeTAKServer_API_Form.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Net.Http;
 using System.Windows.Forms;
-using static FreeTAKServer_Manager.LoggerClass;
 
 namespace FreeTAKServer_Manager
 {
@@ -36,7 +35,7 @@ private async void Test_button_Click(object sender, EventArgs e)
                 catch (Exception ex)
                 {
                     MessageBox.Show(ex.Message, "Could not test API", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                    LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                     return;
                 }
             }
@@ -66,7 +65,7 @@ private async void Custom_button_Click(object sender, EventArgs e)
                 catch (Exception ex)
                 {
                     MessageBox.Show(ex.Message, "Could not custom test API", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                    LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                     return;
                 }
             }
diff --git a/WinForms/FreeTAKServer_Manager/Forms/MainForm.Designer.cs b/WinForms/FreeTAKServer_Manager/Forms/MainForm.Designer.cs
index 3b5e32c..c5930ad 100644
--- a/WinForms/FreeTAKServer_Manager/Forms/MainForm.Designer.cs
+++ b/WinForms/FreeTAKServer_Manager/Forms/MainForm.Designer.cs
@@ -344,7 +344,7 @@ private void InitializeComponent()
             // 
             this.freeTAKServerAPIToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("freeTAKServerAPIToolStripMenuItem.Image")));
             this.freeTAKServerAPIToolStripMenuItem.Name = "freeTAKServerAPIToolStripMenuItem";
-            this.freeTAKServerAPIToolStripMenuItem.Size = new System.Drawing.Size(258, 34);
+            this.freeTAKServerAPIToolStripMenuItem.Size = new System.Drawing.Size(270, 34);
             this.freeTAKServerAPIToolStripMenuItem.Text = "FreeTAKServer API";
             this.freeTAKServerAPIToolStripMenuItem.Click += new System.EventHandler(this.freeTAKServerAPIToolStripMenuItem_Click);
             // 
@@ -352,7 +352,7 @@ private void InitializeComponent()
             // 
             this.telegramAPIToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("telegramAPIToolStripMenuItem.Image")));
             this.telegramAPIToolStripMenuItem.Name = "telegramAPIToolStripMenuItem";
-            this.telegramAPIToolStripMenuItem.Size = new System.Drawing.Size(258, 34);
+            this.telegramAPIToolStripMenuItem.Size = new System.Drawing.Size(270, 34);
             this.telegramAPIToolStripMenuItem.Text = "Telegram API";
             this.telegramAPIToolStripMenuItem.Click += new System.EventHandler(this.telegramAPIToolStripMenuItem_Click);
             // 
@@ -391,10 +391,13 @@ private void InitializeComponent()
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.menuStrip1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MainMenuStrip = this.menuStrip1;
             this.MaximizeBox = false;
+            this.MaximumSize = new System.Drawing.Size(770, 662);
             this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(770, 662);
             this.Name = "MainForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "FreeTAKServer Manager";
diff --git a/WinForms/FreeTAKServer_Manager/Forms/MainForm.cs b/WinForms/FreeTAKServer_Manager/Forms/MainForm.cs
index 2d55980..d55f722 100644
--- a/WinForms/FreeTAKServer_Manager/Forms/MainForm.cs
+++ b/WinForms/FreeTAKServer_Manager/Forms/MainForm.cs
@@ -13,7 +13,6 @@
 using System.Windows.Forms;
 using System.Windows.Threading;
 using static FreeTAKServer_Manager.CMD_Class;
-using static FreeTAKServer_Manager.LoggerClass;
 
 namespace FreeTAKServer_Manager
 {
@@ -41,13 +40,13 @@ private void Ini()
                 PythonInstalled();
                 LoadPropertys();
 
-                Logger.WriteLine(" *** Ini Complete [MainForm] ***");
+                LoggerClass.WriteLine(" *** Ini Complete [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Ini Complete" + Environment.NewLine);
             }
             catch (Exception ex)
             {
                 MessageBox.Show(ex.Message, "Ini Error!", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                 return;
             }
@@ -60,13 +59,13 @@ private void PythonInstalled()
                 //Check if Python is installed
                 //bool isinstalled = IsSoftwareInstalled("Python");//Call the method
                 string pythonversion = PythonVersion();
-                Logger.WriteLine($" *** Python check result: {pythonversion} [MainForm] ***");
+                LoggerClass.WriteLine($" *** Python check result: {pythonversion} [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + $"] : Python check result: {pythonversion}");
             }
             catch (Exception ex)
             {
                 MessageBox.Show(ex.Message, "PythonInstalled check error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                 return;
             }
@@ -113,7 +112,7 @@ private void LoadPropertys()
             catch (Exception ex)
             {
                 MessageBox.Show(ex.Message, "Could not get Pythondir Property", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                 return;
             }
@@ -125,15 +124,15 @@ private void CreateFolder()
                 //Create the folders used by the app
                 string path = Application.StartupPath;
                 Directory.CreateDirectory(path + @"\Logs");
-                Logger.WriteLine(" *** Application Start [MainForm] ***");
+                LoggerClass.WriteLine(" *** Application Start [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Application Start" + Environment.NewLine);
-                Logger.WriteLine(" *** CreateDirectory Success [MainForm] ***");
+                LoggerClass.WriteLine(" *** CreateDirectory Success [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Logs Create Directory Success" + Environment.NewLine);
             }
             catch (Exception ex)
             {
                 MessageBox.Show(ex.Message, "Create Folder Error!", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                 return;
             }
@@ -171,7 +170,7 @@ private void replaceText()
             catch (Exception ex)
             {
                 MessageBox.Show(ex.Message, "Create Folder Error!", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                 return;
             }
@@ -236,14 +235,14 @@ private void StartServer()
                 CMD_PID_Class._ServerPIDVar = _ServerPID;
                 CMD_PID_Class._UIPIDVar = _UIPID;
                 Process.Start("http://127.0.0.1:5000");// Open this page in the default browser
-                Logger.WriteLine(" *** Start Server PID=" + _ServerPID + ", Start UI PID=" + _UIPID + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Start Server PID=" + _ServerPID + ", Start UI PID=" + _UIPID + " [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Start Server PID=" + _ServerPID + ", Start UI PID=" + _UIPID + Environment.NewLine);
 
             }
             else
             {
                 MessageBox.Show("Server is not installed", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                Logger.WriteLine(" *** Server is not installed  [MainForm] ***");
+                LoggerClass.WriteLine(" *** Server is not installed  [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Server is not installed" + Environment.NewLine);
             }
         }
@@ -264,7 +263,7 @@ private void StopServer()
                 {
                     CMD_Instance.PIDkill(CMD_PID_Class._ServerPIDVar);//Kill the server
                     CMD_Instance.PIDkill(CMD_PID_Class._UIPIDVar);//Kill the UI
-                    Logger.WriteLine(" *** Kill Server PID=" + CMD_PID_Class._ServerPIDVar + ",  Kill UI PID=" + CMD_PID_Class._UIPIDVar + "[MainForm] ***");
+                    LoggerClass.WriteLine(" *** Kill Server PID=" + CMD_PID_Class._ServerPIDVar + ",  Kill UI PID=" + CMD_PID_Class._UIPIDVar + "[MainForm] ***");
                     Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Kill Server PID=" + CMD_PID_Class._ServerPIDVar + ", Kill UI PID=" + CMD_PID_Class._UIPIDVar + Environment.NewLine);
                 }
                 else
@@ -276,7 +275,7 @@ private void StopServer()
             else
             {
                 MessageBox.Show("Server is not installed", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                Logger.WriteLine(" *** Server is not installed  [MainForm] ***");
+                LoggerClass.WriteLine(" *** Server is not installed  [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Server is not installed" + Environment.NewLine);
             }
         }
@@ -302,7 +301,7 @@ private void Restartserver_button_Click(object sender, EventArgs e)
                     int _UIPID = CMD_Instance.CMDStartServer("/k cd " + Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer-UI&&set FLASK_APP=run.py&&Flask run --host=0.0.0.0", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer-UI");
                     CMD_PID_Class._ServerPIDVar = _ServerPID;
                     CMD_PID_Class._UIPIDVar = _UIPID;
-                    Logger.WriteLine(" *** Restart Server PID=" + _ServerPID + ", Restart UI PID=" + _UIPID + " [MainForm] ***");
+                    LoggerClass.WriteLine(" *** Restart Server PID=" + _ServerPID + ", Restart UI PID=" + _UIPID + " [MainForm] ***");
                     Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Restart Server PID=" + _ServerPID + ", Restart UI PID=" + _UIPID + Environment.NewLine);
                 }
                 else
@@ -315,7 +314,7 @@ private void Restartserver_button_Click(object sender, EventArgs e)
             else
             {
                 MessageBox.Show("Server is not installed", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                Logger.WriteLine(" *** Server is not installed  [MainForm] ***");
+                LoggerClass.WriteLine(" *** Server is not installed  [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Server is not installed" + Environment.NewLine);
             }
 
@@ -343,12 +342,12 @@ private void Uninstallserver_button_Click(object sender, EventArgs e)
                         Directory.Delete(Pythonpath + @"Lib\site-packages\FreeTAKServer", true);
                         Directory.Delete(Pythonpath + @"Lib\site-packages\FreeTAKServer-UI", true);
 
-                        Logger.WriteLine(" *** Deleting Dir=" + Pythonpath + @"Lib\site-packages\FreeTAKServer  [MainForm] ***");
+                        LoggerClass.WriteLine(" *** Deleting Dir=" + Pythonpath + @"Lib\site-packages\FreeTAKServer  [MainForm] ***");
                         Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Deleting Dir=" + Pythonpath + @"Lib\site-packages\FreeTAKServer" + Environment.NewLine);
-                        Logger.WriteLine(" *** Deleting Dir=" + Pythonpath + @"Lib\site-packages\FreeTAKServer-UI  [MainForm] ***");
+                        LoggerClass.WriteLine(" *** Deleting Dir=" + Pythonpath + @"Lib\site-packages\FreeTAKServer-UI  [MainForm] ***");
                         Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Deleting Dir=" + Pythonpath + @"Lib\site-packages\FreeTAKServer-UI" + Environment.NewLine);
                     }
-                    Logger.WriteLine(" *** Uninstall Server PID=" + _Uninstall + " [MainForm] ***");
+                    LoggerClass.WriteLine(" *** Uninstall Server PID=" + _Uninstall + " [MainForm] ***");
                     Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Uninstall Server PID=" + _Uninstall + Environment.NewLine);
                     Cursor.Current = Cursors.Default;
                     MessageBox.Show("Server has been uninstalled", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -357,7 +356,7 @@ private void Uninstallserver_button_Click(object sender, EventArgs e)
                 {
                     Cursor.Current = Cursors.Default;
                     MessageBox.Show(ex.Message, "Could not uninstall FreeTAKServer & FreeTAKServer-UI", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                    LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                     Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                     return;
                 }
@@ -365,7 +364,7 @@ private void Uninstallserver_button_Click(object sender, EventArgs e)
             else
             {
                 MessageBox.Show("Server is already uninstalled", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                Logger.WriteLine(" *** Server is already uninstalled  [MainForm] ***");
+                LoggerClass.WriteLine(" *** Server is already uninstalled  [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Server is already uninstalled" + Environment.NewLine);
             }
 
@@ -386,13 +385,13 @@ private void Editmainconfig_button_Click(object sender, EventArgs e)
 
                 p.Start();
                 //p.WaitForExit();
-                Logger.WriteLine(" *** Edit MainConfig.py [MainForm] ***");
+                LoggerClass.WriteLine(" *** Edit MainConfig.py [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Edit MainConfig.py" + Environment.NewLine);
             }
             catch (Exception ex)
             {
                 MessageBox.Show(ex.Message, "Could edit MainConfig.py", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                 return;
             }
@@ -413,13 +412,13 @@ private void Editconfig_button_Click(object sender, EventArgs e)
 
                 p.Start();
                 //p.WaitForExit();
-                Logger.WriteLine(" *** Edit config.py [MainForm] ***");
+                LoggerClass.WriteLine(" *** Edit config.py [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Edit config.py" + Environment.NewLine);
             }
             catch (Exception ex)
             {
                 MessageBox.Show(ex.Message, "Could edit config.py", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                 return;
             }
@@ -429,7 +428,7 @@ private void Checkports_button_Click(object sender, EventArgs e)
         {
             //Open www.yougetsignal.com in the default browser 
             Process.Start("https://www.yougetsignal.com/tools/open-ports/");
-            Logger.WriteLine(" *** Check ports https://www.yougetsignal.com/tools/open-ports/ [MainForm] ***");
+            LoggerClass.WriteLine(" *** Check ports https://www.yougetsignal.com/tools/open-ports/ [MainForm] ***");
             Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Check ports https://www.yougetsignal.com/tools/open-ports/" + Environment.NewLine);
         }
         private void Installserver_button_Click(object sender, EventArgs e)
@@ -441,7 +440,7 @@ private void Installserver_button_Click(object sender, EventArgs e)
             if (Directory.Exists(Path.GetDirectoryName(configfile)) && Directory.Exists(Path.GetDirectoryName(MainConfigfile)) && Directory.Exists(Path.GetDirectoryName(YamlConfigfile)))
             {
                 MessageBox.Show("Server is already installed", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                Logger.WriteLine(" *** Server is already installed  [MainForm] ***");
+                LoggerClass.WriteLine(" *** Server is already installed  [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Server is already installed" + Environment.NewLine);
             }
             else
@@ -453,12 +452,12 @@ private void Installserver_button_Click(object sender, EventArgs e)
                     // /c pip install -r requirements.txt&&python -m pip install FreeTAKServer[ui]
                     // /c pip install -r requirements.txt&&python -m pip install FreeTAKServer[ui]==1.8.1
                     // /c pip python -m pip install FreeTAKServer[ui]==1.7.5
-                    int _Install = CMD_Instance.SendCMDCommandNormal("/c pip install -r requirements.txt&&python -m pip install FreeTAKServer[ui]==1.9.7", Application.StartupPath);
+                    int _Install = CMD_Instance.SendCMDCommandNormal("/c pip install -r requirements.txt&&python -m pip install FreeTAKServer[ui]==1.9.8", Application.StartupPath);
                     File.Copy(Application.StartupPath + @"\FTSConfig.yaml", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\FTSConfig.yaml", true);
                     File.Copy(Application.StartupPath+ @"\config.py", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer-UI\config.py", true);
                     File.Copy(Application.StartupPath+ @"\MainConfig.py", Properties.Settings.Default.Pythondir + @"Lib\site-packages\FreeTAKServer\controllers\configuration\MainConfig.py", true);
                     replaceText();
-                    Logger.WriteLine(" *** Install Server PID=" + _Install + " [MainForm] ***");
+                    LoggerClass.WriteLine(" *** Install Server PID=" + _Install + " [MainForm] ***");
                     Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Install Server PID=" + _Install + Environment.NewLine);
                     Cursor.Current = Cursors.Default;
                     MessageBox.Show("Server has been installed", "", MessageBoxButtons.OK, MessageBoxIcon.Information);
@@ -467,7 +466,7 @@ private void Installserver_button_Click(object sender, EventArgs e)
                 {
                     Cursor.Current = Cursors.Default;
                     MessageBox.Show(ex.Message, "Could not install FreeTAKServer[ui]", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                    LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                     Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                     return;
                 }
@@ -478,22 +477,28 @@ private void Installserver_button_Click(object sender, EventArgs e)
         private void aboutToolStripMenuItem_Click(object sender, EventArgs e)
         {
             //Open the about form
-            Form f = new About_Form();
-            f.ShowDialog();
+            using (Form f = new About_Form())
+            {
+                f.ShowDialog();
+            }
         }
 
         private void emailSetupToolStripMenuItem_Click(object sender, EventArgs e)
         {
             //Open the email setup form
-            Form f = new EmailSetup_Form();
-            f.ShowDialog();
+            using (Form f = new EmailSetup_Form())
+            {
+                f.ShowDialog();
+            }
         }
 
         private void readMeToolStripMenuItem_Click(object sender, EventArgs e)
         {
             //Open the read me form
-            Form f = new ReadMe_Form();
-            f.ShowDialog();
+            using (Form f = new ReadMe_Form())
+            {
+                f.ShowDialog();
+            }
         }
         private string PythonVersion()
         {
@@ -554,7 +559,7 @@ string GetPythonPath()
             catch (Exception ex)
             {
                 MessageBox.Show(ex.Message, "Get Python Path Error!", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                 return "Get Python Path Error";
             }
@@ -572,18 +577,18 @@ private void Setdir_button_Click(object sender, EventArgs e)
                     Pythondir_textBox.Enabled = true;
                     Pythondir_textBox.ReadOnly = false;
                     Setdir_button.Text = "Save Dir";
-                    Logger.WriteLine(" *** Auto Get Python Path Success [MainForm] ***");
+                    LoggerClass.WriteLine(" *** Auto Get Python Path Success [MainForm] ***");
                     Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Auto Get Python Path Success" + Environment.NewLine);
                 }
                 catch (Exception ex)
                 {
                     MessageBox.Show(ex.Message, "Auto Get Python Path Error! Please enter path manually.", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                    LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                     Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                     Pythondir_textBox.Enabled = true;
                     Pythondir_textBox.ReadOnly = false;
                     Setdir_button.Text = "Save Dir";
-                    Logger.WriteLine(" *** Auto Get Python Path Error. Attempting Manual Path Entry [MainForm] ***");
+                    LoggerClass.WriteLine(" *** Auto Get Python Path Error. Attempting Manual Path Entry [MainForm] ***");
                     Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Auto Get Python Path Error. Attempting Manual Path Entry" + Environment.NewLine);
                     return;
                 }
@@ -609,7 +614,7 @@ private void Setdir_button_Click(object sender, EventArgs e)
                 Checkports_button.Enabled = true;
                 Installserver_button.Enabled = true;
                 MessageBox.Show("Dir : \' " + Pythondir_textBox.Text + " \' has been saved ", "");
-                Logger.WriteLine(" *** Python Path Save Success. Path=" + Pythondir_textBox.Text + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Python Path Save Success. Path=" + Pythondir_textBox.Text + " [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Python Path Save Success" + Environment.NewLine);
             }
         }
@@ -621,13 +626,13 @@ private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
                 //On form closing stop the server and UI
                 CMD_Instance.PIDkill(CMD_PID_Class._ServerPIDVar);
                 CMD_Instance.PIDkill(CMD_PID_Class._UIPIDVar);
-                Logger.WriteLine(" *** Kill Server PID=" + CMD_PID_Class._ServerPIDVar + ",  Kill UI PID=" + CMD_PID_Class._UIPIDVar + "[MainForm] ***");
+                LoggerClass.WriteLine(" *** Kill Server PID=" + CMD_PID_Class._ServerPIDVar + ",  Kill UI PID=" + CMD_PID_Class._UIPIDVar + "[MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Kill Server PID=" + CMD_PID_Class._ServerPIDVar + ", Kill UI PID=" + CMD_PID_Class._UIPIDVar + Environment.NewLine);
-                Logger.WriteLine(" *** Application Closed [MainForm] ***");
+                LoggerClass.WriteLine(" *** Application Closed [MainForm] ***");
             }
             else
             {
-                Logger.WriteLine(" *** Application Closed [MainForm] ***");
+                LoggerClass.WriteLine(" *** Application Closed [MainForm] ***");
                 //do nothing
             }
         }
@@ -642,7 +647,7 @@ public static bool PingHost(string hostUri, int portNumber)
             catch (SocketException ex)
             {
                 //MessageBox.Show("Error pinging host:'" + hostUri + ":" + portNumber.ToString() + "'");
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 //Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                 return false;
             }
@@ -656,11 +661,11 @@ private void TimerStart()
                 //Start the watchdog timer to check that the server is running
                 if (dispatcherTimer.IsEnabled)
                 {
-                    Logger.WriteLine(" *** DispatcherTimer Already Running, No Need To Start [MainForm] ***");
+                    LoggerClass.WriteLine(" *** DispatcherTimer Already Running, No Need To Start [MainForm] ***");
                 }
                 else
                 {
-                    Logger.WriteLine(" *** Started dispatcherTimer [MainForm] ***");
+                    LoggerClass.WriteLine(" *** Started dispatcherTimer [MainForm] ***");
                     dispatcherTimer = new DispatcherTimer();
                     dispatcherTimer.Tick += dispatcherTimer_Tick;
                     dispatcherTimer.Interval = new TimeSpan(0, 0, 30);//60 seconds
@@ -669,7 +674,7 @@ private void TimerStart()
             }
             catch (Exception ex)
             {
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 //MessageBox.Show(ex.ToString(), "TimerStart Error!", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
@@ -681,17 +686,17 @@ private void TimerStop()
                 //Stop the watchdog timer
                 if (dispatcherTimer.IsEnabled)
                 {
-                    Logger.WriteLine(" *** Stopped dispatcherTimer [MainForm] *** ");
+                    LoggerClass.WriteLine(" *** Stopped dispatcherTimer [MainForm] *** ");
                     dispatcherTimer.Stop();
                 }
                 else
                 {
-                    Logger.WriteLine(" *** DispatcherTimer Already Stopped, No Need To Stop [MainForm] *** ");
+                    LoggerClass.WriteLine(" *** DispatcherTimer Already Stopped, No Need To Stop [MainForm] *** ");
                 }
             }
             catch (Exception ex)
             {
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 //MessageBox.Show(ex.ToString(), "TimerStop Error!", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
@@ -709,24 +714,24 @@ private void dispatcherTimer_Tick(object sender, EventArgs e)
                     string _pass = EncryptionClass.ToInsecureString(password);
 
                     MailMessage mail = new MailMessage();
-                    SmtpClient SmtpServer = new SmtpClient(Properties.Settings.Default.emailSmtp);//smtp.techrad.co.za
+                    SmtpClient SmtpServer = new SmtpClient(Properties.Settings.Default.emailSmtp);//smtp.example.com
 
-                    mail.From = new MailAddress(Properties.Settings.Default.emailFrom);
-                    mail.To.Add(Properties.Settings.Default.emailTo);
-                    mail.Subject = Properties.Settings.Default.emailSubject;
-                    mail.Body = Properties.Settings.Default.emailBody;
+                    mail.From = new MailAddress(Properties.Settings.Default.emailFrom);//from
+                    mail.To.Add(Properties.Settings.Default.emailTo);//to
+                    mail.Subject = Properties.Settings.Default.emailSubject;//subject
+                    mail.Body = Properties.Settings.Default.emailBody;//body
 
                     SmtpServer.Port = 587;//port
                     SmtpServer.Credentials = new NetworkCredential(Properties.Settings.Default.emailUsername, _pass);//details
-                    SmtpServer.EnableSsl = true;
+                    SmtpServer.EnableSsl = true;//ssl
 
                     SmtpServer.Send(mail);
-                    Logger.WriteLine(" *** ALERT!! Mail sent! [MainForm] ***");
+                    LoggerClass.WriteLine(" *** ALERT!! Mail sent! [MainForm] ***");
                 }
                 catch (Exception ex)
                 {
                     //MessageBox.Show(ex.Message, "Email could not be tested", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    Logger.WriteLine(" *** Error:" + ex.Message + " [EmailSetup_Form] ***");
+                    LoggerClass.WriteLine(" *** Error:" + ex.Message + " [EmailSetup_Form] ***");
                 }
             }
         }
@@ -753,7 +758,7 @@ private void Email_checkBox_Click(object sender, EventArgs e)
             }
             catch (Exception ex)
             {
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                 MessageBox.Show(ex.Message, "Send email alert error", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
@@ -784,7 +789,7 @@ private void Startserver_checkBox_Click(object sender, EventArgs e)
             }
             catch (Exception ex)
             {
-                Logger.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
+                LoggerClass.WriteLine(" *** Error:" + ex.Message + " [MainForm] ***");
                 Logs_richTextBox.AppendText("[" + DateTime.Now.ToString() + "] : Error:" + ex.Message + Environment.NewLine);
                 MessageBox.Show(ex.Message, "Send email alert error", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
@@ -794,15 +799,19 @@ private void Startserver_checkBox_Click(object sender, EventArgs e)
         private void freeTAKServerAPIToolStripMenuItem_Click(object sender, EventArgs e)
         {
             //Open the test API form
-            Form f = new FreeTAKServer_API_Form();
-            f.ShowDialog();
+            using (Form f = new FreeTAKServer_API_Form())
+            {
+                f.ShowDialog();
+            }
         }
 
         private void telegramAPIToolStripMenuItem_Click(object sender, EventArgs e)
         {
             //Open the test API form
-            Form f = new TelegramAPIForm();
-            f.ShowDialog();
+            using (Form f = new TelegramAPIForm())
+            {
+                f.ShowDialog();
+            }
         }
     }
 }
diff --git a/WinForms/FreeTAKServer_Manager/Forms/ReadMe_Form.cs b/WinForms/FreeTAKServer_Manager/Forms/ReadMe_Form.cs
index 3683999..6933f17 100644
--- a/WinForms/FreeTAKServer_Manager/Forms/ReadMe_Form.cs
+++ b/WinForms/FreeTAKServer_Manager/Forms/ReadMe_Form.cs
@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using System.Windows.Forms;
-using static FreeTAKServer_Manager.LoggerClass;
 
 namespace FreeTAKServer_Manager
 {
@@ -14,7 +13,7 @@ public ReadMe_Form()
 
         private void ReadMe_Form_Load(object sender, EventArgs e)
         {
-            Logger.WriteLine(" *** Notes Form Show Success [NotesForm] *** ");
+            LoggerClass.WriteLine(" *** Notes Form Show Success [NotesForm] *** ");
             try
             {
                 //Clear Richtextbox and add the content of ReadMe.txt
diff --git a/WinForms/FreeTAKServer_Manager/Forms/TelegramAPIForm.cs b/WinForms/FreeTAKServer_Manager/Forms/TelegramAPIForm.cs
index 62b66ae..21a0305 100644
--- a/WinForms/FreeTAKServer_Manager/Forms/TelegramAPIForm.cs
+++ b/WinForms/FreeTAKServer_Manager/Forms/TelegramAPIForm.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Net.Http;
 using System.Windows.Forms;
-using static FreeTAKServer_Manager.LoggerClass;
 
 namespace FreeTAKServer_Manager
 {
@@ -47,7 +46,7 @@ private async void Test_button_Click(object sender, EventArgs e)
                 catch (Exception ex)
                 {
                     MessageBox.Show(ex.Message, "Could not test Telegram API", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    Logger.WriteLine(" *** Error:" + ex.Message + " [TelegramAPIForm] ***");
+                    LoggerClass.WriteLine(" *** Error:" + ex.Message + " [TelegramAPIForm] ***");
                     return;
                 }
             }
@@ -77,7 +76,7 @@ private async void Custom_Test_button_Click(object sender, EventArgs e)
                 catch (Exception ex)
                 {
                     MessageBox.Show(ex.Message, "Could not test Telegram API", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    Logger.WriteLine(" *** Error:" + ex.Message + " [TelegramAPIForm] ***");
+                    LoggerClass.WriteLine(" *** Error:" + ex.Message + " [TelegramAPIForm] ***");
                     return;
                 }
             }
diff --git a/WinForms/FreeTAKServer_Manager/Properties/AssemblyInfo.cs b/WinForms/FreeTAKServer_Manager/Properties/AssemblyInfo.cs
index dd66969..d30707a 100644
--- a/WinForms/FreeTAKServer_Manager/Properties/AssemblyInfo.cs
+++ b/WinForms/FreeTAKServer_Manager/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.5")]
-[assembly: AssemblyFileVersion("1.0.0.5")]
+[assembly: AssemblyVersion("1.0.0.6")]
+[assembly: AssemblyFileVersion("1.0.0.6")]
diff --git a/WinForms/FreeTAKServer_Manager/Updater/gup.xml b/WinForms/FreeTAKServer_Manager/Updater/gup.xml
index 5d3d5f8..f0f5236 100644
--- a/WinForms/FreeTAKServer_Manager/Updater/gup.xml
+++ b/WinForms/FreeTAKServer_Manager/Updater/gup.xml
@@ -22,7 +22,7 @@
 	It's the current version of your program. WinGup will add "?version=versionNumber" at the end of InfoUrl.
 	This parameter will be ignored if you pass directly your version number to WinGup via command line "-v".
 	-->
-	<Version>1.003</Version>
+	<Version>1.006</Version>
 	
 	<!-- optional.
 	It could be whatever you want.