diff --git a/config/ConfigFormUnit.dfm b/config/ConfigFormUnit.dfm
index d529c36..e5e0ef0 100644
--- a/config/ConfigFormUnit.dfm
+++ b/config/ConfigFormUnit.dfm
@@ -2682,184 +2682,6 @@ object ConfigForm: TConfigForm
   OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 13
-  object AdvDisplayPnl: TPanel
-    Left = 191
-    Top = 8
-    Width = 499
-    Height = 465
-    Color = clWhite
-    ParentBackground = False
-    ShowCaption = False
-    TabOrder = 2
-    Visible = False
-    StyleElements = [seFont, seBorder]
-    object RendererLbl: TLabel
-      Left = 40
-      Top = 28
-      Width = 64
-      Height = 21
-      Caption = 'Renderer'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = 'Segoe UI'
-      Font.Style = []
-      ParentFont = False
-      StyleElements = [seClient, seBorder]
-    end
-    object SavesettingsLbl: TLabel
-      Left = 40
-      Top = 386
-      Width = 212
-      Height = 21
-      Margins.Top = 18
-      Caption = 'Save window position and size'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = 'Segoe UI'
-      Font.Style = []
-      ParentFont = False
-      StyleElements = [seClient, seBorder]
-    end
-    object ShaderLbl: TLabel
-      Left = 40
-      Top = 105
-      Width = 110
-      Height = 21
-      Margins.Top = 18
-      Caption = 'OpenGL Shader'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = 'Segoe UI'
-      Font.Style = []
-      ParentFont = False
-      StyleElements = [seClient, seBorder]
-    end
-    object MaxfpsLbl: TLabel
-      Left = 40
-      Top = 182
-      Width = 111
-      Height = 21
-      Margins.Top = 18
-      Caption = 'Limit frame rate'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = 'Segoe UI'
-      Font.Style = []
-      ParentFont = False
-      StyleElements = [seClient, seBorder]
-    end
-    object BorderLbl: TLabel
-      Left = 40
-      Top = 318
-      Width = 293
-      Height = 21
-      Margins.Top = 18
-      Caption = 'Show window borders in windowed mode'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = 'Segoe UI'
-      Font.Style = []
-      ParentFont = False
-      StyleElements = [seClient, seBorder]
-    end
-    object BoxingLbl: TLabel
-      Left = 40
-      Top = 250
-      Width = 220
-      Height = 21
-      Margins.Top = 18
-      Caption = 'Windowboxing / Integer scaling'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = 'Segoe UI'
-      Font.Style = []
-      ParentFont = False
-      StyleElements = [seClient, seBorder]
-    end
-    object RendererCbx: TComboBox
-      Left = 48
-      Top = 55
-      Width = 185
-      Height = 29
-      BevelEdges = []
-      BevelInner = bvNone
-      BevelOuter = bvSpace
-      Style = csDropDownList
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = 'Segoe UI'
-      Font.Style = []
-      ParentFont = False
-      TabOrder = 0
-      OnChange = RendererCbxChange
-      Items.Strings = (
-        'Automatic'
-        'Direct3D9'
-        'OpenGL'
-        'GDI')
-    end
-    object BorderChk: TToggleSwitch
-      Left = 40
-      Top = 345
-      Width = 50
-      Height = 20
-      ShowStateCaption = False
-      TabOrder = 1
-      OnClick = BorderChkClick
-    end
-    object SavesettingsChk: TToggleSwitch
-      Left = 40
-      Top = 413
-      Width = 50
-      Height = 20
-      ShowStateCaption = False
-      TabOrder = 2
-      OnClick = SavesettingsChkClick
-    end
-    object ShaderCbx: TComboBox
-      Left = 48
-      Top = 132
-      Width = 425
-      Height = 29
-      BevelEdges = []
-      BevelInner = bvNone
-      BevelOuter = bvSpace
-      Style = csDropDownList
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = 'Segoe UI'
-      Font.Style = []
-      ParentFont = False
-      TabOrder = 3
-      OnChange = ShaderCbxChange
-    end
-    object MaxfpsChk: TToggleSwitch
-      Left = 40
-      Top = 209
-      Width = 50
-      Height = 20
-      ShowStateCaption = False
-      TabOrder = 4
-      OnClick = MaxfpsChkClick
-    end
-    object BoxingChk: TToggleSwitch
-      Left = 40
-      Top = 277
-      Width = 50
-      Height = 20
-      ShowStateCaption = False
-      TabOrder = 5
-      OnClick = BoxingChkClick
-    end
-  end
   object DisplayPnl: TPanel
     Left = 191
     Top = 8
@@ -3178,6 +3000,184 @@ object ConfigForm: TConfigForm
       OnClick = NonexclusiveChkClick
     end
   end
