diff --git a/TGControlPanel/Main.Designer.cs b/TGControlPanel/Main.Designer.cs
index 7ed294b27e..2020a8b21d 100644
--- a/TGControlPanel/Main.Designer.cs
+++ b/TGControlPanel/Main.Designer.cs
@@ -38,126 +38,126 @@
 			this.FullUpdateWorker = new System.ComponentModel.BackgroundWorker();
 			this.ServerStartBGW = new System.ComponentModel.BackgroundWorker();
 			this.ChatPanel = new System.Windows.Forms.TabPage();
-			this.panel1 = new System.Windows.Forms.Panel();
-			this.AdminModeNormal = new System.Windows.Forms.RadioButton();
-			this.AdminModeSpecial = new System.Windows.Forms.RadioButton();
-			this.ChatAdminsTitle = new System.Windows.Forms.Label();
-			this.ChatAdminsTextBox = new System.Windows.Forms.TextBox();
-			this.ChannelsTitle = new System.Windows.Forms.Label();
-			this.ChatProviderTitle = new System.Windows.Forms.Label();
-			this.ChatProviderSelectorPanel = new System.Windows.Forms.Panel();
-			this.IRCProviderSwitch = new System.Windows.Forms.RadioButton();
-			this.DiscordProviderSwitch = new System.Windows.Forms.RadioButton();
-			this.ChatEnabledCheckbox = new System.Windows.Forms.CheckBox();
-			this.ChatStatusTitle = new System.Windows.Forms.Label();
-			this.ChatStatusLabel = new System.Windows.Forms.Label();
-			this.ChatReconnectButton = new System.Windows.Forms.Button();
-			this.AuthField1 = new System.Windows.Forms.TextBox();
-			this.AuthField2 = new System.Windows.Forms.TextBox();
-			this.AuthField1Title = new System.Windows.Forms.Label();
-			this.AuthField2Title = new System.Windows.Forms.Label();
-			this.ChatApplyButton = new System.Windows.Forms.Button();
-			this.ChatServerTitle = new System.Windows.Forms.Label();
-			this.ChatServerText = new System.Windows.Forms.TextBox();
-			this.ChatPortTitle = new System.Windows.Forms.Label();
-			this.ChatPortSelector = new System.Windows.Forms.NumericUpDown();
-			this.ChatNicknameTitle = new System.Windows.Forms.Label();
-			this.ChatNicknameText = new System.Windows.Forms.TextBox();
-			this.ChatRefreshButton = new System.Windows.Forms.Button();
-			this.DevChannelsTextbox = new System.Windows.Forms.TextBox();
-			this.GameChannelsTextbox = new System.Windows.Forms.TextBox();
-			this.WDChannelsTextbox = new System.Windows.Forms.TextBox();
-			this.AdminChannelsTextbox = new System.Windows.Forms.TextBox();
-			this.label1 = new System.Windows.Forms.Label();
-			this.IRCModesComboBox = new System.Windows.Forms.ComboBox();
-			this.label2 = new System.Windows.Forms.Label();
-			this.label3 = new System.Windows.Forms.Label();
-			this.label4 = new System.Windows.Forms.Label();
 			this.label5 = new System.Windows.Forms.Label();
+			this.label4 = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.label2 = new System.Windows.Forms.Label();
+			this.IRCModesComboBox = new System.Windows.Forms.ComboBox();
+			this.label1 = new System.Windows.Forms.Label();
+			this.AdminChannelsTextbox = new System.Windows.Forms.TextBox();
+			this.WDChannelsTextbox = new System.Windows.Forms.TextBox();
+			this.GameChannelsTextbox = new System.Windows.Forms.TextBox();
+			this.DevChannelsTextbox = new System.Windows.Forms.TextBox();
+			this.ChatNicknameText = new System.Windows.Forms.TextBox();
+			this.ChatServerText = new System.Windows.Forms.TextBox();
+			this.AuthField2 = new System.Windows.Forms.TextBox();
+			this.AuthField1 = new System.Windows.Forms.TextBox();
+			this.ChatAdminsTextBox = new System.Windows.Forms.TextBox();
+			this.ChatRefreshButton = new System.Windows.Forms.Button();
+			this.ChatNicknameTitle = new System.Windows.Forms.Label();
+			this.ChatPortSelector = new System.Windows.Forms.NumericUpDown();
+			this.ChatPortTitle = new System.Windows.Forms.Label();
+			this.ChatServerTitle = new System.Windows.Forms.Label();
+			this.ChatApplyButton = new System.Windows.Forms.Button();
+			this.AuthField2Title = new System.Windows.Forms.Label();
+			this.AuthField1Title = new System.Windows.Forms.Label();
+			this.ChatReconnectButton = new System.Windows.Forms.Button();
+			this.ChatStatusLabel = new System.Windows.Forms.Label();
+			this.ChatStatusTitle = new System.Windows.Forms.Label();
+			this.ChatEnabledCheckbox = new System.Windows.Forms.CheckBox();
+			this.ChatProviderSelectorPanel = new System.Windows.Forms.Panel();
+			this.DiscordProviderSwitch = new System.Windows.Forms.RadioButton();
+			this.IRCProviderSwitch = new System.Windows.Forms.RadioButton();
+			this.ChatProviderTitle = new System.Windows.Forms.Label();
+			this.ChannelsTitle = new System.Windows.Forms.Label();
+			this.ChatAdminsTitle = new System.Windows.Forms.Label();
+			this.panel1 = new System.Windows.Forms.Panel();
+			this.AdminModeSpecial = new System.Windows.Forms.RadioButton();
+			this.AdminModeNormal = new System.Windows.Forms.RadioButton();
 			this.ServerPanel = new System.Windows.Forms.TabPage();
-			this.ServerStatusTitle = new System.Windows.Forms.Label();
-			this.ServerStatusLabel = new System.Windows.Forms.Label();
-			this.compilerProgressBar = new System.Windows.Forms.ProgressBar();
-			this.initializeButton = new System.Windows.Forms.Button();
-			this.compileButton = new System.Windows.Forms.Button();
-			this.CompilerLabel = new System.Windows.Forms.Label();
-			this.CompilerStatusLabel = new System.Windows.Forms.Label();
-			this.ServerStartButton = new System.Windows.Forms.Button();
-			this.ServerStopButton = new System.Windows.Forms.Button();
-			this.ServerRestartButton = new System.Windows.Forms.Button();
-			this.ServerGStopButton = new System.Windows.Forms.CheckBox();
-			this.ServerGRestartButton = new System.Windows.Forms.Button();
-			this.UpdateHardButton = new System.Windows.Forms.Button();
-			this.UpdateMergeButton = new System.Windows.Forms.Button();
-			this.UpdateTestmergeButton = new System.Windows.Forms.Button();
-			this.TestmergeButton = new System.Windows.Forms.Button();
-			this.ServerTestmergeInput = new System.Windows.Forms.NumericUpDown();
-			this.ServerPRLabel = new System.Windows.Forms.Label();
-			this.PortSelector = new System.Windows.Forms.NumericUpDown();
-			this.PortLabel = new System.Windows.Forms.Label();
-			this.projectNameText = new System.Windows.Forms.TextBox();
-			this.ProjectPathLabel = new System.Windows.Forms.Label();
-			this.CompileCancelButton = new System.Windows.Forms.Button();
-			this.ServerPathTextbox = new System.Windows.Forms.TextBox();
-			this.ServerPathLabel = new System.Windows.Forms.Label();
-			this.ResetTestmerge = new System.Windows.Forms.Button();
-			this.SecurityTitle = new System.Windows.Forms.Label();
-			this.SecuritySelector = new System.Windows.Forms.ComboBox();
-			this.VisibilityTitle = new System.Windows.Forms.Label();
-			this.WorldAnnounceField = new System.Windows.Forms.TextBox();
-			this.WorldAnnounceButton = new System.Windows.Forms.Button();
-			this.WebclientCheckBox = new System.Windows.Forms.CheckBox();
 			this.AutostartCheckbox = new System.Windows.Forms.CheckBox();
+			this.WebclientCheckBox = new System.Windows.Forms.CheckBox();
+			this.WorldAnnounceButton = new System.Windows.Forms.Button();
+			this.WorldAnnounceField = new System.Windows.Forms.TextBox();
+			this.ServerPathTextbox = new System.Windows.Forms.TextBox();
+			this.projectNameText = new System.Windows.Forms.TextBox();
+			this.WorldAnnounceLabel = new System.Windows.Forms.Label();
+			this.SecuritySelector = new System.Windows.Forms.ComboBox();
+			this.SecurityTitle = new System.Windows.Forms.Label();
+			this.ResetTestmerge = new System.Windows.Forms.Button();
+			this.ServerPathLabel = new System.Windows.Forms.Label();
+			this.CompileCancelButton = new System.Windows.Forms.Button();
+			this.ProjectPathLabel = new System.Windows.Forms.Label();
+			this.PortLabel = new System.Windows.Forms.Label();
+			this.PortSelector = new System.Windows.Forms.NumericUpDown();
+			this.ServerPRLabel = new System.Windows.Forms.Label();
+			this.ServerTestmergeInput = new System.Windows.Forms.NumericUpDown();
+			this.TestmergeButton = new System.Windows.Forms.Button();
+			this.UpdateTestmergeButton = new System.Windows.Forms.Button();
+			this.UpdateMergeButton = new System.Windows.Forms.Button();
+			this.UpdateHardButton = new System.Windows.Forms.Button();
+			this.ServerGRestartButton = new System.Windows.Forms.Button();
+			this.ServerGStopButton = new System.Windows.Forms.CheckBox();
+			this.ServerRestartButton = new System.Windows.Forms.Button();
+			this.ServerStopButton = new System.Windows.Forms.Button();
+			this.ServerStartButton = new System.Windows.Forms.Button();
+			this.CompilerStatusLabel = new System.Windows.Forms.Label();
+			this.CompilerLabel = new System.Windows.Forms.Label();
+			this.compileButton = new System.Windows.Forms.Button();
+			this.initializeButton = new System.Windows.Forms.Button();
+			this.compilerProgressBar = new System.Windows.Forms.ProgressBar();
+			this.ServerStatusLabel = new System.Windows.Forms.Label();
+			this.ServerStatusTitle = new System.Windows.Forms.Label();
 			this.BYONDPanel = new System.Windows.Forms.TabPage();
-			this.UpdateProgressBar = new System.Windows.Forms.ProgressBar();
-			this.MajorVersionNumeric = new System.Windows.Forms.NumericUpDown();
-			this.MinorVersionNumeric = new System.Windows.Forms.NumericUpDown();
-			this.UpdateButton = new System.Windows.Forms.Button();
-			this.MajorVersionLabel = new System.Windows.Forms.Label();
-			this.MinorVersionLabel = new System.Windows.Forms.Label();
-			this.VersionTitle = new System.Windows.Forms.Label();
-			this.VersionLabel = new System.Windows.Forms.Label();
-			this.StatusLabel = new System.Windows.Forms.Label();
-			this.StagedVersionTitle = new System.Windows.Forms.Label();
-			this.StagedVersionLabel = new System.Windows.Forms.Label();
-			this.LatestVersionTitle = new System.Windows.Forms.Label();
 			this.LatestVersionLabel = new System.Windows.Forms.Label();
+			this.LatestVersionTitle = new System.Windows.Forms.Label();
+			this.StagedVersionLabel = new System.Windows.Forms.Label();
+			this.StagedVersionTitle = new System.Windows.Forms.Label();
+			this.StatusLabel = new System.Windows.Forms.Label();
+			this.VersionLabel = new System.Windows.Forms.Label();
+			this.VersionTitle = new System.Windows.Forms.Label();
+			this.MinorVersionLabel = new System.Windows.Forms.Label();
+			this.MajorVersionLabel = new System.Windows.Forms.Label();
+			this.UpdateButton = new System.Windows.Forms.Button();
+			this.MinorVersionNumeric = new System.Windows.Forms.NumericUpDown();
+			this.MajorVersionNumeric = new System.Windows.Forms.NumericUpDown();
+			this.UpdateProgressBar = new System.Windows.Forms.ProgressBar();
 			this.RepoPanel = new System.Windows.Forms.TabPage();
-			this.RepoProgressBar = new System.Windows.Forms.ProgressBar();
-			this.RepoProgressBarLabel = new System.Windows.Forms.Label();
-			this.CloneRepositoryButton = new System.Windows.Forms.Button();
-			this.CurrentRevisionTitle = new System.Windows.Forms.Label();
-			this.BranchNameTitle = new System.Windows.Forms.Label();
-			this.RemoteNameTitle = new System.Windows.Forms.Label();
-			this.TestMergeListTitle = new System.Windows.Forms.Label();
-			this.IdentityLabel = new System.Windows.Forms.Label();
-			this.MergePRButton = new System.Windows.Forms.Button();
-			this.UpdateRepoButton = new System.Windows.Forms.Button();
-			this.HardReset = new System.Windows.Forms.Button();
-			this.RepoRemoteTextBox = new System.Windows.Forms.TextBox();
-			this.RepoBranchTextBox = new System.Windows.Forms.TextBox();
-			this.RepoApplyButton = new System.Windows.Forms.Button();
-			this.CurrentRevisionLabel = new System.Windows.Forms.Label();
-			this.TestMergeListLabel = new System.Windows.Forms.ListBox();
-			this.TestmergeSelector = new System.Windows.Forms.NumericUpDown();
-			this.RepoGenChangelogButton = new System.Windows.Forms.Button();
-			this.PythonPathLabel = new System.Windows.Forms.Label();
-			this.PythonPathText = new System.Windows.Forms.TextBox();
-			this.RecloneButton = new System.Windows.Forms.Button();
-			this.ResetRemote = new System.Windows.Forms.Button();
-			this.BackupTagsList = new System.Windows.Forms.ListBox();
 			this.RepoRefreshButton = new System.Windows.Forms.Button();
+			this.BackupTagsList = new System.Windows.Forms.ListBox();
+			this.ResetRemote = new System.Windows.Forms.Button();
+			this.RecloneButton = new System.Windows.Forms.Button();
+			this.PythonPathText = new System.Windows.Forms.TextBox();
+			this.RepoBranchTextBox = new System.Windows.Forms.TextBox();
+			this.RepoRemoteTextBox = new System.Windows.Forms.TextBox();
+			this.PythonPathLabel = new System.Windows.Forms.Label();
+			this.RepoGenChangelogButton = new System.Windows.Forms.Button();
+			this.TestmergeSelector = new System.Windows.Forms.NumericUpDown();
+			this.TestMergeListLabel = new System.Windows.Forms.ListBox();
+			this.CurrentRevisionLabel = new System.Windows.Forms.Label();
+			this.RepoApplyButton = new System.Windows.Forms.Button();
+			this.HardReset = new System.Windows.Forms.Button();
+			this.UpdateRepoButton = new System.Windows.Forms.Button();
+			this.MergePRButton = new System.Windows.Forms.Button();
+			this.IdentityLabel = new System.Windows.Forms.Label();
+			this.TestMergeListTitle = new System.Windows.Forms.Label();
+			this.RemoteNameTitle = new System.Windows.Forms.Label();
+			this.BranchNameTitle = new System.Windows.Forms.Label();
+			this.CurrentRevisionTitle = new System.Windows.Forms.Label();
+			this.CloneRepositoryButton = new System.Windows.Forms.Button();
+			this.RepoProgressBarLabel = new System.Windows.Forms.Label();
+			this.RepoProgressBar = new System.Windows.Forms.ProgressBar();
 			this.Panels = new System.Windows.Forms.TabControl();
 			this.ChatPanel.SuspendLayout();
-			this.panel1.SuspendLayout();
-			this.ChatProviderSelectorPanel.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.ChatPortSelector)).BeginInit();
+			this.ChatProviderSelectorPanel.SuspendLayout();
+			this.panel1.SuspendLayout();
 			this.ServerPanel.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.ServerTestmergeInput)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.PortSelector)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.ServerTestmergeInput)).BeginInit();
 			this.BYONDPanel.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.MajorVersionNumeric)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.MinorVersionNumeric)).BeginInit();
