diff --git a/ide/lazarus.lpi b/ide/lazarus.lpi
index ef8ac893b3..4b4639e6dc 100644
--- a/ide/lazarus.lpi
+++ b/ide/lazarus.lpi
@@ -49,7 +49,7 @@
         <PackageName Value="SynEdit"/>
       </Item4>
     </RequiredPackages>
-    <Units Count="70">
+    <Units Count="69">
       <Unit0>
         <Filename Value="lazarus.pp"/>
         <IsPartOfProject Value="True"/>
@@ -118,418 +118,410 @@
         <UnitName Value="fpdoc_options"/>
       </Unit9>
       <Unit10>
-        <Filename Value="ideintf/ideoptionsintf.pas"/>
-        <IsPartOfProject Value="True"/>
-        <ComponentName Value="AbstractIDEOptionsEditor"/>
-        <HasResources Value="True"/>
-        <ResourceBaseClass Value="Frame"/>
-        <UnitName Value="IDEOptionsIntf"/>
-      </Unit10>
-      <Unit11>
         <Filename Value="frames/editor_general_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="EditorGeneralOptionsFrame"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="editor_general_options"/>
-      </Unit11>
-      <Unit12>
+      </Unit10>
+      <Unit11>
         <Filename Value="frames/editor_display_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="EditorDisplayOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="editor_display_options"/>
-      </Unit12>
-      <Unit13>
+      </Unit11>
+      <Unit12>
         <Filename Value="frames/editor_keymapping_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="EditorKeymappingOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="editor_keymapping_options"/>
-      </Unit13>
-      <Unit14>
+      </Unit12>
+      <Unit13>
         <Filename Value="frames/editor_color_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="EditorColorOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="editor_color_options"/>
-      </Unit14>
-      <Unit15>
+      </Unit13>
+      <Unit14>
         <Filename Value="frames/editor_codetools_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="EditorCodetoolsOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="editor_codetools_options"/>
-      </Unit15>
-      <Unit16>
+      </Unit14>
+      <Unit15>
         <Filename Value="frames/editor_codefolding_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="EditorCodefoldingOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="editor_codefolding_options"/>
-      </Unit16>
-      <Unit17>
+      </Unit15>
+      <Unit16>
         <Filename Value="frames/codetools_general_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CodetoolsGeneralOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="codetools_general_options"/>
-      </Unit17>
-      <Unit18>
+      </Unit16>
+      <Unit17>
         <Filename Value="frames/codetools_codecreation_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CodetoolsCodeCreationOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="codetools_codecreation_options"/>
-      </Unit18>
-      <Unit19>
+      </Unit17>
+      <Unit18>
         <Filename Value="frames/codetools_wordpolicy_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CodetoolsWordPolicyOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="codetools_wordpolicy_options"/>
-      </Unit19>
-      <Unit20>
+      </Unit18>
+      <Unit19>
         <Filename Value="frames/codetools_linesplitting_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CodetoolsLineSplittingOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="codetools_linesplitting_options"/>
-      </Unit20>
-      <Unit21>
+      </Unit19>
+      <Unit20>
         <Filename Value="frames/codetools_space_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CodetoolsSpaceOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="codetools_space_options"/>
-      </Unit21>
-      <Unit22>
+      </Unit20>
+      <Unit21>
         <Filename Value="frames/codetools_identifiercompletion_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CodetoolsIndentifierComplietionOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="codetools_identifiercompletion_options"/>
-      </Unit22>
-      <Unit23>
+      </Unit21>
+      <Unit22>
         <Filename Value="frames/editor_general_misc_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="EditorGeneralMiscOptionsFrame"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="editor_general_misc_options"/>
-      </Unit23>
-      <Unit24>
+      </Unit22>
+      <Unit23>
         <Filename Value="../debugger/frames/debugger_general_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="DebuggerGeneralOptionsFrame"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="debugger_general_options"/>
-      </Unit24>
-      <Unit25>
+      </Unit23>
+      <Unit24>
         <Filename Value="../debugger/frames/debugger_eventlog_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="DebuggerEventLogOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="debugger_eventlog_options"/>
-      </Unit25>
-      <Unit26>
+      </Unit24>
+      <Unit25>
         <Filename Value="../debugger/frames/debugger_language_exceptions_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="DebuggerLanguageExceptionsOptions"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="debugger_language_exceptions_options"/>