+  object AdvDisplayPnl: TPanel
+    Left = 191
+    Top = 8
+    Width = 499
+    Height = 465
+    Color = clWhite
+    ParentBackground = False
+    ShowCaption = False
+    TabOrder = 2
+    Visible = False
+    StyleElements = [seFont, seBorder]
+    object RendererLbl: TLabel
+      Left = 40
+      Top = 28
+      Width = 64
+      Height = 21
+      Caption = 'Renderer'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = 'Segoe UI'
+      Font.Style = []
+      ParentFont = False
+      StyleElements = [seClient, seBorder]
+    end
+    object SavesettingsLbl: TLabel
+      Left = 40
+      Top = 386
+      Width = 256
+      Height = 21
+      Margins.Top = 18
+      Caption = 'Remember window position and size'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = 'Segoe UI'
+      Font.Style = []
+      ParentFont = False
+      StyleElements = [seClient, seBorder]
+    end
+    object ShaderLbl: TLabel
+      Left = 40
+      Top = 105
+      Width = 110
+      Height = 21
+      Margins.Top = 18
+      Caption = 'OpenGL Shader'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = 'Segoe UI'
+      Font.Style = []
+      ParentFont = False
+      StyleElements = [seClient, seBorder]
+    end
+    object MaxfpsLbl: TLabel
+      Left = 40
+      Top = 182
+      Width = 111
+      Height = 21
+      Margins.Top = 18
+      Caption = 'Limit frame rate'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = 'Segoe UI'
+      Font.Style = []
+      ParentFont = False
+      StyleElements = [seClient, seBorder]
+    end
+    object BorderLbl: TLabel
+      Left = 40
+      Top = 318
+      Width = 293
+      Height = 21
+      Margins.Top = 18
+      Caption = 'Show window borders in windowed mode'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = 'Segoe UI'
+      Font.Style = []
+      ParentFont = False
+      StyleElements = [seClient, seBorder]
+    end
+    object BoxingLbl: TLabel
+      Left = 40
+      Top = 250
+      Width = 220
+      Height = 21
+      Margins.Top = 18
+      Caption = 'Windowboxing / Integer scaling'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = 'Segoe UI'
+      Font.Style = []
+      ParentFont = False
+      StyleElements = [seClient, seBorder]
+    end
+    object RendererCbx: TComboBox
+      Left = 48
+      Top = 55
+      Width = 185
+      Height = 29
+      BevelEdges = []
+      BevelInner = bvNone
+      BevelOuter = bvSpace
+      Style = csDropDownList
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = 'Segoe UI'
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 0
+      OnChange = RendererCbxChange
+      Items.Strings = (
+        'Automatic'
+        'Direct3D9'
+        'OpenGL'
+        'GDI')
+    end
+    object BorderChk: TToggleSwitch
+      Left = 40
+      Top = 345
+      Width = 50
+      Height = 20
+      ShowStateCaption = False
+      TabOrder = 1
+      OnClick = BorderChkClick
+    end
+    object SavesettingsChk: TToggleSwitch
+      Left = 40
+      Top = 413
+      Width = 50
+      Height = 20
+      ShowStateCaption = False
+      TabOrder = 2
+      OnClick = SavesettingsChkClick
+    end
+    object ShaderCbx: TComboBox
+      Left = 48
+      Top = 132
+      Width = 425
+      Height = 29
+      BevelEdges = []
+      BevelInner = bvNone
+      BevelOuter = bvSpace
+      Style = csDropDownList
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -16
+      Font.Name = 'Segoe UI'
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 3
+      OnChange = ShaderCbxChange
+    end
+    object MaxfpsChk: TToggleSwitch
+      Left = 40
+      Top = 209
+      Width = 50
+      Height = 20
+      ShowStateCaption = False
+      TabOrder = 4
+      OnClick = MaxfpsChkClick
+    end
+    object BoxingChk: TToggleSwitch
+      Left = 40
+      Top = 277
+      Width = 50
+      Height = 20
+      ShowStateCaption = False
+      TabOrder = 5
+      OnClick = BoxingChkClick
+    end
+  end
   object MenuPnl: TPanel
     Left = 0
     Top = 8
diff --git a/config/cnc-ddraw config.cbproj b/config/cnc-ddraw config.cbproj
index a8d8389..6b5df9a 100644
--- a/config/cnc-ddraw config.cbproj	
+++ b/config/cnc-ddraw config.cbproj	
@@ -6,7 +6,7 @@
         <AppType>Application</AppType>
         <MainSource>cnc-ddraw config.cpp</MainSource>
         <Base>True</Base>
-        <Config Condition="'$(Config)'==''">Debug</Config>
+        <Config Condition="'$(Config)'==''">Release</Config>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <TargetedPlatforms>1</TargetedPlatforms>
     </PropertyGroup>