+			((System.ComponentModel.ISupportInitialize)(this.MajorVersionNumeric)).BeginInit();
 			this.RepoPanel.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.TestmergeSelector)).BeginInit();
 			this.Panels.SuspendLayout();
@@ -239,51 +239,144 @@
 			this.ChatPanel.TabIndex = 4;
 			this.ChatPanel.Text = "Chat";
 			// 
-			// panel1
+			// label5
 			// 
-			this.panel1.Controls.Add(this.AdminModeSpecial);
-			this.panel1.Controls.Add(this.AdminModeNormal);
-			this.panel1.Location = new System.Drawing.Point(174, 168);
-			this.panel1.Name = "panel1";
-			this.panel1.Size = new System.Drawing.Size(202, 25);
-			this.panel1.TabIndex = 15;
+			this.label5.AutoSize = true;
+			this.label5.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.label5.Location = new System.Drawing.Point(686, 219);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(148, 18);
+			this.label5.TabIndex = 43;
+			this.label5.Text = "Game Messages:";
+			this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// AdminModeNormal
+			// label4
 			// 
-			this.AdminModeNormal.AutoSize = true;
-			this.AdminModeNormal.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.AdminModeNormal.Location = new System.Drawing.Point(3, 8);
-			this.AdminModeNormal.Name = "AdminModeNormal";
-			this.AdminModeNormal.Size = new System.Drawing.Size(78, 17);
-			this.AdminModeNormal.TabIndex = 12;
-			this.AdminModeNormal.TabStop = true;
-			this.AdminModeNormal.Text = "Nicknames";
-			this.AdminModeNormal.UseVisualStyleBackColor = true;
-			this.AdminModeNormal.CheckedChanged += new System.EventHandler(this.AdminModeNormal_CheckedChanged);
+			this.label4.AutoSize = true;
+			this.label4.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.label4.Location = new System.Drawing.Point(516, 219);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(136, 18);
+			this.label4.TabIndex = 42;
+			this.label4.Text = "Developer Info:";
+			this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// AdminModeSpecial
+			// label3
 			// 
-			this.AdminModeSpecial.AutoSize = true;
-			this.AdminModeSpecial.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.AdminModeSpecial.Location = new System.Drawing.Point(87, 8);
-			this.AdminModeSpecial.Name = "AdminModeSpecial";
-			this.AdminModeSpecial.Size = new System.Drawing.Size(94, 17);
-			this.AdminModeSpecial.TabIndex = 13;
-			this.AdminModeSpecial.TabStop = true;
-			this.AdminModeSpecial.Text = "Channel Mode";
-			this.AdminModeSpecial.UseVisualStyleBackColor = true;
+			this.label3.AutoSize = true;
+			this.label3.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.label3.Location = new System.Drawing.Point(686, 61);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(135, 18);
+			this.label3.TabIndex = 41;
+			this.label3.Text = "Administration:";
+			this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// ChatAdminsTitle
+			// label2
 			// 
-			this.ChatAdminsTitle.AutoSize = true;
-			this.ChatAdminsTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ChatAdminsTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ChatAdminsTitle.Location = new System.Drawing.Point(366, 15);
-			this.ChatAdminsTitle.Name = "ChatAdminsTitle";
-			this.ChatAdminsTitle.Size = new System.Drawing.Size(75, 18);
-			this.ChatAdminsTitle.TabIndex = 9;
-			this.ChatAdminsTitle.Text = "Admins:";
-			this.ChatAdminsTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.label2.AutoSize = true;
+			this.label2.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.label2.Location = new System.Drawing.Point(516, 61);
+			this.label2.Name = "label2";
+			this.label2.Size = new System.Drawing.Size(153, 18);
+			this.label2.TabIndex = 40;
+			this.label2.Text = "Server Watchdog:";
+			this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// IRCModesComboBox
+			// 
+			this.IRCModesComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.IRCModesComboBox.FormattingEnabled = true;
+			this.IRCModesComboBox.Items.AddRange(new object[] {
+            "Voice - +",
+            "Halfop - %",
+            "Op - @",
+            "Owner - ~"});
+			this.IRCModesComboBox.Location = new System.Drawing.Point(369, 170);
+			this.IRCModesComboBox.Name = "IRCModesComboBox";
+			this.IRCModesComboBox.Size = new System.Drawing.Size(141, 21);
+			this.IRCModesComboBox.TabIndex = 38;
+			this.IRCModesComboBox.Visible = false;
+			// 
+			// label1
+			// 
+			this.label1.AutoSize = true;
+			this.label1.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.label1.Location = new System.Drawing.Point(30, 174);
+			this.label1.Name = "label1";
+			this.label1.Size = new System.Drawing.Size(110, 18);
+			this.label1.TabIndex = 39;
+			this.label1.Text = "Admin Auth:";
+			this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// AdminChannelsTextbox
+			// 
+			this.AdminChannelsTextbox.Location = new System.Drawing.Point(689, 82);
+			this.AdminChannelsTextbox.Multiline = true;
+			this.AdminChannelsTextbox.Name = "AdminChannelsTextbox";
+			this.AdminChannelsTextbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.AdminChannelsTextbox.Size = new System.Drawing.Size(167, 120);
+			this.AdminChannelsTextbox.TabIndex = 37;
+			// 
+			// WDChannelsTextbox
+			// 
+			this.WDChannelsTextbox.Location = new System.Drawing.Point(516, 82);
+			this.WDChannelsTextbox.Multiline = true;
+			this.WDChannelsTextbox.Name = "WDChannelsTextbox";
+			this.WDChannelsTextbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.WDChannelsTextbox.Size = new System.Drawing.Size(167, 120);
+			this.WDChannelsTextbox.TabIndex = 36;
+			// 
+			// GameChannelsTextbox
+			// 
+			this.GameChannelsTextbox.Location = new System.Drawing.Point(689, 240);
+			this.GameChannelsTextbox.Multiline = true;
+			this.GameChannelsTextbox.Name = "GameChannelsTextbox";
+			this.GameChannelsTextbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.GameChannelsTextbox.Size = new System.Drawing.Size(167, 120);
+			this.GameChannelsTextbox.TabIndex = 35;
+			// 
+			// DevChannelsTextbox
+			// 
+			this.DevChannelsTextbox.Location = new System.Drawing.Point(516, 240);
+			this.DevChannelsTextbox.Multiline = true;
+			this.DevChannelsTextbox.Name = "DevChannelsTextbox";
+			this.DevChannelsTextbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+			this.DevChannelsTextbox.Size = new System.Drawing.Size(167, 120);
+			this.DevChannelsTextbox.TabIndex = 34;
+			// 
+			// ChatNicknameText
+			// 
+			this.ChatNicknameText.Location = new System.Drawing.Point(174, 251);
+			this.ChatNicknameText.Name = "ChatNicknameText";
+			this.ChatNicknameText.Size = new System.Drawing.Size(151, 20);
+			this.ChatNicknameText.TabIndex = 31;
+			// 
+			// ChatServerText
+			// 
+			this.ChatServerText.Location = new System.Drawing.Point(174, 199);
+			this.ChatServerText.Name = "ChatServerText";
+			this.ChatServerText.Size = new System.Drawing.Size(151, 20);
+			this.ChatServerText.TabIndex = 27;
+			// 
+			// AuthField2
+			// 
+			this.AuthField2.Location = new System.Drawing.Point(174, 309);
+			this.AuthField2.Name = "AuthField2";
+			this.AuthField2.Size = new System.Drawing.Size(151, 20);
+			this.AuthField2.TabIndex = 22;
+			// 
+			// AuthField1
+			// 
+			this.AuthField1.Location = new System.Drawing.Point(174, 283);
+			this.AuthField1.Name = "AuthField1";
+			this.AuthField1.Size = new System.Drawing.Size(151, 20);
+			this.AuthField1.TabIndex = 21;
 			// 
 			// ChatAdminsTextBox
 			// 
@@ -294,190 +387,27 @@
 			this.ChatAdminsTextBox.Size = new System.Drawing.Size(141, 311);
 			this.ChatAdminsTextBox.TabIndex = 10;
 			// 
-			// ChannelsTitle
+			// ChatRefreshButton
 			// 
-			this.ChannelsTitle.AutoSize = true;
-			this.ChannelsTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ChannelsTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ChannelsTitle.Location = new System.Drawing.Point(565, 15);
-			this.ChannelsTitle.Name = "ChannelsTitle";
-			this.ChannelsTitle.Size = new System.Drawing.Size(234, 18);
-			this.ChannelsTitle.TabIndex = 11;
-			this.ChannelsTitle.Text = "Listen/Broadcast Channels:";
-			this.ChannelsTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.ChatRefreshButton.Location = new System.Drawing.Point(174, 335);
+			this.ChatRefreshButton.Name = "ChatRefreshButton";
+			this.ChatRefreshButton.Size = new System.Drawing.Size(112, 25);
+			this.ChatRefreshButton.TabIndex = 32;
+			this.ChatRefreshButton.Text = "Refresh";
+			this.ChatRefreshButton.UseVisualStyleBackColor = true;
+			this.ChatRefreshButton.Click += new System.EventHandler(this.ChatRefreshButton_Click);
 			// 
-			// ChatProviderTitle
+			// ChatNicknameTitle
 			// 
-			this.ChatProviderTitle.AutoSize = true;
-			this.ChatProviderTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ChatProviderTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ChatProviderTitle.Location = new System.Drawing.Point(20, 15);
-			this.ChatProviderTitle.Name = "ChatProviderTitle";
-			this.ChatProviderTitle.Size = new System.Drawing.Size(144, 18);
-			this.ChatProviderTitle.TabIndex = 13;
-			this.ChatProviderTitle.Text = "Editing Provider:";
-			this.ChatProviderTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// ChatProviderSelectorPanel
-			// 
-			this.ChatProviderSelectorPanel.Controls.Add(this.DiscordProviderSwitch);
-			this.ChatProviderSelectorPanel.Controls.Add(this.IRCProviderSwitch);
-			this.ChatProviderSelectorPanel.Location = new System.Drawing.Point(23, 49);
-			this.ChatProviderSelectorPanel.Name = "ChatProviderSelectorPanel";
-			this.ChatProviderSelectorPanel.Size = new System.Drawing.Size(302, 50);
-			this.ChatProviderSelectorPanel.TabIndex = 14;
-			// 
-			// IRCProviderSwitch
-			// 
-			this.IRCProviderSwitch.AutoSize = true;
-			this.IRCProviderSwitch.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.IRCProviderSwitch.Location = new System.Drawing.Point(14, 17);
-			this.IRCProviderSwitch.Name = "IRCProviderSwitch";
-			this.IRCProviderSwitch.Size = new System.Drawing.Size(116, 17);
-			this.IRCProviderSwitch.TabIndex = 12;
-			this.IRCProviderSwitch.TabStop = true;
-			this.IRCProviderSwitch.Text = "Internet Relay Chat";
-			this.IRCProviderSwitch.UseVisualStyleBackColor = true;
-			this.IRCProviderSwitch.CheckedChanged += new System.EventHandler(this.IRCProviderSwitch_CheckedChanged);
-			// 
-			// DiscordProviderSwitch
-			// 
-			this.DiscordProviderSwitch.AutoSize = true;
-			this.DiscordProviderSwitch.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.DiscordProviderSwitch.Location = new System.Drawing.Point(220, 17);
-			this.DiscordProviderSwitch.Name = "DiscordProviderSwitch";
-			this.DiscordProviderSwitch.Size = new System.Drawing.Size(61, 17);
-			this.DiscordProviderSwitch.TabIndex = 13;
-			this.DiscordProviderSwitch.TabStop = true;
-			this.DiscordProviderSwitch.Text = "Discord";
-			this.DiscordProviderSwitch.UseVisualStyleBackColor = true;
-			this.DiscordProviderSwitch.CheckedChanged += new System.EventHandler(this.DiscordProviderSwitch_CheckedChanged);
-			// 
-			// ChatEnabledCheckbox
-			// 
-			this.ChatEnabledCheckbox.AutoSize = true;
-			this.ChatEnabledCheckbox.Font = new System.Drawing.Font("Verdana", 12F);
-			this.ChatEnabledCheckbox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ChatEnabledCheckbox.Location = new System.Drawing.Point(32, 142);
-			this.ChatEnabledCheckbox.Name = "ChatEnabledCheckbox";
-			this.ChatEnabledCheckbox.Size = new System.Drawing.Size(136, 22);
-			this.ChatEnabledCheckbox.TabIndex = 15;
-			this.ChatEnabledCheckbox.Text = "Chat Enabled";
-			this.ChatEnabledCheckbox.UseVisualStyleBackColor = true;
-			// 
-			// ChatStatusTitle
-			// 
-			this.ChatStatusTitle.AutoSize = true;
-			this.ChatStatusTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ChatStatusTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ChatStatusTitle.Location = new System.Drawing.Point(30, 113);
-			this.ChatStatusTitle.Name = "ChatStatusTitle";
-			this.ChatStatusTitle.Size = new System.Drawing.Size(112, 18);
-			this.ChatStatusTitle.TabIndex = 16;
-			this.ChatStatusTitle.Text = "Chat Status:";
-			this.ChatStatusTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// ChatStatusLabel
-			// 
-			this.ChatStatusLabel.AutoSize = true;
-			this.ChatStatusLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ChatStatusLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ChatStatusLabel.Location = new System.Drawing.Point(171, 113);
-			this.ChatStatusLabel.Name = "ChatStatusLabel";
-			this.ChatStatusLabel.Size = new System.Drawing.Size(82, 18);
-			this.ChatStatusLabel.TabIndex = 17;
-			this.ChatStatusLabel.Text = "Unknown";
-			this.ChatStatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// ChatReconnectButton
-			// 
-			this.ChatReconnectButton.Enabled = false;
-			this.ChatReconnectButton.Location = new System.Drawing.Point(174, 141);
-			this.ChatReconnectButton.Name = "ChatReconnectButton";
-			this.ChatReconnectButton.Size = new System.Drawing.Size(112, 25);
-			this.ChatReconnectButton.TabIndex = 18;
-			this.ChatReconnectButton.Text = "Reconnect";
-			this.ChatReconnectButton.UseVisualStyleBackColor = true;
-			this.ChatReconnectButton.Click += new System.EventHandler(this.ChatReconnectButton_Click);
-			// 
-			// AuthField1
-			// 
-			this.AuthField1.Location = new System.Drawing.Point(174, 283);
-			this.AuthField1.Name = "AuthField1";
-			this.AuthField1.Size = new System.Drawing.Size(151, 20);
-			this.AuthField1.TabIndex = 21;
-			// 
-			// AuthField2
-			// 
-			this.AuthField2.Location = new System.Drawing.Point(174, 309);
-			this.AuthField2.Name = "AuthField2";
-			this.AuthField2.Size = new System.Drawing.Size(151, 20);
-			this.AuthField2.TabIndex = 22;
-			// 
-			// AuthField1Title
-			// 
-			this.AuthField1Title.AutoSize = true;
-			this.AuthField1Title.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.AuthField1Title.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.AuthField1Title.Location = new System.Drawing.Point(30, 285);
-			this.AuthField1Title.Name = "AuthField1Title";
-			this.AuthField1Title.Size = new System.Drawing.Size(45, 18);
-			this.AuthField1Title.TabIndex = 23;
-			this.AuthField1Title.Text = "AF1:";
-			this.AuthField1Title.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// AuthField2Title
-			// 
-			this.AuthField2Title.AutoSize = true;
-			this.AuthField2Title.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.AuthField2Title.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.AuthField2Title.Location = new System.Drawing.Point(30, 311);
-			this.AuthField2Title.Name = "AuthField2Title";
-			this.AuthField2Title.Size = new System.Drawing.Size(45, 18);
-			this.AuthField2Title.TabIndex = 24;
-			this.AuthField2Title.Text = "AF2:";
-			this.AuthField2Title.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// ChatApplyButton
-			// 
-			this.ChatApplyButton.Location = new System.Drawing.Point(56, 335);
-			this.ChatApplyButton.Name = "ChatApplyButton";
-			this.ChatApplyButton.Size = new System.Drawing.Size(112, 25);
-			this.ChatApplyButton.TabIndex = 25;
-			this.ChatApplyButton.Text = "Apply";
-			this.ChatApplyButton.UseVisualStyleBackColor = true;
-			this.ChatApplyButton.Click += new System.EventHandler(this.ChatApplyButton_Click);
-			// 
-			// ChatServerTitle
-			// 
-			this.ChatServerTitle.AutoSize = true;
-			this.ChatServerTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ChatServerTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ChatServerTitle.Location = new System.Drawing.Point(30, 201);
-			this.ChatServerTitle.Name = "ChatServerTitle";
-			this.ChatServerTitle.Size = new System.Drawing.Size(66, 18);
-			this.ChatServerTitle.TabIndex = 26;
-			this.ChatServerTitle.Text = "Server:";
-			this.ChatServerTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// ChatServerText
-			// 
-			this.ChatServerText.Location = new System.Drawing.Point(174, 199);
-			this.ChatServerText.Name = "ChatServerText";
-			this.ChatServerText.Size = new System.Drawing.Size(151, 20);
-			this.ChatServerText.TabIndex = 27;
-			// 
-			// ChatPortTitle
-			// 
-			this.ChatPortTitle.AutoSize = true;
-			this.ChatPortTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ChatPortTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ChatPortTitle.Location = new System.Drawing.Point(30, 227);
-			this.ChatPortTitle.Name = "ChatPortTitle";
-			this.ChatPortTitle.Size = new System.Drawing.Size(48, 18);
-			this.ChatPortTitle.TabIndex = 28;
-			this.ChatPortTitle.Text = "Port:";
-			this.ChatPortTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.ChatNicknameTitle.AutoSize = true;
+			this.ChatNicknameTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.ChatNicknameTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ChatNicknameTitle.Location = new System.Drawing.Point(30, 250);
+			this.ChatNicknameTitle.Name = "ChatNicknameTitle";
+			this.ChatNicknameTitle.Size = new System.Drawing.Size(94, 18);
+			this.ChatNicknameTitle.TabIndex = 30;
+			this.ChatNicknameTitle.Text = "Nickname:";
+			this.ChatNicknameTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
 			// ChatPortSelector
 			// 
