diff --git a/components/jcf2/CommandLine/Lazarus/jcf.lpi b/components/jcf2/CommandLine/Lazarus/jcf.lpi
index 4e7119aded..a29f0152a2 100644
--- a/components/jcf2/CommandLine/Lazarus/jcf.lpi
+++ b/components/jcf2/CommandLine/Lazarus/jcf.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <CONFIG>
   <ProjectOptions>
-    <PathDelim Value="\"/>
+    <PathDelim Value="/"/>
     <Version Value="6"/>
     <General>
       <MainUnit Value="0"/>
@@ -30,1162 +30,1345 @@
         <PackageName Value="LCL"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="132">
+    <Units Count="150">
       <Unit0>
         <Filename Value="JCF.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="52" Y="384"/>
-        <TopLine Value="368"/>
-        <EditorIndex Value="0"/>
-        <UsageCount Value="79"/>
+        <CursorPos X="1" Y="48"/>
+        <TopLine Value="37"/>
+        <UsageCount Value="82"/>
         <Bookmarks Count="1">
           <Item0 X="17" Y="397" ID="1"/>
         </Bookmarks>
-        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
-        <Filename Value="..\..\laz_svn\0.9.25\fpc_bad_test\test.pp"/>
+        <Filename Value="../../laz_svn/0.9.25/fpc_bad_test/test.pp"/>
         <UnitName Value="test"/>
         <CursorPos X="17" Y="6"/>
         <TopLine Value="1"/>
         <UsageCount Value="6"/>
       </Unit1>
       <Unit2>
-        <Filename Value="..\Include\JcfGlobal.inc"/>
+        <Filename Value="../Include/JcfGlobal.inc"/>
         <CursorPos X="1" Y="4"/>
         <TopLine Value="1"/>
         <UsageCount Value="8"/>
       </Unit2>
       <Unit3>
-        <Filename Value="..\Settings\JcfRegistrySettings.pas"/>
+        <Filename Value="../Settings/JcfRegistrySettings.pas"/>
         <UnitName Value="JcfRegistrySettings"/>
         <CursorPos X="41" Y="251"/>
         <TopLine Value="230"/>
         <UsageCount Value="8"/>
       </Unit3>
       <Unit4>
-        <Filename Value="..\ReadWrite\ConvertTypes.pas"/>
+        <Filename Value="../ReadWrite/ConvertTypes.pas"/>
         <UnitName Value="ConvertTypes"/>
         <CursorPos X="78" Y="67"/>
         <TopLine Value="47"/>
         <UsageCount Value="8"/>
       </Unit4>
       <Unit5>
-        <Filename Value="..\Utils\FileUtils.pas"/>
+        <Filename Value="../Utils/FileUtils.pas"/>
         <UnitName Value="FileUtils"/>
         <CursorPos X="1" Y="63"/>
         <TopLine Value="57"/>
         <UsageCount Value="8"/>
       </Unit5>
       <Unit6>
-        <Filename Value="..\Ui\fJcfErrorDisplay.pas"/>
+        <Filename Value="../Ui/fJcfErrorDisplay.pas"/>
         <ComponentName Value="ExceptionDialog"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <ResourceFilename Value="..\Ui\fJcfErrorDisplay.lrs"/>
+        <ResourceFilename Value="../Ui/fJcfErrorDisplay.lrs"/>
         <UnitName Value="fJcfErrorDisplay"/>
         <CursorPos X="44" Y="64"/>
         <TopLine Value="49"/>
         <UsageCount Value="8"/>
       </Unit6>
       <Unit7>
-        <Filename Value="..\Parse\UI\fShowParseTree.pas"/>
+        <Filename Value="../Parse/UI/fShowParseTree.pas"/>
         <ComponentName Value="frmShowParseTree"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <ResourceFilename Value="..\Parse\UI\fShowParseTree.lrs"/>
+        <ResourceFilename Value="../Parse/UI/fShowParseTree.lrs"/>
         <UnitName Value="fShowParseTree"/>
         <CursorPos X="99" Y="296"/>
         <TopLine Value="282"/>
         <UsageCount Value="7"/>
       </Unit7>
       <Unit8>
-        <Filename Value="..\..\Parse\Tokens.pas"/>
+        <Filename Value="../../Parse/Tokens.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Tokens"/>
         <CursorPos X="11" Y="416"/>
         <TopLine Value="398"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
         <Bookmarks Count="1">
           <Item0 X="35" Y="886" ID="1"/>
         </Bookmarks>
       </Unit8>
       <Unit9>
-        <Filename Value="..\..\Utils\JcfUnicode.pas"/>
+        <Filename Value="../../Utils/JcfUnicode.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfUnicode"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit9>
       <Unit10>
-        <Filename Value="..\..\Utils\JcfMiscFunctions.pas"/>
+        <Filename Value="../../Utils/JcfMiscFunctions.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JCFMiscFunctions"/>
         <CursorPos X="11" Y="272"/>
         <TopLine Value="272"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit10>
       <Unit11>
-        <Filename Value="..\..\Parse\BuildTokenList.pas"/>
+        <Filename Value="../../Parse/BuildTokenList.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="BuildTokenList"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit11>
       <Unit12>
-        <Filename Value="..\..\Settings\JcfRegistrySettings.pas"/>
+        <Filename Value="../../Settings/JcfRegistrySettings.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JCFRegistrySettings"/>
         <CursorPos X="22" Y="245"/>
         <TopLine Value="226"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit12>
       <Unit13>
-        <Filename Value="..\..\Utils\JcfUtils.pas"/>
+        <Filename Value="../../Utils/JcfUtils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfUtils"/>
         <CursorPos X="62" Y="510"/>
         <TopLine Value="489"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit13>
       <Unit14>
-        <Filename Value="..\..\Settings\SettingsTypes.pas"/>
+        <Filename Value="../../Settings/SettingsTypes.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SettingsTypes"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit14>
       <Unit15>
-        <Filename Value="..\..\Parse\TokenUtils.pas"/>
+        <Filename Value="../../Parse/TokenUtils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TokenUtils"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit15>
       <Unit16>
-        <Filename Value="..\..\Settings\Streams\SettingsStream.pas"/>
+        <Filename Value="../../Settings/Streams/SettingsStream.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SettingsStream"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit16>
       <Unit17>
-        <Filename Value="..\..\Settings\SetClarify.pas"/>
+        <Filename Value="../../Settings/SetClarify.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetClarify"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit17>
       <Unit18>
-        <Filename Value="..\..\Settings\SetReplace.pas"/>
+        <Filename Value="../../Settings/SetReplace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetReplace"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit18>
       <Unit19>
-        <Filename Value="..\..\VersionConsts.pas"/>
+        <Filename Value="../../VersionConsts.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="VersionConsts"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit19>
       <Unit20>
-        <Filename Value="..\..\Settings\JCFSettings.pas"/>
+        <Filename Value="../../Settings/JCFSettings.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JCFSettings"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit20>
       <Unit21>
-        <Filename Value="..\..\Parse\AsmKeywords.pas"/>
+        <Filename Value="../../Parse/AsmKeywords.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AsmKeywords"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit21>
       <Unit22>
-        <Filename Value="..\..\Parse\BuildParseTree.pas"/>
+        <Filename Value="../../Parse/BuildParseTree.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="BuildParseTree"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit22>
       <Unit23>
-        <Filename Value="..\..\Process\BaseVisitor.pas"/>
+        <Filename Value="../../Process/BaseVisitor.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="BaseVisitor"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit23>
       <Unit24>
-        <Filename Value="..\..\ReadWrite\Converter.pas"/>
+        <Filename Value="../../ReadWrite/Converter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Converter"/>
         <CursorPos X="15" Y="7"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit24>
       <Unit25>
-        <Filename Value="..\..\Utils\JcfFontSetFunctions.pas"/>
+        <Filename Value="../../Utils/JcfFontSetFunctions.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfFontSetFunctions"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit25>
       <Unit26>
-        <Filename Value="..\..\Parse\UI\fShowParseTree.pas"/>
+        <Filename Value="../../Parse/UI/fShowParseTree.pas"/>
         <ComponentName Value="frmShowParseTree"/>
         <HasResources Value="True"/>
         <IsPartOfProject Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <ResourceFilename Value="..\..\Parse\UI\fShowParseTree.lrs"/>
+        <ResourceFilename Value="../../Parse/UI/fShowParseTree.lrs"/>
         <UnitName Value="fShowParseTree"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit26>
       <Unit27>
-        <Filename Value="..\..\Process\VisitSetXY.pas"/>
+        <Filename Value="../../Process/VisitSetXY.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="VisitSetXY"/>
         <CursorPos X="80" Y="10"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit27>
       <Unit28>
-        <Filename Value="..\..\Process\FormatFlags.pas"/>
+        <Filename Value="../../Process/FormatFlags.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="FormatFlags"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit28>
       <Unit29>
-        <Filename Value="..\..\Process\Obfuscate\FixCase.pas"/>
+        <Filename Value="../../Process/Obfuscate/FixCase.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="FixCase"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit29>
       <Unit30>
-        <Filename Value="..\..\Process\Obfuscate\RemoveComment.pas"/>
+        <Filename Value="../../Process/Obfuscate/RemoveComment.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveComment"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit30>
       <Unit31>
-        <Filename Value="..\..\Process\Obfuscate\RemoveUnneededWhiteSpace.pas"/>
+        <Filename Value="../../Process/Obfuscate/RemoveUnneededWhiteSpace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveUnneededWhiteSpace"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit31>
       <Unit32>
-        <Filename Value="..\..\Process\Obfuscate\RemoveReturn.pas"/>
+        <Filename Value="../../Process/Obfuscate/RemoveReturn.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveReturn"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit32>
       <Unit33>
-        <Filename Value="..\..\Process\Obfuscate\RebreakLines.pas"/>
+        <Filename Value="../../Process/Obfuscate/RebreakLines.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RebreakLines"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit33>
       <Unit34>
-        <Filename Value="..\..\Process\RemoveEmptyComment.pas"/>
+        <Filename Value="../../Process/RemoveEmptyComment.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveEmptyComment"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit34>
       <Unit35>
-        <Filename Value="..\..\Process\Capitalisation\IdentifierCaps.pas"/>
+        <Filename Value="../../Process/Capitalisation/IdentifierCaps.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="IdentifierCaps"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit35>
       <Unit36>
-        <Filename Value="..\..\Process\Capitalisation\Capitalisation.pas"/>
+        <Filename Value="../../Process/Capitalisation/Capitalisation.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Capitalisation"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit36>
       <Unit37>
-        <Filename Value="..\..\Process\Returns\ReturnChars.pas"/>
+        <Filename Value="../../Process/Returns/ReturnChars.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ReturnChars"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit37>
       <Unit38>
-        <Filename Value="..\..\Process\Returns\BlockStyles.pas"/>
+        <Filename Value="../../Process/Returns/BlockStyles.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="BlockStyles"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit38>
       <Unit39>
-        <Filename Value="..\..\Process\Spacing\TabToSpace.pas"/>
+        <Filename Value="../../Process/Spacing/TabToSpace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TabToSpace"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit39>
       <Unit40>
-        <Filename Value="..\..\Process\Spacing\SpaceToTab.pas"/>
+        <Filename Value="../../Process/Spacing/SpaceToTab.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SpaceToTab"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit40>
       <Unit41>
-        <Filename Value="..\..\Process\Spacing\MaxSpaces.pas"/>
+        <Filename Value="../../Process/Spacing/MaxSpaces.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="MaxSpaces"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit41>
       <Unit42>
-        <Filename Value="..\..\Process\Spacing\SingleSpaceBefore.pas"/>
+        <Filename Value="../../Process/Spacing/SingleSpaceBefore.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SingleSpaceBefore"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="35"/>
+        <UsageCount Value="38"/>
       </Unit42>
       <Unit43>
-        <Filename Value="..\..\Process\Spacing\SingleSpaceAfter.pas"/>
+        <Filename Value="../../Process/Spacing/SingleSpaceAfter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SingleSpaceAfter"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="35"/>
+        <UsageCount Value="38"/>
       </Unit43>
       <Unit44>
-        <Filename Value="..\..\Process\Spacing\SpaceBeforeColon.pas"/>
+        <Filename Value="../../Process/Spacing/SpaceBeforeColon.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SpaceBeforeColon"/>
         <CursorPos X="39" Y="17"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit44>
       <Unit45>
-        <Filename Value="..\..\Process\Indent\Indenter.pas"/>
+        <Filename Value="../../Process/Indent/Indenter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Indenter"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit45>
       <Unit46>
-        <Filename Value="..\..\Process\Returns\LongLineBreaker.pas"/>
+        <Filename Value="../../Process/Returns/LongLineBreaker.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="LongLineBreaker"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit46>
       <Unit47>
-        <Filename Value="..\..\Process\Info\BasicStats.pas"/>
+        <Filename Value="../../Process/Info/BasicStats.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="BasicStats"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit47>
       <Unit48>
-        <Filename Value="..\..\Parse\PreProcessor\PreProcessorExpressionTokens.pas"/>
+        <Filename Value="../../Parse/PreProcessor/PreProcessorExpressionTokens.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PreProcessorExpressionTokens"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit48>
       <Unit49>
-        <Filename Value="..\..\Parse\PreProcessor\PreProcessorExpressionTokenise.pas"/>
+        <Filename Value="../../Parse/PreProcessor/PreProcessorExpressionTokenise.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PreProcessorExpressionTokenise"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit49>
       <Unit50>
-        <Filename Value="..\..\ReadWrite\FileConverter.pas"/>
+        <Filename Value="../../ReadWrite/FileConverter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="FileConverter"/>
         <CursorPos X="24" Y="12"/>
         <TopLine Value="1"/>
-        <UsageCount Value="35"/>
+        <UsageCount Value="38"/>
       </Unit50>
       <Unit51>
-        <Filename Value="..\..\Utils\JcfUnicodeFiles.pas"/>
+        <Filename Value="../../Utils/JcfUnicodeFiles.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JcfUnicodeFiles"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <CursorPos X="13" Y="51"/>
+        <TopLine Value="38"/>
+        <UsageCount Value="37"/>
       </Unit51>
       <Unit52>
-        <Filename Value="..\..\Ui\fJcfErrorDisplay.pas"/>
+        <Filename Value="../../Ui/fJcfErrorDisplay.pas"/>
         <ComponentName Value="ExceptionDialog"/>
         <HasResources Value="True"/>
         <IsPartOfProject Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <ResourceFilename Value="..\..\Ui\fJcfErrorDisplay.lrs"/>
+        <ResourceFilename Value="../../Ui/fJcfErrorDisplay.lrs"/>
         <UnitName Value="fJcfErrorDisplay"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="34"/>
+        <UsageCount Value="37"/>
       </Unit52>
       <Unit53>
-        <Filename Value="..\CommandLineConstants.pas"/>
+        <Filename Value="../CommandLineConstants.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="CommandLineConstants"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="33"/>
+        <UsageCount Value="36"/>
       </Unit53>
       <Unit54>
-        <Filename Value="..\StatusMessageReceiver.pas"/>
+        <Filename Value="../StatusMessageReceiver.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="StatusMessageReceiver"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="33"/>
+        <UsageCount Value="36"/>
       </Unit54>
       <Unit55>
-        <Filename Value="..\CommandLineReturnCode.pas"/>
+        <Filename Value="../CommandLineReturnCode.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="CommandLineReturnCode"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="33"/>
+        <UsageCount Value="36"/>
       </Unit55>
       <Unit56>
-        <Filename Value="..\..\ReadWrite\ConvertTypes.pas"/>
+        <Filename Value="../../ReadWrite/ConvertTypes.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ConvertTypes"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit56>
       <Unit57>
-        <Filename Value="..\..\Parse\ParseError.pas"/>
+        <Filename Value="../../Parse/ParseError.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ParseError"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit57>
       <Unit58>
-        <Filename Value="..\..\Parse\ParseTreeNode.pas"/>
+        <Filename Value="../../Parse/ParseTreeNode.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ParseTreeNode"/>
         <CursorPos X="46" Y="21"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit58>
       <Unit59>
-        <Filename Value="..\..\Parse\ParseTreeNodeType.pas"/>
+        <Filename Value="../../Parse/ParseTreeNodeType.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ParseTreeNodeType"/>
         <CursorPos X="37" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit59>
       <Unit60>
-        <Filename Value="..\..\Parse\SourceToken.pas"/>
+        <Filename Value="../../Parse/SourceToken.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SourceToken"/>
         <CursorPos X="13" Y="68"/>
         <TopLine Value="50"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit60>
       <Unit61>
-        <Filename Value="..\..\Parse\SourceTokenList.pas"/>
+        <Filename Value="../../Parse/SourceTokenList.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SourceTokenList"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit61>
       <Unit62>
-        <Filename Value="..\..\Utils\FileUtils.pas"/>
+        <Filename Value="../../Utils/FileUtils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="FileUtils"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit62>
       <Unit63>
-        <Filename Value="..\..\Utils\JcfLog.pas"/>
+        <Filename Value="../../Utils/JcfLog.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JCFLog"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit63>
       <Unit64>
-        <Filename Value="..\..\Settings\SetUses.pas"/>
+        <Filename Value="../../Settings/SetUses.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetUses"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit64>
       <Unit65>
-        <Filename Value="..\..\Settings\JCFSetBase.pas"/>
+        <Filename Value="../../Settings/JCFSetBase.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JCFSetBase"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit65>
       <Unit66>
-        <Filename Value="..\..\Settings\SetAlign.pas"/>
+        <Filename Value="../../Settings/SetAlign.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetAlign"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit66>
       <Unit67>
-        <Filename Value="..\..\Settings\SetCaps.pas"/>
+        <Filename Value="../../Settings/SetCaps.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetCaps"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit67>
       <Unit68>
-        <Filename Value="..\..\Settings\SetFile.pas"/>
+        <Filename Value="../../Settings/SetFile.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetFile"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit68>
       <Unit69>
-        <Filename Value="..\..\Settings\SetIndent.pas"/>
+        <Filename Value="../../Settings/SetIndent.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetIndent"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit69>
       <Unit70>
-        <Filename Value="..\..\Settings\SetObfuscate.pas"/>
+        <Filename Value="../../Settings/SetObfuscate.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetObfuscate"/>
         <CursorPos X="99" Y="2"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit70>
       <Unit71>
-        <Filename Value="..\..\Process\Warnings\WarnUnusedParam.pas"/>
+        <Filename Value="../../Process/Warnings/WarnUnusedParam.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="WarnUnusedParam"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit71>
       <Unit72>
-        <Filename Value="..\..\Process\Warnings\WarnDestroy.pas"/>
+        <Filename Value="../../Process/Warnings/WarnDestroy.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="WarnDestroy"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit72>
       <Unit73>
-        <Filename Value="..\..\Process\Warnings\WarnAssignToFunctionName.pas"/>
+        <Filename Value="../../Process/Warnings/WarnAssignToFunctionName.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="WarnAssignToFunctionName"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit73>
       <Unit74>
-        <Filename Value="..\..\Process\Capitalisation\UnitNameCaps.pas"/>
+        <Filename Value="../../Process/Capitalisation/UnitNameCaps.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UnitNameCaps"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit74>
       <Unit75>
-        <Filename Value="..\..\Process\Transform\SortUsesData.pas"/>
+        <Filename Value="../../Process/Transform/SortUsesData.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SortUsesData"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit75>
       <Unit76>
-        <Filename Value="..\..\Process\Capitalisation\SpecificWordCaps.pas"/>
+        <Filename Value="../../Process/Capitalisation/SpecificWordCaps.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SpecificWordCaps"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit76>
       <Unit77>
-        <Filename Value="..\..\Settings\SetWordList.pas"/>
+        <Filename Value="../../Settings/SetWordList.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetWordList"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit77>
       <Unit78>
-        <Filename Value="..\..\Settings\SetPreProcessor.pas"/>
+        <Filename Value="../../Settings/SetPreProcessor.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetPreprocessor"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit78>
       <Unit79>
-        <Filename Value="..\..\Utils\JCFHelp.pas"/>
+        <Filename Value="../../Utils/JCFHelp.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="JCFHelp"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit79>
       <Unit80>
-        <Filename Value="..\..\Settings\SetReturns.pas"/>
+        <Filename Value="../../Settings/SetReturns.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetReturns"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit80>
       <Unit81>
-        <Filename Value="..\..\Settings\SetSpaces.pas"/>
+        <Filename Value="../../Settings/SetSpaces.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetSpaces"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit81>
       <Unit82>
-        <Filename Value="..\..\Settings\Streams\RegistrySettings.pas"/>
+        <Filename Value="../../Settings/Streams/RegistrySettings.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RegistrySettings"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit82>
       <Unit83>
-        <Filename Value="..\..\Process\Obfuscate\ReduceWhiteSpace.pas"/>
+        <Filename Value="../../Process/Obfuscate/ReduceWhiteSpace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ReduceWhiteSpace"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit83>
       <Unit84>
-        <Filename Value="..\..\Process\Obfuscate\RemoveConsecutiveWhiteSpace.pas"/>
+        <Filename Value="../../Process/Obfuscate/RemoveConsecutiveWhiteSpace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveConsecutiveWhiteSpace"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit84>
       <Unit85>
-        <Filename Value="..\..\Process\Warnings\WarnRealType.pas"/>
+        <Filename Value="../../Process/Warnings/WarnRealType.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="WarnRealType"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit85>
       <Unit86>
-        <Filename Value="..\..\Process\Warnings\WarnCaseNoElse.pas"/>
+        <Filename Value="../../Process/Warnings/WarnCaseNoElse.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="WarnCaseNoElse"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit86>
       <Unit87>
-        <Filename Value="..\..\Process\Warnings\WarnEmptyBlock.pas"/>
+        <Filename Value="../../Process/Warnings/WarnEmptyBlock.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="WarnEmptyBlock"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit87>
       <Unit88>
-        <Filename Value="..\..\Process\Warnings\Warning.pas"/>
+        <Filename Value="../../Process/Warnings/Warning.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Warning"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit88>
       <Unit89>
-        <Filename Value="..\..\Process\Spacing\NoSpaceBefore.pas"/>
+        <Filename Value="../../Process/Spacing/NoSpaceBefore.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="NoSpaceBefore"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit89>
       <Unit90>
-        <Filename Value="..\..\Process\Spacing\NoSpaceAfter.pas"/>
+        <Filename Value="../../Process/Spacing/NoSpaceAfter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="NoSpaceAfter"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit90>
       <Unit91>
-        <Filename Value="..\..\Process\Returns\ReturnAfter.pas"/>
+        <Filename Value="../../Process/Returns/ReturnAfter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ReturnAfter"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit91>
       <Unit92>
-        <Filename Value="..\..\Process\Nesting.pas"/>
+        <Filename Value="../../Process/Nesting.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="Nesting"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit92>
       <Unit93>
-        <Filename Value="..\..\Process\VisitSetNesting.pas"/>
+        <Filename Value="../../Process/VisitSetNesting.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="VisitSetNesting"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit93>
       <Unit94>
-        <Filename Value="..\..\Process\Returns\ReturnBefore.pas"/>
+        <Filename Value="../../Process/Returns/ReturnBefore.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ReturnBefore"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="28"/>
       </Unit94>
       <Unit95>
-        <Filename Value="..\..\Process\Returns\NoReturnAfter.pas"/>
+        <Filename Value="../../Process/Returns/NoReturnAfter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="NoReturnAfter"/>
         <CursorPos X="80" Y="6"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit95>
       <Unit96>
-        <Filename Value="..\..\Process\Returns\NoReturnBefore.pas"/>
+        <Filename Value="../../Process/Returns/NoReturnBefore.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="NoReturnBefore"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit96>
       <Unit97>
-        <Filename Value="..\..\Process\AllProcesses.pas"/>
+        <Filename Value="../../Process/AllProcesses.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AllProcesses"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit97>
       <Unit98>
-        <Filename Value="..\..\Process\Obfuscate\RemoveBlankLine.pas"/>
+        <Filename Value="../../Process/Obfuscate/RemoveBlankLine.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveBlankLine"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit98>
       <Unit99>
-        <Filename Value="..\..\Process\SwitchableVisitor.pas"/>
+        <Filename Value="../../Process/SwitchableVisitor.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SwitchableVisitor"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit99>
       <Unit100>
-        <Filename Value="..\..\Process\Returns\PropertyOnOneLine.pas"/>
+        <Filename Value="../../Process/Returns/PropertyOnOneLine.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PropertyOnOneLine"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit100>
       <Unit101>
-        <Filename Value="..\..\Process\VisitStripEmptySpace.pas"/>
+        <Filename Value="../../Process/VisitStripEmptySpace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="VisitStripEmptySpace"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit101>
       <Unit102>
-        <Filename Value="..\..\Process\Returns\RemoveBlankLinesAfterProcHeader.pas"/>
+        <Filename Value="../../Process/Returns/RemoveBlankLinesAfterProcHeader.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveBlankLinesAfterProcHeader"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit102>
       <Unit103>
-        <Filename Value="..\..\Process\Returns\RemoveBlankLinesInVars.pas"/>
+        <Filename Value="../../Process/Returns/RemoveBlankLinesInVars.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveBlankLinesInVars"/>
         <CursorPos X="57" Y="14"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit103>
       <Unit104>
-        <Filename Value="..\..\Process\Returns\RemoveReturnsBeforeEnd.pas"/>
+        <Filename Value="../../Process/Returns/RemoveReturnsBeforeEnd.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveReturnsBeforeEnd"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit104>
       <Unit105>
