diff --git a/Novetus/NovetusFuncs/LauncherFuncs.cs b/Novetus/NovetusFuncs/LauncherFuncs.cs
index e38d774..548f4ca 100644
--- a/Novetus/NovetusFuncs/LauncherFuncs.cs
+++ b/Novetus/NovetusFuncs/LauncherFuncs.cs
@@ -126,7 +126,7 @@ public class LauncherFuncs
             ini.IniWriteValue(section, "GraphicsMode", Settings.GraphicsOptions.GetIntForMode(GlobalVars.UserConfiguration.GraphicsMode).ToString());
             ini.IniWriteValue(section, "ReShade", GlobalVars.UserConfiguration.ReShade.ToString());
             ini.IniWriteValue(section, "QualityLevel", Settings.QualityOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString());
-            ini.IniWriteValue(section, "Layout", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherLayout).ToString());
+            ini.IniWriteValue(section, "Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherLayout).ToString());
             ini.IniWriteValue(section, "AssetLocalizerSaveBackups", GlobalVars.UserConfiguration.AssetLocalizerSaveBackups.ToString());
         }
         else
@@ -135,7 +135,7 @@ public class LauncherFuncs
             string closeonlaunch, userid, name, selectedclient,
                 map, port, limit, upnp,
                 disablehelpmessage, tripcode, discord, mappath, mapsnip,
-                graphics, reshade, qualitylevel, layout, savebackups;
+                graphics, reshade, qualitylevel, style, savebackups;
 
             INIFile ini = new INIFile(cfgpath);
 
@@ -157,7 +157,7 @@ public class LauncherFuncs
             graphics = ini.IniReadValue(section, "GraphicsMode", Settings.GraphicsOptions.GetIntForMode(GlobalVars.UserConfiguration.GraphicsMode).ToString());
             reshade = ini.IniReadValue(section, "ReShade", GlobalVars.UserConfiguration.ReShade.ToString());
             qualitylevel = ini.IniReadValue(section, "QualityLevel", Settings.QualityOptions.GetIntForLevel(GlobalVars.UserConfiguration.QualityLevel).ToString());
-            layout = ini.IniReadValue(section, "Layout", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherLayout).ToString());
+            style = ini.IniReadValue(section, "Style", Settings.UIOptions.GetIntForStyle(GlobalVars.UserConfiguration.LauncherLayout).ToString());
             savebackups = ini.IniReadValue(section, "AssetLocalizerSaveBackups", GlobalVars.UserConfiguration.AssetLocalizerSaveBackups.ToString());
 
             try
@@ -206,7 +206,7 @@ public class LauncherFuncs
                 GlobalVars.UserConfiguration.GraphicsMode = Settings.GraphicsOptions.GetModeForInt(Convert.ToInt32(graphics));
                 GlobalVars.UserConfiguration.ReShade = Convert.ToBoolean(reshade);
                 GlobalVars.UserConfiguration.QualityLevel = Settings.QualityOptions.GetLevelForInt(Convert.ToInt32(qualitylevel));
-                GlobalVars.UserConfiguration.LauncherLayout = Settings.UIOptions.GetStyleForInt(Convert.ToInt32(layout));
+                GlobalVars.UserConfiguration.LauncherLayout = Settings.UIOptions.GetStyleForInt(Convert.ToInt32(style));
                 GlobalVars.UserConfiguration.AssetLocalizerSaveBackups = Convert.ToBoolean(savebackups);
             }
             catch (Exception)
diff --git a/Novetus/NovetusLauncher/MainForm/Compact/MainForm_legacy.Designer.cs b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.Designer.cs
similarity index 99%
rename from Novetus/NovetusLauncher/MainForm/Compact/MainForm_legacy.Designer.cs
rename to Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.Designer.cs
index a0aa57a..10a9018 100644
--- a/Novetus/NovetusLauncher/MainForm/Compact/MainForm_legacy.Designer.cs
+++ b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.Designer.cs
@@ -10,7 +10,7 @@
 //This ALWAYS gets lost whenever I compile. WTF VS?
 namespace NovetusLauncher
 {
-    partial class MainForm_legacy
+    partial class LauncherFormCompact
     {
         /// <summary>
         /// Designer variable used to keep track of non-visual components.
@@ -43,7 +43,7 @@ namespace NovetusLauncher
 
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm_legacy));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormCompact));
             this.tabControl1 = new TabControlWithoutHeader(2);
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.label2 = new System.Windows.Forms.Label();
@@ -242,7 +242,7 @@ namespace NovetusLauncher
             // 
             // label31
             // 