@@ -501,145 +431,215 @@
             0,
             0});
 			// 
-			// ChatNicknameTitle
+			// ChatPortTitle
 			// 
-			this.ChatNicknameTitle.AutoSize = true;
-			this.ChatNicknameTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ChatNicknameTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ChatNicknameTitle.Location = new System.Drawing.Point(30, 250);
-			this.ChatNicknameTitle.Name = "ChatNicknameTitle";
-			this.ChatNicknameTitle.Size = new System.Drawing.Size(94, 18);
-			this.ChatNicknameTitle.TabIndex = 30;
-			this.ChatNicknameTitle.Text = "Nickname:";
-			this.ChatNicknameTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.ChatPortTitle.AutoSize = true;
+			this.ChatPortTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.ChatPortTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ChatPortTitle.Location = new System.Drawing.Point(30, 227);
+			this.ChatPortTitle.Name = "ChatPortTitle";
+			this.ChatPortTitle.Size = new System.Drawing.Size(48, 18);
+			this.ChatPortTitle.TabIndex = 28;
+			this.ChatPortTitle.Text = "Port:";
+			this.ChatPortTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// ChatNicknameText
+			// ChatServerTitle
 			// 
-			this.ChatNicknameText.Location = new System.Drawing.Point(174, 251);
-			this.ChatNicknameText.Name = "ChatNicknameText";
-			this.ChatNicknameText.Size = new System.Drawing.Size(151, 20);
-			this.ChatNicknameText.TabIndex = 31;
+			this.ChatServerTitle.AutoSize = true;
+			this.ChatServerTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.ChatServerTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ChatServerTitle.Location = new System.Drawing.Point(30, 201);
+			this.ChatServerTitle.Name = "ChatServerTitle";
+			this.ChatServerTitle.Size = new System.Drawing.Size(66, 18);
+			this.ChatServerTitle.TabIndex = 26;
+			this.ChatServerTitle.Text = "Server:";
+			this.ChatServerTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// ChatRefreshButton
+			// ChatApplyButton
 			// 
-			this.ChatRefreshButton.Location = new System.Drawing.Point(174, 335);
-			this.ChatRefreshButton.Name = "ChatRefreshButton";
-			this.ChatRefreshButton.Size = new System.Drawing.Size(112, 25);
-			this.ChatRefreshButton.TabIndex = 32;
-			this.ChatRefreshButton.Text = "Refresh";
-			this.ChatRefreshButton.UseVisualStyleBackColor = true;
-			this.ChatRefreshButton.Click += new System.EventHandler(this.ChatRefreshButton_Click);
+			this.ChatApplyButton.Location = new System.Drawing.Point(56, 335);
+			this.ChatApplyButton.Name = "ChatApplyButton";
+			this.ChatApplyButton.Size = new System.Drawing.Size(112, 25);
+			this.ChatApplyButton.TabIndex = 25;
+			this.ChatApplyButton.Text = "Apply";
+			this.ChatApplyButton.UseVisualStyleBackColor = true;
+			this.ChatApplyButton.Click += new System.EventHandler(this.ChatApplyButton_Click);
 			// 
-			// DevChannelsTextbox
+			// AuthField2Title
 			// 
-			this.DevChannelsTextbox.Location = new System.Drawing.Point(516, 240);
-			this.DevChannelsTextbox.Multiline = true;
-			this.DevChannelsTextbox.Name = "DevChannelsTextbox";
-			this.DevChannelsTextbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-			this.DevChannelsTextbox.Size = new System.Drawing.Size(167, 120);
-			this.DevChannelsTextbox.TabIndex = 34;
+			this.AuthField2Title.AutoSize = true;
+			this.AuthField2Title.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.AuthField2Title.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.AuthField2Title.Location = new System.Drawing.Point(30, 311);
+			this.AuthField2Title.Name = "AuthField2Title";
+			this.AuthField2Title.Size = new System.Drawing.Size(45, 18);
+			this.AuthField2Title.TabIndex = 24;
+			this.AuthField2Title.Text = "AF2:";
+			this.AuthField2Title.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// GameChannelsTextbox
+			// AuthField1Title
 			// 
-			this.GameChannelsTextbox.Location = new System.Drawing.Point(689, 240);
-			this.GameChannelsTextbox.Multiline = true;
-			this.GameChannelsTextbox.Name = "GameChannelsTextbox";
-			this.GameChannelsTextbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-			this.GameChannelsTextbox.Size = new System.Drawing.Size(167, 120);
-			this.GameChannelsTextbox.TabIndex = 35;
+			this.AuthField1Title.AutoSize = true;
+			this.AuthField1Title.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.AuthField1Title.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.AuthField1Title.Location = new System.Drawing.Point(30, 285);
+			this.AuthField1Title.Name = "AuthField1Title";
+			this.AuthField1Title.Size = new System.Drawing.Size(45, 18);
+			this.AuthField1Title.TabIndex = 23;
+			this.AuthField1Title.Text = "AF1:";
+			this.AuthField1Title.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// WDChannelsTextbox
+			// ChatReconnectButton
 			// 
-			this.WDChannelsTextbox.Location = new System.Drawing.Point(516, 82);
-			this.WDChannelsTextbox.Multiline = true;
-			this.WDChannelsTextbox.Name = "WDChannelsTextbox";
-			this.WDChannelsTextbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-			this.WDChannelsTextbox.Size = new System.Drawing.Size(167, 120);
-			this.WDChannelsTextbox.TabIndex = 36;
+			this.ChatReconnectButton.Enabled = false;
+			this.ChatReconnectButton.Location = new System.Drawing.Point(174, 141);
+			this.ChatReconnectButton.Name = "ChatReconnectButton";
+			this.ChatReconnectButton.Size = new System.Drawing.Size(112, 25);
+			this.ChatReconnectButton.TabIndex = 18;
+			this.ChatReconnectButton.Text = "Reconnect";
+			this.ChatReconnectButton.UseVisualStyleBackColor = true;
+			this.ChatReconnectButton.Click += new System.EventHandler(this.ChatReconnectButton_Click);
 			// 
-			// AdminChannelsTextbox
+			// ChatStatusLabel
 			// 
-			this.AdminChannelsTextbox.Location = new System.Drawing.Point(689, 82);
-			this.AdminChannelsTextbox.Multiline = true;
-			this.AdminChannelsTextbox.Name = "AdminChannelsTextbox";
-			this.AdminChannelsTextbox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-			this.AdminChannelsTextbox.Size = new System.Drawing.Size(167, 120);
-			this.AdminChannelsTextbox.TabIndex = 37;
+			this.ChatStatusLabel.AutoSize = true;
+			this.ChatStatusLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.ChatStatusLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ChatStatusLabel.Location = new System.Drawing.Point(171, 113);
+			this.ChatStatusLabel.Name = "ChatStatusLabel";
+			this.ChatStatusLabel.Size = new System.Drawing.Size(82, 18);
+			this.ChatStatusLabel.TabIndex = 17;
+			this.ChatStatusLabel.Text = "Unknown";
+			this.ChatStatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// label1
+			// ChatStatusTitle
 			// 
-			this.label1.AutoSize = true;
-			this.label1.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.label1.Location = new System.Drawing.Point(30, 174);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(110, 18);
-			this.label1.TabIndex = 39;
-			this.label1.Text = "Admin Auth:";
-			this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.ChatStatusTitle.AutoSize = true;
+			this.ChatStatusTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.ChatStatusTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ChatStatusTitle.Location = new System.Drawing.Point(30, 113);
+			this.ChatStatusTitle.Name = "ChatStatusTitle";
+			this.ChatStatusTitle.Size = new System.Drawing.Size(112, 18);
+			this.ChatStatusTitle.TabIndex = 16;
+			this.ChatStatusTitle.Text = "Chat Status:";
+			this.ChatStatusTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// IRCModesComboBox
+			// ChatEnabledCheckbox
 			// 
-			this.IRCModesComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.IRCModesComboBox.FormattingEnabled = true;
-			this.IRCModesComboBox.Items.AddRange(new object[] {
-            "Voice - +",
-            "Halfop - %",
-            "Op - @",
-            "Owner - ~"});
-			this.IRCModesComboBox.Location = new System.Drawing.Point(369, 170);
-			this.IRCModesComboBox.Name = "IRCModesComboBox";
-			this.IRCModesComboBox.Size = new System.Drawing.Size(141, 21);
-			this.IRCModesComboBox.TabIndex = 38;
-			this.IRCModesComboBox.Visible = false;
+			this.ChatEnabledCheckbox.AutoSize = true;
+			this.ChatEnabledCheckbox.Font = new System.Drawing.Font("Verdana", 12F);
+			this.ChatEnabledCheckbox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ChatEnabledCheckbox.Location = new System.Drawing.Point(32, 142);
+			this.ChatEnabledCheckbox.Name = "ChatEnabledCheckbox";
+			this.ChatEnabledCheckbox.Size = new System.Drawing.Size(136, 22);
+			this.ChatEnabledCheckbox.TabIndex = 15;
+			this.ChatEnabledCheckbox.Text = "Chat Enabled";
+			this.ChatEnabledCheckbox.UseVisualStyleBackColor = true;
 			// 
-			// label2
+			// ChatProviderSelectorPanel
 			// 
-			this.label2.AutoSize = true;
-			this.label2.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.label2.Location = new System.Drawing.Point(516, 61);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(153, 18);
-			this.label2.TabIndex = 40;
-			this.label2.Text = "Server Watchdog:";
-			this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.ChatProviderSelectorPanel.Controls.Add(this.DiscordProviderSwitch);
+			this.ChatProviderSelectorPanel.Controls.Add(this.IRCProviderSwitch);
+			this.ChatProviderSelectorPanel.Location = new System.Drawing.Point(23, 49);
+			this.ChatProviderSelectorPanel.Name = "ChatProviderSelectorPanel";
+			this.ChatProviderSelectorPanel.Size = new System.Drawing.Size(302, 50);
+			this.ChatProviderSelectorPanel.TabIndex = 14;
 			// 
-			// label3
+			// DiscordProviderSwitch
 			// 
-			this.label3.AutoSize = true;
-			this.label3.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.label3.Location = new System.Drawing.Point(686, 61);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(135, 18);
-			this.label3.TabIndex = 41;
-			this.label3.Text = "Administration:";
-			this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.DiscordProviderSwitch.AutoSize = true;
+			this.DiscordProviderSwitch.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.DiscordProviderSwitch.Location = new System.Drawing.Point(220, 17);
+			this.DiscordProviderSwitch.Name = "DiscordProviderSwitch";
+			this.DiscordProviderSwitch.Size = new System.Drawing.Size(61, 17);
+			this.DiscordProviderSwitch.TabIndex = 13;
+			this.DiscordProviderSwitch.TabStop = true;
+			this.DiscordProviderSwitch.Text = "Discord";
+			this.DiscordProviderSwitch.UseVisualStyleBackColor = true;
+			this.DiscordProviderSwitch.CheckedChanged += new System.EventHandler(this.DiscordProviderSwitch_CheckedChanged);
 			// 
-			// label4
+			// IRCProviderSwitch
 			// 
-			this.label4.AutoSize = true;
-			this.label4.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.label4.Location = new System.Drawing.Point(516, 219);
-			this.label4.Name = "label4";
-			this.label4.Size = new System.Drawing.Size(136, 18);
-			this.label4.TabIndex = 42;
-			this.label4.Text = "Developer Info:";
-			this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.IRCProviderSwitch.AutoSize = true;
+			this.IRCProviderSwitch.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.IRCProviderSwitch.Location = new System.Drawing.Point(14, 17);
+			this.IRCProviderSwitch.Name = "IRCProviderSwitch";
+			this.IRCProviderSwitch.Size = new System.Drawing.Size(116, 17);
+			this.IRCProviderSwitch.TabIndex = 12;
+			this.IRCProviderSwitch.TabStop = true;
+			this.IRCProviderSwitch.Text = "Internet Relay Chat";
+			this.IRCProviderSwitch.UseVisualStyleBackColor = true;
+			this.IRCProviderSwitch.CheckedChanged += new System.EventHandler(this.IRCProviderSwitch_CheckedChanged);
 			// 
-			// label5
+			// ChatProviderTitle
 			// 