-        <Filename Value="..\..\Process\Returns\RemoveReturnsAfterBegin.pas"/>
+        <Filename Value="../../Process/Returns/RemoveReturnsAfterBegin.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveReturnsAfterBegin"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit105>
       <Unit106>
-        <Filename Value="..\..\Utils\IntList.pas"/>
+        <Filename Value="../../Utils/IntList.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="IntList"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit106>
       <Unit107>
-        <Filename Value="..\..\Process\Align\AlignConst.pas"/>
+        <Filename Value="../../Process/Align/AlignConst.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignConst"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit107>
       <Unit108>
-        <Filename Value="..\..\Process\Align\AlignBase.pas"/>
+        <Filename Value="../../Process/Align/AlignBase.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignBase"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit108>
       <Unit109>
-        <Filename Value="..\..\Process\Align\AlignAssign.pas"/>
+        <Filename Value="../../Process/Align/AlignAssign.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignAssign"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit109>
       <Unit110>
-        <Filename Value="..\..\Process\Align\AlignVars.pas"/>
+        <Filename Value="../../Process/Align/AlignVars.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignVars"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit110>
       <Unit111>
-        <Filename Value="..\..\Process\Align\AlignTypedef.pas"/>
+        <Filename Value="../../Process/Align/AlignTypedef.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignTypedef"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit111>
       <Unit112>
-        <Filename Value="..\..\Process\Align\AlignComment.pas"/>
+        <Filename Value="../../Process/Align/AlignComment.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignComment"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit112>
       <Unit113>
-        <Filename Value="..\..\Parse\PreProcessor\PreProcessorExpressionParser.pas"/>
+        <Filename Value="../../Parse/PreProcessor/PreProcessorExpressionParser.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PreProcessorExpressionParser"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit113>
       <Unit114>
-        <Filename Value="..\..\Process\Spacing\RemoveSpaceAtLineEnd.pas"/>
+        <Filename Value="../../Process/Spacing/RemoveSpaceAtLineEnd.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveSpaceAtLineEnd"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit114>
       <Unit115>
-        <Filename Value="..\..\Process\Transform\FindReplace.pas"/>
+        <Filename Value="../../Process/Transform/FindReplace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="FindReplace"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit115>
       <Unit116>
-        <Filename Value="..\..\Process\Returns\ReturnsAfterFinalEnd.pas"/>
+        <Filename Value="../../Process/Returns/ReturnsAfterFinalEnd.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="ReturnsAfterFinalEnd"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit116>
       <Unit117>
-        <Filename Value="..\..\Parse\PreProcessor\PreProcessorParseTree.pas"/>
+        <Filename Value="../../Parse/PreProcessor/PreProcessorParseTree.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PreProcessorParseTree"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit117>
       <Unit118>
-        <Filename Value="..\..\Process\Returns\RemoveConsecutiveReturns.pas"/>
+        <Filename Value="../../Process/Returns/RemoveConsecutiveReturns.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveConsecutiveReturns"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit118>
       <Unit119>
-        <Filename Value="..\..\Process\Transform\UsesClauseFindReplace.pas"/>
+        <Filename Value="../../Process/Transform/UsesClauseFindReplace.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UsesClauseFindReplace"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit119>
       <Unit120>
-        <Filename Value="..\..\Process\Transform\UsesClauseInsert.pas"/>
+        <Filename Value="../../Process/Transform/UsesClauseInsert.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UsesClauseInsert"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit120>
       <Unit121>
-        <Filename Value="..\..\Process\Transform\UsesClauseRemove.pas"/>
+        <Filename Value="../../Process/Transform/UsesClauseRemove.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="UsesClauseRemove"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit121>
       <Unit122>
-        <Filename Value="..\..\Settings\SetComments.pas"/>
+        <Filename Value="../../Settings/SetComments.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetComments"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit122>
       <Unit123>
-        <Filename Value="..\..\Process\TreeWalker.pas"/>
+        <Filename Value="../../Process/TreeWalker.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TreeWalker"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit123>
       <Unit124>
-        <Filename Value="..\..\Process\Transform\AddBlockEndSemicolon.pas"/>
+        <Filename Value="../../Process/Transform/AddBlockEndSemicolon.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AddBlockEndSemicolon"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit124>
       <Unit125>
-        <Filename Value="..\..\Process\Transform\AddBeginEnd.pas"/>
+        <Filename Value="../../Process/Transform/AddBeginEnd.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AddBeginEnd"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit125>
       <Unit126>
-        <Filename Value="..\..\Settings\SetTransform.pas"/>
+        <Filename Value="../../Settings/SetTransform.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetTransform"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit126>
       <Unit127>
-        <Filename Value="..\..\Process\Align\AlignField.pas"/>
+        <Filename Value="../../Process/Align/AlignField.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="AlignField"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit127>
       <Unit128>
-        <Filename Value="..\..\Process\Transform\SortUses.pas"/>
+        <Filename Value="../../Process/Transform/SortUses.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SortUses"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit128>
       <Unit129>
-        <Filename Value="..\..\Settings\SetAsm.pas"/>
+        <Filename Value="../../Settings/SetAsm.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="SetAsm"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit129>
       <Unit130>
-        <Filename Value="..\..\Process\Returns\RemoveReturnsAfter.pas"/>
+        <Filename Value="../../Process/Returns/RemoveReturnsAfter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="RemoveReturnsAfter"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit130>
       <Unit131>
-        <Filename Value="..\..\Process\Indent\IndentAsmParam.pas"/>
+        <Filename Value="../../Process/Indent/IndentAsmParam.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="IndentAsmParam"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="24"/>
+        <UsageCount Value="27"/>
       </Unit131>
+      <Unit132>
+        <Filename Value="../../../../ide/lazarusidestrconsts.pas"/>
+        <UnitName Value="LazarusIDEStrConsts"/>
+        <CursorPos X="3" Y="358"/>
+        <TopLine Value="345"/>
+        <UsageCount Value="10"/>
+      </Unit132>
+      <Unit133>
+        <Filename Value="../../../../ide/mainbase.pas"/>
+        <UnitName Value="MainBase"/>
+        <CursorPos X="67" Y="706"/>
+        <TopLine Value="696"/>
+        <UsageCount Value="10"/>
+      </Unit133>
+      <Unit134>
+        <Filename Value="../../../../ideintf/menuintf.pas"/>
+        <UnitName Value="MenuIntf"/>
+        <CursorPos X="32" Y="432"/>
+        <TopLine Value="419"/>
+        <EditorIndex Value="5"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit134>
+      <Unit135>
+        <Filename Value="../../../../ide/mainbar.pas"/>
+        <UnitName Value="MainBar"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="4"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit135>
+      <Unit136>
+        <Filename Value="../../../synedit/syneditkeycmds.pp"/>
+        <UnitName Value="SynEditKeyCmds"/>
+        <CursorPos X="3" Y="118"/>
+        <TopLine Value="114"/>
+        <UsageCount Value="10"/>
+      </Unit136>
+      <Unit137>
+        <Filename Value="../../../../ideintf/idecommands.pas"/>
+        <UnitName Value="IDECommands"/>
+        <CursorPos X="10" Y="514"/>
+        <TopLine Value="501"/>
+        <EditorIndex Value="2"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit137>
+      <Unit138>
+        <Filename Value="../../../../ide/main.pp"/>
+        <UnitName Value="Main"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="3"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit138>
+      <Unit139>
+        <Filename Value="../../../../ideintf/ideimagesintf.pas"/>
+        <UnitName Value="IDEImagesIntf"/>
+        <CursorPos X="29" Y="149"/>
+        <TopLine Value="133"/>
+        <UsageCount Value="10"/>
+      </Unit139>
+      <Unit140>
+        <Filename Value="../../../../lcl/imglist.pp"/>
+        <UnitName Value="ImgList"/>
+        <CursorPos X="14" Y="167"/>
+        <TopLine Value="154"/>
+        <UsageCount Value="10"/>
+      </Unit140>
+      <Unit141>
+        <Filename Value="../../../../ide/svnshowlogfrm.pas"/>
+        <ComponentName Value="SVNShowLogForm"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="SVNShowLogFrm"/>
+        <CursorPos X="32" Y="35"/>
+        <TopLine Value="28"/>
+        <UsageCount Value="10"/>
+      </Unit141>
+      <Unit142>
+        <Filename Value="../../../../ide/svnupdate.pas"/>
+        <ComponentName Value="SVNUpdateFrm"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
+        <UnitName Value="SVNUpdate"/>
+        <CursorPos X="30" Y="31"/>
+        <TopLine Value="19"/>
+        <UsageCount Value="10"/>
+      </Unit142>
+      <Unit143>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintf.pas"/>
+        <UnitName Value="LazSVNIntf"/>
+        <CursorPos X="70" Y="37"/>
+        <TopLine Value="26"/>
+        <EditorIndex Value="0"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit143>
+      <Unit144>
+        <Filename Value="../../../printers/design/ideprinting.pas"/>
+        <UnitName Value="ideprinting"/>
+        <CursorPos X="1" Y="113"/>
+        <TopLine Value="85"/>
+        <UsageCount Value="10"/>
+      </Unit144>
+      <Unit145>
+        <Filename Value="../../../printers/design/printers4lazide.pas"/>
+        <UnitName Value="printers4lazide"/>
+        <CursorPos X="9" Y="10"/>
+        <TopLine Value="1"/>
+        <UsageCount Value="10"/>
+      </Unit145>
+      <Unit146>
+        <Filename Value="../../../printers/design/sourceprinter.pas"/>
+        <UnitName Value="SourcePrinter"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="114"/>
+        <UsageCount Value="10"/>
+      </Unit146>
+      <Unit147>
+        <Filename Value="../../../../ideintf/srceditorintf.pas"/>
+        <UnitName Value="SrcEditorIntf"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="289"/>
+        <UsageCount Value="10"/>
+      </Unit147>
+      <Unit148>
+        <Filename Value="../../../datadict/reglazdatadict.pp"/>
+        <UnitName Value="reglazdatadict"/>
+        <CursorPos X="41" Y="38"/>
+        <TopLine Value="25"/>
+        <EditorIndex Value="6"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit148>
+      <Unit149>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintfpkg.pas"/>
+        <UnitName Value="LazSVNIntfPkg"/>
+        <CursorPos X="30" Y="12"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="1"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit149>
     </Units>
-    <JumpHistory Count="18" HistoryIndex="17">
+    <JumpHistory Count="28" HistoryIndex="27">
       <Position1>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="188" Column="16" TopLine="157"/>
+        <Filename Value="../../../../ide/main.pp"/>
+        <Caret Line="129" Column="33" TopLine="110"/>
       </Position1>
       <Position2>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="96" Column="12" TopLine="73"/>
+        <Filename Value="../../../../ide/main.pp"/>
+        <Caret Line="2241" Column="47" TopLine="2227"/>
       </Position2>
       <Position3>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="384" Column="1" TopLine="366"/>
+        <Filename Value="../../../../ide/main.pp"/>
+        <Caret Line="306" Column="28" TopLine="294"/>
       </Position3>
       <Position4>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="386" Column="1" TopLine="368"/>
+        <Filename Value="../../../../ide/main.pp"/>
+        <Caret Line="2241" Column="9" TopLine="2227"/>
       </Position4>
       <Position5>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="388" Column="1" TopLine="370"/>
+        <Filename Value="../../../../ide/main.pp"/>
+        <Caret Line="2242" Column="9" TopLine="2228"/>
       </Position5>
       <Position6>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="390" Column="1" TopLine="372"/>
+        <Filename Value="../../../../ide/main.pp"/>
+        <Caret Line="2243" Column="11" TopLine="2229"/>
       </Position6>
       <Position7>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="395" Column="1" TopLine="377"/>
+        <Filename Value="../../../../ide/main.pp"/>
+        <Caret Line="2240" Column="18" TopLine="2230"/>
       </Position7>
       <Position8>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="397" Column="17" TopLine="378"/>
+        <Filename Value="../../../../ide/main.pp"/>
+        <Caret Line="2240" Column="38" TopLine="2230"/>
       </Position8>
       <Position9>
-        <Filename Value="JCF.lpr"/>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintf.pas"/>
         <Caret Line="1" Column="1" TopLine="1"/>
       </Position9>
       <Position10>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="166" Column="14" TopLine="148"/>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintf.pas"/>
+        <Caret Line="60" Column="51" TopLine="47"/>
       </Position10>
       <Position11>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="202" Column="16" TopLine="184"/>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintf.pas"/>
+        <Caret Line="37" Column="57" TopLine="29"/>
       </Position11>
       <Position12>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="307" Column="20" TopLine="289"/>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintf.pas"/>
+        <Caret Line="32" Column="65" TopLine="2"/>
       </Position12>
       <Position13>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="386" Column="23" TopLine="378"/>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintf.pas"/>
+        <Caret Line="35" Column="1" TopLine="28"/>
       </Position13>
       <Position14>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="384" Column="1" TopLine="366"/>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintf.pas"/>
+        <Caret Line="55" Column="50" TopLine="42"/>
       </Position14>
       <Position15>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="384" Column="1" TopLine="366"/>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintf.pas"/>
+        <Caret Line="59" Column="15" TopLine="48"/>
       </Position15>
       <Position16>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="386" Column="26" TopLine="368"/>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintf.pas"/>
+        <Caret Line="63" Column="6" TopLine="48"/>
       </Position16>
       <Position17>
-        <Filename Value="JCF.lpr"/>
-        <Caret Line="68" Column="3" TopLine="37"/>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintf.pas"/>
+        <Caret Line="67" Column="40" TopLine="57"/>
       </Position17>
       <Position18>
-        <Filename Value="JCF.lpr"/>
+        <Filename Value="../../../datadict/reglazdatadict.pp"/>
         <Caret Line="1" Column="1" TopLine="1"/>
       </Position18>
+      <Position19>
+        <Filename Value="../../../datadict/reglazdatadict.pp"/>
+        <Caret Line="381" Column="7" TopLine="375"/>
+      </Position19>
+      <Position20>
+        <Filename Value="../../../datadict/reglazdatadict.pp"/>
+        <Caret Line="94" Column="32" TopLine="9"/>
+      </Position20>
+      <Position21>
+        <Filename Value="../../../datadict/reglazdatadict.pp"/>
+        <Caret Line="5" Column="53" TopLine="1"/>
+      </Position21>
+      <Position22>
+        <Filename Value="../../../../ide/mainbar.pas"/>
+        <Caret Line="281" Column="29" TopLine="276"/>
+      </Position22>
+      <Position23>
+        <Filename Value="../../../../ide/mainbar.pas"/>
+        <Caret Line="282" Column="19" TopLine="269"/>
+      </Position23>
+      <Position24>
+        <Filename Value="../../../../ide/mainbar.pas"/>
+        <Caret Line="283" Column="19" TopLine="270"/>
+      </Position24>
+      <Position25>
+        <Filename Value="../../../../ide/mainbar.pas"/>
+        <Caret Line="284" Column="19" TopLine="271"/>
+      </Position25>
+      <Position26>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintf.pas"/>
+        <Caret Line="54" Column="29" TopLine="47"/>
+      </Position26>
+      <Position27>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintf.pas"/>
+        <Caret Line="84" Column="44" TopLine="64"/>
+      </Position27>
+      <Position28>
+        <Filename Value="../../../../../../../../media/My Book/C/lazarus/svn/lazsvnpkg/lazsvnintfpkg.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
+      </Position28>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="8"/>
-    <PathDelim Value="\"/>
     <SearchPaths>
-      <IncludeFiles Value="..\..\Include\"/>
-      <OtherUnitFiles Value="..\..\Output\Lazarus\"/>
-      <UnitOutputDirectory Value="..\..\Output\Lazarus"/>
-      <SrcPath Value="..\..\Include\"/>
+      <IncludeFiles Value="../../Include/"/>
+      <OtherUnitFiles Value="../../Output/Lazarus/"/>
+      <UnitOutputDirectory Value="../../Output/Lazarus"/>
+      <SrcPath Value="../../Include/"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>
@@ -1196,4 +1379,12 @@
       <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
+  <Debugging>
+    <BreakPoints Count="1">
+      <Item1>
+        <Source Value="JCF.lpr"/>
+        <Line Value="54"/>
+      </Item1>
+    </BreakPoints>
+  </Debugging>
 </CONFIG>
diff --git a/ide/abstractsmethodsdlg.lfm b/ide/abstractsmethodsdlg.lfm
index 0aa885bace..fe356db733 100644
--- a/ide/abstractsmethodsdlg.lfm
+++ b/ide/abstractsmethodsdlg.lfm
@@ -3,126 +3,290 @@ object AbstractMethodsDialog: TAbstractMethodsDialog
   Height = 344
   Top = 291
   Width = 581
+  HelpContext = 0
   ActiveControl = MethodsCheckListBox
+  Align = alNone
+  AllowDropFiles = False
+  AutoScroll = True
+  AutoSize = False
+  BorderIcons = [biSystemMenu, biMinimize, biMaximize]
+  BorderStyle = bsSizeable
   Caption = 'AbstractMethodsDialog'
+  ChildSizing.LeftRightSpacing = 0
+  ChildSizing.TopBottomSpacing = 0
+  ChildSizing.HorizontalSpacing = 0
+  ChildSizing.VerticalSpacing = 0
+  ChildSizing.ControlsPerLine = 0
   ClientHeight = 344
   ClientWidth = 581
+  DockSite = False
+  DragKind = dkDrag
+  DragMode = dmManual
+  Enabled = True
+  Font.Height = 0
+  Font.Style = []
+  FormStyle = fsNormal
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  ParentBiDiMode = True
   ParentFont = False
-  LCLVersion = '0.9.25'
+  Position = poDesigned
+  ShowInTaskBar = stDefault
+  UseDockManager = False
+  LCLVersion = '0.9.27'
+  WindowState = wsNormal
   object NoteLabel: TLabel
-    Height = 14
-    Width = 581
+    Left = 6
+    Height = 18
+    Top = 6
+    Width = 569
+    HelpContext = 0
     Align = alTop
+    Alignment = taLeftJustify
+    AutoSize = True
+    BorderSpacing.Left = 0
+    BorderSpacing.Top = 0
+    BorderSpacing.Right = 0
+    BorderSpacing.Bottom = 0
+    BorderSpacing.Around = 6
+    BorderSpacing.CellAlignHorizontal = ccaFill
+    BorderSpacing.CellAlignVertical = ccaFill
     Caption = 'NoteLabel'
+    DragCursor = crDrag
+    DragMode = dmManual
+    Enabled = True
+    Layout = tlTop
+    ParentBidiMode = True
     ParentColor = False
+    ParentFont = True
+    ParentShowHint = True
+    ShowAccelChar = True
+    Transparent = True
+    Visible = True
     WordWrap = True
+    OptimalFill = False
   end
   object MethodsGroupBox: TGroupBox
-    Height = 280
-    Top = 14
-    Width = 581
+    Left = 6
+    Height = 260
+    Top = 30
+    Width = 569
+    HelpContext = 0
     Align = alClient
+    AutoSize = False
+    BorderSpacing.Left = 0
+    BorderSpacing.Top = 0
+    BorderSpacing.Right = 0
+    BorderSpacing.Bottom = 0
+    BorderSpacing.Around = 6
+    BorderSpacing.CellAlignHorizontal = ccaFill
+    BorderSpacing.CellAlignVertical = ccaFill
     Caption = 'MethodsGroupBox'
-    ClientHeight = 262
-    ClientWidth = 577
+    ChildSizing.LeftRightSpacing = 0
+    ChildSizing.TopBottomSpacing = 0
+    ChildSizing.HorizontalSpacing = 0
+    ChildSizing.VerticalSpacing = 0
+    ChildSizing.ControlsPerLine = 0
+    ClientHeight = 241
+    ClientWidth = 565
+    Ctl3D = False
+    DockSite = False
+    DragCursor = crDrag
+    DragKind = dkDrag
+    DragMode = dmManual
+    Enabled = True
+    ParentBidiMode = True
+    ParentColor = True
+    ParentCtl3D = True
+    ParentFont = True
+    ParentShowHint = True
     TabOrder = 0
+    TabStop = False
+    Visible = True
     object MethodsCheckListBox: TCheckListBox
       AnchorSideBottom.Control = SelectAllButton
-      Height = 227
-      Width = 577
+      Left = 6
+      Height = 194
+      Top = 6
+      Width = 553
+      HelpContext = 0
       Align = alTop
+      AllowGrayed = False
       Anchors = [akTop, akLeft, akRight, akBottom]
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
+      BorderSpacing.Around = 6
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
+      BorderStyle = bsSingle
+      Columns = 0
+      DragCursor = crDrag
+      DragMode = dmManual
+      ExtendedSelect = True
+      Enabled = True
+      IntegralHeight = False
+      ItemHeight = 0
+      MultiSelect = False
       OnClickCheck = MethodsCheckListBoxClickCheck
+      ParentBidiMode = True
+      ParentFont = True
+      ParentShowHint = True
+      Sorted = False
+      Style = lbStandard
       TabOrder = 0
+      TabStop = True
+      TopIndex = -1
+      Visible = True
     end
     object SelectAllButton: TButton
       AnchorSideLeft.Control = MethodsGroupBox
       AnchorSideBottom.Control = MethodsGroupBox
       AnchorSideBottom.Side = asrBottom
       Left = 6
-      Height = 23
-      Top = 233
-      Width = 98
+      Height = 29
+      Top = 206
+      Width = 110
+      HelpContext = 0
+      Align = alNone
       Anchors = [akLeft, akBottom]
       AutoSize = True
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
       BorderSpacing.Around = 6
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
+      Cancel = False
       Caption = 'SelectAllButton'
+      Default = False
+      DragCursor = crDrag
+      DragMode = dmManual
+      Enabled = True
+      ParentBidiMode = True
+      ModalResult = 0
       OnClick = SelectAllButtonClick
+      ParentFont = True
+      ParentShowHint = True
       TabOrder = 1
+      TabStop = True
+      Visible = True
     end
     object SelectNoneButton: TButton
       AnchorSideLeft.Control = SelectAllButton
       AnchorSideLeft.Side = asrBottom
       AnchorSideBottom.Control = MethodsGroupBox
       AnchorSideBottom.Side = asrBottom
-      Left = 110
-      Height = 23
-      Top = 233
-      Width = 112
+      Left = 122
+      Height = 29
+      Top = 206
+      Width = 129
+      HelpContext = 0
+      Align = alNone
       Anchors = [akLeft, akBottom]
       AutoSize = True
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
       BorderSpacing.Around = 6
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
+      Cancel = False
       Caption = 'SelectNoneButton'
+      Default = False
+      DragCursor = crDrag
+      DragMode = dmManual
+      Enabled = True
+      ParentBidiMode = True
+      ModalResult = 0
       OnClick = SelectNoneButtonClick
+      ParentFont = True
+      ParentShowHint = True
       TabOrder = 2
+      TabStop = True
+      Visible = True
     end
   end
-  object BtnPanel: TPanel
-    Height = 50
-    Top = 294
-    Width = 581
+  object ButtonPanel: TButtonPanel
+    Left = 6
+    Height = 48
+    Top = 296
+    Width = 569
+    HelpContext = 0
     Align = alBottom
-    BevelOuter = bvNone
-    ClientHeight = 50
-    ClientWidth = 581
+    AutoSize = True
+    ButtonOrder = boDefault
     TabOrder = 1
-    object CancelBitBtn: TBitBtn
-      Left = 517
-      Height = 38
-      Top = 6
-      Width = 58
+    DefaultButton = pbOK
+    ShowButtons = [pbCancel, pbHelp]
+    ShowGlyphs = [pbOK, pbCancel, pbClose, pbHelp]
+    Visible = True
+    object AddFirstButton: TBitBtn
+      Left = 510
+      Height = 34
+      Top = 8
+      Width = 53
+      HelpContext = 0
       Align = alRight
       AutoSize = True
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
       BorderSpacing.Around = 6
-      Cancel = True
-      Caption = 'Cancel'
-      Kind = bkCancel
-      ModalResult = 2
-      NumGlyphs = 0
-      TabOrder = 0
-    end
-    object AddFirstBitBtn: TBitBtn
-      Left = 392
-      Height = 38
-      Top = 6
-      Width = 43
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = '&Yes'
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
+      Cancel = False
+      Caption = '&OK'
       Default = True
-      Kind = bkYes
-      ModalResult = 6
+      Enabled = True
+      Kind = bkOK
+      Layout = blGlyphLeft
+      Margin = -1
+      ModalResult = 1
       NumGlyphs = 0
-      OnClick = AddFirstBitBtnClick
-      TabOrder = 1
+      OnClick = AddFirstButtonClick
+      ParentFont = True
+      ParentShowHint = True
+      Spacing = 3
+      TabOrder = 4
+      TabStop = True
+      Visible = True
     end
-    object AddAllBitBtn: TBitBtn
-      Left = 441
-      Height = 38
-      Top = 6
-      Width = 70
+    object AddAllButton: TBitBtn
+      Left = 458
+      Height = 34
+      Top = 8
+      Width = 46
+      HelpContext = 0
       Align = alRight
       AutoSize = True
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
       BorderSpacing.Around = 6
-      Caption = 'Yes to &All'
-      Kind = bkYesToAll
-      ModalResult = 10
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
+      Cancel = False
+      Caption = '&All'
+      Default = False
+      Enabled = True
+      Kind = bkAll
+      Layout = blGlyphLeft
+      Margin = -1
+      ModalResult = 8
       NumGlyphs = 0