-            this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.label31.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.label31.Location = new System.Drawing.Point(267, 5);
             this.label31.Name = "label31";
@@ -327,7 +327,7 @@ namespace NovetusLauncher
             // 
             // label3
             // 
-            this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.label3.Location = new System.Drawing.Point(16, 5);
             this.label3.Name = "label3";
@@ -384,8 +384,8 @@ namespace NovetusLauncher
             // 
             // textBox3
             // 
-            this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+            this.textBox3.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.textBox3.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.textBox3.Location = new System.Drawing.Point(6, 21);
@@ -785,8 +785,8 @@ namespace NovetusLauncher
             // 
             // richTextBox1
             // 
-            this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+            this.richTextBox1.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.richTextBox1.BackColor = System.Drawing.SystemColors.ControlText;
             this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
@@ -811,8 +811,8 @@ namespace NovetusLauncher
             // 
             // richTextBox2
             // 
-            this.richTextBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+            this.richTextBox2.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.richTextBox2.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.richTextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None;
diff --git a/Novetus/NovetusLauncher/MainForm/Compact/MainForm_legacy.cs b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.cs
similarity index 99%
rename from Novetus/NovetusLauncher/MainForm/Compact/MainForm_legacy.cs
rename to Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.cs
index 46964f9..dfe79fc 100644
--- a/Novetus/NovetusLauncher/MainForm/Compact/MainForm_legacy.cs
+++ b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.cs
@@ -16,18 +16,17 @@ using System.ComponentModel;
 using System.Reflection;
 using Mono.Nat;
 using System.Globalization;
-//using LiteNetLib;
 
 namespace NovetusLauncher
 {
     /// <summary>
     /// Description of MainForm.
     /// </summary>
-    public partial class MainForm_legacy : Form
+    public partial class LauncherFormCompact : Form
 	{
 		IDiscordRPC.EventHandlers handlers;
 			
-		public MainForm_legacy()
+		public LauncherFormCompact()
 		{
 			_fieldsTreeCache = new TreeView();
             //
@@ -1488,7 +1487,7 @@ namespace NovetusLauncher
 
 		void SettingsButtonClick(object sender, EventArgs e)
 		{
-			NovetusSettings im = new NovetusSettings();
+			LauncherFormCompactSettings im = new LauncherFormCompactSettings();
 			im.Show();
 		}
 
diff --git a/Novetus/NovetusLauncher/MainForm/Compact/MainForm_legacy.resx b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.resx
similarity index 100%
rename from Novetus/NovetusLauncher/MainForm/Compact/MainForm_legacy.resx
rename to Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompact.resx
diff --git a/Novetus/NovetusLauncher/MainForm/Compact/NovetusSettings.Designer.cs b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.Designer.cs
similarity index 98%
rename from Novetus/NovetusLauncher/MainForm/Compact/NovetusSettings.Designer.cs
rename to Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.Designer.cs
index ed129b0..9db73c1 100644
--- a/Novetus/NovetusLauncher/MainForm/Compact/NovetusSettings.Designer.cs
+++ b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.Designer.cs
@@ -1,6 +1,6 @@
 namespace NovetusLauncher
 {
-    partial class NovetusSettings
+    partial class LauncherFormCompactSettings
     {
         /// <summary>
         /// Required designer variable.
@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NovetusSettings));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormCompactSettings));
             this.label3 = new System.Windows.Forms.Label();
             this.comboBox2 = new System.Windows.Forms.ComboBox();
             this.label31 = new System.Windows.Forms.Label();
diff --git a/Novetus/NovetusLauncher/MainForm/Compact/NovetusSettings.cs b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.cs
similarity index 91%
rename from Novetus/NovetusLauncher/MainForm/Compact/NovetusSettings.cs
rename to Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.cs
index 490d88d..8669377 100644
--- a/Novetus/NovetusLauncher/MainForm/Compact/NovetusSettings.cs
+++ b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.cs
@@ -1,17 +1,11 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Windows.Forms;
 
 namespace NovetusLauncher
 {
-    public partial class NovetusSettings : Form
+    public partial class LauncherFormCompactSettings : Form
     {
-        public NovetusSettings()
+        public LauncherFormCompactSettings()
         {
             InitializeComponent();
         }
@@ -108,7 +102,14 @@ namespace NovetusLauncher
 
         private void NovetusSettings_Load(object sender, EventArgs e)
         {
-            ReadConfigValues();
+            if (GlobalVars.UserConfiguration.LauncherLayout == Settings.UIOptions.Style.Compact)
+            {
+                ReadConfigValues();
+            }
+            else
+            {
+                Close();
+            }
         }
     }
 }
diff --git a/Novetus/NovetusLauncher/MainForm/Compact/NovetusSettings.resx b/Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.resx
similarity index 100%
rename from Novetus/NovetusLauncher/MainForm/Compact/NovetusSettings.resx
rename to Novetus/NovetusLauncher/LauncherForm/Compact/LauncherFormCompactSettings.resx
diff --git a/Novetus/NovetusLauncher/MainForm/Extended/MainForm.Designer.cs b/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.Designer.cs
similarity index 93%
rename from Novetus/NovetusLauncher/MainForm/Extended/MainForm.Designer.cs
rename to Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.Designer.cs
index 033e6e9..42dbd8d 100644
--- a/Novetus/NovetusLauncher/MainForm/Extended/MainForm.Designer.cs
+++ b/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.Designer.cs
@@ -10,26 +10,28 @@
 //This ALWAYS gets lost whenever I compile. WTF VS?
 namespace NovetusLauncher
 {
-	partial class MainForm
-	{
-		/// <summary>
-		/// Designer variable used to keep track of non-visual components.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-		
-		/// <summary>
-		/// Disposes resources used by the form.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing) {
-				if (components != null) {
-					components.Dispose();
-				}
-			}
-			base.Dispose(disposing);
-		}
+    partial class LauncherFormExtended
+    {
+        /// <summary>
+        /// Designer variable used to keep track of non-visual components.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Disposes resources used by the form.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (components != null)
+                {
+                    components.Dispose();
+                }
+            }
+            base.Dispose(disposing);
+        }
 
         /// <summary>
         /// This method is required for Windows Forms designer support.