-			this.label5.AutoSize = true;
-			this.label5.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.label5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.label5.Location = new System.Drawing.Point(686, 219);
-			this.label5.Name = "label5";
-			this.label5.Size = new System.Drawing.Size(148, 18);
-			this.label5.TabIndex = 43;
-			this.label5.Text = "Game Messages:";
-			this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.ChatProviderTitle.AutoSize = true;
+			this.ChatProviderTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.ChatProviderTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ChatProviderTitle.Location = new System.Drawing.Point(20, 15);
+			this.ChatProviderTitle.Name = "ChatProviderTitle";
+			this.ChatProviderTitle.Size = new System.Drawing.Size(144, 18);
+			this.ChatProviderTitle.TabIndex = 13;
+			this.ChatProviderTitle.Text = "Editing Provider:";
+			this.ChatProviderTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// ChannelsTitle
+			// 
+			this.ChannelsTitle.AutoSize = true;
+			this.ChannelsTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.ChannelsTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ChannelsTitle.Location = new System.Drawing.Point(565, 15);
+			this.ChannelsTitle.Name = "ChannelsTitle";
+			this.ChannelsTitle.Size = new System.Drawing.Size(234, 18);
+			this.ChannelsTitle.TabIndex = 11;
+			this.ChannelsTitle.Text = "Listen/Broadcast Channels:";
+			this.ChannelsTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// ChatAdminsTitle
+			// 
+			this.ChatAdminsTitle.AutoSize = true;
+			this.ChatAdminsTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.ChatAdminsTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ChatAdminsTitle.Location = new System.Drawing.Point(366, 15);
+			this.ChatAdminsTitle.Name = "ChatAdminsTitle";
+			this.ChatAdminsTitle.Size = new System.Drawing.Size(75, 18);
+			this.ChatAdminsTitle.TabIndex = 9;
+			this.ChatAdminsTitle.Text = "Admins:";
+			this.ChatAdminsTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// panel1
+			// 
+			this.panel1.Controls.Add(this.AdminModeSpecial);
+			this.panel1.Controls.Add(this.AdminModeNormal);
+			this.panel1.Location = new System.Drawing.Point(174, 168);
+			this.panel1.Name = "panel1";
+			this.panel1.Size = new System.Drawing.Size(202, 25);
+			this.panel1.TabIndex = 15;
+			// 
+			// AdminModeSpecial
+			// 
+			this.AdminModeSpecial.AutoSize = true;
+			this.AdminModeSpecial.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.AdminModeSpecial.Location = new System.Drawing.Point(87, 8);
+			this.AdminModeSpecial.Name = "AdminModeSpecial";
+			this.AdminModeSpecial.Size = new System.Drawing.Size(94, 17);
+			this.AdminModeSpecial.TabIndex = 13;
+			this.AdminModeSpecial.TabStop = true;
+			this.AdminModeSpecial.Text = "Channel Mode";
+			this.AdminModeSpecial.UseVisualStyleBackColor = true;
+			// 
+			// AdminModeNormal
+			// 
+			this.AdminModeNormal.AutoSize = true;
+			this.AdminModeNormal.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.AdminModeNormal.Location = new System.Drawing.Point(3, 8);
+			this.AdminModeNormal.Name = "AdminModeNormal";
+			this.AdminModeNormal.Size = new System.Drawing.Size(78, 17);
+			this.AdminModeNormal.TabIndex = 12;
+			this.AdminModeNormal.TabStop = true;
+			this.AdminModeNormal.Text = "Nicknames";
+			this.AdminModeNormal.UseVisualStyleBackColor = true;
+			this.AdminModeNormal.CheckedChanged += new System.EventHandler(this.AdminModeNormal_CheckedChanged);
 			// 
 			// ServerPanel
 			// 
@@ -650,7 +650,7 @@
 			this.ServerPanel.Controls.Add(this.WorldAnnounceField);
 			this.ServerPanel.Controls.Add(this.ServerPathTextbox);
 			this.ServerPanel.Controls.Add(this.projectNameText);
-			this.ServerPanel.Controls.Add(this.VisibilityTitle);
+			this.ServerPanel.Controls.Add(this.WorldAnnounceLabel);
 			this.ServerPanel.Controls.Add(this.SecuritySelector);
 			this.ServerPanel.Controls.Add(this.SecurityTitle);
 			this.ServerPanel.Controls.Add(this.ResetTestmerge);
@@ -684,217 +684,168 @@
 			this.ServerPanel.TabIndex = 2;
 			this.ServerPanel.Text = "Server";
 			// 
-			// ServerStatusTitle
+			// AutostartCheckbox
 			// 
-			this.ServerStatusTitle.AutoSize = true;
-			this.ServerStatusTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ServerStatusTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ServerStatusTitle.Location = new System.Drawing.Point(15, 17);
-			this.ServerStatusTitle.Name = "ServerStatusTitle";
-			this.ServerStatusTitle.Size = new System.Drawing.Size(125, 18);
-			this.ServerStatusTitle.TabIndex = 8;
-			this.ServerStatusTitle.Text = "Server Status:";
-			this.ServerStatusTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.AutostartCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.AutostartCheckbox.AutoSize = true;
+			this.AutostartCheckbox.Font = new System.Drawing.Font("Verdana", 12F);
+			this.AutostartCheckbox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.AutostartCheckbox.Location = new System.Drawing.Point(754, 16);
+			this.AutostartCheckbox.Name = "AutostartCheckbox";
+			this.AutostartCheckbox.Size = new System.Drawing.Size(104, 22);
+			this.AutostartCheckbox.TabIndex = 15;
+			this.AutostartCheckbox.Text = "Autostart";
+			this.AutostartCheckbox.UseVisualStyleBackColor = true;
+			this.AutostartCheckbox.CheckedChanged += new System.EventHandler(this.AutostartCheckbox_CheckedChanged);
 			// 
-			// ServerStatusLabel
+			// WebclientCheckBox
 			// 
-			this.ServerStatusLabel.AutoSize = true;
-			this.ServerStatusLabel.Font = new System.Drawing.Font("Verdana", 10F);
-			this.ServerStatusLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ServerStatusLabel.Location = new System.Drawing.Point(136, 19);
-			this.ServerStatusLabel.Name = "ServerStatusLabel";
-			this.ServerStatusLabel.Size = new System.Drawing.Size(73, 17);
-			this.ServerStatusLabel.TabIndex = 9;
-			this.ServerStatusLabel.Text = "Unknown";
-			this.ServerStatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.WebclientCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.WebclientCheckBox.AutoSize = true;
+			this.WebclientCheckBox.Font = new System.Drawing.Font("Verdana", 12F);
+			this.WebclientCheckBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.WebclientCheckBox.Location = new System.Drawing.Point(754, 57);
+			this.WebclientCheckBox.Name = "WebclientCheckBox";
+			this.WebclientCheckBox.Size = new System.Drawing.Size(108, 22);
+			this.WebclientCheckBox.TabIndex = 42;
+			this.WebclientCheckBox.Text = "Webclient";
+			this.WebclientCheckBox.UseVisualStyleBackColor = true;
+			this.WebclientCheckBox.CheckedChanged += new System.EventHandler(this.WebclientCheckBox_CheckedChanged);
 			// 
-			// compilerProgressBar
+			// WorldAnnounceButton
 			// 
-			this.compilerProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.compilerProgressBar.Location = new System.Drawing.Point(110, 302);
-			this.compilerProgressBar.MarqueeAnimationSpeed = 50;
-			this.compilerProgressBar.Name = "compilerProgressBar";
-			this.compilerProgressBar.Size = new System.Drawing.Size(618, 31);
-			this.compilerProgressBar.TabIndex = 10;
+			this.WorldAnnounceButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.WorldAnnounceButton.Location = new System.Drawing.Point(785, 136);
+			this.WorldAnnounceButton.Name = "WorldAnnounceButton";
+			this.WorldAnnounceButton.Size = new System.Drawing.Size(77, 20);
+			this.WorldAnnounceButton.TabIndex = 41;
+			this.WorldAnnounceButton.Text = "Send";
+			this.WorldAnnounceButton.UseVisualStyleBackColor = true;
+			this.WorldAnnounceButton.Click += new System.EventHandler(this.WorldAnnounceButton_Click);
 			// 
-			// initializeButton
+			// WorldAnnounceField
 			// 
-			this.initializeButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
-			this.initializeButton.Enabled = false;
-			this.initializeButton.Location = new System.Drawing.Point(219, 240);
-			this.initializeButton.Name = "initializeButton";
-			this.initializeButton.Size = new System.Drawing.Size(159, 28);
-			this.initializeButton.TabIndex = 11;
-			this.initializeButton.Text = "Initialize Game Folders";
-			this.initializeButton.UseVisualStyleBackColor = true;
-			this.initializeButton.Click += new System.EventHandler(this.InitializeButton_Click);
+			this.WorldAnnounceField.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.WorldAnnounceField.Location = new System.Drawing.Point(566, 136);
+			this.WorldAnnounceField.Name = "WorldAnnounceField";
+			this.WorldAnnounceField.Size = new System.Drawing.Size(213, 20);
+			this.WorldAnnounceField.TabIndex = 40;
 			// 
-			// compileButton
+			// ServerPathTextbox
 			// 
-			this.compileButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
-			this.compileButton.Enabled = false;
-			this.compileButton.Location = new System.Drawing.Point(456, 240);
-			this.compileButton.Name = "compileButton";
-			this.compileButton.Size = new System.Drawing.Size(159, 28);
-			this.compileButton.TabIndex = 12;
-			this.compileButton.Text = "Copy from Repo and Compile";
-			this.compileButton.UseVisualStyleBackColor = true;
-			this.compileButton.Click += new System.EventHandler(this.CompileButton_Click);
+			this.ServerPathTextbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.ServerPathTextbox.Location = new System.Drawing.Point(136, 163);
+			this.ServerPathTextbox.Name = "ServerPathTextbox";
+			this.ServerPathTextbox.Size = new System.Drawing.Size(296, 20);
+			this.ServerPathTextbox.TabIndex = 32;
 			// 
-			// CompilerLabel
+			// projectNameText
 			// 
-			this.CompilerLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.CompilerLabel.AutoSize = true;
-			this.CompilerLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.CompilerLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.CompilerLabel.Location = new System.Drawing.Point(379, 203);
-			this.CompilerLabel.Name = "CompilerLabel";
-			this.CompilerLabel.Size = new System.Drawing.Size(80, 18);
-			this.CompilerLabel.TabIndex = 13;
-			this.CompilerLabel.Text = "Compiler";
-			this.CompilerLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.projectNameText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.projectNameText.Location = new System.Drawing.Point(566, 163);
+			this.projectNameText.Name = "projectNameText";
+			this.projectNameText.Size = new System.Drawing.Size(296, 20);
+			this.projectNameText.TabIndex = 29;
 			// 
-			// CompilerStatusLabel
+			// WorldAnnounceLabel
 			// 
-			this.CompilerStatusLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.CompilerStatusLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.CompilerStatusLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.CompilerStatusLabel.Location = new System.Drawing.Point(110, 271);
-			this.CompilerStatusLabel.Name = "CompilerStatusLabel";
-			this.CompilerStatusLabel.Size = new System.Drawing.Size(618, 28);
-			this.CompilerStatusLabel.TabIndex = 14;
-			this.CompilerStatusLabel.Text = "Idle";
-			this.CompilerStatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.WorldAnnounceLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.WorldAnnounceLabel.AutoSize = true;
+			this.WorldAnnounceLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.WorldAnnounceLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.WorldAnnounceLabel.Location = new System.Drawing.Point(466, 139);
+			this.WorldAnnounceLabel.Name = "WorldAnnounceLabel";
+			this.WorldAnnounceLabel.Size = new System.Drawing.Size(94, 18);
+			this.WorldAnnounceLabel.TabIndex = 39;
+			this.WorldAnnounceLabel.Text = "Announce:";
+			this.WorldAnnounceLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// ServerStartButton
+			// SecuritySelector
 			// 
-			this.ServerStartButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
-			this.ServerStartButton.Location = new System.Drawing.Point(130, 54);
-			this.ServerStartButton.Name = "ServerStartButton";
-			this.ServerStartButton.Size = new System.Drawing.Size(118, 28);
-			this.ServerStartButton.TabIndex = 16;
-			this.ServerStartButton.Text = "Start";
-			this.ServerStartButton.UseVisualStyleBackColor = true;
-			this.ServerStartButton.Click += new System.EventHandler(this.ServerStartButton_Click);
+			this.SecuritySelector.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+			this.SecuritySelector.FormattingEnabled = true;
+			this.SecuritySelector.Items.AddRange(new object[] {
+            "Trusted",
+            "Safe",
+            "Ultrasafe"});
+			this.SecuritySelector.Location = new System.Drawing.Point(136, 136);
+			this.SecuritySelector.Name = "SecuritySelector";
+			this.SecuritySelector.Size = new System.Drawing.Size(121, 21);
+			this.SecuritySelector.TabIndex = 38;
+			this.SecuritySelector.SelectedIndexChanged += new System.EventHandler(this.SecuritySelector_SelectedIndexChanged);
 			// 
-			// ServerStopButton
+			// SecurityTitle
 			// 
-			this.ServerStopButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
-			this.ServerStopButton.Location = new System.Drawing.Point(254, 54);
-			this.ServerStopButton.Name = "ServerStopButton";
-			this.ServerStopButton.Size = new System.Drawing.Size(118, 28);
-			this.ServerStopButton.TabIndex = 17;
-			this.ServerStopButton.Text = "Stop";
-			this.ServerStopButton.UseVisualStyleBackColor = true;
-			this.ServerStopButton.Click += new System.EventHandler(this.ServerStopButton_Click);
+			this.SecurityTitle.AutoSize = true;
+			this.SecurityTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.SecurityTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.SecurityTitle.Location = new System.Drawing.Point(44, 139);
+			this.SecurityTitle.Name = "SecurityTitle";
+			this.SecurityTitle.Size = new System.Drawing.Size(80, 18);
+			this.SecurityTitle.TabIndex = 37;
+			this.SecurityTitle.Text = "Security:";
+			this.SecurityTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// ServerRestartButton
+			// ResetTestmerge
 			// 
-			this.ServerRestartButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
-			this.ServerRestartButton.Location = new System.Drawing.Point(378, 54);
-			this.ServerRestartButton.Name = "ServerRestartButton";
-			this.ServerRestartButton.Size = new System.Drawing.Size(118, 28);
-			this.ServerRestartButton.TabIndex = 18;
-			this.ServerRestartButton.Text = "Restart";
-			this.ServerRestartButton.UseVisualStyleBackColor = true;
-			this.ServerRestartButton.Click += new System.EventHandler(this.ServerRestartButton_Click);
+			this.ResetTestmerge.Anchor = System.Windows.Forms.AnchorStyles.Top;
+			this.ResetTestmerge.Location = new System.Drawing.Point(602, 95);
+			this.ResetTestmerge.Name = "ResetTestmerge";
+			this.ResetTestmerge.Size = new System.Drawing.Size(142, 28);
+			this.ResetTestmerge.TabIndex = 36;
+			this.ResetTestmerge.Text = "Reset and Recompile";
+			this.ResetTestmerge.UseVisualStyleBackColor = true;
+			this.ResetTestmerge.Click += new System.EventHandler(this.ResetTestmerge_Click);
 			// 
-			// ServerGStopButton
+			// ServerPathLabel
 			// 
-			this.ServerGStopButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
-			this.ServerGStopButton.Appearance = System.Windows.Forms.Appearance.Button;
-			this.ServerGStopButton.Location = new System.Drawing.Point(502, 54);
-			this.ServerGStopButton.Name = "ServerGStopButton";
-			this.ServerGStopButton.Size = new System.Drawing.Size(118, 28);
-			this.ServerGStopButton.TabIndex = 19;
-			this.ServerGStopButton.Text = "Graceful Stop";
-			this.ServerGStopButton.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			this.ServerGStopButton.UseVisualStyleBackColor = true;
-			this.ServerGStopButton.CheckedChanged += new System.EventHandler(this.ServerGStopButton_Checked);
+			this.ServerPathLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.ServerPathLabel.AutoSize = true;
+			this.ServerPathLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.ServerPathLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ServerPathLabel.Location = new System.Drawing.Point(15, 165);
+			this.ServerPathLabel.Name = "ServerPathLabel";
+			this.ServerPathLabel.Size = new System.Drawing.Size(109, 18);
+			this.ServerPathLabel.TabIndex = 33;
+			this.ServerPathLabel.Text = "Server Path:";
+			this.ServerPathLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// ServerGRestartButton
+			// CompileCancelButton
 			// 