-      OnClick = AddAllBitBtnClick
-      TabOrder = 2
+      OnClick = AddAllButtonClick
+      ParentFont = True
+      ParentShowHint = True
+      Spacing = 3
+      TabOrder = 5
+      TabStop = True
+      Visible = True
     end
   end
 end
diff --git a/ide/abstractsmethodsdlg.lrs b/ide/abstractsmethodsdlg.lrs
index ab9f34de64..1a14fe37e7 100644
--- a/ide/abstractsmethodsdlg.lrs
+++ b/ide/abstractsmethodsdlg.lrs
@@ -2,41 +2,95 @@
 
 LazarusResources.Add('TAbstractMethodsDialog','FORMDATA',[
   'TPF0'#22'TAbstractMethodsDialog'#21'AbstractMethodsDialog'#4'Left'#3'^'#1#6
-  +'Height'#3'X'#1#3'Top'#3'#'#1#5'Width'#3'E'#2#13'ActiveControl'#7#19'Methods'
-  +'CheckListBox'#7'Caption'#6#21'AbstractMethodsDialog'#12'ClientHeight'#3'X'#1
-  +#11'ClientWidth'#3'E'#2#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormD'
-  +'estroy'#10'ParentFont'#8#10'LCLVersion'#6#6'0.9.25'#0#6'TLabel'#9'NoteLabel'
-  +#6'Height'#2#14#5'Width'#3'E'#2#5'Align'#7#5'alTop'#7'Caption'#6#9'NoteLabel'
-  +#11'ParentColor'#8#8'WordWrap'#9#0#0#9'TGroupBox'#15'MethodsGroupBox'#6'Heig'
-  +'ht'#3#24#1#3'Top'#2#14#5'Width'#3'E'#2#5'Align'#7#8'alClient'#7'Caption'#6
-  +#15'MethodsGroupBox'#12'ClientHeight'#3#6#1#11'ClientWidth'#3'A'#2#8'TabOrde'
-  +'r'#2#0#0#13'TCheckListBox'#19'MethodsCheckListBox'#24'AnchorSideBottom.Cont'
-  +'rol'#7#15'SelectAllButton'#6'Height'#3#227#0#5'Width'#3'A'#2#5'Align'#7#5'a'
-  +'lTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#12'OnClickC'
-  +'heck'#7#29'MethodsCheckListBoxClickCheck'#8'TabOrder'#2#0#0#0#7'TButton'#15
-  +'SelectAllButton'#22'AnchorSideLeft.Control'#7#15'MethodsGroupBox'#24'Anchor'
-  +'SideBottom.Control'#7#15'MethodsGroupBox'#21'AnchorSideBottom.Side'#7#9'asr'
-  +'Bottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#233#0#5'Width'#2'b'#7'Anchors'
-  +#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Cap'
-  +'tion'#6#15'SelectAllButton'#7'OnClick'#7#20'SelectAllButtonClick'#8'TabOrde'
-  +'r'#2#1#0#0#7'TButton'#16'SelectNoneButton'#22'AnchorSideLeft.Control'#7#15
-  +'SelectAllButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom'
-  +'.Control'#7#15'MethodsGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
-  +'Left'#2'n'#6'Height'#2#23#3'Top'#3#233#0#5'Width'#2'p'#7'Anchors'#11#6'akLe'
-  +'ft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#16
-  +'SelectNoneButton'#7'OnClick'#7#21'SelectNoneButtonClick'#8'TabOrder'#2#2#0#0
-  +#0#6'TPanel'#8'BtnPanel'#6'Height'#2'2'#3'Top'#3'&'#1#5'Width'#3'E'#2#5'Alig'
-  +'n'#7#8'alBottom'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'2'#11'Client'
-  +'Width'#3'E'#2#8'TabOrder'#2#1#0#7'TBitBtn'#12'CancelBitBtn'#4'Left'#3#5#2#6
-  +'Height'#2'&'#3'Top'#2#6#5'Width'#2':'#5'Align'#7#7'alRight'#8'AutoSize'#9#20
-  +'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bk'
-  +'Cancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'
-  +#14'AddFirstBitBtn'#4'Left'#3#136#1#6'Height'#2'&'#3'Top'#2#6#5'Width'#2'+'#5
-  +'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#4'&Yes'#7'Default'#9#4'Kind'#7#5'bkYes'#11'ModalResult'#2#6#9'NumGlyphs'#2#0
-  +#7'OnClick'#7#19'AddFirstBitBtnClick'#8'TabOrder'#2#1#0#0#7'TBitBtn'#12'AddA'
-  +'llBitBtn'#4'Left'#3#185#1#6'Height'#2'&'#3'Top'#2#6#5'Width'#2'F'#5'Align'#7
-  +#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'Yes t'
-  +'o &All'#4'Kind'#7#10'bkYesToAll'#11'ModalResult'#2#10#9'NumGlyphs'#2#0#7'On'
-  +'Click'#7#17'AddAllBitBtnClick'#8'TabOrder'#2#2#0#0#0#0
+  +'Height'#3'X'#1#3'Top'#3'#'#1#5'Width'#3'E'#2#11'HelpContext'#2#0#13'ActiveC'
+  +'ontrol'#7#19'MethodsCheckListBox'#5'Align'#7#6'alNone'#14'AllowDropFiles'#8
+  +#10'AutoScroll'#9#8'AutoSize'#8#11'BorderIcons'#11#12'biSystemMenu'#10'biMin'
+  +'imize'#10'biMaximize'#0#11'BorderStyle'#7#10'bsSizeable'#7'Caption'#6#21'Ab'
+  +'stractMethodsDialog'#28'ChildSizing.LeftRightSpacing'#2#0#28'ChildSizing.To'
+  +'pBottomSpacing'#2#0#29'ChildSizing.HorizontalSpacing'#2#0#27'ChildSizing.Ve'
+  +'rticalSpacing'#2#0#27'ChildSizing.ControlsPerLine'#2#0#12'ClientHeight'#3'X'
+  +#1#11'ClientWidth'#3'E'#2#8'DockSite'#8#8'DragKind'#7#6'dkDrag'#8'DragMode'#7
+  +#8'dmManual'#7'Enabled'#9#11'Font.Height'#2#0#10'Font.Style'#11#0#9'FormStyl'
+  +'e'#7#8'fsNormal'#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'
+  +#14'ParentBiDiMode'#9#10'ParentFont'#8#8'Position'#7#10'poDesigned'#13'ShowI'
+  +'nTaskBar'#7#9'stDefault'#14'UseDockManager'#8#10'LCLVersion'#6#6'0.9.27'#11
+  +'WindowState'#7#8'wsNormal'#0#6'TLabel'#9'NoteLabel'#4'Left'#2#6#6'Height'#2
+  +#18#3'Top'#2#6#5'Width'#3'9'#2#11'HelpContext'#2#0#5'Align'#7#5'alTop'#9'Ali'
+  +'gnment'#7#13'taLeftJustify'#8'AutoSize'#9#18'BorderSpacing.Left'#2#0#17'Bor'
+  +'derSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0
+  +#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFil'
+  +'l'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#9'NoteLabe'
+  +'l'#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#6'Layo'
+  +'ut'#7#5'tlTop'#14'ParentBidiMode'#9#11'ParentColor'#8#10'ParentFont'#9#14'P'
+  +'arentShowHint'#9#13'ShowAccelChar'#9#11'Transparent'#9#7'Visible'#9#8'WordW'
+  +'rap'#9#11'OptimalFill'#8#0#0#9'TGroupBox'#15'MethodsGroupBox'#4'Left'#2#6#6
+  +'Height'#3#4#1#3'Top'#2#30#5'Width'#3'9'#2#11'HelpContext'#2#0#5'Align'#7#8
+  +'alClient'#8'AutoSize'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0
+  +#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.A'
+  +'round'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacin'
+  +'g.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#15'MethodsGroupBox'#28'Child'
+  +'Sizing.LeftRightSpacing'#2#0#28'ChildSizing.TopBottomSpacing'#2#0#29'ChildS'
+  +'izing.HorizontalSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2#0#27'ChildSi'
+  +'zing.ControlsPerLine'#2#0#12'ClientHeight'#3#241#0#11'ClientWidth'#3'5'#2#5
+  +'Ctl3D'#8#8'DockSite'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8
+  +'DragMode'#7#8'dmManual'#7'Enabled'#9#14'ParentBidiMode'#9#11'ParentColor'#9
+  +#11'ParentCtl3D'#9#10'ParentFont'#9#14'ParentShowHint'#9#8'TabOrder'#2#0#7'T'
+  +'abStop'#8#7'Visible'#9#0#13'TCheckListBox'#19'MethodsCheckListBox'#24'Ancho'
+  +'rSideBottom.Control'#7#15'SelectAllButton'#4'Left'#2#6#6'Height'#3#194#0#3
+  +'Top'#2#6#5'Width'#3')'#2#11'HelpContext'#2#0#5'Align'#7#5'alTop'#11'AllowGr'
+  +'ayed'#8#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#18'Border'
+  +'Spacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20
+  +'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellA'
+  +'lignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFil'
+  +'l'#11'BorderStyle'#7#8'bsSingle'#7'Columns'#2#0#10'DragCursor'#7#6'crDrag'#8
+  +'DragMode'#7#8'dmManual'#14'ExtendedSelect'#9#7'Enabled'#9#14'IntegralHeight'
+  +#8#10'ItemHeight'#2#0#11'MultiSelect'#8#12'OnClickCheck'#7#29'MethodsCheckLi'
+  +'stBoxClickCheck'#14'ParentBidiMode'#9#10'ParentFont'#9#14'ParentShowHint'#9
+  +#6'Sorted'#8#5'Style'#7#10'lbStandard'#8'TabOrder'#2#0#7'TabStop'#9#8'TopInd'
+  +'ex'#2#255#7'Visible'#9#0#0#7'TButton'#15'SelectAllButton'#22'AnchorSideLeft'
+  +'.Control'#7#15'MethodsGroupBox'#24'AnchorSideBottom.Control'#7#15'MethodsGr'
+  +'oupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#29
+  +#3'Top'#3#206#0#5'Width'#2'n'#11'HelpContext'#2#0#5'Align'#7#6'alNone'#7'Anc'
+  +'hors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#0#17
+  +'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'
+  +#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'cc'
+  +'aFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#6'Cancel'#8#7'Capti'
+  +'on'#6#15'SelectAllButton'#7'Default'#8#10'DragCursor'#7#6'crDrag'#8'DragMod'
+  +'e'#7#8'dmManual'#7'Enabled'#9#14'ParentBidiMode'#9#11'ModalResult'#2#0#7'On'
+  +'Click'#7#20'SelectAllButtonClick'#10'ParentFont'#9#14'ParentShowHint'#9#8'T'
+  +'abOrder'#2#1#7'TabStop'#9#7'Visible'#9#0#0#7'TButton'#16'SelectNoneButton'
+  +#22'AnchorSideLeft.Control'#7#15'SelectAllButton'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#24'AnchorSideBottom.Control'#7#15'MethodsGroupBox'#21'AnchorSide'
+  +'Bottom.Side'#7#9'asrBottom'#4'Left'#2'z'#6'Height'#2#29#3'Top'#3#206#0#5'Wi'
+  +'dth'#3#129#0#11'HelpContext'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#6'akLef'
+  +'t'#8'akBottom'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#0#17'BorderSpacing.'
+  +'Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'Border'
+  ,'Spacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'Bor'
+  +'derSpacing.CellAlignVertical'#7#7'ccaFill'#6'Cancel'#8#7'Caption'#6#16'Sele'
+  +'ctNoneButton'#7'Default'#8#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmMan'
+  +'ual'#7'Enabled'#9#14'ParentBidiMode'#9#11'ModalResult'#2#0#7'OnClick'#7#21
+  +'SelectNoneButtonClick'#10'ParentFont'#9#14'ParentShowHint'#9#8'TabOrder'#2#2
+  +#7'TabStop'#9#7'Visible'#9#0#0#0#12'TButtonPanel'#11'ButtonPanel'#4'Left'#2#6
+  +#6'Height'#2'0'#3'Top'#3'('#1#5'Width'#3'9'#2#11'HelpContext'#2#0#5'Align'#7
+  +#8'alBottom'#8'AutoSize'#9#11'ButtonOrder'#7#9'boDefault'#8'TabOrder'#2#1#13
+  +'DefaultButton'#7#4'pbOK'#11'ShowButtons'#11#8'pbCancel'#6'pbHelp'#0#10'Show'
+  +'Glyphs'#11#4'pbOK'#8'pbCancel'#7'pbClose'#6'pbHelp'#0#7'Visible'#9#0#7'TBit'
+  +'Btn'#14'AddFirstButton'#4'Left'#3#254#1#6'Height'#2'"'#3'Top'#2#8#5'Width'#2
+  +'5'#11'HelpContext'#2#0#5'Align'#7#7'alRight'#8'AutoSize'#9#18'BorderSpacing'
+  +'.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderS'
+  +'pacing.Bottom'#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHor'
+  +'izontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#6'Ca'
+  +'ncel'#8#7'Caption'#6#3'&OK'#7'Default'#9#7'Enabled'#9#4'Kind'#7#4'bkOK'#6'L'
+  +'ayout'#7#11'blGlyphLeft'#6'Margin'#2#255#11'ModalResult'#2#1#9'NumGlyphs'#2
+  +#0#7'OnClick'#7#19'AddFirstButtonClick'#10'ParentFont'#9#14'ParentShowHint'#9
+  +#7'Spacing'#2#3#8'TabOrder'#2#4#7'TabStop'#9#7'Visible'#9#0#0#7'TBitBtn'#12
+  +'AddAllButton'#4'Left'#3#202#1#6'Height'#2'"'#3'Top'#2#8#5'Width'#2'.'#11'He'
+  +'lpContext'#2#0#5'Align'#7#7'alRight'#8'AutoSize'#9#18'BorderSpacing.Left'#2
+  +#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bo'
+  +'ttom'#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7
+  +#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#6'Cancel'#8#7'C'
+  +'aption'#6#4'&All'#7'Default'#8#7'Enabled'#9#4'Kind'#7#5'bkAll'#6'Layout'#7
+  +#11'blGlyphLeft'#6'Margin'#2#255#11'ModalResult'#2#8#9'NumGlyphs'#2#0#7'OnCl'
+  +'ick'#7#17'AddAllButtonClick'#10'ParentFont'#9#14'ParentShowHint'#9#7'Spacin'
+  +'g'#2#3#8'TabOrder'#2#5#7'TabStop'#9#7'Visible'#9#0#0#0#0
 ]);
diff --git a/ide/abstractsmethodsdlg.pas b/ide/abstractsmethodsdlg.pas
index dd76544562..fcad265ae5 100644
--- a/ide/abstractsmethodsdlg.pas
+++ b/ide/abstractsmethodsdlg.pas
@@ -37,7 +37,7 @@ uses
   CheckLst, StdCtrls, ExtCtrls, Buttons,
   CodeAtom, CodeTree, PascalParserTool, CodeCache, CodeToolManager,
   LazIDEIntf, SrcEditorIntf,
-  LazarusIDEStrConsts;
+  LazarusIDEStrConsts, ButtonPanel, IDEContextHelpEdit;
 
 type
 
@@ -53,19 +53,19 @@ type
   { TAbstractMethodsDialog }
 
   TAbstractMethodsDialog = class(TForm)
-    AddAllBitBtn: TBitBtn;
+    AddFirstButton: TBitBtn;
+    AddAllButton: TBitBtn;
+    ButtonPanel: TButtonPanel;
     NoteLabel: TLabel;
     SelectNoneButton: TButton;
     SelectAllButton: TButton;
-    CancelBitBtn: TBitBtn;
-    AddFirstBitBtn: TBitBtn;
     MethodsCheckListBox: TCheckListBox;
     MethodsGroupBox: TGroupBox;
-    BtnPanel: TPanel;
-    procedure AddAllBitBtnClick(Sender: TObject);
-    procedure AddFirstBitBtnClick(Sender: TObject);
+    procedure AddAllButtonClick(Sender: TObject);
+    procedure AddFirstButtonClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
+    procedure HelpButtonClick(Sender: TObject);
     procedure MethodsCheckListBoxClickCheck(Sender: TObject);
     procedure SelectAllButtonClick(Sender: TObject);
     procedure SelectNoneButtonClick(Sender: TObject);
@@ -156,25 +156,22 @@ procedure TAbstractMethodsDialog.FormCreate(Sender: TObject);
 begin
   FItems:=TFPList.Create;
 
-  AddFirstBitBtn.Caption:=lisSAMOverrideFirstSelected;
-  AddAllBitBtn.Caption:=lisSAMOverrideAllSelected;
-  CancelBitBtn.Caption:=dlgCancel;
+  ButtonPanel.HelpButton.OnClick := @HelpButtonClick;
+  AddFirstButton.Caption:=lisSAMOverrideFirstSelected;
+  AddAllButton.Caption:=lisSAMOverrideAllSelected;
 
   SelectNoneButton.Caption:=lisSAMSelectNone;
   SelectAllButton.Caption:=lisMenuSelectAll;
   MethodsGroupBox.Caption:=lisSAMAbstractMethodsNotYetOverridden;
-  CancelBitBtn.LoadGlyphFromLazarusResource('btn_cancel');
-  AddFirstBitBtn.LoadGlyphFromLazarusResource('btn_ok');
-  AddAllBitBtn.LoadGlyphFromLazarusResource('btn_all');
 end;
 
-procedure TAbstractMethodsDialog.AddFirstBitBtnClick(Sender: TObject);
+procedure TAbstractMethodsDialog.AddFirstButtonClick(Sender: TObject);
 begin
   if not AddOverrides(true) then exit;
   ModalResult:=mrOk;
 end;
 
-procedure TAbstractMethodsDialog.AddAllBitBtnClick(Sender: TObject);
+procedure TAbstractMethodsDialog.AddAllButtonClick(Sender: TObject);
 begin
   if not AddOverrides(false) then exit;
   ModalResult:=mrOk;
@@ -185,6 +182,11 @@ begin
   ClearItems;
 end;
 
+procedure TAbstractMethodsDialog.HelpButtonClick(Sender: TObject);
+begin
+  ShowContextHelpForIDE(Self);
+end;
+
 procedure TAbstractMethodsDialog.MethodsCheckListBoxClickCheck(Sender: TObject);
 begin
   CheckSelection;
@@ -224,8 +226,8 @@ var
 begin
   i:=MethodsCheckListBox.Items.Count-1;
   while (i>=0) and (not MethodsCheckListBox.Checked[i]) do dec(i);
-  AddFirstBitBtn.Enabled:=i>=0;
-  AddAllBitBtn.Enabled:=AddFirstBitBtn.Enabled;
+  AddFirstButton.Enabled:=i>=0;
+  AddAllButton.Enabled:=AddFirstButton.Enabled;
 end;
 
 function TAbstractMethodsDialog.CheckSelection: boolean;
diff --git a/ide/checklfmdlg.lfm b/ide/checklfmdlg.lfm
index 0aa8637776..8141882cd8 100644
--- a/ide/checklfmdlg.lfm
+++ b/ide/checklfmdlg.lfm
@@ -3,44 +3,144 @@ object CheckLFMDialog: TCheckLFMDialog
   Height = 580
   Top = 206
   Width = 552
+  HelpContext = 0
   ActiveControl = LFMSynEdit
+  Align = alNone
+  AllowDropFiles = False
+  AutoScroll = True
+  AutoSize = False
+  BorderIcons = [biSystemMenu, biMinimize, biMaximize]
+  BorderStyle = bsSizeable
   Caption = 'Repair LFM file'
+  ChildSizing.LeftRightSpacing = 0
+  ChildSizing.TopBottomSpacing = 0
+  ChildSizing.HorizontalSpacing = 0
+  ChildSizing.VerticalSpacing = 0
+  ChildSizing.ControlsPerLine = 0
   ClientHeight = 580
   ClientWidth = 552
+  DockSite = False
+  DragKind = dkDrag
+  DragMode = dmManual
+  Enabled = True
+  Font.Height = 0
+  Font.Style = []
+  FormStyle = fsNormal
   OnCreate = CheckLFMDialogCreate
+  ParentBiDiMode = True
   ParentFont = False
-  LCLVersion = '0.9.25'
+  Position = poDesigned
+  ShowInTaskBar = stDefault
+  UseDockManager = False
+  LCLVersion = '0.9.27'
+  WindowState = wsNormal
   object NoteLabel: TLabel
-    Height = 14
-    Width = 552
+    Left = 6
+    Height = 18
+    Top = 6
+    Width = 540
+    HelpContext = 0
     Align = alTop
+    Alignment = taLeftJustify
+    AutoSize = True
+    BorderSpacing.Left = 0
+    BorderSpacing.Top = 0
+    BorderSpacing.Right = 0
+    BorderSpacing.Bottom = 0
+    BorderSpacing.Around = 6
+    BorderSpacing.CellAlignHorizontal = ccaFill
+    BorderSpacing.CellAlignVertical = ccaFill
     Caption = 'NoteLabel'
+    DragCursor = crDrag
+    DragMode = dmManual
+    Enabled = True
+    Layout = tlTop
+    ParentBidiMode = True
     ParentColor = False
+    ParentFont = True
+    ParentShowHint = True
+    ShowAccelChar = True
+    Transparent = True
+    Visible = True
     WordWrap = True
+    OptimalFill = False
   end
   object LFMGroupBox: TGroupBox
-    Height = 427
-    Top = 14
-    Width = 552
-    Align = alClient
+    Left = 6
+    Height = 354
+    Top = 30
+    Width = 540
+    HelpContext = 0
+    Align = alTop
+    AutoSize = False
+    BorderSpacing.Left = 0
+    BorderSpacing.Top = 0
+    BorderSpacing.Right = 0
+    BorderSpacing.Bottom = 0
+    BorderSpacing.Around = 6
+    BorderSpacing.CellAlignHorizontal = ccaFill
+    BorderSpacing.CellAlignVertical = ccaFill
     Caption = 'LFM file'
-    ClientHeight = 409
-    ClientWidth = 548
+    ChildSizing.LeftRightSpacing = 0
+    ChildSizing.TopBottomSpacing = 0
+    ChildSizing.HorizontalSpacing = 0
+    ChildSizing.VerticalSpacing = 0
+    ChildSizing.ControlsPerLine = 0
+    ClientHeight = 335
+    ClientWidth = 536
+    Ctl3D = False
+    DockSite = False
+    DragCursor = crDrag
+    DragKind = dkDrag
+    DragMode = dmManual
+    Enabled = True
+    ParentBidiMode = True
+    ParentColor = True
     ParentCtl3D = False
+    ParentFont = True
+    ParentShowHint = True
     TabOrder = 0
+    TabStop = False
+    Visible = True
     object LFMSynEdit: TSynEdit
-      Height = 409
-      Width = 548
+      Tag = 0
+      Left = 6
+      Height = 323
+      Top = 6
+      Width = 524
+      HelpContext = 0
       Align = alClient
+      BlockIndent = 2
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
+      BorderSpacing.Around = 6
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
+      Color = clWhite
+      CFDividerDrawLevel = 0
+      Ctl3D = False
+      Enabled = True
       Font.Height = -15
       Font.Name = 'courier'
       Font.Pitch = fpFixed
+      Font.Quality = fqNonAntialiased
+      Font.Style = []
       ParentColor = False
       ParentCtl3D = False
       ParentFont = False
+      ParentShowHint = True
       TabOrder = 0
+      Visible = True
       BookMarkOptions.OnChange = nil
+      BorderStyle = bsSingle
+      ExtraCharSpacing = 0
+      ExtraLineSpacing = 0
+      HideSelection = False
       Highlighter = SynLFMSyn1
+      InsertCaret = ctVerticalLine
+      InsertMode = True
       Keystrokes = <      
         item
           Command = 3
@@ -365,69 +465,132 @@ object CheckLFMDialog: TCheckLFMDialog
       Lines.Strings = (
         'LFMSynEdit'
       )
+      MaxLeftChar = 1024
+      MaxUndo = 1024
+      Options = [eoAutoIndent, eoDragDropEditing, eoGroupUndo, eoScrollPastEol, eoShowScrollHint, eoSmartTabDelete, eoSmartTabs, eoTabsToSpaces, eoTrimTrailingSpaces, eoBracketHighlight]
+      Options2 = []
+      OverwriteCaret = ctBlock
+      ReadOnly = False
+      RightEdge = 80
+      RightEdgeColor = clSilver
+      ScrollBars = ssBoth
       SelectedColor.OnChange = nil
+      SelectionMode = smNormal
+      TabWidth = 8
+      WantTabs = False
       OnSpecialLineMarkup = LFMSynEditSpecialLineMarkup
     end
   end
   object ErrorsGroupBox: TGroupBox
-    Height = 104
-    Top = 441
-    Width = 552
-    Align = alBottom
+    Left = 6
+    Height = 125
+    Top = 401
+    Width = 540
+    HelpContext = 0
+    Align = alClient
+    AutoSize = False
+    BorderSpacing.Left = 0
+    BorderSpacing.Top = 0
+    BorderSpacing.Right = 0
+    BorderSpacing.Bottom = 0
+    BorderSpacing.Around = 6
+    BorderSpacing.CellAlignHorizontal = ccaFill
+    BorderSpacing.CellAlignVertical = ccaFill
     Caption = 'Errors'