-      </Unit26>
-      <Unit27>
+      </Unit25>
+      <Unit26>
         <Filename Value="../debugger/frames/debugger_signals_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="DebuggerSignalsOptions"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="debugger_signals_options"/>
-      </Unit27>
-      <Unit28>
+      </Unit26>
+      <Unit27>
         <Filename Value="projectresources.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ProjectResources"/>
-      </Unit28>
-      <Unit29>
+      </Unit27>
+      <Unit28>
         <Filename Value="w32manifest.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="W32Manifest"/>
-      </Unit29>
-      <Unit30>
+      </Unit28>
+      <Unit29>
         <Filename Value="projecticon.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ProjectIcon"/>
-      </Unit30>
-      <Unit31>
+      </Unit29>
+      <Unit30>
         <Filename Value="w32versioninfo.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="W32VersionInfo"/>
-      </Unit31>
-      <Unit32>
+      </Unit30>
+      <Unit31>
         <Filename Value="frames/compiler_condtree.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompOptsCondTreeFrame"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="Compiler_CondTree"/>
-      </Unit32>
-      <Unit33>
+      </Unit31>
+      <Unit32>
         <Filename Value="frames/compiler_buildvar_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompOptBuildVarsFrame"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="Compiler_BuildVar_Options"/>
-      </Unit33>
-      <Unit34>
+      </Unit32>
+      <Unit33>
         <Filename Value="sourceeditor.pp"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="SourceNotebook"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="SourceEditor"/>
-      </Unit34>
-      <Unit35>
+      </Unit33>
+      <Unit34>
         <Filename Value="componentlist.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="ComponentListForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="ComponentList"/>
-      </Unit35>
-      <Unit36>
+      </Unit34>
+      <Unit35>
         <Filename Value="frames/codeexplorer_update_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CodeExplorerUpdateOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="codeexplorer_update_options"/>
-      </Unit36>
-      <Unit37>
+      </Unit35>
+      <Unit36>
         <Filename Value="frames/codeexplorer_categories_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CodeExplorerCategoriesOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="codeexplorer_categories_options"/>
-      </Unit37>
-      <Unit38>
+      </Unit36>
+      <Unit37>
         <Filename Value="frames/codeobserver_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CodeObserverOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="codeobserver_options"/>
-      </Unit38>
-      <Unit39>
+      </Unit37>
+      <Unit38>
         <Filename Value="frames/help_general_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="HelpGeneralOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="help_general_options"/>
-      </Unit39>
-      <Unit40>
+      </Unit38>
+      <Unit39>
         <Filename Value="frames/editor_mouseaction_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="EditorMouseOptionsFrame"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="editor_mouseaction_options"/>
-      </Unit40>
-      <Unit41>
+      </Unit39>
+      <Unit40>
         <Filename Value="frames/editor_mouseaction_options_advanced.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="EditorMouseOptionsAdvFrame"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="editor_mouseaction_options_advanced"/>
-      </Unit41>
-      <Unit42>
+      </Unit40>
+      <Unit41>
         <Filename Value="main.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Main"/>
-      </Unit42>
-      <Unit43>
+      </Unit41>
+      <Unit42>
         <Filename Value="../designer/designer.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Designer"/>
-      </Unit43>
-      <Unit44>
+      </Unit42>
+      <Unit43>
         <Filename Value="../designer/designerprocs.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="DesignerProcs"/>
-      </Unit44>
-      <Unit45>
+      </Unit43>
+      <Unit44>
         <Filename Value="codebrowser.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CodeBrowserView"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="CodeBrowser"/>
-      </Unit45>
-      <Unit46>
+      </Unit44>
+      <Unit45>
         <Filename Value="frames/buildmodeseditor.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="BuildModesEditorFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="BuildModesEditor"/>
-      </Unit46>
-      <Unit47>
+      </Unit45>
+      <Unit46>
         <Filename Value="project.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Project"/>
-      </Unit47>
-      <Unit48>
+      </Unit46>
+      <Unit47>
         <Filename Value="customformeditor.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="CustomFormEditor"/>