-			this.ServerGRestartButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
-			this.ServerGRestartButton.Location = new System.Drawing.Point(626, 54);
-			this.ServerGRestartButton.Name = "ServerGRestartButton";
-			this.ServerGRestartButton.Size = new System.Drawing.Size(118, 28);
-			this.ServerGRestartButton.TabIndex = 20;
-			this.ServerGRestartButton.Text = "Graceful Restart";
-			this.ServerGRestartButton.UseVisualStyleBackColor = true;
-			this.ServerGRestartButton.Click += new System.EventHandler(this.ServerGRestartButton_Click);
+			this.CompileCancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.CompileCancelButton.Enabled = false;
+			this.CompileCancelButton.Location = new System.Drawing.Point(737, 302);
+			this.CompileCancelButton.Name = "CompileCancelButton";
+			this.CompileCancelButton.Size = new System.Drawing.Size(69, 31);
+			this.CompileCancelButton.TabIndex = 31;
+			this.CompileCancelButton.Text = "Cancel";
+			this.CompileCancelButton.UseVisualStyleBackColor = true;
+			this.CompileCancelButton.Click += new System.EventHandler(this.CompileCancelButton_Click);
 			// 
-			// UpdateHardButton
+			// ProjectPathLabel
 			// 
-			this.UpdateHardButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
-			this.UpdateHardButton.Location = new System.Drawing.Point(7, 95);
-			this.UpdateHardButton.Name = "UpdateHardButton";
-			this.UpdateHardButton.Size = new System.Drawing.Size(145, 28);
-			this.UpdateHardButton.TabIndex = 21;
-			this.UpdateHardButton.Text = "Update (Reset Testmerge)";
-			this.UpdateHardButton.UseVisualStyleBackColor = true;
-			this.UpdateHardButton.Click += new System.EventHandler(this.UpdateHardButton_Click);
+			this.ProjectPathLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.ProjectPathLabel.AutoSize = true;
+			this.ProjectPathLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.ProjectPathLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ProjectPathLabel.Location = new System.Drawing.Point(445, 165);
+			this.ProjectPathLabel.Name = "ProjectPathLabel";
+			this.ProjectPathLabel.Size = new System.Drawing.Size(115, 18);
+			this.ProjectPathLabel.TabIndex = 30;
+			this.ProjectPathLabel.Text = "Project Path:";
+			this.ProjectPathLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// UpdateMergeButton
+			// PortLabel
 			// 
-			this.UpdateMergeButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
-			this.UpdateMergeButton.Location = new System.Drawing.Point(158, 95);
-			this.UpdateMergeButton.Name = "UpdateMergeButton";
-			this.UpdateMergeButton.Size = new System.Drawing.Size(142, 28);
-			this.UpdateMergeButton.TabIndex = 22;
-			this.UpdateMergeButton.Text = "Update (KeepTestmerge)";
-			this.UpdateMergeButton.UseVisualStyleBackColor = true;
-			this.UpdateMergeButton.Click += new System.EventHandler(this.UpdateMergeButton_Click);
-			// 
-			// UpdateTestmergeButton
-			// 
-			this.UpdateTestmergeButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
-			this.UpdateTestmergeButton.Location = new System.Drawing.Point(306, 95);
-			this.UpdateTestmergeButton.Name = "UpdateTestmergeButton";
-			this.UpdateTestmergeButton.Size = new System.Drawing.Size(142, 28);
-			this.UpdateTestmergeButton.TabIndex = 23;
-			this.UpdateTestmergeButton.Text = "Update and Testmerge";
-			this.UpdateTestmergeButton.UseVisualStyleBackColor = true;
-			this.UpdateTestmergeButton.Click += new System.EventHandler(this.UpdateTestmergeButton_Click);
-			// 
-			// TestmergeButton
-			// 
-			this.TestmergeButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
-			this.TestmergeButton.Location = new System.Drawing.Point(454, 95);
-			this.TestmergeButton.Name = "TestmergeButton";
-			this.TestmergeButton.Size = new System.Drawing.Size(142, 28);
-			this.TestmergeButton.TabIndex = 24;
-			this.TestmergeButton.Text = "Testmerge";
-			this.TestmergeButton.UseVisualStyleBackColor = true;
-			this.TestmergeButton.Click += new System.EventHandler(this.TestmergeButton_Click);
-			// 
-			// ServerTestmergeInput
-			// 
-			this.ServerTestmergeInput.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.ServerTestmergeInput.Location = new System.Drawing.Point(806, 99);
-			this.ServerTestmergeInput.Maximum = new decimal(new int[] {
-            1000000,
-            0,
-            0,
-            0});
-			this.ServerTestmergeInput.Name = "ServerTestmergeInput";
-			this.ServerTestmergeInput.Size = new System.Drawing.Size(62, 20);
-			this.ServerTestmergeInput.TabIndex = 25;
-			// 
-			// ServerPRLabel
-			// 
-			this.ServerPRLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.ServerPRLabel.AutoSize = true;
-			this.ServerPRLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ServerPRLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ServerPRLabel.Location = new System.Drawing.Point(745, 101);
-			this.ServerPRLabel.Name = "ServerPRLabel";
-			this.ServerPRLabel.Size = new System.Drawing.Size(49, 18);
-			this.ServerPRLabel.TabIndex = 26;
-			this.ServerPRLabel.Text = "PR#:";
-			this.ServerPRLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.PortLabel.AutoSize = true;
+			this.PortLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.PortLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.PortLabel.Location = new System.Drawing.Point(4, 60);
+			this.PortLabel.Name = "PortLabel";
+			this.PortLabel.Size = new System.Drawing.Size(48, 18);
+			this.PortLabel.TabIndex = 28;
+			this.PortLabel.Text = "Port:";
+			this.PortLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
 			// PortSelector
 			// 
@@ -919,168 +870,217 @@
             0});
 			this.PortSelector.ValueChanged += new System.EventHandler(this.PortSelector_ValueChanged);
 			// 
-			// PortLabel
+			// ServerPRLabel
 			// 
-			this.PortLabel.AutoSize = true;
-			this.PortLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.PortLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.PortLabel.Location = new System.Drawing.Point(4, 60);
-			this.PortLabel.Name = "PortLabel";
-			this.PortLabel.Size = new System.Drawing.Size(48, 18);
-			this.PortLabel.TabIndex = 28;
-			this.PortLabel.Text = "Port:";
-			this.PortLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.ServerPRLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.ServerPRLabel.AutoSize = true;
+			this.ServerPRLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.ServerPRLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ServerPRLabel.Location = new System.Drawing.Point(745, 101);
+			this.ServerPRLabel.Name = "ServerPRLabel";
+			this.ServerPRLabel.Size = new System.Drawing.Size(49, 18);
+			this.ServerPRLabel.TabIndex = 26;
+			this.ServerPRLabel.Text = "PR#:";
+			this.ServerPRLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// projectNameText
+			// ServerTestmergeInput
 			// 
-			this.projectNameText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.projectNameText.Location = new System.Drawing.Point(566, 163);
-			this.projectNameText.Name = "projectNameText";
-			this.projectNameText.Size = new System.Drawing.Size(296, 20);
-			this.projectNameText.TabIndex = 29;
+			this.ServerTestmergeInput.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.ServerTestmergeInput.Location = new System.Drawing.Point(806, 99);
+			this.ServerTestmergeInput.Maximum = new decimal(new int[] {
+            1000000,
+            0,
+            0,
+            0});
+			this.ServerTestmergeInput.Name = "ServerTestmergeInput";
+			this.ServerTestmergeInput.Size = new System.Drawing.Size(62, 20);
+			this.ServerTestmergeInput.TabIndex = 25;
 			// 
-			// ProjectPathLabel
+			// TestmergeButton
 			// 
-			this.ProjectPathLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.ProjectPathLabel.AutoSize = true;
-			this.ProjectPathLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ProjectPathLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ProjectPathLabel.Location = new System.Drawing.Point(445, 165);
-			this.ProjectPathLabel.Name = "ProjectPathLabel";
-			this.ProjectPathLabel.Size = new System.Drawing.Size(115, 18);
-			this.ProjectPathLabel.TabIndex = 30;
-			this.ProjectPathLabel.Text = "Project Path:";
-			this.ProjectPathLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.TestmergeButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
+			this.TestmergeButton.Location = new System.Drawing.Point(454, 95);
+			this.TestmergeButton.Name = "TestmergeButton";
+			this.TestmergeButton.Size = new System.Drawing.Size(142, 28);
+			this.TestmergeButton.TabIndex = 24;
+			this.TestmergeButton.Text = "Testmerge";
+			this.TestmergeButton.UseVisualStyleBackColor = true;
+			this.TestmergeButton.Click += new System.EventHandler(this.TestmergeButton_Click);
 			// 
-			// CompileCancelButton
+			// UpdateTestmergeButton
 			// 
-			this.CompileCancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.CompileCancelButton.Enabled = false;
-			this.CompileCancelButton.Location = new System.Drawing.Point(737, 302);
-			this.CompileCancelButton.Name = "CompileCancelButton";
-			this.CompileCancelButton.Size = new System.Drawing.Size(69, 31);
-			this.CompileCancelButton.TabIndex = 31;
-			this.CompileCancelButton.Text = "Cancel";
-			this.CompileCancelButton.UseVisualStyleBackColor = true;
-			this.CompileCancelButton.Click += new System.EventHandler(this.CompileCancelButton_Click);
+			this.UpdateTestmergeButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
+			this.UpdateTestmergeButton.Location = new System.Drawing.Point(306, 95);
+			this.UpdateTestmergeButton.Name = "UpdateTestmergeButton";
+			this.UpdateTestmergeButton.Size = new System.Drawing.Size(142, 28);
+			this.UpdateTestmergeButton.TabIndex = 23;
+			this.UpdateTestmergeButton.Text = "Update and Testmerge";
+			this.UpdateTestmergeButton.UseVisualStyleBackColor = true;
+			this.UpdateTestmergeButton.Click += new System.EventHandler(this.UpdateTestmergeButton_Click);
 			// 
-			// ServerPathTextbox
+			// UpdateMergeButton
 			// 
-			this.ServerPathTextbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.ServerPathTextbox.Location = new System.Drawing.Point(136, 163);
-			this.ServerPathTextbox.Name = "ServerPathTextbox";
-			this.ServerPathTextbox.Size = new System.Drawing.Size(296, 20);
-			this.ServerPathTextbox.TabIndex = 32;
+			this.UpdateMergeButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
+			this.UpdateMergeButton.Location = new System.Drawing.Point(158, 95);
+			this.UpdateMergeButton.Name = "UpdateMergeButton";
+			this.UpdateMergeButton.Size = new System.Drawing.Size(142, 28);
+			this.UpdateMergeButton.TabIndex = 22;
+			this.UpdateMergeButton.Text = "Update (KeepTestmerge)";
+			this.UpdateMergeButton.UseVisualStyleBackColor = true;
+			this.UpdateMergeButton.Click += new System.EventHandler(this.UpdateMergeButton_Click);
 			// 
-			// ServerPathLabel
+			// UpdateHardButton
 			// 
-			this.ServerPathLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.ServerPathLabel.AutoSize = true;
-			this.ServerPathLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.ServerPathLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.ServerPathLabel.Location = new System.Drawing.Point(15, 165);
-			this.ServerPathLabel.Name = "ServerPathLabel";
-			this.ServerPathLabel.Size = new System.Drawing.Size(109, 18);
-			this.ServerPathLabel.TabIndex = 33;
-			this.ServerPathLabel.Text = "Server Path:";
-			this.ServerPathLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.UpdateHardButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
+			this.UpdateHardButton.Location = new System.Drawing.Point(7, 95);
+			this.UpdateHardButton.Name = "UpdateHardButton";
+			this.UpdateHardButton.Size = new System.Drawing.Size(145, 28);
+			this.UpdateHardButton.TabIndex = 21;
+			this.UpdateHardButton.Text = "Update (Reset Testmerge)";
+			this.UpdateHardButton.UseVisualStyleBackColor = true;
+			this.UpdateHardButton.Click += new System.EventHandler(this.UpdateHardButton_Click);
 			// 
-			// ResetTestmerge
+			// ServerGRestartButton
 			// 
-			this.ResetTestmerge.Anchor = System.Windows.Forms.AnchorStyles.Top;
-			this.ResetTestmerge.Location = new System.Drawing.Point(602, 95);
-			this.ResetTestmerge.Name = "ResetTestmerge";
-			this.ResetTestmerge.Size = new System.Drawing.Size(142, 28);
-			this.ResetTestmerge.TabIndex = 36;
-			this.ResetTestmerge.Text = "Reset and Recompile";
-			this.ResetTestmerge.UseVisualStyleBackColor = true;
-			this.ResetTestmerge.Click += new System.EventHandler(this.ResetTestmerge_Click);
+			this.ServerGRestartButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
+			this.ServerGRestartButton.Location = new System.Drawing.Point(626, 54);
+			this.ServerGRestartButton.Name = "ServerGRestartButton";
+			this.ServerGRestartButton.Size = new System.Drawing.Size(118, 28);
+			this.ServerGRestartButton.TabIndex = 20;
+			this.ServerGRestartButton.Text = "Graceful Restart";
+			this.ServerGRestartButton.UseVisualStyleBackColor = true;
+			this.ServerGRestartButton.Click += new System.EventHandler(this.ServerGRestartButton_Click);
 			// 
-			// SecurityTitle
+			// ServerGStopButton
 			// 
-			this.SecurityTitle.AutoSize = true;
-			this.SecurityTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.SecurityTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.SecurityTitle.Location = new System.Drawing.Point(44, 139);
-			this.SecurityTitle.Name = "SecurityTitle";
-			this.SecurityTitle.Size = new System.Drawing.Size(80, 18);
-			this.SecurityTitle.TabIndex = 37;
-			this.SecurityTitle.Text = "Security:";
-			this.SecurityTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.ServerGStopButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
+			this.ServerGStopButton.Appearance = System.Windows.Forms.Appearance.Button;
+			this.ServerGStopButton.Location = new System.Drawing.Point(502, 54);
+			this.ServerGStopButton.Name = "ServerGStopButton";
+			this.ServerGStopButton.Size = new System.Drawing.Size(118, 28);
+			this.ServerGStopButton.TabIndex = 19;
+			this.ServerGStopButton.Text = "Graceful Stop";
+			this.ServerGStopButton.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.ServerGStopButton.UseVisualStyleBackColor = true;
+			this.ServerGStopButton.CheckedChanged += new System.EventHandler(this.ServerGStopButton_Checked);
 			// 
-			// SecuritySelector
+			// ServerRestartButton
 			// 
-			this.SecuritySelector.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-			this.SecuritySelector.FormattingEnabled = true;
-			this.SecuritySelector.Items.AddRange(new object[] {
-            "Trusted",
-            "Safe",
-            "Ultrasafe"});
-			this.SecuritySelector.Location = new System.Drawing.Point(136, 136);
-			this.SecuritySelector.Name = "SecuritySelector";
-			this.SecuritySelector.Size = new System.Drawing.Size(121, 21);
-			this.SecuritySelector.TabIndex = 38;
-			this.SecuritySelector.SelectedIndexChanged += new System.EventHandler(this.SecuritySelector_SelectedIndexChanged);
+			this.ServerRestartButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
+			this.ServerRestartButton.Location = new System.Drawing.Point(378, 54);
+			this.ServerRestartButton.Name = "ServerRestartButton";
+			this.ServerRestartButton.Size = new System.Drawing.Size(118, 28);
+			this.ServerRestartButton.TabIndex = 18;
+			this.ServerRestartButton.Text = "Restart";
+			this.ServerRestartButton.UseVisualStyleBackColor = true;
+			this.ServerRestartButton.Click += new System.EventHandler(this.ServerRestartButton_Click);
 			// 
-			// VisibilityTitle
+			// ServerStopButton
 			// 