-    ClientHeight = 86
-    ClientWidth = 548
+    ChildSizing.LeftRightSpacing = 0
+    ChildSizing.TopBottomSpacing = 0
+    ChildSizing.HorizontalSpacing = 0
+    ChildSizing.VerticalSpacing = 0
+    ChildSizing.ControlsPerLine = 0
+    ClientHeight = 106
+    ClientWidth = 536
+    Ctl3D = False
+    DockSite = False
+    DragCursor = crDrag
+    DragKind = dkDrag
+    DragMode = dmManual
+    Enabled = True
+    ParentBidiMode = True
+    ParentColor = True
     ParentCtl3D = False
+    ParentFont = True
+    ParentShowHint = True
     TabOrder = 1
+    TabStop = False
+    Visible = True
     object ErrorsListBox: TListBox
-      Height = 86
-      Width = 548
+      Left = 6
+      Height = 94
+      Top = 6
+      Width = 524
+      HelpContext = 0
       Align = alClient
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
+      BorderSpacing.Around = 6
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
+      BorderStyle = bsSingle
+      ClickOnSelChange = True
+      Columns = 0
+      DragCursor = crDrag
+      DragKind = dkDrag
+      DragMode = dmManual
+      ExtendedSelect = True
+      Enabled = True
+      IntegralHeight = False
+      ItemHeight = 0
+      MultiSelect = False
       OnClick = ErrorsListBoxClick
+      ParentBidiMode = True
+      ParentShowHint = True
+      ParentFont = True
+      Sorted = False
+      Style = lbStandard
       TabOrder = 0
+      TabStop = True
+      TopIndex = -1
+      Visible = True
     end
   end
-  object BtnPanel: TPanel
-    Height = 35
-    Top = 545
+  object Splitter1: TSplitter
+    Cursor = crVSplit
+    Left = 0
+    Height = 5
+    Top = 390
     Width = 552
+    HelpContext = 0
+    Align = alTop
+    AutoSnap = True
+    Beveled = False
+    MinSize = 30
+    ParentColor = True
+    ParentShowHint = True
+    ResizeAnchor = akTop
+    ResizeStyle = rsUpdate
+    Visible = True
+  end
+  object ButtonPanel: TButtonPanel
+    Left = 6
+    Height = 48
+    Top = 532
+    Width = 540
+    HelpContext = 0
     Align = alBottom
     AutoSize = True
-    BevelOuter = bvNone
-    ClientHeight = 35
-    ClientWidth = 552
-    TabOrder = 2
-    object CancelButton: TBitBtn
-      Left = 488
-      Height = 23
-      Top = 6
-      Width = 58
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = 'Cancel'
-      ModalResult = 2
-      NumGlyphs = 0
-      TabOrder = 0
-    end
-    object RemoveAllButton: TBitBtn
-      Left = 319
-      Height = 23
-      Top = 6
-      Width = 163
-      Align = alRight
-      AutoSize = True
-      BorderSpacing.Around = 6
-      Caption = 'Remove all invalid properties'
-      NumGlyphs = 0
-      OnClick = RemoveAllButtonClick
-      TabOrder = 1
-    end
+    ButtonOrder = boDefault
+    TabOrder = 3
+    DefaultButton = pbOK
+    ShowButtons = [pbOK, pbCancel, pbHelp]
+    ShowGlyphs = [pbOK, pbCancel, pbClose, pbHelp]
+    Visible = True
   end
   object SynLFMSyn1: TSynLFMSyn
     DefaultFilter = 'Lazarus Form Files (*.lfm)|*.lfm'
     Enabled = False
-    left = 129
-    top = 104
+    left = 115
+    top = 497
   end
 end
diff --git a/ide/checklfmdlg.lrs b/ide/checklfmdlg.lrs
index c2af94722e..2b072a9d73 100644
--- a/ide/checklfmdlg.lrs
+++ b/ide/checklfmdlg.lrs
@@ -2,75 +2,132 @@
 
 LazarusResources.Add('TCheckLFMDialog','FORMDATA',[
   'TPF0'#15'TCheckLFMDialog'#14'CheckLFMDialog'#4'Left'#3#164#1#6'Height'#3'D'#2
-  +#3'Top'#3#206#0#5'Width'#3'('#2#13'ActiveControl'#7#10'LFMSynEdit'#7'Caption'
-  +#6#15'Repair LFM file'#12'ClientHeight'#3'D'#2#11'ClientWidth'#3'('#2#8'OnCr'
-  +'eate'#7#20'CheckLFMDialogCreate'#10'ParentFont'#8#10'LCLVersion'#6#6'0.9.25'
-  +#0#6'TLabel'#9'NoteLabel'#6'Height'#2#14#5'Width'#3'('#2#5'Align'#7#5'alTop'
-  +#7'Caption'#6#9'NoteLabel'#11'ParentColor'#8#8'WordWrap'#9#0#0#9'TGroupBox'
-  +#11'LFMGroupBox'#6'Height'#3#171#1#3'Top'#2#14#5'Width'#3'('#2#5'Align'#7#8
-  +'alClient'#7'Caption'#6#8'LFM file'#12'ClientHeight'#3#153#1#11'ClientWidth'
-  +#3'$'#2#11'ParentCtl3D'#8#8'TabOrder'#2#0#0#8'TSynEdit'#10'LFMSynEdit'#6'Hei'
-  +'ght'#3#153#1#5'Width'#3'$'#2#5'Align'#7#8'alClient'#11'Font.Height'#2#241#9
-  +'Font.Name'#6#7'courier'#10'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#11'Pa'
-  +'rentCtl3D'#8#10'ParentFont'#8#8'TabOrder'#2#0#24'BookMarkOptions.OnChange'
-  +#13#11'Highlighter'#7#10'SynLFMSyn1'#10'Keystrokes'#14#1#7'Command'#2#3#8'Sh'
-  +'ortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8
-  +'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'S'
-  +'hortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8
-  +'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'S'
-  +'hortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'S'
-  +'hortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8
-  +'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10
-  +#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8
-  +'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8
-  +'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8
-  +'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8
-  +'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8
-  +'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8
-  +'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8
-  +'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0
-  +#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3
-  +'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Comman'
-  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
-  +'mmand'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'
-  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'Short'
-  +'Cut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3
-  +#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Comm'
-  +'and'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7
-  +'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'
-  +#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3
-  +'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortC'
-  +'ut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8
-  +'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'
-  +#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3
-  +'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Comman'
-  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
-  +'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
-  +#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'
-  +#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3
-  +'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCu'
-  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
-  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1
-  +#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3
-  +'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Comma'
-  +'nd'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7
-  +'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1
-  +#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#10'LFMSynEdi'
-  +'t'#0#22'SelectedColor.OnChange'#13#19'OnSpecialLineMarkup'#7#27'LFMSynEditS'
-  +'pecialLineMarkup'#0#0#0#9'TGroupBox'#14'ErrorsGroupBox'#6'Height'#2'h'#3'To'
-  +'p'#3#185#1#5'Width'#3'('#2#5'Align'#7#8'alBottom'#7'Caption'#6#6'Errors'#12
-  +'ClientHeight'#2'V'#11'ClientWidth'#3'$'#2#11'ParentCtl3D'#8#8'TabOrder'#2#1
-  +#0#8'TListBox'#13'ErrorsListBox'#6'Height'#2'V'#5'Width'#3'$'#2#5'Align'#7#8
-  +'alClient'#7'OnClick'#7#18'ErrorsListBoxClick'#8'TabOrder'#2#0#0#0#0#6'TPane'
-  +'l'#8'BtnPanel'#6'Height'#2'#'#3'Top'#3'!'#2#5'Width'#3'('#2#5'Align'#7#8'al'
-  +'Bottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'#'#11'C'
-  +'lientWidth'#3'('#2#8'TabOrder'#2#2#0#7'TBitBtn'#12'CancelButton'#4'Left'#3
-  ,#232#1#6'Height'#2#23#3'Top'#2#6#5'Width'#2':'#5'Align'#7#7'alRight'#8'AutoS'
-  +'ize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'Cancel'#11'ModalResult'#2
-  +#2#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#15'RemoveAllButton'#4'Lef'
-  +'t'#3'?'#1#6'Height'#2#23#3'Top'#2#6#5'Width'#3#163#0#5'Align'#7#7'alRight'#8
-  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#29'Remove all invalid'
-  +' properties'#9'NumGlyphs'#2#0#7'OnClick'#7#20'RemoveAllButtonClick'#8'TabOr'
-  +'der'#2#1#0#0#0#10'TSynLFMSyn'#10'SynLFMSyn1'#13'DefaultFilter'#6' Lazarus F'
-  +'orm Files (*.lfm)|*.lfm'#7'Enabled'#8#4'left'#3#129#0#3'top'#2'h'#0#0#0
+  +#3'Top'#3#206#0#5'Width'#3'('#2#11'HelpContext'#2#0#13'ActiveControl'#7#10'L'
+  +'FMSynEdit'#5'Align'#7#6'alNone'#14'AllowDropFiles'#8#10'AutoScroll'#9#8'Aut'
+  +'oSize'#8#11'BorderIcons'#11#12'biSystemMenu'#10'biMinimize'#10'biMaximize'#0
+  +#11'BorderStyle'#7#10'bsSizeable'#7'Caption'#6#15'Repair LFM file'#28'ChildS'
+  +'izing.LeftRightSpacing'#2#0#28'ChildSizing.TopBottomSpacing'#2#0#29'ChildSi'
+  +'zing.HorizontalSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2#0#27'ChildSiz'
+  +'ing.ControlsPerLine'#2#0#12'ClientHeight'#3'D'#2#11'ClientWidth'#3'('#2#8'D'
+  +'ockSite'#8#8'DragKind'#7#6'dkDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#11
+  +'Font.Height'#2#0#10'Font.Style'#11#0#9'FormStyle'#7#8'fsNormal'#8'OnCreate'
+  +#7#20'CheckLFMDialogCreate'#14'ParentBiDiMode'#9#10'ParentFont'#8#8'Position'
+  +#7#10'poDesigned'#13'ShowInTaskBar'#7#9'stDefault'#14'UseDockManager'#8#10'L'
+  +'CLVersion'#6#6'0.9.27'#11'WindowState'#7#8'wsNormal'#0#6'TLabel'#9'NoteLabe'
+  +'l'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#6#5'Width'#3#28#2#11'HelpContext'#2#0
+  +#5'Align'#7#5'alTop'#9'Alignment'#7#13'taLeftJustify'#8'AutoSize'#9#18'Borde'
+  +'rSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20
+  +'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellA'
+  +'lignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFil'
+  +'l'#7'Caption'#6#9'NoteLabel'#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmM'
+  +'anual'#7'Enabled'#9#6'Layout'#7#5'tlTop'#14'ParentBidiMode'#9#11'ParentColo'
+  +'r'#8#10'ParentFont'#9#14'ParentShowHint'#9#13'ShowAccelChar'#9#11'Transpare'
+  +'nt'#9#7'Visible'#9#8'WordWrap'#9#11'OptimalFill'#8#0#0#9'TGroupBox'#11'LFMG'
+  +'roupBox'#4'Left'#2#6#6'Height'#3'b'#1#3'Top'#2#30#5'Width'#3#28#2#11'HelpCo'
+  +'ntext'#2#0#5'Align'#7#5'alTop'#8'AutoSize'#8#18'BorderSpacing.Left'#2#0#17
+  +'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'
+  +#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'cc'
+  +'aFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#8'LFM '
+  +'file'#28'ChildSizing.LeftRightSpacing'#2#0#28'ChildSizing.TopBottomSpacing'
+  +#2#0#29'ChildSizing.HorizontalSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2
+  +#0#27'ChildSizing.ControlsPerLine'#2#0#12'ClientHeight'#3'O'#1#11'ClientWidt'
+  +'h'#3#24#2#5'Ctl3D'#8#8'DockSite'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'#7
+  +#6'dkDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#14'ParentBidiMode'#9#11'Pa'
+  +'rentColor'#9#11'ParentCtl3D'#8#10'ParentFont'#9#14'ParentShowHint'#9#8'TabO'
+  +'rder'#2#0#7'TabStop'#8#7'Visible'#9#0#8'TSynEdit'#10'LFMSynEdit'#3'Tag'#2#0
+  +#4'Left'#2#6#6'Height'#3'C'#1#3'Top'#2#6#5'Width'#3#12#2#11'HelpContext'#2#0
+  +#5'Align'#7#8'alClient'#11'BlockIndent'#2#2#18'BorderSpacing.Left'#2#0#17'Bo'
+  +'rderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2
+  +#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaF'
+  +'ill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#5'Color'#7#7'clWhite'
+  +#18'CFDividerDrawLevel'#2#0#5'Ctl3D'#8#7'Enabled'#9#11'Font.Height'#2#241#9
+  +'Font.Name'#6#7'courier'#10'Font.Pitch'#7#7'fpFixed'#12'Font.Quality'#7#16'f'
+  +'qNonAntialiased'#10'Font.Style'#11#0#11'ParentColor'#8#11'ParentCtl3D'#8#10
+  +'ParentFont'#8#14'ParentShowHint'#9#8'TabOrder'#2#0#7'Visible'#9#24'BookMark'
+  +'Options.OnChange'#13#11'BorderStyle'#7#8'bsSingle'#16'ExtraCharSpacing'#2#0
+  +#16'ExtraLineSpacing'#2#0#13'HideSelection'#8#11'Highlighter'#7#10'SynLFMSyn'
+  +'1'#11'InsertCaret'#7#14'ctVerticalLine'#10'InsertMode'#9#10'Keystrokes'#14#1
+  +#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7
+  +'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7
+  +'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1
+  +#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7
+  +'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7
+  +'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7
+  +'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7
+  +'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7
+  +'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7
+  +'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'C'
+  +'ommand'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7
+  +'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'C'
+  +'ommand'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7
+  +'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'C'
+  +'ommand'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7
+  +'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0
+  +#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2
+  +'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCu'
+  ,'t'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'S'
+  +'hortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'
+  +#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7
+  +'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'
+  +#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3
+  +'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'Short'
+  +'Cut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8
+  +'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251
+  +#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'
+  +#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Comm'
+  +'and'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7
+  +'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0
+  +#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5'
+  +'@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'
+  +#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'Short'
+  +'Cut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8
+  +'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'
+  +#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3
+  +'d'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Comman'
+  +'d'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'C'
+  +'ommand'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0
+  +#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3
+  +'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'
+  +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#10
+  +'LFMSynEdit'#0#11'MaxLeftChar'#3#0#4#7'MaxUndo'#3#0#4#7'Options'#11#12'eoAut'
+  +'oIndent'#17'eoDragDropEditing'#11'eoGroupUndo'#15'eoScrollPastEol'#16'eoSho'
+  +'wScrollHint'#16'eoSmartTabDelete'#11'eoSmartTabs'#14'eoTabsToSpaces'#20'eoT'
+  +'rimTrailingSpaces'#18'eoBracketHighlight'#0#8'Options2'#11#0#14'OverwriteCa'
+  +'ret'#7#7'ctBlock'#8'ReadOnly'#8#9'RightEdge'#2'P'#14'RightEdgeColor'#7#8'cl'
+  +'Silver'#10'ScrollBars'#7#6'ssBoth'#22'SelectedColor.OnChange'#13#13'Selecti'
+  +'onMode'#7#8'smNormal'#8'TabWidth'#2#8#8'WantTabs'#8#19'OnSpecialLineMarkup'
+  +#7#27'LFMSynEditSpecialLineMarkup'#0#0#0#9'TGroupBox'#14'ErrorsGroupBox'#4'L'
+  +'eft'#2#6#6'Height'#2'}'#3'Top'#3#145#1#5'Width'#3#28#2#11'HelpContext'#2#0#5
+  +'Align'#7#8'alClient'#8'AutoSize'#8#18'BorderSpacing.Left'#2#0#17'BorderSpac'
+  +'ing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'Bo'
+  +'rderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31
+  +'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#6'Errors'#28'Chi'
+  +'ldSizing.LeftRightSpacing'#2#0#28'ChildSizing.TopBottomSpacing'#2#0#29'Chil'
+  +'dSizing.HorizontalSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2#0#27'Child'
+  +'Sizing.ControlsPerLine'#2#0#12'ClientHeight'#2'j'#11'ClientWidth'#3#24#2#5
+  +'Ctl3D'#8#8'DockSite'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8
+  +'DragMode'#7#8'dmManual'#7'Enabled'#9#14'ParentBidiMode'#9#11'ParentColor'#9
+  +#11'ParentCtl3D'#8#10'ParentFont'#9#14'ParentShowHint'#9#8'TabOrder'#2#1#7'T'
+  +'abStop'#8#7'Visible'#9#0#8'TListBox'#13'ErrorsListBox'#4'Left'#2#6#6'Height'
+  +#2'^'#3'Top'#2#6#5'Width'#3#12#2#11'HelpContext'#2#0#5'Align'#7#8'alClient'
+  +#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'
+  +#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacin'
+  +'g.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7
+  +'ccaFill'#11'BorderStyle'#7#8'bsSingle'#16'ClickOnSelChange'#9#7'Columns'#2#0
+  +#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8'DragMode'#7#8'dmManual'
+  +#14'ExtendedSelect'#9#7'Enabled'#9#14'IntegralHeight'#8#10'ItemHeight'#2#0#11
+  +'MultiSelect'#8#7'OnClick'#7#18'ErrorsListBoxClick'#14'ParentBidiMode'#9#14
+  +'ParentShowHint'#9#10'ParentFont'#9#6'Sorted'#8#5'Style'#7#10'lbStandard'#8
+  +'TabOrder'#2#0#7'TabStop'#9#8'TopIndex'#2#255#7'Visible'#9#0#0#0#9'TSplitter'
+  +#9'Splitter1'#6'Cursor'#7#8'crVSplit'#4'Left'#2#0#6'Height'#2#5#3'Top'#3#134
+  +#1#5'Width'#3'('#2#11'HelpContext'#2#0#5'Align'#7#5'alTop'#8'AutoSnap'#9#7'B'
+  +'eveled'#8#7'MinSize'#2#30#11'ParentColor'#9#14'ParentShowHint'#9#12'ResizeA'
+  +'nchor'#7#5'akTop'#11'ResizeStyle'#7#8'rsUpdate'#7'Visible'#9#0#0#12'TButton'
+  +'Panel'#11'ButtonPanel'#4'Left'#2#6#6'Height'#2'0'#3'Top'#3#20#2#5'Width'#3
+  +#28#2#11'HelpContext'#2#0#5'Align'#7#8'alBottom'#8'AutoSize'#9#11'ButtonOrde'
+  +'r'#7#9'boDefault'#8'TabOrder'#2#3#13'DefaultButton'#7#4'pbOK'#11'ShowButton'
+  +'s'#11#4'pbOK'#8'pbCancel'#6'pbHelp'#0#10'ShowGlyphs'#11#4'pbOK'#8'pbCancel'
+  +#7'pbClose'#6'pbHelp'#0#7'Visible'#9#0#0#10'TSynLFMSyn'#10'SynLFMSyn1'#13'De'
+  +'faultFilter'#6' Lazarus Form Files (*.lfm)|*.lfm'#7'Enabled'#8#4'left'#2's'
+  ,#3'top'#3#241#1#0#0#0
 ]);
diff --git a/ide/checklfmdlg.pas b/ide/checklfmdlg.pas
index 4ab7d75462..00dd5c401a 100644
--- a/ide/checklfmdlg.pas
+++ b/ide/checklfmdlg.pas
@@ -41,21 +41,20 @@ uses
   // IDE
   PropEdits, IDEDialogs, ComponentReg, PackageIntf, IDEWindowIntf,
   CustomFormEditor, LazarusIDEStrConsts, OutputFilter, IDEProcs, IDEOptionDefs,
-  EditorOptions, ExtCtrls;
+  EditorOptions, ExtCtrls, ButtonPanel;
 
 type
 
   { TCheckLFMDialog }
 
   TCheckLFMDialog = class(TForm)
-    CancelButton: TBitBtn;
+    ButtonPanel: TButtonPanel;
     ErrorsGroupBox: TGroupBox;
     ErrorsListBox: TListBox;
     NoteLabel: TLabel;
     LFMGroupBox: TGroupBox;
     LFMSynEdit: TSynEdit;
