diff --git a/app/Settings.Designer.cs b/app/Settings.Designer.cs
index 7f8387a14..06264065b 100644
--- a/app/Settings.Designer.cs
+++ b/app/Settings.Designer.cs
@@ -48,8 +48,8 @@ private void InitializeComponent()
             panelFooter = new Panel();
             tableButtons = new TableLayoutPanel();
             buttonKeyboard = new RButton();
-            buttonQuit = new RButton();
             buttonUpdates = new RButton();
+            buttonQuit = new RButton();
             checkStartup = new CheckBox();
             panelPerformance = new Panel();
             tablePerf = new TableLayoutPanel();
@@ -348,13 +348,14 @@ private void InitializeComponent()
             // tableButtons
             // 
             tableButtons.AutoSize = true;
-            tableButtons.ColumnCount = 3;
-            tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
+            tableButtons.ColumnCount = 4;
             tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
             tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
+            tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 8.33083248F));
+            tableButtons.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 25.0024986F));
             tableButtons.Controls.Add(buttonKeyboard, 0, 0);
-            tableButtons.Controls.Add(buttonQuit, 2, 0);
             tableButtons.Controls.Add(buttonUpdates, 1, 0);
+            tableButtons.Controls.Add(buttonQuit, 3, 0);
             tableButtons.Dock = DockStyle.Top;
             tableButtons.Location = new Point(20, 20);
             tableButtons.Name = "tableButtons";
@@ -385,24 +386,6 @@ private void InitializeComponent()
             buttonKeyboard.TextImageRelation = TextImageRelation.ImageBeforeText;
             buttonKeyboard.UseVisualStyleBackColor = false;
             // 
-            // buttonQuit
-            // 
-            buttonQuit.AccessibleName = "Quit Application";
-            buttonQuit.Activated = false;
-            buttonQuit.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-            buttonQuit.BackColor = SystemColors.ControlLight;
-            buttonQuit.BorderColor = Color.Transparent;
-            buttonQuit.BorderRadius = 2;
-            buttonQuit.FlatStyle = FlatStyle.Flat;
-            buttonQuit.Image = Properties.Resources.icons8_quit_32;
-            buttonQuit.Location = new Point(703, 4);
-            buttonQuit.Margin = new Padding(4);
-            buttonQuit.Name = "buttonQuit";
-            buttonQuit.Secondary = true;
-            buttonQuit.Size = new Size(64, 50);
-            buttonQuit.TabIndex = 23;
-            buttonQuit.UseVisualStyleBackColor = false;
-            // 
             // buttonUpdates
             // 
             buttonUpdates.AccessibleName = "BIOS and Driver Updates";
@@ -424,6 +407,24 @@ private void InitializeComponent()
             buttonUpdates.TextImageRelation = TextImageRelation.ImageBeforeText;
             buttonUpdates.UseVisualStyleBackColor = false;
             // 
+            // buttonQuit
+            // 
+            buttonQuit.AccessibleName = "Quit Application";
+            buttonQuit.Activated = false;
+            buttonQuit.BackColor = SystemColors.ControlLight;
+            buttonQuit.BorderColor = Color.Transparent;
+            buttonQuit.BorderRadius = 2;
+            buttonQuit.Dock = DockStyle.Top;
+            buttonQuit.FlatStyle = FlatStyle.Flat;
+            buttonQuit.Location = new Point(580, 4);
+            buttonQuit.Margin = new Padding(4);
+            buttonQuit.Name = "buttonQuit";
+            buttonQuit.Secondary = true;
+            buttonQuit.Size = new Size(187, 50);
+            buttonQuit.TabIndex = 23;
+            buttonQuit.Text = "Quit";
+            buttonQuit.UseVisualStyleBackColor = false;
+            // 
             // checkStartup
             // 
             checkStartup.AutoSize = true;
diff --git a/app/Settings.cs b/app/Settings.cs
index 19ca3918c..62e36d899 100644
--- a/app/Settings.cs
+++ b/app/Settings.cs
@@ -75,7 +75,7 @@ public SettingsForm()
             checkStartup.Text = Properties.Strings.RunOnStartup;
 
             buttonMatrix.Text = Properties.Strings.PictureGif;
-            //buttonQuit.Text = Properties.Strings.Quit;
+            buttonQuit.Text = Properties.Strings.Quit;
             buttonUpdates.Text = Properties.Strings.Updates;
 
             FormClosing += SettingsForm_FormClosing;
@@ -893,8 +893,11 @@ public void SetModeLabel(string modeText)
         public void AutoKeyboard()
         {
 
-            AsusUSB.ApplyAuraPower();
-            AsusUSB.ApplyAura();
+            if (!AppConfig.Is("skip_aura"))
+            {
+                AsusUSB.ApplyAuraPower();
+                AsusUSB.ApplyAura();
+            }
 
             InputDispatcher.SetBacklightAuto(true);
 
diff --git a/app/Settings.resx b/app/Settings.resx
index af32865ec..a395bffc9 100644
--- a/app/Settings.resx
+++ b/app/Settings.resx
@@ -18,7 +18,7 @@
     <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
     <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
     <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
     <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
         <value>[base64 mime encoded serialized .NET Framework object]</value>
     </data>