diff --git a/th2patchlauncher/th2patchlauncher/LauncherForm.cs b/th2patchlauncher/th2patchlauncher/LauncherForm.cs
index 03f4802..2b8e5c2 100644
--- a/th2patchlauncher/th2patchlauncher/LauncherForm.cs
+++ b/th2patchlauncher/th2patchlauncher/LauncherForm.cs
@@ -267,6 +267,70 @@ private void quitButtonClick(object sender, EventArgs e)
             Application.Exit();
         }
 
+        #region [General tab]
+
+
+        private void altSkinsBox_CheckedChanged(object sender, EventArgs e)
+        {
+            op.SetBool("Patch", "MoreSkins", (sender as CheckBox).Checked);
+            swapBox.Enabled = altSkinsBox.Checked;
+        }
+
+        private void swapBox_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            op.SetString("Patch", "DickSwap", ((DickSwap)((sender as ComboBox).SelectedIndex)).ToString());
+        }
+
+        private void skipIntroBox_CheckedChanged(object sender, EventArgs e)
+        {
+            op.SetBool("Patch", "SkipIntro", (sender as CheckBox).Checked);
+        }
+
+        private void separateSaveBox_CheckedChanged(object sender, EventArgs e)
+        {
+            op.SetBool("Patch", "SeparateSaves", (sender as CheckBox).Checked);
+        }
+
+        private void gameBox_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            op.SetString("Patch", "Game", (sender as ComboBox).Text);
+        }
+
+        private void trackBar2_MouseUp(object sender, MouseEventArgs e)
+        {
+            var fog = (int)(Math.Pow(fogSlider.Value, 2) / (float)fogSlider.Maximum + 10f);
+
+            if (fog < 10) fog = 10;
+            if (fog > 750) fog = 750;
+
+            op.SetInt("Video", "FogScale", fog);
+        }
+
+        private void resBox_SelectionChangeCommitted(object sender, EventArgs e)
+        {
+            op.ParseResText(resBox.Text);
+            MaybeUpdateFovBar();
+        }
+
+        #endregion
+
+        #region [Video tab]
+
+        private void rendererBox_CheckedChanged(object sender, EventArgs e)
+        {
+            bool softrender = (sender as CheckBox).Checked;
+
+            op.SetString("Video", "Renderer", softrender ? "Software" : "Hardware");
+
+            if (softrender)
+                force32box.Checked = false;
+        }
+
+        private void fovSlider_Scroll(object sender, EventArgs e)
+        {
+
+        }
+
         private void trackBar1_ValueChanged(object sender, EventArgs e)
         {
             op.ZoomFactor = op.ValidateRange(fovSlider.Value, 30, 140);
@@ -309,15 +373,25 @@ private void trackBar2_Scroll(object sender, EventArgs e)
 
         private void unlockFPSbox_CheckedChanged(object sender, EventArgs e)
         {
+            op.SetBool("Video", "UnlockFPS", (sender as CheckBox).Checked);
 
         }
 
         private void force32box_CheckedChanged(object sender, EventArgs e)
         {
+            op.SetBool("Video", "Force32Bpp", (sender as CheckBox).Checked);
+
+            bool force32bits = (sender as CheckBox).Checked;
 
+            op.SetBool("Video", "Force32Bpp", force32bits);
+
+            if (force32bits)
+                rendererBox.Checked = false;
         }
 
-        #region [Music tab checkboxes]
+        #endregion
+
+        #region [Music tab]
         private void randomBox_CheckedChanged(object sender, EventArgs e)
         {
             op.SetBool("Music", "Random", (sender as CheckBox).Checked);
@@ -344,7 +418,12 @@ private void separateTracksBox_CheckedChanged(object sender, EventArgs e)
         }
         #endregion
 
-        #region [Patches tab checkboxes]
+        #region [Patches tab]
+        private void skyBox_CheckedChanged(object sender, EventArgs e)
+        {
+            op.SetBool("Patch", "DisableSky", (sender as CheckBox).Checked);
+        }
+
         private void vibrationBox_CheckedChanged(object sender, EventArgs e)
         {
             op.SetBool("Input", "Vibration", (sender as CheckBox).Checked);
@@ -360,70 +439,36 @@ private void xinputBox_CheckedChanged(object sender, EventArgs e)
             op.SetBool("Input", "XInput", (sender as CheckBox).Checked);
         }
 
-    #endregion
-
-        private void drawshadowBox_CheckedChanged(object sender, EventArgs e)
-        {
-            op.SetBool("Video", "DrawShadow", (sender as CheckBox).Checked);
-        }
-
-        private void drawhudBox_CheckedChanged(object sender, EventArgs e)
-        {
-            op.SetBool("Video", "ShowHUD", (sender as CheckBox).Checked);
-        }
-
-        private void psxtexBox_CheckedChanged(object sender, EventArgs e)
-        {
-            op.SetBool("Video", "DisableNewTex", (sender as CheckBox).Checked);
-        }
-
         private void userPatchBox_CheckedChanged(object sender, EventArgs e)
         {
             op.SetBool("Patch", "UserPatch", (sender as CheckBox).Checked);
         }
 
-        private void altSkinsBox_CheckedChanged(object sender, EventArgs e)
-        {
-            op.SetBool("Patch", "MoreSkins", (sender as CheckBox).Checked);
-            swapBox.Enabled = altSkinsBox.Checked;
-        }
-
-        private void swapBox_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            op.SetString("Patch", "DickSwap", ((DickSwap)((sender as ComboBox).SelectedIndex)).ToString());
-        }
-
-        private void skipIntroBox_CheckedChanged(object sender, EventArgs e)
+        private void manualsBox_CheckedChanged(object sender, EventArgs e)
         {
-            op.SetBool("Patch", "SkipIntro", (sender as CheckBox).Checked);
+            op.SetBool("Input", "Manuals", (sender as CheckBox).Checked);
         }
 