@@ -41,7 +43,7 @@ namespace NovetusLauncher
 
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LauncherFormExtended));
             this.tabControl1 = new TabControlWithoutHeader(1);
             this.tabPage1 = new System.Windows.Forms.TabPage();
             this.label24 = new System.Windows.Forms.Label();
@@ -780,7 +782,7 @@ namespace NovetusLauncher
             // 
             // richTextBox1
             // 
-            this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.richTextBox1.BackColor = System.Drawing.SystemColors.ControlText;
             this.richTextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
@@ -805,7 +807,7 @@ namespace NovetusLauncher
             // 
             // richTextBox2
             // 
-            this.richTextBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.richTextBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
             this.richTextBox2.BackColor = System.Drawing.SystemColors.ControlLightLight;
             this.richTextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None;
@@ -1469,81 +1471,81 @@ namespace NovetusLauncher
         }
 
         private System.Windows.Forms.Label label17;
-		private System.Windows.Forms.CheckBox checkBox4;
-		private System.Windows.Forms.Button button6;
-		private System.Windows.Forms.TreeView treeView1;
-		private System.Windows.Forms.Label label16;
-		private System.Windows.Forms.Label label12;
-		private System.Windows.Forms.Label label10;
-		private System.Windows.Forms.Label label7;
-		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.TabPage tabPage5;
-		private System.Windows.Forms.Button button23;
-		private System.Windows.Forms.Button button22;
-		private System.Windows.Forms.Button button7;
-		private System.Windows.Forms.PictureBox pictureBox2;
-		private System.Windows.Forms.NumericUpDown numericUpDown3;
-		private System.Windows.Forms.NumericUpDown numericUpDown2;
-		private System.Windows.Forms.NumericUpDown numericUpDown1;
-		private System.Windows.Forms.Button button21;
-		private System.Windows.Forms.Label label29;
-		private System.Windows.Forms.RichTextBox richTextBox2;
-		private System.Windows.Forms.TabPage tabPage8;
-		private System.Windows.Forms.RichTextBox richTextBox1;
-		private System.Windows.Forms.TabPage tabPage7;
-		private System.Windows.Forms.Button button19;
-		private System.Windows.Forms.Button button18;
-		private System.Windows.Forms.Button button16;
-		private System.Windows.Forms.Button button17;
-		private System.Windows.Forms.Button button12;
-		private System.Windows.Forms.Button button13;
-		private System.Windows.Forms.Button button14;
-		private System.Windows.Forms.Button button15;
-		private System.Windows.Forms.Label label36;
-		private System.Windows.Forms.Label label37;
-		private System.Windows.Forms.Label label39;
-		private System.Windows.Forms.Label label38;
-		private System.Windows.Forms.Button button11;
-		private System.Windows.Forms.Button button10;
-		private System.Windows.Forms.Label label14;
-		private System.Windows.Forms.Label label21;
-		private System.Windows.Forms.ListBox listBox3;
-		private System.Windows.Forms.ListBox listBox4;
-		private System.Windows.Forms.TabPage tabPage6;
-		private System.Windows.Forms.Button button9;
+        private System.Windows.Forms.CheckBox checkBox4;
+        private System.Windows.Forms.Button button6;
+        private System.Windows.Forms.TreeView treeView1;
+        private System.Windows.Forms.Label label16;
+        private System.Windows.Forms.Label label12;
+        private System.Windows.Forms.Label label10;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TabPage tabPage5;
+        private System.Windows.Forms.Button button23;
+        private System.Windows.Forms.Button button22;
+        private System.Windows.Forms.Button button7;
+        private System.Windows.Forms.PictureBox pictureBox2;
+        private System.Windows.Forms.NumericUpDown numericUpDown3;
+        private System.Windows.Forms.NumericUpDown numericUpDown2;
+        private System.Windows.Forms.NumericUpDown numericUpDown1;
+        private System.Windows.Forms.Button button21;
+        private System.Windows.Forms.Label label29;
+        private System.Windows.Forms.RichTextBox richTextBox2;
+        private System.Windows.Forms.TabPage tabPage8;
+        private System.Windows.Forms.RichTextBox richTextBox1;
+        private System.Windows.Forms.TabPage tabPage7;
+        private System.Windows.Forms.Button button19;
+        private System.Windows.Forms.Button button18;
+        private System.Windows.Forms.Button button16;
+        private System.Windows.Forms.Button button17;
+        private System.Windows.Forms.Button button12;
+        private System.Windows.Forms.Button button13;
+        private System.Windows.Forms.Button button14;
+        private System.Windows.Forms.Button button15;
+        private System.Windows.Forms.Label label36;
+        private System.Windows.Forms.Label label37;
+        private System.Windows.Forms.Label label39;
+        private System.Windows.Forms.Label label38;
+        private System.Windows.Forms.Button button11;
+        private System.Windows.Forms.Button button10;
+        private System.Windows.Forms.Label label14;
+        private System.Windows.Forms.Label label21;
+        private System.Windows.Forms.ListBox listBox3;
+        private System.Windows.Forms.ListBox listBox4;
+        private System.Windows.Forms.TabPage tabPage6;
+        private System.Windows.Forms.Button button9;
         private System.Windows.Forms.Button SettingsButton;
         private System.Windows.Forms.Button UAButton;
         private System.Windows.Forms.TextBox textBox6;