-			this.VisibilityTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.VisibilityTitle.AutoSize = true;
-			this.VisibilityTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.VisibilityTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.VisibilityTitle.Location = new System.Drawing.Point(466, 139);
-			this.VisibilityTitle.Name = "VisibilityTitle";
-			this.VisibilityTitle.Size = new System.Drawing.Size(94, 18);
-			this.VisibilityTitle.TabIndex = 39;
-			this.VisibilityTitle.Text = "Announce:";
-			this.VisibilityTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.ServerStopButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
+			this.ServerStopButton.Location = new System.Drawing.Point(254, 54);
+			this.ServerStopButton.Name = "ServerStopButton";
+			this.ServerStopButton.Size = new System.Drawing.Size(118, 28);
+			this.ServerStopButton.TabIndex = 17;
+			this.ServerStopButton.Text = "Stop";
+			this.ServerStopButton.UseVisualStyleBackColor = true;
+			this.ServerStopButton.Click += new System.EventHandler(this.ServerStopButton_Click);
 			// 
-			// WorldAnnounceField
+			// ServerStartButton
 			// 
-			this.WorldAnnounceField.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.WorldAnnounceField.Location = new System.Drawing.Point(566, 136);
-			this.WorldAnnounceField.Name = "WorldAnnounceField";
-			this.WorldAnnounceField.Size = new System.Drawing.Size(213, 20);
-			this.WorldAnnounceField.TabIndex = 40;
+			this.ServerStartButton.Anchor = System.Windows.Forms.AnchorStyles.Top;
+			this.ServerStartButton.Location = new System.Drawing.Point(130, 54);
+			this.ServerStartButton.Name = "ServerStartButton";
+			this.ServerStartButton.Size = new System.Drawing.Size(118, 28);
+			this.ServerStartButton.TabIndex = 16;
+			this.ServerStartButton.Text = "Start";
+			this.ServerStartButton.UseVisualStyleBackColor = true;
+			this.ServerStartButton.Click += new System.EventHandler(this.ServerStartButton_Click);
 			// 
-			// WorldAnnounceButton
+			// CompilerStatusLabel
 			// 
-			this.WorldAnnounceButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.WorldAnnounceButton.Location = new System.Drawing.Point(785, 136);
-			this.WorldAnnounceButton.Name = "WorldAnnounceButton";
-			this.WorldAnnounceButton.Size = new System.Drawing.Size(77, 20);
-			this.WorldAnnounceButton.TabIndex = 41;
-			this.WorldAnnounceButton.Text = "Send";
-			this.WorldAnnounceButton.UseVisualStyleBackColor = true;
-			this.WorldAnnounceButton.Click += new System.EventHandler(this.WorldAnnounceButton_Click);
+			this.CompilerStatusLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.CompilerStatusLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.CompilerStatusLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.CompilerStatusLabel.Location = new System.Drawing.Point(110, 271);
+			this.CompilerStatusLabel.Name = "CompilerStatusLabel";
+			this.CompilerStatusLabel.Size = new System.Drawing.Size(618, 28);
+			this.CompilerStatusLabel.TabIndex = 14;
+			this.CompilerStatusLabel.Text = "Idle";
+			this.CompilerStatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// WebclientCheckBox
+			// CompilerLabel
 			// 
-			this.WebclientCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.WebclientCheckBox.AutoSize = true;
-			this.WebclientCheckBox.Font = new System.Drawing.Font("Verdana", 12F);
-			this.WebclientCheckBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.WebclientCheckBox.Location = new System.Drawing.Point(754, 57);
-			this.WebclientCheckBox.Name = "WebclientCheckBox";
-			this.WebclientCheckBox.Size = new System.Drawing.Size(108, 22);
-			this.WebclientCheckBox.TabIndex = 42;
-			this.WebclientCheckBox.Text = "Webclient";
-			this.WebclientCheckBox.UseVisualStyleBackColor = true;
-			this.WebclientCheckBox.CheckedChanged += new System.EventHandler(this.WebclientCheckBox_CheckedChanged);
+			this.CompilerLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.CompilerLabel.AutoSize = true;
+			this.CompilerLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.CompilerLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.CompilerLabel.Location = new System.Drawing.Point(379, 203);
+			this.CompilerLabel.Name = "CompilerLabel";
+			this.CompilerLabel.Size = new System.Drawing.Size(80, 18);
+			this.CompilerLabel.TabIndex = 13;
+			this.CompilerLabel.Text = "Compiler";
+			this.CompilerLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
-			// AutostartCheckbox
+			// compileButton
 			// 
-			this.AutostartCheckbox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.AutostartCheckbox.AutoSize = true;
-			this.AutostartCheckbox.Font = new System.Drawing.Font("Verdana", 12F);
-			this.AutostartCheckbox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.AutostartCheckbox.Location = new System.Drawing.Point(754, 16);
-			this.AutostartCheckbox.Name = "AutostartCheckbox";
-			this.AutostartCheckbox.Size = new System.Drawing.Size(104, 22);
-			this.AutostartCheckbox.TabIndex = 15;
-			this.AutostartCheckbox.Text = "Autostart";
-			this.AutostartCheckbox.UseVisualStyleBackColor = true;
-			this.AutostartCheckbox.CheckedChanged += new System.EventHandler(this.AutostartCheckbox_CheckedChanged);
+			this.compileButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+			this.compileButton.Enabled = false;
+			this.compileButton.Location = new System.Drawing.Point(456, 240);
+			this.compileButton.Name = "compileButton";
+			this.compileButton.Size = new System.Drawing.Size(159, 28);
+			this.compileButton.TabIndex = 12;
+			this.compileButton.Text = "Copy from Repo and Compile";
+			this.compileButton.UseVisualStyleBackColor = true;
+			this.compileButton.Click += new System.EventHandler(this.CompileButton_Click);
+			// 
+			// initializeButton
+			// 
+			this.initializeButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+			this.initializeButton.Enabled = false;
+			this.initializeButton.Location = new System.Drawing.Point(219, 240);
+			this.initializeButton.Name = "initializeButton";
+			this.initializeButton.Size = new System.Drawing.Size(159, 28);
+			this.initializeButton.TabIndex = 11;
+			this.initializeButton.Text = "Initialize Game Folders";
+			this.initializeButton.UseVisualStyleBackColor = true;
+			this.initializeButton.Click += new System.EventHandler(this.InitializeButton_Click);
+			// 
+			// compilerProgressBar
+			// 
+			this.compilerProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.compilerProgressBar.Location = new System.Drawing.Point(110, 302);
+			this.compilerProgressBar.MarqueeAnimationSpeed = 50;
+			this.compilerProgressBar.Name = "compilerProgressBar";
+			this.compilerProgressBar.Size = new System.Drawing.Size(618, 31);
+			this.compilerProgressBar.TabIndex = 10;
+			// 
+			// ServerStatusLabel
+			// 
+			this.ServerStatusLabel.AutoSize = true;
+			this.ServerStatusLabel.Font = new System.Drawing.Font("Verdana", 10F);
+			this.ServerStatusLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ServerStatusLabel.Location = new System.Drawing.Point(136, 19);
+			this.ServerStatusLabel.Name = "ServerStatusLabel";
+			this.ServerStatusLabel.Size = new System.Drawing.Size(73, 17);
+			this.ServerStatusLabel.TabIndex = 9;
+			this.ServerStatusLabel.Text = "Unknown";
+			this.ServerStatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// ServerStatusTitle
+			// 
+			this.ServerStatusTitle.AutoSize = true;
+			this.ServerStatusTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.ServerStatusTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.ServerStatusTitle.Location = new System.Drawing.Point(15, 17);
+			this.ServerStatusTitle.Name = "ServerStatusTitle";
+			this.ServerStatusTitle.Size = new System.Drawing.Size(125, 18);
+			this.ServerStatusTitle.TabIndex = 8;
+			this.ServerStatusTitle.Text = "Server Status:";
+			this.ServerStatusTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 			// 
 			// BYONDPanel
 			// 
@@ -1104,30 +1104,124 @@
 			this.BYONDPanel.TabIndex = 1;
 			this.BYONDPanel.Text = "BYOND";
 			// 
-			// UpdateProgressBar
+			// LatestVersionLabel
 			// 
-			this.UpdateProgressBar.Location = new System.Drawing.Point(107, 286);
-			this.UpdateProgressBar.MarqueeAnimationSpeed = 50;
-			this.UpdateProgressBar.Name = "UpdateProgressBar";
-			this.UpdateProgressBar.Size = new System.Drawing.Size(650, 31);
-			this.UpdateProgressBar.TabIndex = 0;
+			this.LatestVersionLabel.AutoSize = true;
+			this.LatestVersionLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.LatestVersionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.LatestVersionLabel.Location = new System.Drawing.Point(425, 93);
+			this.LatestVersionLabel.Name = "LatestVersionLabel";
+			this.LatestVersionLabel.Size = new System.Drawing.Size(82, 18);
+			this.LatestVersionLabel.TabIndex = 13;
+			this.LatestVersionLabel.Text = "Unknown";
+			this.LatestVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
 			// 
-			// MajorVersionNumeric
+			// LatestVersionTitle
 			// 
-			this.MajorVersionNumeric.Location = new System.Drawing.Point(245, 210);
-			this.MajorVersionNumeric.Maximum = new decimal(new int[] {
-            1000,
-            0,
-            0,
-            0});
-			this.MajorVersionNumeric.Name = "MajorVersionNumeric";
-			this.MajorVersionNumeric.Size = new System.Drawing.Size(120, 20);
-			this.MajorVersionNumeric.TabIndex = 1;
-			this.MajorVersionNumeric.Value = new decimal(new int[] {
-            511,
-            0,
-            0,
-            0});
+			this.LatestVersionTitle.AutoSize = true;
+			this.LatestVersionTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.LatestVersionTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.LatestVersionTitle.Location = new System.Drawing.Point(286, 93);
+			this.LatestVersionTitle.Name = "LatestVersionTitle";
+			this.LatestVersionTitle.Size = new System.Drawing.Size(133, 18);
+			this.LatestVersionTitle.TabIndex = 12;
+			this.LatestVersionTitle.Text = "Latest Version:";
+			this.LatestVersionTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// StagedVersionLabel
+			// 
+			this.StagedVersionLabel.AutoSize = true;
+			this.StagedVersionLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.StagedVersionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.StagedVersionLabel.Location = new System.Drawing.Point(425, 131);
+			this.StagedVersionLabel.Name = "StagedVersionLabel";
+			this.StagedVersionLabel.Size = new System.Drawing.Size(82, 18);
+			this.StagedVersionLabel.TabIndex = 11;
+			this.StagedVersionLabel.Text = "Unknown";
+			this.StagedVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.StagedVersionLabel.Visible = false;
+			// 
+			// StagedVersionTitle
+			// 
+			this.StagedVersionTitle.AutoSize = true;
+			this.StagedVersionTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.StagedVersionTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.StagedVersionTitle.Location = new System.Drawing.Point(282, 131);
+			this.StagedVersionTitle.Name = "StagedVersionTitle";
+			this.StagedVersionTitle.Size = new System.Drawing.Size(137, 18);
+			this.StagedVersionTitle.TabIndex = 10;
+			this.StagedVersionTitle.Text = "Staged version:";
+			this.StagedVersionTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.StagedVersionTitle.Visible = false;
+			// 
+			// StatusLabel
+			// 
+			this.StatusLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.StatusLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.StatusLabel.Location = new System.Drawing.Point(303, 320);
+			this.StatusLabel.Name = "StatusLabel";
+			this.StatusLabel.Size = new System.Drawing.Size(253, 37);
+			this.StatusLabel.TabIndex = 9;
+			this.StatusLabel.Text = "Idle";
+			this.StatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// VersionLabel
+			// 
+			this.VersionLabel.AutoSize = true;
+			this.VersionLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.VersionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.VersionLabel.Location = new System.Drawing.Point(425, 56);
+			this.VersionLabel.Name = "VersionLabel";
+			this.VersionLabel.Size = new System.Drawing.Size(82, 18);
+			this.VersionLabel.TabIndex = 8;
+			this.VersionLabel.Text = "Unknown";
+			this.VersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			// 
+			// VersionTitle
+			// 
+			this.VersionTitle.AutoSize = true;
+			this.VersionTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.VersionTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.VersionTitle.Location = new System.Drawing.Point(265, 56);
+			this.VersionTitle.Name = "VersionTitle";
+			this.VersionTitle.Size = new System.Drawing.Size(154, 18);
+			this.VersionTitle.TabIndex = 7;
+			this.VersionTitle.Text = "Installed Version:";
+			this.VersionTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// MinorVersionLabel
+			// 
+			this.MinorVersionLabel.AutoSize = true;
+			this.MinorVersionLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.MinorVersionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.MinorVersionLabel.Location = new System.Drawing.Point(521, 180);
+			this.MinorVersionLabel.Name = "MinorVersionLabel";
+			this.MinorVersionLabel.Size = new System.Drawing.Size(59, 18);
+			this.MinorVersionLabel.TabIndex = 6;
+			this.MinorVersionLabel.Text = "Minor:";
+			this.MinorVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// MajorVersionLabel
+			// 
+			this.MajorVersionLabel.AutoSize = true;
+			this.MajorVersionLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.MajorVersionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.MajorVersionLabel.Location = new System.Drawing.Point(276, 180);
+			this.MajorVersionLabel.Name = "MajorVersionLabel";
+			this.MajorVersionLabel.Size = new System.Drawing.Size(60, 18);
+			this.MajorVersionLabel.TabIndex = 5;
+			this.MajorVersionLabel.Text = "Major:";
+			this.MajorVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// UpdateButton
+			// 
+			this.UpdateButton.Location = new System.Drawing.Point(372, 252);
+			this.UpdateButton.Name = "UpdateButton";
+			this.UpdateButton.Size = new System.Drawing.Size(118, 28);
+			this.UpdateButton.TabIndex = 3;
+			this.UpdateButton.Text = "Update";
+			this.UpdateButton.UseVisualStyleBackColor = true;
+			this.UpdateButton.Click += new System.EventHandler(this.UpdateButton_Click);
 			// 
 			// MinorVersionNumeric
 			// 
@@ -1146,124 +1240,30 @@
             0,
             0});
 			// 
-			// UpdateButton
+			// MajorVersionNumeric
 			// 
-			this.UpdateButton.Location = new System.Drawing.Point(372, 252);
-			this.UpdateButton.Name = "UpdateButton";
-			this.UpdateButton.Size = new System.Drawing.Size(118, 28);
-			this.UpdateButton.TabIndex = 3;
-			this.UpdateButton.Text = "Update";
-			this.UpdateButton.UseVisualStyleBackColor = true;
-			this.UpdateButton.Click += new System.EventHandler(this.UpdateButton_Click);
+			this.MajorVersionNumeric.Location = new System.Drawing.Point(245, 210);
+			this.MajorVersionNumeric.Maximum = new decimal(new int[] {
+            1000,
+            0,
+            0,
+            0});
+			this.MajorVersionNumeric.Name = "MajorVersionNumeric";
+			this.MajorVersionNumeric.Size = new System.Drawing.Size(120, 20);
+			this.MajorVersionNumeric.TabIndex = 1;
+			this.MajorVersionNumeric.Value = new decimal(new int[] {
+            511,
+            0,
+            0,
+            0});
 			// 
-			// MajorVersionLabel
+			// UpdateProgressBar
 			// 