-    BtnPanel: TPanel;
-    RemoveAllButton: TBitBtn;
+    Splitter1: TSplitter;
     SynLFMSyn1: TSynLFMSyn;
     procedure ErrorsListBoxClick(Sender: TObject);
     procedure LFMSynEditSpecialLineMarkup(Sender: TObject; Line: integer;
@@ -550,18 +549,16 @@ procedure TCheckLFMDialog.SetLFMTree(const AValue: TLFMTree);
 begin
   if FLFMTree=AValue then exit;
   FLFMTree:=AValue;
-  RemoveAllButton.Enabled:=AutomaticFixIsPossible;
+  ButtonPanel.OKButton.Enabled:=AutomaticFixIsPossible;
 end;
 
 procedure TCheckLFMDialog.SetupComponents;
 begin
   NoteLabel.Caption:=lisTheLFMLazarusFormFileContainsInvalidPropertiesThis;
-  CancelButton.Caption:=dlgCancel;
-  CancelButton.LoadGlyphFromLazarusResource('btn_cancel');
   ErrorsGroupBox.Caption:=lisErrors;
   LFMGroupBox.Caption:=lisLFMFile;
-  RemoveAllButton.Caption:=lisRemoveAllInvalidProperties;
-  RemoveAllButton.LoadGlyphFromLazarusResource('delete');
+  ButtonPanel.OKButton.Caption:=lisRemoveAllInvalidProperties;
+  ButtonPanel.OKButton.LoadGlyphFromLazarusResource('delete');
   EditorOpts.GetHighlighterSettings(SynLFMSyn1);
   EditorOpts.GetSynEditSettings(LFMSynEdit);
 end;
diff --git a/ide/fpdoceditwindow.lfm b/ide/fpdoceditwindow.lfm
index a08f7a7d16..d3a0c206c7 100644
--- a/ide/fpdoceditwindow.lfm
+++ b/ide/fpdoceditwindow.lfm
@@ -3,96 +3,251 @@ object FPDocEditor: TFPDocEditor
   Height = 126
   Top = 548
   Width = 753
+  HelpContext = 0
   ActiveControl = ShortEdit
+  Align = alNone
+  AllowDropFiles = False
+  AutoScroll = True
+  AutoSize = False
+  BorderIcons = [biSystemMenu, biMinimize, biMaximize]
+  BorderStyle = bsSizeable
   Caption = 'FPDoc editor'
+  ChildSizing.LeftRightSpacing = 0
+  ChildSizing.TopBottomSpacing = 0
+  ChildSizing.HorizontalSpacing = 0
+  ChildSizing.VerticalSpacing = 0
+  ChildSizing.ControlsPerLine = 0
   ClientHeight = 126
   ClientWidth = 753
+  DockSite = False
+  DragKind = dkDrag
+  DragMode = dmManual
+  Enabled = True
+  Font.Height = 0
+  Font.Style = []
+  FormStyle = fsNormal
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnResize = FormResize
+  ParentBiDiMode = True
   ParentFont = False
-  LCLVersion = '0.9.25'
+  Position = poDesigned
+  ShowInTaskBar = stDefault
+  UseDockManager = False
+  LCLVersion = '0.9.27'
+  WindowState = wsNormal
   object PageControl: TPageControl
     Left = 40
     Height = 126
+    Top = 0
     Width = 713
+    HelpContext = 0
+    TabStop = True
     ActivePage = ShortTabSheet
     Align = alClient
+    BorderSpacing.Left = 0
+    BorderSpacing.Top = 0
+    BorderSpacing.Right = 0
+    BorderSpacing.Bottom = 0
+    BorderSpacing.Around = 0
+    BorderSpacing.CellAlignHorizontal = ccaFill
+    BorderSpacing.CellAlignVertical = ccaFill
+    DockSite = False
+    DragCursor = crDrag
+    DragKind = dkDrag
+    DragMode = dmManual
+    Enabled = True
+    ParentFont = True
+    ParentShowHint = True
     TabIndex = 0
     TabOrder = 0
     TabPosition = tpBottom
+    Visible = True
     OnChange = PageControlChange
     OnPageChanged = PageControlChange
     object ShortTabSheet: TTabSheet
+      HelpContext = 0
       Caption = 'ShortTabSheet'
-      ClientHeight = 100
-      ClientWidth = 705
+      ChildSizing.LeftRightSpacing = 0
+      ChildSizing.TopBottomSpacing = 0
+      ChildSizing.HorizontalSpacing = 0
+      ChildSizing.VerticalSpacing = 0
+      ChildSizing.ControlsPerLine = 0
+      ClientHeight = 95
+      ClientWidth = 709
+      Enabled = True
+      ParentFont = True
+      ParentShowHint = True
       object LinkLabel: TLabel
         AnchorSideTop.Control = LinkEdit
         AnchorSideTop.Side = asrCenter
         Left = 6
-        Height = 14
-        Top = 35
-        Width = 44
+        Height = 18
+        Top = 33
+        Width = 60
+        HelpContext = 0
+        Align = alNone
+        Alignment = taLeftJustify
+        AutoSize = True
+        BorderSpacing.Left = 0
         BorderSpacing.Top = 6
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
         Caption = 'LinkLabel'
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        Layout = tlTop
+        ParentBidiMode = True
         ParentColor = False
+        ParentFont = True
+        ParentShowHint = True
+        ShowAccelChar = True
+        Transparent = True
+        Visible = True
+        WordWrap = False
+        OptimalFill = False
       end
       object ShortLabel: TLabel
         AnchorSideLeft.Control = ShortTabSheet
         AnchorSideTop.Control = ShortEdit
         AnchorSideTop.Side = asrCenter
         Left = 6
-        Height = 14
-        Top = 6
-        Width = 52
+        Height = 18
+        Top = 4
+        Width = 70
+        HelpContext = 0
+        Align = alNone
+        Alignment = taLeftJustify
+        AutoSize = True
         BorderSpacing.Left = 6
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
         Caption = 'ShortLabel'
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        Layout = tlTop
+        ParentBidiMode = True
         ParentColor = False
+        ParentFont = True
+        ParentShowHint = True
+        ShowAccelChar = True
+        Transparent = True
+        Visible = True
+        WordWrap = False
+        OptimalFill = False
       end
       object ShortEdit: TEdit
         AnchorSideLeft.Control = ShortLabel
         AnchorSideLeft.Side = asrBottom
         AnchorSideRight.Control = ShortTabSheet
         AnchorSideRight.Side = asrBottom
-        Left = 64
+        Left = 82
         Height = 27
-        Width = 639
+        Top = 0
+        Width = 625
+        HelpContext = 0
+        Align = alNone
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
+        AutoSelect = False
         BorderSpacing.Left = 6
+        BorderSpacing.Top = 0
         BorderSpacing.Right = 2
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        CharCase = ecNormal
+        DragCursor = crDrag
+        DragMode = dmManual
+        EchoMode = emNormal
+        Enabled = True
+        MaxLength = -1
+        ParentBidiMode = True
         OnChange = ShortEditEditingDone
         OnEditingDone = ShortEditEditingDone
+        ParentFont = True
+        ParentShowHint = True
+        PasswordChar = #0
+        ReadOnly = False
+        TabStop = True
         TabOrder = 0
         Text = 'ShortEdit'
+        Visible = True
       end
       object CreateButton: TButton
         AnchorSideTop.Control = LinkEdit
         AnchorSideTop.Side = asrBottom
         Left = 6
-        Height = 23
+        Height = 29
         Top = 62
-        Width = 91
+        Width = 98
+        HelpContext = 0
+        Align = alNone
         AutoSize = True
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
         BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Cancel = False
         Caption = 'CreateButton'
+        Default = False
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        ParentBidiMode = True
+        ModalResult = 0
         OnClick = CreateButtonClick
+        ParentFont = True
+        ParentShowHint = True
         TabOrder = 1
+        TabStop = True
+        Visible = True
       end
       object SaveButton: TButton
         AnchorSideLeft.Control = CreateButton
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = CreateButton
-        Left = 103
-        Height = 23
+        Left = 110
+        Height = 29
         Top = 62
-        Width = 82
+        Width = 87
+        HelpContext = 0
+        Align = alNone
         AutoSize = True
         BorderSpacing.Left = 6
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Cancel = False
         Caption = 'SaveButton'
+        Default = False
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        ParentBidiMode = True
+        ModalResult = 0
         OnClick = SaveButtonClick
+        ParentFont = True
+        ParentShowHint = True
         TabOrder = 2
+        TabStop = True
+        Visible = True
       end
       object LinkEdit: TEdit
         AnchorSideLeft.Control = LinkLabel
@@ -101,33 +256,84 @@ object FPDocEditor: TFPDocEditor
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = ShortTabSheet
         AnchorSideRight.Side = asrBottom
-        Left = 56
+        Left = 72
         Height = 27
         Top = 29
-        Width = 647
+        Width = 635
+        HelpContext = 0
+        Align = alNone
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
+        AutoSelect = False
         BorderSpacing.Left = 6
         BorderSpacing.Top = 2
         BorderSpacing.Right = 2
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        CharCase = ecNormal
+        DragCursor = crDrag
+        DragMode = dmManual
+        EchoMode = emNormal
+        Enabled = True
+        MaxLength = -1
+        ParentBidiMode = True
         OnChange = LinkEditEditingDone
         OnEditingDone = LinkEditEditingDone
+        ParentFont = True
+        ParentShowHint = True
+        PasswordChar = #0
+        ReadOnly = False
+        TabStop = True
         TabOrder = 3
         Text = 'LinkEdit'
+        Visible = True
       end
     end
     object InheritedTabSheet: TTabSheet
+      HelpContext = 0
       Caption = 'InheritedTabSheet'
-      ClientHeight = 100
-      ClientWidth = 705
+      ChildSizing.LeftRightSpacing = 0
+      ChildSizing.TopBottomSpacing = 0
+      ChildSizing.HorizontalSpacing = 0
+      ChildSizing.VerticalSpacing = 0
+      ChildSizing.ControlsPerLine = 0
+      ClientHeight = 95
+      ClientWidth = 709
+      Enabled = True
+      ParentFont = True
+      ParentShowHint = True
       object InheritedShortLabel: TLabel
+        Left = 0
         Height = 14
         Top = 2
-        Width = 705
+        Width = 709
+        HelpContext = 0
         Align = alTop
+        Alignment = taLeftJustify
+        AutoSize = True
+        BorderSpacing.Left = 0
         BorderSpacing.Top = 2
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
         Caption = 'InheritedShortLabel'
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        Layout = tlTop
+        ParentBidiMode = True
         ParentColor = False
+        ParentFont = True
+        ParentShowHint = True
+        ShowAccelChar = True
+        Transparent = True
+        Visible = True
+        WordWrap = False
+        OptimalFill = False
       end
       object InheritedShortEdit: TEdit
         AnchorSideLeft.Control = InheritedTabSheet
@@ -135,27 +341,69 @@ object FPDocEditor: TFPDocEditor
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = InheritedTabSheet
         AnchorSideRight.Side = asrBottom
+        Left = 0
         Height = 27
         Top = 18
-        Width = 705
+        Width = 709
+        HelpContext = 0
+        Align = alNone
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
+        AutoSelect = False
+        BorderSpacing.Left = 0
         BorderSpacing.Top = 2
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        CharCase = ecNormal
+        DragCursor = crDrag
+        DragMode = dmManual
+        EchoMode = emNormal
+        Enabled = True
+        MaxLength = -1
+        ParentBidiMode = True
+        ParentFont = True
+        ParentShowHint = True
+        PasswordChar = #0
         ReadOnly = True
+        TabStop = True
         TabOrder = 0
         Text = 'InheritedShortEdit'
+        Visible = True
       end
       object MoveToInheritedButton: TButton
         AnchorSideTop.Control = InheritedShortEdit
         AnchorSideTop.Side = asrBottom
+        Left = 0
         Height = 23
         Top = 51
         Width = 140
+        HelpContext = 0
+        Align = alNone
         AutoSize = True
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
         BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Cancel = False
         Caption = 'MoveToInheritedButton'
+        Default = False
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        ParentBidiMode = True
+        ModalResult = 0
         OnClick = MoveToInheritedButtonClick
+        ParentFont = True
+        ParentShowHint = True
         TabOrder = 1
+        TabStop = True
+        Visible = True
       end
       object CopyFromInheritedButton: TButton
         AnchorSideLeft.Control = MoveToInheritedButton
@@ -166,11 +414,30 @@ object FPDocEditor: TFPDocEditor
         Height = 23
         Top = 51
         Width = 151
+        HelpContext = 0
+        Align = alNone
         AutoSize = True
         BorderSpacing.Left = 10
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Cancel = False
         Caption = 'CopyFromInheritedButton'
+        Default = False
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        ParentBidiMode = True
+        ModalResult = 0
         OnClick = CopyFromInheritedButtonClick
+        ParentFont = True
+        ParentShowHint = True
         TabOrder = 2
+        TabStop = True
+        Visible = True
       end
       object AddLinkToInheritedButton: TButton
         AnchorSideLeft.Control = CopyFromInheritedButton
@@ -180,89 +447,242 @@ object FPDocEditor: TFPDocEditor
         Height = 23
         Top = 51
         Width = 151
+        HelpContext = 0
+        Align = alNone
         AutoSize = True
         BorderSpacing.Left = 10
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Cancel = False
         Caption = 'AddLinkToInheritedButton'
+        Default = False
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        ParentBidiMode = True
+        ModalResult = 0
         OnClick = AddLinkToInheritedButtonClick
+        ParentFont = True
+        ParentShowHint = True
         TabOrder = 3
+        TabStop = True
+        Visible = True
       end
     end
     object DescrTabSheet: TTabSheet
+      HelpContext = 0
       Caption = 'DescrTabSheet'
-      ClientHeight = 100
-      ClientWidth = 705
+      ChildSizing.LeftRightSpacing = 0
+      ChildSizing.TopBottomSpacing = 0
+      ChildSizing.HorizontalSpacing = 0
+      ChildSizing.VerticalSpacing = 0
+      ChildSizing.ControlsPerLine = 0
+      ClientHeight = 95
+      ClientWidth = 709
+      Enabled = True
+      ParentFont = True
+      ParentShowHint = True
       object DescrMemo: TMemo
-        Height = 96
-        Width = 703
+        Left = 0
+        Height = 91
+        Top = 0
+        Width = 707
+        HelpContext = 0
         Align = alClient
+        Alignment = taLeftJustify
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
         BorderSpacing.Right = 2
         BorderSpacing.Bottom = 4
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
         Lines.Strings = (
           'DescrMemo'
         )
+        MaxLength = -1
         OnChange = DescrMemoChange
+        ParentBidiMode = True
+        ParentFont = True
+        ReadOnly = False
+        ScrollBars = ssNone
         TabOrder = 0
+        TabStop = True
+        Visible = True
+        WantReturns = True
+        WantTabs = False
       end
     end
     object ErrorsTabSheet: TTabSheet
+      HelpContext = 0
       Caption = 'ErrorsTabSheet'
-      ClientHeight = 100
-      ClientWidth = 705
+      ChildSizing.LeftRightSpacing = 0
+      ChildSizing.TopBottomSpacing = 0
+      ChildSizing.HorizontalSpacing = 0
+      ChildSizing.VerticalSpacing = 0
+      ChildSizing.ControlsPerLine = 0
+      ClientHeight = 95
+      ClientWidth = 709
+      Enabled = True
+      ParentFont = True
+      ParentShowHint = True
       object ErrorsMemo: TMemo
-        Height = 96
-        Width = 703
+        Left = 0
+        Height = 91
+        Top = 0
+        Width = 707
+        HelpContext = 0
         Align = alClient
+        Alignment = taLeftJustify
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
         BorderSpacing.Right = 2
         BorderSpacing.Bottom = 4
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
         Lines.Strings = (
           'ErrorsMemo'
         )
+        MaxLength = -1
         OnChange = ErrorsMemoChange
+        ParentBidiMode = True
+        ParentFont = True
+        ReadOnly = False
+        ScrollBars = ssNone
         TabOrder = 0
+        TabStop = True
+        Visible = True
+        WantReturns = True
+        WantTabs = False
       end
     end
     object SeeAlsoTabSheet: TTabSheet
+      HelpContext = 0
       Caption = 'SeeAlsoTabSheet'
-      ClientHeight = 100
-      ClientWidth = 705
+      ChildSizing.LeftRightSpacing = 0
+      ChildSizing.TopBottomSpacing = 0
+      ChildSizing.HorizontalSpacing = 0
+      ChildSizing.VerticalSpacing = 0
+      ChildSizing.ControlsPerLine = 0
+      ClientHeight = 95
+      ClientWidth = 709
+      Enabled = True
+      ParentFont = True
+      ParentShowHint = True
       object LinkListBox: TListBox
         AnchorSideTop.Control = AddLinkButton
         AnchorSideTop.Side = asrBottom
-        Height = 69
+        Left = 0
+        Height = 64
         Top = 27
-        Width = 703
+        Width = 707
+        HelpContext = 0
         Align = alBottom
         Anchors = [akTop, akLeft, akRight, akBottom]
+        BorderSpacing.Left = 0
         BorderSpacing.Top = 4
         BorderSpacing.Right = 2
         BorderSpacing.Bottom = 4
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        BorderStyle = bsSingle
+        ClickOnSelChange = True
+        Columns = 0
+        DragCursor = crDrag
+        DragKind = dkDrag
+        DragMode = dmManual
+        ExtendedSelect = True
+        Enabled = True
+        IntegralHeight = False
+        ItemHeight = 0
+        MultiSelect = False
         OnClick = LinkListBoxClick
+        ParentBidiMode = True
+        ParentShowHint = True
+        ParentFont = True
+        Sorted = False
+        Style = lbStandard
         TabOrder = 0
+        TabStop = True
+        TopIndex = -1
+        Visible = True
       end
       object AddLinkButton: TButton
         AnchorSideRight.Control = DeleteLinkButton
-        Left = 495
+        Left = 499
         Height = 23
+        Top = 0
         Width = 95
+        HelpContext = 0
+        Align = alNone
         Anchors = [akTop, akRight]
         AutoSize = True
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
         BorderSpacing.Right = 6
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Cancel = False
         Caption = 'AddLinkButton'
+        Default = False
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        ParentBidiMode = True
+        ModalResult = 0
         OnClick = AddLinkButtonClick
+        ParentFont = True
+        ParentShowHint = True
         TabOrder = 1
+        TabStop = True
+        Visible = True
       end
       object DeleteLinkButton: TButton
         AnchorSideRight.Control = SeeAlsoTabSheet
         AnchorSideRight.Side = asrBottom
-        Left = 596
+        Left = 600
         Height = 23
+        Top = 0
         Width = 107
+        HelpContext = 0
+        Align = alNone
         Anchors = [akTop, akRight]
         AutoSize = True
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
         BorderSpacing.Right = 2
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Cancel = False
         Caption = 'DeleteLinkButton'
+        Default = False
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        ParentBidiMode = True
+        ModalResult = 0
         OnClick = DeleteLinkButtonClick
+        ParentFont = True
+        ParentShowHint = True
         TabOrder = 2
+        TabStop = True
+        Visible = True
       end
       object LinkTextEdit: TEdit
         AnchorSideLeft.Control = LinkIdComboBox
@@ -271,165 +691,508 @@ object FPDocEditor: TFPDocEditor
         Left = 229
         Height = 27
         Top = 1
-        Width = 262
+        Width = 266
+        HelpContext = 0
+        Align = alNone
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
+        AutoSelect = False
         BorderSpacing.Left = 4
+        BorderSpacing.Top = 0
         BorderSpacing.Right = 4
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        CharCase = ecNormal
+        DragCursor = crDrag
+        DragMode = dmManual
+        EchoMode = emNormal
+        Enabled = True
+        MaxLength = -1
+        ParentBidiMode = True
         OnChange = LinkChange
+        ParentFont = True
+        ParentShowHint = True
+        PasswordChar = #0
+        ReadOnly = False
+        TabStop = True
         TabOrder = 3
         Text = 'LinkTextEdit'
+        Visible = True
       end
       object LinkIdComboBox: TComboBox
+        Left = 0
         Height = 21
         Top = 1
         Width = 225
-        ItemHeight = 13
+        HelpContext = 0
+        TabStop = True
+        Align = alNone
+        ArrowKeysTraverseList = True
+        AutoComplete = False
+        AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+        AutoDropDown = False
+        AutoSelect = False
+        AutoSize = True
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        CharCase = ecNormal
+        Ctl3D = False
+        DragCursor = crDrag
+        DragMode = dmManual
+        DropDownCount = 8
+        Enabled = True
+        ItemHeight = 0
+        ItemIndex = -1
+        ItemWidth = 0
+        MaxLength = 0
         OnChange = LinkChange
+        ParentBidiMode = True
+        ParentColor = False
+        ParentCtl3D = True
+        ParentFont = True
+        ParentShowHint = True
+        Sorted = False
+        Style = csDropDown
         TabOrder = 4
         Text = 'LinkIdComboBox'
+        Visible = True
       end
     end
     object ExampleTabSheet: TTabSheet
+      HelpContext = 0
       Caption = 'ExampleTabSheet'
-      ClientHeight = 100
-      ClientWidth = 705
+      ChildSizing.LeftRightSpacing = 0
+      ChildSizing.TopBottomSpacing = 0
+      ChildSizing.HorizontalSpacing = 0
+      ChildSizing.VerticalSpacing = 0
+      ChildSizing.ControlsPerLine = 0
+      ClientHeight = 95
+      ClientWidth = 709
+      Enabled = True
+      ParentFont = True
+      ParentShowHint = True
       object ExampleEdit: TEdit
+        Left = 0
         Height = 27
-        Width = 703
+        Top = 0
+        Width = 707
+        HelpContext = 0
         Align = alTop
         AutoSize = True
+        AutoSelect = False
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
         BorderSpacing.Right = 2
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        CharCase = ecNormal
+        DragCursor = crDrag
+        DragMode = dmManual
+        EchoMode = emNormal
+        Enabled = True
+        MaxLength = -1
+        ParentBidiMode = True
         OnChange = ExampleEditChange
+        ParentFont = True
+        ParentShowHint = True
+        PasswordChar = #0
+        ReadOnly = False
+        TabStop = True
         TabOrder = 0
         Text = 'ExampleEdit'
+        Visible = True
       end
       object BrowseExampleButton: TButton
         AnchorSideTop.Control = ExampleEdit
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = ExampleTabSheet
         AnchorSideRight.Side = asrBottom
-        Left = 566
+        Left = 570
         Height = 23
         Top = 33
         Width = 133
+        HelpContext = 0
+        Align = alNone
         Anchors = [akTop, akRight]
         AutoSize = True
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
         BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Cancel = False
         Caption = 'BrowseExampleButton'
+        Default = False
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        ParentBidiMode = True
+        ModalResult = 0
         OnClick = BrowseExampleButtonClick
+        ParentFont = True
+        ParentShowHint = True
         TabOrder = 1
+        TabStop = True
+        Visible = True
       end
     end
   end
   object LeftBtnPanel: TPanel
+    Left = 0
     Height = 126
+    Top = 0
     Width = 20
+    HelpContext = 0
     Align = alLeft
+    Alignment = taCenter
+    AutoSize = False
+    BorderSpacing.Left = 0
+    BorderSpacing.Top = 0
+    BorderSpacing.Right = 0
+    BorderSpacing.Bottom = 0
+    BorderSpacing.Around = 0
+    BorderSpacing.CellAlignHorizontal = ccaFill
+    BorderSpacing.CellAlignVertical = ccaFill
+    BevelInner = bvNone
     BevelOuter = bvNone
+    BevelWidth = 1
+    BorderWidth = 0
+    BorderStyle = bsNone
+    ChildSizing.LeftRightSpacing = 0
+    ChildSizing.TopBottomSpacing = 0
+    ChildSizing.HorizontalSpacing = 0
+    ChildSizing.VerticalSpacing = 0
+    ChildSizing.ControlsPerLine = 0
     ClientHeight = 126
     ClientWidth = 20
+    DockSite = False
+    DragCursor = crDrag
+    DragKind = dkDrag
+    DragMode = dmManual
+    Enabled = True
     FullRepaint = False
+    ParentColor = True
+    ParentFont = True
     ParentShowHint = False
     ShowHint = True
     TabOrder = 1
+    TabStop = False
+    Visible = True
     object BoldFormatButton: TSpeedButton
+      Left = 0
       Height = 23
+      Top = 0
       Width = 20
+      HelpContext = 0
       Align = alTop
+      AllowAllUp = False
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
+      BorderSpacing.Around = 0
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
       Color = clBtnFace
+      Down = False
+      Enabled = True
+      Flat = False
+      GroupIndex = 0
+      Layout = blGlyphLeft
+      Margin = -1
       NumGlyphs = 0
+      Spacing = 4
+      Transparent = True
+      Visible = True
       OnClick = FormatButtonClick
+      ShowCaption = True
+      ParentFont = True
+      ParentShowHint = True
     end
     object ItalicFormatButton: TSpeedButton
       Tag = 1
+      Left = 0
       Height = 23
       Top = 46
       Width = 20
+      HelpContext = 0
       Align = alTop
+      AllowAllUp = False
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
+      BorderSpacing.Around = 0
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
       Color = clBtnFace
+      Down = False
+      Enabled = True
+      Flat = False
+      GroupIndex = 0
+      Layout = blGlyphLeft
+      Margin = -1
       NumGlyphs = 0
+      Spacing = 4
+      Transparent = True
+      Visible = True
       OnClick = FormatButtonClick
+      ShowCaption = True
+      ParentFont = True
+      ParentShowHint = True
     end
     object UnderlineFormatButton: TSpeedButton
       Tag = 2
+      Left = 0
       Height = 23
       Top = 23
       Width = 20
+      HelpContext = 0
       Align = alTop
+      AllowAllUp = False
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
+      BorderSpacing.Around = 0
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
       Color = clBtnFace
+      Down = False
+      Enabled = True
+      Flat = False
+      GroupIndex = 0
+      Layout = blGlyphLeft
+      Margin = -1
       NumGlyphs = 0
+      Spacing = 4
+      Transparent = True
+      Visible = True
       OnClick = FormatButtonClick
+      ShowCaption = True
+      ParentFont = True
+      ParentShowHint = True
     end
     object InsertVarTagButton: TSpeedButton
       Tag = 5
+      Left = 0
       Height = 23
       Top = 92
       Width = 20
+      HelpContext = 0
       Align = alTop
+      AllowAllUp = False
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
+      BorderSpacing.Around = 0
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
       Color = clBtnFace
+      Down = False
+      Enabled = True
+      Flat = False
+      GroupIndex = 0
+      Layout = blGlyphLeft
+      Margin = -1
       NumGlyphs = 0
+      Spacing = 4
+      Transparent = True
+      Visible = True
       OnClick = FormatButtonClick
+      ShowCaption = True
+      ParentFont = True
+      ParentShowHint = True
     end
     object InsertParagraphSpeedButton: TSpeedButton
       Tag = 6
+      Left = 0
       Height = 23
       Top = 69
       Width = 20
+      HelpContext = 0
       Align = alTop
+      AllowAllUp = False
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
+      BorderSpacing.Around = 0
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
       Caption = 'P'
       Color = clBtnFace
+      Down = False
+      Enabled = True
+      Flat = False
+      GroupIndex = 0
+      Layout = blGlyphLeft
+      Margin = -1
       NumGlyphs = 0
+      Spacing = 4
+      Transparent = True
+      Visible = True
       OnClick = FormatButtonClick
+      ShowCaption = True
+      ParentFont = True
+      ParentShowHint = True
     end
   end
   object RightBtnPanel: TPanel
     Left = 20
     Height = 126
+    Top = 0
     Width = 20
+    HelpContext = 0
     Align = alLeft
+    Alignment = taCenter
+    AutoSize = False
+    BorderSpacing.Left = 0
+    BorderSpacing.Top = 0
+    BorderSpacing.Right = 0
+    BorderSpacing.Bottom = 0
+    BorderSpacing.Around = 0
+    BorderSpacing.CellAlignHorizontal = ccaFill
+    BorderSpacing.CellAlignVertical = ccaFill
+    BevelInner = bvNone
     BevelOuter = bvNone
+    BevelWidth = 1
+    BorderWidth = 0
+    BorderStyle = bsNone
+    ChildSizing.LeftRightSpacing = 0
+    ChildSizing.TopBottomSpacing = 0
+    ChildSizing.HorizontalSpacing = 0
+    ChildSizing.VerticalSpacing = 0
+    ChildSizing.ControlsPerLine = 0
     ClientHeight = 126
     ClientWidth = 20
+    DockSite = False
+    DragCursor = crDrag
+    DragKind = dkDrag
+    DragMode = dmManual
+    Enabled = True
+    FullRepaint = True
+    ParentColor = True
+    ParentFont = True
+    ParentShowHint = True
     TabOrder = 2
+    TabStop = False
+    Visible = True
     object InsertLinkSpeedButton: TSpeedButton
+      Left = 0
       Height = 23
+      Top = 0
       Width = 20
+      HelpContext = 0
       Align = alTop
+      AllowAllUp = False
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
+      BorderSpacing.Around = 0
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
       Caption = 'Li'
       Color = clBtnFace
+      Down = False
       Enabled = False
+      Flat = False
+      GroupIndex = 0
+      Layout = blGlyphLeft
+      Margin = -1
       NumGlyphs = 0
+      Spacing = 4
+      Transparent = True
+      Visible = True
       OnClick = InsertLinkSpeedButtonClick
+      ShowCaption = True
       ShowHint = True
+      ParentFont = True
       ParentShowHint = False
     end
     object InsertCodeTagButton: TSpeedButton
       Tag = 3
+      Left = 0
       Height = 23
       Top = 23
       Width = 20
+      HelpContext = 0
       Align = alTop
+      AllowAllUp = False
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
+      BorderSpacing.Around = 0
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
       Color = clBtnFace
+      Down = False
+      Enabled = True
+      Flat = False
+      GroupIndex = 0
+      Layout = blGlyphLeft
+      Margin = -1
       NumGlyphs = 0
+      Spacing = 4
+      Transparent = True
+      Visible = True
       OnClick = FormatButtonClick
+      ShowCaption = True
       ShowHint = True
+      ParentFont = True
       ParentShowHint = False
     end
     object InsertRemarkButton: TSpeedButton
       Tag = 4
+      Left = 0
       Height = 23
       Top = 46
       Width = 20
+      HelpContext = 0
       Align = alTop
+      AllowAllUp = False
+      BorderSpacing.Left = 0
+      BorderSpacing.Top = 0
+      BorderSpacing.Right = 0
+      BorderSpacing.Bottom = 0
+      BorderSpacing.Around = 0
+      BorderSpacing.CellAlignHorizontal = ccaFill
+      BorderSpacing.CellAlignVertical = ccaFill
       Color = clBtnFace
+      Down = False
+      Enabled = True
+      Flat = False
+      GroupIndex = 0
+      Layout = blGlyphLeft
+      Margin = -1
       NumGlyphs = 0
+      Spacing = 4
+      Transparent = True
+      Visible = True
       OnClick = FormatButtonClick
+      ShowCaption = True
       ShowHint = True
+      ParentFont = True
       ParentShowHint = False
     end
   end
   object OpenDialog: TOpenDialog
+    Width = 0
+    Height = 0
     Title = 'Open example file'
     Filter = 'pascal file|*.pas; *.pp; *.p'
     FilterIndex = 0
diff --git a/ide/fpdoceditwindow.lrs b/ide/fpdoceditwindow.lrs
index 9a7ec163f2..b024264094 100644
--- a/ide/fpdoceditwindow.lrs
+++ b/ide/fpdoceditwindow.lrs
@@ -2,139 +2,378 @@
 
 LazarusResources.Add('TFPDocEditor','FORMDATA',[
   'TPF0'#12'TFPDocEditor'#11'FPDocEditor'#4'Left'#3'/'#1#6'Height'#2'~'#3'Top'#3
-  +'$'#2#5'Width'#3#241#2#13'ActiveControl'#7#9'ShortEdit'#7'Caption'#6#12'FPDo'
-  +'c editor'#12'ClientHeight'#2'~'#11'ClientWidth'#3#241#2#8'OnCreate'#7#10'Fo'
-  +'rmCreate'#9'OnDestroy'#7#11'FormDestroy'#8'OnResize'#7#10'FormResize'#10'Pa'
-  +'rentFont'#8#10'LCLVersion'#6#6'0.9.25'#0#12'TPageControl'#11'PageControl'#4
-  +'Left'#2'('#6'Height'#2'~'#5'Width'#3#201#2#10'ActivePage'#7#13'ShortTabShee'
-  +'t'#5'Align'#7#8'alClient'#8'TabIndex'#2#0#8'TabOrder'#2#0#11'TabPosition'#7
-  +#8'tpBottom'#8'OnChange'#7#17'PageControlChange'#13'OnPageChanged'#7#17'Page'
-  +'ControlChange'#0#9'TTabSheet'#13'ShortTabSheet'#7'Caption'#6#13'ShortTabShe'
-  +'et'#12'ClientHeight'#2'd'#11'ClientWidth'#3#193#2#0#6'TLabel'#9'LinkLabel'
-  +#21'AnchorSideTop.Control'#7#8'LinkEdit'#18'AnchorSideTop.Side'#7#9'asrCente'
-  +'r'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'#'#5'Width'#2','#17'BorderSpacing.To'
-  +'p'#2#6#7'Caption'#6#9'LinkLabel'#11'ParentColor'#8#0#0#6'TLabel'#10'ShortLa'
-  +'bel'#22'AnchorSideLeft.Control'#7#13'ShortTabSheet'#21'AnchorSideTop.Contro'
-  +'l'#7#9'ShortEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Heigh'
-  +'t'#2#14#3'Top'#2#6#5'Width'#2'4'#18'BorderSpacing.Left'#2#6#7'Caption'#6#10
-  +'ShortLabel'#11'ParentColor'#8#0#0#5'TEdit'#9'ShortEdit'#22'AnchorSideLeft.C'
-  +'ontrol'#7#10'ShortLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSi'
-  +'deRight.Control'#7#13'ShortTabSheet'#20'AnchorSideRight.Side'#7#9'asrBottom'
-  +#4'Left'#2'@'#6'Height'#2#27#5'Width'#3''#2#7'Anchors'#11#5'akTop'#6'akLeft'
-  +#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Righ'
-  +'t'#2#2#8'OnChange'#7#20'ShortEditEditingDone'#13'OnEditingDone'#7#20'ShortE'
-  +'ditEditingDone'#8'TabOrder'#2#0#4'Text'#6#9'ShortEdit'#0#0#7'TButton'#12'Cr'
-  +'eateButton'#21'AnchorSideTop.Control'#7#8'LinkEdit'#18'AnchorSideTop.Side'#7
-  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'>'#5'Width'#2'['#8'AutoSiz'
-  +'e'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'CreateButton'#7'OnClick'#7
-  +#17'CreateButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#10'SaveButton'#22'Anch'
-  +'orSideLeft.Control'#7#12'CreateButton'#19'AnchorSideLeft.Side'#7#9'asrBotto'
-  +'m'#21'AnchorSideTop.Control'#7#12'CreateButton'#4'Left'#2'g'#6'Height'#2#23
-  +#3'Top'#2'>'#5'Width'#2'R'#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#7'Captio'
-  +'n'#6#10'SaveButton'#7'OnClick'#7#15'SaveButtonClick'#8'TabOrder'#2#2#0#0#5
-  +'TEdit'#8'LinkEdit'#22'AnchorSideLeft.Control'#7#9'LinkLabel'#19'AnchorSideL'
-  +'eft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'ShortEdit'#18'Anchor'
-  +'SideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#13'ShortTabSheet'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'8'#6'Height'#2#27#3'Top'#2
-  +#29#5'Width'#3#135#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSiz'
-  +'e'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing.'
-  +'Right'#2#2#8'OnChange'#7#19'LinkEditEditingDone'#13'OnEditingDone'#7#19'Lin'
-  +'kEditEditingDone'#8'TabOrder'#2#3#4'Text'#6#8'LinkEdit'#0#0#0#9'TTabSheet'
-  +#17'InheritedTabSheet'#7'Caption'#6#17'InheritedTabSheet'#12'ClientHeight'#2
-  +'d'#11'ClientWidth'#3#193#2#0#6'TLabel'#19'InheritedShortLabel'#6'Height'#2
-  +#14#3'Top'#2#2#5'Width'#3#193#2#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#2
-  +#7'Caption'#6#19'InheritedShortLabel'#11'ParentColor'#8#0#0#5'TEdit'#18'Inhe'
-  +'ritedShortEdit'#22'AnchorSideLeft.Control'#7#17'InheritedTabSheet'#21'Ancho'
-  +'rSideTop.Control'#7#19'InheritedShortLabel'#18'AnchorSideTop.Side'#7#9'asrB'
-  +'ottom'#23'AnchorSideRight.Control'#7#17'InheritedTabSheet'#20'AnchorSideRig'
-  +'ht.Side'#7#9'asrBottom'#6'Height'#2#27#3'Top'#2#18#5'Width'#3#193#2#7'Ancho'
-  +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#17'BorderSpacing.Top'#2
-  +#2#8'ReadOnly'#9#8'TabOrder'#2#0#4'Text'#6#18'InheritedShortEdit'#0#0#7'TBut'
-  +'ton'#21'MoveToInheritedButton'#21'AnchorSideTop.Control'#7#18'InheritedShor'
-  +'tEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#2#23#3'Top'#2'3'#5'W'
-  +'idth'#3#140#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'Mo'
-  +'veToInheritedButton'#7'OnClick'#7#26'MoveToInheritedButtonClick'#8'TabOrder'
-  +#2#1#0#0#7'TButton'#23'CopyFromInheritedButton'#22'AnchorSideLeft.Control'#7
-  +#21'MoveToInheritedButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorS'
-  +'ideTop.Control'#7#21'MoveToInheritedButton'#18'AnchorSideTop.Side'#7#9'asrC'
-  +'enter'#4'Left'#3#150#0#6'Height'#2#23#3'Top'#2'3'#5'Width'#3#151#0#8'AutoSi'
-  +'ze'#9#18'BorderSpacing.Left'#2#10#7'Caption'#6#23'CopyFromInheritedButton'#7
-  +'OnClick'#7#28'CopyFromInheritedButtonClick'#8'TabOrder'#2#2#0#0#7'TButton'
-  +#24'AddLinkToInheritedButton'#22'AnchorSideLeft.Control'#7#23'CopyFromInheri'
-  +'tedButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'
-  +#7#23'CopyFromInheritedButton'#4'Left'#3'7'#1#6'Height'#2#23#3'Top'#2'3'#5'W'
-  +'idth'#3#151#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#10#7'Caption'#6#24'Add'
-  +'LinkToInheritedButton'#7'OnClick'#7#29'AddLinkToInheritedButtonClick'#8'Tab'
-  ,'Order'#2#3#0#0#0#9'TTabSheet'#13'DescrTabSheet'#7'Caption'#6#13'DescrTabShe'
-  +'et'#12'ClientHeight'#2'd'#11'ClientWidth'#3#193#2#0#5'TMemo'#9'DescrMemo'#6
-  +'Height'#2'`'#5'Width'#3#191#2#5'Align'#7#8'alClient'#19'BorderSpacing.Right'
-  +#2#2#20'BorderSpacing.Bottom'#2#4#13'Lines.Strings'#1#6#9'DescrMemo'#0#8'OnC'
-  +'hange'#7#15'DescrMemoChange'#8'TabOrder'#2#0#0#0#0#9'TTabSheet'#14'ErrorsTa'
-  +'bSheet'#7'Caption'#6#14'ErrorsTabSheet'#12'ClientHeight'#2'd'#11'ClientWidt'
-  +'h'#3#193#2#0#5'TMemo'#10'ErrorsMemo'#6'Height'#2'`'#5'Width'#3#191#2#5'Alig'
-  +'n'#7#8'alClient'#19'BorderSpacing.Right'#2#2#20'BorderSpacing.Bottom'#2#4#13
-  +'Lines.Strings'#1#6#10'ErrorsMemo'#0#8'OnChange'#7#16'ErrorsMemoChange'#8'Ta'
-  +'bOrder'#2#0#0#0#0#9'TTabSheet'#15'SeeAlsoTabSheet'#7'Caption'#6#15'SeeAlsoT'
-  +'abSheet'#12'ClientHeight'#2'd'#11'ClientWidth'#3#193#2#0#8'TListBox'#11'Lin'
-  +'kListBox'#21'AnchorSideTop.Control'#7#13'AddLinkButton'#18'AnchorSideTop.Si'
-  +'de'#7#9'asrBottom'#6'Height'#2'E'#3'Top'#2#27#5'Width'#3#191#2#5'Align'#7#8
-  +'alBottom'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#17'Bord'
-  +'erSpacing.Top'#2#4#19'BorderSpacing.Right'#2#2#20'BorderSpacing.Bottom'#2#4
-  +#7'OnClick'#7#16'LinkListBoxClick'#8'TabOrder'#2#0#0#0#7'TButton'#13'AddLink'
-  +'Button'#23'AnchorSideRight.Control'#7#16'DeleteLinkButton'#4'Left'#3#239#1#6
-  +'Height'#2#23#5'Width'#2'_'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9
-  +#19'BorderSpacing.Right'#2#6#7'Caption'#6#13'AddLinkButton'#7'OnClick'#7#18
-  +'AddLinkButtonClick'#8'TabOrder'#2#1#0#0#7'TButton'#16'DeleteLinkButton'#23
-  +'AnchorSideRight.Control'#7#15'SeeAlsoTabSheet'#20'AnchorSideRight.Side'#7#9
-  +'asrBottom'#4'Left'#3'T'#2#6'Height'#2#23#5'Width'#2'k'#7'Anchors'#11#5'akTo'
-  +'p'#7'akRight'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#2#7'Caption'#6#16'D'
-  +'eleteLinkButton'#7'OnClick'#7#21'DeleteLinkButtonClick'#8'TabOrder'#2#2#0#0
-  +#5'TEdit'#12'LinkTextEdit'#22'AnchorSideLeft.Control'#7#14'LinkIdComboBox'#19
-  +'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#13'AddLin'
-  +'kButton'#4'Left'#3#229#0#6'Height'#2#27#3'Top'#2#1#5'Width'#3#6#1#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#4
-  +#19'BorderSpacing.Right'#2#4#8'OnChange'#7#10'LinkChange'#8'TabOrder'#2#3#4
-  +'Text'#6#12'LinkTextEdit'#0#0#9'TComboBox'#14'LinkIdComboBox'#6'Height'#2#21
-  +#3'Top'#2#1#5'Width'#3#225#0#10'ItemHeight'#2#13#9'MaxLength'#2#255#8'OnChan'
-  +'ge'#7#10'LinkChange'#8'TabOrder'#2#4#4'Text'#6#14'LinkIdComboBox'#0#0#0#9'T'
-  +'TabSheet'#15'ExampleTabSheet'#7'Caption'#6#15'ExampleTabSheet'#12'ClientHei'
-  +'ght'#2'd'#11'ClientWidth'#3#193#2#0#5'TEdit'#11'ExampleEdit'#6'Height'#2#27
-  +#5'Width'#3#191#2#5'Align'#7#5'alTop'#8'AutoSize'#9#19'BorderSpacing.Right'#2
-  +#2#8'OnChange'#7#17'ExampleEditChange'#8'TabOrder'#2#0#4'Text'#6#11'ExampleE'
-  +'dit'#0#0#7'TButton'#19'BrowseExampleButton'#21'AnchorSideTop.Control'#7#11
-  +'ExampleEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Contr'
-  +'ol'#7#15'ExampleTabSheet'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3
-  +'6'#2#6'Height'#2#23#3'Top'#2'!'#5'Width'#3#133#0#7'Anchors'#11#5'akTop'#7'a'
-  +'kRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'Browse'
-  +'ExampleButton'#7'OnClick'#7#24'BrowseExampleButtonClick'#8'TabOrder'#2#1#0#0
-  +#0#0#6'TPanel'#12'LeftBtnPanel'#6'Height'#2'~'#5'Width'#2#20#5'Align'#7#6'al'
-  +'Left'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'~'#11'ClientWidth'#2#20
-  +#11'FullRepaint'#8#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#1#0#12'T'
-  +'SpeedButton'#16'BoldFormatButton'#6'Height'#2#23#5'Width'#2#20#5'Align'#7#5
-  +'alTop'#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButto'
-  +'nClick'#0#0#12'TSpeedButton'#18'ItalicFormatButton'#3'Tag'#2#1#6'Height'#2
-  +#23#3'Top'#2'.'#5'Width'#2#20#5'Align'#7#5'alTop'#5'Color'#7#9'clBtnFace'#9
-  +'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedButton'#21'U'
-  +'nderlineFormatButton'#3'Tag'#2#2#6'Height'#2#23#3'Top'#2#23#5'Width'#2#20#5
-  +'Align'#7#5'alTop'#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17
-  +'FormatButtonClick'#0#0#12'TSpeedButton'#18'InsertVarTagButton'#3'Tag'#2#5#6
-  +'Height'#2#23#3'Top'#2'\'#5'Width'#2#20#5'Align'#7#5'alTop'#5'Color'#7#9'clB'
-  +'tnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#12'TSpeedBu'
-  +'tton'#26'InsertParagraphSpeedButton'#3'Tag'#2#6#6'Height'#2#23#3'Top'#2'E'#5
-  +'Width'#2#20#5'Align'#7#5'alTop'#7'Caption'#6#1'P'#5'Color'#7#9'clBtnFace'#9
-  +'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#0#0#0#6'TPanel'#13'RightB'
-  +'tnPanel'#4'Left'#2#20#6'Height'#2'~'#5'Width'#2#20#5'Align'#7#6'alLeft'#10
-  +'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'~'#11'ClientWidth'#2#20#8'TabOrd'
-  +'er'#2#2#0#12'TSpeedButton'#21'InsertLinkSpeedButton'#6'Height'#2#23#5'Width'
-  +#2#20#5'Align'#7#5'alTop'#7'Caption'#6#2'Li'#5'Color'#7#9'clBtnFace'#7'Enabl'
-  +'ed'#8#9'NumGlyphs'#2#0#7'OnClick'#7#26'InsertLinkSpeedButtonClick'#8'ShowHi'
-  +'nt'#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#19'InsertCodeTagButton'#3'T'
-  ,'ag'#2#3#6'Height'#2#23#3'Top'#2#23#5'Width'#2#20#5'Align'#7#5'alTop'#5'Colo'
-  +'r'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#8'Sho'
-  +'wHint'#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#18'InsertRemarkButton'#3
-  +'Tag'#2#4#6'Height'#2#23#3'Top'#2'.'#5'Width'#2#20#5'Align'#7#5'alTop'#5'Col'
-  +'or'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#17'FormatButtonClick'#8'Sh'
-  +'owHint'#9#14'ParentShowHint'#8#0#0#0#11'TOpenDialog'#10'OpenDialog'#5'Title'
-  +#6#17'Open example file'#6'Filter'#6#28'pascal file|*.pas; *.pp; *.p'#11'Fil'
-  +'terIndex'#2#0#4'left'#3#240#0#3'top'#2#16#0#0#0
+  +'$'#2#5'Width'#3#241#2#11'HelpContext'#2#0#13'ActiveControl'#7#9'ShortEdit'#5
+  +'Align'#7#6'alNone'#14'AllowDropFiles'#8#10'AutoScroll'#9#8'AutoSize'#8#11'B'
+  +'orderIcons'#11#12'biSystemMenu'#10'biMinimize'#10'biMaximize'#0#11'BorderSt'
+  +'yle'#7#10'bsSizeable'#7'Caption'#6#12'FPDoc editor'#28'ChildSizing.LeftRigh'
+  +'tSpacing'#2#0#28'ChildSizing.TopBottomSpacing'#2#0#29'ChildSizing.Horizonta'
+  +'lSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2#0#27'ChildSizing.ControlsPe'
+  +'rLine'#2#0#12'ClientHeight'#2'~'#11'ClientWidth'#3#241#2#8'DockSite'#8#8'Dr'
+  +'agKind'#7#6'dkDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#11'Font.Height'#2
+  +#0#10'Font.Style'#11#0#9'FormStyle'#7#8'fsNormal'#8'OnCreate'#7#10'FormCreat'
+  +'e'#9'OnDestroy'#7#11'FormDestroy'#8'OnResize'#7#10'FormResize'#14'ParentBiD'
+  +'iMode'#9#10'ParentFont'#8#8'Position'#7#10'poDesigned'#13'ShowInTaskBar'#7#9
+  +'stDefault'#14'UseDockManager'#8#10'LCLVersion'#6#6'0.9.27'#11'WindowState'#7
+  +#8'wsNormal'#0#12'TPageControl'#11'PageControl'#4'Left'#2'('#6'Height'#2'~'#3
+  +'Top'#2#0#5'Width'#3#201#2#11'HelpContext'#2#0#7'TabStop'#9#10'ActivePage'#7
+  +#13'ShortTabSheet'#5'Align'#7#8'alClient'#18'BorderSpacing.Left'#2#0#17'Bord'
+  +'erSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0
+  +#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFil'
+  +'l'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#8'DockSite'#8#10'DragCu'
+  +'rsor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8'DragMode'#7#8'dmManual'#7'Enabl'
+  +'ed'#9#10'ParentFont'#9#14'ParentShowHint'#9#8'TabIndex'#2#0#8'TabOrder'#2#0
+  +#11'TabPosition'#7#8'tpBottom'#7'Visible'#9#8'OnChange'#7#17'PageControlChan'
+  +'ge'#13'OnPageChanged'#7#17'PageControlChange'#0#9'TTabSheet'#13'ShortTabShe'
+  +'et'#11'HelpContext'#2#0#7'Caption'#6#13'ShortTabSheet'#28'ChildSizing.LeftR'
+  +'ightSpacing'#2#0#28'ChildSizing.TopBottomSpacing'#2#0#29'ChildSizing.Horizo'
+  +'ntalSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2#0#27'ChildSizing.Control'
+  +'sPerLine'#2#0#12'ClientHeight'#2'_'#11'ClientWidth'#3#197#2#7'Enabled'#9#10
+  +'ParentFont'#9#14'ParentShowHint'#9#0#6'TLabel'#9'LinkLabel'#21'AnchorSideTo'
+  +'p.Control'#7#8'LinkEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6
+  +'Height'#2#18#3'Top'#2'!'#5'Width'#2'<'#11'HelpContext'#2#0#5'Align'#7#6'alN'
+  +'one'#9'Alignment'#7#13'taLeftJustify'#8'AutoSize'#9#18'BorderSpacing.Left'#2
+  +#0#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bo'
+  +'ttom'#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7
+  +#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#9
+  +'LinkLabel'#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9
+  +#6'Layout'#7#5'tlTop'#14'ParentBidiMode'#9#11'ParentColor'#8#10'ParentFont'#9
+  +#14'ParentShowHint'#9#13'ShowAccelChar'#9#11'Transparent'#9#7'Visible'#9#8'W'
+  +'ordWrap'#8#11'OptimalFill'#8#0#0#6'TLabel'#10'ShortLabel'#22'AnchorSideLeft'
+  +'.Control'#7#13'ShortTabSheet'#21'AnchorSideTop.Control'#7#9'ShortEdit'#18'A'
+  +'nchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#4#5'W'
+  +'idth'#2'F'#11'HelpContext'#2#0#5'Align'#7#6'alNone'#9'Alignment'#7#13'taLef'
+  +'tJustify'#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#0
+  +#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.A'
+  +'round'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacin'
+  +'g.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#10'ShortLabel'#10'DragCursor'
+  +#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#6'Layout'#7#5'tlTop'#14
+  +'ParentBidiMode'#9#11'ParentColor'#8#10'ParentFont'#9#14'ParentShowHint'#9#13
+  +'ShowAccelChar'#9#11'Transparent'#9#7'Visible'#9#8'WordWrap'#8#11'OptimalFil'
+  +'l'#8#0#0#5'TEdit'#9'ShortEdit'#22'AnchorSideLeft.Control'#7#10'ShortLabel'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#13'Sho'
+  +'rtTabSheet'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'R'#6'Height'#2
+  +#27#3'Top'#2#0#5'Width'#3'q'#2#11'HelpContext'#2#0#5'Align'#7#6'alNone'#7'An'
+  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#10'AutoSelect'#8#18
+  +'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2
+  +#2#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.'
+  +'CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'c'
+  +'caFill'#8'CharCase'#7#8'ecNormal'#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8
+  +'dmManual'#8'EchoMode'#7#8'emNormal'#7'Enabled'#9#9'MaxLength'#2#255#14'Pare'
+  +'ntBidiMode'#9#8'OnChange'#7#20'ShortEditEditingDone'#13'OnEditingDone'#7#20
+  +'ShortEditEditingDone'#10'ParentFont'#9#14'ParentShowHint'#9#12'PasswordChar'
+  +#6#1#0#8'ReadOnly'#8#7'TabStop'#9#8'TabOrder'#2#0#4'Text'#6#9'ShortEdit'#7'V'
+  +'isible'#9#0#0#7'TButton'#12'CreateButton'#21'AnchorSideTop.Control'#7#8'Lin'
+  +'kEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#29#3'T'
+  +'op'#2'>'#5'Width'#2'b'#11'HelpContext'#2#0#5'Align'#7#6'alNone'#8'AutoSize'
+  ,#9#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Rig'
+  +'ht'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#6'!BorderSp'
+  +'acing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'
+  +#7#7'ccaFill'#6'Cancel'#8#7'Caption'#6#12'CreateButton'#7'Default'#8#10'Drag'
+  +'Cursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#14'ParentBidiMod'
+  +'e'#9#11'ModalResult'#2#0#7'OnClick'#7#17'CreateButtonClick'#10'ParentFont'#9
+  +#14'ParentShowHint'#9#8'TabOrder'#2#1#7'TabStop'#9#7'Visible'#9#0#0#7'TButto'
+  +'n'#10'SaveButton'#22'AnchorSideLeft.Control'#7#12'CreateButton'#19'AnchorSi'
+  +'deLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#12'CreateButton'#4
+  +'Left'#2'n'#6'Height'#2#29#3'Top'#2'>'#5'Width'#2'W'#11'HelpContext'#2#0#5'A'
+  +'lign'#7#6'alNone'#8'AutoSize'#9#18'BorderSpacing.Left'#2#6#17'BorderSpacing'
+  +'.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'Borde'
+  +'rSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'Bo'
+  +'rderSpacing.CellAlignVertical'#7#7'ccaFill'#6'Cancel'#8#7'Caption'#6#10'Sav'
+  +'eButton'#7'Default'#8#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7
+  +'Enabled'#9#14'ParentBidiMode'#9#11'ModalResult'#2#0#7'OnClick'#7#15'SaveBut'
+  +'tonClick'#10'ParentFont'#9#14'ParentShowHint'#9#8'TabOrder'#2#2#7'TabStop'#9
+  +#7'Visible'#9#0#0#5'TEdit'#8'LinkEdit'#22'AnchorSideLeft.Control'#7#9'LinkLa'
+  +'bel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'S'
+  +'hortEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'
+  +#7#13'ShortTabSheet'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'H'#6
+  +'Height'#2#27#3'Top'#2#29#5'Width'#3'{'#2#11'HelpContext'#2#0#5'Align'#7#6'a'
+  +'lNone'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#10'AutoS'
+  +'elect'#8#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2#19'BorderSpac'
+  +'ing.Right'#2#2#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#0'!B'
+  +'orderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVe'
+  +'rtical'#7#7'ccaFill'#8'CharCase'#7#8'ecNormal'#10'DragCursor'#7#6'crDrag'#8
+  +'DragMode'#7#8'dmManual'#8'EchoMode'#7#8'emNormal'#7'Enabled'#9#9'MaxLength'
+  +#2#255#14'ParentBidiMode'#9#8'OnChange'#7#19'LinkEditEditingDone'#13'OnEditi'
+  +'ngDone'#7#19'LinkEditEditingDone'#10'ParentFont'#9#14'ParentShowHint'#9#12
+  +'PasswordChar'#6#1#0#8'ReadOnly'#8#7'TabStop'#9#8'TabOrder'#2#3#4'Text'#6#8
+  +'LinkEdit'#7'Visible'#9#0#0#0#9'TTabSheet'#17'InheritedTabSheet'#11'HelpCont'
+  +'ext'#2#0#7'Caption'#6#17'InheritedTabSheet'#28'ChildSizing.LeftRightSpacing'
+  +#2#0#28'ChildSizing.TopBottomSpacing'#2#0#29'ChildSizing.HorizontalSpacing'#2
+  +#0#27'ChildSizing.VerticalSpacing'#2#0#27'ChildSizing.ControlsPerLine'#2#0#12
+  +'ClientHeight'#2'_'#11'ClientWidth'#3#197#2#7'Enabled'#9#10'ParentFont'#9#14
+  +'ParentShowHint'#9#0#6'TLabel'#19'InheritedShortLabel'#4'Left'#2#0#6'Height'
+  +#2#14#3'Top'#2#2#5'Width'#3#197#2#11'HelpContext'#2#0#5'Align'#7#5'alTop'#9
+  +'Alignment'#7#13'taLeftJustify'#8'AutoSize'#9#18'BorderSpacing.Left'#2#0#17
+  +'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'
+  +#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'cc'
+  +'aFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#19'Inh'
+  +'eritedShortLabel'#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'En'
+  +'abled'#9#6'Layout'#7#5'tlTop'#14'ParentBidiMode'#9#11'ParentColor'#8#10'Par'
+  +'entFont'#9#14'ParentShowHint'#9#13'ShowAccelChar'#9#11'Transparent'#9#7'Vis'
+  +'ible'#9#8'WordWrap'#8#11'OptimalFill'#8#0#0#5'TEdit'#18'InheritedShortEdit'
+  +#22'AnchorSideLeft.Control'#7#17'InheritedTabSheet'#21'AnchorSideTop.Control'
+  +#7#19'InheritedShortLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSi'
+  +'deRight.Control'#7#17'InheritedTabSheet'#20'AnchorSideRight.Side'#7#9'asrBo'
+  +'ttom'#4'Left'#2#0#6'Height'#2#27#3'Top'#2#18#5'Width'#3#197#2#11'HelpContex'
+  +'t'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8
+  +'AutoSize'#9#10'AutoSelect'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.To'
+  +'p'#2#2#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSp'
+  +'acing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'Borde'
+  +'rSpacing.CellAlignVertical'#7#7'ccaFill'#8'CharCase'#7#8'ecNormal'#10'DragC'
+  +'ursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#8'EchoMode'#7#8'emNormal'#7'En'
+  +'abled'#9#9'MaxLength'#2#255#14'ParentBidiMode'#9#10'ParentFont'#9#14'Parent'
+  +'ShowHint'#9#12'PasswordChar'#6#1#0#8'ReadOnly'#9#7'TabStop'#9#8'TabOrder'#2
+  +#0#4'Text'#6#18'InheritedShortEdit'#7'Visible'#9#0#0#7'TButton'#21'MoveToInh'
+  +'eritedButton'#21'AnchorSideTop.Control'#7#18'InheritedShortEdit'#18'AnchorS'
+  +'ideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#23#3'Top'#2'3'#5'Width'
+  +#3#140#0#11'HelpContext'#2#0#5'Align'#7#6'alNone'#8'AutoSize'#9#18'BorderSpa'
+  +'cing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'Bor'
+  +'derSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlig'
+  ,'nHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#6
+  +'Cancel'#8#7'Caption'#6#21'MoveToInheritedButton'#7'Default'#8#10'DragCursor'
+  +#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#14'ParentBidiMode'#9#11
+  +'ModalResult'#2#0#7'OnClick'#7#26'MoveToInheritedButtonClick'#10'ParentFont'
+  +#9#14'ParentShowHint'#9#8'TabOrder'#2#1#7'TabStop'#9#7'Visible'#9#0#0#7'TBut'
+  +'ton'#23'CopyFromInheritedButton'#22'AnchorSideLeft.Control'#7#21'MoveToInhe'
+  +'ritedButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contro'
+  +'l'#7#21'MoveToInheritedButton'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'
+  +#3#150#0#6'Height'#2#23#3'Top'#2'3'#5'Width'#3#151#0#11'HelpContext'#2#0#5'A'
+  +'lign'#7#6'alNone'#8'AutoSize'#9#18'BorderSpacing.Left'#2#10#17'BorderSpacin'
+  +'g.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'Bord'
+  +'erSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'B'
+  +'orderSpacing.CellAlignVertical'#7#7'ccaFill'#6'Cancel'#8#7'Caption'#6#23'Co'
+  +'pyFromInheritedButton'#7'Default'#8#10'DragCursor'#7#6'crDrag'#8'DragMode'#7
+  +#8'dmManual'#7'Enabled'#9#14'ParentBidiMode'#9#11'ModalResult'#2#0#7'OnClick'
+  +#7#28'CopyFromInheritedButtonClick'#10'ParentFont'#9#14'ParentShowHint'#9#8
+  +'TabOrder'#2#2#7'TabStop'#9#7'Visible'#9#0#0#7'TButton'#24'AddLinkToInherite'
+  +'dButton'#22'AnchorSideLeft.Control'#7#23'CopyFromInheritedButton'#19'Anchor'
+  +'SideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'CopyFromInheri'
+  +'tedButton'#4'Left'#3'7'#1#6'Height'#2#23#3'Top'#2'3'#5'Width'#3#151#0#11'He'
+  +'lpContext'#2#0#5'Align'#7#6'alNone'#8'AutoSize'#9#18'BorderSpacing.Left'#2
+  +#10#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.B'
+  +'ottom'#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'
+  +#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#6'Cancel'#8#7
+  +'Caption'#6#24'AddLinkToInheritedButton'#7'Default'#8#10'DragCursor'#7#6'crD'
+  +'rag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#14'ParentBidiMode'#9#11'ModalRe'
+  +'sult'#2#0#7'OnClick'#7#29'AddLinkToInheritedButtonClick'#10'ParentFont'#9#14
+  +'ParentShowHint'#9#8'TabOrder'#2#3#7'TabStop'#9#7'Visible'#9#0#0#0#9'TTabShe'
+  +'et'#13'DescrTabSheet'#11'HelpContext'#2#0#7'Caption'#6#13'DescrTabSheet'#28
+  +'ChildSizing.LeftRightSpacing'#2#0#28'ChildSizing.TopBottomSpacing'#2#0#29'C'
+  +'hildSizing.HorizontalSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2#0#27'Ch'
+  +'ildSizing.ControlsPerLine'#2#0#12'ClientHeight'#2'_'#11'ClientWidth'#3#197#2
+  +#7'Enabled'#9#10'ParentFont'#9#14'ParentShowHint'#9#0#5'TMemo'#9'DescrMemo'#4
+  +'Left'#2#0#6'Height'#2'['#3'Top'#2#0#5'Width'#3#195#2#11'HelpContext'#2#0#5
+  +'Align'#7#8'alClient'#9'Alignment'#7#13'taLeftJustify'#18'BorderSpacing.Left'
+  +#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#2#20'BorderSpacing.'
+  +'Bottom'#2#4#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'
+  +#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#10'DragCursor'
+  +#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#13'Lines.Strings'#1#6#9
+  +'DescrMemo'#0#9'MaxLength'#2#255#8'OnChange'#7#15'DescrMemoChange'#14'Parent'
+  +'BidiMode'#9#10'ParentFont'#9#8'ReadOnly'#8#10'ScrollBars'#7#6'ssNone'#8'Tab'
+  +'Order'#2#0#7'TabStop'#9#7'Visible'#9#11'WantReturns'#9#8'WantTabs'#8#0#0#0#9
+  +'TTabSheet'#14'ErrorsTabSheet'#11'HelpContext'#2#0#7'Caption'#6#14'ErrorsTab'
+  +'Sheet'#28'ChildSizing.LeftRightSpacing'#2#0#28'ChildSizing.TopBottomSpacing'
+  +#2#0#29'ChildSizing.HorizontalSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2
+  +#0#27'ChildSizing.ControlsPerLine'#2#0#12'ClientHeight'#2'_'#11'ClientWidth'
+  +#3#197#2#7'Enabled'#9#10'ParentFont'#9#14'ParentShowHint'#9#0#5'TMemo'#10'Er'
+  +'rorsMemo'#4'Left'#2#0#6'Height'#2'['#3'Top'#2#0#5'Width'#3#195#2#11'HelpCon'
+  +'text'#2#0#5'Align'#7#8'alClient'#9'Alignment'#7#13'taLeftJustify'#18'Border'
+  +'Spacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#2#20
+  +'BorderSpacing.Bottom'#2#4#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellA'
+  +'lignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFil'
+  +'l'#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#13'Lin'
+  +'es.Strings'#1#6#10'ErrorsMemo'#0#9'MaxLength'#2#255#8'OnChange'#7#16'Errors'
+  +'MemoChange'#14'ParentBidiMode'#9#10'ParentFont'#9#8'ReadOnly'#8#10'ScrollBa'
+  +'rs'#7#6'ssNone'#8'TabOrder'#2#0#7'TabStop'#9#7'Visible'#9#11'WantReturns'#9
+  +#8'WantTabs'#8#0#0#0#9'TTabSheet'#15'SeeAlsoTabSheet'#11'HelpContext'#2#0#7
+  +'Caption'#6#15'SeeAlsoTabSheet'#28'ChildSizing.LeftRightSpacing'#2#0#28'Chil'
+  +'dSizing.TopBottomSpacing'#2#0#29'ChildSizing.HorizontalSpacing'#2#0#27'Chil'
+  +'dSizing.VerticalSpacing'#2#0#27'ChildSizing.ControlsPerLine'#2#0#12'ClientH'
+  +'eight'#2'_'#11'ClientWidth'#3#197#2#7'Enabled'#9#10'ParentFont'#9#14'Parent'
+  +'ShowHint'#9#0#8'TListBox'#11'LinkListBox'#21'AnchorSideTop.Control'#7#13'Ad'
+  +'dLinkButton'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2
+  +'@'#3'Top'#2#27#5'Width'#3#195#2#11'HelpContext'#2#0#5'Align'#7#8'alBottom'#7
+  ,'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#18'BorderSpacing.Le'
+  +'ft'#2#0#17'BorderSpacing.Top'#2#4#19'BorderSpacing.Right'#2#2#20'BorderSpac'
+  +'ing.Bottom'#2#4#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizo'
+  +'ntal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#11'Bord'
+  +'erStyle'#7#8'bsSingle'#16'ClickOnSelChange'#9#7'Columns'#2#0#10'DragCursor'
+  +#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8'DragMode'#7#8'dmManual'#14'ExtendedSe'
+  +'lect'#9#7'Enabled'#9#14'IntegralHeight'#8#10'ItemHeight'#2#0#11'MultiSelect'
+  +#8#7'OnClick'#7#16'LinkListBoxClick'#14'ParentBidiMode'#9#14'ParentShowHint'
+  +#9#10'ParentFont'#9#6'Sorted'#8#5'Style'#7#10'lbStandard'#8'TabOrder'#2#0#7
+  +'TabStop'#9#8'TopIndex'#2#255#7'Visible'#9#0#0#7'TButton'#13'AddLinkButton'
+  +#23'AnchorSideRight.Control'#7#16'DeleteLinkButton'#4'Left'#3#243#1#6'Height'
+  +#2#23#3'Top'#2#0#5'Width'#2'_'#11'HelpContext'#2#0#5'Align'#7#6'alNone'#7'An'
+  +'chors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#0#17
+  +'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'
+  +#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'cc'
+  +'aFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#6'Cancel'#8#7'Capti'
+  +'on'#6#13'AddLinkButton'#7'Default'#8#10'DragCursor'#7#6'crDrag'#8'DragMode'
+  +#7#8'dmManual'#7'Enabled'#9#14'ParentBidiMode'#9#11'ModalResult'#2#0#7'OnCli'
+  +'ck'#7#18'AddLinkButtonClick'#10'ParentFont'#9#14'ParentShowHint'#9#8'TabOrd'
+  +'er'#2#1#7'TabStop'#9#7'Visible'#9#0#0#7'TButton'#16'DeleteLinkButton'#23'An'
+  +'chorSideRight.Control'#7#15'SeeAlsoTabSheet'#20'AnchorSideRight.Side'#7#9'a'
+  +'srBottom'#4'Left'#3'X'#2#6'Height'#2#23#3'Top'#2#0#5'Width'#2'k'#11'HelpCon'
+  +'text'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSi'
+  +'ze'#9#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing'
+  +'.Right'#2#2#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#0'!Bord'
+  +'erSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVerti'
+  +'cal'#7#7'ccaFill'#6'Cancel'#8#7'Caption'#6#16'DeleteLinkButton'#7'Default'#8
+  +#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#14'Parent'
+  +'BidiMode'#9#11'ModalResult'#2#0#7'OnClick'#7#21'DeleteLinkButtonClick'#10'P'
+  +'arentFont'#9#14'ParentShowHint'#9#8'TabOrder'#2#2#7'TabStop'#9#7'Visible'#9
+  +#0#0#5'TEdit'#12'LinkTextEdit'#22'AnchorSideLeft.Control'#7#14'LinkIdComboBo'
+  +'x'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#13
+  +'AddLinkButton'#4'Left'#3#229#0#6'Height'#2#27#3'Top'#2#1#5'Width'#3#10#1#11
+  +'HelpContext'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
+  +'Right'#0#8'AutoSize'#9#10'AutoSelect'#8#18'BorderSpacing.Left'#2#4#17'Borde'
+  +'rSpacing.Top'#2#0#19'BorderSpacing.Right'#2#4#20'BorderSpacing.Bottom'#2#0
+  +#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFil'
+  +'l'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#8'CharCase'#7#8'ecNorma'
+  +'l'#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#8'EchoMode'#7#8'emN'
+  +'ormal'#7'Enabled'#9#9'MaxLength'#2#255#14'ParentBidiMode'#9#8'OnChange'#7#10
+  +'LinkChange'#10'ParentFont'#9#14'ParentShowHint'#9#12'PasswordChar'#6#1#0#8
+  +'ReadOnly'#8#7'TabStop'#9#8'TabOrder'#2#3#4'Text'#6#12'LinkTextEdit'#7'Visib'
+  +'le'#9#0#0#9'TComboBox'#14'LinkIdComboBox'#4'Left'#2#0#6'Height'#2#21#3'Top'
+  +#2#1#5'Width'#3#225#0#11'HelpContext'#2#0#7'TabStop'#9#5'Align'#7#6'alNone'
+  +#21'ArrowKeysTraverseList'#9#12'AutoComplete'#8#16'AutoCompleteText'#11#22'c'
+  +'bactEndOfLineComplete'#20'cbactSearchAscending'#0#12'AutoDropDown'#8#10'Aut'
+  +'oSelect'#8#8'AutoSize'#9#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2
+  +#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing'
+  +'.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpac'
+  +'ing.CellAlignVertical'#7#7'ccaFill'#8'CharCase'#7#8'ecNormal'#5'Ctl3D'#8#10
+  +'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#13'DropDownCount'#2#8#7'E'
+  +'nabled'#9#10'ItemHeight'#2#0#9'ItemIndex'#2#255#9'ItemWidth'#2#0#9'MaxLengt'
+  +'h'#2#0#8'OnChange'#7#10'LinkChange'#14'ParentBidiMode'#9#11'ParentColor'#8
+  +#11'ParentCtl3D'#9#10'ParentFont'#9#14'ParentShowHint'#9#6'Sorted'#8#5'Style'
+  +#7#10'csDropDown'#8'TabOrder'#2#4#4'Text'#6#14'LinkIdComboBox'#7'Visible'#9#0
+  +#0#0#9'TTabSheet'#15'ExampleTabSheet'#11'HelpContext'#2#0#7'Caption'#6#15'Ex'
+  +'ampleTabSheet'#28'ChildSizing.LeftRightSpacing'#2#0#28'ChildSizing.TopBotto'
+  +'mSpacing'#2#0#29'ChildSizing.HorizontalSpacing'#2#0#27'ChildSizing.Vertical'
+  +'Spacing'#2#0#27'ChildSizing.ControlsPerLine'#2#0#12'ClientHeight'#2'_'#11'C'
+  +'lientWidth'#3#197#2#7'Enabled'#9#10'ParentFont'#9#14'ParentShowHint'#9#0#5
+  +'TEdit'#11'ExampleEdit'#4'Left'#2#0#6'Height'#2#27#3'Top'#2#0#5'Width'#3#195
+  +#2#11'HelpContext'#2#0#5'Align'#7#5'alTop'#8'AutoSize'#9#10'AutoSelect'#8#18
+  +'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2
+  +#2#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.'
+  ,'CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'c'
+  +'caFill'#8'CharCase'#7#8'ecNormal'#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8
+  +'dmManual'#8'EchoMode'#7#8'emNormal'#7'Enabled'#9#9'MaxLength'#2#255#14'Pare'
+  +'ntBidiMode'#9#8'OnChange'#7#17'ExampleEditChange'#10'ParentFont'#9#14'Paren'
+  +'tShowHint'#9#12'PasswordChar'#6#1#0#8'ReadOnly'#8#7'TabStop'#9#8'TabOrder'#2
+  +#0#4'Text'#6#11'ExampleEdit'#7'Visible'#9#0#0#7'TButton'#19'BrowseExampleBut'
+  +'ton'#21'AnchorSideTop.Control'#7#11'ExampleEdit'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#23'AnchorSideRight.Control'#7#15'ExampleTabSheet'#20'AnchorSideR'
+  +'ight.Side'#7#9'asrBottom'#4'Left'#3':'#2#6'Height'#2#23#3'Top'#2'!'#5'Width'
+  +#3#133#0#11'HelpContext'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#5'akTop'#7'a'
+  +'kRight'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0
+  +#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.A'
+  +'round'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacin'
+  +'g.CellAlignVertical'#7#7'ccaFill'#6'Cancel'#8#7'Caption'#6#19'BrowseExample'
+  +'Button'#7'Default'#8#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7
+  +'Enabled'#9#14'ParentBidiMode'#9#11'ModalResult'#2#0#7'OnClick'#7#24'BrowseE'
+  +'xampleButtonClick'#10'ParentFont'#9#14'ParentShowHint'#9#8'TabOrder'#2#1#7
+  +'TabStop'#9#7'Visible'#9#0#0#0#0#6'TPanel'#12'LeftBtnPanel'#4'Left'#2#0#6'He'
+  +'ight'#2'~'#3'Top'#2#0#5'Width'#2#20#11'HelpContext'#2#0#5'Align'#7#6'alLeft'
+  +#9'Alignment'#7#8'taCenter'#8'AutoSize'#8#18'BorderSpacing.Left'#2#0#17'Bord'
+  +'erSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0
+  +#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFil'
+  +'l'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#10'BevelInner'#7#6'bvNo'
+  +'ne'#10'BevelOuter'#7#6'bvNone'#10'BevelWidth'#2#1#11'BorderWidth'#2#0#11'Bo'
+  +'rderStyle'#7#6'bsNone'#28'ChildSizing.LeftRightSpacing'#2#0#28'ChildSizing.'
+  +'TopBottomSpacing'#2#0#29'ChildSizing.HorizontalSpacing'#2#0#27'ChildSizing.'
+  +'VerticalSpacing'#2#0#27'ChildSizing.ControlsPerLine'#2#0#12'ClientHeight'#2
+  +'~'#11'ClientWidth'#2#20#8'DockSite'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'
+  +#7#6'dkDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#11'FullRepaint'#8#11'Par'
+  +'entColor'#9#10'ParentFont'#9#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'
+  +#2#1#7'TabStop'#8#7'Visible'#9#0#12'TSpeedButton'#16'BoldFormatButton'#4'Lef'
+  +'t'#2#0#6'Height'#2#23#3'Top'#2#0#5'Width'#2#20#11'HelpContext'#2#0#5'Align'
+  +#7#5'alTop'#10'AllowAllUp'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'
+  +#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpaci'
+  +'ng.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSp'
+  +'acing.CellAlignVertical'#7#7'ccaFill'#5'Color'#7#9'clBtnFace'#4'Down'#8#7'E'
+  +'nabled'#9#4'Flat'#8#10'GroupIndex'#2#0#6'Layout'#7#11'blGlyphLeft'#6'Margin'
+  +#2#255#9'NumGlyphs'#2#0#7'Spacing'#2#4#11'Transparent'#9#7'Visible'#9#7'OnCl'
+  +'ick'#7#17'FormatButtonClick'#11'ShowCaption'#9#10'ParentFont'#9#14'ParentSh'
+  +'owHint'#9#0#0#12'TSpeedButton'#18'ItalicFormatButton'#3'Tag'#2#1#4'Left'#2#0
+  +#6'Height'#2#23#3'Top'#2'.'#5'Width'#2#20#11'HelpContext'#2#0#5'Align'#7#5'a'
+  +'lTop'#10'AllowAllUp'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0
+  +#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.A'
+  +'round'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacin'
+  +'g.CellAlignVertical'#7#7'ccaFill'#5'Color'#7#9'clBtnFace'#4'Down'#8#7'Enabl'
+  +'ed'#9#4'Flat'#8#10'GroupIndex'#2#0#6'Layout'#7#11'blGlyphLeft'#6'Margin'#2
+  +#255#9'NumGlyphs'#2#0#7'Spacing'#2#4#11'Transparent'#9#7'Visible'#9#7'OnClic'
+  +'k'#7#17'FormatButtonClick'#11'ShowCaption'#9#10'ParentFont'#9#14'ParentShow'
+  +'Hint'#9#0#0#12'TSpeedButton'#21'UnderlineFormatButton'#3'Tag'#2#2#4'Left'#2
+  +#0#6'Height'#2#23#3'Top'#2#23#5'Width'#2#20#11'HelpContext'#2#0#5'Align'#7#5
+  +'alTop'#10'AllowAllUp'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0
+  +#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.A'
+  +'round'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacin'
+  +'g.CellAlignVertical'#7#7'ccaFill'#5'Color'#7#9'clBtnFace'#4'Down'#8#7'Enabl'
+  +'ed'#9#4'Flat'#8#10'GroupIndex'#2#0#6'Layout'#7#11'blGlyphLeft'#6'Margin'#2
+  +#255#9'NumGlyphs'#2#0#7'Spacing'#2#4#11'Transparent'#9#7'Visible'#9#7'OnClic'
+  +'k'#7#17'FormatButtonClick'#11'ShowCaption'#9#10'ParentFont'#9#14'ParentShow'
+  +'Hint'#9#0#0#12'TSpeedButton'#18'InsertVarTagButton'#3'Tag'#2#5#4'Left'#2#0#6
+  +'Height'#2#23#3'Top'#2'\'#5'Width'#2#20#11'HelpContext'#2#0#5'Align'#7#5'alT'
+  +'op'#10'AllowAllUp'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19
+  +'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Arou'
+  +'nd'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.C'
+  +'ellAlignVertical'#7#7'ccaFill'#5'Color'#7#9'clBtnFace'#4'Down'#8#7'Enabled'
+  +#9#4'Flat'#8#10'GroupIndex'#2#0#6'Layout'#7#11'blGlyphLeft'#6'Margin'#2#255#9
+  ,'NumGlyphs'#2#0#7'Spacing'#2#4#11'Transparent'#9#7'Visible'#9#7'OnClick'#7#17
+  +'FormatButtonClick'#11'ShowCaption'#9#10'ParentFont'#9#14'ParentShowHint'#9#0
+  +#0#12'TSpeedButton'#26'InsertParagraphSpeedButton'#3'Tag'#2#6#4'Left'#2#0#6
+  +'Height'#2#23#3'Top'#2'E'#5'Width'#2#20#11'HelpContext'#2#0#5'Align'#7#5'alT'
+  +'op'#10'AllowAllUp'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19
+  +'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Arou'
+  +'nd'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.C'
+  +'ellAlignVertical'#7#7'ccaFill'#7'Caption'#6#1'P'#5'Color'#7#9'clBtnFace'#4
+  +'Down'#8#7'Enabled'#9#4'Flat'#8#10'GroupIndex'#2#0#6'Layout'#7#11'blGlyphLef'
+  +'t'#6'Margin'#2#255#9'NumGlyphs'#2#0#7'Spacing'#2#4#11'Transparent'#9#7'Visi'
+  +'ble'#9#7'OnClick'#7#17'FormatButtonClick'#11'ShowCaption'#9#10'ParentFont'#9
+  +#14'ParentShowHint'#9#0#0#0#6'TPanel'#13'RightBtnPanel'#4'Left'#2#20#6'Heigh'
+  +'t'#2'~'#3'Top'#2#0#5'Width'#2#20#11'HelpContext'#2#0#5'Align'#7#6'alLeft'#9
+  +'Alignment'#7#8'taCenter'#8'AutoSize'#8#18'BorderSpacing.Left'#2#0#17'Border'
+  +'Spacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20
+  +'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'
+  +#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#10'BevelInner'#7#6'bvNone'
+  +#10'BevelOuter'#7#6'bvNone'#10'BevelWidth'#2#1#11'BorderWidth'#2#0#11'Border'
+  +'Style'#7#6'bsNone'#28'ChildSizing.LeftRightSpacing'#2#0#28'ChildSizing.TopB'
+  +'ottomSpacing'#2#0#29'ChildSizing.HorizontalSpacing'#2#0#27'ChildSizing.Vert'
+  +'icalSpacing'#2#0#27'ChildSizing.ControlsPerLine'#2#0#12'ClientHeight'#2'~'
+  +#11'ClientWidth'#2#20#8'DockSite'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'#7
+  +#6'dkDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#11'FullRepaint'#9#11'Paren'
+  +'tColor'#9#10'ParentFont'#9#14'ParentShowHint'#9#8'TabOrder'#2#2#7'TabStop'#8
+  +#7'Visible'#9#0#12'TSpeedButton'#21'InsertLinkSpeedButton'#4'Left'#2#0#6'Hei'
+  +'ght'#2#23#3'Top'#2#0#5'Width'#2#20#11'HelpContext'#2#0#5'Align'#7#5'alTop'
+  +#10'AllowAllUp'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'Bo'
+  +'rderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'
+  +#2#0'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellA'
+  +'lignVertical'#7#7'ccaFill'#7'Caption'#6#2'Li'#5'Color'#7#9'clBtnFace'#4'Dow'
+  +'n'#8#7'Enabled'#8#4'Flat'#8#10'GroupIndex'#2#0#6'Layout'#7#11'blGlyphLeft'#6
+  +'Margin'#2#255#9'NumGlyphs'#2#0#7'Spacing'#2#4#11'Transparent'#9#7'Visible'#9
+  +#7'OnClick'#7#26'InsertLinkSpeedButtonClick'#11'ShowCaption'#9#8'ShowHint'#9
+  +#10'ParentFont'#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#19'InsertCodeTag'
+  +'Button'#3'Tag'#2#3#4'Left'#2#0#6'Height'#2#23#3'Top'#2#23#5'Width'#2#20#11
+  +'HelpContext'#2#0#5'Align'#7#5'alTop'#10'AllowAllUp'#8#18'BorderSpacing.Left'
+  +#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.'
+  +'Bottom'#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAlignHorizontal'
+  +#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#5'Color'#7#9
+  +'clBtnFace'#4'Down'#8#7'Enabled'#9#4'Flat'#8#10'GroupIndex'#2#0#6'Layout'#7
+  +#11'blGlyphLeft'#6'Margin'#2#255#9'NumGlyphs'#2#0#7'Spacing'#2#4#11'Transpar'
+  +'ent'#9#7'Visible'#9#7'OnClick'#7#17'FormatButtonClick'#11'ShowCaption'#9#8
+  +'ShowHint'#9#10'ParentFont'#9#14'ParentShowHint'#8#0#0#12'TSpeedButton'#18'I'
+  +'nsertRemarkButton'#3'Tag'#2#4#4'Left'#2#0#6'Height'#2#23#3'Top'#2'.'#5'Widt'
+  +'h'#2#20#11'HelpContext'#2#0#5'Align'#7#5'alTop'#10'AllowAllUp'#8#18'BorderS'
+  +'pacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'B'
+  +'orderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.CellAl'
+  +'ignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'
+  +#5'Color'#7#9'clBtnFace'#4'Down'#8#7'Enabled'#9#4'Flat'#8#10'GroupIndex'#2#0
+  +#6'Layout'#7#11'blGlyphLeft'#6'Margin'#2#255#9'NumGlyphs'#2#0#7'Spacing'#2#4
+  +#11'Transparent'#9#7'Visible'#9#7'OnClick'#7#17'FormatButtonClick'#11'ShowCa'
+  +'ption'#9#8'ShowHint'#9#10'ParentFont'#9#14'ParentShowHint'#8#0#0#0#11'TOpen'
+  +'Dialog'#10'OpenDialog'#5'Width'#2#0#6'Height'#2#0#5'Title'#6#17'Open exampl'
+  +'e file'#6'Filter'#6#28'pascal file|*.pas; *.pp; *.p'#11'FilterIndex'#2#0#4
+  +'left'#3#240#0#3'top'#2#16#0#0#0
 ]);
diff --git a/ide/fpdoceditwindow.pas b/ide/fpdoceditwindow.pas
index 0db018e056..524abb4478 100644
--- a/ide/fpdoceditwindow.pas
+++ b/ide/fpdoceditwindow.pas
@@ -1203,7 +1203,7 @@ begin
 end;
 
 initialization
-  {$I lazdoc.lrs}
+  {$I fpdoceditwindow.lrs}
   {$I fpdoceditwindow.lrs}
 
 end.
diff --git a/ideintf/componenteditors.pas b/ideintf/componenteditors.pas
index f53649ef81..7d78b0427e 100644
--- a/ideintf/componenteditors.pas
+++ b/ideintf/componenteditors.pas
@@ -28,7 +28,7 @@ uses
   Classes, SysUtils, LResources, TypInfo, LCLProc, Forms, Controls, Menus,
   ExtCtrls, StdCtrls, Graphics, Grids, CheckLst, Buttons, ComCtrls, Dialogs,
   LazStringGridEdit, CheckListboxEditorDlg, CheckGroupEditorDlg, GraphType, PropEdits,
-  ObjInspStrConsts;
+  ObjInspStrConsts, bp;
 
 type
   { TComponentEditorDesigner }
@@ -326,6 +326,17 @@ type
     function ToolBar: TToolBar; virtual;
   end;
 
+{ TButtonPanelComponentEditor
+  The default componenteditor for TButtonPanelComponentEditor }
+
+  TButtonPanelComponentEditor = class(TDefaultComponentEditor)
+  protected
+  public
+    procedure ExecuteVerb(Index: Integer); override;
+    function GetVerb(Index: Integer): string; override;
+    function GetVerbCount: Integer; override;
+    function ButtonPanel: TCustomButtonPanel2; virtual;
+  end;
 
 { TFileDialogComponentEditor
   The default componenteditor for TFileDialog }
@@ -995,6 +1006,61 @@ begin
   Result := TToolBar(GetComponent);
 end;
 
+{ TButtonPanelComponentEditor }
+
+procedure TButtonPanelComponentEditor.ExecuteVerb(Index: Integer);
+var
+  Hook: TPropertyEditorHook;
+  NewPanelButton: TPanelBitBtn2;
+  NewName: string;
+  CurButtonPanel: TCustomButtonPanel2;
+begin
+  Hook:=nil;
+  if not GetHook(Hook) then exit;
+  CurButtonPanel := ButtonPanel;
+
+  case Index of
+    //0: default button
+    0: NewPanelButton := CurButtonPanel.AddNewButton;
+    //1: OK button
+    1: NewPanelButton := CurButtonPanel.AddOKButton;
+    //2: Cancel button
+    2: NewPanelButton := CurButtonPanel.AddCancelButton;
+    //3: Help button
+    3: NewPanelButton := CurButtonPanel.AddHelpButton;
+    //4: Apply button
+    4: NewPanelButton := CurButtonPanel.AddApplyButton;
+  else
+    exit;
+  end;
+
+  Hook.PersistentAdded(NewPanelButton, True);
+  Modified;
+end;
+
+function TButtonPanelComponentEditor.GetVerb(Index: Integer): string;
+begin
+  case Index of
+    0: Result := 'New button';
+    1: Result := 'New OK button';
+    2: Result := 'New Cancel button';
+    3: Result := 'New Help button';
+    4: Result := 'New Apply button';
+  else
+    Result := '';
+  end;
+end;
+
+function TButtonPanelComponentEditor.GetVerbCount: Integer;
+begin
+  Result := 5;
+end;
+
+function TButtonPanelComponentEditor.ButtonPanel: TCustomButtonPanel2;
+begin
+  Result := TCustomButtonPanel2(GetComponent);
+end;
+
 { TCommonDialogComponentEditor }
 
 procedure TCommonDialogComponentEditor.TestDialog;
@@ -1186,6 +1252,7 @@ initialization
   RegisterComponentEditor(TCheckListBox,TCheckListBoxComponentEditor);
   RegisterComponentEditor(TCheckGroup,TCheckGroupComponentEditor);
   RegisterComponentEditor(TToolBar,TToolBarComponentEditor);
+  RegisterComponentEditor(TButtonPanel2,TButtonPanelComponentEditor);
   RegisterComponentEditor(TCommonDialog, TCommonDialogComponentEditor);
 
 finalization
diff --git a/images/laz_images.lrs b/images/laz_images.lrs
index 867f03f1b4..e3bffda81c 100644
--- a/images/laz_images.lrs
+++ b/images/laz_images.lrs
@@ -6148,6 +6148,31 @@ LazarusResources.Add('menu_comment','PNG',[
   +#149#7#30'c('#204#155'r'#238'?3'#19'#'#3'7'''#11#206'@f````Xu'#224#209'la'
   +#128'K|'#224#1#0'a'#226'H'#21'Z'#150#140#0#0#0#0'IEND'#174'B`'#130
 ]);
+LazarusResources.Add('menu_commit','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+  +#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167#147#0#0#0#9'pHYs'#0#0#13#215#0#0
+  +#13#215#1'B('#155'x'#0#0#0#7'tIME'#7#214#7#26#10''''#21'?'#184#237'!'#0#0#1
+  +#220'IDAT8'#203#157#147'Mk'#19'Q'#24#133#159';_M'#140#164'BLc'#131#31'm6'#213
+  +'v'#211#210'*~Tc'#13'B'#169'8nD+'#130#184#26'p'#173';'#193#191#224'~V'#221'u'
+  +')D'#10#133#138#197'R'#186'j'#164#168#27#193'Mu!)bL&M'#154#201'd'#198#205#24
+  +''''#157'A'#130'g'#249'^'#158#195#185#231#190#23#250#144'nj'#158'nj'#211'Qg'
+  +#18#253'k[7'#181#194''#27'<~`'#0#188#209'Mm.8'#23#17'q'#7#128'<'#176#8'L'#1
+  +#147#1#3#150#150'M'#128#27'E'#195'^'#15#25#232#166'v'#1'x>'''#180'T'#182'puX'
+  +'M'#141#230#16#2'U'#142'a'#217'?)}['#225#202#232#189#30#19#17#128#23#128#23
+  +#143#242#249#243#242'PN'#170#217'e'#188#218#167#158't'#31#155'5'#128#174#201
+  +#185'={V'#248#240#4#240#242#225#181#235'7c'#153'3X'#149'u,O#'#238#218#0#12':'
+  +#13'6'#219#206#223#226#132#196#165#145#187',-'#155'('#254#236#233#157#179#227
+  +#147#177't'#150#250#175'w$Z'#13#18'4'#24'nUxE'#2'G'#234#237':=x'#178'{'#13#5
+  +'`@'#213'f'#143#143'M'#167#227#214'{'#178#251'Uv'#164#4#154'"'#168#29#137'3'
+  +#238'C'#23#21'0'#235#22#153'c'#167#217'\'#253#208#237'@'#1#232#184'nF'#200
+  +#130'T'#195'b'#171'T'#247#214'Z'#149#208#235'L\>'#17#130#187'{'#224't'#156
+  +#228#209#198'W'#182'wvYk'#181'-'#224#25'0U4lQ4l'#1#240'69'#20#130#129'n'#7
+  +#236'7'#171#238'J]H'#192#253#162'a'#175#30'N'#224#195'3E'#195'.En'#162#170
+  +#200#7#128#23#5#251#10#193#193#4#27#205#189#178'Z'#144#189#24#166'6'#216#228
+  +#207'5'#162'$'#3#140#221#150#221'/'#7#237#250#173#153#220#143#212'n'#249#148
+  +#208#213#173#207#175';v?$'#184#137'#'#192#2'P'#5'6'#158'$'#221#239#2#188#249
+  +'E'#167#243'/'#131#223#215'K'#186#5'^'#207'5'#222#0#0#0#0'IEND'#174'B`'#130
+]);
 LazarusResources.Add('menu_compiler_options','PNG',[
   #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
   +#0#0#2'JIDATx^'#165#147'Mk'#19'a'#20#133#207';'#157#153'4ic'#155#166#154#144
@@ -6241,6 +6266,47 @@ LazarusResources.Add('menu_configure_help','PNG',[
   +#10#176#224'h'#201'z\'#157#255#5'~'#28'{rg'#141#201#170#0#0#0#0'IEND'#174'B`'
   +#130
 ]);
+LazarusResources.Add('menu_diff','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+  +#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167#147#0#0#0#9'pHYs'#0#0#13#215#0#0
+  +#13#215#1'B('#155'x'#0#0#0#7'tIME'#7#213#6#29#17#18#8#200#223'lx'#0#0#3'4IDA'
+  +'T8'#203#165#147'[hTw'#16#198'g'#254#231#178#231#156#205#222#226'n6'#169#27
+  +'4'#136#26#139#151'6'#27'['#179'T'#173#164'>'#24'|P4'#20#20#162#146'B'#169
+  +#171#173#15'5M5TZ4D'#193#18#164'Thk'#21#164#133'&/}'#170#180#198#16'/H'#172
+  +'h@'#163#193'['#196'd'#147#205#222#183#155#205#238#158'=9'#243#247'%'#27'Z'
+  +#241#173#31#12'3'#204#195#143'o'#24'>'#132'W'#212#214'~'#248'7'#189#144#223
+  +#138#136'*qB'#206#249#140#205'f'#191#216'y'#188#235#19'x'#141#196#210#240'E'
+  +#251#225#13#185'|'#254#175#230#157#205#178#195'Q'#142'E'#195#228'&'#7#144#5
+  +#180'NgR'#31'g2'#211'{'#237'v[c'#231#241#174#155#255#6' '#0#192#177#175';'
+  +#214#166#211#233'['#193#253#159'a'#223#221#201#226'HR,('#154#166#154#196#165
+  +'\6'#155#241#191#1'J'#227#219'>'#185#251#204'i'#170#240'T'#212'w'#28'=6'#244
+  +#31#7#137'Dr'#224#211#3#135#240#247#219'QcJ'#183'K'#187'6'#249#178#11#23'h'
+  +#255#152'D'#174#161#231#233#196#141#145#216#162#233#191#195#197#131#193'Cr'
+  +#247#153'o'#175#1#128#173#4#16':'#190':'#210#230#175#171#223'<'#154#20#205
+  +#209#25'M'#250#168'qI'#164#202#165#162'"3'#137#8'd'#213'"'#166'r'#250#236#195
+  +#231'I'#170#177'P'#206#240#186#20'\'#189'fU'#246#234#192#181'['#0#0','#145
+  +#136#159#244#215#249#165#193#23#134#28'X'#238'6'#4#6'n'#221'0'#157'y}V3'#137
+  +#4#211'4'#221#145#148#238'A'#192#240'p'#4#228'w'#214#190#171'D'#163#145#238
+  +#249#19'$I'#226#4#12#173'v'#7'('#178'x/'#147'7'#152'br]'#20#176'H'#196#151
+  +#246#220#8#157'4'#136#202#128#131'+m'#136#159#171#170#6#146'$'#241'y'#0#17
+  +#205'Z$Q'#146#24#231'O&'#166#167#24#218#152#171#12'L'#189'h'#134#199'b'#185
+  +#144'N'#20#23'8'#18'0'#174#204#26#134#169#235#186'@D'#198'<'#192#235#245#222
+  +#153#152#152#168'w'#200'2>'#30#143#151#143#199's79'#131'("'#139' q'#183#0'0'
+  +#3#200#173#201'Xt}'#237#162'rL&'#19'zee'#213'`'#9#192'DQ'#252#177''#224'Jx'
+  +#171#223'+'#168'V5`r'#178#1'G'#6#156#139#28#200'A'#8'r'#161'P'#168'py<'#239
+  +'oy'#203#195'~'#190'p.'#147'N'#167#250#231#191'p'#165#175'h'#197#155#181'mV'
+  +#139#168#175'\V'#163#141#198#139#245#177'p'#200#163#170#234'3'#226'T'#27#25
+  +''#177#221#229'v'#239#222#177'J'#132#193#235'rU'#209'0'#22#139'5'#212',Y|'
+  +#225#225#131#145#172#0#0#176'c'#231#246#203#195#15#238#239#231#185#212#212
+  +#174#166#128#221#0#177'r'#166#200'?'#224'('#172#169'[ZQ'#181#205#239#134'sgO'
+  +'S`]'#128'MNMJD'#166#196#24'kihX'#215#135'%+]'#167'N'#172#30#27#27#255#195
+  +#227#246#20#156#206'r'#217'_'#231'wVWW'#219'zz{'#30'=y'#250'H'#213#243#198'7'
+  +'N'#151#253#167#166'-Mpo'#248'>lxo#'#253#242#235'E'#134#175#134#163#235#212
+  +#137'}'#0#208#28#10#133'6'#2#128#230#243#249'.'#1'@o{'#219#209#243#193'`'#176
+  +#19#25#255'rO'#203'^'#176'Z'#203#224#251#179#223#1#190'&`l'#174#176#148#149
+  +#185#206#1#0'Z[[[T'#205#242#195#220#238'C'#248#191'z'#9';'#169'f'#147'hO'#162
+  +#5#0#0#0#0'IEND'#174'B`'#130
+]);
 LazarusResources.Add('menu_editor_options','PNG',[
   #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
   +#0#0#0#1'sRGB'#0#174#206#28#233#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167
@@ -6570,6 +6636,31 @@ LazarusResources.Add('menu_information','PNG',[
   +#193#194':'#16#131' '#8'^'#0'M'#2#228#214#190'G'#255#197','#211#138#215#249
   +'7'#139#238#165#161#139#191#222'a'#0#0#0#0'IEND'#174'B`'#130
 ]);
+LazarusResources.Add('menu_log','PNG',[
+  #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+  +#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167#147#0#0#0#9'pHYs'#0#0#11#19#0#0
+  +#11#19#1#0#154#156#24#0#0#0#7'tIME'#7#213#9#22#18'7);R'#2'H'#0#0#1#203'IDAT8'
+  +#203#165#147'Mh'#19'A'#20#199'3'#221#163'H'#22'"-'#226#177#224')'#160'X+'#1
+  +#15#130#21#132'x'#236'E'#208#182''''#175#165#23#21'<'#138' '#197' '#245'"~'
+  +#128#154#22#138'1'#189'['#26#17'M\'#16#237#193'b'#211#141#27'L'#253#192#213
+  +'l'#235#16#21'Z'#145#205'x0C'#179'mj+'#190#203#255#13#204#251#207'of'#222#131
+  +#255#12'a'#146#226']'#250#128#25#224#216'Vzx'#136#188#169#147#0#151'G/'#157#1
+  +'f'#14#30'w'#216#142#182#18'XM'#189#1#240#237#249'9'#182#163'WOJ'#221#172';-'
+  +#141#211#222'T@Y'#21'X'#221#147#167#172#10#252#232'z'#216'V_LK'#6#199#138#28
+  +#233#31#6#24'7'#4#196#227'q'#196#137#165'?'#139'}MeM}'#223'''O2t'#237#25#31
+  +#158#140'3'#183#16#132'@'#135#213'z'#31#165#20#245'z}'#195'K'#7'A'#128#155'I'
+  +#173#21'{'#203'|-Mu'#0'='#17#3#219#182#177'm;R'#236#251'>n&'#197#224'X'#145
+  +#197#199#25'^'#149#151'Q'#165#28'@'#207#200'dc'#246#175#4#230#228#129't'#129
+  +#197'|'#134#185#183#10'U'#202#241's'#255'E'#206#159#189'0'#11#136'M'#9#180
+  +#214#20#210#189#12'\y'#138'7}'#135#202#231#239#168#249#7#188#239#26#166#179
+  +#205'7F'#8#180#214'd'#179'Y~'#201'C'#204';'#14#239'>'#213'Yz='#5#189'iv'#173
+  +#172#0#218'4'#161'nK'#16#134'!'#187'?'#166'y'#244#165#155#251#185#28#221#242
+  +'%;'#251'n'#145'L&q]'#151'7'#149#5#140#139'\OP'#173'V'#241'<'#143#145#201#6
+  +'G;+'#172#238'H'#16#30#24'%'#145'H`Y'#22#150'eE'#186'x'#3'A,'#22'CkM'#173'VC'
+  +'k'#141#148#18#173'5B'#8#132#16#173#219#27#17#3#165#20#142#227'l:u'#198'd}'
+  +#24#131#137#155#183#175#159#250#135')'#158'0'#201'oZ'#157#232#152'y'#9#252#18
+  +#0#0#0#0'IEND'#174'B`'#130
+]);
 LazarusResources.Add('menu_new','PNG',[
   #137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
   +#0#0#2'"IDATx^]'#146#191'k'#21'A'#20#133#207#157#217'}'#201'K'#226'3F'#17'S)'
diff --git a/images/laz_images_list.txt b/images/laz_images_list.txt
index 69d64c451e..f278e07d16 100644
--- a/images/laz_images_list.txt
+++ b/images/laz_images_list.txt
@@ -38,9 +38,11 @@ menu/menu_close_all.png
 menu/menu_codetoolsdefineseditor.png
 menu/menu_codetoolsoptions.png
 menu/menu_comment.png
+menu/menu_commit.png
 menu/menu_compiler_options.png
 menu/menu_configure_build_lazarus.png
 menu/menu_configure_help.png
+menu/menu_diff.png
 menu/menu_editor_options.png
 menu/menu_edit_lowercase.png
 menu/menu_edit_sort.png
@@ -53,6 +55,7 @@ menu/menu_goto_line.png
 menu/menu_help.png
 menu/menu_indent.png
 menu/menu_information.png
+menu/menu_log.png
 menu/menu_new.png
 menu/menu_pause.png
 menu/menu_project_add.png
@@ -206,4 +209,4 @@ codetoolsdefines/da_ifdef.png
 codetoolsdefines/da_ifndef.png
 codetoolsdefines/da_undefine.png
 codetoolsdefines/da_undefineall.png
-codetoolsdefines/da_undefinerecurse.png
\ No newline at end of file
+codetoolsdefines/da_undefinerecurse.png
diff --git a/lcl/alllclunits.pp b/lcl/alllclunits.pp
index 6b41df6b3c..dba2264bee 100644
--- a/lcl/alllclunits.pp
+++ b/lcl/alllclunits.pp
@@ -47,7 +47,7 @@ uses
   LCLClasses, AsyncProcess, FileCtrl, Maps, HelpIntfs, LazHelpIntf, LazHelpHTML,
   StdActns, Buttons, Extctrls, Calendar, Clipbrd, Forms, LCLIntf, Spin,
   Comctrls, Graphics, StdCtrls, Arrow, Controls, ImgList, Menus, Toolwin,
-  Dialogs, Messages, ActnList, Grids, MaskEdit, ButtonPanel,
+  Dialogs, Messages, ActnList, Grids, MaskEdit, ButtonPanel, bp,
   Printers, PostScriptPrinter, PostScriptCanvas, CheckLst, PairSplitter,
   ExtDlgs, DBCtrls, DBGrids, DBActns, EditBtn, ExtGraphics, ColorBox,
   PropertyStorage, IniPropStorage, XMLPropStorage, Chart, LDockTree, LDockCtrl,
diff --git a/packager/pkgfileslcl.inc b/packager/pkgfileslcl.inc
index 5b6fafb0c2..d2f17ee0c5 100644
--- a/packager/pkgfileslcl.inc
+++ b/packager/pkgfileslcl.inc
@@ -6,6 +6,7 @@ AddFile('arrow.pp','Arrow',pftUnit,[pffHasRegisterProc],cpBase);
 AddFile('asyncprocess.pp','AsyncProcess',pftUnit,[pffHasRegisterProc],cpBase);
 AddFile('avglvltree.pas','AvgLvlTree',pftUnit,[],cpBase);
 AddFile('buttonpanel.pas','ButtonPanel',pftUnit,[pffHasRegisterProc],cpBase);
+AddFile('bp.pas','bp',pftUnit,[pffHasRegisterProc],cpBase);
 AddFile('buttons.pp','Buttons',pftUnit,[pffHasRegisterProc],cpBase);
 AddFile('calendar.pp','Calendar',pftUnit,[pffHasRegisterProc],cpBase);
 AddFile('chart.pp','Chart',pftUnit,[pffHasRegisterProc],cpBase);
diff --git a/packager/registerlcl.pas b/packager/registerlcl.pas
index 0d50668be7..459582402b 100644
--- a/packager/registerlcl.pas
+++ b/packager/registerlcl.pas
@@ -41,7 +41,7 @@ uses
   LazarusPackageIntf,
   Menus, Buttons, StdCtrls, ExtCtrls, ComCtrls, Forms, Grids, Controls,
   Dialogs, Spin, Arrow, Calendar, MaskEdit, CheckLst, PairSplitter, ExtDlgs,
-  StdActns, DBCtrls, DBGrids, DBActns, EditBtn, ActnList, FileCtrl, ButtonPanel,
+  StdActns, DBCtrls, DBGrids, DBActns, EditBtn, ActnList, FileCtrl, ButtonPanel, bp,
   LResources, XMLPropStorage, IniPropStorage, Graphics, Chart, ColorBox,
   LazHelpHTML, PopupNotifier, AsyncProcess;
   
@@ -80,6 +80,7 @@ begin
   RegisterUnit('Chart',@Chart.Register);
   RegisterUnit('ColorBox',@ColorBox.Register);
   RegisterUnit('ButtonPanel',@ButtonPanel.Register);
+  RegisterUnit('bp',@bp.Register);
   RegisterUnit('LResources',@LResources.Register);
   RegisterUnit('LazHelpHTML',@LazHelpHTML.Register);
   RegisterUnit('PopupNotifier', @PopupNotifier.Register);