-		private System.Windows.Forms.Button button8;
-		private System.Windows.Forms.TextBox textBox5;
-		private System.Windows.Forms.Label label35;
-		private System.Windows.Forms.Label label30;
-		private System.Windows.Forms.Label label28;
-		private System.Windows.Forms.Label label27;
-		private System.Windows.Forms.CheckBox checkBox3;
-		private System.Windows.Forms.Label label26;
-		private System.Windows.Forms.Label label25;
-		private System.Windows.Forms.Label label15;
-		private System.Windows.Forms.TextBox textBox2;
-		private System.Windows.Forms.ListBox listBox2;
-		private System.Windows.Forms.TabPage tabPage3;
-		private System.Windows.Forms.Button button5;
-		private System.Windows.Forms.Button button4;
-		private System.Windows.Forms.Label label13;
-		private System.Windows.Forms.Label label11;
-		private System.Windows.Forms.Button button3;
-		private System.Windows.Forms.CheckBox checkBox1;
-		private System.Windows.Forms.Label label8;
-		private System.Windows.Forms.Label label4;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.TextBox textBox1;
-		private System.Windows.Forms.Button button2;
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.TabPage tabPage2;
-		private System.Windows.Forms.TabPage tabPage1;
-		private TabControlWithoutHeader tabControl1;
-		private System.Windows.Forms.TreeView _fieldsTreeCache;
-		private System.Windows.Forms.Button button24;
+        private System.Windows.Forms.Button button8;
+        private System.Windows.Forms.TextBox textBox5;
+        private System.Windows.Forms.Label label35;
+        private System.Windows.Forms.Label label30;
+        private System.Windows.Forms.Label label28;
+        private System.Windows.Forms.Label label27;
+        private System.Windows.Forms.CheckBox checkBox3;
+        private System.Windows.Forms.Label label26;
+        private System.Windows.Forms.Label label25;
+        private System.Windows.Forms.Label label15;
+        private System.Windows.Forms.TextBox textBox2;
+        private System.Windows.Forms.ListBox listBox2;
+        private System.Windows.Forms.TabPage tabPage3;
+        private System.Windows.Forms.Button button5;
+        private System.Windows.Forms.Button button4;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.Button button3;
+        private System.Windows.Forms.CheckBox checkBox1;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.Button button2;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.TabPage tabPage1;
+        private TabControlWithoutHeader tabControl1;
+        private System.Windows.Forms.TreeView _fieldsTreeCache;
+        private System.Windows.Forms.Button button24;
         private System.Windows.Forms.Button button25;
         private System.Windows.Forms.Button button26;
         private System.Windows.Forms.Label label18;