-			this.MajorVersionLabel.AutoSize = true;
-			this.MajorVersionLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.MajorVersionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.MajorVersionLabel.Location = new System.Drawing.Point(276, 180);
-			this.MajorVersionLabel.Name = "MajorVersionLabel";
-			this.MajorVersionLabel.Size = new System.Drawing.Size(60, 18);
-			this.MajorVersionLabel.TabIndex = 5;
-			this.MajorVersionLabel.Text = "Major:";
-			this.MajorVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// MinorVersionLabel
-			// 
-			this.MinorVersionLabel.AutoSize = true;
-			this.MinorVersionLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.MinorVersionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.MinorVersionLabel.Location = new System.Drawing.Point(521, 180);
-			this.MinorVersionLabel.Name = "MinorVersionLabel";
-			this.MinorVersionLabel.Size = new System.Drawing.Size(59, 18);
-			this.MinorVersionLabel.TabIndex = 6;
-			this.MinorVersionLabel.Text = "Minor:";
-			this.MinorVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// VersionTitle
-			// 
-			this.VersionTitle.AutoSize = true;
-			this.VersionTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.VersionTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.VersionTitle.Location = new System.Drawing.Point(265, 56);
-			this.VersionTitle.Name = "VersionTitle";
-			this.VersionTitle.Size = new System.Drawing.Size(154, 18);
-			this.VersionTitle.TabIndex = 7;
-			this.VersionTitle.Text = "Installed Version:";
-			this.VersionTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// VersionLabel
-			// 
-			this.VersionLabel.AutoSize = true;
-			this.VersionLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.VersionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.VersionLabel.Location = new System.Drawing.Point(425, 56);
-			this.VersionLabel.Name = "VersionLabel";
-			this.VersionLabel.Size = new System.Drawing.Size(82, 18);
-			this.VersionLabel.TabIndex = 8;
-			this.VersionLabel.Text = "Unknown";
-			this.VersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-			// 
-			// StatusLabel
-			// 
-			this.StatusLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.StatusLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.StatusLabel.Location = new System.Drawing.Point(303, 320);
-			this.StatusLabel.Name = "StatusLabel";
-			this.StatusLabel.Size = new System.Drawing.Size(253, 37);
-			this.StatusLabel.TabIndex = 9;
-			this.StatusLabel.Text = "Idle";
-			this.StatusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// StagedVersionTitle
-			// 
-			this.StagedVersionTitle.AutoSize = true;
-			this.StagedVersionTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.StagedVersionTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.StagedVersionTitle.Location = new System.Drawing.Point(282, 131);
-			this.StagedVersionTitle.Name = "StagedVersionTitle";
-			this.StagedVersionTitle.Size = new System.Drawing.Size(137, 18);
-			this.StagedVersionTitle.TabIndex = 10;
-			this.StagedVersionTitle.Text = "Staged version:";
-			this.StagedVersionTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			this.StagedVersionTitle.Visible = false;
-			// 
-			// StagedVersionLabel
-			// 
-			this.StagedVersionLabel.AutoSize = true;
-			this.StagedVersionLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.StagedVersionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.StagedVersionLabel.Location = new System.Drawing.Point(425, 131);
-			this.StagedVersionLabel.Name = "StagedVersionLabel";
-			this.StagedVersionLabel.Size = new System.Drawing.Size(82, 18);
-			this.StagedVersionLabel.TabIndex = 11;
-			this.StagedVersionLabel.Text = "Unknown";
-			this.StagedVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-			this.StagedVersionLabel.Visible = false;
-			// 
-			// LatestVersionTitle
-			// 
-			this.LatestVersionTitle.AutoSize = true;
-			this.LatestVersionTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.LatestVersionTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.LatestVersionTitle.Location = new System.Drawing.Point(286, 93);
-			this.LatestVersionTitle.Name = "LatestVersionTitle";
-			this.LatestVersionTitle.Size = new System.Drawing.Size(133, 18);
-			this.LatestVersionTitle.TabIndex = 12;
-			this.LatestVersionTitle.Text = "Latest Version:";
-			this.LatestVersionTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			// 
-			// LatestVersionLabel
-			// 
-			this.LatestVersionLabel.AutoSize = true;
-			this.LatestVersionLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.LatestVersionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.LatestVersionLabel.Location = new System.Drawing.Point(425, 93);
-			this.LatestVersionLabel.Name = "LatestVersionLabel";
-			this.LatestVersionLabel.Size = new System.Drawing.Size(82, 18);
-			this.LatestVersionLabel.TabIndex = 13;
-			this.LatestVersionLabel.Text = "Unknown";
-			this.LatestVersionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.UpdateProgressBar.Location = new System.Drawing.Point(107, 286);
+			this.UpdateProgressBar.MarqueeAnimationSpeed = 50;
+			this.UpdateProgressBar.Name = "UpdateProgressBar";
+			this.UpdateProgressBar.Size = new System.Drawing.Size(650, 31);
+			this.UpdateProgressBar.TabIndex = 0;
 			// 
 			// RepoPanel
 			// 
@@ -1299,154 +1299,61 @@
 			this.RepoPanel.TabIndex = 0;
 			this.RepoPanel.Text = "Repository";
 			// 
-			// RepoProgressBar
+			// RepoRefreshButton
 			// 
-			this.RepoProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.RepoProgressBar.Location = new System.Drawing.Point(184, 191);
-			this.RepoProgressBar.Name = "RepoProgressBar";
-			this.RepoProgressBar.Size = new System.Drawing.Size(499, 23);
-			this.RepoProgressBar.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
-			this.RepoProgressBar.TabIndex = 0;
+			this.RepoRefreshButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.RepoRefreshButton.Location = new System.Drawing.Point(722, 296);
+			this.RepoRefreshButton.Name = "RepoRefreshButton";
+			this.RepoRefreshButton.Size = new System.Drawing.Size(140, 29);
+			this.RepoRefreshButton.TabIndex = 35;
+			this.RepoRefreshButton.Text = "Refresh";
+			this.RepoRefreshButton.UseVisualStyleBackColor = true;
+			this.RepoRefreshButton.Visible = false;
+			this.RepoRefreshButton.Click += new System.EventHandler(this.RepoRefreshButton_Click);
 			// 
-			// RepoProgressBarLabel
+			// BackupTagsList
 			// 
-			this.RepoProgressBarLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.RepoProgressBarLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.RepoProgressBarLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.RepoProgressBarLabel.Location = new System.Drawing.Point(184, 142);
-			this.RepoProgressBarLabel.Name = "RepoProgressBarLabel";
-			this.RepoProgressBarLabel.Size = new System.Drawing.Size(499, 46);
-			this.RepoProgressBarLabel.TabIndex = 1;
-			this.RepoProgressBarLabel.Text = "Searching for Repository...";
-			this.RepoProgressBarLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.BackupTagsList.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.BackupTagsList.Items.AddRange(new object[] {
+            "None"});
+			this.BackupTagsList.Location = new System.Drawing.Point(122, 142);
+			this.BackupTagsList.Name = "BackupTagsList";
+			this.BackupTagsList.ScrollAlwaysVisible = true;
+			this.BackupTagsList.Size = new System.Drawing.Size(535, 95);
+			this.BackupTagsList.TabIndex = 34;
+			this.BackupTagsList.Visible = false;
 			// 
-			// CloneRepositoryButton
+			// ResetRemote
 			// 
-			this.CloneRepositoryButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-			this.CloneRepositoryButton.Location = new System.Drawing.Point(311, 191);
-			this.CloneRepositoryButton.Name = "CloneRepositoryButton";
-			this.CloneRepositoryButton.Size = new System.Drawing.Size(229, 34);
-			this.CloneRepositoryButton.TabIndex = 2;
-			this.CloneRepositoryButton.Text = "Clone Repository";
-			this.CloneRepositoryButton.UseVisualStyleBackColor = true;
-			this.CloneRepositoryButton.Visible = false;
-			this.CloneRepositoryButton.Click += new System.EventHandler(this.CloneRepositoryButton_Click);
+			this.ResetRemote.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.ResetRemote.Location = new System.Drawing.Point(722, 81);
+			this.ResetRemote.Name = "ResetRemote";
+			this.ResetRemote.Size = new System.Drawing.Size(140, 29);
+			this.ResetRemote.TabIndex = 33;
+			this.ResetRemote.Text = "Reset To Remote";
+			this.ResetRemote.UseVisualStyleBackColor = true;
+			this.ResetRemote.Visible = false;
+			this.ResetRemote.Click += new System.EventHandler(this.ResetRemote_Click);
 			// 
-			// CurrentRevisionTitle
+			// RecloneButton
 			// 
-			this.CurrentRevisionTitle.AutoSize = true;
-			this.CurrentRevisionTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.CurrentRevisionTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.CurrentRevisionTitle.Location = new System.Drawing.Point(6, 14);
-			this.CurrentRevisionTitle.Name = "CurrentRevisionTitle";
-			this.CurrentRevisionTitle.Size = new System.Drawing.Size(150, 18);
-			this.CurrentRevisionTitle.TabIndex = 3;
-			this.CurrentRevisionTitle.Text = "Current Revision:";
-			this.CurrentRevisionTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			this.CurrentRevisionTitle.Visible = false;
+			this.RecloneButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.RecloneButton.Location = new System.Drawing.Point(722, 212);
+			this.RecloneButton.Name = "RecloneButton";
+			this.RecloneButton.Size = new System.Drawing.Size(140, 29);
+			this.RecloneButton.TabIndex = 32;
+			this.RecloneButton.Text = "Reclone";
+			this.RecloneButton.UseVisualStyleBackColor = true;
+			this.RecloneButton.Visible = false;
+			this.RecloneButton.Click += new System.EventHandler(this.RecloneButton_Click);
 			// 
-			// BranchNameTitle
+			// PythonPathText
 			// 
-			this.BranchNameTitle.AutoSize = true;
-			this.BranchNameTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.BranchNameTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.BranchNameTitle.Location = new System.Drawing.Point(6, 72);
-			this.BranchNameTitle.Name = "BranchNameTitle";
-			this.BranchNameTitle.Size = new System.Drawing.Size(70, 18);
-			this.BranchNameTitle.TabIndex = 4;
-			this.BranchNameTitle.Text = "Branch:";
-			this.BranchNameTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-			this.BranchNameTitle.Visible = false;
-			// 
-			// RemoteNameTitle
-			// 
-			this.RemoteNameTitle.AutoSize = true;
-			this.RemoteNameTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.RemoteNameTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.RemoteNameTitle.Location = new System.Drawing.Point(6, 46);
-			this.RemoteNameTitle.Name = "RemoteNameTitle";
-			this.RemoteNameTitle.Size = new System.Drawing.Size(78, 18);
-			this.RemoteNameTitle.TabIndex = 5;
-			this.RemoteNameTitle.Text = "Remote:";
-			this.RemoteNameTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-			this.RemoteNameTitle.Visible = false;
-			// 
-			// TestMergeListTitle
-			// 
-			this.TestMergeListTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.TestMergeListTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.TestMergeListTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.TestMergeListTitle.Location = new System.Drawing.Point(6, 260);
-			this.TestMergeListTitle.Name = "TestMergeListTitle";
-			this.TestMergeListTitle.Size = new System.Drawing.Size(110, 41);
-			this.TestMergeListTitle.TabIndex = 6;
-			this.TestMergeListTitle.Text = "Active Test Merges:";
-			this.TestMergeListTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-			this.TestMergeListTitle.Visible = false;
-			// 
-			// IdentityLabel
-			// 
-			this.IdentityLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.IdentityLabel.AutoSize = true;
-			this.IdentityLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.IdentityLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.IdentityLabel.Location = new System.Drawing.Point(6, 142);
-			this.IdentityLabel.Name = "IdentityLabel";
-			this.IdentityLabel.Size = new System.Drawing.Size(116, 18);
-			this.IdentityLabel.TabIndex = 8;
-			this.IdentityLabel.Text = "Backup Tags:";
-			this.IdentityLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-			this.IdentityLabel.Visible = false;
-			// 
-			// MergePRButton
-			// 
-			this.MergePRButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.MergePRButton.Location = new System.Drawing.Point(722, 116);
-			this.MergePRButton.Name = "MergePRButton";
-			this.MergePRButton.Size = new System.Drawing.Size(140, 29);
-			this.MergePRButton.TabIndex = 11;
-			this.MergePRButton.Text = "Merge Pull Request";
-			this.MergePRButton.UseVisualStyleBackColor = true;
-			this.MergePRButton.Visible = false;
-			this.MergePRButton.Click += new System.EventHandler(this.TestMergeButton_Click);
-			// 
-			// UpdateRepoButton
-			// 
-			this.UpdateRepoButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.UpdateRepoButton.Location = new System.Drawing.Point(722, 11);
-			this.UpdateRepoButton.Name = "UpdateRepoButton";
-			this.UpdateRepoButton.Size = new System.Drawing.Size(140, 29);
-			this.UpdateRepoButton.TabIndex = 12;
-			this.UpdateRepoButton.Text = "Merge from Remote";
-			this.UpdateRepoButton.UseVisualStyleBackColor = true;
-			this.UpdateRepoButton.Visible = false;
-			this.UpdateRepoButton.Click += new System.EventHandler(this.UpdateRepoButton_Click);
-			// 
-			// HardReset
-			// 
-			this.HardReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.HardReset.Location = new System.Drawing.Point(722, 46);
-			this.HardReset.Name = "HardReset";
-			this.HardReset.Size = new System.Drawing.Size(140, 29);
-			this.HardReset.TabIndex = 13;
-			this.HardReset.Text = "Reset To Origin Branch";
-			this.HardReset.UseVisualStyleBackColor = true;
-			this.HardReset.Visible = false;
-			this.HardReset.Click += new System.EventHandler(this.HardReset_Click);
-			// 
-			// RepoRemoteTextBox
-			// 
-			this.RepoRemoteTextBox.Location = new System.Drawing.Point(122, 44);
-			this.RepoRemoteTextBox.Name = "RepoRemoteTextBox";
-			this.RepoRemoteTextBox.Size = new System.Drawing.Size(535, 20);
-			this.RepoRemoteTextBox.TabIndex = 14;
-			this.RepoRemoteTextBox.Visible = false;
+			this.PythonPathText.Location = new System.Drawing.Point(122, 112);
+			this.PythonPathText.Name = "PythonPathText";
+			this.PythonPathText.Size = new System.Drawing.Size(535, 20);
+			this.PythonPathText.TabIndex = 31;
+			this.PythonPathText.Visible = false;
 			// 
 			// RepoBranchTextBox
 			// 
@@ -1456,43 +1363,38 @@
 			this.RepoBranchTextBox.TabIndex = 15;
 			this.RepoBranchTextBox.Visible = false;
 			// 
-			// RepoApplyButton
+			// RepoRemoteTextBox
 			// 
-			this.RepoApplyButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.RepoApplyButton.Location = new System.Drawing.Point(722, 331);
-			this.RepoApplyButton.Name = "RepoApplyButton";
-			this.RepoApplyButton.Size = new System.Drawing.Size(140, 29);
-			this.RepoApplyButton.TabIndex = 17;
-			this.RepoApplyButton.Text = "Apply Changes";
-			this.RepoApplyButton.UseVisualStyleBackColor = true;
-			this.RepoApplyButton.Visible = false;
-			this.RepoApplyButton.Click += new System.EventHandler(this.RepoApplyButton_Click);
+			this.RepoRemoteTextBox.Location = new System.Drawing.Point(122, 44);
+			this.RepoRemoteTextBox.Name = "RepoRemoteTextBox";
+			this.RepoRemoteTextBox.Size = new System.Drawing.Size(535, 20);
+			this.RepoRemoteTextBox.TabIndex = 14;
+			this.RepoRemoteTextBox.Visible = false;
 			// 
-			// CurrentRevisionLabel
+			// PythonPathLabel
 			// 
-			this.CurrentRevisionLabel.AutoSize = true;
-			this.CurrentRevisionLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.CurrentRevisionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.CurrentRevisionLabel.Location = new System.Drawing.Point(162, 14);
-			this.CurrentRevisionLabel.Name = "CurrentRevisionLabel";
-			this.CurrentRevisionLabel.Size = new System.Drawing.Size(82, 18);
-			this.CurrentRevisionLabel.TabIndex = 20;
-			this.CurrentRevisionLabel.Text = "Unknown";
-			this.CurrentRevisionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-			this.CurrentRevisionLabel.Visible = false;
+			this.PythonPathLabel.AutoSize = true;
+			this.PythonPathLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.PythonPathLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.PythonPathLabel.Location = new System.Drawing.Point(6, 112);
+			this.PythonPathLabel.Name = "PythonPathLabel";
+			this.PythonPathLabel.Size = new System.Drawing.Size(114, 18);
+			this.PythonPathLabel.TabIndex = 30;
+			this.PythonPathLabel.Text = "Python Path:";
+			this.PythonPathLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.PythonPathLabel.Visible = false;
 			// 
