diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/ApplicationOptionPanel.Designer.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/Application/GeneralOptionPanel.Designer.cs
similarity index 99%
rename from CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/ApplicationOptionPanel.Designer.cs
rename to CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/Application/GeneralOptionPanel.Designer.cs
index f632025c..db1a8d54 100644
--- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/ApplicationOptionPanel.Designer.cs
+++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/Application/GeneralOptionPanel.Designer.cs
@@ -1,6 +1,6 @@
-namespace UniversalEditor.UserInterface.WindowsForms.OptionPanels
+namespace UniversalEditor.UserInterface.WindowsForms.OptionPanels.Application
 {
-    partial class ApplicationOptionPanel
+    partial class GeneralOptionPanel
     {
         /// <summary> 
         /// Required designer variable.
diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/ApplicationOptionPanel.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/Application/GeneralOptionPanel.cs
similarity index 93%
rename from CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/ApplicationOptionPanel.cs
rename to CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/Application/GeneralOptionPanel.cs
index 7128569f..44561eea 100644
--- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/ApplicationOptionPanel.cs
+++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/Application/GeneralOptionPanel.cs
@@ -5,16 +5,16 @@ using System.Drawing;
 using System.Text;
 using System.Windows.Forms;
 
-namespace UniversalEditor.UserInterface.WindowsForms.OptionPanels
+namespace UniversalEditor.UserInterface.WindowsForms.OptionPanels.Application
 {
-	public partial class ApplicationOptionPanel : OptionPanel
+	public partial class GeneralOptionPanel : OptionPanel
 	{
-		public ApplicationOptionPanel()
+		public GeneralOptionPanel()
 		{
 			InitializeComponent();
 		}
 
-		private string[] mvarOptionGroups = new string[] { "Application" };
+		private string[] mvarOptionGroups = new string[] { "Application", "General" };
 		public override string[] OptionGroups { get { return mvarOptionGroups; } }
 
 		public override void LoadSettings()
diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/ApplicationOptionPanel.resx b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/Application/GeneralOptionPanel.resx
similarity index 100%
rename from CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/ApplicationOptionPanel.resx
rename to CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/OptionPanels/Application/GeneralOptionPanel.resx
diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/UniversalEditor.UserInterface.WindowsForms.DesktopApplication.csproj b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/UniversalEditor.UserInterface.WindowsForms.DesktopApplication.csproj
index 637f2092..621f81be 100644
--- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/UniversalEditor.UserInterface.WindowsForms.DesktopApplication.csproj
+++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/UniversalEditor.UserInterface.WindowsForms.DesktopApplication.csproj
@@ -141,11 +141,11 @@
     <Compile Include="MainWindow.Designer.cs">
       <DependentUpon>MainWindow.cs</DependentUpon>
     </Compile>
-    <Compile Include="OptionPanels\ApplicationOptionPanel.cs">
+    <Compile Include="OptionPanels\Application\GeneralOptionPanel.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="OptionPanels\ApplicationOptionPanel.Designer.cs">
-      <DependentUpon>ApplicationOptionPanel.cs</DependentUpon>
+    <Compile Include="OptionPanels\Application\GeneralOptionPanel.Designer.cs">
+      <DependentUpon>GeneralOptionPanel.cs</DependentUpon>
     </Compile>
     <Compile Include="OptionPanels\Application\DocumentsOptionPanel.cs">
       <SubType>UserControl</SubType>
@@ -255,8 +255,8 @@
     <EmbeddedResource Include="MainWindow.resx">
       <DependentUpon>MainWindow.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OptionPanels\ApplicationOptionPanel.resx">
-      <DependentUpon>ApplicationOptionPanel.cs</DependentUpon>
+    <EmbeddedResource Include="OptionPanels\Application\GeneralOptionPanel.resx">
+      <DependentUpon>GeneralOptionPanel.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="OptionPanels\Application\DocumentsOptionPanel.resx">
       <DependentUpon>DocumentsOptionPanel.cs</DependentUpon>