diff --git a/Novetus/NovetusLauncher/MainForm/Extended/MainForm.cs b/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.cs
similarity index 99%
rename from Novetus/NovetusLauncher/MainForm/Extended/MainForm.cs
rename to Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.cs
index 66ba39b..0ffbd1f 100644
--- a/Novetus/NovetusLauncher/MainForm/Extended/MainForm.cs
+++ b/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.cs
@@ -22,11 +22,11 @@ namespace NovetusLauncher
     /// <summary>
     /// Description of MainForm.
     /// </summary>
-    public partial class MainForm : Form
+    public partial class LauncherFormExtended : Form
 	{
 		IDiscordRPC.EventHandlers handlers;
 			
-		public MainForm()
+		public LauncherFormExtended()
 		{
 			_fieldsTreeCache = new TreeView();
             //
diff --git a/Novetus/NovetusLauncher/MainForm/Extended/MainForm.resx b/Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.resx
similarity index 100%
rename from Novetus/NovetusLauncher/MainForm/Extended/MainForm.resx
rename to Novetus/NovetusLauncher/LauncherForm/Extended/LauncherFormExtended.resx
diff --git a/Novetus/NovetusLauncher/Novetus.Launcher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
index 6a19e4a..1abca8e 100644
--- a/Novetus/NovetusLauncher/Novetus.Launcher.csproj
+++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
@@ -145,17 +145,17 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Classes\WinForms\TreeNodeHelper.cs" />
-    <Compile Include="MainForm\Compact\MainForm_legacy.cs">
+    <Compile Include="LauncherForm\Compact\LauncherFormCompact.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MainForm\Compact\MainForm_legacy.Designer.cs">
-      <DependentUpon>MainForm_legacy.cs</DependentUpon>
+    <Compile Include="LauncherForm\Compact\LauncherFormCompact.Designer.cs">
+      <DependentUpon>LauncherFormCompact.cs</DependentUpon>
     </Compile>
-    <Compile Include="MainForm\Compact\NovetusSettings.cs">
+    <Compile Include="LauncherForm\Compact\LauncherFormCompactSettings.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MainForm\Compact\NovetusSettings.Designer.cs">
-      <DependentUpon>NovetusSettings.cs</DependentUpon>
+    <Compile Include="LauncherForm\Compact\LauncherFormCompactSettings.Designer.cs">
+      <DependentUpon>LauncherFormCompactSettings.cs</DependentUpon>
     </Compile>
     <Compile Include="SDK\ClientinfoCreator.cs">
       <SubType>Form</SubType>
@@ -210,11 +210,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="MainForm\Extended\MainForm.cs">
+    <Compile Include="LauncherForm\Extended\LauncherFormExtended.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="MainForm\Extended\MainForm.Designer.cs">
-      <DependentUpon>MainForm.cs</DependentUpon>
+    <Compile Include="LauncherForm\Extended\LauncherFormExtended.Designer.cs">
+      <DependentUpon>LauncherFormExtended.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -226,11 +226,11 @@
     <EmbeddedResource Include="CharacterCustomization\CharacterCustomization.resx">
       <DependentUpon>CharacterCustomization.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="MainForm\Compact\MainForm_legacy.resx">
-      <DependentUpon>MainForm_legacy.cs</DependentUpon>
+    <EmbeddedResource Include="LauncherForm\Compact\LauncherFormCompact.resx">
+      <DependentUpon>LauncherFormCompact.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="MainForm\Compact\NovetusSettings.resx">
-      <DependentUpon>NovetusSettings.cs</DependentUpon>
+    <EmbeddedResource Include="LauncherForm\Compact\LauncherFormCompactSettings.resx">
+      <DependentUpon>LauncherFormCompactSettings.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="SDK\ClientinfoCreator.resx">
       <DependentUpon>ClientinfoCreator.cs</DependentUpon>
@@ -250,8 +250,8 @@
     <EmbeddedResource Include="SDK\SplashTester.resx">
       <DependentUpon>SplashTester.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="MainForm\Extended\MainForm.resx">
-      <DependentUpon>MainForm.cs</DependentUpon>
+    <EmbeddedResource Include="LauncherForm\Extended\LauncherFormExtended.resx">
+      <DependentUpon>LauncherFormExtended.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="SDK\NovetusSDK.resx">
       <DependentUpon>NovetusSDK.cs</DependentUpon>
diff --git a/Novetus/NovetusLauncher/Program.cs b/Novetus/NovetusLauncher/Program.cs
index e324bee..88e3ca9 100644
--- a/Novetus/NovetusLauncher/Program.cs
+++ b/Novetus/NovetusLauncher/Program.cs
@@ -36,10 +36,10 @@ namespace NovetusLauncher
 				switch (GlobalVars.UserConfiguration.LauncherLayout)
                 {
 					case Settings.UIOptions.Style.Compact:
-						Application.Run(new MainForm_legacy());
+						Application.Run(new LauncherFormCompact());
 						break;
 					default:
-						Application.Run(new MainForm());
+						Application.Run(new LauncherFormExtended());
 						break;
 				}
 			}
diff --git a/Novetus/NovetusURI/Form1.Designer.cs b/Novetus/NovetusURI/InstallForm.Designer.cs
similarity index 98%
rename from Novetus/NovetusURI/Form1.Designer.cs
rename to Novetus/NovetusURI/InstallForm.Designer.cs
index 72495ce..8fb1b39 100644
--- a/Novetus/NovetusURI/Form1.Designer.cs
+++ b/Novetus/NovetusURI/InstallForm.Designer.cs
@@ -1,6 +1,6 @@
 namespace NovetusURI
 {
-    partial class Form1
+    partial class InstallForm
     {
         /// <summary>
         /// Required designer variable.
@@ -28,7 +28,7 @@
         /// </summary>
         private void InitializeComponent()
         {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InstallForm));
             this.button1 = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
diff --git a/Novetus/NovetusURI/Form1.cs b/Novetus/NovetusURI/InstallForm.cs
similarity index 93%
rename from Novetus/NovetusURI/Form1.cs
rename to Novetus/NovetusURI/InstallForm.cs
index 423dd5b..6ea5c71 100644
--- a/Novetus/NovetusURI/Form1.cs
+++ b/Novetus/NovetusURI/InstallForm.cs
@@ -3,9 +3,9 @@ using System.Windows.Forms;
 
 namespace NovetusURI
 {
-    public partial class Form1 : Form
+    public partial class InstallForm : Form
     {
-        public Form1()
+        public InstallForm()
         {
             InitializeComponent();
         }
diff --git a/Novetus/NovetusURI/Form1.resx b/Novetus/NovetusURI/InstallForm.resx
similarity index 100%
rename from Novetus/NovetusURI/Form1.resx
rename to Novetus/NovetusURI/InstallForm.resx
diff --git a/Novetus/NovetusURI/URI/LoaderForm.Designer.cs b/Novetus/NovetusURI/LoaderForm.Designer.cs
similarity index 100%
rename from Novetus/NovetusURI/URI/LoaderForm.Designer.cs
rename to Novetus/NovetusURI/LoaderForm.Designer.cs
diff --git a/Novetus/NovetusURI/URI/LoaderForm.cs b/Novetus/NovetusURI/LoaderForm.cs
similarity index 100%
rename from Novetus/NovetusURI/URI/LoaderForm.cs
rename to Novetus/NovetusURI/LoaderForm.cs
diff --git a/Novetus/NovetusURI/URI/LoaderForm.resx b/Novetus/NovetusURI/LoaderForm.resx
similarity index 100%
rename from Novetus/NovetusURI/URI/LoaderForm.resx
rename to Novetus/NovetusURI/LoaderForm.resx
diff --git a/Novetus/NovetusURI/Novetus.URI.csproj b/Novetus/NovetusURI/Novetus.URI.csproj
index c673190..74524bf 100644
--- a/Novetus/NovetusURI/Novetus.URI.csproj
+++ b/Novetus/NovetusURI/Novetus.URI.csproj
@@ -86,29 +86,29 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Classes\URIReg.cs" />
-    <Compile Include="Form1.cs">
+    <Compile Include="InstallForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <Compile Include="InstallForm.Designer.cs">
+      <DependentUpon>InstallForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Classes\LocalVars.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="URI\LoaderForm.cs">
+    <Compile Include="LoaderForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="URI\LoaderForm.Designer.cs">
+    <Compile Include="LoaderForm.Designer.cs">
       <DependentUpon>LoaderForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="URI\QuickConfigure.cs">
+    <Compile Include="QuickConfigure.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="URI\QuickConfigure.Designer.cs">
+    <Compile Include="QuickConfigure.Designer.cs">
       <DependentUpon>QuickConfigure.cs</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <EmbeddedResource Include="InstallForm.resx">
+      <DependentUpon>InstallForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -120,10 +120,10 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="URI\LoaderForm.resx">
+    <EmbeddedResource Include="LoaderForm.resx">
       <DependentUpon>LoaderForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="URI\QuickConfigure.resx">
+    <EmbeddedResource Include="QuickConfigure.resx">
       <DependentUpon>QuickConfigure.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="packages.config" />
@@ -150,6 +150,9 @@
   <ItemGroup>
     <Content Include="NovetusIcon.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="URI\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>SET path=$(SolutionDir)build
diff --git a/Novetus/NovetusURI/Program.cs b/Novetus/NovetusURI/Program.cs
index 1b1b64b..0b9857f 100644
--- a/Novetus/NovetusURI/Program.cs
+++ b/Novetus/NovetusURI/Program.cs
@@ -24,7 +24,7 @@ namespace NovetusURI
             LauncherFuncs.Config(GlobalPaths.ConfigDir + "\\" + GlobalVars.ConfigName, false);
             if (args.Length == 0)
             {
-                Application.Run(new Form1());
+                Application.Run(new InstallForm());
             }
             else
             {
diff --git a/Novetus/NovetusURI/URI/QuickConfigure.Designer.cs b/Novetus/NovetusURI/QuickConfigure.Designer.cs
similarity index 100%
rename from Novetus/NovetusURI/URI/QuickConfigure.Designer.cs
rename to Novetus/NovetusURI/QuickConfigure.Designer.cs
diff --git a/Novetus/NovetusURI/URI/QuickConfigure.cs b/Novetus/NovetusURI/QuickConfigure.cs
similarity index 100%
rename from Novetus/NovetusURI/URI/QuickConfigure.cs
rename to Novetus/NovetusURI/QuickConfigure.cs
diff --git a/Novetus/NovetusURI/URI/QuickConfigure.resx b/Novetus/NovetusURI/QuickConfigure.resx
similarity index 100%
rename from Novetus/NovetusURI/URI/QuickConfigure.resx
rename to Novetus/NovetusURI/QuickConfigure.resx