-			// TestMergeListLabel
+			// RepoGenChangelogButton
 			// 
-			this.TestMergeListLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.TestMergeListLabel.HorizontalScrollbar = true;
-			this.TestMergeListLabel.Items.AddRange(new object[] {
-            "None"});
-			this.TestMergeListLabel.Location = new System.Drawing.Point(122, 260);
-			this.TestMergeListLabel.Name = "TestMergeListLabel";
-			this.TestMergeListLabel.ScrollAlwaysVisible = true;
-			this.TestMergeListLabel.Size = new System.Drawing.Size(535, 95);
-			this.TestMergeListLabel.TabIndex = 21;
-			this.TestMergeListLabel.Visible = false;
+			this.RepoGenChangelogButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.RepoGenChangelogButton.Location = new System.Drawing.Point(722, 177);
+			this.RepoGenChangelogButton.Name = "RepoGenChangelogButton";
+			this.RepoGenChangelogButton.Size = new System.Drawing.Size(140, 29);
+			this.RepoGenChangelogButton.TabIndex = 27;
+			this.RepoGenChangelogButton.Text = "Generate Changelog";
+			this.RepoGenChangelogButton.UseVisualStyleBackColor = true;
+			this.RepoGenChangelogButton.Visible = false;
+			this.RepoGenChangelogButton.Click += new System.EventHandler(this.RepoGenChangelogButton_Click);
 			// 
 			// TestmergeSelector
 			// 
@@ -1508,86 +1410,184 @@
 			this.TestmergeSelector.TabIndex = 22;
 			this.TestmergeSelector.Visible = false;
 			// 
-			// RepoGenChangelogButton
+			// TestMergeListLabel
 			// 
-			this.RepoGenChangelogButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.RepoGenChangelogButton.Location = new System.Drawing.Point(722, 177);
-			this.RepoGenChangelogButton.Name = "RepoGenChangelogButton";
-			this.RepoGenChangelogButton.Size = new System.Drawing.Size(140, 29);
-			this.RepoGenChangelogButton.TabIndex = 27;
-			this.RepoGenChangelogButton.Text = "Generate Changelog";
-			this.RepoGenChangelogButton.UseVisualStyleBackColor = true;
-			this.RepoGenChangelogButton.Visible = false;
-			this.RepoGenChangelogButton.Click += new System.EventHandler(this.RepoGenChangelogButton_Click);
-			// 
-			// PythonPathLabel
-			// 
-			this.PythonPathLabel.AutoSize = true;
-			this.PythonPathLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-			this.PythonPathLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
-			this.PythonPathLabel.Location = new System.Drawing.Point(6, 112);
-			this.PythonPathLabel.Name = "PythonPathLabel";
-			this.PythonPathLabel.Size = new System.Drawing.Size(114, 18);
-			this.PythonPathLabel.TabIndex = 30;
-			this.PythonPathLabel.Text = "Python Path:";
-			this.PythonPathLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-			this.PythonPathLabel.Visible = false;
-			// 
-			// PythonPathText
-			// 
-			this.PythonPathText.Location = new System.Drawing.Point(122, 112);
-			this.PythonPathText.Name = "PythonPathText";
-			this.PythonPathText.Size = new System.Drawing.Size(535, 20);
-			this.PythonPathText.TabIndex = 31;
-			this.PythonPathText.Visible = false;
-			// 
-			// RecloneButton
-			// 
-			this.RecloneButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.RecloneButton.Location = new System.Drawing.Point(722, 212);
-			this.RecloneButton.Name = "RecloneButton";
-			this.RecloneButton.Size = new System.Drawing.Size(140, 29);
-			this.RecloneButton.TabIndex = 32;
-			this.RecloneButton.Text = "Reclone";
-			this.RecloneButton.UseVisualStyleBackColor = true;
-			this.RecloneButton.Visible = false;
-			this.RecloneButton.Click += new System.EventHandler(this.RecloneButton_Click);
-			// 
-			// ResetRemote
-			// 
-			this.ResetRemote.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.ResetRemote.Location = new System.Drawing.Point(722, 81);
-			this.ResetRemote.Name = "ResetRemote";
-			this.ResetRemote.Size = new System.Drawing.Size(140, 29);
-			this.ResetRemote.TabIndex = 33;
-			this.ResetRemote.Text = "Reset To Remote";
-			this.ResetRemote.UseVisualStyleBackColor = true;
-			this.ResetRemote.Visible = false;
-			this.ResetRemote.Click += new System.EventHandler(this.ResetRemote_Click);
-			// 
-			// BackupTagsList
-			// 
-			this.BackupTagsList.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-			this.BackupTagsList.Items.AddRange(new object[] {
+			this.TestMergeListLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.TestMergeListLabel.HorizontalScrollbar = true;
+			this.TestMergeListLabel.Items.AddRange(new object[] {
             "None"});
-			this.BackupTagsList.Location = new System.Drawing.Point(122, 142);
-			this.BackupTagsList.Name = "BackupTagsList";
-			this.BackupTagsList.ScrollAlwaysVisible = true;
-			this.BackupTagsList.Size = new System.Drawing.Size(535, 95);
-			this.BackupTagsList.TabIndex = 34;
-			this.BackupTagsList.Visible = false;
+			this.TestMergeListLabel.Location = new System.Drawing.Point(122, 260);
+			this.TestMergeListLabel.Name = "TestMergeListLabel";
+			this.TestMergeListLabel.ScrollAlwaysVisible = true;
+			this.TestMergeListLabel.Size = new System.Drawing.Size(535, 95);
+			this.TestMergeListLabel.TabIndex = 21;
+			this.TestMergeListLabel.Visible = false;
 			// 
-			// RepoRefreshButton
+			// CurrentRevisionLabel
 			// 
-			this.RepoRefreshButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-			this.RepoRefreshButton.Location = new System.Drawing.Point(722, 296);
-			this.RepoRefreshButton.Name = "RepoRefreshButton";
-			this.RepoRefreshButton.Size = new System.Drawing.Size(140, 29);
-			this.RepoRefreshButton.TabIndex = 35;
-			this.RepoRefreshButton.Text = "Refresh";
-			this.RepoRefreshButton.UseVisualStyleBackColor = true;
-			this.RepoRefreshButton.Visible = false;
-			this.RepoRefreshButton.Click += new System.EventHandler(this.RepoRefreshButton_Click);
+			this.CurrentRevisionLabel.AutoSize = true;
+			this.CurrentRevisionLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.CurrentRevisionLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.CurrentRevisionLabel.Location = new System.Drawing.Point(162, 14);
+			this.CurrentRevisionLabel.Name = "CurrentRevisionLabel";
+			this.CurrentRevisionLabel.Size = new System.Drawing.Size(82, 18);
+			this.CurrentRevisionLabel.TabIndex = 20;
+			this.CurrentRevisionLabel.Text = "Unknown";
+			this.CurrentRevisionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.CurrentRevisionLabel.Visible = false;
+			// 
+			// RepoApplyButton
+			// 
+			this.RepoApplyButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+			this.RepoApplyButton.Location = new System.Drawing.Point(722, 331);
+			this.RepoApplyButton.Name = "RepoApplyButton";
+			this.RepoApplyButton.Size = new System.Drawing.Size(140, 29);
+			this.RepoApplyButton.TabIndex = 17;
+			this.RepoApplyButton.Text = "Apply Changes";
+			this.RepoApplyButton.UseVisualStyleBackColor = true;
+			this.RepoApplyButton.Visible = false;
+			this.RepoApplyButton.Click += new System.EventHandler(this.RepoApplyButton_Click);
+			// 
+			// HardReset
+			// 
+			this.HardReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.HardReset.Location = new System.Drawing.Point(722, 46);
+			this.HardReset.Name = "HardReset";
+			this.HardReset.Size = new System.Drawing.Size(140, 29);
+			this.HardReset.TabIndex = 13;
+			this.HardReset.Text = "Reset To Origin Branch";
+			this.HardReset.UseVisualStyleBackColor = true;
+			this.HardReset.Visible = false;
+			this.HardReset.Click += new System.EventHandler(this.HardReset_Click);
+			// 
+			// UpdateRepoButton
+			// 
+			this.UpdateRepoButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.UpdateRepoButton.Location = new System.Drawing.Point(722, 11);
+			this.UpdateRepoButton.Name = "UpdateRepoButton";
+			this.UpdateRepoButton.Size = new System.Drawing.Size(140, 29);
+			this.UpdateRepoButton.TabIndex = 12;
+			this.UpdateRepoButton.Text = "Merge from Remote";
+			this.UpdateRepoButton.UseVisualStyleBackColor = true;
+			this.UpdateRepoButton.Visible = false;
+			this.UpdateRepoButton.Click += new System.EventHandler(this.UpdateRepoButton_Click);
+			// 
+			// MergePRButton
+			// 
+			this.MergePRButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.MergePRButton.Location = new System.Drawing.Point(722, 116);
+			this.MergePRButton.Name = "MergePRButton";
+			this.MergePRButton.Size = new System.Drawing.Size(140, 29);
+			this.MergePRButton.TabIndex = 11;
+			this.MergePRButton.Text = "Merge Pull Request";
+			this.MergePRButton.UseVisualStyleBackColor = true;
+			this.MergePRButton.Visible = false;
+			this.MergePRButton.Click += new System.EventHandler(this.TestMergeButton_Click);
+			// 
+			// IdentityLabel
+			// 
+			this.IdentityLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.IdentityLabel.AutoSize = true;
+			this.IdentityLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.IdentityLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.IdentityLabel.Location = new System.Drawing.Point(6, 142);
+			this.IdentityLabel.Name = "IdentityLabel";
+			this.IdentityLabel.Size = new System.Drawing.Size(116, 18);
+			this.IdentityLabel.TabIndex = 8;
+			this.IdentityLabel.Text = "Backup Tags:";
+			this.IdentityLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.IdentityLabel.Visible = false;
+			// 
+			// TestMergeListTitle
+			// 
+			this.TestMergeListTitle.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+			this.TestMergeListTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.TestMergeListTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.TestMergeListTitle.Location = new System.Drawing.Point(6, 260);
+			this.TestMergeListTitle.Name = "TestMergeListTitle";
+			this.TestMergeListTitle.Size = new System.Drawing.Size(110, 41);
+			this.TestMergeListTitle.TabIndex = 6;
+			this.TestMergeListTitle.Text = "Active Test Merges:";
+			this.TestMergeListTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.TestMergeListTitle.Visible = false;
+			// 
+			// RemoteNameTitle
+			// 
+			this.RemoteNameTitle.AutoSize = true;
+			this.RemoteNameTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.RemoteNameTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.RemoteNameTitle.Location = new System.Drawing.Point(6, 46);
+			this.RemoteNameTitle.Name = "RemoteNameTitle";
+			this.RemoteNameTitle.Size = new System.Drawing.Size(78, 18);
+			this.RemoteNameTitle.TabIndex = 5;
+			this.RemoteNameTitle.Text = "Remote:";
+			this.RemoteNameTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.RemoteNameTitle.Visible = false;
+			// 
+			// BranchNameTitle
+			// 
+			this.BranchNameTitle.AutoSize = true;
+			this.BranchNameTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.BranchNameTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.BranchNameTitle.Location = new System.Drawing.Point(6, 72);
+			this.BranchNameTitle.Name = "BranchNameTitle";
+			this.BranchNameTitle.Size = new System.Drawing.Size(70, 18);
+			this.BranchNameTitle.TabIndex = 4;
+			this.BranchNameTitle.Text = "Branch:";
+			this.BranchNameTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+			this.BranchNameTitle.Visible = false;
+			// 
+			// CurrentRevisionTitle
+			// 
+			this.CurrentRevisionTitle.AutoSize = true;
+			this.CurrentRevisionTitle.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.CurrentRevisionTitle.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.CurrentRevisionTitle.Location = new System.Drawing.Point(6, 14);
+			this.CurrentRevisionTitle.Name = "CurrentRevisionTitle";
+			this.CurrentRevisionTitle.Size = new System.Drawing.Size(150, 18);
+			this.CurrentRevisionTitle.TabIndex = 3;
+			this.CurrentRevisionTitle.Text = "Current Revision:";
+			this.CurrentRevisionTitle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			this.CurrentRevisionTitle.Visible = false;
+			// 
+			// CloneRepositoryButton
+			// 
+			this.CloneRepositoryButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.CloneRepositoryButton.Location = new System.Drawing.Point(311, 191);
+			this.CloneRepositoryButton.Name = "CloneRepositoryButton";
+			this.CloneRepositoryButton.Size = new System.Drawing.Size(229, 34);
+			this.CloneRepositoryButton.TabIndex = 2;
+			this.CloneRepositoryButton.Text = "Clone Repository";
+			this.CloneRepositoryButton.UseVisualStyleBackColor = true;
+			this.CloneRepositoryButton.Visible = false;
+			this.CloneRepositoryButton.Click += new System.EventHandler(this.CloneRepositoryButton_Click);
+			// 
+			// RepoProgressBarLabel
+			// 
+			this.RepoProgressBarLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.RepoProgressBarLabel.Font = new System.Drawing.Font("Verdana", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.RepoProgressBarLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(248)))), ((int)(((byte)(248)))), ((int)(((byte)(242)))));
+			this.RepoProgressBarLabel.Location = new System.Drawing.Point(184, 142);
+			this.RepoProgressBarLabel.Name = "RepoProgressBarLabel";
+			this.RepoProgressBarLabel.Size = new System.Drawing.Size(499, 46);
+			this.RepoProgressBarLabel.TabIndex = 1;
+			this.RepoProgressBarLabel.Text = "Searching for Repository...";
+			this.RepoProgressBarLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+			// 
+			// RepoProgressBar
+			// 
+			this.RepoProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.RepoProgressBar.Location = new System.Drawing.Point(184, 191);
+			this.RepoProgressBar.Name = "RepoProgressBar";
+			this.RepoProgressBar.Size = new System.Drawing.Size(499, 23);
+			this.RepoProgressBar.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
+			this.RepoProgressBar.TabIndex = 0;
 			// 
 			// Panels
 			// 
@@ -1617,19 +1617,19 @@
 			this.Text = "/tg/station 13 Server Control Panel";
 			this.ChatPanel.ResumeLayout(false);
 			this.ChatPanel.PerformLayout();
-			this.panel1.ResumeLayout(false);
-			this.panel1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.ChatPortSelector)).EndInit();
 			this.ChatProviderSelectorPanel.ResumeLayout(false);
 			this.ChatProviderSelectorPanel.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)(this.ChatPortSelector)).EndInit();
+			this.panel1.ResumeLayout(false);
+			this.panel1.PerformLayout();
 			this.ServerPanel.ResumeLayout(false);
 			this.ServerPanel.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)(this.ServerTestmergeInput)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.PortSelector)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.ServerTestmergeInput)).EndInit();
 			this.BYONDPanel.ResumeLayout(false);
 			this.BYONDPanel.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)(this.MajorVersionNumeric)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.MinorVersionNumeric)).EndInit();
+			((System.ComponentModel.ISupportInitialize)(this.MajorVersionNumeric)).EndInit();
 			this.RepoPanel.ResumeLayout(false);
 			this.RepoPanel.PerformLayout();
 			((System.ComponentModel.ISupportInitialize)(this.TestmergeSelector)).EndInit();
@@ -1690,7 +1690,7 @@
 		private System.Windows.Forms.TextBox WorldAnnounceField;
 		private System.Windows.Forms.TextBox ServerPathTextbox;
 		private System.Windows.Forms.TextBox projectNameText;
-		private System.Windows.Forms.Label VisibilityTitle;
+		private System.Windows.Forms.Label WorldAnnounceLabel;
 		private System.Windows.Forms.ComboBox SecuritySelector;
 		private System.Windows.Forms.Label SecurityTitle;
 		private System.Windows.Forms.Button ResetTestmerge;