-      </Unit48>
-      <Unit49>
+      </Unit47>
+      <Unit48>
         <Filename Value="aboutfrm.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="AboutForm"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="AboutFrm"/>
-      </Unit49>
-      <Unit50>
+      </Unit48>
+      <Unit49>
         <Filename Value="helpmanager.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="HelpSelectorDialog"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="HelpManager"/>
-      </Unit50>
-      <Unit51>
+      </Unit49>
+      <Unit50>
         <Filename Value="../designer/askcompnamedlg.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="AskCompNameDialog"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="AskCompNameDlg"/>
-      </Unit51>
-      <Unit52>
+      </Unit50>
+      <Unit51>
         <Filename Value="frames/project_application_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="ProjectApplicationOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="project_application_options"/>
-      </Unit52>
-      <Unit53>
+      </Unit51>
+      <Unit52>
         <Filename Value="frames/project_forms_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="ProjectFormsOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="project_forms_options"/>
-      </Unit53>
-      <Unit54>
+      </Unit52>
+      <Unit53>
         <Filename Value="frames/project_lazdoc_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="ProjectLazDocOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="project_lazdoc_options"/>
-      </Unit54>
-      <Unit55>
+      </Unit53>
+      <Unit54>
         <Filename Value="frames/project_save_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="ProjectSaveOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="project_save_options"/>
-      </Unit55>
-      <Unit56>
+      </Unit54>
+      <Unit55>
         <Filename Value="frames/project_versioninfo_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="ProjectVersionInfoOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="project_versioninfo_options"/>
-      </Unit56>
-      <Unit57>
+      </Unit55>
+      <Unit56>
         <Filename Value="frames/project_i18n_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="ProjectI18NOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="project_i18n_options"/>
-      </Unit57>
-      <Unit58>
+      </Unit56>
+      <Unit57>
         <Filename Value="frames/project_misc_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="ProjectMiscOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="project_misc_options"/>
-      </Unit58>
-      <Unit59>
+      </Unit57>
+      <Unit58>
         <Filename Value="frames/compiler_messages_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompilerMessagesOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="compiler_messages_options"/>
-      </Unit59>
-      <Unit60>
+      </Unit58>
+      <Unit59>
         <Filename Value="frames/compiler_path_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompilerPathOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="compiler_path_options"/>
-      </Unit60>
-      <Unit61>
+      </Unit59>
+      <Unit60>
         <Filename Value="frames/compiler_parsing_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompilerParsingOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="compiler_parsing_options"/>
-      </Unit61>
-      <Unit62>
+      </Unit60>
+      <Unit61>
         <Filename Value="frames/compiler_codegen_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompilerCodegenOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="compiler_codegen_options"/>
-      </Unit62>
-      <Unit63>
+      </Unit61>
+      <Unit62>
         <Filename Value="frames/compiler_linking_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompilerLinkingOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="compiler_linking_options"/>
-      </Unit63>
-      <Unit64>
+      </Unit62>
+      <Unit63>
         <Filename Value="frames/compiler_verbosity_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompilerVerbosityOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="compiler_verbosity_options"/>
-      </Unit64>
-      <Unit65>
+      </Unit63>
+      <Unit64>
         <Filename Value="frames/compiler_other_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompilerOtherOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="compiler_other_options"/>
-      </Unit65>
-      <Unit66>
+      </Unit64>
+      <Unit65>
         <Filename Value="frames/compiler_inherited_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompilerInheritedOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="compiler_inherited_options"/>
-      </Unit66>
-      <Unit67>
+      </Unit65>
+      <Unit66>
         <Filename Value="frames/compiler_compilation_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompilerCompilationOptionsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="compiler_compilation_options"/>
-      </Unit67>
-      <Unit68>
+      </Unit66>
+      <Unit67>
         <Filename Value="frames/compiler_conditionals_options.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="CompOptsConditionalsFrame"/>
         <ResourceBaseClass Value="Frame"/>
         <UnitName Value="compiler_conditionals_options"/>
-      </Unit68>
-      <Unit69>
+      </Unit67>
+      <Unit68>
         <Filename Value="debugmanager.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="DebugManager"/>
-      </Unit69>
+      </Unit68>
     </Units>
   </ProjectOptions>
   <CompilerOptions>