-        private void separateSaveBox_CheckedChanged(object sender, EventArgs e)
+        private void railBarBox_CheckedChanged(object sender, EventArgs e)
         {
-            op.SetBool("Patch", "SeparateSaves", (sender as CheckBox).Checked);
+            op.SetBool("Patch", "RailBalanceBar", (sender as CheckBox).Checked);
         }
 
-        private void gameBox_SelectedIndexChanged(object sender, EventArgs e)
+        private void drawshadowBox_CheckedChanged(object sender, EventArgs e)
         {
-            op.SetString("Patch", "Game", (sender as ComboBox).Text);
+            op.SetBool("Video", "DrawShadow", (sender as CheckBox).Checked);
         }
 
-        private void trackBar2_MouseUp(object sender, MouseEventArgs e)
+        private void drawhudBox_CheckedChanged(object sender, EventArgs e)
         {
-            var fog = (int)(Math.Pow(fogSlider.Value, 2) / (float)fogSlider.Maximum + 10f);
-
-            if (fog < 10) fog = 10;
-            if (fog > 750) fog = 750;
-
-            op.SetInt("Video", "FogScale", fog);
+            op.SetBool("Video", "ShowHUD", (sender as CheckBox).Checked);
         }
 
-        private void resBox_SelectionChangeCommitted(object sender, EventArgs e)
+        private void psxtexBox_CheckedChanged(object sender, EventArgs e)
         {
-            op.ParseResText(resBox.Text);
-            MaybeUpdateFovBar();
+            op.SetBool("Video", "DisableNewTex", (sender as CheckBox).Checked);
         }
-
+        #endregion
 
         #region [About tab]
         private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -442,30 +487,5 @@ private void linkLabel3_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
         }
         #endregion
 
-
-        private void rendererBox_CheckedChanged(object sender, EventArgs e)
-        {
-
-        }
-
-        private void manualsBox_CheckedChanged(object sender, EventArgs e)
-        {
-            op.SetBool("Input", "Manuals", (sender as CheckBox).Checked);
-        }
-
-        private void skyBox_CheckedChanged(object sender, EventArgs e)
-        {
-            op.SetBool("Patch", "DisableSky", (sender as CheckBox).Checked);
-        }
-
-        private void railBarBox_CheckedChanged(object sender, EventArgs e)
-        {
-            op.SetBool("Patch", "RailBalanceBar", (sender as CheckBox).Checked);
-        }
-
-        private void fovSlider_Scroll(object sender, EventArgs e)
-        {
-
-        }
     }
 }
\ No newline at end of file
diff --git a/th2patchlauncher/th2patchlauncher/th2patchlauncher.csproj b/th2patchlauncher/th2patchlauncher/th2patchlauncher.csproj
index d82a69a..f1591aa 100644
--- a/th2patchlauncher/th2patchlauncher/th2patchlauncher.csproj
+++ b/th2patchlauncher/th2patchlauncher/th2patchlauncher.csproj
@@ -78,6 +78,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="LauncherForm.resx">
       <DependentUpon>LauncherForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>