diff --git a/designer/aligncompsdlg.lfm b/designer/aligncompsdlg.lfm
index d466ce4a9e..a9c146fe0b 100644
--- a/designer/aligncompsdlg.lfm
+++ b/designer/aligncompsdlg.lfm
@@ -1,18 +1,21 @@
 object AlignComponentsDialog: TAlignComponentsDialog
-  Left = 312
+  Left = 362
   Height = 238
-  Top = 606
+  Top = 325
   Width = 400
   HorzScrollBar.Page = 399
   VertScrollBar.Page = 237
   ActiveControl = OKButton
   BorderStyle = bsSizeToolWin
   Caption = 'AlignComponentsDialog'
+  ClientHeight = 238
+  ClientWidth = 400
   OnResize = FormResize
   Position = poScreenCenter
   object HorizontalRadioGroup: TRadioGroup
+    AnchorSideBottom.Control = ACDBtnPanel
     Left = 6
-    Height = 195
+    Height = 176
     Top = 6
     Width = 191
     Anchors = [akTop, akLeft, akBottom]
@@ -30,9 +33,9 @@ object AlignComponentsDialog: TAlignComponentsDialog
     TabOrder = 0
   end
   object VerticalRadioGroup: TRadioGroup
-    AnchorSideBottom.Control = OKButton
+    AnchorSideBottom.Control = ACDBtnPanel
     Left = 203
-    Height = 195
+    Height = 176
     Top = 6
     Width = 191
     Anchors = [akTop, akRight, akBottom]
@@ -49,41 +52,49 @@ object AlignComponentsDialog: TAlignComponentsDialog
     ChildSizing.ControlsPerLine = 1
     TabOrder = 1
   end
-  object OKButton: TBitBtn
-    AnchorSideRight.Control = CancelButton
-    Left = 226
-    Height = 25
-    Top = 207
-    Width = 75
-    Anchors = [akRight, akBottom]
+  object ACDBtnPanel: TPanel
+    Height = 50
+    Top = 188
+    Width = 400
+    Align = alBottom
     AutoSize = True
-    BorderSpacing.Right = 6
-    Caption = '&OK'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    Default = True
-    Kind = bkOK
-    ModalResult = 1
-    NumGlyphs = 0
+    BevelOuter = bvNone
+    ClientHeight = 50
+    ClientWidth = 400
     TabOrder = 2
-  end
-  object CancelButton: TBitBtn
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 307
-    Height = 25
-    Top = 207
-    Width = 87
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Right = 6
-    BorderSpacing.Bottom = 6
-    Caption = 'Cancel'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    Kind = bkCancel
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 3
+    object OKButton: TBitBtn
+      AnchorSideRight.Control = CancelButton
+      Left = 227
+      Height = 38
+      Top = 6
+      Width = 75
+      Align = alRight
+      Anchors = [akRight, akBottom]
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Caption = '&OK'
+      Constraints.MinWidth = 75
+      Default = True
+      Kind = bkOK
+      ModalResult = 1
+      NumGlyphs = 0
+      TabOrder = 0
+    end
+    object CancelButton: TBitBtn
+      AnchorSideRight.Side = asrBottom
+      Left = 308
+      Height = 38
+      Top = 6
+      Width = 86
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Caption = 'Cancel'
+      Constraints.MinWidth = 75
+      Kind = bkCancel
+      ModalResult = 2
+      NumGlyphs = 0
+      TabOrder = 1
+    end
   end
 end
diff --git a/designer/aligncompsdlg.lrs b/designer/aligncompsdlg.lrs
index 790aae1fc1..db84bb780b 100644
--- a/designer/aligncompsdlg.lrs
+++ b/designer/aligncompsdlg.lrs
@@ -1,38 +1,40 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TAlignComponentsDialog','FORMDATA',[
-  'TPF0'#22'TAlignComponentsDialog'#21'AlignComponentsDialog'#4'Left'#3'8'#1#6
-  +'Height'#3#238#0#3'Top'#3'^'#2#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143
+  'TPF0'#22'TAlignComponentsDialog'#21'AlignComponentsDialog'#4'Left'#3'j'#1#6
+  +'Height'#3#238#0#3'Top'#3'E'#1#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143
   +#1#18'VertScrollBar.Page'#3#237#0#13'ActiveControl'#7#8'OKButton'#11'BorderS'
-  +'tyle'#7#13'bsSizeToolWin'#7'Caption'#6#21'AlignComponentsDialog'#8'OnResize'
-  +#7#10'FormResize'#8'Position'#7#14'poScreenCenter'#0#11'TRadioGroup'#20'Hori'
-  +'zontalRadioGroup'#4'Left'#2#6#6'Height'#3#195#0#3'Top'#2#6#5'Width'#3#191#0
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'AutoFill'#9#20'BorderSpaci'
-  +'ng.Around'#2#6#7'Caption'#6#20'HorizontalRadioGroup'#28'ChildSizing.LeftRig'
-  +'htSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeH'
-  +'orizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7
-  +#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScale'
-  +'Childs'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.'
-  +'Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'
-  +#2#1#8'TabOrder'#2#0#0#0#11'TRadioGroup'#18'VerticalRadioGroup'#24'AnchorSid'
-  +'eBottom.Control'#7#8'OKButton'#4'Left'#3#203#0#6'Height'#3#195#0#3'Top'#2#6
-  +#5'Width'#3#191#0#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#8'AutoFill'
-  +#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'VerticalRadioGroup'#28'Child'
-  +'Sizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildS'
-  +'izing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.Enla'
-  +'rgeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'
-  +#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18
-  +'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Cont'
-  +'rolsPerLine'#2#1#8'TabOrder'#2#1#0#0#7'TBitBtn'#8'OKButton'#23'AnchorSideRi'
-  +'ght.Control'#7#12'CancelButton'#4'Left'#3#226#0#6'Height'#2#25#3'Top'#3#207
-  +#0#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'Bor'
-  +'derSpacing.Right'#2#6#7'Caption'#6#3'&OK'#21'Constraints.MaxHeight'#2#25#20
-  +'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2
-  +#1#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelButton'#23'Ancho'
-  +'rSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le'
-  +'ft'#3'3'#1#6'Height'#2#25#3'Top'#3#207#0#5'Width'#2'W'#7'Anchors'#11#7'akRi'
-  +'ght'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#20'BorderSpaci'
-  +'ng.Bottom'#2#6#7'Caption'#6#6'Cancel'#21'Constraints.MaxHeight'#2#25#20'Con'
-  +'straints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyp'
-  +'hs'#2#0#8'TabOrder'#2#3#0#0#0
+  +'tyle'#7#13'bsSizeToolWin'#7'Caption'#6#21'AlignComponentsDialog'#12'ClientH'
+  +'eight'#3#238#0#11'ClientWidth'#3#144#1#8'OnResize'#7#10'FormResize'#8'Posit'
+  +'ion'#7#14'poScreenCenter'#0#11'TRadioGroup'#20'HorizontalRadioGroup'#24'Anc'
+  +'horSideBottom.Control'#7#11'ACDBtnPanel'#4'Left'#2#6#6'Height'#3#176#0#3'To'
+  +'p'#2#6#5'Width'#3#191#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#8'Au'
+  +'toFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#20'HorizontalRadioGroup'
+  +#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29
+  +'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizin'
+  +'g.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHori'
+  +'zontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleCh'
+  +'ilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSi'
+  +'zing.ControlsPerLine'#2#1#8'TabOrder'#2#0#0#0#11'TRadioGroup'#18'VerticalRa'
+  +'dioGroup'#24'AnchorSideBottom.Control'#7#11'ACDBtnPanel'#4'Left'#3#203#0#6
+  +'Height'#3#176#0#3'Top'#2#6#5'Width'#3#191#0#7'Anchors'#11#5'akTop'#7'akRigh'
+  +'t'#8'akBottom'#0#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#18
+  +'VerticalRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.Top'
+  +'BottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChil'
+  +'dResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28
+  +'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVer'
+  +'tical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenT'
+  +'opToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2#1#0#0#6'TPane'
+  +'l'#11'ACDBtnPanel'#6'Height'#2'2'#3'Top'#3#188#0#5'Width'#3#144#1#5'Align'#7
+  +#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'2'
+  +#11'ClientWidth'#3#144#1#8'TabOrder'#2#2#0#7'TBitBtn'#8'OKButton'#23'AnchorS'
+  +'ideRight.Control'#7#12'CancelButton'#4'Left'#3#227#0#6'Height'#2'&'#3'Top'#2
+  +#6#5'Width'#2'K'#5'Align'#7#7'alRight'#7'Anchors'#11#7'akRight'#8'akBottom'#0
+  +#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#20'Constrain'
+  +'ts.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumG'
+  +'lyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#12'CancelButton'#20'AnchorSideRig'
+  +'ht.Side'#7#9'asrBottom'#4'Left'#3'4'#1#6'Height'#2'&'#3'Top'#2#6#5'Width'#2
+  +'V'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Capti'
+  +'on'#6#6'Cancel'#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'Moda'
+  +'lResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#0#0
 ]);
diff --git a/designer/aligncompsdlg.pp b/designer/aligncompsdlg.pp
index 46990a6d00..bde336efc3 100644
--- a/designer/aligncompsdlg.pp
+++ b/designer/aligncompsdlg.pp
@@ -39,6 +39,7 @@ type
     OKButton: TBitBtn;
     CancelButton: TBitBtn;
     HorizontalRadioGroup: TRadioGroup;
+    ACDBtnPanel: TPanel;
     VerticalRadioGroup: TRadioGroup;
     procedure FormResize(Sender: TObject);
   public
diff --git a/ide/codetemplatesdlg.lfm b/ide/codetemplatesdlg.lfm
index 9762cda513..5c3e54b9b0 100644
--- a/ide/codetemplatesdlg.lfm
+++ b/ide/codetemplatesdlg.lfm
@@ -1,14 +1,14 @@
 object CodeTemplateDialog: TCodeTemplateDialog
-  Left = 310
-  Height = 612
-  Top = 162
+  Left = 306
+  Height = 542
+  Top = 136
   Width = 497
   HorzScrollBar.Page = 496
-  VertScrollBar.Page = 611
+  VertScrollBar.Page = 541
   ActiveControl = FilenameEdit
   BorderIcons = [biSystemMenu]
   Caption = 'CodeTemplateDialog'
-  ClientHeight = 612
+  ClientHeight = 542
   ClientWidth = 497
   OnClose = FormClose
   OnCreate = FormCreate
@@ -138,17 +138,17 @@ object CodeTemplateDialog: TCodeTemplateDialog
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = CancelButton
+    AnchorSideBottom.Control = BtnPanel
     Left = 6
-    Height = 339
+    Height = 250
     Top = 236
     Width = 485
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
     Caption = 'EditTemplateGroupBox'
-    ClientHeight = 320
+    ClientHeight = 231
     ClientWidth = 481
-    TabOrder = 4
+    TabOrder = 2
     object UseMacrosCheckBox: TCheckBox
       Left = 6
       Height = 22
@@ -165,8 +165,8 @@ object CodeTemplateDialog: TCodeTemplateDialog
       AnchorSideTop.Side = asrCenter
       AnchorSideRight.Side = asrBottom
       Left = 163
-      Height = 37
-      Top = -1
+      Height = 31
+      Top = 2
       Width = 138
       AutoSize = True
       BorderSpacing.Top = 6
@@ -184,8 +184,8 @@ object CodeTemplateDialog: TCodeTemplateDialog
       AnchorSideBottom.Control = EditTemplateGroupBox
       AnchorSideBottom.Side = asrBottom
       Left = 6
-      Height = 244
-      Top = 70
+      Height = 158
+      Top = 67
       Width = 469
       BorderSpacing.Around = 6
       Anchors = [akTop, akLeft, akRight, akBottom]
@@ -526,7 +526,7 @@ object CodeTemplateDialog: TCodeTemplateDialog
       AnchorSideTop.Side = asrBottom
       Left = 6
       Height = 22
-      Top = 42
+      Top = 39
       Width = 197
       BorderSpacing.Top = 6
       Caption = 'AutoOnLineBreakCheckBox'
@@ -538,54 +538,59 @@ object CodeTemplateDialog: TCodeTemplateDialog
       AnchorSideTop.Control = AutoOnLineBreakCheckBox
       Left = 215
       Height = 22
-      Top = 42
+      Top = 39
       Width = 175
       BorderSpacing.Left = 12
       Caption = 'AutoOnSpaceCheckBox'
       TabOrder = 4
     end
   end
-  object CancelButton: TBitBtn
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 405
-    Height = 25
-    Top = 581
-    Width = 86
-    Anchors = [akRight, akBottom]
+  object BtnPanel: TPanel
+    Height = 50
+    Top = 492
+    Width = 497
+    Align = alBottom
     AutoSize = True
-    BorderSpacing.Around = 6
-    Cancel = True
-    Caption = 'Cancel'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    Kind = bkCancel
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 2
-  end
-  object OkButton: TBitBtn
-    AnchorSideRight.Control = CancelButton
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 324
-    Height = 25
-    Top = 581
-    Width = 75
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Around = 6
-    Caption = '&OK'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    Default = True
-    Kind = bkOK
-    ModalResult = 1
-    NumGlyphs = 0
-    OnClick = OkButtonClick
+    BevelOuter = bvNone
+    ClientHeight = 50
+    ClientWidth = 497
     TabOrder = 3
+    object OkButton: TBitBtn
+      AnchorSideBottom.Side = asrBottom
+      Left = 324
+      Height = 38
+      Top = 6
+      Width = 75
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Caption = '&OK'
+      Constraints.MinWidth = 75
+      Default = True
+      Kind = bkOK
+      ModalResult = 1
+      NumGlyphs = 0
+      OnClick = OkButtonClick
+      TabOrder = 0
+    end
+    object CancelButton: TBitBtn
+      AnchorSideRight.Side = asrBottom
+      AnchorSideBottom.Side = asrBottom
+      Left = 405
+      Height = 38
+      Top = 6
+      Width = 86
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Cancel = True
+      Caption = 'Cancel'
+      Constraints.MinWidth = 75
+      Kind = bkCancel
+      ModalResult = 2
+      NumGlyphs = 0
+      TabOrder = 1
+    end
   end
   object ASynPasSyn: TSynFreePascalSyn
     Enabled = False
diff --git a/ide/codetemplatesdlg.lrs b/ide/codetemplatesdlg.lrs
index a63f745f05..1745f9871e 100644
--- a/ide/codetemplatesdlg.lrs
+++ b/ide/codetemplatesdlg.lrs
@@ -1,11 +1,11 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TCodeTemplateDialog','FORMDATA',[
-  'TPF0'#19'TCodeTemplateDialog'#18'CodeTemplateDialog'#4'Left'#3'6'#1#6'Height'
-  +#3'd'#2#3'Top'#3#162#0#5'Width'#3#241#1#18'HorzScrollBar.Page'#3#240#1#18'Ve'
-  +'rtScrollBar.Page'#3'c'#2#13'ActiveControl'#7#12'FilenameEdit'#11'BorderIcon'
+  'TPF0'#19'TCodeTemplateDialog'#18'CodeTemplateDialog'#4'Left'#3'2'#1#6'Height'
+  +#3#30#2#3'Top'#3#136#0#5'Width'#3#241#1#18'HorzScrollBar.Page'#3#240#1#18'Ve'
+  +'rtScrollBar.Page'#3#29#2#13'ActiveControl'#7#12'FilenameEdit'#11'BorderIcon'
   +'s'#11#12'biSystemMenu'#0#7'Caption'#6#18'CodeTemplateDialog'#12'ClientHeigh'
-  +'t'#3'd'#2#11'ClientWidth'#3#241#1#7'OnClose'#7#9'FormClose'#8'OnCreate'#7#10
+  +'t'#3#30#2#11'ClientWidth'#3#241#1#7'OnClose'#7#9'FormClose'#8'OnCreate'#7#10
   +'FormCreate'#0#9'TGroupBox'#16'FilenameGroupBox'#4'Left'#2#6#6'Height'#2'3'#3
   +'Top'#2#6#5'Width'#3#229#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7
   +'Caption'#6#16'FilenameGroupBox'#12'ClientHeight'#2' '#11'ClientWidth'#3#225
@@ -51,31 +51,31 @@ LazarusResources.Add('TCodeTemplateDialog','FORMDATA',[
   +'tton'#7'OnClick'#7#15'EditButtonClick'#8'TabOrder'#2#2#0#0#0#9'TGroupBox'#20
   +'EditTemplateGroupBox'#21'AnchorSideTop.Control'#7#17'TemplatesGroupBox'#18
   +'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20
-  +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'Canc'
-  +'elButton'#4'Left'#2#6#6'Height'#3'S'#1#3'Top'#3#236#0#5'Width'#3#229#1#7'An'
-  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Arou'
-  +'nd'#2#6#7'Caption'#6#20'EditTemplateGroupBox'#12'ClientHeight'#3'@'#1#11'Cl'
-  +'ientWidth'#3#225#1#8'TabOrder'#2#4#0#9'TCheckBox'#17'UseMacrosCheckBox'#4'L'
-  +'eft'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3#157#0#20'BorderSpacing.Bottom'
-  +#2#7#7'Caption'#6#17'UseMacrosCheckBox'#8'TabOrder'#2#0#0#0#7'TButton'#17'In'
-  +'sertMacroButton'#22'AnchorSideLeft.Control'#7#17'UseMacrosCheckBox'#19'Anch'
-  +'orSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'UseMacrosChe'
-  +'ckBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#20'AnchorSideRight.Side'#7#9'a'
-  +'srBottom'#4'Left'#3#163#0#6'Height'#2'%'#3'Top'#2#255#5'Width'#3#138#0#8'Au'
-  +'toSize'#9#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#25'BorderSp'
-  +'acing.InnerBorder'#2#4#7'Caption'#6#17'InsertMacroButton'#7'OnClick'#7#22'I'
-  +'nsertMacroButtonClick'#8'TabOrder'#2#2#0#0#8'TSynEdit'#15'TemplateSynEdit'
-  ,#21'AnchorSideTop.Control'#7#23'AutoOnLineBreakCheckBox'#18'AnchorSideTop.Si'
-  +'de'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#20'EditTemplateGroupBox'#20
-  +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#20'Edit'
-  +'TemplateGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'He'
-  +'ight'#3#244#0#3'Top'#2'F'#5'Width'#3#213#1#20'BorderSpacing.Around'#2#6#7'A'
-  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2#242
-  +#9'Font.Name'#6#7'courier'#11'ParentColor'#8#8'TabOrder'#2#1#23'Gutter.CodeF'
-  +'oldingWidth'#2#14#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
+  +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#8'BtnPa'
+  +'nel'#4'Left'#2#6#6'Height'#3#250#0#3'Top'#3#236#0#5'Width'#3#229#1#7'Anchor'
+  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#20'EditTemplateGroupBox'#12'ClientHeight'#3#231#0#11'ClientW'
+  +'idth'#3#225#1#8'TabOrder'#2#2#0#9'TCheckBox'#17'UseMacrosCheckBox'#4'Left'#2
+  +#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3#157#0#20'BorderSpacing.Bottom'#2#7#7
+  +'Caption'#6#17'UseMacrosCheckBox'#8'TabOrder'#2#0#0#0#7'TButton'#17'InsertMa'
+  +'croButton'#22'AnchorSideLeft.Control'#7#17'UseMacrosCheckBox'#19'AnchorSide'
+  +'Left.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'UseMacrosCheckBox'
+  +#18'AnchorSideTop.Side'#7#9'asrCenter'#20'AnchorSideRight.Side'#7#9'asrBotto'
+  +'m'#4'Left'#3#163#0#6'Height'#2#31#3'Top'#2#2#5'Width'#3#138#0#8'AutoSize'#9
+  +#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#25'BorderSpacing.Inne'
+  +'rBorder'#2#4#7'Caption'#6#17'InsertMacroButton'#7'OnClick'#7#22'InsertMacro'
+  +'ButtonClick'#8'TabOrder'#2#2#0#0#8'TSynEdit'#15'TemplateSynEdit'#21'AnchorS'
+  ,'ideTop.Control'#7#23'AutoOnLineBreakCheckBox'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#23'AnchorSideRight.Control'#7#20'EditTemplateGroupBox'#20'AnchorSi'
+  +'deRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#20'EditTemplate'
+  +'GroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3
+  +#158#0#3'Top'#2'C'#5'Width'#3#213#1#20'BorderSpacing.Around'#2#6#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2#242#9'Font'
+  +'.Name'#6#7'courier'#11'ParentColor'#8#8'TabOrder'#2#1#23'Gutter.CodeFolding'
+  +'Width'#2#14#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Comma'
+  +'nd'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'C'
+  +'ommand'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Co'
+  +'mmand'#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
@@ -118,25 +118,24 @@ LazarusResources.Add('TCodeTemplateDialog','FORMDATA',[
   +'lor.OnChange'#13#0#0#9'TCheckBox'#23'AutoOnLineBreakCheckBox'#22'AnchorSide'
   +'Left.Control'#7#17'UseMacrosCheckBox'#21'AnchorSideTop.Control'#7#17'Insert'
   +'MacroButton'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
-  +#22#3'Top'#2'*'#5'Width'#3#197#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#23'A'
-  +'utoOnLineBreakCheckBox'#8'TabOrder'#2#3#0#0#9'TCheckBox'#19'AutoOnSpaceChec'
-  +'kBox'#22'AnchorSideLeft.Control'#7#23'AutoOnLineBreakCheckBox'#19'AnchorSid'
-  +'eLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'AutoOnLineBreakCh'
-  +'eckBox'#4'Left'#3#215#0#6'Height'#2#22#3'Top'#2'*'#5'Width'#3#175#0#18'Bord'
-  +'erSpacing.Left'#2#12#7'Caption'#6#19'AutoOnSpaceCheckBox'#8'TabOrder'#2#4#0
-  +#0#0#7'TBitBtn'#12'CancelButton'#23'AnchorSideRight.Control'#7#5'Owner'#20'A'
-  +'nchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'
-  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#149#1#6'Height'#2#25#3'T'
-  +'op'#3'E'#2#5'Width'#2'V'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'
-  +#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#21'Constr'
-  ,'aints.MaxHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11
-  +'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TBitBtn'#8'OkButton'
-  +#23'AnchorSideRight.Control'#7#12'CancelButton'#24'AnchorSideBottom.Control'
-  +#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'D'#1#6'Height'
-  +#2#25#3'Top'#3'E'#2#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'A'
-  +'utoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#21'Constraints.'
-  +'MaxHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'
-  +#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'TabOr'
-  +'der'#2#3#0#0#17'TSynFreePascalSyn'#10'ASynPasSyn'#7'Enabled'#8#14'NestedCom'
-  +'ments'#9#4'left'#3#16#1#3'top'#2#24#0#0#0
+  +#22#3'Top'#2''''#5'Width'#3#197#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#23
+  +'AutoOnLineBreakCheckBox'#8'TabOrder'#2#3#0#0#9'TCheckBox'#19'AutoOnSpaceChe'
+  +'ckBox'#22'AnchorSideLeft.Control'#7#23'AutoOnLineBreakCheckBox'#19'AnchorSi'
+  +'deLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'AutoOnLineBreakC'
+  +'heckBox'#4'Left'#3#215#0#6'Height'#2#22#3'Top'#2''''#5'Width'#3#175#0#18'Bo'
+  +'rderSpacing.Left'#2#12#7'Caption'#6#19'AutoOnSpaceCheckBox'#8'TabOrder'#2#4
+  +#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'2'#3'Top'#3#236#1#5'Width'#3#241#1#5
+  +'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeig'
+  +'ht'#2'2'#11'ClientWidth'#3#241#1#8'TabOrder'#2#3#0#7'TBitBtn'#8'OkButton'#21
+  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'D'#1#6'Height'#2'&'#3'Top'#2
+  +#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'
+  ,#2#6#7'Caption'#6#3'&OK'#20'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7
+  +#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonClick'
+  +#8'TabOrder'#2#0#0#0#7'TBitBtn'#12'CancelButton'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#149#1#6'Heigh'
+  +'t'#2'&'#3'Top'#2#6#5'Width'#2'V'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Bor'
+  +'derSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#20'Constraints.Mi'
+  +'nWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'T'
+  +'abOrder'#2#1#0#0#0#17'TSynFreePascalSyn'#10'ASynPasSyn'#7'Enabled'#8#14'Nes'
+  +'tedComments'#9#4'left'#3#16#1#3'top'#2#24#0#0#0
 ]);
diff --git a/ide/codetemplatesdlg.pas b/ide/codetemplatesdlg.pas
index 268b91a87a..f8eeef6775 100644
--- a/ide/codetemplatesdlg.pas
+++ b/ide/codetemplatesdlg.pas
@@ -55,6 +55,7 @@ type
     OkButton: TBitBtn;
     CancelButton: TBitBtn;
     InsertMacroButton: TButton;
+    BtnPanel: TPanel;
     UseMacrosCheckBox: TCheckBox;
     EditButton: TButton;
     DeleteButton: TButton;
diff --git a/ide/compileroptionsdlg.lfm b/ide/compileroptionsdlg.lfm
index d98281ef05..efd4f9af3c 100644
--- a/ide/compileroptionsdlg.lfm
+++ b/ide/compileroptionsdlg.lfm
@@ -17,16 +17,16 @@ object frmCompilerOptions: TfrmCompilerOptions
   Position = poScreenCenter
   object MainNotebook: TNotebook
     AnchorSideBottom.Control = BtnPanel
-    Height = 480
+    Height = 478
     Width = 669
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
-    PageIndex = 0
+    PageIndex = 1
     TabOrder = 0
     object PathPage: TPage
       Caption = 'PathPage'
       ClientWidth = 665
-      ClientHeight = 449
+      ClientHeight = 447
       object lblOtherUnits: TLabel
         Left = 6
         Height = 20
@@ -116,7 +116,7 @@ object frmCompilerOptions: TfrmCompilerOptions
         Left = 6
         Height = 20
         Top = 306
-        Width = 128
+        Width = 127
         BorderSpacing.Top = 6
         BorderSpacing.Around = 6
         Caption = 'LCLWidgetTypeLabel'
@@ -228,7 +228,7 @@ object frmCompilerOptions: TfrmCompilerOptions
         AnchorSideLeft.Control = LCLWidgetTypeLabel
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = LCLWidgetTypeLabel
-        Left = 140
+        Left = 139
         Height = 25
         Top = 306
         Width = 155
@@ -286,7 +286,7 @@ object frmCompilerOptions: TfrmCompilerOptions
     object CodeGenPage: TPage
       Caption = 'CodeGenPage'
       ClientWidth = 665
-      ClientHeight = 447
+      ClientHeight = 449
       object grpSmartLinkUnit: TGroupBox
         AnchorSideLeft.Control = grpChecks
         AnchorSideLeft.Side = asrBottom
@@ -657,7 +657,7 @@ object frmCompilerOptions: TfrmCompilerOptions
     object LinkingPage: TPage
       Caption = 'LinkingPage'
       ClientWidth = 665
-      ClientHeight = 447
+      ClientHeight = 449
       object grpLinkLibraries: TGroupBox
         Left = 6
         Height = 53
@@ -824,7 +824,7 @@ object frmCompilerOptions: TfrmCompilerOptions
     object MsgPage: TPage
       Caption = 'MsgPage'
       ClientWidth = 665
-      ClientHeight = 447
+      ClientHeight = 449
       object grpVerbosity: TCheckGroup
         Left = 6
         Height = 196
@@ -872,7 +872,7 @@ object frmCompilerOptions: TfrmCompilerOptions
     object OtherPage: TPage
       Caption = 'OtherPage'
       ClientWidth = 665
-      ClientHeight = 447
+      ClientHeight = 449
       object grpConfigFile: TGroupBox
         Left = 6
         Height = 110
@@ -919,18 +919,18 @@ object frmCompilerOptions: TfrmCompilerOptions
       end
       object grpCustomOptions: TGroupBox
         Left = 6
-        Height = 319
+        Height = 321
         Top = 122
         Width = 653
         Align = alClient
         BorderSpacing.Around = 6
         Caption = 'grpCustomOptions'
-        ClientHeight = 300
+        ClientHeight = 317
         ClientWidth = 649
         TabOrder = 1
         object memCustomOptions: TMemo
           Left = 6
-          Height = 288
+          Height = 305
           Top = 6
           Width = 637
           Align = alClient
@@ -942,7 +942,7 @@ object frmCompilerOptions: TfrmCompilerOptions
     object InheritedPage: TPage
       Caption = 'InheritedPage'
       ClientWidth = 665
-      ClientHeight = 447
+      ClientHeight = 449
       object InhNoteLabel: TLabel
         Left = 6
         Height = 20
@@ -967,7 +967,7 @@ object frmCompilerOptions: TfrmCompilerOptions
       end
       object InhItemMemo: TMemo
         Left = 6
-        Height = 157
+        Height = 159
         Top = 284
         Width = 653
         Align = alClient
@@ -990,7 +990,7 @@ object frmCompilerOptions: TfrmCompilerOptions
     object CompilationPage: TPage
       Caption = 'CompilationPage'
       ClientWidth = 665
-      ClientHeight = 447
+      ClientHeight = 449
       object chkCreateMakefile: TCheckBox
         Left = 6
         Height = 22
@@ -1360,21 +1360,21 @@ object frmCompilerOptions: TfrmCompilerOptions
     end
   end
   object BtnPanel: TPanel
-    Height = 48
-    Top = 480
+    Height = 50
+    Top = 478
     Width = 669
     Align = alBottom
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 48
+    ClientHeight = 50
     ClientWidth = 669
     TabOrder = 1
     object HelpButton: TBitBtn
       AnchorSideBottom.Side = asrBottom
       Left = 6
-      Height = 36
+      Height = 38
       Top = 6
-      Width = 75
+      Width = 76
       Align = alLeft
       AutoSize = True
       BorderSpacing.Around = 6
@@ -1388,8 +1388,8 @@ object frmCompilerOptions: TfrmCompilerOptions
     end
     object btnShowOptions: TBitBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 135
-      Height = 36
+      Left = 137
+      Height = 38
       Top = 6
       Width = 143
       Align = alRight
@@ -1440,8 +1440,8 @@ object frmCompilerOptions: TfrmCompilerOptions
     end
     object btnCheck: TBitBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 284
-      Height = 36
+      Left = 286
+      Height = 38
       Top = 6
       Width = 75
       Align = alRight
@@ -1458,8 +1458,8 @@ object frmCompilerOptions: TfrmCompilerOptions
     end
     object btnLoadSave: TBitBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 365
-      Height = 36
+      Left = 367
+      Height = 38
       Top = 6
       Width = 123
       Align = alRight
@@ -1508,8 +1508,8 @@ object frmCompilerOptions: TfrmCompilerOptions
     end
     object btnOK: TBitBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 494
-      Height = 36
+      Left = 496
+      Height = 38
       Top = 6
       Width = 75
       Align = alRight
@@ -1526,10 +1526,10 @@ object frmCompilerOptions: TfrmCompilerOptions
     object btnCancel: TBitBtn
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Side = asrBottom
-      Left = 575
-      Height = 36
+      Left = 577
+      Height = 38
       Top = 6
-      Width = 88
+      Width = 86
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
diff --git a/ide/compileroptionsdlg.lrs b/ide/compileroptionsdlg.lrs
index 546a59d6b0..fdc7015038 100644
--- a/ide/compileroptionsdlg.lrs
+++ b/ide/compileroptionsdlg.lrs
@@ -8,10 +8,10 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +'ht'#3#16#2#11'ClientWidth'#3#157#2#21'Constraints.MinHeight'#3#194#1#20'Con'
   +'straints.MinWidth'#3'D'#2#7'OnClose'#7#23'frmCompilerOptionsClose'#8'OnResi'
   +'ze'#7#10'FormResize'#8'Position'#7#14'poScreenCenter'#0#9'TNotebook'#12'Mai'
-  +'nNotebook'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#6'Height'#3#224#1#5'W'
+  +'nNotebook'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#6'Height'#3#222#1#5'W'
   +'idth'#3#157#2#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
-  +'t'#8'akBottom'#0#9'PageIndex'#2#0#8'TabOrder'#2#0#0#5'TPage'#8'PathPage'#7
-  +'Caption'#6#8'PathPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#193#1#0#6
+  +'t'#8'akBottom'#0#9'PageIndex'#2#1#8'TabOrder'#2#0#0#5'TPage'#8'PathPage'#7
+  +'Caption'#6#8'PathPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#191#1#0#6
   +'TLabel'#13'lblOtherUnits'#4'Left'#2#6#6'Height'#2#20#3'Top'#2#6#5'Width'#3
   +#141#2#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2
   +#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#13'lblOtherUnits'#11'ParentColor'
@@ -40,55 +40,55 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +'rSpacing.Right'#2#6#7'Caption'#6#12'lblDebugPath'#11'ParentColor'#8#0#0#6'T'
   +'Label'#18'LCLWidgetTypeLabel'#22'AnchorSideLeft.Control'#7#8'PathPage'#21'A'
   +'nchorSideTop.Control'#7#12'edtDebugPath'#18'AnchorSideTop.Side'#7#9'asrBott'
-  +'om'#4'Left'#2#6#6'Height'#2#20#3'Top'#3'2'#1#5'Width'#3#128#0#17'BorderSpac'
-  +'ing.Top'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'LCLWidgetTypeLabe'
-  +'l'#11'ParentColor'#8#0#0#5'TEdit'#13'edtOtherUnits'#22'AnchorSideLeft.Contr'
-  +'ol'#7#8'PathPage'#21'AnchorSideTop.Control'#7#13'lblOtherUnits'#18'AnchorSi'
-  +'deTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#8'PathPage'#20'Anc'
-  +'horSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#26#5
-  +'Width'#3#141#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpaci'
-  +'ng.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#8'Tab'
-  +'Order'#2#0#4'Text'#6#13'edtOtherUnits'#0#0#5'TEdit'#15'edtIncludeFiles'#22
-  +'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7#15'lblInc'
-  +'ludeFiles'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'
+  +'om'#4'Left'#2#6#6'Height'#2#20#3'Top'#3'2'#1#5'Width'#2''#17'BorderSpacing'
+  +'.Top'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'LCLWidgetTypeLabel'
+  +#11'ParentColor'#8#0#0#5'TEdit'#13'edtOtherUnits'#22'AnchorSideLeft.Control'
+  +#7#8'PathPage'#21'AnchorSideTop.Control'#7#13'lblOtherUnits'#18'AnchorSideTo'
+  +'p.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#8'PathPage'#20'AnchorS'
+  +'ideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#26#5'Widt'
+  +'h'#3#141#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.L'
+  +'eft'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#8'TabOrde'
+  +'r'#2#0#4'Text'#6#13'edtOtherUnits'#0#0#5'TEdit'#15'edtIncludeFiles'#22'Anch'
+  +'orSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7#15'lblInclude'
+  +'Files'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#8
+  +'PathPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23
+  +#3'Top'#2'K'#5'Width'#3#141#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bot'
+  +'tom'#2#6#8'TabOrder'#2#1#4'Text'#6#15'edtIncludeFiles'#0#0#5'TEdit'#15'edtO'
+  +'therSources'#22'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Cont'
+  +'rol'#7#15'lblOtherSources'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorS'
+  +'ideRight.Control'#7#8'PathPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'L'
+  +'eft'#2#6#6'Height'#2#23#3'Top'#2'|'#5'Width'#3#141#2#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2
+  +#6#20'BorderSpacing.Bottom'#2#6#8'TabOrder'#2#2#4'Text'#6#15'edtOtherSources'
+  +#0#0#5'TEdit'#12'edtLibraries'#22'AnchorSideLeft.Control'#7#8'PathPage'#21'A'
+  +'nchorSideTop.Control'#7#12'lblLibraries'#18'AnchorSideTop.Side'#7#9'asrBott'
+  +'om'#23'AnchorSideRight.Control'#7#8'PathPage'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#173#0#5'Width'#3#141#2#7'Anc'
+  ,'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'Bord'
+  +'erSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#8'TabOrder'#2#3#4'Text'#6
+  +#12'edtLibraries'#0#0#5'TEdit'#16'edtUnitOutputDir'#22'AnchorSideLeft.Contro'
+  +'l'#7#8'PathPage'#21'AnchorSideTop.Control'#7#16'lblUnitOutputDir'#18'Anchor'
+  +'SideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#8'PathPage'#20'A'
+  +'nchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#222
+  +#0#5'Width'#3#141#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderS'
+  +'pacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#8
+  +'TabOrder'#2#4#4'Text'#6#16'edtUnitOutputDir'#0#0#5'TEdit'#12'edtDebugPath'
+  +#22'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7#12'lbl'
+  +'DebugPath'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'
   +#7#8'PathPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
-  +#2#23#3'Top'#2'K'#5'Width'#3#141#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
-  +'t'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacin'
-  +'g.Bottom'#2#6#8'TabOrder'#2#1#4'Text'#6#15'edtIncludeFiles'#0#0#5'TEdit'#15
-  +'edtOtherSources'#22'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.'
-  +'Control'#7#15'lblOtherSources'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anc'
-  +'horSideRight.Control'#7#8'PathPage'#20'AnchorSideRight.Side'#7#9'asrBottom'
-  +#4'Left'#2#6#6'Height'#2#23#3'Top'#2'|'#5'Width'#3#141#2#7'Anchors'#11#5'akT'
-  +'op'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Righ'
-  +'t'#2#6#20'BorderSpacing.Bottom'#2#6#8'TabOrder'#2#2#4'Text'#6#15'edtOtherSo'
-  +'urces'#0#0#5'TEdit'#12'edtLibraries'#22'AnchorSideLeft.Control'#7#8'PathPag'
-  +'e'#21'AnchorSideTop.Control'#7#12'lblLibraries'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#23'AnchorSideRight.Control'#7#8'PathPage'#20'AnchorSideRight.Sid'
-  +'e'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#173#0#5'Width'#3#141#2
-  ,#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19
-  +'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#8'TabOrder'#2#3#4'Tex'
-  +'t'#6#12'edtLibraries'#0#0#5'TEdit'#16'edtUnitOutputDir'#22'AnchorSideLeft.C'
-  +'ontrol'#7#8'PathPage'#21'AnchorSideTop.Control'#7#16'lblUnitOutputDir'#18'A'
-  +'nchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#8'PathPage'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3
-  +#222#0#5'Width'#3#141#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'Bor'
-  +'derSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2
-  +#6#8'TabOrder'#2#4#4'Text'#6#16'edtUnitOutputDir'#0#0#5'TEdit'#12'edtDebugPa'
-  +'th'#22'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7#12
-  +'lblDebugPath'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Cont'
-  +'rol'#7#8'PathPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'He'
-  +'ight'#2#23#3'Top'#3#15#1#5'Width'#3#141#2#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'Border'
-  +'Spacing.Bottom'#2#6#8'TabOrder'#2#5#4'Text'#6#12'edtDebugPath'#0#0#9'TCombo'
-  +'Box'#21'LCLWidgetTypeComboBox'#22'AnchorSideLeft.Control'#7#18'LCLWidgetTyp'
-  +'eLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
-  +#18'LCLWidgetTypeLabel'#4'Left'#3#140#0#6'Height'#2#25#3'Top'#3'2'#1#5'Width'
-  +#3#155#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAs'
-  +'cending'#0#18'BorderSpacing.Left'#2#6#9'MaxLength'#2#0#8'TabOrder'#2#6#4'Te'
-  +'xt'#6#21'LCLWidgetTypeComboBox'#0#0#0#5'TPage'#11'ParsingPage'#7'Caption'#6
-  +#11'ParsingPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#191#1#0#11'TRadi'
-  +'oGroup'#8'grpStyle'#4'Left'#2#6#6'Height'#2'('#3'Top'#2#6#5'Width'#3#141#2#5
-  +'Align'#7#5'alTop'#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#8
+  +#2#23#3'Top'#3#15#1#5'Width'#3#141#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRi'
+  +'ght'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpac'
+  +'ing.Bottom'#2#6#8'TabOrder'#2#5#4'Text'#6#12'edtDebugPath'#0#0#9'TComboBox'
+  +#21'LCLWidgetTypeComboBox'#22'AnchorSideLeft.Control'#7#18'LCLWidgetTypeLabe'
+  +'l'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#18'LC'
+  +'LWidgetTypeLabel'#4'Left'#3#139#0#6'Height'#2#25#3'Top'#3'2'#1#5'Width'#3
+  +#155#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAsce'
+  +'nding'#0#18'BorderSpacing.Left'#2#6#9'MaxLength'#2#0#8'TabOrder'#2#6#4'Text'
+  +#6#21'LCLWidgetTypeComboBox'#0#0#0#5'TPage'#11'ParsingPage'#7'Caption'#6#11
+  +'ParsingPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#191#1#0#11'TRadioGr'
+  +'oup'#8'grpStyle'#4'Left'#2#6#6'Height'#2'('#3'Top'#2#6#5'Width'#3#141#2#5'A'
+  +'lign'#7#5'alTop'#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#8
   +'grpStyle'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpac'
   +'ing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27
   +'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.'
@@ -104,7 +104,7 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +'izing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclL'
   +'eftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#8'TabOrder'#2
   +#1#0#0#0#5'TPage'#11'CodeGenPage'#7'Caption'#6#11'CodeGenPage'#11'ClientWidt'
-  +'h'#3#153#2#12'ClientHeight'#3#191#1#0#9'TGroupBox'#16'grpSmartLinkUnit'#22
+  +'h'#3#153#2#12'ClientHeight'#3#193#1#0#9'TGroupBox'#16'grpSmartLinkUnit'#22
   +'AnchorSideLeft.Control'#7#9'grpChecks'#19'AnchorSideLeft.Side'#7#9'asrBotto'
   +'m'#21'AnchorSideTop.Control'#7#11'CodeGenPage'#23'AnchorSideRight.Control'#7
   +#11'CodeGenPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom'
@@ -227,7 +227,7 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +'eg'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#205#0#6'Height'#2#22#3
   +'Top'#2'"'#5'Width'#3#131#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'chk'
   +'OptUncertain'#8'TabOrder'#2#5#0#0#0#0#5'TPage'#11'LinkingPage'#7'Caption'#6
-  +#11'LinkingPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#191#1#0#9'TGroup'
+  +#11'LinkingPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#193#1#0#9'TGroup'
   +'Box'#16'grpLinkLibraries'#4'Left'#2#6#6'Height'#2'5'#3'Top'#3#233#0#5'Width'
   +#3#141#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Ca'
   +'ption'#6#16'grpLinkLibraries'#12'ClientHeight'#2'"'#11'ClientWidth'#3#137#2
@@ -269,7 +269,7 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +'bOrder'#2#5#0#0#9'TCheckBox'#15'chkSymbolsStrip'#4'Left'#2#6#6'Height'#2#22
   +#3'Top'#3#174#0#5'Width'#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'
   +#2#6#7'Caption'#6#15'chkSymbolsStrip'#8'TabOrder'#2#6#0#0#0#0#5'TPage'#7'Msg'
-  +'Page'#7'Caption'#6#7'MsgPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#191
+  +'Page'#7'Caption'#6#7'MsgPage'#11'ClientWidth'#3#153#2#12'ClientHeight'#3#193
   +#1#0#11'TCheckGroup'#12'grpVerbosity'#4'Left'#2#6#6'Height'#3#196#0#3'Top'#2
   +#6#5'Width'#3#141#2#5'Align'#7#5'alTop'#8'AutoFill'#9#20'BorderSpacing.Aroun'
   +'d'#2#6#7'Caption'#6#12'grpVerbosity'#28'ChildSizing.LeftRightSpacing'#2#6#28
@@ -285,7 +285,7 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +#6'Height'#2#23#3'Top'#2#6#5'Width'#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpac'
   +'ing.Around'#2#6#8'TabOrder'#2#0#4'Text'#6#11'edtErrorCnt'#0#0#0#0#5'TPage'#9
   +'OtherPage'#7'Caption'#6#9'OtherPage'#11'ClientWidth'#3#153#2#12'ClientHeigh'
-  +'t'#3#191#1#0#9'TGroupBox'#13'grpConfigFile'#4'Left'#2#6#6'Height'#2'n'#3'To'
+  +'t'#3#193#1#0#9'TGroupBox'#13'grpConfigFile'#4'Left'#2#6#6'Height'#2'n'#3'To'
   +'p'#2#6#5'Width'#3#141#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.'
   +'Around'#2#6#7'Caption'#6#13'grpConfigFile'#12'ClientHeight'#2'['#11'ClientW'
   +'idth'#3#137#2#8'TabOrder'#2#0#0#9'TCheckBox'#13'chkConfigFile'#4'Left'#2#6#6
@@ -297,26 +297,26 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +#0#5'TEdit'#13'edtConfigPath'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'>'#5'Width'
   +#3'}'#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#2#4'T'
   +'ext'#6#13'edtConfigPath'#0#0#0#9'TGroupBox'#16'grpCustomOptions'#4'Left'#2#6
-  +#6'Height'#3'?'#1#3'Top'#2'z'#5'Width'#3#141#2#5'Align'#7#8'alClient'#20'Bor'
+  +#6'Height'#3'A'#1#3'Top'#2'z'#5'Width'#3#141#2#5'Align'#7#8'alClient'#20'Bor'
   +'derSpacing.Around'#2#6#7'Caption'#6#16'grpCustomOptions'#12'ClientHeight'#3
-  +','#1#11'ClientWidth'#3#137#2#8'TabOrder'#2#1#0#5'TMemo'#16'memCustomOptions'
-  +#4'Left'#2#6#6'Height'#3' '#1#3'Top'#2#6#5'Width'#3'}'#2#5'Align'#7#8'alClie'
+  +'='#1#11'ClientWidth'#3#137#2#8'TabOrder'#2#1#0#5'TMemo'#16'memCustomOptions'
+  +#4'Left'#2#6#6'Height'#3'1'#1#3'Top'#2#6#5'Width'#3'}'#2#5'Align'#7#8'alClie'
   +'nt'#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#0#0#0#0#5'TPage'#13'Inheri'
   +'tedPage'#7'Caption'#6#13'InheritedPage'#11'ClientWidth'#3#153#2#12'ClientHe'
-  +'ight'#3#191#1#0#6'TLabel'#12'InhNoteLabel'#4'Left'#2#6#6'Height'#2#20#3'Top'
+  +'ight'#3#193#1#0#6'TLabel'#12'InhNoteLabel'#4'Left'#2#6#6'Height'#2#20#3'Top'
   +#2#6#5'Width'#3#141#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Cap'
   +'tion'#6#12'InhNoteLabel'#11'ParentColor'#8#0#0#9'TTreeView'#11'InhTreeView'
   +#4'Left'#2#6#6'Height'#3#247#0#3'Top'#2' '#5'Width'#3#141#2#5'Align'#7#5'alT'
   +'op'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#17'DefaultItemHe'
   +'ight'#2#19#8'TabOrder'#2#0#18'OnSelectionChanged'#7#27'InhTreeViewSelection'
-  +'Changed'#0#0#5'TMemo'#11'InhItemMemo'#4'Left'#2#6#6'Height'#3#157#0#3'Top'#3
+  +'Changed'#0#0#5'TMemo'#11'InhItemMemo'#4'Left'#2#6#6'Height'#3#159#0#3'Top'#3
   +#28#1#5'Width'#3#141#2#5'Align'#7#8'alClient'#18'BorderSpacing.Left'#2#6#19
   +'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#8'ReadOnly'#9#10'Scro'
   +'llBars'#7#14'ssAutoVertical'#8'TabOrder'#2#1#0#0#9'TSplitter'#11'InhSplitte'
   +'r'#6'Cursor'#7#8'crVSplit'#6'Height'#2#5#3'Top'#3#23#1#5'Width'#3#153#2#5'A'
   +'lign'#7#5'alTop'#12'ResizeAnchor'#7#5'akTop'#0#0#0#5'TPage'#15'CompilationP'
   +'age'#7'Caption'#6#15'CompilationPage'#11'ClientWidth'#3#153#2#12'ClientHeig'
-  +'ht'#3#191#1#0#9'TCheckBox'#17'chkCreateMakefile'#4'Left'#2#6#6'Height'#2#22
+  +'ht'#3#193#1#0#9'TCheckBox'#17'chkCreateMakefile'#4'Left'#2#6#6'Height'#2#22
   +#3'Top'#2#6#5'Width'#3#141#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6
   +#7'Caption'#6#17'chkCreateMakefile'#8'TabOrder'#2#0#0#0#9'TGroupBox'#20'Exec'
   +'uteAfterGroupBox'#4'Left'#2#6#6'Height'#2'f'#3'Top'#3#222#0#5'Width'#3#141#2
@@ -446,15 +446,15 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +'ommandEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3'!'#2#6'Height'#2
   +#22#3'Top'#2'='#5'Width'#3#228#0#18'BorderSpacing.Left'#2#24#20'BorderSpacin'
   +'g.Around'#2#6#7'Caption'#6#28'ExecuteBeforeShowAllCheckBox'#8'TabOrder'#2#6
-  +#0#0#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'0'#3'Top'#3#224#1#5'Width'#3#157
+  +#0#0#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'2'#3'Top'#3#222#1#5'Width'#3#157
   +#2#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'Client'
-  +'Height'#2'0'#11'ClientWidth'#3#157#2#8'TabOrder'#2#1#0#7'TBitBtn'#10'HelpBu'
-  ,'tton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'$'#3
-  +'Top'#2#6#5'Width'#2'K'#5'Align'#7#6'alLeft'#8'AutoSize'#9#20'BorderSpacing.'
+  +'Height'#2'2'#11'ClientWidth'#3#157#2#8'TabOrder'#2#1#0#7'TBitBtn'#10'HelpBu'
+  ,'tton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'&'#3
+  +'Top'#2#6#5'Width'#2'L'#5'Align'#7#6'alLeft'#8'AutoSize'#9#20'BorderSpacing.'
   +'Around'#2#6#7'Caption'#6#5'&Help'#21'Constraints.MinHeight'#2#25#20'Constra'
   +'ints.MinWidth'#2'K'#4'Kind'#7#6'bkHelp'#9'NumGlyphs'#2#0#7'OnClick'#7#15'He'
   +'lpButtonClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#14'btnShowOptions'#21'AnchorS'
-  +'ideBottom.Side'#7#9'asrBottom'#4'Left'#3#135#0#6'Height'#2'$'#3'Top'#2#6#5
+  +'ideBottom.Side'#7#9'asrBottom'#4'Left'#3#137#0#6'Height'#2'&'#3'Top'#2#6#5
   +'Width'#3#143#0#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'
   +#2#6#7'Caption'#6#14'btnShowOptions'#21'Constraints.MinHeight'#2#25#20'Const'
   +'raints.MinWidth'#2'K'#10'Glyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0
@@ -510,12 +510,12 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +#255#255#0#255#255#255#0#254#254#254#0#165#170#202#255#128#146#218#255#254
   +#254#254#0#247#247#251#0#254#254#254#0#255#255#255#0#9'NumGlyphs'#2#0#7'OnCl'
   +'ick'#7#24'ButtonShowOptionsClicked'#8'TabOrder'#2#1#0#0#7'TBitBtn'#8'btnChe'
-  +'ck'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#28#1#6'Height'#2'$'#3
+  +'ck'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#30#1#6'Height'#2'&'#3
   +'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing'
   +'.Around'#2#6#7'Caption'#6#4'&Yes'#21'Constraints.MinHeight'#2#25#20'Constra'
   ,'ints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#5'bkYes'#9'NumGlyphs'#2#0#7'OnCl'
   +'ick'#7#14'btnTestClicked'#8'TabOrder'#2#2#0#0#7'TBitBtn'#11'btnLoadSave'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'm'#1#6'Height'#2'$'#3'Top'#2
+  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'o'#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#11'btnLoadSave'#10'Glyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4
   +#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'
@@ -571,13 +571,13 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +'j6'#255#187'j6'#255#188'l9'#255#189'n;'#255#187'm:'#255#187'k8'#239#187'p>'
   +#203#182'i5T'#255#255#255#0#9'NumGlyphs'#2#0#7'OnClick'#7#19'ButtonLoadSaveC'
   +'lick'#8'TabOrder'#2#3#0#0#7'TBitBtn'#5'btnOK'#21'AnchorSideBottom.Side'#7#9
-  +'asrBottom'#4'Left'#3#238#1#6'Height'#2'$'#3'Top'#2#6#5'Width'#2'K'#5'Align'
+  +'asrBottom'#4'Left'#3#240#1#6'Height'#2'&'#3'Top'#2#6#5'Width'#2'K'#5'Align'
   +#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'
   +#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#4'bk'
   +'OK'#9'NumGlyphs'#2#0#7'OnClick'#7#15'ButtonOKClicked'#8'TabOrder'#2#4#0#0#7
   +'TBitBtn'#9'btnCancel'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSide'
-  +'Bottom.Side'#7#9'asrBottom'#4'Left'#3'?'#2#6'Height'#2'$'#3'Top'#2#6#5'Widt'
-  ,'h'#2'X'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6
+  +'Bottom.Side'#7#9'asrBottom'#4'Left'#3'A'#2#6'Height'#2'&'#3'Top'#2#6#5'Widt'
+  ,'h'#2'V'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6
   +'Cancel'#9#7'Caption'#6#6'Cancel'#21'Constraints.MinHeight'#2#25#20'Constrai'
   +'nts.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2
   +#0#8'TabOrder'#2#5#0#0#0#0
diff --git a/ide/debugoptionsfrm.lfm b/ide/debugoptionsfrm.lfm
index a41bd4a777..b239164337 100644
--- a/ide/debugoptionsfrm.lfm
+++ b/ide/debugoptionsfrm.lfm
@@ -19,7 +19,7 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
     Width = 482
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
-    PageIndex = 0
+    PageIndex = 3
     TabOrder = 0
     object pgGeneral: TPage
       Caption = 'pgGeneral'
@@ -335,15 +335,14 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AnchorSideBottom.Control = bgIgnoreExceptions
           AnchorSideBottom.Side = asrBottom
           Left = 381
-          Height = 25
-          Top = 272
+          Height = 31
+          Top = 266
           Width = 75
           Anchors = [akRight, akBottom]
           AutoSize = True
           BorderSpacing.Around = 6
           BorderSpacing.InnerBorder = 4
           Caption = 'Remove'
-          Constraints.MaxHeight = 25
           Constraints.MinWidth = 75
           Enabled = False
           OnClick = cmdExceptionRemoveCLICK
@@ -354,15 +353,14 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AnchorSideBottom.Control = bgIgnoreExceptions
           AnchorSideBottom.Side = asrBottom
           Left = 300
-          Height = 25
-          Top = 272
+          Height = 31
+          Top = 266
           Width = 75
           Anchors = [akRight, akBottom]
           AutoSize = True
           BorderSpacing.Around = 6
           BorderSpacing.InnerBorder = 4
           Caption = 'Add'
-          Constraints.MaxHeight = 25
           Constraints.MinWidth = 75
           OnClick = cmdExceptionAddCLICK
           TabOrder = 1
@@ -371,7 +369,7 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AnchorSideRight.Side = asrBottom
           AnchorSideBottom.Control = cmdExceptionAdd
           Left = 6
-          Height = 260
+          Height = 254
           Top = 6
           Width = 450
           Align = alTop
@@ -417,15 +415,14 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AnchorSideBottom.Control = gbSignals
           AnchorSideBottom.Side = asrBottom
           Left = 381
-          Height = 25
-          Top = 300
+          Height = 31
+          Top = 294
           Width = 75
           Anchors = [akRight, akBottom]
           AutoSize = True
           BorderSpacing.Around = 6
           BorderSpacing.InnerBorder = 4
           Caption = 'Remove'
-          Constraints.MaxHeight = 25
           Constraints.MinWidth = 75
           Enabled = False
           TabOrder = 0
@@ -435,22 +432,21 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AnchorSideBottom.Control = gbSignals
           AnchorSideBottom.Side = asrBottom
           Left = 300
-          Height = 25
-          Top = 300
+          Height = 31
+          Top = 294
           Width = 75
           Anchors = [akRight, akBottom]
           AutoSize = True
           BorderSpacing.Around = 6
           BorderSpacing.InnerBorder = 4
           Caption = 'Add'
-          Constraints.MaxHeight = 25
           Constraints.MinWidth = 75
           TabOrder = 1
         end
         object lvSignals: TListView
           AnchorSideBottom.Control = cmdSignalAdd
           Left = 6
-          Height = 288
+          Height = 282
           Top = 6
           Width = 450
           Align = alTop
@@ -480,19 +476,19 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
     end
   end
   object BtnPanel: TPanel
-    Height = 48
-    Top = 395
+    Height = 50
+    Top = 393
     Width = 482
     Align = alBottom
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 48
+    ClientHeight = 50
     ClientWidth = 482
     TabOrder = 1
     object cmdOK: TBitBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 307
-      Height = 36
+      Left = 309
+      Height = 38
       Top = 6
       Width = 75
       Align = alRight
@@ -509,10 +505,10 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
     object cmdCancel: TBitBtn
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Side = asrBottom
-      Left = 388
-      Height = 36
+      Left = 390
+      Height = 38
       Top = 6
-      Width = 88
+      Width = 86
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
diff --git a/ide/debugoptionsfrm.lrs b/ide/debugoptionsfrm.lrs
index 2e0a6397a5..b99d9af2e4 100644
--- a/ide/debugoptionsfrm.lrs
+++ b/ide/debugoptionsfrm.lrs
@@ -9,7 +9,7 @@ LazarusResources.Add('TDebuggerOptionsForm','FORMDATA',[
   +'ormCREATE'#9'OnDestroy'#7#26'DebuggerOptionsFormDESTROY'#8'Position'#7#14'p'
   +'oScreenCenter'#0#9'TNotebook'#14'nbDebugOptions'#24'AnchorSideBottom.Contro'
   +'l'#7#8'BtnPanel'#6'Height'#3#137#1#5'Width'#3#226#1#5'Align'#7#5'alTop'#7'A'
-  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#0#8'T'
+  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#3#8'T'
   +'abOrder'#2#0#0#5'TPage'#9'pgGeneral'#7'Caption'#6#9'pgGeneral'#11'ClientWid'
   +'th'#3#222#1#12'ClientHeight'#3'j'#1#0#9'TGroupBox'#14'gbDebuggerType'#4'Lef'
   +'t'#2#6#6'Height'#2'W'#3'Top'#2#6#5'Width'#3#210#1#5'Align'#7#5'alTop'#8'Aut'
@@ -109,67 +109,66 @@ LazarusResources.Add('TDebuggerOptionsForm','FORMDATA',[
   +#3#206#1#11'ParentCtl3D'#8#8'TabOrder'#2#0#0#7'TButton'#18'cmdExceptionRemov'
   +'e'#23'AnchorSideRight.Control'#7#18'bgIgnoreExceptions'#20'AnchorSideRight.'
   +'Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#18'bgIgnoreExceptions'
-  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'}'#1#6'Height'#2#25#3'To'
-  +'p'#3#16#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'}'#1#6'Height'#2#31#3'To'
+  +'p'#3#10#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9
   +#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6
-  +#6'Remove'#21'Constraints.MaxHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'En'
-  +'abled'#8#7'OnClick'#7#23'cmdExceptionRemoveCLICK'#8'TabOrder'#2#0#0#0#7'TBu'
-  +'tton'#15'cmdExceptionAdd'#23'AnchorSideRight.Control'#7#18'cmdExceptionRemo'
-  +'ve'#24'AnchorSideBottom.Control'#7#18'bgIgnoreExceptions'#21'AnchorSideBott'
-  +'om.Side'#7#9'asrBottom'#4'Left'#3','#1#6'Height'#2#25#3'Top'#3#16#1#5'Width'
-  +#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.'
-  +'Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'Add'#21'Constr'
-  +'aints.MaxHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'OnClick'#7#20'cmdExce'
-  +'ptionAddCLICK'#8'TabOrder'#2#1#0#0#13'TCheckListBox'#13'clbExceptions'#20'A'
-  +'nchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#15'cmdEx'
-  +'ceptionAdd'#4'Left'#2#6#6'Height'#3#4#1#3'Top'#2#6#5'Width'#3#194#1#5'Align'
-  +#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'Bor'
-  +'derSpacing.Around'#2#6#7'OnClick'#7#18'clbExceptionsCLICK'#8'TabOrder'#2#2#8
-  +'TopIndex'#2#255#0#0#0#9'TCheckBox'#19'chkBreakOnException'#4'Left'#2#6#6'He'
-  +'ight'#2#22#3'Top'#3'N'#1#5'Width'#3#210#1#5'Align'#7#8'alBottom'#11'AllowGr'
-  +'ayed'#9#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#27'Break on Lazarus Exceptions'#8'TabOrder'#2#1#0#0#0#5'TPage'#9
-  ,'pgSignals'#7'Caption'#6#9'pgSignals'#11'ClientWidth'#3#222#1#12'ClientHeigh'
-  +'t'#3'j'#1#0#9'TGroupBox'#9'gbSignals'#4'Left'#2#6#6'Height'#3'^'#1#3'Top'#2
-  +#6#5'Width'#3#210#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7'Ca'
-  +'ption'#6#7'Signals'#12'ClientHeight'#3'K'#1#11'ClientWidth'#3#206#1#11'Pare'
-  +'ntCtl3D'#8#8'TabOrder'#2#0#0#7'TButton'#15'cmdSignalRemove'#23'AnchorSideRi'
-  +'ght.Control'#7#9'gbSignals'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'Anch'
-  +'orSideBottom.Control'#7#9'gbSignals'#21'AnchorSideBottom.Side'#7#9'asrBotto'
-  +'m'#4'Left'#3'}'#1#6'Height'#2#25#3'Top'#3','#1#5'Width'#2'K'#7'Anchors'#11#7
-  +'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'Border'
-  +'Spacing.InnerBorder'#2#4#7'Caption'#6#6'Remove'#21'Constraints.MaxHeight'#2
-  +#25#20'Constraints.MinWidth'#2'K'#7'Enabled'#8#8'TabOrder'#2#0#0#0#7'TButton'
-  +#12'cmdSignalAdd'#23'AnchorSideRight.Control'#7#15'cmdSignalRemove'#24'Ancho'
-  +'rSideBottom.Control'#7#9'gbSignals'#21'AnchorSideBottom.Side'#7#9'asrBottom'
-  +#4'Left'#3','#1#6'Height'#2#25#3'Top'#3','#1#5'Width'#2'K'#7'Anchors'#11#7'a'
-  +'kRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderS'
-  +'pacing.InnerBorder'#2#4#7'Caption'#6#3'Add'#21'Constraints.MaxHeight'#2#25
-  +#20'Constraints.MinWidth'#2'K'#8'TabOrder'#2#1#0#0#9'TListView'#9'lvSignals'
-  +#24'AnchorSideBottom.Control'#7#12'cmdSignalAdd'#4'Left'#2#6#6'Height'#3' '#1
-  +#3'Top'#2#6#5'Width'#3#194#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'ak'
-  +'Left'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Columns'#14#1
-  +#7'Caption'#6#4'Name'#5'Width'#3#200#0#0#1#7'Caption'#6#2'ID'#0#1#7'Caption'
-  +#6#10'Handled by'#5'Width'#2'K'#0#1#7'Caption'#6#6'Resume'#5'Width'#2'k'#0#0
-  +#9'PopupMenu'#7#9'popSignal'#8'TabOrder'#2#2#9'ViewStyle'#7#8'vsReport'#0#0#0
-  +#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'0'#3'Top'#3#139#1#5'Width'#3#226#1#5
-  +'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeig'
-  +'ht'#2'0'#11'ClientWidth'#3#226#1#8'TabOrder'#2#1#0#7'TBitBtn'#5'cmdOK'#21'A'
-  +'nchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'3'#1#6'Height'#2'$'#3'Top'#2
-  +#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'
-  +#2#6#7'Caption'#6#3'&OK'#20'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7
-  +#4'bkOK'#9'NumGlyphs'#2#0#7'OnClick'#7#10'cmdOKCLICK'#8'TabOrder'#2#0#0#0#7
-  +'TBitBtn'#9'cmdCancel'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSide'
-  +'Bottom.Side'#7#9'asrBottom'#4'Left'#3#132#1#6'Height'#2'$'#3'Top'#2#6#5'Wid'
-  +'th'#2'X'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6
-  +'Cancel'#9#7'Caption'#6#6'Cancel'#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8
-  +'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#0#10'TPo'
-  +'pupMenu'#9'popSignal'#4'left'#2#8#3'top'#3#192#1#0#9'TMenuItem'#19'mnuHandl'
-  +'edByProgram'#9'AutoCheck'#9#7'Caption'#6#18'Handled by Program'#10'GroupInd'
-  +'ex'#2#1#9'RadioItem'#9#0#0#9'TMenuItem'#21'mnuiHandledByDebugger'#9'AutoChe'
-  +'ck'#9#7'Caption'#6#19'Handled by Debugger'#10'GroupIndex'#2#1#9'RadioItem'#9
-  +#0#0#9'TMenuItem'#2'N1'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#16'mnuResumeHandl'
-  +'ed'#9'AutoCheck'#9#7'Caption'#6#14'Resume Handled'#10'GroupIndex'#2#2#9'Rad'
-  +'ioItem'#9#0#0#9'TMenuItem'#18'mnuResumeUnhandled'#9'AutoCheck'#9#7'Caption'
-  +#6#16'Resume Unhandled'#10'GroupIndex'#2#2#9'RadioItem'#9#0#0#0#0
+  +#6'Remove'#20'Constraints.MinWidth'#2'K'#7'Enabled'#8#7'OnClick'#7#23'cmdExc'
+  +'eptionRemoveCLICK'#8'TabOrder'#2#0#0#0#7'TButton'#15'cmdExceptionAdd'#23'An'
+  +'chorSideRight.Control'#7#18'cmdExceptionRemove'#24'AnchorSideBottom.Control'
+  +#7#18'bgIgnoreExceptions'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
+  +','#1#6'Height'#2#31#3'Top'#3#10#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8
+  +'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.Inn'
+  +'erBorder'#2#4#7'Caption'#6#3'Add'#20'Constraints.MinWidth'#2'K'#7'OnClick'#7
+  +#20'cmdExceptionAddCLICK'#8'TabOrder'#2#1#0#0#13'TCheckListBox'#13'clbExcept'
+  +'ions'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7
+  +#15'cmdExceptionAdd'#4'Left'#2#6#6'Height'#3#254#0#3'Top'#2#6#5'Width'#3#194
+  +#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBotto'
+  +'m'#0#20'BorderSpacing.Around'#2#6#7'OnClick'#7#18'clbExceptionsCLICK'#8'Tab'
+  +'Order'#2#2#8'TopIndex'#2#255#0#0#0#9'TCheckBox'#19'chkBreakOnException'#4'L'
+  +'eft'#2#6#6'Height'#2#22#3'Top'#3'N'#1#5'Width'#3#210#1#5'Align'#7#8'alBotto'
+  +'m'#11'AllowGrayed'#9#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing'
+  +'.Around'#2#6#7'Caption'#6#27'Break on Lazarus Exceptions'#8'TabOrder'#2#1#0
+  +#0#0#5'TPage'#9'pgSignals'#7'Caption'#6#9'pgSignals'#11'ClientWidth'#3#222#1
+  ,#12'ClientHeight'#3'j'#1#0#9'TGroupBox'#9'gbSignals'#4'Left'#2#6#6'Height'#3
+  +'^'#1#3'Top'#2#6#5'Width'#3#210#1#5'Align'#7#8'alClient'#20'BorderSpacing.Ar'
+  +'ound'#2#6#7'Caption'#6#7'Signals'#12'ClientHeight'#3'K'#1#11'ClientWidth'#3
+  +#206#1#11'ParentCtl3D'#8#8'TabOrder'#2#0#0#7'TButton'#15'cmdSignalRemove'#23
+  +'AnchorSideRight.Control'#7#9'gbSignals'#20'AnchorSideRight.Side'#7#9'asrBot'
+  +'tom'#24'AnchorSideBottom.Control'#7#9'gbSignals'#21'AnchorSideBottom.Side'#7
+  +#9'asrBottom'#4'Left'#3'}'#1#6'Height'#2#31#3'Top'#3'&'#1#5'Width'#2'K'#7'An'
+  +'chors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2
+  +#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#6'Remove'#20'Constraints.M'
+  +'inWidth'#2'K'#7'Enabled'#8#8'TabOrder'#2#0#0#0#7'TButton'#12'cmdSignalAdd'
+  +#23'AnchorSideRight.Control'#7#15'cmdSignalRemove'#24'AnchorSideBottom.Contr'
+  +'ol'#7#9'gbSignals'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3','#1#6
+  +'Height'#2#31#3'Top'#3'&'#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBotto'
+  +'m'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorde'
+  +'r'#2#4#7'Caption'#6#3'Add'#20'Constraints.MinWidth'#2'K'#8'TabOrder'#2#1#0#0
+  +#9'TListView'#9'lvSignals'#24'AnchorSideBottom.Control'#7#12'cmdSignalAdd'#4
+  +'Left'#2#6#6'Height'#3#26#1#3'Top'#2#6#5'Width'#3#194#1#5'Align'#7#5'alTop'#7
+  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Ar'
+  +'ound'#2#6#7'Columns'#14#1#7'Caption'#6#4'Name'#5'Width'#3#200#0#0#1#7'Capti'
+  +'on'#6#2'ID'#0#1#7'Caption'#6#10'Handled by'#5'Width'#2'K'#0#1#7'Caption'#6#6
+  +'Resume'#5'Width'#2'k'#0#0#9'PopupMenu'#7#9'popSignal'#8'TabOrder'#2#2#9'Vie'
+  +'wStyle'#7#8'vsReport'#0#0#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'2'#3'Top'
+  +#3#137#1#5'Width'#3#226#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'
+  +#7#6'bvNone'#12'ClientHeight'#2'2'#11'ClientWidth'#3#226#1#8'TabOrder'#2#1#0
+  +#7'TBitBtn'#5'cmdOK'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'5'#1
+  +#6'Height'#2'&'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#20'Constraints.MinWidth'#2
+  +'K'#7'Default'#9#4'Kind'#7#4'bkOK'#9'NumGlyphs'#2#0#7'OnClick'#7#10'cmdOKCLI'
+  +'CK'#8'TabOrder'#2#0#0#0#7'TBitBtn'#9'cmdCancel'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#134#1#6'Heigh'
+  +'t'#2'&'#3'Top'#2#6#5'Width'#2'V'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Bor'
+  +'derSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#20'Constraints.Mi'
+  +'nWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'T'
+  +'abOrder'#2#1#0#0#0#10'TPopupMenu'#9'popSignal'#4'left'#2#8#3'top'#3#192#1#0
+  +#9'TMenuItem'#19'mnuHandledByProgram'#9'AutoCheck'#9#7'Caption'#6#18'Handled'
+  +' by Program'#10'GroupIndex'#2#1#9'RadioItem'#9#0#0#9'TMenuItem'#21'mnuiHand'
+  +'ledByDebugger'#9'AutoCheck'#9#7'Caption'#6#19'Handled by Debugger'#10'Group'
+  +'Index'#2#1#9'RadioItem'#9#0#0#9'TMenuItem'#2'N1'#7'Caption'#6#1'-'#0#0#9'TM'
+  +'enuItem'#16'mnuResumeHandled'#9'AutoCheck'#9#7'Caption'#6#14'Resume Handled'
+  +#10'GroupIndex'#2#2#9'RadioItem'#9#0#0#9'TMenuItem'#18'mnuResumeUnhandled'#9
+  +'AutoCheck'#9#7'Caption'#6#16'Resume Unhandled'#10'GroupIndex'#2#2#9'RadioIt'
+  +'em'#9#0#0#0#0
 ]);
diff --git a/ide/editoroptions.lfm b/ide/editoroptions.lfm
index 79cc943400..de8cc8cc44 100644
--- a/ide/editoroptions.lfm
+++ b/ide/editoroptions.lfm
@@ -5,7 +5,6 @@ object EditorOptionsForm: TEditorOptionsForm
   Width = 481
   HorzScrollBar.Page = 480
   VertScrollBar.Page = 530
-  ActiveControl = CancelButton
   Caption = 'EditorOptionsForm'
   ClientHeight = 531
   ClientWidth = 481
@@ -13,16 +12,18 @@ object EditorOptionsForm: TEditorOptionsForm
   Constraints.MinWidth = 400
   Position = poScreenCenter
   object MainNotebook: TNotebook
-    Height = 491
+    AnchorSideBottom.Control = BtnPanel
+    Height = 482
     Width = 481
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
-    PageIndex = 0
+    BorderSpacing.Bottom = 6
+    PageIndex = 2
     TabOrder = 0
     object GeneralPage: TPage
       Caption = 'GeneralPage'
       ClientWidth = 477
-      ClientHeight = 460
+      ClientHeight = 451
       object BlockIndentLabel: TLabel
         AnchorSideLeft.Control = BlockIndentComboBox
         AnchorSideLeft.Side = asrBottom
@@ -30,7 +31,7 @@ object EditorOptionsForm: TEditorOptionsForm
         AnchorSideBottom.Side = asrCenter
         Left = 112
         Height = 20
-        Top = 369
+        Top = 360
         Width = 109
         Anchors = [akLeft, akBottom]
         BorderSpacing.Around = 6
@@ -44,7 +45,7 @@ object EditorOptionsForm: TEditorOptionsForm
         AnchorSideBottom.Side = asrCenter
         Left = 112
         Height = 20
-        Top = 400
+        Top = 391
         Width = 100
         Anchors = [akLeft, akBottom]
         BorderSpacing.Around = 6
@@ -58,7 +59,7 @@ object EditorOptionsForm: TEditorOptionsForm
         AnchorSideBottom.Side = asrCenter
         Left = 112
         Height = 20
-        Top = 431
+        Top = 422
         Width = 98
         Anchors = [akLeft, akBottom]
         BorderSpacing.Around = 6
@@ -69,7 +70,7 @@ object EditorOptionsForm: TEditorOptionsForm
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = BlockIndentLabel
         Left = 6
-        Height = 351
+        Height = 342
         Top = 6
         Width = 465
         Align = alTop
@@ -95,7 +96,7 @@ object EditorOptionsForm: TEditorOptionsForm
         AnchorSideBottom.Control = UndoLimitComboBox
         Left = 6
         Height = 25
-        Top = 367
+        Top = 358
         Width = 100
         Anchors = [akLeft, akBottom]
         AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@@ -116,7 +117,7 @@ object EditorOptionsForm: TEditorOptionsForm
         AnchorSideBottom.Control = TabWidthsComboBox
         Left = 6
         Height = 25
-        Top = 398
+        Top = 389
         Width = 100
         Anchors = [akLeft, akBottom]
         AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@@ -137,7 +138,7 @@ object EditorOptionsForm: TEditorOptionsForm
         AnchorSideBottom.Side = asrBottom
         Left = 6
         Height = 25
-        Top = 429
+        Top = 420
         Width = 100
         Anchors = [akLeft, akBottom]
         AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
@@ -407,8 +408,6 @@ object EditorOptionsForm: TEditorOptionsForm
         Font.Name = 'courier'
         ParentColor = False
         TabOrder = 2
-        BookMarkOptions.OnChange = nil
-        Gutter.OnChange = nil
         Gutter.CodeFoldingWidth = 14
         Keystrokes = <        
           item
@@ -735,14 +734,13 @@ object EditorOptionsForm: TEditorOptionsForm
           'DisplayPreview'
         )
         ReadOnly = True
-        SelectedColor.OnChange = nil
         OnSpecialLineColors = OnSpecialLineColors
       end
     end
     object KeymappingPage: TPage
       Caption = 'KeymappingPage'
       ClientWidth = 477
-      ClientHeight = 460
+      ClientHeight = 451
       object KeyMappingHelpLabel: TLabel
         Left = 6
         Height = 20
@@ -785,7 +783,7 @@ object EditorOptionsForm: TEditorOptionsForm
       end
       object KeyMappingTreeView: TTreeView
         Left = 6
-        Height = 360
+        Height = 351
         Top = 94
         Width = 465
         Align = alClient
@@ -891,8 +889,6 @@ object EditorOptionsForm: TEditorOptionsForm
         ParentColor = False
         TabOrder = 3
         OnMouseDown = ColorPreviewMouseUp
-        BookMarkOptions.OnChange = nil
-        Gutter.OnChange = nil
         Gutter.CodeFoldingWidth = 14
         Keystrokes = <        
           item
@@ -1219,7 +1215,6 @@ object EditorOptionsForm: TEditorOptionsForm
           'ColorPreview'
         )
         ReadOnly = True
-        SelectedColor.OnChange = nil
         OnSpecialLineColors = OnSpecialLineColors
       end
       object ColorElementListBox: TListBox
@@ -1527,42 +1522,47 @@ object EditorOptionsForm: TEditorOptionsForm
       end
     end
   end
-  object CancelButton: TButton
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 369
-    Height = 25
-    Top = 500
-    Width = 106
-    Anchors = [akRight, akBottom]
+  object BtnPanel: TPanel
+    Height = 43
+    Top = 488
+    Width = 481
+    Align = alBottom
     AutoSize = True
-    BorderSpacing.Around = 6
-    BorderSpacing.InnerBorder = 4
-    Caption = 'CancelButton'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    OnClick = CancelButtonClick
+    BevelOuter = bvNone
+    ClientHeight = 43
+    ClientWidth = 481
     TabOrder = 1
-  end
-  object OkButton: TButton
-    AnchorSideRight.Control = CancelButton
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 297
-    Height = 25
-    Top = 500
-    Width = 80
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Around = 6
-    BorderSpacing.InnerBorder = 4
-    Caption = 'OkButton'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    OnClick = OkButtonClick
-    TabOrder = 2
+    object OkButton: TButton
+      AnchorSideBottom.Side = asrBottom
+      Left = 283
+      Height = 31
+      Top = 6
+      Width = 80
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      BorderSpacing.InnerBorder = 4
+      Caption = 'OkButton'
+      Constraints.MinWidth = 75
+      OnClick = OkButtonClick
+      TabOrder = 0
+    end
+    object CancelButton: TButton
+      AnchorSideRight.Side = asrBottom
+      AnchorSideBottom.Side = asrBottom
+      Left = 369
+      Height = 31
+      Top = 6
+      Width = 106
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      BorderSpacing.InnerBorder = 4
+      Caption = 'CancelButton'
+      Constraints.MinWidth = 75
+      OnClick = CancelButtonClick
+      TabOrder = 1
+    end
   end
   object ImageList: TImageList
     Height = 21
diff --git a/ide/editoroptions.lrs b/ide/editoroptions.lrs
index ea21cd7dbd..a2ff129d26 100644
--- a/ide/editoroptions.lrs
+++ b/ide/editoroptions.lrs
@@ -3,327 +3,325 @@
 LazarusResources.Add('TEditorOptionsForm','FORMDATA',[
   'TPF0'#18'TEditorOptionsForm'#17'EditorOptionsForm'#4'Left'#3#190#1#6'Height'
   +#3#19#2#3'Top'#3#148#0#5'Width'#3#225#1#18'HorzScrollBar.Page'#3#224#1#18'Ve'
-  +'rtScrollBar.Page'#3#18#2#13'ActiveControl'#7#12'CancelButton'#7'Caption'#6
-  +#17'EditorOptionsForm'#12'ClientHeight'#3#19#2#11'ClientWidth'#3#225#1#21'Co'
-  +'nstraints.MinHeight'#3#244#1#20'Constraints.MinWidth'#3#144#1#8'Position'#7
-  +#14'poScreenCenter'#0#9'TNotebook'#12'MainNotebook'#6'Height'#3#235#1#5'Widt'
-  +'h'#3#225#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
-  +'akBottom'#0#9'PageIndex'#2#0#8'TabOrder'#2#0#0#5'TPage'#11'GeneralPage'#7'C'
-  +'aption'#6#11'GeneralPage'#11'ClientWidth'#3#221#1#12'ClientHeight'#3#204#1#0
-  +#6'TLabel'#16'BlockIndentLabel'#22'AnchorSideLeft.Control'#7#19'BlockIndentC'
-  +'omboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'
-  +#7#19'BlockIndentComboBox'#21'AnchorSideBottom.Side'#7#9'asrCenter'#4'Left'#2
-  +'p'#6'Height'#2#20#3'Top'#3'q'#1#5'Width'#2'm'#7'Anchors'#11#6'akLeft'#8'akB'
-  +'ottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'BlockIndentLabel'#11
-  +'ParentColor'#8#0#0#6'TLabel'#14'UndoLimitLabel'#22'AnchorSideLeft.Control'#7
-  +#17'UndoLimitComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideB'
-  +'ottom.Control'#7#17'UndoLimitComboBox'#21'AnchorSideBottom.Side'#7#9'asrCen'
-  +'ter'#4'Left'#2'p'#6'Height'#2#20#3'Top'#3#144#1#5'Width'#2'd'#7'Anchors'#11
-  +#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'UndoLi'
-  +'mitLabel'#11'ParentColor'#8#0#0#6'TLabel'#14'TabWidthsLabel'#22'AnchorSideL'
-  +'eft.Control'#7#17'TabWidthsComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'
-  +#24'AnchorSideBottom.Control'#7#17'TabWidthsComboBox'#21'AnchorSideBottom.Si'
-  +'de'#7#9'asrCenter'#4'Left'#2'p'#6'Height'#2#20#3'Top'#3#175#1#5'Width'#2'b'
-  +#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Captio'
-  +'n'#6#14'TabWidthsLabel'#11'ParentColor'#8#0#0#11'TCheckGroup'#21'EditorOpti'
-  +'onsGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Co'
-  +'ntrol'#7#16'BlockIndentLabel'#4'Left'#2#6#6'Height'#3'_'#1#3'Top'#2#6#5'Wid'
-  +'th'#3#209#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
-  +#8'akBottom'#0#8'AutoFill'#9#20'BorderSpacing.Bottom'#2#6#20'BorderSpacing.A'
-  +'round'#2#6#7'Caption'#6#21'EditorOptionsGroupBox'#28'ChildSizing.LeftRightS'
-  +'pacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHori'
-  +'zontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24
-  +'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChi'
-  +'lds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Lay'
-  +'out'#7#29'cclTopToBottomThenLeftToRight'#27'ChildSizing.ControlsPerLine'#2#1
-  +#12'ColumnLayout'#7#24'clVerticalThenHorizontal'#7'Columns'#2#2#11'OnItemCli'
-  +'ck'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#9'TComboBox'#19'Block'
-  +'IndentComboBox'#24'AnchorSideBottom.Control'#7#17'UndoLimitComboBox'#4'Left'
-  +#2#6#6'Height'#2#25#3'Top'#3'o'#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'ak'
-  +'Bottom'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearch'
-  +'Ascending'#0#20'BorderSpacing.Around'#2#6#13'Items.Strings'#1#6#1'1'#6#1'2'
-  +#6#1'4'#6#1'8'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExi'
-  +'t'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#1
-  +#0#0#9'TComboBox'#17'UndoLimitComboBox'#24'AnchorSideBottom.Control'#7#17'Ta'
-  +'bWidthsComboBox'#4'Left'#2#6#6'Height'#2#25#3'Top'#3#142#1#5'Width'#2'd'#7
-  +'Anchors'#11#6'akLeft'#8'akBottom'#0#16'AutoCompleteText'#11#22'cbactEndOfLi'
-  +'neComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Around'#2#6#13'Item'
-  +'s.Strings'#1#6#5'32767'#6#4'4096'#6#3'512'#0#9'MaxLength'#2#0#8'OnChange'#7
-  +#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'Combo'
-  +'BoxOnKeyDown'#8'TabOrder'#2#2#0#0#9'TComboBox'#17'TabWidthsComboBox'#24'Anc'
-  +'horSideBottom.Control'#7#11'GeneralPage'#21'AnchorSideBottom.Side'#7#9'asrB'
-  +'ottom'#4'Left'#2#6#6'Height'#2#25#3'Top'#3#173#1#5'Width'#2'd'#7'Anchors'#11
-  +#6'akLeft'#8'akBottom'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'
-  +#20'cbactSearchAscending'#0#20'BorderSpacing.Around'#2#6#13'Items.Strings'#1
-  +#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnC'
-  +'hange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8
-  +'TabOrder'#2#3#0#0#0#5'TPage'#11'DisplayPage'#7'Caption'#6#11'DisplayPage'#11
-  +'ClientWidth'#3#221#1#12'ClientHeight'#3#204#1#0#9'TGroupBox'#23'MarginAndGu'
-  +'tterGroupBox'#4'Left'#2#6#6'Height'#3#128#0#3'Top'#2#6#5'Width'#3#209#1#5'A'
-  +'lign'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'MarginAndGutt'
-  +'erGroupBox'#12'ClientHeight'#2'm'#11'ClientWidth'#3#205#1#8'TabOrder'#2#0#0
-  +#6'TLabel'#16'RightMarginLabel'#4'Left'#3'f'#1#6'Height'#2#20#3'Top'#2#10#5
-  +'Width'#2'n'#7'Caption'#6#16'RightMarginLabel'#11'ParentColor'#8#0#0#12'TCol'
-  +'orButton'#22'RightMarginColorButton'#4'Left'#3#246#0#6'Height'#2#21#3'Top'#2
-  ,'$'#5'Width'#2'd'#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9
-  +'clBtnFace'#14'OnColorChanged'#7'"RightMarginColorButtonColorChanged'#0#0#12
-  +'TColorButton'#17'GutterColorButton'#4'Left'#3#246#0#6'Height'#2#21#3'Top'#2
-  +'T'#5'Width'#2'd'#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9
-  +'clBtnFace'#14'OnColorChanged'#7#23'ColorButtonColorChanged'#0#0#6'TLabel'#21
-  +'RightMarginColorLabel'#4'Left'#3'f'#1#6'Height'#2#20#3'Top'#2'"'#5'Width'#3
-  +#143#0#7'Caption'#6#21'RightMarginColorLabel'#11'ParentColor'#8#0#0#6'TLabel'
-  +#16'GutterWidthLabel'#4'Left'#3'f'#1#6'Height'#2#20#3'Top'#2'<'#5'Width'#2'o'
-  +#7'Caption'#6#16'GutterWidthLabel'#11'ParentColor'#8#0#0#6'TLabel'#16'Gutter'
-  +'ColorLabel'#4'Left'#3'f'#1#6'Height'#2#20#3'Top'#2'R'#5'Width'#2'm'#7'Capti'
-  +'on'#6#16'GutterColorLabel'#11'ParentColor'#8#0#0#9'TCheckBox'#26'VisibleRig'
-  +'htMarginCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#8#5'Width'#3#203#0#7
-  +'Caption'#6#26'VisibleRightMarginCheckBox'#8'OnChange'#7#23'GeneralCheckBoxO'
-  +'nChange'#8'TabOrder'#2#0#0#0#9'TCheckBox'#21'VisibleGutterCheckBox'#4'Left'
-  +#2#6#6'Height'#2#22#3'Top'#2' '#5'Width'#3#169#0#7'Caption'#6#21'VisibleGutt'
-  +'erCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#1#0#0#9
-  +'TCheckBox'#23'ShowLineNumbersCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2
-  +'8'#5'Width'#3#206#0#7'Caption'#6#23'ShowLineNumbersCheckBox'#8'OnChange'#7
-  +#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#2#0#0#9'TComboBox'#19'RightMargin'
-  +'ComboBox'#4'Left'#3#246#0#6'Height'#2#25#3'Top'#2#8#5'Width'#2'd'#16'AutoCo'
-  +'mpleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#13'Ite'
-  +'ms.Strings'#1#6#2'80'#6#2'78'#6#2'76'#0#9'MaxLength'#2#0#8'OnChange'#7#16'C'
-  +'omboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxO'
-  +'nKeyDown'#8'TabOrder'#2#3#0#0#9'TComboBox'#19'GutterWidthComboBox'#4'Left'#3
-  +#246#0#6'Height'#2#25#3'Top'#2':'#5'Width'#2'd'#16'AutoCompleteText'#11#22'c'
-  +'bactEndOfLineComplete'#20'cbactSearchAscending'#0#13'Items.Strings'#1#6#2'4'
-  +'0'#6#2'35'#6#2'30'#6#2'25'#6#2'20'#0#9'MaxLength'#2#0#8'OnChange'#7#16'Comb'
-  +'oBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKe'
-  +'yDown'#8'TabOrder'#2#4#0#0#0#9'TGroupBox'#18'EditorFontGroupBox'#4'Left'#2#6
-  +#6'Height'#3#136#0#3'Top'#3#140#0#5'Width'#3#209#1#5'Align'#7#5'alTop'#20'Bo'
-  +'rderSpacing.Around'#2#6#7'Caption'#6#18'EditorFontGroupBox'#12'ClientHeight'
-  +#2'u'#11'ClientWidth'#3#205#1#8'TabOrder'#2#1#0#6'TLabel'#15'EditorFontLabel'
-  +#4'Left'#2#6#6'Height'#2#20#3'Top'#2#6#5'Width'#3#193#1#5'Align'#7#5'alTop'
-  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'
-  +#2#6#7'Caption'#6#15'EditorFontLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'Edi'
-  +'torFontHeightLabel'#4'Left'#2't'#6'Height'#2#20#3'Top'#2'<'#5'Width'#3'B'#1
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#21'EditorFontHeightLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'Ext'
-  +'raLineSpacingLabel'#4'Left'#2't'#6'Height'#2#20#3'Top'#2'Z'#5'Width'#3'B'#1
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#21'ExtraLineSpacingLabel'#11'ParentColor'#8#0#0#9'TComboBox'#18
-  +'EditorFontComboBox'#23'AnchorSideRight.Control'#7#16'EditorFontButton'#4'Le'
-  +'ft'#2#6#6'Height'#2#25#3'Top'#2#29#5'Width'#3#148#1#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20
-  +'cbactSearchAscending'#0#20'BorderSpacing.Around'#2#6#9'MaxLength'#2#0#13'On'
-  +'EditingDone'#7#29'EditorFontComboBoxEditingDone'#8'TabOrder'#2#0#4'Text'#6
-  +#18'EditorFontComboBox'#0#0#7'TButton'#16'EditorFontButton'#4'Left'#3#160#1#6
-  +'Height'#2#25#3'Top'#2#29#5'Width'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#0
-  +#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'...'#7'OnClick'#7#21'Edito'
-  +'rFontButtonClick'#8'TabOrder'#2#1#0#0#9'TComboBox'#24'EditorFontHeightCombo'
-  +'Box'#4'Left'#2#6#6'Height'#2#25#3'Top'#2':'#5'Width'#2'd'#16'AutoCompleteTe'
-  +'xt'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#13'Items.Strin'
-  +'gs'#1#6#2'10'#6#2'11'#6#2'12'#6#2'13'#6#2'14'#6#2'15'#6#2'16'#6#2'17'#6#2'1'
-  +'8'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'Com'
-  +'boBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0#9'TCo'
-  +'mboBox'#24'ExtraLineSpacingComboBox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'X'
-  +#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSe'
-  +'archAscending'#0#13'Items.Strings'#1#6#1'0'#6#1'1'#6#1'2'#0#9'MaxLength'#2#0
-  +#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDo'
-  +'wn'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#3#0#0#0#8'TSynEdit'#14'DisplayPre'
-  +'view'#4'Left'#2#6#6'Height'#3#172#0#3'Top'#3#26#1#5'Width'#3#209#1#5'Align'
-  +#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Anchors'#11#5'akTop'#6'akLeft'
-  +#7'akRight'#8'akBottom'#0#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#11
-  +'ParentColor'#8#8'TabOrder'#2#2#24'BookMarkOptions.OnChange'#13#15'Gutter.On'
-  ,'Change'#13#23'Gutter.CodeFoldingWidth'#2#14#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'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#14'DisplayPr'
-  +'eview'#0#8'ReadOnly'#9#22'SelectedColor.OnChange'#13#19'OnSpecialLineColors'
-  +#7#19'OnSpecialLineColors'#0#0#0#5'TPage'#14'KeymappingPage'#7'Caption'#6#14
-  +'KeymappingPage'#11'ClientWidth'#3#221#1#12'ClientHeight'#3#204#1#0#6'TLabel'
-  +#19'KeyMappingHelpLabel'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'D'#5'Width'#3
-  +#209#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2
-  +#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#19'KeyMappingHelpLabel'#11'Paren'
-  +'tColor'#8#0#0#7'TButton'#28'KeyMappingChooseSchemeButton'#4'Left'#2#6#6'Hei'
-  +'ght'#2#25#3'Top'#2#6#5'Width'#3#209#1#5'Align'#7#5'alTop'#18'BorderSpacing.'
-  +'Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#25'BorderSp'
-  +'acing.InnerBorder'#2#4#7'Caption'#6#28'KeyMappingChooseSchemeButton'#7'OnCl'
-  +'ick'#7'!KeyMappingChooseSchemeButtonClick'#8'TabOrder'#2#0#0#0#7'TButton Ke'
-  +'yMappingConsistencyCheckButton'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'%'#5'Wi'
-  +'dth'#3#209#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacin'
-  +'g.Top'#2#6#19'BorderSpacing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#4#7
-  +'Caption'#6' KeyMappingConsistencyCheckButton'#7'OnClick'#7'%KeyMappingConsi'
-  +'stencyCheckButtonClick'#8'TabOrder'#2#1#0#0#9'TTreeView'#18'KeyMappingTreeV'
-  +'iew'#4'Left'#2#6#6'Height'#3'h'#1#3'Top'#2'^'#5'Width'#3#209#1#5'Align'#7#8
-  +'alClient'#20'BorderSpacing.Around'#2#6#17'DefaultItemHeight'#2#21#6'Images'
-  +#7#9'ImageList'#8'ReadOnly'#9#9'RowSelect'#9#8'TabOrder'#2#2#9'OnMouseUp'#7
-  +#25'KeyMappingTreeViewMouseUp'#7'Options'#11#17'tvoAutoItemHeight'#16'tvoHid'
-  +'eSelection'#21'tvoKeepCollapsedNodes'#11'tvoReadOnly'#12'tvoRowSelect'#14't'
-  ,'voShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#17'tvoShowSeparators'#11'tv'
-  +'oToolTips'#0#0#0#0#5'TPage'#9'ColorPage'#7'Caption'#6#9'ColorPage'#11'Clien'
-  +'tWidth'#3#221#1#12'ClientHeight'#3#204#1#0#6'TLabel'#13'LanguageLabel'#4'Le'
-  +'ft'#3#214#0#6'Height'#2#20#3'Top'#2#12#5'Width'#2'b'#7'Caption'#6#13'Langua'
-  +'geLabel'#11'ParentColor'#8#0#0#6'TLabel'#16'ColorSchemeLabel'#4'Left'#3#214
-  +#0#6'Height'#2#20#3'Top'#2'$'#5'Width'#2'y'#7'Caption'#6#16'ColorSchemeLabel'
-  +#11'ParentColor'#8#0#0#6'TLabel'#19'FileExtensionsLabel'#4'Left'#3#214#0#6'H'
-  +'eight'#2#20#3'Top'#2'<'#5'Width'#2'|'#7'Caption'#6#19'FileExtensionsLabel'
-  +#11'ParentColor'#8#0#0#6'TLabel'#17'ColorElementLabel'#4'Left'#2#4#6'Height'
-  +#2#20#3'Top'#2'Z'#5'Width'#2'y'#7'Caption'#6#17'ColorElementLabel'#11'Parent'
-  +'Color'#8#0#0#9'TComboBox'#16'LanguageComboBox'#4'Left'#2#3#6'Height'#2#25#3
-  +'Top'#2#10#5'Width'#3#200#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplet'
-  +'e'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnC'
-  +'hange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8
-  +'TabOrder'#2#0#4'Text'#6#16'LanguageComboBox'#0#0#9'TComboBox'#19'ColorSchem'
-  +'eComboBox'#4'Left'#2#3#6'Height'#2#25#3'Top'#2'"'#5'Width'#3#200#0#16'AutoC'
-  +'ompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'Max'
-  +'Length'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExi'
-  +'t'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#1#4'Text'#6#19'ColorS'
-  +'chemeComboBox'#0#0#9'TComboBox'#22'FileExtensionsComboBox'#4'Left'#2#3#6'He'
-  +'ight'#2#25#3'Top'#2':'#5'Width'#3#200#0#16'AutoCompleteText'#11#22'cbactEnd'
-  +'OfLineComplete'#20'cbactSearchAscending'#0#13'Items.Strings'#1#6#26'pp;pas;'
-  +'inc;lpr;lrs;dpr;dpk'#6#18'pp;pas;inc;lpr;lrs'#6#10'pp;pas;inc'#0#9'MaxLengt'
+  +'rtScrollBar.Page'#3#18#2#7'Caption'#6#17'EditorOptionsForm'#12'ClientHeight'
+  +#3#19#2#11'ClientWidth'#3#225#1#21'Constraints.MinHeight'#3#244#1#20'Constra'
+  +'ints.MinWidth'#3#144#1#8'Position'#7#14'poScreenCenter'#0#9'TNotebook'#12'M'
+  +'ainNotebook'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#6'Height'#3#226#1#5
+  +'Width'#3#225#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRig'
+  +'ht'#8'akBottom'#0#20'BorderSpacing.Bottom'#2#6#9'PageIndex'#2#2#8'TabOrder'
+  +#2#0#0#5'TPage'#11'GeneralPage'#7'Caption'#6#11'GeneralPage'#11'ClientWidth'
+  +#3#221#1#12'ClientHeight'#3#195#1#0#6'TLabel'#16'BlockIndentLabel'#22'Anchor'
+  +'SideLeft.Control'#7#19'BlockIndentComboBox'#19'AnchorSideLeft.Side'#7#9'asr'
+  +'Bottom'#24'AnchorSideBottom.Control'#7#19'BlockIndentComboBox'#21'AnchorSid'
+  +'eBottom.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Height'#2#20#3'Top'#3'h'#1#5'Wi'
+  +'dth'#2'm'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6
+  +#7'Caption'#6#16'BlockIndentLabel'#11'ParentColor'#8#0#0#6'TLabel'#14'UndoLi'
+  +'mitLabel'#22'AnchorSideLeft.Control'#7#17'UndoLimitComboBox'#19'AnchorSideL'
+  +'eft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'UndoLimitComboBo'
+  +'x'#21'AnchorSideBottom.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Height'#2#20#3'T'
+  +'op'#3#135#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#14'UndoLimitLabel'#11'ParentColor'#8#0#0#6'T'
+  +'Label'#14'TabWidthsLabel'#22'AnchorSideLeft.Control'#7#17'TabWidthsComboBox'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'Ta'
+  +'bWidthsComboBox'#21'AnchorSideBottom.Side'#7#9'asrCenter'#4'Left'#2'p'#6'He'
+  +'ight'#2#20#3'Top'#3#166#1#5'Width'#2'b'#7'Anchors'#11#6'akLeft'#8'akBottom'
+  +#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'TabWidthsLabel'#11'ParentCol'
+  +'or'#8#0#0#11'TCheckGroup'#21'EditorOptionsGroupBox'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#16'BlockIndentLabel'#4'Left'#2
+  +#6#6'Height'#3'V'#1#3'Top'#2#6#5'Width'#3#209#1#5'Align'#7#5'alTop'#7'Anchor'
+  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#20'BorderSp'
+  +'acing.Bottom'#2#6#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'EditorOption'
+  +'sGroupBox'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpa'
+  +'cing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'
+  +#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizi'
+  +'ng.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7
+  +#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclTopToBottomThenLeftToRigh'
+  +'t'#27'ChildSizing.ControlsPerLine'#2#1#12'ColumnLayout'#7#24'clVerticalThen'
+  +'Horizontal'#7'Columns'#2#2#11'OnItemClick'#7#23'GeneralCheckBoxOnChange'#8
+  +'TabOrder'#2#0#0#0#9'TComboBox'#19'BlockIndentComboBox'#24'AnchorSideBottom.'
+  +'Control'#7#17'UndoLimitComboBox'#4'Left'#2#6#6'Height'#2#25#3'Top'#3'f'#1#5
+  +'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#16'AutoCompleteText'#11#22
+  +'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Around'
+  +#2#6#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'MaxLength'#2#0#8'On'
+  +'Change'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7
+  +#17'ComboBoxOnKeyDown'#8'TabOrder'#2#1#0#0#9'TComboBox'#17'UndoLimitComboBox'
+  +#24'AnchorSideBottom.Control'#7#17'TabWidthsComboBox'#4'Left'#2#6#6'Height'#2
+  +#25#3'Top'#3#133#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#16'Au'
+  +'toCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20
+  +'BorderSpacing.Around'#2#6#13'Items.Strings'#1#6#5'32767'#6#4'4096'#6#3'512'
+  +#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboB'
+  +'oxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0#9'TCombo'
+  +'Box'#17'TabWidthsComboBox'#24'AnchorSideBottom.Control'#7#11'GeneralPage'#21
+  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#25#3'Top'#3
+  +#164#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#16'AutoCompleteTe'
+  +'xt'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20'BorderSpaci'
+  +'ng.Around'#2#6#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'MaxLengt'
   +'h'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9
-  +'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0#8'TSynEdit'#12'Color'
-  +'Preview'#4'Left'#2#4#6'Height'#2'a'#3'Top'#3'g'#1#5'Width'#3#213#1#5'Align'
-  +#7#8'alBottom'#20'BorderSpacing.Around'#2#4#7'Anchors'#11#5'akTop'#6'akLeft'
-  +#7'akRight'#8'akBottom'#0#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#11
-  +'ParentColor'#8#8'TabOrder'#2#3#11'OnMouseDown'#7#19'ColorPreviewMouseUp'#24
-  +'BookMarkOptions.OnChange'#13#15'Gutter.OnChange'#13#23'Gutter.CodeFoldingWi'
-  +'dth'#2#14#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'Comma'
-  +'nd'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Comman'
-  +'d'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Comm'
-  +'and'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Comm'
-  +'and'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Comm'
-  +'and'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Co'
-  +'mmand'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'C'
-  +'ommand'#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'C'
-  +'ommand'#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'C'
-  +'ommand'#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'C'
-  +'ommand'#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'Command'#3'['#2#8'ShortCut'#3
-  +'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCu'
-  +'t'#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'ShortCut'#4#8#160#0#0#0#1#7'C'
-  +'ommand'#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'Short'
-  +'Cut'#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'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'Com'
-  +'mand'#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'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'Short'
-  +'Cut'#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'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'Comman'
-  +'d'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'C'
-  +'ommand'#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'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'ShortCu'
-  +'t'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'Sh'
-  +'ortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#12'ColorPreview'#0#8'ReadOnly'#9#22
-  +'SelectedColor.OnChange'#13#19'OnSpecialLineColors'#7#19'OnSpecialLineColors'
-  +#0#0#8'TListBox'#19'ColorElementListBox'#4'Left'#2#3#6'Height'#3#242#0#3'Top'
-  +#2'l'#5'Width'#3#200#0#17'OnSelectionChange'#7'"ColorElementListBoxSelection'
-  +'Change'#8'TabOrder'#2#4#8'TopIndex'#2#255#0#0#7'TButton'#27'SetAttributeToD'
-  +'efaultButton'#23'AnchorSideRight.Control'#7#9'ColorPage'#20'AnchorSideRight'
-  +'.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#25#3'Top'#2'Z'#5'Width'#3
-  +#3#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2
-  +#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#27'SetAttributeToDefaultBu'
-  +'tton'#7'OnClick'#7' SetAttributeToDefaultButtonClick'#8'TabOrder'#2#5#0#0#7
-  +'TButton'#31'SetAllAttributesToDefaultButton'#23'AnchorSideRight.Control'#7#9
-  +'ColorPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'
-  +#2#25#3'Top'#2'z'#5'Width'#3#3#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
-  +#0#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'
-  +#6#31'SetAllAttributesToDefaultButton'#7'OnClick'#7'$SetAllAttributesToDefau'
-  +'ltButtonClick'#8'TabOrder'#2#6#0#0#9'TGroupBox'#22'TextAttributesGroupBox'
-  +#23'AnchorSideRight.Control'#7#9'ColorPage'#20'AnchorSideRight.Side'#7#9'asr'
-  +'Bottom'#24'AnchorSideBottom.Control'#7#12'ColorPreview'#4'Left'#3#212#0#6'H'
-  +'eight'#3#199#0#3'Top'#3#154#0#5'Width'#3#3#1#7'Anchors'#11#5'akTop'#6'akLef'
-  +'t'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#10'At'
-  +'tributes'#12'ClientHeight'#3#180#0#11'ClientWidth'#3#255#0#8'TabOrder'#2#7#0
-  +#6'TLabel'#15'ForeGroundLabel'#4'Left'#2#8#6'Height'#2#20#5'Width'#2'n'#7'Ca'
-  +'ption'#6#15'ForeGroundLabel'#11'ParentColor'#8#0#0#12'TColorButton'#21'Fore'
-  +'groundColorButton'#21'AnchorSideTop.Control'#7#15'ForeGroundLabel'#18'Ancho'
-  +'rSideTop.Side'#7#9'asrBottom'#4'Left'#2#8#6'Height'#2#21#3'Top'#2#22#5'Widt'
-  +'h'#2'K'#17'BorderSpacing.Top'#2#2#11'BorderWidth'#2#2#15'ButtonColorSize'#2
-  +#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7#23'ColorButtonColorChanged'
-  +#0#0#12'TColorButton'#21'BackGroundColorButton'#21'AnchorSideTop.Control'#7
-  +#15'BackGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#8#6'Hei'
-  +'ght'#2#21#3'Top'#2'F'#5'Width'#2'K'#17'BorderSpacing.Top'#2#2#11'BorderWidt'
-  +'h'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7
-  +#23'ColorButtonColorChanged'#0#0#6'TLabel'#15'BackGroundLabel'#21'AnchorSide'
-  +'Top.Control'#7#15'ForeGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
-  +'Left'#2#8#6'Height'#2#20#3'Top'#2'0'#5'Width'#2'q'#17'BorderSpacing.Top'#2
-  +#28#7'Caption'#6#15'BackGroundLabel'#11'ParentColor'#8#0#0#9'TCheckBox'#28'F'
-  +'oreGroundUseDefaultCheckBox'#21'AnchorSideTop.Control'#7#15'ForeGroundLabel'
+  +'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#3#0#0#0#5'TPage'#11'Displa'
+  +'yPage'#7'Caption'#6#11'DisplayPage'#11'ClientWidth'#3#221#1#12'ClientHeight'
+  +#3#204#1#0#9'TGroupBox'#23'MarginAndGutterGroupBox'#4'Left'#2#6#6'Height'#3
+  +#128#0#3'Top'#2#6#5'Width'#3#209#1#5'Align'#7#5'alTop'#20'BorderSpacing.Arou'
+  +'nd'#2#6#7'Caption'#6#23'MarginAndGutterGroupBox'#12'ClientHeight'#2'm'#11'C'
+  +'lientWidth'#3#205#1#8'TabOrder'#2#0#0#6'TLabel'#16'RightMarginLabel'#4'Left'
+  +#3'f'#1#6'Height'#2#20#3'Top'#2#10#5'Width'#2'n'#7'Caption'#6#16'RightMargin'
+  +'Label'#11'ParentColor'#8#0#0#12'TColorButton'#22'RightMarginColorButton'#4
+  ,'Left'#3#246#0#6'Height'#2#21#3'Top'#2'$'#5'Width'#2'd'#11'BorderWidth'#2#2
+  +#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7'"Righ'
+  +'tMarginColorButtonColorChanged'#0#0#12'TColorButton'#17'GutterColorButton'#4
+  +'Left'#3#246#0#6'Height'#2#21#3'Top'#2'T'#5'Width'#2'd'#11'BorderWidth'#2#2
+  +#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7#23'Co'
+  +'lorButtonColorChanged'#0#0#6'TLabel'#21'RightMarginColorLabel'#4'Left'#3'f'
+  +#1#6'Height'#2#20#3'Top'#2'"'#5'Width'#3#143#0#7'Caption'#6#21'RightMarginCo'
+  +'lorLabel'#11'ParentColor'#8#0#0#6'TLabel'#16'GutterWidthLabel'#4'Left'#3'f'
+  +#1#6'Height'#2#20#3'Top'#2'<'#5'Width'#2'o'#7'Caption'#6#16'GutterWidthLabel'
+  +#11'ParentColor'#8#0#0#6'TLabel'#16'GutterColorLabel'#4'Left'#3'f'#1#6'Heigh'
+  +'t'#2#20#3'Top'#2'R'#5'Width'#2'm'#7'Caption'#6#16'GutterColorLabel'#11'Pare'
+  +'ntColor'#8#0#0#9'TCheckBox'#26'VisibleRightMarginCheckBox'#4'Left'#2#6#6'He'
+  +'ight'#2#22#3'Top'#2#8#5'Width'#3#203#0#7'Caption'#6#26'VisibleRightMarginCh'
+  +'eckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#9'TCh'
+  +'eckBox'#21'VisibleGutterCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2' '#5
+  +'Width'#3#169#0#7'Caption'#6#21'VisibleGutterCheckBox'#8'OnChange'#7#23'Gene'
+  +'ralCheckBoxOnChange'#8'TabOrder'#2#1#0#0#9'TCheckBox'#23'ShowLineNumbersChe'
+  +'ckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'8'#5'Width'#3#206#0#7'Caption'#6
+  +#23'ShowLineNumbersCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'Tab'
+  +'Order'#2#2#0#0#9'TComboBox'#19'RightMarginComboBox'#4'Left'#3#246#0#6'Heigh'
+  +'t'#2#25#3'Top'#2#8#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineC'
+  +'omplete'#20'cbactSearchAscending'#0#13'Items.Strings'#1#6#2'80'#6#2'78'#6#2
+  +'76'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'Co'
+  +'mboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#3#0#0#9'TC'
+  +'omboBox'#19'GutterWidthComboBox'#4'Left'#3#246#0#6'Height'#2#25#3'Top'#2':'
+  +#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSe'
+  +'archAscending'#0#13'Items.Strings'#1#6#2'40'#6#2'35'#6#2'30'#6#2'25'#6#2'20'
+  +#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboB'
+  +'oxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#4#0#0#0#9'TGro'
+  +'upBox'#18'EditorFontGroupBox'#4'Left'#2#6#6'Height'#3#136#0#3'Top'#3#140#0#5
+  +'Width'#3#209#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#18'EditorFontGroupBox'#12'ClientHeight'#2'u'#11'ClientWidth'#3#205#1#8'TabO'
+  +'rder'#2#1#0#6'TLabel'#15'EditorFontLabel'#4'Left'#2#6#6'Height'#2#20#3'Top'
+  +#2#6#5'Width'#3#193#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'Bord'
+  +'erSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#15'EditorFontLa'
+  +'bel'#11'ParentColor'#8#0#0#6'TLabel'#21'EditorFontHeightLabel'#4'Left'#2't'
+  +#6'Height'#2#20#3'Top'#2'<'#5'Width'#3'B'#1#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'EditorFontHeightL'
+  +'abel'#11'ParentColor'#8#0#0#6'TLabel'#21'ExtraLineSpacingLabel'#4'Left'#2't'
+  +#6'Height'#2#20#3'Top'#2'Z'#5'Width'#3'B'#1#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'ExtraLineSpacingL'
+  +'abel'#11'ParentColor'#8#0#0#9'TComboBox'#18'EditorFontComboBox'#23'AnchorSi'
+  +'deRight.Control'#7#16'EditorFontButton'#4'Left'#2#6#6'Height'#2#25#3'Top'#2
+  +#29#5'Width'#3#148#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCo'
+  +'mpleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20'Bor'
+  +'derSpacing.Around'#2#6#9'MaxLength'#2#0#13'OnEditingDone'#7#29'EditorFontCo'
+  +'mboBoxEditingDone'#8'TabOrder'#2#0#4'Text'#6#18'EditorFontComboBox'#0#0#7'T'
+  +'Button'#16'EditorFontButton'#4'Left'#3#160#1#6'Height'#2#25#3'Top'#2#29#5'W'
+  +'idth'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'
+  +#2#4#7'Caption'#6#3'...'#7'OnClick'#7#21'EditorFontButtonClick'#8'TabOrder'#2
+  +#1#0#0#9'TComboBox'#24'EditorFontHeightComboBox'#4'Left'#2#6#6'Height'#2#25#3
+  +'Top'#2':'#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'
+  +#20'cbactSearchAscending'#0#13'Items.Strings'#1#6#2'10'#6#2'11'#6#2'12'#6#2
+  +'13'#6#2'14'#6#2'15'#6#2'16'#6#2'17'#6#2'18'#0#9'MaxLength'#2#0#8'OnChange'#7
+  +#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'Combo'
+  +'BoxOnKeyDown'#8'TabOrder'#2#2#0#0#9'TComboBox'#24'ExtraLineSpacingComboBox'
+  +#4'Left'#2#6#6'Height'#2#25#3'Top'#2'X'#5'Width'#2'd'#16'AutoCompleteText'#11
+  +#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#13'Items.Strings'#1#6
+  +#1'0'#6#1'1'#6#1'2'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6
+  +'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrde'
+  +'r'#2#3#0#0#0#8'TSynEdit'#14'DisplayPreview'#4'Left'#2#6#6'Height'#3#172#0#3
+  +'Top'#3#26#1#5'Width'#3#209#1#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'
+  +#2#6#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Heigh'
+  +'t'#2#240#9'Font.Name'#6#7'courier'#11'ParentColor'#8#8'TabOrder'#2#2#23'Gut'
+  ,'ter.CodeFoldingWidth'#2#14#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'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'Short'
+  +'Cut'#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'ShortCut'#2#8#0#1#7'Command'#3#245
+  +#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Comman'
+  +'d'#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'ShortC'
+  +'ut'#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'ShortCut'#3'T@'#0#1#7'Comm'
+  +'and'#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'Command'#3'-'#1#8'ShortCu'
+  +'t'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'Sh'
+  +'ortCut'#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'Comman'
+  +'d'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'C'
+  +'ommand'#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'Command'#3'f'#1#8'ShortCu'
+  +'t'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'Sh'
+  +'ortCut'#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'Comma'
+  +'nd'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#14'DisplayPreview'#0
+  +#8'ReadOnly'#9#19'OnSpecialLineColors'#7#19'OnSpecialLineColors'#0#0#0#5'TPa'
+  +'ge'#14'KeymappingPage'#7'Caption'#6#14'KeymappingPage'#11'ClientWidth'#3#221
+  +#1#12'ClientHeight'#3#195#1#0#6'TLabel'#19'KeyMappingHelpLabel'#4'Left'#2#6#6
+  +'Height'#2#20#3'Top'#2'D'#5'Width'#3#209#1#5'Align'#7#5'alTop'#18'BorderSpac'
+  +'ing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Capti'
+  +'on'#6#19'KeyMappingHelpLabel'#11'ParentColor'#8#0#0#7'TButton'#28'KeyMappin'
+  +'gChooseSchemeButton'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#6#5'Width'#3#209#1
+  +#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19
+  +'BorderSpacing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#28
+  +'KeyMappingChooseSchemeButton'#7'OnClick'#7'!KeyMappingChooseSchemeButtonCli'
+  +'ck'#8'TabOrder'#2#0#0#0#7'TButton KeyMappingConsistencyCheckButton'#4'Left'
+  +#2#6#6'Height'#2#25#3'Top'#2'%'#5'Width'#3#209#1#5'Align'#7#5'alTop'#18'Bord'
+  +'erSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#25
+  +'BorderSpacing.InnerBorder'#2#4#7'Caption'#6' KeyMappingConsistencyCheckButt'
+  +'on'#7'OnClick'#7'%KeyMappingConsistencyCheckButtonClick'#8'TabOrder'#2#1#0#0
+  +#9'TTreeView'#18'KeyMappingTreeView'#4'Left'#2#6#6'Height'#3'_'#1#3'Top'#2'^'
+  +#5'Width'#3#209#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#17'Def'
+  +'aultItemHeight'#2#21#6'Images'#7#9'ImageList'#8'ReadOnly'#9#9'RowSelect'#9#8
+  +'TabOrder'#2#2#9'OnMouseUp'#7#25'KeyMappingTreeViewMouseUp'#7'Options'#11#17
+  +'tvoAutoItemHeight'#16'tvoHideSelection'#21'tvoKeepCollapsedNodes'#11'tvoRea'
+  +'dOnly'#12'tvoRowSelect'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'
+  ,#17'tvoShowSeparators'#11'tvoToolTips'#0#0#0#0#5'TPage'#9'ColorPage'#7'Capti'
+  +'on'#6#9'ColorPage'#11'ClientWidth'#3#221#1#12'ClientHeight'#3#204#1#0#6'TLa'
+  +'bel'#13'LanguageLabel'#4'Left'#3#214#0#6'Height'#2#20#3'Top'#2#12#5'Width'#2
+  +'b'#7'Caption'#6#13'LanguageLabel'#11'ParentColor'#8#0#0#6'TLabel'#16'ColorS'
+  +'chemeLabel'#4'Left'#3#214#0#6'Height'#2#20#3'Top'#2'$'#5'Width'#2'y'#7'Capt'
+  +'ion'#6#16'ColorSchemeLabel'#11'ParentColor'#8#0#0#6'TLabel'#19'FileExtensio'
+  +'nsLabel'#4'Left'#3#214#0#6'Height'#2#20#3'Top'#2'<'#5'Width'#2'|'#7'Caption'
+  +#6#19'FileExtensionsLabel'#11'ParentColor'#8#0#0#6'TLabel'#17'ColorElementLa'
+  +'bel'#4'Left'#2#4#6'Height'#2#20#3'Top'#2'Z'#5'Width'#2'y'#7'Caption'#6#17'C'
+  +'olorElementLabel'#11'ParentColor'#8#0#0#9'TComboBox'#16'LanguageComboBox'#4
+  +'Left'#2#3#6'Height'#2#25#3'Top'#2#10#5'Width'#3#200#0#16'AutoCompleteText'
+  +#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8
+  +'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'
+  +#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#0#4'Text'#6#16'LanguageComboBox'#0#0#9
+  +'TComboBox'#19'ColorSchemeComboBox'#4'Left'#2#3#6'Height'#2#25#3'Top'#2'"'#5
+  +'Width'#3#200#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactS'
+  +'earchAscending'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnE'
+  +'xit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2
+  +#1#4'Text'#6#19'ColorSchemeComboBox'#0#0#9'TComboBox'#22'FileExtensionsCombo'
+  +'Box'#4'Left'#2#3#6'Height'#2#25#3'Top'#2':'#5'Width'#3#200#0#16'AutoComplet'
+  +'eText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#13'Items.St'
+  +'rings'#1#6#26'pp;pas;inc;lpr;lrs;dpr;dpk'#6#18'pp;pas;inc;lpr;lrs'#6#10'pp;'
+  +'pas;inc'#0#9'MaxLength'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7
+  +#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0
+  +#8'TSynEdit'#12'ColorPreview'#4'Left'#2#4#6'Height'#2'a'#3'Top'#3'g'#1#5'Wid'
+  +'th'#3#213#1#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#4#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#11'Font.Height'#2#240#9'Font'
+  +'.Name'#6#7'courier'#11'ParentColor'#8#8'TabOrder'#2#3#11'OnMouseDown'#7#19
+  +'ColorPreviewMouseUp'#23'Gutter.CodeFoldingWidth'#2#14#10'Keystrokes'#14#1#7
+  +'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'C'
+  +'ommand'#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#12
+  +'ColorPreview'#0#8'ReadOnly'#9#19'OnSpecialLineColors'#7#19'OnSpecialLineCol'
+  +'ors'#0#0#8'TListBox'#19'ColorElementListBox'#4'Left'#2#3#6'Height'#3#242#0#3
+  +'Top'#2'l'#5'Width'#3#200#0#17'OnSelectionChange'#7'"ColorElementListBoxSele'
+  +'ctionChange'#8'TabOrder'#2#4#8'TopIndex'#2#255#0#0#7'TButton'#27'SetAttribu'
+  +'teToDefaultButton'#23'AnchorSideRight.Control'#7#9'ColorPage'#20'AnchorSide'
+  +'Right.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#25#3'Top'#2'Z'#5'Wid'
+  +'th'#3#3#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Ar'
+  +'ound'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#27'SetAttributeToD'
+  +'efaultButton'#7'OnClick'#7' SetAttributeToDefaultButtonClick'#8'TabOrder'#2
+  +#5#0#0#7'TButton'#31'SetAllAttributesToDefaultButton'#23'AnchorSideRight.Con'
+  +'trol'#7#9'ColorPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#212#0
+  +#6'Height'#2#25#3'Top'#2'z'#5'Width'#3#3#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#0#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7
+  +'Caption'#6#31'SetAllAttributesToDefaultButton'#7'OnClick'#7'$SetAllAttribut'
+  +'esToDefaultButtonClick'#8'TabOrder'#2#6#0#0#9'TGroupBox'#22'TextAttributesG'
+  +'roupBox'#23'AnchorSideRight.Control'#7#9'ColorPage'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'ColorPreview'#4'Left'#3#212
+  +#0#6'Height'#3#199#0#3'Top'#3#154#0#5'Width'#3#3#1#7'Anchors'#11#5'akTop'#6
+  +'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#10'Attributes'#12'ClientHeight'#3#180#0#11'ClientWidth'#3#255#0#8'TabOrder'
+  +#2#7#0#6'TLabel'#15'ForeGroundLabel'#4'Left'#2#8#6'Height'#2#20#5'Width'#2'n'
+  +#7'Caption'#6#15'ForeGroundLabel'#11'ParentColor'#8#0#0#12'TColorButton'#21
+  +'ForegroundColorButton'#21'AnchorSideTop.Control'#7#15'ForeGroundLabel'#18'A'
+  +'nchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#8#6'Height'#2#21#3'Top'#2#22#5
+  +'Width'#2'K'#17'BorderSpacing.Top'#2#2#11'BorderWidth'#2#2#15'ButtonColorSiz'
+  +'e'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7#23'ColorButtonColorCha'
+  +'nged'#0#0#12'TColorButton'#21'BackGroundColorButton'#21'AnchorSideTop.Contr'
+  +'ol'#7#15'BackGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#8
+  +#6'Height'#2#21#3'Top'#2'F'#5'Width'#2'K'#17'BorderSpacing.Top'#2#2#11'Borde'
+  +'rWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChan'
+  +'ged'#7#23'ColorButtonColorChanged'#0#0#6'TLabel'#15'BackGroundLabel'#21'Anc'
+  +'horSideTop.Control'#7#15'ForeGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBot'
+  +'tom'#4'Left'#2#8#6'Height'#2#20#3'Top'#2'0'#5'Width'#2'q'#17'BorderSpacing.'
+  +'Top'#2#28#7'Caption'#6#15'BackGroundLabel'#11'ParentColor'#8#0#0#9'TCheckBo'
+  +'x'#28'ForeGroundUseDefaultCheckBox'#21'AnchorSideTop.Control'#7#15'ForeGrou'
+  +'ndLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'^'#6'Height'#2#22#3
+  +'Top'#2#22#5'Width'#3#128#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17
+  +'BorderSpacing.Top'#2#2#7'Caption'#6#28'ForeGroundUseDefaultCheckBox'#8'OnCh'
+  +'ange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#9'TCheckBox'#28'Bac'
+  +'kGroundUseDefaultCheckBox'#21'AnchorSideTop.Control'#7#15'BackGroundLabel'
   +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'^'#6'Height'#2#22#3'Top'#2
-  +#22#5'Width'#3#128#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'Border'
-  +'Spacing.Top'#2#2#7'Caption'#6#28'ForeGroundUseDefaultCheckBox'#8'OnChange'#7
-  +#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#9'TCheckBox'#28'BackGroundU'
-  +'seDefaultCheckBox'#21'AnchorSideTop.Control'#7#15'BackGroundLabel'#18'Ancho'
-  +'rSideTop.Side'#7#9'asrBottom'#4'Left'#2'^'#6'Height'#2#22#3'Top'#2'D'#5'Wid'
-  +'th'#3#128#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.'
-  +'Right'#2#2#7'Caption'#6#28'BackGroundUseDefaultCheckBox'#8'OnChange'#7#23'G'
-  +'eneralCheckBoxOnChange'#8'TabOrder'#2#1#0#0#9'TCheckBox'#16'TextBoldCheckBo'
-  +'x'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'`'#5'Width'#3#243#0#5'Align'#7#8'alB'
-  +'ottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'TextBoldCheckBox'#8'OnC'
-  +'hange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#2#0#0#9'TCheckBox'#18'Te'
-  +'xtItalicCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'|'#5'Width'#3#243#0#5
-  +'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'TextItali'
-  +'cCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#3#0#0#9
+  +'D'#5'Width'#3#128#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'Border'
+  +'Spacing.Right'#2#2#7'Caption'#6#28'BackGroundUseDefaultCheckBox'#8'OnChange'
+  +#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#1#0#0#9'TCheckBox'#16'TextBoldC'
+  +'heckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'`'#5'Width'#3#243#0#5'Align'#7
+  +#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'TextBoldCheckBox'#8
+  +'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#2#0#0#9'TCheckBox'#18
+  +'TextItalicCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'|'#5'Width'#3#243#0
+  +#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'TextIta'
+  +'licCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#3#0#0#9
   +'TCheckBox'#21'TextUnderlineCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#152
   +#0#5'Width'#3#243#0#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Ca'
   +'ption'#6#21'TextUnderlineCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'
   +#8'TabOrder'#2#4#0#0#0#0#5'TPage'#13'CodetoolsPage'#7'Caption'#6#13'Codetool'
   +'sPage'#11'ClientWidth'#3#221#1#12'ClientHeight'#3#204#1#0#9'TGroupBox'#25'A'
-  ,'utomaticFeaturesGroupBox'#4'Left'#2#6#6'Height'#3#192#1#3'Top'#2#6#5'Width'
+  +'utomaticFeaturesGroupBox'#4'Left'#2#6#6'Height'#3#192#1#3'Top'#2#6#5'Width'
   +#3#209#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7'Caption'#6#25
-  +'AutomaticFeaturesGroupBox'#12'ClientHeight'#3#173#1#11'ClientWidth'#3#205#1
+  ,'AutomaticFeaturesGroupBox'#12'ClientHeight'#3#173#1#11'ClientWidth'#3#205#1
   +#8'TabOrder'#2#0#0#6'TLabel'#14'AutoDelayLabel'#4'Left'#2#6#6'Height'#2#20#3
   +'Top'#3#188#0#5'Width'#3#193#1#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#24
   +#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'AutoDelayLabel'#11'ParentColor'
@@ -360,20 +358,19 @@ LazarusResources.Add('TEditorOptionsForm','FORMDATA',[
   +#6#21'chkCodeFoldingEnabled'#8'OnChange'#7#27'chkCodeFoldingEnabledChange'#8
   +'TabOrder'#2#0#0#0#9'TSpinEdit'#18'edDividerDrawLevel'#4'Left'#3#211#0#6'Hei'
   +'ght'#2#23#3'Top'#2'B'#5'Width'#2'2'#8'MaxValue'#2#10#8'MinValue'#2#1#8'TabO'
-  +'rder'#2#1#5'Value'#2#1#0#0#0#0#7'TButton'#12'CancelButton'#23'AnchorSideRig'
-  +'ht.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSid'
-  +'eBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'
-  +#3'q'#1#6'Height'#2#25#3'Top'#3#244#1#5'Width'#2'j'#7'Anchors'#11#7'akRight'
-  +#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.I'
-  +'nnerBorder'#2#4#7'Caption'#6#12'CancelButton'#21'Constraints.MaxHeight'#2#25
-  +#20'Constraints.MinWidth'#2'K'#7'OnClick'#7#17'CancelButtonClick'#8'TabOrder'
-  +#2#1#0#0#7'TButton'#8'OkButton'#23'AnchorSideRight.Control'#7#12'CancelButto'
-  +'n'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'as'
-  +'rBottom'#4'Left'#3')'#1#6'Height'#2#25#3'Top'#3#244#1#5'Width'#2'P'#7'Ancho'
-  +'rs'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6
-  +#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#8'OkButton'#21'Constraints.M'
-  +'axHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'OnClick'#7#13'OkButtonClick'
-  +#8'TabOrder'#2#2#0#0#10'TImageList'#9'ImageList'#6'Height'#2#21#5'Width'#2#21
+  +'rder'#2#1#5'Value'#2#1#0#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'+'#3'Top'#3
+  +#232#1#5'Width'#3#225#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7
+  +#6'bvNone'#12'ClientHeight'#2'+'#11'ClientWidth'#3#225#1#8'TabOrder'#2#1#0#7
+  +'TButton'#8'OkButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#27#1
+  +#6'Height'#2#31#3'Top'#2#6#5'Width'#2'P'#5'Align'#7#7'alRight'#8'AutoSize'#9
+  +#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6
+  +#8'OkButton'#20'Constraints.MinWidth'#2'K'#7'OnClick'#7#13'OkButtonClick'#8
+  +'TabOrder'#2#0#0#0#7'TButton'#12'CancelButton'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'q'#1#6'Height'
+  +#2#31#3'Top'#2#6#5'Width'#2'j'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Border'
+  +'Spacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#12'Cance'
+  +'lButton'#20'Constraints.MinWidth'#2'K'#7'OnClick'#7#17'CancelButtonClick'#8
+  +'TabOrder'#2#1#0#0#0#10'TImageList'#9'ImageList'#6'Height'#2#21#5'Width'#2#21
   +#4'left'#3#144#1#3'top'#2'('#6'Bitmap'#10#214#13#0#0'Li'#2#0#0#0#21#0#0#0#21
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
@@ -385,10 +382,10 @@ LazarusResources.Add('TEditorOptionsForm','FORMDATA',[
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'HNK'#255#139#145#141#255#168#174
-  ,#170#255#194#199#195#255#209#214#210#255#161#164#161#255#0#0#0#0#0#0#0#0#0#0
+  +#170#255#194#199#195#255#209#214#210#255#161#164#161#255#0#0#0#0#0#0#0#0#0#0
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
   +#0#0#0#0#0#0#0#0'z'#133#128#255#176#186#181#255#141#147#144#255#153#156#154
-  +#255#147#148#147#255#188#192#188#255#229#234#230#255#174#178#176#255'KNN'#255
+  ,#255#147#148#147#255#188#192#188#255#229#234#230#255#174#178#176#255'KNN'#255
   +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
   +#0#0#0#0#0#0#170#177#173#255#168#177#173#255#189#196#192#255#140#144#141#255
   +#139#141#139#255#151#154#151#255#228#231#228#255#146#151#149#255'BIF'#255':@'
@@ -449,10 +446,10 @@ LazarusResources.Add('TEditorOptionsForm','FORMDATA',[
   +#246#255#246#246#246#255#238#238#238#255#230#230#230#255#230#230#230#255#230
   +#230#230#255#231#231#231#255#232#232#232#255#230#230#230#255#229#229#229#255
   +#228#228#228#255#226#226#226#255#222#222#222#255#204#204#204#255#184#184#184
-  ,#255'yyy'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#165#165#165#255#249#249#249#255
+  +#255'yyy'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#165#165#165#255#249#249#249#255
   +#246#246#246#255#217#217#217#255#215#215#215#255#219#219#219#255#222#222#222
   +#255#225#225#225#255#228#228#228#255#230#230#230#255#233#233#233#255#235#235
-  +#235#255#237#237#237#255#239#239#239#255#205#205#205#255#178#178#178#255'ttt'
+  ,#235#255#237#237#237#255#239#239#239#255#205#205#205#255#178#178#178#255'ttt'
   +#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#164#164#164#255#247#247#247#255#245#245
   +#245#255#216#216#216#255#218#218#218#255#222#222#222#255#225#225#225#255#228
   +#228#228#255#230#230#230#255#233#233#233#255#235#235#235#255#237#237#237#255
diff --git a/ide/editoroptions.pp b/ide/editoroptions.pp
index 09ebc0704d..f2d07fa569 100644
--- a/ide/editoroptions.pp
+++ b/ide/editoroptions.pp
@@ -355,6 +355,7 @@ type
     BlockIndentComboBox: TComboBox;
     BlockIndentLabel: TLabel;
     CodeFolding: TPage;
+    BtnPanel: TPanel;
     UndoLimitComboBox: TComboBox;
     UndoLimitLabel: TLabel;
     TabWidthsComboBox: TComboBox;
diff --git a/ide/environmentopts.lfm b/ide/environmentopts.lfm
index 9721f260b8..7ec809096f 100644
--- a/ide/environmentopts.lfm
+++ b/ide/environmentopts.lfm
@@ -1,28 +1,29 @@
 object EnvironmentOptionsDialog: TEnvironmentOptionsDialog
-  Left = 314
+  Left = 316
   Height = 522
-  Top = 124
+  Top = 174
   Width = 542
   HorzScrollBar.Page = 541
   VertScrollBar.Page = 521
-  ActiveControl = CancelButton
+  ActiveControl = HideIDEOnRunCheckBox
   Caption = 'EnvironmentOptionsDialog'
   ClientHeight = 522
   ClientWidth = 542
   OnResize = FormResize
   Position = poScreenCenter
   object Notebook: TNotebook
+    AnchorSideBottom.Control = EODBtnPanel
     Height = 479
     Width = 542
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
     OnChangeBounds = NotebookChangeBounds
-    PageIndex = 0
+    PageIndex = 2
     TabOrder = 0
     object FilesPage: TPage
       Caption = 'FilesPage'
       ClientWidth = 538
-      ClientHeight = 448
+      ClientHeight = 453
       object MaxRecentOpenFilesLabel: TLabel
         Left = 62
         Height = 20
@@ -324,7 +325,7 @@ object EnvironmentOptionsDialog: TEnvironmentOptionsDialog
     object DesktopPage: TPage
       Caption = 'DesktopPage'
       ClientWidth = 538
-      ClientHeight = 448
+      ClientHeight = 453
       object LanguageGroupBox: TGroupBox
         AnchorSideRight.Control = DesktopPage
         AnchorSideRight.Side = asrBottom
@@ -557,7 +558,7 @@ object EnvironmentOptionsDialog: TEnvironmentOptionsDialog
     object FormEditorPage: TPage
       Caption = 'FormEditorPage'
       ClientWidth = 538
-      ClientHeight = 448
+      ClientHeight = 453
       OnResize = FormEditorPageResize
       object GridGroupBox: TGroupBox
         Left = 6
@@ -1034,7 +1035,7 @@ object EnvironmentOptionsDialog: TEnvironmentOptionsDialog
     object ObjectInspectorPage: TPage
       Caption = 'ObjectInspectorPage'
       ClientWidth = 538
-      ClientHeight = 448
+      ClientHeight = 453
       object ObjectInspectorColorsGroupBox: TGroupBox
         AnchorSideRight.Control = ObjectInspectorPage
         AnchorSideRight.Side = asrBottom
@@ -1208,7 +1209,7 @@ object EnvironmentOptionsDialog: TEnvironmentOptionsDialog
     object BackupPage: TPage
       Caption = 'BackupPage'
       ClientWidth = 538
-      ClientHeight = 448
+      ClientHeight = 453
       object BackupHelpLabel: TLabel
         AnchorSideRight.Control = BackupPage
         AnchorSideRight.Side = asrBottom
@@ -1453,7 +1454,7 @@ object EnvironmentOptionsDialog: TEnvironmentOptionsDialog
     object NamingPage: TPage
       Caption = 'NamingPage'
       ClientWidth = 538
-      ClientHeight = 448
+      ClientHeight = 453
       object PascalFileExtRadiogroup: TRadioGroup
         AnchorSideRight.Control = NamingPage
         AnchorSideRight.Side = asrBottom
@@ -1524,7 +1525,7 @@ object EnvironmentOptionsDialog: TEnvironmentOptionsDialog
     object LazDocPage: TPage
       Caption = 'LazDocPage'
       ClientWidth = 538
-      ClientHeight = 448
+      ClientHeight = 453
       object LazDocPathsGroupBox: TGroupBox
         AnchorSideRight.Control = LazDocPage
         AnchorSideRight.Side = asrBottom
@@ -1616,44 +1617,49 @@ object EnvironmentOptionsDialog: TEnvironmentOptionsDialog
       end
     end
   end
-  object CancelButton: TButton
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 430
-    Height = 25
-    Top = 491
-    Width = 106
-    Anchors = [akRight, akBottom]
+  object EODBtnPanel: TPanel
+    Height = 43
+    Top = 479
+    Width = 542
+    Align = alBottom
     AutoSize = True
-    BorderSpacing.Around = 6
-    BorderSpacing.InnerBorder = 4
-    Cancel = True
-    Caption = 'CancelButton'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    OnClick = CancelButtonClick
+    BevelOuter = bvNone
+    ClientHeight = 43
+    ClientWidth = 542
     TabOrder = 1
-  end
-  object OkButton: TButton
-    AnchorSideRight.Control = CancelButton
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 349
-    Height = 25
-    Top = 491
-    Width = 75
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Around = 6
-    BorderSpacing.InnerBorder = 4
-    Caption = 'Ok'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    Default = True
-    OnClick = OkButtonClick
-    TabOrder = 2
+    object OkButton: TButton
+      AnchorSideBottom.Side = asrBottom
+      Left = 349
+      Height = 31
+      Top = 6
+      Width = 75
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      BorderSpacing.InnerBorder = 4
+      Caption = 'Ok'
+      Constraints.MinWidth = 75
+      Default = True
+      OnClick = OkButtonClick
+      TabOrder = 0
+    end
+    object CancelButton: TButton
+      AnchorSideRight.Side = asrBottom
+      AnchorSideBottom.Side = asrBottom
+      Left = 430
+      Height = 31
+      Top = 6
+      Width = 106
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      BorderSpacing.InnerBorder = 4
+      Cancel = True
+      Caption = 'CancelButton'
+      Constraints.MinWidth = 75
+      OnClick = CancelButtonClick
+      TabOrder = 1
+    end
   end
   object SelectDirectoryDialog: TSelectDirectoryDialog
     Title = 'Select Directory'
diff --git a/ide/environmentopts.lrs b/ide/environmentopts.lrs
index 4060c07f2d..264444dc24 100644
--- a/ide/environmentopts.lrs
+++ b/ide/environmentopts.lrs
@@ -1,5 +1,601 @@
 { This is an automatically generated lazarus resource file }
 
+LazarusResources.Add('TEnvironmentOptionsDialog','FORMDATA',[
+  'TPF0'#25'TEnvironmentOptionsDialog'#24'EnvironmentOptionsDialog'#4'Left'#3'<'
+  +#1#6'Height'#3#10#2#3'Top'#3#174#0#5'Width'#3#30#2#18'HorzScrollBar.Page'#3
+  +#29#2#18'VertScrollBar.Page'#3#9#2#13'ActiveControl'#7#20'HideIDEOnRunCheckB'
+  +'ox'#7'Caption'#6#24'EnvironmentOptionsDialog'#12'ClientHeight'#3#10#2#11'Cl'
+  +'ientWidth'#3#30#2#8'OnResize'#7#10'FormResize'#8'Position'#7#14'poScreenCen'
+  +'ter'#0#9'TNotebook'#8'Notebook'#24'AnchorSideBottom.Control'#7#11'EODBtnPan'
+  +'el'#6'Height'#3#223#1#5'Width'#3#30#2#5'Align'#7#5'alTop'#7'Anchors'#11#5'a'
+  +'kTop'#6'akLeft'#7'akRight'#8'akBottom'#0#14'OnChangeBounds'#7#20'NotebookCh'
+  +'angeBounds'#9'PageIndex'#2#2#8'TabOrder'#2#0#0#5'TPage'#9'FilesPage'#7'Capt'
+  +'ion'#6#9'FilesPage'#11'ClientWidth'#3#26#2#12'ClientHeight'#3#197#1#0#6'TLa'
+  +'bel'#23'MaxRecentOpenFilesLabel'#4'Left'#2'>'#6'Height'#2#20#3'Top'#2#235#5
+  +'Width'#3#165#0#7'Caption'#6#23'MaxRecentOpenFilesLabel'#11'ParentColor'#8#0
+  +#0#6'TLabel'#26'MaxRecentProjectFilesLabel'#4'Left'#2#6#6'Height'#2#20#3'Top'
+  +#2':'#5'Width'#3#175#0#7'Caption'#6#26'MaxRecentProjectFilesLabel'#11'Parent'
+  +'Color'#8#0#0#9'TComboBox'#26'MaxRecentOpenFilesComboBox'#23'AnchorSideRight'
+  +'.Control'#7#9'FilesPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6
+  +#6'Height'#2#25#3'Top'#2#26#5'Width'#3#14#2#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSea'
+  +'rchAscending'#0#19'BorderSpacing.Right'#2#6#13'Items.Strings'#1#6#1'5'#6#2
+  +'10'#6#2'15'#6#2'20'#6#2'25'#6#2'30'#0#9'MaxLength'#2#0#8'TabOrder'#2#0#0#0#9
+  +'TComboBox'#29'MaxRecentProjectFilesComboBox'#23'AnchorSideRight.Control'#7#9
+  +'FilesPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#25#3'Top'#2'J'#5'Width'#3#14#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'
+  +#0#19'BorderSpacing.Right'#2#6#13'Items.Strings'#1#6#1'5'#6#2'10'#6#2'15'#6#2
+  +'20'#6#2'25'#6#2'30'#0#9'MaxLength'#2#0#8'TabOrder'#2#1#0#0#9'TCheckBox'#30
+  +'OpenLastProjectAtStartCheckBox'#23'AnchorSideRight.Control'#7#9'FilesPage'
+  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2
+  +'j'#5'Width'#3#14#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderS'
+  +'pacing.Right'#2#6#7'Caption'#6#30'OpenLastProjectAtStartCheckBox'#8'TabOrde'
+  +'r'#2#2#0#0#9'TGroupBox'#18'LazarusDirGroupBox'#23'AnchorSideRight.Control'#7
+  +#9'FilesPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +'6'#3'Top'#3#142#0#5'Width'#3#14#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
+  +'t'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#18'LazarusDirGroupBox'#12'Cli'
+  +'entHeight'#2'#'#11'ClientWidth'#3#10#2#8'TabOrder'#2#3#0#9'TComboBox'#18'La'
+  +'zarusDirComboBox'#22'AnchorSideLeft.Control'#7#18'LazarusDirGroupBox'#23'An'
+  +'chorSideRight.Control'#7#16'LazarusDirButton'#4'Left'#2#6#6'Height'#2#25#3
+  +'Top'#2#3#5'Width'#3#229#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16
+  +'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0
+  +#18'BorderSpacing.Left'#2#6#9'MaxLength'#2#0#8'TabOrder'#2#0#4'Text'#6#18'La'
+  +'zarusDirComboBox'#0#0#7'TButton'#16'LazarusDirButton'#22'AnchorSideLeft.Con'
+  +'trol'#7#18'LazarusDirGroupBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'An'
+  +'chorSideTop.Control'#7#18'LazarusDirComboBox'#23'AnchorSideRight.Control'#7
+  +#18'LazarusDirGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSid'
+  +'eBottom.Control'#7#18'LazarusDirComboBox'#21'AnchorSideBottom.Side'#7#9'asr'
+  +'Bottom'#4'Left'#3#235#1#6'Height'#2#25#3'Top'#2#3#5'Width'#2#25#7'Anchors'
+  +#11#5'akTop'#7'akRight'#8'akBottom'#0#19'BorderSpacing.Right'#2#6#25'BorderS'
+  +'pacing.InnerBorder'#2#4#7'Caption'#6#3'...'#7'OnClick'#7#22'DirectoriesButt'
+  +'onClick'#8'TabOrder'#2#1#0#0#0#9'TGroupBox'#20'CompilerPathGroupBox'#23'Anc'
+  +'horSideRight.Control'#7#9'FilesPage'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#4'Left'#2#6#6'Height'#2'6'#3'Top'#3#197#0#5'Width'#3#14#2#7'Anchors'#11#5'a'
+  +'kTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#20'Co'
+  +'mpilerPathGroupBox'#12'ClientHeight'#2'#'#11'ClientWidth'#3#10#2#8'TabOrder'
+  +#2#4#0#9'TComboBox'#20'CompilerPathComboBox'#22'AnchorSideLeft.Control'#7#20
+  +'CompilerPathGroupBox'#23'AnchorSideRight.Control'#7#18'CompilerPathButton'#4
+  +'Left'#2#6#6'Height'#2#25#3'Top'#2#3#5'Width'#3#229#1#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20
+  +'cbactSearchAscending'#0#18'BorderSpacing.Left'#2#6#9'MaxLength'#2#0#8'TabOr'
+  +'der'#2#0#4'Text'#6#20'CompilerPathComboBox'#0#0#7'TButton'#18'CompilerPathB'
+  +'utton'#21'AnchorSideTop.Control'#7#20'CompilerPathComboBox'#23'AnchorSideRi'
+  +'ght.Control'#7#20'CompilerPathGroupBox'#20'AnchorSideRight.Side'#7#9'asrBot'
+  +'tom'#24'AnchorSideBottom.Control'#7#20'CompilerPathComboBox'#21'AnchorSideB'
+  +'ottom.Side'#7#9'asrBottom'#4'Left'#3#235#1#6'Height'#2#25#3'Top'#2#3#5'Widt'
+  +'h'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#19'BorderSpacing.Ri'
+  ,'ght'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'...'#7'OnClick'#7
+  +#16'FilesButtonClick'#8'TabOrder'#2#1#0#0#0#9'TGroupBox'#20'FPCSourceDirGrou'
+  +'pBox'#23'AnchorSideRight.Control'#7#9'FilesPage'#20'AnchorSideRight.Side'#7
+  +#9'asrBottom'#4'Left'#2#6#6'Height'#2'6'#3'Top'#3#252#0#5'Width'#3#14#2#7'An'
+  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7'Cap'
+  +'tion'#6#20'FPCSourceDirGroupBox'#12'ClientHeight'#2'#'#11'ClientWidth'#3#10
+  +#2#8'TabOrder'#2#5#0#9'TComboBox'#20'FPCSourceDirComboBox'#22'AnchorSideLeft'
+  +'.Control'#7#20'FPCSourceDirGroupBox'#23'AnchorSideRight.Control'#7#18'FPCSo'
+  +'urceDirButton'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#3#5'Width'#3#229#1#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEn'
+  +'dOfLineComplete'#20'cbactSearchAscending'#0#18'BorderSpacing.Left'#2#6#9'Ma'
+  +'xLength'#2#0#8'TabOrder'#2#0#4'Text'#6#20'FPCSourceDirComboBox'#0#0#7'TButt'
+  +'on'#18'FPCSourceDirButton'#21'AnchorSideTop.Control'#7#20'FPCSourceDirCombo'
+  +'Box'#23'AnchorSideRight.Control'#7#20'FPCSourceDirGroupBox'#20'AnchorSideRi'
+  +'ght.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#20'FPCSourceDirComb'
+  +'oBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#235#1#6'Height'#2
+  +#25#3'Top'#2#3#5'Width'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0
+  +#19'BorderSpacing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3
+  +'...'#7'OnClick'#7#22'DirectoriesButtonClick'#8'TabOrder'#2#1#0#0#0#9'TGroup'
+  +'Box'#16'MakePathGroupBox'#23'AnchorSideRight.Control'#7#9'FilesPage'#20'Anc'
+  +'horSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'6'#3'Top'#3'3'#1#5
+  +'Width'#3#14#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacin'
+  +'g.Right'#2#6#7'Caption'#6#16'MakePathGroupBox'#12'ClientHeight'#2'#'#11'Cli'
+  +'entWidth'#3#10#2#8'TabOrder'#2#6#0#9'TComboBox'#16'MakePathComboBox'#22'Anc'
+  +'horSideLeft.Control'#7#16'MakePathGroupBox'#23'AnchorSideRight.Control'#7#14
+  +'MakePathButton'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#3#5'Width'#3#229#1#7'An'
+  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactE'
+  +'ndOfLineComplete'#20'cbactSearchAscending'#0#18'BorderSpacing.Left'#2#6#9'M'
+  +'axLength'#2#0#8'TabOrder'#2#0#4'Text'#6#16'MakePathComboBox'#0#0#7'TButton'
+  +#14'MakePathButton'#21'AnchorSideTop.Control'#7#16'MakePathComboBox'#23'Anch'
+  +'orSideRight.Control'#7#16'MakePathGroupBox'#20'AnchorSideRight.Side'#7#9'as'
+  +'rBottom'#24'AnchorSideBottom.Control'#7#16'MakePathComboBox'#21'AnchorSideB'
+  +'ottom.Side'#7#9'asrBottom'#4'Left'#3#235#1#6'Height'#2#25#3'Top'#2#3#5'Widt'
+  +'h'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#19'BorderSpacing.Ri'
+  +'ght'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'...'#7'OnClick'#7
+  +#16'FilesButtonClick'#8'TabOrder'#2#1#0#0#0#9'TGroupBox'#20'TestBuildDirGrou'
+  +'pBox'#23'AnchorSideRight.Control'#7#9'FilesPage'#20'AnchorSideRight.Side'#7
+  +#9'asrBottom'#4'Left'#2#6#6'Height'#2'6'#3'Top'#3'j'#1#5'Width'#3#14#2#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7'Capt'
+  +'ion'#6#20'TestBuildDirGroupBox'#12'ClientHeight'#2'#'#11'ClientWidth'#3#10#2
+  +#8'TabOrder'#2#7#0#9'TComboBox'#20'TestBuildDirComboBox'#22'AnchorSideLeft.C'
+  +'ontrol'#7#20'TestBuildDirGroupBox'#23'AnchorSideRight.Control'#7#18'TestBui'
+  +'ldDirButton'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#3#5'Width'#3#229#1#7'Ancho'
+  +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndO'
+  +'fLineComplete'#20'cbactSearchAscending'#0#18'BorderSpacing.Left'#2#6#9'MaxL'
+  +'ength'#2#0#8'TabOrder'#2#0#4'Text'#6#20'TestBuildDirComboBox'#0#0#7'TButton'
+  +#18'TestBuildDirButton'#21'AnchorSideTop.Control'#7#20'TestBuildDirComboBox'
+  +#23'AnchorSideRight.Control'#7#20'TestBuildDirGroupBox'#20'AnchorSideRight.S'
+  +'ide'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#20'TestBuildDirComboBox'
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#235#1#6'Height'#2#25#3'T'
+  +'op'#2#3#5'Width'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#19'Bo'
+  +'rderSpacing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'...'
+  +#7'OnClick'#7#22'DirectoriesButtonClick'#8'TabOrder'#2#1#0#0#0#0#5'TPage'#11
+  +'DesktopPage'#7'Caption'#6#11'DesktopPage'#11'ClientWidth'#3#26#2#12'ClientH'
+  +'eight'#3#197#1#0#9'TGroupBox'#16'LanguageGroupBox'#23'AnchorSideRight.Contr'
+  +'ol'#7#11'DesktopPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#4#6
+  +'Height'#2'8'#3'Top'#2#10#5'Width'#3#16#2#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#16'LanguageGroupBox'#12
+  +'ClientHeight'#2'%'#11'ClientWidth'#3#12#2#8'TabOrder'#2#0#0#9'TComboBox'#16
+  +'LanguageComboBox'#22'AnchorSideLeft.Control'#7#16'LanguageGroupBox'#23'Anch'
+  +'orSideRight.Control'#7#16'LanguageGroupBox'#20'AnchorSideRight.Side'#7#9'as'
+  +'rBottom'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#8#5'Width'#3#0#2#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineCo'
+  +'mplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Around'#2#6#9'MaxLength'
+  ,#2#0#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#0#0#0#0#9'TCheckBox#CheckDi'
+  +'skChangesWithLoadingCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#3'@'#1#5'Wi'
+  +'dth'#3#30#1#7'Caption'#6'#CheckDiskChangesWithLoadingCheckBox'#8'TabOrder'#2
+  +#1#0#0#9'TCheckBox$ShowHintsForComponentPaletteCheckBox'#4'Left'#2#6#6'Heigh'
+  +'t'#2#22#3'Top'#3'V'#1#5'Width'#3'%'#1#7'Caption'#6'$ShowHintsForComponentPa'
+  +'letteCheckBox'#8'TabOrder'#2#2#0#0#9'TGroupBox'#16'AutoSaveGroupBox'#23'Anc'
+  +'horSideRight.Control'#7#11'DesktopPage'#20'AnchorSideRight.Side'#7#9'asrBot'
+  +'tom'#4'Left'#2#4#6'Height'#3#136#0#3'Top'#2'J'#5'Width'#3#16#2#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#16
+  +'AutoSaveGroupBox'#12'ClientHeight'#2'u'#11'ClientWidth'#3#12#2#8'TabOrder'#2
+  +#6#0#6'TLabel'#27'AutoSaveIntervalInSecsLabel'#4'Left'#2#6#6'Height'#2#20#3
+  +'Top'#2'C'#5'Width'#3#213#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7
+  +'Caption'#6#27'AutoSaveIntervalInSecsLabel'#7'Enabled'#8#11'ParentColor'#8#0
+  +#0#9'TCheckBox'#27'AutoSaveEditorFilesCheckBox'#4'Left'#2#6#6'Height'#2#22#3
+  +'Top'#2#4#5'Width'#3#222#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'C'
+  +'aption'#6#27'AutoSaveEditorFilesCheckBox'#7'Enabled'#8#8'TabOrder'#2#0#0#0#9
+  +'TCheckBox'#23'AutoSaveProjectCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2
+  +#30#5'Width'#3#222#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'
+  +#6#23'AutoSaveProjectCheckBox'#7'Enabled'#8#8'TabOrder'#2#1#0#0#9'TComboBox'
+  +#30'AutoSaveIntervalInSecsComboBox'#22'AnchorSideLeft.Control'#7#16'AutoSave'
+  +'GroupBox'#23'AnchorSideRight.Control'#7#16'AutoSaveGroupBox'#20'AnchorSideR'
+  +'ight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'W'#5'Width'#3
+  +#0#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22
+  +'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#20'BorderSpacing.Around'
+  +#2#6#7'Enabled'#8#13'Items.Strings'#1#6#4'1200'#6#3'600'#6#3'300'#6#3'120'#0
+  +#9'MaxLength'#2#0#8'TabOrder'#2#2#0#0#0#9'TGroupBox'#20'DesktopFilesGroupBox'
+  +#23'AnchorSideRight.Control'#7#11'DesktopPage'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#2#4#6'Height'#2'a'#3'Top'#3#218#0#5'Width'#3#16#2#7'Anch'
+  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7'Capti'
+  +'on'#6#20'DesktopFilesGroupBox'#12'ClientHeight'#2'N'#11'ClientWidth'#3#12#2
+  +#8'TabOrder'#2#3#0#7'TButton'#31'SaveDesktopSettingsToFileButton'#22'AnchorS'
+  +'ideLeft.Control'#7#20'DesktopFilesGroupBox'#23'AnchorSideRight.Control'#7#20
+  +'DesktopFilesGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6
+  +'Height'#2#25#3'Top'#2#8#5'Width'#3#0#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'a'
+  +'kRight'#0#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7
+  +'Caption'#6#31'SaveDesktopSettingsToFileButton'#7'OnClick'#7'$SaveDesktopSet'
+  +'tingsToFileButtonClick'#8'TabOrder'#2#0#0#0#7'TButton!LoadDesktopSettingsFr'
+  +'omFileButton'#22'AnchorSideLeft.Control'#7#20'DesktopFilesGroupBox'#23'Anch'
+  +'orSideRight.Control'#7#20'DesktopFilesGroupBox'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'+'#5'Width'#3#0#2#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#25'BorderSp'
+  +'acing.InnerBorder'#2#4#7'Caption'#6'!LoadDesktopSettingsFromFileButton'#7'O'
+  +'nClick'#7'&LoadDesktopSettingsFromFileButtonClick'#8'TabOrder'#2#1#0#0#0#9
+  +'TCheckBox$ShowHintsForMainSpeedButtonsCheckBox'#4'Left'#2#6#6'Height'#2#22#3
+  +'Top'#3'j'#1#5'Width'#3''''#1#7'Caption'#6'$ShowHintsForMainSpeedButtonsChec'
+  +'kBox'#8'TabOrder'#2#4#0#0#9'TCheckBox'#28'MsgViewDblClickJumpsCheckBox'#4'L'
+  +'eft'#2#6#6'Height'#2#22#3'Top'#3'~'#1#5'Width'#3#231#0#7'Caption'#6#28'MsgV'
+  +'iewDblClickJumpsCheckBox'#8'TabOrder'#2#5#0#0#0#5'TPage'#11'WindowsPage'#7
+  +'Caption'#6#11'WindowsPage'#11'ClientWidth'#3#26#2#12'ClientHeight'#3#192#1#0
+  +#9'TCheckBox!MinimizeAllOnMinimizeMainCheckBox'#23'AnchorSideRight.Control'#7
+  +#11'WindowsPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heigh'
+  +'t'#2#22#3'Top'#2#10#5'Width'#3#14#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRi'
+  +'ght'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6'!MinimizeAllOnMinimizeMainC'
+  +'heckBox'#7'Enabled'#8#8'TabOrder'#2#0#0#0#9'TCheckBox'#20'HideIDEOnRunCheck'
+  +'Box'#23'AnchorSideRight.Control'#7#11'WindowsPage'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'"'#5'Width'#3#14#2#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7'Capt'
+  +'ion'#6#20'HideIDEOnRunCheckBox'#8'TabOrder'#2#1#0#0#9'TGroupBox'#23'WindowP'
+  +'ositionsGroupBox'#23'AnchorSideRight.Control'#7#11'WindowsPage'#20'AnchorSi'
+  +'deRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3'@'#1#3'Top'#2'D'#5'Wid'
+  +'th'#3#14#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#19'Bor'
+  +'derSpacing.Right'#2#6#7'Caption'#6#23'WindowPositionsGroupBox'#12'ClientHei'
+  +'ght'#3'-'#1#11'ClientWidth'#3#10#2#8'TabOrder'#2#2#0#8'TListBox'#22'WindowP'
+  +'ositionsListBox'#22'AnchorSideLeft.Control'#7#23'WindowPositionsGroupBox'#23
+  ,'AnchorSideRight.Control'#7#23'WindowPositionsGroupBox'#20'AnchorSideRight.S'
+  +'ide'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'd'#3'Top'#2#6#5'Width'#3#254#1#7
+  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#9
+  +'OnMouseUp'#7#29'WindowPositionsListBoxMouseUp'#8'TabOrder'#2#0#8'TopIndex'#2
+  +#255#0#0#0#0#5'TPage'#14'FormEditorPage'#7'Caption'#6#14'FormEditorPage'#11
+  +'ClientWidth'#3#26#2#12'ClientHeight'#3#197#1#8'OnResize'#7#20'FormEditorPag'
+  +'eResize'#0#9'TGroupBox'#12'GridGroupBox'#4'Left'#2#6#6'Height'#3#212#0#3'To'
+  +'p'#2#6#5'Width'#3'Q'#1#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'GridGro'
+  +'upBox'#12'ClientHeight'#3#193#0#11'ClientWidth'#3'M'#1#8'TabOrder'#2#0#0#6
+  +'TLabel'#14'GridColorLabel'#22'AnchorSideLeft.Control'#7#12'GridGroupBox'#21
+  +'AnchorSideTop.Control'#7#14'GridSizeYLabel'#18'AnchorSideTop.Side'#7#9'asrB'
+  +'ottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#3#140#0#5'Width'#2'^'#17'BorderSpa'
+  +'cing.Top'#2#4#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'GridColorLabel'
+  +#11'ParentColor'#8#0#0#6'TLabel'#14'GridSizeXLabel'#22'AnchorSideLeft.Contro'
+  +'l'#7#12'GridGroupBox'#21'AnchorSideTop.Control'#7#18'SnapToGridCheckBox'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'P'#5
+  +'Width'#2'`'#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'GridSizeXLabel'#11
+  +'ParentColor'#8#0#0#6'TLabel'#14'GridSizeYLabel'#22'AnchorSideLeft.Control'#7
+  +#12'GridGroupBox'#21'AnchorSideTop.Control'#7#14'GridSizeXLabel'#18'AnchorSi'
+  +'deTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'n'#5'Width'#2
+  +'_'#17'BorderSpacing.Top'#2#4#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'G'
+  +'ridSizeYLabel'#11'ParentColor'#8#0#0#12'TColorButton'#15'GridColorButton'#22
+  +'AnchorSideLeft.Control'#7#14'GridColorLabel'#19'AnchorSideLeft.Side'#7#9'as'
+  +'rBottom'#21'AnchorSideTop.Control'#7#14'GridColorLabel'#18'AnchorSideTop.Si'
+  +'de'#7#9'asrCenter'#4'Left'#2'j'#6'Height'#2#23#3'Top'#3#139#0#5'Width'#2'2'
+  +#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#0#0#9
+  +'TCheckBox'#18'SnapToGridCheckBox'#22'AnchorSideLeft.Control'#7#12'GridGroup'
+  +'Box'#21'AnchorSideTop.Control'#7#23'ShowBorderSpaceCheckBox'#18'AnchorSideT'
+  +'op.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'4'#5'Width'#3
+  +#253#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2
+  +#6#17'BorderSpacing.Top'#2#4#7'Caption'#6#18'SnapToGridCheckBox'#8'TabOrder'
+  +#2#1#0#0#9'TCheckBox'#16'ShowGridCheckBox'#22'AnchorSideLeft.Control'#7#12'G'
+  +'ridGroupBox'#4'Left'#2#6#6'Height'#2#22#5'Width'#3#147#0#18'BorderSpacing.L'
+  +'eft'#2#6#7'Caption'#6#16'ShowGridCheckBox'#8'TabOrder'#2#0#0#0#9'TComboBox'
+  +#17'GridSizeXComboBox'#22'AnchorSideLeft.Control'#7#14'GridSizeXLabel'#19'An'
+  +'chorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#14'GridSizeXL'
+  +'abel'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'l'#6'Height'#2#25#3'T'
+  +'op'#2'N'#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20
+  +'cbactSearchAscending'#0#13'Items.Strings'#1#6#1'2'#6#1'5'#6#1'8'#6#2'10'#6#2
+  +'12'#6#2'15'#6#2'20'#6#2'25'#6#2'30'#0#9'MaxLength'#2#0#14'ParentShowHint'#8
+  +#8'ShowHint'#9#8'TabOrder'#2#2#0#0#9'TComboBox'#17'GridSizeYComboBox'#22'Anc'
+  +'horSideLeft.Control'#7#14'GridSizeYLabel'#19'AnchorSideLeft.Side'#7#9'asrBo'
+  +'ttom'#21'AnchorSideTop.Control'#7#14'GridSizeYLabel'#18'AnchorSideTop.Side'
+  +#7#9'asrCenter'#4'Left'#2'k'#6'Height'#2#25#3'Top'#2'l'#5'Width'#2'd'#16'Aut'
+  +'oCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#13
+  +'Items.Strings'#1#6#1'2'#6#1'5'#6#1'8'#6#2'10'#6#2'12'#6#2'15'#6#2'20'#6#2'2'
+  +'5'#6#2'30'#0#9'MaxLength'#2#0#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'
+  +#2#3#0#0#9'TCheckBox'#23'ShowBorderSpaceCheckBox'#22'AnchorSideLeft.Control'
+  +#7#12'GridGroupBox'#21'AnchorSideTop.Control'#7#16'ShowGridCheckBox'#18'Anch'
+  +'orSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#26#5'Wid'
+  +'th'#3#204#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#4#7'Caption'
+  +#6#23'ShowBorderSpaceCheckBox'#8'TabOrder'#2#4#0#0#0#9'TGroupBox'#18'GuideLi'
+  +'nesGroupBox'#22'AnchorSideLeft.Control'#7#20'FormEditMiscGroupBox'#19'Ancho'
+  +'rSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#18'RubberbandGro'
+  +'upBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
+  +#14'FormEditorPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBot'
+  +'tom.Control'#7#14'FormEditorPage'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
+  +'Left'#3']'#1#6'Height'#3#218#0#3'Top'#3#224#0#5'Width'#3#183#0#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#18'GuideLinesGroupBox'#12'ClientHeight'#3#199#0#11'ClientWidth'#3
+  +#179#0#8'TabOrder'#2#1#0#12'TColorButton'#27'GuideLineColorLeftTopButton'#21
+  +'AnchorSideTop.Control'#7#26'GuideLineColorLeftTopLabel'#18'AnchorSideTop.Si'
+  +'de'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'd'#5'Width'#2'2'#11
+  +'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#0#0#12'TC'
+  ,'olorButton'#31'GuideLineColorRightBottomButton'#21'AnchorSideTop.Control'#7
+  +#30'GuideLineColorRightBottomLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#2#23#3'Top'#3#155#0#5'Width'#2'2'#11'BorderWidth'#2#2#15
+  +'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#0#0#6'TLabel'#26'GuideLineCol'
+  +'orLeftTopLabel'#22'AnchorSideLeft.Control'#7#18'GuideLinesGroupBox'#23'Anch'
+  +'orSideRight.Control'#7#18'GuideLinesGroupBox'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'J'#5'Width'#3#167#0#7'Anchor'
+  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Captio'
+  +'n'#6#26'GuideLineColorLeftTopLabel'#11'ParentColor'#8#0#0#6'TLabel'#30'Guid'
+  +'eLineColorRightBottomLabel'#22'AnchorSideLeft.Control'#7#18'GuideLinesGroup'
+  +'Box'#21'AnchorSideTop.Control'#7#27'GuideLineColorLeftTopButton'#18'AnchorS'
+  +'ideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#18'GuideLinesGrou'
+  +'pBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3
+  +'Top'#3#129#0#5'Width'#3#167#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#30'GuideLineColorRightBottomLabel'
+  +#11'ParentColor'#8#0#0#9'TCheckBox'#22'ShowGuideLinesCheckBox'#22'AnchorSide'
+  +'Left.Control'#7#18'GuideLinesGroupBox'#23'AnchorSideRight.Control'#7#18'Gui'
+  +'deLinesGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heig'
+  +'ht'#2#22#5'Width'#3#167#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#22'ShowGuideLinesCheckBox'#8'TabOrde'
+  +'r'#2#0#0#0#9'TCheckBox'#24'SnapToGuideLinesCheckBox'#22'AnchorSideLeft.Cont'
+  +'rol'#7#18'GuideLinesGroupBox'#21'AnchorSideTop.Control'#7#22'ShowGuideLines'
+  +'CheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'
+  +#7#18'GuideLinesGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6
+  +#6'Height'#2#22#3'Top'#2#28#5'Width'#3#167#0#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#24'SnapToGuideLinesC'
+  +'heckBox'#8'TabOrder'#2#1#0#0#0#9'TGroupBox'#20'FormEditMiscGroupBox'#21'Anc'
+  +'horSideTop.Control'#7#12'GridGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#23'AnchorSideRight.Control'#7#14'FormEditorPage'#20'AnchorSideRight.Side'#7
+  +#9'asrBottom'#24'AnchorSideBottom.Control'#7#14'FormEditorPage'#21'AnchorSid'
+  +'eBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#218#0#3'Top'#3#224#0#5
+  +'Width'#3'Q'#1#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpaci'
+  +'ng.Around'#2#6#7'Caption'#6#20'FormEditMiscGroupBox'#12'ClientHeight'#3#199
+  +#0#11'ClientWidth'#3'M'#1#8'TabOrder'#2#2#0#12'TColorButton'#18'GrabberColor'
+  +'Button'#22'AnchorSideLeft.Control'#7#17'GrabberColorLabel'#19'AnchorSideLef'
+  +'t.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'GrabberColorLabel'#18
+  +'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#132#0#6'Height'#2#23#3'Top'#2
+  +'m'#5'Width'#2'2'#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9
+  +'clBtnFace'#0#0#12'TColorButton'#17'MarkerColorButton'#22'AnchorSideLeft.Con'
+  +'trol'#7#16'MarkerColorLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Anch'
+  +'orSideTop.Control'#7#16'MarkerColorLabel'#18'AnchorSideTop.Side'#7#9'asrCen'
+  +'ter'#4'Left'#2'|'#6'Height'#2#23#3'Top'#3#139#0#5'Width'#2'2'#11'BorderWidt'
+  +'h'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#0#0#6'TLabel'#17'Gr'
+  +'abberColorLabel'#22'AnchorSideLeft.Control'#7#20'FormEditMiscGroupBox'#21'A'
+  +'nchorSideTop.Control'#7#25'RightClickSelectsCheckBox'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'n'#5'Width'#2'x'#17'Bord'
+  +'erSpacing.Top'#2#4#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'GrabberColo'
+  +'rLabel'#11'ParentColor'#8#0#0#6'TLabel'#16'MarkerColorLabel'#22'AnchorSideL'
+  +'eft.Control'#7#20'FormEditMiscGroupBox'#21'AnchorSideTop.Control'#7#17'Grab'
+  +'berColorLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#20#3'Top'#3#140#0#5'Width'#2'p'#17'BorderSpacing.Top'#2#4#20'BorderSpacing.'
+  +'Around'#2#6#7'Caption'#6#16'MarkerColorLabel'#11'ParentColor'#8#0#0#9'TChec'
+  +'kBox'#29'ShowComponentCaptionsCheckBox'#22'AnchorSideLeft.Control'#7#20'For'
+  +'mEditMiscGroupBox'#4'Left'#2#6#6'Height'#2#22#5'Width'#3#0#1#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#29'Sh'
+  +'owComponentCaptionsCheckBox'#8'TabOrder'#2#0#0#0#9'TCheckBox'#23'ShowEditor'
+  +'HintsCheckBox'#22'AnchorSideLeft.Control'#7#20'FormEditMiscGroupBox'#21'Anc'
+  +'horSideTop.Control'#7#29'ShowComponentCaptionsCheckBox'#18'AnchorSideTop.Si'
+  +'de'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#26#5'Width'#3#0#1#7
+  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'B'
+  +'orderSpacing.Top'#2#4#7'Caption'#6#23'ShowEditorHintsCheckBox'#8'TabOrder'#2
+  +#1#0#0#9'TCheckBox'#29'AutoCreateFormsOnOpenCheckBox'#22'AnchorSideLeft.Cont'
+  +'rol'#7#20'FormEditMiscGroupBox'#21'AnchorSideTop.Control'#7#23'ShowEditorHi'
+  +'ntsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  ,#22#3'Top'#2'4'#5'Width'#3#0#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#4#7'Caption'#6#29'AutoCr'
+  +'eateFormsOnOpenCheckBox'#8'TabOrder'#2#2#0#0#9'TCheckBox'#25'RightClickSele'
+  +'ctsCheckBox'#22'AnchorSideLeft.Control'#7#20'FormEditMiscGroupBox'#21'Ancho'
+  +'rSideTop.Control'#7#29'AutoCreateFormsOnOpenCheckBox'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'N'#5'Width'#3#0#1#7'Anch'
+  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'Borde'
+  +'rSpacing.Top'#2#4#7'Caption'#6#25'RightClickSelectsCheckBox'#8'TabOrder'#2#3
+  +#0#0#9'TCheckBox'#25'DesignerPaintLazyCheckBox'#22'AnchorSideLeft.Control'#7
+  +#20'FormEditMiscGroupBox'#21'AnchorSideTop.Control'#7#16'MarkerColorLabel'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#3#170#0
+  +#5'Width'#3#254#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpa'
+  +'cing.Top'#2#4#20'BorderSpacing.Around'#2#6#7'Caption'#6#25'DesignerPaintLaz'
+  +'yCheckBox'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#4#0#0#0#9'TGrou'
+  +'pBox'#18'RubberbandGroupBox'#22'AnchorSideLeft.Control'#7#12'GridGroupBox'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#14'For'
+  +'mEditorPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3']'#1#6'Heigh'
+  +'t'#3#212#0#3'Top'#2#6#5'Width'#3#183#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'a'
+  +'kRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'RubberbandGroupBox'
+  +#12'ClientHeight'#3#193#0#11'ClientWidth'#3#179#0#5'Color'#7#9'clBtnFace'#11
+  +'ParentColor'#8#8'TabOrder'#2#3#0#12'TColorButton'#27'RubberbandSelectColorB'
+  +'utton'#22'AnchorSideLeft.Control'#7#26'RubberbandSelectColorLabel'#21'Ancho'
+  +'rSideTop.Control'#7#26'RubberbandSelectColorLabel'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2' '#5'Width'#2'2'#11'Border'
+  +'Width'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#0#0#12'TColorBu'
+  +'tton'#27'RubberbandCreateColorButton'#22'AnchorSideLeft.Control'#7#26'Rubbe'
+  +'rbandCreateColorLabel'#21'AnchorSideTop.Control'#7#26'RubberbandCreateColor'
+  +'Label'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'T'
+  +'op'#2'W'#5'Width'#2'2'#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'
+  +#7#9'clBtnFace'#0#0#6'TLabel'#26'RubberbandSelectColorLabel'#22'AnchorSideLe'
+  +'ft.Control'#7#18'RubberbandGroupBox'#21'AnchorSideTop.Control'#7#18'Rubberb'
+  +'andGroupBox'#23'AnchorSideRight.Control'#7#18'RubberbandGroupBox'#20'Anchor'
+  +'SideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2#6#5'Widt'
+  +'h'#3#167#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.A'
+  +'round'#2#6#7'Caption'#6#26'RubberbandSelectColorLabel'#11'ParentColor'#8#0#0
+  +#6'TLabel'#26'RubberbandCreateColorLabel'#22'AnchorSideLeft.Control'#7#18'Ru'
+  +'bberbandGroupBox'#21'AnchorSideTop.Control'#7#27'RubberbandSelectColorButto'
+  +'n'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#18'R'
+  +'ubberbandGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'He'
+  +'ight'#2#20#3'Top'#2'='#5'Width'#3#167#0#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#26'RubberbandCreateCol'
+  +'orLabel'#11'ParentColor'#8#0#0#9'TCheckBox$RubberbandSelectsGrandChildsChec'
+  +'kBox'#22'AnchorSideLeft.Control'#7#18'RubberbandGroupBox'#21'AnchorSideTop.'
+  +'Control'#7#27'RubberbandCreateColorButton'#18'AnchorSideTop.Side'#7#9'asrBo'
+  +'ttom'#23'AnchorSideRight.Control'#7#18'RubberbandGroupBox'#20'AnchorSideRig'
+  +'ht.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2't'#5'Width'#3
+  +#167#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'
+  +#2#6#7'Caption'#6'$RubberbandSelectsGrandChildsCheckBox'#8'TabOrder'#2#0#0#0
+  +#0#0#5'TPage'#19'ObjectInspectorPage'#7'Caption'#6#19'ObjectInspectorPage'#11
+  +'ClientWidth'#3#26#2#12'ClientHeight'#3#197#1#0#9'TGroupBox'#29'ObjectInspec'
+  +'torColorsGroupBox'#23'AnchorSideRight.Control'#7#19'ObjectInspectorPage'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#174#0#3'Top'#2
+  +#7#5'Width'#3#14#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'
+  +#9#18'BorderSpacing.Left'#2#5#17'BorderSpacing.Top'#2#5#19'BorderSpacing.Rig'
+  +'ht'#2#6#7'Caption'#6#29'ObjectInspectorColorsGroupBox'#28'ChildSizing.LeftR'
+  +'ightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.Horizo'
+  +'ntalSpacing'#2#2#27'ChildSizing.VerticalSpacing'#2#2#12'ClientHeight'#3#155
+  +#0#11'ClientWidth'#3#10#2#8'TabOrder'#2#0#0#12'TColorButton'#23'OIBackground'
+  +'ColorButton'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#6#5'Width'#2'2'#11'BorderW'
+  +'idth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#0#0#12'TColorBut'
+  +'ton'#21'OISubPropsColorButton'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#30#5'Wid'
+  +'th'#2'2'#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFac'
+  +'e'#0#0#12'TColorButton'#23'OIReferencesColorButton'#4'Left'#2#6#6'Height'#2
+  +#23#3'Top'#2'6'#5'Width'#2'2'#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5
+  ,'Color'#7#9'clBtnFace'#0#0#12'TColorButton'#18'OIValueColorButton'#4'Left'#2
+  +#6#6'Height'#2#23#3'Top'#2'N'#5'Width'#2'2'#11'BorderWidth'#2#2#15'ButtonCol'
+  +'orSize'#2#16#5'Color'#7#9'clBtnFace'#0#0#12'TColorButton'#25'OIDefaultValue'
+  +'ColorButton'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'f'#5'Width'#2'2'#11'Border'
+  +'Width'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#0#0#12'TColorBu'
+  +'tton'#21'OIPropNameColorButton'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'~'#5'Wi'
+  +'dth'#2'2'#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFa'
+  +'ce'#0#0#6'TLabel'#22'OIBackgroundColorLabel'#4'Left'#2'A'#6'Height'#2#20#3
+  +'Top'#2#12#5'Width'#3#182#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7
+  +'Caption'#6#22'OIBackgroundColorLabel'#11'ParentColor'#8#0#0#6'TLabel'#20'OI'
+  +'SubPropsColorLabel'#4'Left'#2'A'#6'Height'#2#20#3'Top'#2'$'#5'Width'#3#182#1
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6#20'OISubPropsCol'
+  +'orLabel'#11'ParentColor'#8#0#0#6'TLabel'#22'OIReferencesColorLabel'#4'Left'
+  +#2'A'#6'Height'#2#20#3'Top'#2'<'#5'Width'#3#182#1#7'Anchors'#11#5'akTop'#6'a'
+  +'kLeft'#7'akRight'#0#7'Caption'#6#22'OIReferencesColorLabel'#11'ParentColor'
+  +#8#0#0#6'TLabel'#17'OIValueColorLabel'#4'Left'#2'A'#6'Height'#2#20#3'Top'#2
+  +'T'#5'Width'#3#182#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'
+  +#6#17'OIValueColorLabel'#11'ParentColor'#8#0#0#6'TLabel'#24'OIDefaultValueCo'
+  +'lorLabel'#4'Left'#2'A'#6'Height'#2#20#3'Top'#2'l'#5'Width'#3#182#1#7'Anchor'
+  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6#24'OIDefaultValueColorLa'
+  +'bel'#11'ParentColor'#8#0#0#6'TLabel'#20'OIPropNameColorLabel'#4'Left'#2'A'#6
+  +'Height'#2#20#3'Top'#3#132#0#5'Width'#3#182#1#7'Anchors'#11#5'akTop'#6'akLef'
+  +'t'#7'akRight'#0#7'Caption'#6#20'OIPropNameColorLabel'#11'ParentColor'#8#0#0
+  +#0#9'TGroupBox'#14'OIMiscGroupBox'#23'AnchorSideRight.Control'#7#19'ObjectIn'
+  +'spectorPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +'i'#3'Top'#3#186#0#5'Width'#3#14#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
+  +'t'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#14'OIMiscGroupBox'#12'ClientH'
+  +'eight'#2'V'#11'ClientWidth'#3#10#2#8'TabOrder'#2#1#0#6'TLabel'#24'OIDefault'
+  +'ItemHeightLabel'#4'Left'#2#6#6'Height'#2#20#3'Top'#2#6#5'Width'#3#206#1#7'A'
+  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6#24'OIDefaultItemHei'
+  +'ghtLabel'#11'ParentColor'#8#0#0#9'TCheckBox'#18'OIShowHintCheckBox'#4'Left'
+  +#2#6#6'Height'#2#22#3'Top'#2'7'#5'Width'#3#206#1#7'Anchors'#11#5'akTop'#6'ak'
+  +'Left'#7'akRight'#0#7'Caption'#6#18'OIShowHintCheckBox'#8'TabOrder'#2#0#0#0#9
+  +'TSpinEdit'#27'OIDefaultItemHeightSpinEdit'#4'Left'#2#6#6'Height'#2#25#3'Top'
+  +#2#24#5'Width'#2'E'#8'TabOrder'#2#1#5'Value'#2#1#0#0#0#0#5'TPage'#10'BackupP'
+  +'age'#7'Caption'#6#10'BackupPage'#11'ClientWidth'#3#26#2#12'ClientHeight'#3
+  +#197#1#0#6'TLabel'#15'BackupHelpLabel'#23'AnchorSideRight.Control'#7#10'Back'
+  +'upPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3
+  +'Top'#2#7#5'Width'#3#14#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'B'
+  +'orderSpacing.Right'#2#6#7'Caption'#6#15'BackupHelpLabel'#11'ParentColor'#8#0
+  +#0#9'TGroupBox'#21'BackupProjectGroupBox'#23'AnchorSideRight.Control'#7#10'B'
+  +'ackupPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3
+  +#201#0#3'Top'#2'"'#5'Width'#3#14#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
+  +'t'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#21'BackupProjectGroupBox'#12
+  +'ClientHeight'#3#182#0#11'ClientWidth'#3#10#2#8'TabOrder'#2#0#0#6'TLabel'#18
+  +'BakProjAddExtLabel'#22'AnchorSideLeft.Control'#7#21'BakProjAddExtComboBox'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#21'BakPr'
+  +'ojAddExtComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.'
+  +'Control'#7#21'BackupProjectGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#4'Left'#2'p'#6'Height'#2#20#3'Top'#2'd'#5'Width'#3#148#1#7'Anchors'#11#5'ak'
+  +'Top'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'Ba'
+  +'kProjAddExtLabel'#11'ParentColor'#8#0#0#6'TLabel'#22'BakProjMaxCounterLabel'
+  +#22'AnchorSideLeft.Control'#7#25'BakProjMaxCounterComboBox'#19'AnchorSideLef'
+  +'t.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#25'BakProjMaxCounterComb'
+  +'oBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#21
+  +'BackupProjectGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'p'
+  +#6'Height'#2#20#3'Top'#2''#5'Width'#3#148#1#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#22'BakProjMaxCounter'
+  +'Label'#11'ParentColor'#8#0#0#6'TLabel'#18'BakProjSubDirLabel'#22'AnchorSide'
+  +'Left.Control'#7#21'BakProjSubDirComboBox'#19'AnchorSideLeft.Side'#7#9'asrBo'
+  +'ttom'#21'AnchorSideTop.Control'#7#21'BakProjSubDirComboBox'#18'AnchorSideTo'
+  +'p.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#21'BackupProjectGroupB'
+  +'ox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'p'#6'Height'#2#20#3'T'
+  +'op'#3#154#0#5'Width'#3#148#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  ,#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'BakProjSubDirLabel'#11'ParentC'
+  +'olor'#8#0#0#11'TRadioGroup'#21'BakProjTypeRadioGroup'#23'AnchorSideRight.Co'
+  +'ntrol'#7#21'BackupProjectGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#2'X'#5'Width'#3#254#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#0#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'BakPr'
+  +'ojTypeRadioGroup'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBo'
+  +'ttomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildR'
+  +'esize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'Ch'
+  +'ildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVerti'
+  +'cal'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTop'
+  +'ToBottom'#27'ChildSizing.ControlsPerLine'#2#2#7'Columns'#2#2#7'OnClick'#7#22
+  +'BakTypeRadioGroupClick'#8'TabOrder'#2#0#0#0#9'TComboBox'#21'BakProjAddExtCo'
+  +'mboBox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'b'#5'Width'#2'd'#16'AutoComplet'
+  +'eText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLength'
+  +#2#0#8'TabOrder'#2#1#4'Text'#6#21'BakProjAddExtComboBox'#0#0#9'TComboBox'#25
+  +'BakProjMaxCounterComboBox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'}'#5'Width'#2
+  +'d'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscendi'
+  +'ng'#0#9'MaxLength'#2#0#8'TabOrder'#2#2#4'Text'#6#25'BakProjMaxCounterComboB'
+  +'ox'#0#0#9'TComboBox'#21'BakProjSubDirComboBox'#4'Left'#2#6#6'Height'#2#25#3
+  +'Top'#3#152#0#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineComplet'
+  +'e'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'TabOrder'#2#3#4'Text'#6#21
+  +'BakProjSubDirComboBox'#0#0#0#9'TGroupBox'#19'BackupOtherGroupBox'#23'Anchor'
+  +'SideRight.Control'#7#10'BackupPage'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#4'Left'#2#6#6'Height'#3#196#0#3'Top'#3#242#0#5'Width'#3#14#2#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#6#7'Caption'#6#19'B'
+  +'ackupOtherGroupBox'#12'ClientHeight'#3#177#0#11'ClientWidth'#3#10#2#8'TabOr'
+  +'der'#2#1#0#6'TLabel'#19'BakOtherAddExtLabel'#22'AnchorSideLeft.Control'#7#22
+  +'BakOtherAddExtComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSid'
+  +'eTop.Control'#7#22'BakOtherAddExtComboBox'#18'AnchorSideTop.Side'#7#9'asrCe'
+  +'nter'#23'AnchorSideRight.Control'#7#19'BackupOtherGroupBox'#20'AnchorSideRi'
+  +'ght.Side'#7#9'asrBottom'#4'Left'#2'p'#6'Height'#2#20#3'Top'#2'a'#5'Width'#3
+  +#148#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'
+  +#2#6#7'Caption'#6#19'BakOtherAddExtLabel'#11'ParentColor'#8#0#0#6'TLabel'#23
+  +'BakOtherMaxCounterLabel'#22'AnchorSideLeft.Control'#7#26'BakOtherMaxCounter'
+  +'ComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
+  +#26'BakOtherMaxCounterComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'Anc'
+  +'horSideRight.Control'#7#19'BackupOtherGroupBox'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#2'p'#6'Height'#2#20#3'Top'#2'|'#5'Width'#3#148#1#7'Ancho'
+  +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Capti'
+  +'on'#6#23'BakOtherMaxCounterLabel'#11'ParentColor'#8#0#0#6'TLabel'#19'BakOth'
+  +'erSubDirLabel'#22'AnchorSideLeft.Control'#7#22'BakOtherSubDirComboBox'#19'A'
+  +'nchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#22'BakOtherS'
+  +'ubDirComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Con'
+  +'trol'#7#19'BackupOtherGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'L'
+  +'eft'#2'p'#6'Height'#2#20#3'Top'#3#151#0#5'Width'#3#148#1#7'Anchors'#11#5'ak'
+  +'Top'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'Ba'
+  +'kOtherSubDirLabel'#11'ParentColor'#8#0#0#11'TRadioGroup'#22'BakOtherTypeRad'
+  +'ioGroup'#23'AnchorSideRight.Control'#7#19'BackupOtherGroupBox'#20'AnchorSid'
+  +'eRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'T'#5'Width'#3#254#1#7'A'
+  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoFill'#9#20'BorderSpacing.A'
+  +'round'#2#6#7'Caption'#6#22'BakOtherTypeRadioGroup'#28'ChildSizing.LeftRight'
+  +'Spacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHor'
+  +'izontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24
+  +'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChi'
+  +'lds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Lay'
+  +'out'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#2
+  +#7'Columns'#2#2#7'OnClick'#7#22'BakTypeRadioGroupClick'#8'TabOrder'#2#0#0#0#9
+  +'TComboBox'#22'BakOtherAddExtComboBox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'_'
+  +#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSe'
+  +'archAscending'#0#9'MaxLength'#2#0#8'TabOrder'#2#1#4'Text'#6#22'BakOtherAddE'
+  +'xtComboBox'#0#0#9'TComboBox'#26'BakOtherMaxCounterComboBox'#4'Left'#2#6#6'H'
+  +'eight'#2#25#3'Top'#2'z'#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOf'
+  +'LineComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#8'TabOrder'#2#2#4
+  +'Text'#6#26'BakOtherMaxCounterComboBox'#0#0#9'TComboBox'#22'BakOtherSubDirCo'
+  ,'mboBox'#4'Left'#2#6#6'Height'#2#25#3'Top'#3#149#0#5'Width'#2'd'#16'AutoComp'
+  +'leteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLen'
+  +'gth'#2#0#8'TabOrder'#2#3#4'Text'#6#22'BakOtherSubDirComboBox'#0#0#0#0#5'TPa'
+  +'ge'#10'NamingPage'#7'Caption'#6#10'NamingPage'#11'ClientWidth'#3#26#2#12'Cl'
+  +'ientHeight'#3#197#1#0#11'TRadioGroup'#23'PascalFileExtRadiogroup'#23'Anchor'
+  +'SideRight.Control'#7#10'NamingPage'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#4'Left'#2#6#6'Height'#2'/'#3'Top'#2#6#5'Width'#3#14#2#5'Align'#7#5'alTop'#8
+  +'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'PascalFileExtRadio'
+  +'group'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'
+  +#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'Chi'
+  +'ldSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.Shr'
+  +'inkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crs'
+  +'ScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27
+  +'ChildSizing.ControlsPerLine'#2#2#7'Columns'#2#2#8'TabOrder'#2#0#0#0#11'TRad'
+  +'ioGroup'#28'CharcaseFileActionRadioGroup'#23'AnchorSideRight.Control'#7#10
+  +'NamingPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +'U'#3'Top'#3#165#0#5'Width'#3#14#2#5'Align'#7#5'alTop'#8'AutoFill'#9#20'Bord'
+  +'erSpacing.Around'#2#6#7'Caption'#6#28'CharcaseFileActionRadioGroup'#28'Chil'
+  +'dSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'Child'
+  +'Sizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.Enl'
+  +'argeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizonta'
+  +'l'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'
+  +#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.C'
+  +'ontrolsPerLine'#2#2#7'Columns'#2#2#8'TabOrder'#2#1#0#0#11'TRadioGroup'#29'A'
+  +'mbiguousFileActionRadioGroup'#23'AnchorSideRight.Control'#7#10'NamingPage'
+  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'd'#3'Top'#2
+  +';'#5'Width'#3#14#2#5'Align'#7#5'alTop'#8'AutoFill'#9#20'BorderSpacing.Aroun'
+  +'d'#2#6#7'Caption'#6#29'AmbiguousFileActionRadioGroup'#28'ChildSizing.LeftRi'
+  +'ghtSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.Enlarge'
+  +'Horizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7
+  +#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScale'
+  +'Childs'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.'
+  +'Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'
+  +#2#2#7'Columns'#2#2#8'TabOrder'#2#2#0#0#0#5'TPage'#10'LazDocPage'#7'Caption'
+  +#6#10'LazDocPage'#11'ClientWidth'#3#26#2#12'ClientHeight'#3#197#1#0#9'TGroup'
+  +'Box'#19'LazDocPathsGroupBox'#23'AnchorSideRight.Control'#7#10'LazDocPage'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#205#0#3'Top'#2
+  +#6#5'Width'#3#14#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'
+  +#2#6#7'Caption'#6#19'LazDocPathsGroupBox'#12'ClientHeight'#3#186#0#11'Client'
+  +'Width'#3#10#2#8'TabOrder'#2#0#0#8'TListBox'#13'LazDocListBox'#4'Left'#2#6#6
+  +'Height'#2'l'#3'Top'#2#6#5'Width'#3#254#1#5'Align'#7#5'alTop'#20'BorderSpaci'
+  +'ng.Around'#2#6#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#7'TButton'#19'LazDocAd'
+  +'dPathButton'#22'AnchorSideLeft.Control'#7#19'LazDocPathsGroupBox'#21'Anchor'
+  +'SideTop.Control'#7#13'LazDocListBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#2#31#3'Top'#2'x'#5'Width'#3#163#0#8'AutoSize'#9#20'Bord'
+  +'erSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#19'Laz'
+  +'DocAddPathButton'#7'OnClick'#7#24'LazDocAddPathButtonClick'#8'TabOrder'#2#1
+  +#0#0#7'TButton'#22'LazDocDeletePathButton'#22'AnchorSideLeft.Control'#7#19'L'
+  +'azDocAddPathButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop'
+  +'.Control'#7#19'LazDocAddPathButton'#4'Left'#3#179#0#6'Height'#2#31#3'Top'#2
+  +'x'#5'Width'#3#180#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#10#25'BorderSpac'
+  +'ing.InnerBorder'#2#4#7'Caption'#6#22'LazDocDeletePathButton'#7'OnClick'#7#27
+  +'LazDocDeletePathButtonClick'#8'TabOrder'#2#2#0#0#7'TButton'#18'LazDocBrowse'
+  +'Button'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
+  +#14'LazDocPathEdit'#23'AnchorSideRight.Control'#7#19'LazDocPathsGroupBox'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#14'LazD'
+  +'ocPathEdit'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#236#1#6'Heig'
+  +'ht'#2#23#3'Top'#3#157#0#5'Width'#2#24#7'Anchors'#11#5'akTop'#7'akRight'#8'a'
+  +'kBottom'#0#19'BorderSpacing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#4#7
+  +'Caption'#6#3'...'#7'OnClick'#7#23'LazDocBrowseButtonClick'#8'TabOrder'#2#3#0
+  +#0#5'TEdit'#14'LazDocPathEdit'#22'AnchorSideLeft.Control'#7#19'LazDocPathsGr'
+  +'oupBox'#21'AnchorSideTop.Control'#7#19'LazDocAddPathButton'#18'AnchorSideTo'
+  +'p.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#18'LazDocBrowseButton'
+  +#4'Left'#2#6#6'Height'#2#23#3'Top'#3#157#0#5'Width'#3#230#1#7'Anchors'#11#5
+  ,'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.T'
+  +'op'#2#6#20'BorderSpacing.Bottom'#2#6#8'TabOrder'#2#4#4'Text'#6#14'LazDocPat'
+  +'hEdit'#0#0#0#0#0#6'TPanel'#11'EODBtnPanel'#6'Height'#2'+'#3'Top'#3#223#1#5
+  +'Width'#3#30#2#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNon'
+  +'e'#12'ClientHeight'#2'+'#11'ClientWidth'#3#30#2#8'TabOrder'#2#1#0#7'TButton'
+  +#8'OkButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3']'#1#6'Heigh'
+  +'t'#2#31#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Bor'
+  +'derSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#2'Ok'
+  +#20'Constraints.MinWidth'#2'K'#7'Default'#9#7'OnClick'#7#13'OkButtonClick'#8
+  +'TabOrder'#2#0#0#0#7'TButton'#12'CancelButton'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#174#1#6'Heigh'
+  +'t'#2#31#3'Top'#2#6#5'Width'#2'j'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Bor'
+  +'derSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Capt'
+  +'ion'#6#12'CancelButton'#20'Constraints.MinWidth'#2'K'#7'OnClick'#7#17'Cance'
+  +'lButtonClick'#8'TabOrder'#2#1#0#0#0#22'TSelectDirectoryDialog'#21'SelectDir'
+  +'ectoryDialog'#5'Title'#6#16'Select Directory'#11'FilterIndex'#2#0#4'left'#3
+  +#232#1#3'top'#2#8#0#0#0
+]);
+
 LazarusResources.Add('TEnvironmentOptionsDialog','FORMDATA',[
   'TPF0'#25'TEnvironmentOptionsDialog'#24'EnvironmentOptionsDialog'#4'Left'#3':'
   +#1#6'Height'#3#10#2#3'Top'#2'|'#5'Width'#3#30#2#18'HorzScrollBar.Page'#3#29#2
diff --git a/ide/environmentopts.pp b/ide/environmentopts.pp
index a403aacc10..e42663f4b9 100644
--- a/ide/environmentopts.pp
+++ b/ide/environmentopts.pp
@@ -449,6 +449,7 @@ type
     NoteBook: TNoteBook;
     FilesPage: TPage;
     DesktopPage: TPage;
+    EODBtnPanel: TPanel;
     WindowsPage: TPage;
     FormEditorPage: TPage;
     ObjectInspectorPage: TPage;
diff --git a/ide/exttooldialog.lfm b/ide/exttooldialog.lfm
index 2919756b03..476a0f8d8f 100644
--- a/ide/exttooldialog.lfm
+++ b/ide/exttooldialog.lfm
@@ -8,6 +8,8 @@ object ExternalToolDialog: TExternalToolDialog
   ActiveControl = ListBox
   BorderStyle = bsSizeToolWin
   Caption = 'ExternalToolDialog'
+  ClientHeight = 400
+  ClientWidth = 400
   Position = poScreenCenter
   object ToolBar: TToolBar
     Height = 94
@@ -22,28 +24,28 @@ object ExternalToolDialog: TExternalToolDialog
     ShowHint = True
     TabOrder = 0
     object MoveDownButton: TToolButton
-      Left = 117
+      Left = 1
       Top = 48
       Caption = 'MoveDownButton'
       ImageIndex = 4
       OnClick = MoveDownButtonClick
     end
     object MoveUpButton: TToolButton
-      Left = 1
-      Top = 48
+      Left = 277
+      Top = 2
       Caption = 'MoveUpButton'
       ImageIndex = 3
       OnClick = MoveUpButtonClick
     end
     object EditButton: TToolButton
-      Left = 203
+      Left = 179
       Top = 2
       Caption = 'EditButton'
       ImageIndex = 2
       OnClick = EditButtonClick
     end
     object RemoveButton: TToolButton
-      Left = 86
+      Left = 77
       Top = 2
       Caption = 'RemoveButton'
       ImageIndex = 1
@@ -57,7 +59,7 @@ object ExternalToolDialog: TExternalToolDialog
       OnClick = AddButtonClick
     end
     object tbSeparator: TToolButton
-      Left = 287
+      Left = 254
       Top = 2
       Width = 23
       Caption = 'tbSeparator'
@@ -65,8 +67,8 @@ object ExternalToolDialog: TExternalToolDialog
     end
   end
   object ListBox: TListBox
-    AnchorSideBottom.Control = OKButton
-    Height = 269
+    AnchorSideBottom.Control = BtnPanel
+    Height = 250
     Top = 94
     Width = 400
     Align = alTop
@@ -76,367 +78,218 @@ object ExternalToolDialog: TExternalToolDialog
     TabOrder = 1
     TopIndex = -1
   end
-  object OKButton: TBitBtn
-    AnchorSideRight.Control = CancelButton
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 226
-    Height = 25
-    Top = 369
-    Width = 75
-    Anchors = [akRight, akBottom]
+  object BtnPanel: TPanel
+    Height = 50
+    Top = 350
+    Width = 400
+    Align = alBottom
     AutoSize = True
-    BorderSpacing.Around = 6
-    Caption = '&OK'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    Default = True
-    Kind = bkOK
-    ModalResult = 1
-    NumGlyphs = 0
+    BevelOuter = bvNone
+    ClientHeight = 50
+    ClientWidth = 400
     TabOrder = 2
-  end
-  object CancelButton: TBitBtn
-    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 307
-    Height = 19
-    Top = 375
-    Width = 87
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Around = 6
-    Cancel = True
-    Caption = 'Cancel'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    Kind = bkCancel
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 3
+    object OKButton: TBitBtn
+      AnchorSideBottom.Side = asrBottom
+      Left = 227
+      Height = 38
+      Top = 6
+      Width = 75
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Caption = '&OK'
+      Constraints.MinWidth = 75
+      Default = True
+      Kind = bkOK
+      ModalResult = 1
+      NumGlyphs = 0
+      TabOrder = 0
+    end
+    object CancelButton: TBitBtn
+      AnchorSideTop.Side = asrBottom
+      AnchorSideRight.Side = asrBottom
+      AnchorSideBottom.Side = asrBottom
+      Left = 308
+      Height = 38
+      Top = 6
+      Width = 86
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Cancel = True
+      Caption = 'Cancel'
+      Constraints.MinWidth = 75
+      Kind = bkCancel
+      ModalResult = 2
+      NumGlyphs = 0
+      TabOrder = 1
+    end
   end
   object EnabledImageList: TImageList
     left = 77
     top = 24
     Bitmap = {
-      6C690500000010000000100000009B1300002F2A2058504D202A2F0D0A737461
-      7469632063686172202A20706B675F6164645F78706D5B5D203D207B0D0A2231
-      36203136203235372032222C0D0A2220200963204E6F6E65222C0D0A222E2009
-      632023303030303030222C0D0A222B2009632023383030303030222C0D0A2240
-      2009632023303038303030222C0D0A22232009632023383038303030222C0D0A
-      22242009632023303030303830222C0D0A22252009632023383030303830222C
-      0D0A22262009632023303038303830222C0D0A222A2009632023433043304330
-      222C0D0A223D2009632023433044434330222C0D0A222D200963202341364341
-      4630222C0D0A223B2009632023343032303030222C0D0A223E20096320233630
-      32303030222C0D0A222C2009632023383032303030222C0D0A22272009632023
-      413032303030222C0D0A22292009632023433032303030222C0D0A2221200963
-      2023453032303030222C0D0A227E2009632023303034303030222C0D0A227B20
-      09632023323034303030222C0D0A225D2009632023343034303030222C0D0A22
-      5E2009632023363034303030222C0D0A222F2009632023383034303030222C0D
-      0A22282009632023413034303030222C0D0A225F200963202343303430303022
-      2C0D0A223A2009632023453034303030222C0D0A223C20096320233030363030
-      30222C0D0A225B2009632023323036303030222C0D0A227D2009632023343036
-      303030222C0D0A227C2009632023363036303030222C0D0A2231200963202338
-      3036303030222C0D0A22322009632023413036303030222C0D0A223320096320
-      23433036303030222C0D0A22342009632023453036303030222C0D0A22352009
-      632023303038303030222C0D0A22362009632023323038303030222C0D0A2237
-      2009632023343038303030222C0D0A22382009632023363038303030222C0D0A
-      22392009632023383038303030222C0D0A22302009632023413038303030222C
-      0D0A22612009632023433038303030222C0D0A22622009632023453038303030
-      222C0D0A22632009632023303041303030222C0D0A2264200963202332304130
-      3030222C0D0A22652009632023343041303030222C0D0A226620096320233630
-      41303030222C0D0A22672009632023383041303030222C0D0A22682009632023
-      413041303030222C0D0A22692009632023433041303030222C0D0A226A200963
-      2023453041303030222C0D0A226B2009632023303043303030222C0D0A226C20
-      09632023323043303030222C0D0A226D2009632023343043303030222C0D0A22
-      6E2009632023363043303030222C0D0A226F2009632023383043303030222C0D
-      0A22702009632023413043303030222C0D0A2271200963202343304330303022
-      2C0D0A22722009632023453043303030222C0D0A227320096320233030453030
-      30222C0D0A22742009632023323045303030222C0D0A22752009632023343045
-      303030222C0D0A22762009632023363045303030222C0D0A2277200963202338
-      3045303030222C0D0A22782009632023413045303030222C0D0A227920096320
-      23433045303030222C0D0A227A2009632023453045303030222C0D0A22412009
-      632023303030303430222C0D0A22422009632023323030303430222C0D0A2243
-      2009632023343030303430222C0D0A22442009632023363030303430222C0D0A
-      22452009632023383030303430222C0D0A22462009632023413030303430222C
-      0D0A22472009632023433030303430222C0D0A22482009632023453030303430
-      222C0D0A22492009632023303032303430222C0D0A224A200963202332303230
-      3430222C0D0A224B2009632023343032303430222C0D0A224C20096320233630
-      32303430222C0D0A224D2009632023383032303430222C0D0A224E2009632023
-      413032303430222C0D0A224F2009632023433032303430222C0D0A2250200963
-      2023453032303430222C0D0A22512009632023303034303430222C0D0A225220
-      09632023323034303430222C0D0A22532009632023343034303430222C0D0A22
-      542009632023363034303430222C0D0A22552009632023383034303430222C0D
-      0A22562009632023413034303430222C0D0A2257200963202343303430343022
-      2C0D0A22582009632023453034303430222C0D0A225920096320233030363034
-      30222C0D0A225A2009632023323036303430222C0D0A22602009632023343036
-      303430222C0D0A22202E09632023363036303430222C0D0A222E2E0963202338
-      3036303430222C0D0A222B2E09632023413036303430222C0D0A22402E096320
-      23433036303430222C0D0A22232E09632023453036303430222C0D0A22242E09
-      632023303038303430222C0D0A22252E09632023323038303430222C0D0A2226
-      2E09632023343038303430222C0D0A222A2E09632023363038303430222C0D0A
-      223D2E09632023383038303430222C0D0A222D2E09632023413038303430222C
-      0D0A223B2E09632023433038303430222C0D0A223E2E09632023453038303430
-      222C0D0A222C2E09632023303041303430222C0D0A22272E0963202332304130
-      3430222C0D0A22292E09632023343041303430222C0D0A22212E096320233630
-      41303430222C0D0A227E2E09632023383041303430222C0D0A227B2E09632023
-      413041303430222C0D0A225D2E09632023433041303430222C0D0A225E2E0963
-      2023453041303430222C0D0A222F2E09632023303043303430222C0D0A22282E
-      09632023323043303430222C0D0A225F2E09632023343043303430222C0D0A22
-      3A2E09632023363043303430222C0D0A223C2E09632023383043303430222C0D
-      0A225B2E09632023413043303430222C0D0A227D2E0963202343304330343022
-      2C0D0A227C2E09632023453043303430222C0D0A22312E096320233030453034
-      30222C0D0A22322E09632023323045303430222C0D0A22332E09632023343045
-      303430222C0D0A22342E09632023363045303430222C0D0A22352E0963202338
-      3045303430222C0D0A22362E09632023413045303430222C0D0A22372E096320
-      23433045303430222C0D0A22382E09632023453045303430222C0D0A22392E09
-      632023303030303830222C0D0A22302E09632023323030303830222C0D0A2261
-      2E09632023343030303830222C0D0A22622E09632023363030303830222C0D0A
-      22632E09632023383030303830222C0D0A22642E09632023413030303830222C
-      0D0A22652E09632023433030303830222C0D0A22662E09632023453030303830
-      222C0D0A22672E09632023303032303830222C0D0A22682E0963202332303230
-      3830222C0D0A22692E09632023343032303830222C0D0A226A2E096320233630
-      32303830222C0D0A226B2E09632023383032303830222C0D0A226C2E09632023
-      413032303830222C0D0A226D2E09632023433032303830222C0D0A226E2E0963
-      2023453032303830222C0D0A226F2E09632023303034303830222C0D0A22702E
-      09632023323034303830222C0D0A22712E09632023343034303830222C0D0A22
-      722E09632023363034303830222C0D0A22732E09632023383034303830222C0D
-      0A22742E09632023413034303830222C0D0A22752E0963202343303430383022
-      2C0D0A22762E09632023453034303830222C0D0A22772E096320233030363038
-      30222C0D0A22782E09632023323036303830222C0D0A22792E09632023343036
-      303830222C0D0A227A2E09632023363036303830222C0D0A22412E0963202338
-      3036303830222C0D0A22422E09632023413036303830222C0D0A22432E096320
-      23433036303830222C0D0A22442E09632023453036303830222C0D0A22452E09
-      632023303038303830222C0D0A22462E09632023323038303830222C0D0A2247
-      2E09632023343038303830222C0D0A22482E09632023363038303830222C0D0A
-      22492E09632023383038303830222C0D0A224A2E09632023413038303830222C
-      0D0A224B2E09632023433038303830222C0D0A224C2E09632023453038303830
-      222C0D0A224D2E09632023303041303830222C0D0A224E2E0963202332304130
-      3830222C0D0A224F2E09632023343041303830222C0D0A22502E096320233630
-      41303830222C0D0A22512E09632023383041303830222C0D0A22522E09632023
-      413041303830222C0D0A22532E09632023433041303830222C0D0A22542E0963
-      2023453041303830222C0D0A22552E09632023303043303830222C0D0A22562E
-      09632023323043303830222C0D0A22572E09632023343043303830222C0D0A22
-      582E09632023363043303830222C0D0A22592E09632023383043303830222C0D
-      0A225A2E09632023413043303830222C0D0A22602E0963202343304330383022
-      2C0D0A22202B09632023453043303830222C0D0A222E2B096320233030453038
-      30222C0D0A222B2B09632023323045303830222C0D0A22402B09632023343045
-      303830222C0D0A22232B09632023363045303830222C0D0A22242B0963202338
-      3045303830222C0D0A22252B09632023413045303830222C0D0A22262B096320
-      23433045303830222C0D0A222A2B09632023453045303830222C0D0A223D2B09
-      632023303030304330222C0D0A222D2B09632023323030304330222C0D0A223B
-      2B09632023343030304330222C0D0A223E2B09632023363030304330222C0D0A
-      222C2B09632023383030304330222C0D0A22272B09632023413030304330222C
-      0D0A22292B09632023433030304330222C0D0A22212B09632023453030304330
-      222C0D0A227E2B09632023303032304330222C0D0A227B2B0963202332303230
-      4330222C0D0A225D2B09632023343032304330222C0D0A225E2B096320233630
-      32304330222C0D0A222F2B09632023383032304330222C0D0A22282B09632023
-      413032304330222C0D0A225F2B09632023433032304330222C0D0A223A2B0963
-      2023453032304330222C0D0A223C2B09632023303034304330222C0D0A225B2B
-      09632023323034304330222C0D0A227D2B09632023343034304330222C0D0A22
-      7C2B09632023363034304330222C0D0A22312B09632023383034304330222C0D
-      0A22322B09632023413034304330222C0D0A22332B0963202343303430433022
-      2C0D0A22342B09632023453034304330222C0D0A22352B096320233030363043
-      30222C0D0A22362B09632023323036304330222C0D0A22372B09632023343036
-      304330222C0D0A22382B09632023363036304330222C0D0A22392B0963202338
-      3036304330222C0D0A22302B09632023413036304330222C0D0A22612B096320
-      23433036304330222C0D0A22622B09632023453036304330222C0D0A22632B09
-      632023303038304330222C0D0A22642B09632023323038304330222C0D0A2265
-      2B09632023343038304330222C0D0A22662B09632023363038304330222C0D0A
-      22672B09632023383038304330222C0D0A22682B09632023413038304330222C
-      0D0A22692B09632023433038304330222C0D0A226A2B09632023453038304330
-      222C0D0A226B2B09632023303041304330222C0D0A226C2B0963202332304130
-      4330222C0D0A226D2B09632023343041304330222C0D0A226E2B096320233630
-      41304330222C0D0A226F2B09632023383041304330222C0D0A22702B09632023
-      413041304330222C0D0A22712B09632023433041304330222C0D0A22722B0963
-      2023453041304330222C0D0A22732B09632023303043304330222C0D0A22742B
-      09632023323043304330222C0D0A22752B09632023343043304330222C0D0A22
-      762B09632023363043304330222C0D0A22772B09632023383043304330222C0D
-      0A22782B09632023413043304330222C0D0A22792B0963202346464642463022
-      2C0D0A227A2B09632023413041304134222C0D0A22412B096320233830383038
-      30222C0D0A22422B09632023464630303030222C0D0A22432B09632023303046
-      463030222C0D0A22442B09632023464646463030222C0D0A22452B0963202330
-      3030304646222C0D0A22462B09632023464630304646222C0D0A22472B096320
-      23303046464646222C0D0A22482B09632023464646464646222C0D0A22202020
-      2020202020202020202020202020202020202020202020202020202020222C0D
-      0A222020202020202020202020202E202E202E202E2020202020202020202020
-      2020222C0D0A222020202020202020202020202E20642064202E202020202020
-      20202020202020222C0D0A222020202020202020202020202E20642064202E20
-      202020202020202020202020222C0D0A222020202020202020202020202E2064
-      2064202E20202020202020202020202020222C0D0A2220202020202020202020
-      20202E20642064202E20202020202020202020202020222C0D0A2220202E202E
-      202E202E202E202E20642064202E202E202E202E202E202E202020222C0D0A22
-      20202E206420642064206420642064206420642064206420642064202E202020
-      222C0D0A2220202E206420642064206420642064206420642064206420642064
-      202E202020222C0D0A2220202E202E202E202E202E202E20642064202E202E20
-      2E202E202E202E202020222C0D0A222020202020202020202020202E20642064
-      202E20202020202020202020202020222C0D0A22202020202020202020202020
-      2E20642064202E20202020202020202020202020222C0D0A2220202020202020
-      20202020202E20642064202E20202020202020202020202020222C0D0A222020
-      202020202020202020202E20642064202E20202020202020202020202020222C
-      0D0A222020202020202020202020202E202E202E202E20202020202020202020
-      202020222C0D0A22202020202020202020202020202020202020202020202020
-      2020202020202020227D3B0D0AB70100002F2A2058504D202A2F0D0A73746174
-      69632063686172202A2064656C6574655F78706D5B5D203D207B0D0A22313620
-      313620332031222C0D0A22200963204E6F6E65222C0D0A222E09632023303030
-      303030222C0D0A222B09632023374630303030222C0D0A222020202020202020
-      2020202020202020222C0D0A2220202020202020202020202020202020222C0D
-      0A2220202020202020202020202020202020222C0D0A22202020202020202020
-      20202020202020222C0D0A2220202020202020202020202020202020222C0D0A
-      2220202020202020202020202020202020222C0D0A22202E2E2E2E2E2E2E2E2E
-      2E2E2E2E2E20222C0D0A22202E2B2B2B2B2B2B2B2B2B2B2B2B2E20222C0D0A22
-      202E2B2B2B2B2B2B2B2B2B2B2B2B2E20222C0D0A22202E2E2E2E2E2E2E2E2E2E
-      2E2E2E2E20222C0D0A2220202020202020202020202020202020222C0D0A2220
-      202020202020202020202020202020222C0D0A22202020202020202020202020
-      20202020222C0D0A2220202020202020202020202020202020222C0D0A222020
-      2020202020202020202020202020222C0D0A2220202020202020202020202020
-      202020227D3B0D0AD90500002F2A2058504D202A2F0D0A737461746963206368
-      6172202A20706B675F7061636B6167655F636972636C655F78706D5B5D203D20
-      7B0D0A2231362031372036372031222C0D0A22200963204E6F6E65222C0D0A22
-      2E09632023343934323134222C0D0A222B09632023383434373337222C0D0A22
-      4009632023383134323245222C0D0A222309632023383730303133222C0D0A22
-      2409632023344234343137222C0D0A222509632023383734433341222C0D0A22
-      2609632023444443324245222C0D0A222A09632023423732443145222C0D0A22
-      3D09632023434233353241222C0D0A222D09632023374530303045222C0D0A22
-      3B09632023364630303046222C0D0A223E09632023383234343331222C0D0A22
-      2C09632023454545314446222C0D0A222709632023323832383238222C0D0A22
-      2909632023354130303043222C0D0A222109632023374334353335222C0D0A22
-      7E09632023444342464235222C0D0A227B09632023374233463243222C0D0A22
-      5D09632023433638343744222C0D0A225E09632023434635313438222C0D0A22
-      2F09632023374633453241222C0D0A222809632023374433383241222C0D0A22
-      5F09632023423536443636222C0D0A223A09632023383533373238222C0D0A22
-      3C09632023444343324246222C0D0A225B09632023433532423230222C0D0A22
-      7D09632023424532333142222C0D0A227C09632023394336333344222C0D0A22
-      3109632023443535443534222C0D0A223209632023364233363236222C0D0A22
-      3309632023334133413341222C0D0A223409632023373134353338222C0D0A22
-      3509632023453443464344222C0D0A223609632023394536363344222C0D0A22
-      3709632023443336303534222C0D0A223809632023343534353435222C0D0A22
-      3909632023433343334333222C0D0A223009632023373833343146222C0D0A22
-      6109632023443235433533222C0D0A226209632023324332433243222C0D0A22
-      6309632023433443344334222C0D0A226409632023364436443644222C0D0A22
-      6509632023423642364236222C0D0A226609632023373237323732222C0D0A22
-      6709632023344434443444222C0D0A226809632023353535353535222C0D0A22
-      6909632023333633363336222C0D0A226A09632023324232423242222C0D0A22
-      6B09632023384638463846222C0D0A226C09632023353135313531222C0D0A22
-      6D09632023353335333533222C0D0A226E09632023414541454145222C0D0A22
-      6F09632023353635363536222C0D0A227009632023393439343934222C0D0A22
-      7109632023363836383638222C0D0A227209632023334433443344222C0D0A22
-      7309632023424542454245222C0D0A227409632023363236323632222C0D0A22
-      7509632023333733373337222C0D0A227609632023323932393239222C0D0A22
-      7709632023413341334133222C0D0A227809632023373637363736222C0D0A22
-      7909632023354235423542222C0D0A227A09632023333233323332222C0D0A22
-      4109632023343834383438222C0D0A224209632023343134313431222C0D0A22
-      202020202020202E2E20202020202020222C0D0A2220202020202B4040404023
-      2020202020222C0D0A222020202425262A3D232D3B2323202020222C0D0A2220
-      20203E2C2A3D232020202729232020222C0D0A22202020217E3D232020202020
-      20272320222C0D0A222020207B5D5E23202020202020202020222C0D0A222F28
-      2F7B5F5E23232323202020202020222C0D0A22203A3C5D5B7D7C313220203320
-      202020222C0D0A22202034357D3637322020383927202020222C0D0A22202020
-      303C6132202062636464272020222C0D0A222020202032322020276566676864
-      2720222C0D0A222020202020202069696A6B6C6B696969222C0D0A2220202020
-      20202020206D6E6F27202020222C0D0A22202020202020202020277071722020
-      20222C0D0A2220202027272020202773667427202020222C0D0A222020207572
-      2776647778797A20202020222C0D0A2220202020206941272742272020202020
-      227D3B0D0A040600002F2A2058504D202A2F0D0A737461746963206368617220
-      2A2075705F78706D5B5D203D207B0D0A2231362031362037322031222C0D0A22
-      200963204E6F6E65222C0D0A222E09632023394339433943222C0D0A222B0963
-      2023383338333833222C0D0A224009632023423842384238222C0D0A22230963
-      2023453645364536222C0D0A222409632023354235423542222C0D0A22250963
-      2023333633363336222C0D0A222609632023414141414141222C0D0A222A0963
-      2023323932393239222C0D0A223D09632023323432343234222C0D0A222D0963
-      2023413641364136222C0D0A223B09632023444344434443222C0D0A223E0963
-      2023454345434543222C0D0A222C09632023373137313731222C0D0A22270963
-      2023313431343134222C0D0A222909632023333933393339222C0D0A22210963
-      2023394539453945222C0D0A227E09632023444644464446222C0D0A227B0963
-      2023444544454445222C0D0A225D09632023433643364336222C0D0A225E0963
-      2023333133313331222C0D0A222F09632023313931393139222C0D0A22280963
-      2023363936393639222C0D0A225F09632023414341434143222C0D0A223A0963
-      2023433743374337222C0D0A223C09632023453445344534222C0D0A225B0963
-      2023383138313831222C0D0A227D09632023313631363136222C0D0A227C0963
-      2023334333433343222C0D0A223109632023394439443944222C0D0A22320963
-      2023414441444144222C0D0A223309632023453145314531222C0D0A22340963
-      2023453045304530222C0D0A223509632023443644364436222C0D0A22360963
-      2023343134313431222C0D0A223709632023314131413141222C0D0A22380963
-      2023364136413641222C0D0A223909632023423342334233222C0D0A22300963
-      2023423142314231222C0D0A226109632023414541454145222C0D0A22620963
-      2023424542454245222C0D0A226309632023383938393839222C0D0A22640963
-      2023313831383138222C0D0A226509632023324632463246222C0D0A22660963
-      2023393839383938222C0D0A226709632023423442344234222C0D0A22680963
-      2023423242324232222C0D0A226909632023414641464146222C0D0A226A0963
-      2023413841384138222C0D0A226B09632023443244324432222C0D0A226C0963
-      2023343234323432222C0D0A226D09632023313531353135222C0D0A226E0963
-      2023423042304230222C0D0A226F09632023453345334533222C0D0A22700963
-      2023314531453145222C0D0A227109632023324532453245222C0D0A22720963
-      2023393339333933222C0D0A227309632023413941394139222C0D0A22740963
-      2023413741374137222C0D0A227509632023443444344434222C0D0A22760963
-      2023453545354535222C0D0A227709632023443844384438222C0D0A22780963
-      2023353335333533222C0D0A227909632023313731373137222C0D0A227A0963
-      2023354335433543222C0D0A224109632023443344334433222C0D0A22420963
-      2023343834383438222C0D0A224309632023353735373537222C0D0A22440963
-      2023434543454345222C0D0A224509632023454145414541222C0D0A22460963
-      2023464646464646222C0D0A224709632023443544354435222C0D0A22202020
-      20202020202020202020202020222C0D0A222020202020202020202020202020
-      2020222C0D0A22202020202020202E2B40202020202020222C0D0A2220202020
-      202023242526202020202020222C0D0A22202020202020402A3D2D3B20202020
-      20222C0D0A2220202020203E2C2729217E7B20202020222C0D0A222020202020
-      5D5E2F285F3A3C20202020222C0D0A2220202020205B7D7C315F323334202020
-      222C0D0A2220202020353637383930616234202020222C0D0A22202020206364
-      65666768696A3B332020222C0D0A222020206B6C6D24326E695F5F3A6F202022
-      2C0D0A2220202066707172695F7374735F757620222C0D0A2220207778797A61
-      6E396826747339416B222C0D0A2220206E42434445454545454545454646222C
-      0D0A2220204072474646464646464646464646222C0D0A222020753446464646
-      4646464646464646227D3B0D0A060600002F2A2058504D202A2F0D0A73746174
-      69632063686172202A20646F776E5F78706D5B5D203D207B0D0A223136203136
-      2037322031222C0D0A22200963204E6F6E65222C0D0A222E0963202344344434
-      4434222C0D0A222B09632023453045304530222C0D0A22400963202346464646
-      4646222C0D0A222309632023423842384238222C0D0A22240963202339333933
-      3933222C0D0A222509632023443544354435222C0D0A22260963202342304230
-      4230222C0D0A222A09632023343834383438222C0D0A223D0963202335373537
-      3537222C0D0A222D09632023434543454345222C0D0A223B0963202345414541
-      4541222C0D0A223E09632023443844384438222C0D0A222C0963202335333533
-      3533222C0D0A222709632023313731373137222C0D0A22290963202335433543
-      3543222C0D0A222109632023414541454145222C0D0A227E0963202342334233
-      4233222C0D0A227B09632023423242324232222C0D0A225D0963202341414141
-      4141222C0D0A225E09632023413741374137222C0D0A222F0963202341394139
-      4139222C0D0A222809632023443344334433222C0D0A225F0963202344324432
-      4432222C0D0A223A09632023393839383938222C0D0A223C0963202331453145
-      3145222C0D0A225B09632023324532453245222C0D0A227D0963202341464146
-      4146222C0D0A227C09632023414341434143222C0D0A22310963202345354535
-      4535222C0D0A223209632023343234323432222C0D0A22330963202331353135
-      3135222C0D0A223409632023354235423542222C0D0A22350963202341444144
-      4144222C0D0A223609632023433743374337222C0D0A22370963202345334533
-      4533222C0D0A223809632023383938393839222C0D0A22390963202331383138
-      3138222C0D0A223009632023324632463246222C0D0A22610963202342344234
-      4234222C0D0A226209632023413841384138222C0D0A22630963202344434443
-      4443222C0D0A226409632023453145314531222C0D0A22650963202344364436
-      4436222C0D0A226609632023343134313431222C0D0A22670963202331413141
-      3141222C0D0A226809632023364136413641222C0D0A22690963202342314231
-      4231222C0D0A226A09632023424542454245222C0D0A226B0963202338313831
-      3831222C0D0A226C09632023313631363136222C0D0A226D0963202333433343
-      3343222C0D0A226E09632023394439443944222C0D0A226F0963202343364336
-      4336222C0D0A227009632023333133313331222C0D0A22710963202331393139
-      3139222C0D0A227209632023363936393639222C0D0A22730963202345344534
-      4534222C0D0A227409632023454345434543222C0D0A22750963202337313731
-      3731222C0D0A227609632023313431343134222C0D0A22770963202333393339
-      3339222C0D0A227809632023394539453945222C0D0A22790963202344464446
-      4446222C0D0A227A09632023444544454445222C0D0A22410963202332393239
-      3239222C0D0A224209632023323432343234222C0D0A22430963202341364136
-      4136222C0D0A224409632023453645364536222C0D0A22450963202333363336
-      3336222C0D0A224609632023394339433943222C0D0A22470963202338333833
-      3833222C0D0A2220202020202020202020202020202020222C0D0A22202E2B40
-      404040404040404040404020222C0D0A22202324254040404040404040404040
-      20222C0D0A2220262A3D2D3B3B3B3B3B3B3B3B404020222C0D0A22203E2C2729
-      21267E7B5D5E2F7E285F20222C0D0A2220203A3C5B247D7C2F5E2F7C2E312020
-      222C0D0A2220205F32333435267D7C7C3637202020222C0D0A22202020383930
-      3A617B7D626364202020222C0D0A22202020656667687E69216A2B2020202022
-      2C0D0A22202020206B6C6D6E7C35642B20202020222C0D0A22202020206F7071
-      727C36732020202020222C0D0A22202020207475767778797A2020202020222C
-      0D0A2220202020202341424363202020202020222C0D0A222020202020443445
-      5D20202020202020222C0D0A2220202020202046472320202020202020222C0D
-      0A2220202020202020202020202020202020227D3B0D0A
+      4C69050000001000000010000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000FF0000000000000000
+      000000000000000000000000000000FF00000000000000000000000000000000
+      000000000000000000FF000000FF000000FF000000FF00000000000000000000
+      0000000000000000000000FF000000000000000000000000FF00000000000000
+      000000FF0000000000FF00A020FF00A020FF000000FFFFFFFF00FFFF00000000
+      00000000000000000000FFFFFF00FFFF000000000000000000000000000000FF
+      0000FFFFFE00000000FF00A020FF00A020FF000000FF00FF0000000000000000
+      00000000000000000000FF000000000000000000000000000000000000000000
+      FF0000000000000000FF00A020FF00A020FF000000FFFF0000003292E5000000
+      0000000000000000000000FF000000000000000000000000000000000000FF00
+      000000000000000000FF00A020FF00A020FF000000FF00089B00F19807000008
+      9B00F198070000FF0000FF00000000008100000000FF000000FF000000FF0000
+      00FF000000FF000000FF00A020FF00A020FF000000FF000000FF000000FF0000
+      00FF000000FF000000FF008CB50017BA8900000000FF00A020FF00A020FF00A0
+      20FF00A020FF00A020FF00A020FF00A020FF00A020FF00A020FF00A020FF00A0
+      20FF00A020FF000000FFFFFF000016DD8A00000000FF00A020FF00A020FF00A0
+      20FF00A020FF00A020FF00A020FF00A020FF00A020FF00A020FF00A020FF00A0
+      20FF00A020FF000000FFE525000027E40000000000FF000000FF000000FF0000
+      00FF000000FF000000FF00A020FF00A020FF000000FF000000FF000000FF0000
+      00FF000000FF000000FF00001E000000FF000038C200FFFFFE0000FF0000FC03
+      000004FB0000000000FF00A020FF00A020FF000000FF2DE35400220000000000
+      00000000FF0000E524000026E40000E524000026E40000FF0000FF0000000000
+      82000000FF00000000FF00A020FF00A020FF000000FF26E40000E522000024FF
+      0300FF00000000000000D1400000CC080000280000000000FF00008EB20016B7
+      8B00008EB200000000FF00A020FF00A020FF000000FF0000FF0000EC4F0022A9
+      FF0000FF00008EB21500B78B00008DAF1400B2FF0000FFFFFF00FFFF00006600
+      0000719D0000000000FF00A020FF00A020FF000000FF00099D00F29B080000FF
+      0000FFFFFE00D08A17000000FF00004DDC00DE69FF0000FF0000099DF2009B08
+      00000AA4F600000000FF000000FF000000FF000000FF00000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000028DEB7000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000FF0000000000000000
+      000000000000000000000000000000FF00000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000FF000000000000000000000000FF00000000000000
+      000000FF00000000000000A0200000A0200000000000FFFFFF00FFFF00000000
+      00000000000000000000FFFFFF00FFFF000000000000000000000000000000FF
+      0000FFFFFE000000000000A0200000A020000000000000FF0000000000000000
+      00000000000000000000FF000000000000000000000000000000000000000000
+      FF00000000000000000000A0200000A0200000000000FF0000003292E5000000
+      0000000000000000000000FF000000000000000000000000000000000000FF00
+      0000000000000000000000A0200000A020000000000000089B00F19807000008
+      9B00F198070000FF0000FF00000000008100000000FF000000FF000000FF0000
+      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
+      00FF000000FF000000FF008CB50017BA8900000000FF00007FFF00007FFF0000
+      7FFF00007FFF00007FFF00007FFF00007FFF00007FFF00007FFF00007FFF0000
+      7FFF00007FFF000000FFFFFF000016DD8A00000000FF00007FFF00007FFF0000
+      7FFF00007FFF00007FFF00007FFF00007FFF00007FFF00007FFF00007FFF0000
+      7FFF00007FFF000000FFE525000027E40000000000FF000000FF000000FF0000
+      00FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF0000
+      00FF000000FF000000FF00001E000000FF000038C200FFFFFE0000FF0000FC03
+      000004FB00000000000000A0200000A02000000000002DE35400220000000000
+      00000000FF0000E524000026E40000E524000026E40000FF0000FF0000000000
+      82000000FF000000000000A0200000A020000000000026E40000E522000024FF
+      0300FF00000000000000D1400000CC080000280000000000FF00008EB20016B7
+      8B00008EB2000000000000A0200000A02000000000000000FF0000EC4F0022A9
+      FF0000FF00008EB21500B78B00008DAF1400B2FF0000FFFFFF00FFFF00006600
+      0000719D00000000000000A0200000A020000000000000099D00F29B080000FF
+      0000FFFFFE00D08A17000000FF00004DDC00DE69FF0000FF0000099DF2009B08
+      00000AA4F6000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000028DEB7000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000144249FF144249FF0000000000FF0000000000000000
+      000000000000000000000000000000FF00000000000000000000000000000000
+      0000374784FF2E4281FF2E4281FF2E4281FF2E4281FF130087FF000000000000
+      0000000000000000000000FF000000000000000000000000FF0017444BFF3A4C
+      87FFBEC2DDFF1E2DB7FF2A35CBFF130087FF0E007EFF0F006FFF130087FF1300
+      87FF0000000000000000FFFFFF00FFFF00000000000000000000314482FFDFE1
+      EEFF1E2DB7FF2A35CBFF130087FF00A020000000000000FF0000282828FF0C00
+      5AFF130087FF00000000FF00000000000000000000000000000035457CFFB5BF
+      DCFF2A35CBFF130087FF00A0200000A0200000000000FF0000003292E5000000
+      0000282828FF130087FF00FF00000000000000000000000000002C3F7BFF7D84
+      C6FF4851CFFF130087FF00A0200000A020000000000000089B00F19807000008
+      9B00F198070000FF0000FF0000002A3E7FFF2A387DFF2A3E7FFF2C3F7BFF666D
+      B5FF4851CFFF130087FF130087FF130087FF130087FF00000000000000000000
+      00000000000000000000008CB50017BA8900283785FFBFC2DCFF7D84C6FF202B
+      C5FF1B23BEFF3D639CFF545DD5FF26366BFF00007F0000007F003A3A3AFF0000
+      7F0000007F0000000000FFFF000016DD8A0000000000384571FFCDCFE4FF1B23
+      BEFF3D669EFF5460D3FF26366BFF00007F0000007F00454545FFC3C3C3FF2828
+      28FF00007F0000000000E525000027E4000000000000000000001F3478FFBFC2
+      DCFF535CD2FF26366BFF00000000000000002C2C2CFFC4C4C4FF6D6D6DFF6D6D
+      6DFF282828FF0000000000001E000000FF000038C200FFFFFE0000FF00002636
+      6BFF26366BFF0000000000A02000282828FFB6B6B6FF727272FF4D4D4DFF5555
+      55FF6D6D6DFF282828FF0026E40000E524000026E40000FF0000FF0000000000
+      82000000FF0000000000363636FF363636FF2B2B2BFF8F8F8FFF515151FF8F8F
+      8FFF363636FF363636FF363636FFCC080000280000000000FF00008EB20016B7
+      8B00008EB2000000000000A0200000A02000535353FFAEAEAEFF565656FF2828
+      28FF00FF00008EB21500B78B00008DAF1400B2FF0000FFFFFF00FFFF00006600
+      0000719D00000000000000A0200000A02000282828FF949494FF686868FF3D3D
+      3DFFFFFFFE00D08A17000000FF00004DDC00DE69FF0000FF0000282828FF2828
+      28FF0AA4F6000000000000000000282828FFBEBEBEFF727272FF626262FF2828
+      28FF000000000000000000000000000000000000000000000000373737FF3D3D
+      3DFF282828FF292929FF6D6D6DFFA3A3A3FF767676FF5B5B5BFF323232FF0000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000014424900144249000000000000FF0000000000000000
+      000000000000000000000000000000FF00000000000000000000000000000000
+      0000374784002E4281002E4281002E4281002E42810013008700000000000000
+      0000000000000000000000FF000000000000000000000000FF0017444B003A4C
+      8700BEC2DD001E2DB7009C9C9CFF838383FFB8B8B8FF0F006F00130087001300
+      87000000000000000000FFFFFF00FFFF0000000000000000000031448200DFE1
+      EE001E2DB700E6E6E6FF5B5B5BFF363636FFAAAAAAFF00FF0000282828000C00
+      5A001300870000000000FF00000000000000000000000000000035457C00B5BF
+      DC002A35CB00B8B8B8FF292929FF242424FFA6A6A6FFDCDCDCFF3292E5000000
+      0000282828001300870000FF00000000000000000000000000002C3F7B007D84
+      C600ECECECFF717171FF141414FF393939FF9E9E9EFFDFDFDFFFDEDEDEFF0008
+      9B00F198070000FF0000FF0000002A3E7F002A387D002A3E7F002C3F7B00666D
+      B500C6C6C6FF313131FF191919FF696969FFACACACFFC7C7C7FFE4E4E4FF0000
+      00000000000000000000008CB50017BA890028378500BFC2DC007D84C600202B
+      C500818181FF161616FF3C3C3CFF9D9D9DFFACACACFFADADADFFE1E1E1FFE0E0
+      E0FF00007F0000000000FFFF000016DD8A000000000038457100CDCFE400D6D6
+      D6FF414141FF1A1A1AFF6A6A6AFFB3B3B3FFB1B1B1FFAEAEAEFFBEBEBEFFE0E0
+      E0FF00007F0000000000E525000027E4000000000000000000001F3478008989
+      89FF181818FF2F2F2FFF989898FFB4B4B4FFB2B2B2FFAFAFAFFFA8A8A8FFDCDC
+      DCFFE1E1E1FF0000000000001E000000FF000038C200FFFFFE00D2D2D2FF4242
+      42FF151515FF5B5B5BFFADADADFFB0B0B0FFAFAFAFFFACACACFFACACACFFC7C7
+      C7FFE3E3E3FF282828000026E40000E524000026E40000FF0000989898FF1E1E
+      1EFF2E2E2EFF939393FFAFAFAFFFACACACFFA9A9A9FFA7A7A7FFA9A9A9FFACAC
+      ACFFD4D4D4FFE5E5E5FF36363600CC08000028000000D8D8D8FF535353FF1717
+      17FF5C5C5CFFAEAEAEFFB0B0B0FFB3B3B3FFB2B2B2FFAAAAAAFFA7A7A7FFA9A9
+      A9FFB3B3B3FFD3D3D3FFD2D2D2FF8DAF1400B2FF0000B0B0B0FF484848FF5757
+      57FFCECECEFFEAEAEAFFEAEAEAFFEAEAEAFFEAEAEAFFEAEAEAFFEAEAEAFFEAEA
+      EAFFEAEAEAFFFFFFFFFFFFFFFFFF004DDC00DE69FF00B8B8B8FF939393FFD5D5
+      D5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000D4D4D4FFE0E0E0FFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000
+      0000000000000000000014424900144249000000000000FF0000000000000000
+      000000000000000000000000000000FF0000D4D4D4FFE0E0E0FFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFF00FF000000000000B8B8B8FF939393FFD5D5D5FFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+      FFFFFFFFFFFFFFFFFFFFFFFFFF00FFFF0000B0B0B0FF484848FF575757FFCECE
+      CEFFEAEAEAFFEAEAEAFFEAEAEAFFEAEAEAFFEAEAEAFFEAEAEAFFEAEAEAFFEAEA
+      EAFFFFFFFFFFFFFFFFFFFF00000000000000D8D8D8FF535353FF171717FF5C5C
+      5CFFAEAEAEFFB0B0B0FFB3B3B3FFB2B2B2FFAAAAAAFFA7A7A7FFA9A9A9FFB3B3
+      B3FFD3D3D3FFD2D2D2FF00FF00000000000000000000989898FF1E1E1EFF2E2E
+      2EFF939393FFAFAFAFFFACACACFFA9A9A9FFA7A7A7FFA9A9A9FFACACACFFD4D4
+      D4FFE5E5E5FF00FF0000FF0000002A3E7F002A387D00D2D2D2FF424242FF1515
+      15FF5B5B5BFFADADADFFB0B0B0FFAFAFAFFFACACACFFACACACFFC7C7C7FFE3E3
+      E3FF0000000000000000008CB50017BA890028378500BFC2DC00898989FF1818
+      18FF2F2F2FFF989898FFB4B4B4FFB2B2B2FFAFAFAFFFA8A8A8FFDCDCDCFFE1E1
+      E1FF00007F0000000000FFFF000016DD8A000000000038457100D6D6D6FF4141
+      41FF1A1A1AFF6A6A6AFFB3B3B3FFB1B1B1FFAEAEAEFFBEBEBEFFE0E0E0FFE0E0
+      E00000007F0000000000E525000027E4000000000000000000001F3478008181
+      81FF161616FF3C3C3CFF9D9D9DFFACACACFFADADADFFE1E1E1FFE0E0E0FFDCDC
+      DC00E1E1E1000000000000001E000000FF000038C200FFFFFE00D2D2D200C6C6
+      C6FF313131FF191919FF696969FFACACACFFC7C7C7FFE4E4E4FFACACAC00C7C7
+      C700E3E3E300282828000026E40000E524000026E40000FF000098989800ECEC
+      ECFF717171FF141414FF393939FF9E9E9EFFDFDFDFFFDEDEDEFFA9A9A900ACAC
+      AC00D4D4D400E5E5E50036363600CC08000028000000D8D8D800535353001717
+      1700B8B8B8FF292929FF242424FFA6A6A6FFDCDCDCFFAAAAAA00A7A7A700A9A9
+      A900B3B3B300D3D3D300D2D2D2008DAF1400B2FF0000B0B0B000484848005757
+      5700E6E6E6FF5B5B5BFF363636FFAAAAAAFFEAEAEA00EAEAEA00EAEAEA00EAEA
+      EA00EAEAEA00FFFFFF00FFFFFF00004DDC00DE69FF00B8B8B80093939300D5D5
+      D500FFFFFF009C9C9CFF838383FFB8B8B8FFFFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF000000000000000000D4D4D400E0E0E000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00
     }
   end
 end
diff --git a/ide/exttooldialog.lrs b/ide/exttooldialog.lrs
index 4307fc691b..05001db87b 100644
--- a/ide/exttooldialog.lrs
+++ b/ide/exttooldialog.lrs
@@ -4,237 +4,227 @@ LazarusResources.Add('TExternalToolDialog','FORMDATA',[
   'TPF0'#19'TExternalToolDialog'#18'ExternalToolDialog'#4'Left'#3'N'#1#6'Height'
   +#3#144#1#3'Top'#3#226#0#5'Width'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'V'
   +'ertScrollBar.Page'#3#143#1#13'ActiveControl'#7#7'ListBox'#11'BorderStyle'#7
-  +#13'bsSizeToolWin'#7'Caption'#6#18'ExternalToolDialog'#8'Position'#7#14'poSc'
-  +'reenCenter'#0#8'TToolBar'#7'ToolBar'#6'Height'#2'^'#5'Width'#3#144#1#8'Auto'
-  +'Size'#9#12'ButtonHeight'#2'.'#11'ButtonWidth'#2'/'#7'Caption'#6#7'ToolBar'#6
-  +'Images'#7#16'EnabledImageList'#14'ParentShowHint'#8#12'ShowCaptions'#9#8'Sh'
-  +'owHint'#9#8'TabOrder'#2#0#0#11'TToolButton'#14'MoveDownButton'#4'Left'#2'u'
-  +#3'Top'#2'0'#7'Caption'#6#14'MoveDownButton'#10'ImageIndex'#2#4#7'OnClick'#7
-  +#19'MoveDownButtonClick'#0#0#11'TToolButton'#12'MoveUpButton'#4'Left'#2#1#3
-  +'Top'#2'0'#7'Caption'#6#12'MoveUpButton'#10'ImageIndex'#2#3#7'OnClick'#7#17
-  +'MoveUpButtonClick'#0#0#11'TToolButton'#10'EditButton'#4'Left'#3#203#0#3'Top'
-  +#2#2#7'Caption'#6#10'EditButton'#10'ImageIndex'#2#2#7'OnClick'#7#15'EditButt'
-  +'onClick'#0#0#11'TToolButton'#12'RemoveButton'#4'Left'#2'V'#3'Top'#2#2#7'Cap'
-  +'tion'#6#12'RemoveButton'#10'ImageIndex'#2#1#7'OnClick'#7#17'RemoveButtonCli'
-  +'ck'#0#0#11'TToolButton'#9'AddButton'#4'Left'#2#1#3'Top'#2#2#7'Caption'#6#9
-  +'AddButton'#10'ImageIndex'#2#0#7'OnClick'#7#14'AddButtonClick'#0#0#11'TToolB'
-  +'utton'#11'tbSeparator'#4'Left'#3#31#1#3'Top'#2#2#5'Width'#2#23#7'Caption'#6
-  +#11'tbSeparator'#5'Style'#7#12'tbsSeparator'#0#0#0#8'TListBox'#7'ListBox'#24
-  +'AnchorSideBottom.Control'#7#8'OKButton'#6'Height'#3#13#1#3'Top'#2'^'#5'Widt'
-  +'h'#3#144#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
-  +'akBottom'#0#20'BorderSpacing.Bottom'#2#6#7'OnClick'#7#12'ListboxClick'#8'Ta'
-  +'bOrder'#2#1#8'TopIndex'#2#255#0#0#7'TBitBtn'#8'OKButton'#23'AnchorSideRight'
-  +'.Control'#7#12'CancelButton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Anc'
-  +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#3#226#0#6'Height'#2#25#3'Top'#3
-  +'q'#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#21'Constraints.MaxHeight'#2#25
-  +#20'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'
-  +#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TBitBtn'#12'CancelButton'#18'Anc'
-  +'horSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'A'
-  +'nchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'
-  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'3'#1#6'Height'#2#19#3'To'
-  +'p'#3'w'#1#5'Width'#2'W'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9
-  +#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#21'Constrai'
-  +'nts.MaxHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11
-  +'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#3#0#0#10'TImageList'#16'Ena'
-  +'bledImageList'#4'left'#2'M'#3'top'#2#24#6'Bitmap'#10'W'''#0#0'li'#5#0#0#0#16
-  +#0#0#0#16#0#0#0#155#19#0#0'/* XPM */'#13#10'static char * pkg_add_xpm[] = {'
-  +#13#10'"16 16 257 2",'#13#10'"  '#9'c None",'#13#10'". '#9'c #000000",'#13#10
-  +'"+ '#9'c #800000",'#13#10'"@ '#9'c #008000",'#13#10'"# '#9'c #808000",'#13
-  +#10'"$ '#9'c #000080",'#13#10'"% '#9'c #800080",'#13#10'"& '#9'c #008080",'
-  +#13#10'"* '#9'c #C0C0C0",'#13#10'"= '#9'c #C0DCC0",'#13#10'"- '#9'c #A6CAF0"'
-  +','#13#10'"; '#9'c #402000",'#13#10'"> '#9'c #602000",'#13#10'", '#9'c #8020'
-  +'00",'#13#10'"'' '#9'c #A02000",'#13#10'") '#9'c #C02000",'#13#10'"! '#9'c #'
-  +'E02000",'#13#10'"~ '#9'c #004000",'#13#10'"{ '#9'c #204000",'#13#10'"] '#9
-  +'c #404000",'#13#10'"^ '#9'c #604000",'#13#10'"/ '#9'c #804000",'#13#10'"( '
-  +#9'c #A04000",'#13#10'"_ '#9'c #C04000",'#13#10'": '#9'c #E04000",'#13#10'"<'
-  +' '#9'c #006000",'#13#10'"[ '#9'c #206000",'#13#10'"} '#9'c #406000",'#13#10
-  +'"| '#9'c #606000",'#13#10'"1 '#9'c #806000",'#13#10'"2 '#9'c #A06000",'#13
-  +#10'"3 '#9'c #C06000",'#13#10'"4 '#9'c #E06000",'#13#10'"5 '#9'c #008000",'
-  +#13#10'"6 '#9'c #208000",'#13#10'"7 '#9'c #408000",'#13#10'"8 '#9'c #608000"'
-  +','#13#10'"9 '#9'c #808000",'#13#10'"0 '#9'c #A08000",'#13#10'"a '#9'c #C080'
-  +'00",'#13#10'"b '#9'c #E08000",'#13#10'"c '#9'c #00A000",'#13#10'"d '#9'c #2'
-  +'0A000",'#13#10'"e '#9'c #40A000",'#13#10'"f '#9'c #60A000",'#13#10'"g '#9'c'
-  +' #80A000",'#13#10'"h '#9'c #A0A000",'#13#10'"i '#9'c #C0A000",'#13#10'"j '#9
-  +'c #E0A000",'#13#10'"k '#9'c #00C000",'#13#10'"l '#9'c #20C000",'#13#10'"m '
-  +#9'c #40C000",'#13#10'"n '#9'c #60C000",'#13#10'"o '#9'c #80C000",'#13#10'"p'
-  +' '#9'c #A0C000",'#13#10'"q '#9'c #C0C000",'#13#10'"r '#9'c #E0C000",'#13#10
-  +'"s '#9'c #00E000",'#13#10'"t '#9'c #20E000",'#13#10'"u '#9'c #40E000",'#13
-  +#10'"v '#9'c #60E000",'#13#10'"w '#9'c #80E000",'#13#10'"x '#9'c #A0E000",'
-  +#13#10'"y '#9'c #C0E000",'#13#10'"z '#9'c #E0E000",'#13#10'"A '#9'c #000040"'
-  +','#13#10'"B '#9'c #200040",'#13#10'"C '#9'c #400040",'#13#10'"D '#9'c #6000'
-  +'40",'#13#10'"E '#9'c #800040",'#13#10'"F '#9'c #A00040",'#13#10'"G '#9'c #C'
-  +'00040",'#13#10'"H '#9'c #E00040",'#13#10'"I '#9'c #002040",'#13#10'"J '#9'c'
-  ,' #202040",'#13#10'"K '#9'c #402040",'#13#10'"L '#9'c #602040",'#13#10'"M '#9
-  +'c #802040",'#13#10'"N '#9'c #A02040",'#13#10'"O '#9'c #C02040",'#13#10'"P '
-  +#9'c #E02040",'#13#10'"Q '#9'c #004040",'#13#10'"R '#9'c #204040",'#13#10'"S'
-  +' '#9'c #404040",'#13#10'"T '#9'c #604040",'#13#10'"U '#9'c #804040",'#13#10
-  +'"V '#9'c #A04040",'#13#10'"W '#9'c #C04040",'#13#10'"X '#9'c #E04040",'#13
-  +#10'"Y '#9'c #006040",'#13#10'"Z '#9'c #206040",'#13#10'"` '#9'c #406040",'
-  +#13#10'" .'#9'c #606040",'#13#10'"..'#9'c #806040",'#13#10'"+.'#9'c #A06040"'
-  +','#13#10'"@.'#9'c #C06040",'#13#10'"#.'#9'c #E06040",'#13#10'"$.'#9'c #0080'
-  +'40",'#13#10'"%.'#9'c #208040",'#13#10'"&.'#9'c #408040",'#13#10'"*.'#9'c #6'
-  +'08040",'#13#10'"=.'#9'c #808040",'#13#10'"-.'#9'c #A08040",'#13#10'";.'#9'c'
-  +' #C08040",'#13#10'">.'#9'c #E08040",'#13#10'",.'#9'c #00A040",'#13#10'"''.'
-  +#9'c #20A040",'#13#10'").'#9'c #40A040",'#13#10'"!.'#9'c #60A040",'#13#10'"~'
-  +'.'#9'c #80A040",'#13#10'"{.'#9'c #A0A040",'#13#10'"].'#9'c #C0A040",'#13#10
-  +'"^.'#9'c #E0A040",'#13#10'"/.'#9'c #00C040",'#13#10'"(.'#9'c #20C040",'#13
-  +#10'"_.'#9'c #40C040",'#13#10'":.'#9'c #60C040",'#13#10'"<.'#9'c #80C040",'
-  +#13#10'"[.'#9'c #A0C040",'#13#10'"}.'#9'c #C0C040",'#13#10'"|.'#9'c #E0C040"'
-  +','#13#10'"1.'#9'c #00E040",'#13#10'"2.'#9'c #20E040",'#13#10'"3.'#9'c #40E0'
-  +'40",'#13#10'"4.'#9'c #60E040",'#13#10'"5.'#9'c #80E040",'#13#10'"6.'#9'c #A'
-  +'0E040",'#13#10'"7.'#9'c #C0E040",'#13#10'"8.'#9'c #E0E040",'#13#10'"9.'#9'c'
-  +' #000080",'#13#10'"0.'#9'c #200080",'#13#10'"a.'#9'c #400080",'#13#10'"b.'#9
-  +'c #600080",'#13#10'"c.'#9'c #800080",'#13#10'"d.'#9'c #A00080",'#13#10'"e.'
-  +#9'c #C00080",'#13#10'"f.'#9'c #E00080",'#13#10'"g.'#9'c #002080",'#13#10'"h'
-  +'.'#9'c #202080",'#13#10'"i.'#9'c #402080",'#13#10'"j.'#9'c #602080",'#13#10
-  +'"k.'#9'c #802080",'#13#10'"l.'#9'c #A02080",'#13#10'"m.'#9'c #C02080",'#13
-  +#10'"n.'#9'c #E02080",'#13#10'"o.'#9'c #004080",'#13#10'"p.'#9'c #204080",'
-  +#13#10'"q.'#9'c #404080",'#13#10'"r.'#9'c #604080",'#13#10'"s.'#9'c #804080"'
-  +','#13#10'"t.'#9'c #A04080",'#13#10'"u.'#9'c #C04080",'#13#10'"v.'#9'c #E040'
-  +'80",'#13#10'"w.'#9'c #006080",'#13#10'"x.'#9'c #206080",'#13#10'"y.'#9'c #4'
-  +'06080",'#13#10'"z.'#9'c #606080",'#13#10'"A.'#9'c #806080",'#13#10'"B.'#9'c'
-  +' #A06080",'#13#10'"C.'#9'c #C06080",'#13#10'"D.'#9'c #E06080",'#13#10'"E.'#9
-  +'c #008080",'#13#10'"F.'#9'c #208080",'#13#10'"G.'#9'c #408080",'#13#10'"H.'
-  +#9'c #608080",'#13#10'"I.'#9'c #808080",'#13#10'"J.'#9'c #A08080",'#13#10'"K'
-  +'.'#9'c #C08080",'#13#10'"L.'#9'c #E08080",'#13#10'"M.'#9'c #00A080",'#13#10
-  +'"N.'#9'c #20A080",'#13#10'"O.'#9'c #40A080",'#13#10'"P.'#9'c #60A080",'#13
-  +#10'"Q.'#9'c #80A080",'#13#10'"R.'#9'c #A0A080",'#13#10'"S.'#9'c #C0A080",'
-  +#13#10'"T.'#9'c #E0A080",'#13#10'"U.'#9'c #00C080",'#13#10'"V.'#9'c #20C080"'
-  +','#13#10'"W.'#9'c #40C080",'#13#10'"X.'#9'c #60C080",'#13#10'"Y.'#9'c #80C0'
-  +'80",'#13#10'"Z.'#9'c #A0C080",'#13#10'"`.'#9'c #C0C080",'#13#10'" +'#9'c #E'
-  +'0C080",'#13#10'".+'#9'c #00E080",'#13#10'"++'#9'c #20E080",'#13#10'"@+'#9'c'
-  +' #40E080",'#13#10'"#+'#9'c #60E080",'#13#10'"$+'#9'c #80E080",'#13#10'"%+'#9
-  +'c #A0E080",'#13#10'"&+'#9'c #C0E080",'#13#10'"*+'#9'c #E0E080",'#13#10'"=+'
-  +#9'c #0000C0",'#13#10'"-+'#9'c #2000C0",'#13#10'";+'#9'c #4000C0",'#13#10'">'
-  +'+'#9'c #6000C0",'#13#10'",+'#9'c #8000C0",'#13#10'"''+'#9'c #A000C0",'#13#10
-  +'")+'#9'c #C000C0",'#13#10'"!+'#9'c #E000C0",'#13#10'"~+'#9'c #0020C0",'#13
-  +#10'"{+'#9'c #2020C0",'#13#10'"]+'#9'c #4020C0",'#13#10'"^+'#9'c #6020C0",'
-  +#13#10'"/+'#9'c #8020C0",'#13#10'"(+'#9'c #A020C0",'#13#10'"_+'#9'c #C020C0"'
-  +','#13#10'":+'#9'c #E020C0",'#13#10'"<+'#9'c #0040C0",'#13#10'"[+'#9'c #2040'
-  +'C0",'#13#10'"}+'#9'c #4040C0",'#13#10'"|+'#9'c #6040C0",'#13#10'"1+'#9'c #8'
-  +'040C0",'#13#10'"2+'#9'c #A040C0",'#13#10'"3+'#9'c #C040C0",'#13#10'"4+'#9'c'
-  +' #E040C0",'#13#10'"5+'#9'c #0060C0",'#13#10'"6+'#9'c #2060C0",'#13#10'"7+'#9
-  +'c #4060C0",'#13#10'"8+'#9'c #6060C0",'#13#10'"9+'#9'c #8060C0",'#13#10'"0+'
-  +#9'c #A060C0",'#13#10'"a+'#9'c #C060C0",'#13#10'"b+'#9'c #E060C0",'#13#10'"c'
-  +'+'#9'c #0080C0",'#13#10'"d+'#9'c #2080C0",'#13#10'"e+'#9'c #4080C0",'#13#10
-  +'"f+'#9'c #6080C0",'#13#10'"g+'#9'c #8080C0",'#13#10'"h+'#9'c #A080C0",'#13
-  +#10'"i+'#9'c #C080C0",'#13#10'"j+'#9'c #E080C0",'#13#10'"k+'#9'c #00A0C0",'
-  +#13#10'"l+'#9'c #20A0C0",'#13#10'"m+'#9'c #40A0C0",'#13#10'"n+'#9'c #60A0C0"'
-  +','#13#10'"o+'#9'c #80A0C0",'#13#10'"p+'#9'c #A0A0C0",'#13#10'"q+'#9'c #C0A0'
-  +'C0",'#13#10'"r+'#9'c #E0A0C0",'#13#10'"s+'#9'c #00C0C0",'#13#10'"t+'#9'c #2'
-  +'0C0C0",'#13#10'"u+'#9'c #40C0C0",'#13#10'"v+'#9'c #60C0C0",'#13#10'"w+'#9'c'
-  +' #80C0C0",'#13#10'"x+'#9'c #A0C0C0",'#13#10'"y+'#9'c #FFFBF0",'#13#10'"z+'#9
-  +'c #A0A0A4",'#13#10'"A+'#9'c #808080",'#13#10'"B+'#9'c #FF0000",'#13#10'"C+'
-  +#9'c #00FF00",'#13#10'"D+'#9'c #FFFF00",'#13#10'"E+'#9'c #0000FF",'#13#10'"F'
-  +'+'#9'c #FF00FF",'#13#10'"G+'#9'c #00FFFF",'#13#10'"H+'#9'c #FFFFFF",'#13#10
-  +'"                                ",'#13#10'"            . . . .            '
-  ,' ",'#13#10'"            . d d .             ",'#13#10'"            . d d . '
-  +'            ",'#13#10'"            . d d .             ",'#13#10'"         '
-  +'   . d d .             ",'#13#10'"  . . . . . . d d . . . . . .   ",'#13#10
-  +'"  . d d d d d d d d d d d d .   ",'#13#10'"  . d d d d d d d d d d d d .  '
-  +' ",'#13#10'"  . . . . . . d d . . . . . .   ",'#13#10'"            . d d . '
-  +'            ",'#13#10'"            . d d .             ",'#13#10'"         '
-  +'   . d d .             ",'#13#10'"            . d d .             ",'#13#10
-  +'"            . . . .             ",'#13#10'"                               '
-  +' "};'#13#10#183#1#0#0'/* XPM */'#13#10'static char * delete_xpm[] = {'#13#10
-  +'"16 16 3 1",'#13#10'" '#9'c None",'#13#10'".'#9'c #000000",'#13#10'"+'#9'c '
-  +'#7F0000",'#13#10'"                ",'#13#10'"                ",'#13#10'"   '
-  +'             ",'#13#10'"                ",'#13#10'"                ",'#13#10
-  +'"                ",'#13#10'" .............. ",'#13#10'" .++++++++++++. ",'
-  +#13#10'" .++++++++++++. ",'#13#10'" .............. ",'#13#10'"              '
-  +'  ",'#13#10'"                ",'#13#10'"                ",'#13#10'"        '
-  +'        ",'#13#10'"                ",'#13#10'"                "};'#13#10#217
-  +#5#0#0'/* XPM */'#13#10'static char * pkg_package_circle_xpm[] = {'#13#10'"1'
-  +'6 17 67 1",'#13#10'" '#9'c None",'#13#10'".'#9'c #494214",'#13#10'"+'#9'c #'
-  +'844737",'#13#10'"@'#9'c #81422E",'#13#10'"#'#9'c #870013",'#13#10'"$'#9'c #'
-  +'4B4417",'#13#10'"%'#9'c #874C3A",'#13#10'"&'#9'c #DDC2BE",'#13#10'"*'#9'c #'
-  +'B72D1E",'#13#10'"='#9'c #CB352A",'#13#10'"-'#9'c #7E000E",'#13#10'";'#9'c #'
-  +'6F000F",'#13#10'">'#9'c #824431",'#13#10'",'#9'c #EEE1DF",'#13#10'"'''#9'c '
-  +'#282828",'#13#10'")'#9'c #5A000C",'#13#10'"!'#9'c #7C4535",'#13#10'"~'#9'c '
-  +'#DCBFB5",'#13#10'"{'#9'c #7B3F2C",'#13#10'"]'#9'c #C6847D",'#13#10'"^'#9'c '
-  +'#CF5148",'#13#10'"/'#9'c #7F3E2A",'#13#10'"('#9'c #7D382A",'#13#10'"_'#9'c '
-  +'#B56D66",'#13#10'":'#9'c #853728",'#13#10'"<'#9'c #DCC2BF",'#13#10'"['#9'c '
-  +'#C52B20",'#13#10'"}'#9'c #BE231B",'#13#10'"|'#9'c #9C633D",'#13#10'"1'#9'c '
-  +'#D55D54",'#13#10'"2'#9'c #6B3626",'#13#10'"3'#9'c #3A3A3A",'#13#10'"4'#9'c '
-  +'#714538",'#13#10'"5'#9'c #E4CFCD",'#13#10'"6'#9'c #9E663D",'#13#10'"7'#9'c '
-  +'#D36054",'#13#10'"8'#9'c #454545",'#13#10'"9'#9'c #C3C3C3",'#13#10'"0'#9'c '
-  +'#78341F",'#13#10'"a'#9'c #D25C53",'#13#10'"b'#9'c #2C2C2C",'#13#10'"c'#9'c '
-  +'#C4C4C4",'#13#10'"d'#9'c #6D6D6D",'#13#10'"e'#9'c #B6B6B6",'#13#10'"f'#9'c '
-  +'#727272",'#13#10'"g'#9'c #4D4D4D",'#13#10'"h'#9'c #555555",'#13#10'"i'#9'c '
-  +'#363636",'#13#10'"j'#9'c #2B2B2B",'#13#10'"k'#9'c #8F8F8F",'#13#10'"l'#9'c '
-  +'#515151",'#13#10'"m'#9'c #535353",'#13#10'"n'#9'c #AEAEAE",'#13#10'"o'#9'c '
-  +'#565656",'#13#10'"p'#9'c #949494",'#13#10'"q'#9'c #686868",'#13#10'"r'#9'c '
-  +'#3D3D3D",'#13#10'"s'#9'c #BEBEBE",'#13#10'"t'#9'c #626262",'#13#10'"u'#9'c '
-  +'#373737",'#13#10'"v'#9'c #292929",'#13#10'"w'#9'c #A3A3A3",'#13#10'"x'#9'c '
-  +'#767676",'#13#10'"y'#9'c #5B5B5B",'#13#10'"z'#9'c #323232",'#13#10'"A'#9'c '
-  +'#484848",'#13#10'"B'#9'c #414141",'#13#10'"       ..       ",'#13#10'"     '
-  +'+@@@@#     ",'#13#10'"   $%&*=#-;##   ",'#13#10'"   >,*=#   '')#  ",'#13#10
-  +'"   !~=#      ''# ",'#13#10'"   {]^#         ",'#13#10'"/(/{_^####      ",'
-  +#13#10'" :<][}|12  3    ",'#13#10'"  45}672  89''   ",'#13#10'"   0<a2  bcdd'
-  +'''  ",'#13#10'"    22  ''efghd'' ",'#13#10'"       iijklkiii",'#13#10'"    '
-  +'     mno''   ",'#13#10'"         ''pqr   ",'#13#10'"   ''''   ''sft''   ",'
-  +#13#10'"   ur''vdwxyz    ",'#13#10'"     iA''''B''     "};'#13#10#4#6#0#0'/*'
-  +' XPM */'#13#10'static char * up_xpm[] = {'#13#10'"16 16 72 1",'#13#10'" '#9
-  +'c None",'#13#10'".'#9'c #9C9C9C",'#13#10'"+'#9'c #838383",'#13#10'"@'#9'c #'
-  +'B8B8B8",'#13#10'"#'#9'c #E6E6E6",'#13#10'"$'#9'c #5B5B5B",'#13#10'"%'#9'c #'
-  +'363636",'#13#10'"&'#9'c #AAAAAA",'#13#10'"*'#9'c #292929",'#13#10'"='#9'c #'
-  +'242424",'#13#10'"-'#9'c #A6A6A6",'#13#10'";'#9'c #DCDCDC",'#13#10'">'#9'c #'
-  +'ECECEC",'#13#10'",'#9'c #717171",'#13#10'"'''#9'c #141414",'#13#10'")'#9'c '
-  +'#393939",'#13#10'"!'#9'c #9E9E9E",'#13#10'"~'#9'c #DFDFDF",'#13#10'"{'#9'c '
-  +'#DEDEDE",'#13#10'"]'#9'c #C6C6C6",'#13#10'"^'#9'c #313131",'#13#10'"/'#9'c '
-  +'#191919",'#13#10'"('#9'c #696969",'#13#10'"_'#9'c #ACACAC",'#13#10'":'#9'c '
-  +'#C7C7C7",'#13#10'"<'#9'c #E4E4E4",'#13#10'"['#9'c #818181",'#13#10'"}'#9'c '
-  +'#161616",'#13#10'"|'#9'c #3C3C3C",'#13#10'"1'#9'c #9D9D9D",'#13#10'"2'#9'c '
-  +'#ADADAD",'#13#10'"3'#9'c #E1E1E1",'#13#10'"4'#9'c #E0E0E0",'#13#10'"5'#9'c '
-  +'#D6D6D6",'#13#10'"6'#9'c #414141",'#13#10'"7'#9'c #1A1A1A",'#13#10'"8'#9'c '
-  +'#6A6A6A",'#13#10'"9'#9'c #B3B3B3",'#13#10'"0'#9'c #B1B1B1",'#13#10'"a'#9'c '
-  +'#AEAEAE",'#13#10'"b'#9'c #BEBEBE",'#13#10'"c'#9'c #898989",'#13#10'"d'#9'c '
-  +'#181818",'#13#10'"e'#9'c #2F2F2F",'#13#10'"f'#9'c #989898",'#13#10'"g'#9'c '
-  +'#B4B4B4",'#13#10'"h'#9'c #B2B2B2",'#13#10'"i'#9'c #AFAFAF",'#13#10'"j'#9'c '
-  +'#A8A8A8",'#13#10'"k'#9'c #D2D2D2",'#13#10'"l'#9'c #424242",'#13#10'"m'#9'c '
-  ,'#151515",'#13#10'"n'#9'c #B0B0B0",'#13#10'"o'#9'c #E3E3E3",'#13#10'"p'#9'c '
-  +'#1E1E1E",'#13#10'"q'#9'c #2E2E2E",'#13#10'"r'#9'c #939393",'#13#10'"s'#9'c '
-  +'#A9A9A9",'#13#10'"t'#9'c #A7A7A7",'#13#10'"u'#9'c #D4D4D4",'#13#10'"v'#9'c '
-  +'#E5E5E5",'#13#10'"w'#9'c #D8D8D8",'#13#10'"x'#9'c #535353",'#13#10'"y'#9'c '
-  +'#171717",'#13#10'"z'#9'c #5C5C5C",'#13#10'"A'#9'c #D3D3D3",'#13#10'"B'#9'c '
-  +'#484848",'#13#10'"C'#9'c #575757",'#13#10'"D'#9'c #CECECE",'#13#10'"E'#9'c '
-  +'#EAEAEA",'#13#10'"F'#9'c #FFFFFF",'#13#10'"G'#9'c #D5D5D5",'#13#10'"       '
-  +'         ",'#13#10'"                ",'#13#10'"       .+@      ",'#13#10'" '
-  +'     #$%&      ",'#13#10'"      @*=-;     ",'#13#10'"     >,'')!~{    ",'#13
-  +#10'"     ]^/(_:<    ",'#13#10'"     [}|1_234   ",'#13#10'"    567890ab4   "'
-  +','#13#10'"    cdefghij;3  ",'#13#10'"   klm$2ni__:o  ",'#13#10'"   fpqri_st'
-  +'s_uv ",'#13#10'"  wxyzan9h&ts9Ak",'#13#10'"  nBCDEEEEEEEEFF",'#13#10'"  @rG'
-  +'FFFFFFFFFFF",'#13#10'"  u4FFFFFFFFFFFF"};'#13#10#6#6#0#0'/* XPM */'#13#10's'
-  +'tatic char * down_xpm[] = {'#13#10'"16 16 72 1",'#13#10'" '#9'c None",'#13
-  +#10'".'#9'c #D4D4D4",'#13#10'"+'#9'c #E0E0E0",'#13#10'"@'#9'c #FFFFFF",'#13
-  +#10'"#'#9'c #B8B8B8",'#13#10'"$'#9'c #939393",'#13#10'"%'#9'c #D5D5D5",'#13
-  +#10'"&'#9'c #B0B0B0",'#13#10'"*'#9'c #484848",'#13#10'"='#9'c #575757",'#13
-  +#10'"-'#9'c #CECECE",'#13#10'";'#9'c #EAEAEA",'#13#10'">'#9'c #D8D8D8",'#13
-  +#10'",'#9'c #535353",'#13#10'"'''#9'c #171717",'#13#10'")'#9'c #5C5C5C",'#13
-  +#10'"!'#9'c #AEAEAE",'#13#10'"~'#9'c #B3B3B3",'#13#10'"{'#9'c #B2B2B2",'#13
-  +#10'"]'#9'c #AAAAAA",'#13#10'"^'#9'c #A7A7A7",'#13#10'"/'#9'c #A9A9A9",'#13
-  +#10'"('#9'c #D3D3D3",'#13#10'"_'#9'c #D2D2D2",'#13#10'":'#9'c #989898",'#13
-  +#10'"<'#9'c #1E1E1E",'#13#10'"['#9'c #2E2E2E",'#13#10'"}'#9'c #AFAFAF",'#13
-  +#10'"|'#9'c #ACACAC",'#13#10'"1'#9'c #E5E5E5",'#13#10'"2'#9'c #424242",'#13
-  +#10'"3'#9'c #151515",'#13#10'"4'#9'c #5B5B5B",'#13#10'"5'#9'c #ADADAD",'#13
-  +#10'"6'#9'c #C7C7C7",'#13#10'"7'#9'c #E3E3E3",'#13#10'"8'#9'c #898989",'#13
-  +#10'"9'#9'c #181818",'#13#10'"0'#9'c #2F2F2F",'#13#10'"a'#9'c #B4B4B4",'#13
-  +#10'"b'#9'c #A8A8A8",'#13#10'"c'#9'c #DCDCDC",'#13#10'"d'#9'c #E1E1E1",'#13
-  +#10'"e'#9'c #D6D6D6",'#13#10'"f'#9'c #414141",'#13#10'"g'#9'c #1A1A1A",'#13
-  +#10'"h'#9'c #6A6A6A",'#13#10'"i'#9'c #B1B1B1",'#13#10'"j'#9'c #BEBEBE",'#13
-  +#10'"k'#9'c #818181",'#13#10'"l'#9'c #161616",'#13#10'"m'#9'c #3C3C3C",'#13
-  +#10'"n'#9'c #9D9D9D",'#13#10'"o'#9'c #C6C6C6",'#13#10'"p'#9'c #313131",'#13
-  +#10'"q'#9'c #191919",'#13#10'"r'#9'c #696969",'#13#10'"s'#9'c #E4E4E4",'#13
-  +#10'"t'#9'c #ECECEC",'#13#10'"u'#9'c #717171",'#13#10'"v'#9'c #141414",'#13
-  +#10'"w'#9'c #393939",'#13#10'"x'#9'c #9E9E9E",'#13#10'"y'#9'c #DFDFDF",'#13
-  +#10'"z'#9'c #DEDEDE",'#13#10'"A'#9'c #292929",'#13#10'"B'#9'c #242424",'#13
-  +#10'"C'#9'c #A6A6A6",'#13#10'"D'#9'c #E6E6E6",'#13#10'"E'#9'c #363636",'#13
-  +#10'"F'#9'c #9C9C9C",'#13#10'"G'#9'c #838383",'#13#10'"                ",'#13
-  +#10'" .+@@@@@@@@@@@@ ",'#13#10'" #$%@@@@@@@@@@@ ",'#13#10'" &*=-;;;;;;;;@@ "'
-  +','#13#10'" >,'')!&~{]^/~(_ ",'#13#10'"  :<[$}|/^/|.1  ",'#13#10'"  _2345&}|'
-  +'|67   ",'#13#10'"   890:a{}bcd   ",'#13#10'"   efgh~i!j+    ",'#13#10'"    '
-  +'klmn|5d+    ",'#13#10'"    opqr|6s     ",'#13#10'"    tuvwxyz     ",'#13#10
-  +'"     #ABCc      ",'#13#10'"     D4E]       ",'#13#10'"      FG#       ",'
-  +#13#10'"                "};'#13#10#0#0#0
+  +#13'bsSizeToolWin'#7'Caption'#6#18'ExternalToolDialog'#12'ClientHeight'#3#144
+  +#1#11'ClientWidth'#3#144#1#8'Position'#7#14'poScreenCenter'#0#8'TToolBar'#7
+  +'ToolBar'#6'Height'#2'^'#5'Width'#3#144#1#8'AutoSize'#9#12'ButtonHeight'#2'.'
+  +#11'ButtonWidth'#2'/'#7'Caption'#6#7'ToolBar'#6'Images'#7#16'EnabledImageLis'
+  +'t'#14'ParentShowHint'#8#12'ShowCaptions'#9#8'ShowHint'#9#8'TabOrder'#2#0#0
+  +#11'TToolButton'#14'MoveDownButton'#4'Left'#2#1#3'Top'#2'0'#7'Caption'#6#14
+  +'MoveDownButton'#10'ImageIndex'#2#4#7'OnClick'#7#19'MoveDownButtonClick'#0#0
+  +#11'TToolButton'#12'MoveUpButton'#4'Left'#3#21#1#3'Top'#2#2#7'Caption'#6#12
+  +'MoveUpButton'#10'ImageIndex'#2#3#7'OnClick'#7#17'MoveUpButtonClick'#0#0#11
+  +'TToolButton'#10'EditButton'#4'Left'#3#179#0#3'Top'#2#2#7'Caption'#6#10'Edit'
+  +'Button'#10'ImageIndex'#2#2#7'OnClick'#7#15'EditButtonClick'#0#0#11'TToolBut'
+  +'ton'#12'RemoveButton'#4'Left'#2'M'#3'Top'#2#2#7'Caption'#6#12'RemoveButton'
+  +#10'ImageIndex'#2#1#7'OnClick'#7#17'RemoveButtonClick'#0#0#11'TToolButton'#9
+  +'AddButton'#4'Left'#2#1#3'Top'#2#2#7'Caption'#6#9'AddButton'#10'ImageIndex'#2
+  +#0#7'OnClick'#7#14'AddButtonClick'#0#0#11'TToolButton'#11'tbSeparator'#4'Lef'
+  +'t'#3#254#0#3'Top'#2#2#5'Width'#2#23#7'Caption'#6#11'tbSeparator'#5'Style'#7
+  +#12'tbsSeparator'#0#0#0#8'TListBox'#7'ListBox'#24'AnchorSideBottom.Control'#7
+  +#8'BtnPanel'#6'Height'#3#250#0#3'Top'#2'^'#5'Width'#3#144#1#5'Align'#7#5'alT'
+  +'op'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpac'
+  +'ing.Bottom'#2#6#7'OnClick'#7#12'ListboxClick'#8'TabOrder'#2#1#8'TopIndex'#2
+  +#255#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'2'#3'Top'#3'^'#1#5'Width'#3#144#1
+  +#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHe'
+  +'ight'#2'2'#11'ClientWidth'#3#144#1#8'TabOrder'#2#2#0#7'TBitBtn'#8'OKButton'
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#227#0#6'Height'#2'&'#3'T'
+  +'op'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.'
+  +'Around'#2#6#7'Caption'#6#3'&OK'#20'Constraints.MinWidth'#2'K'#7'Default'#9#4
+  +'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7
+  +'TBitBtn'#12'CancelButton'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSi'
+  +'deRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Lef'
+  +'t'#3'4'#1#6'Height'#2'&'#3'Top'#2#6#5'Width'#2'V'#5'Align'#7#7'alRight'#8'A'
+  +'utoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'
+  +#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'N'
+  +'umGlyphs'#2#0#8'TabOrder'#2#1#0#0#0#10'TImageList'#16'EnabledImageList'#4'l'
+  +'eft'#2'M'#3'top'#2#24#6'Bitmap'#10#14#20#0#0'Li'#5#0#0#0#16#0#0#0#16#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0
+  +#0#0#0#0#255#0#0#0#0#0#255#0#160' '#255#0#160' '#255#0#0#0#255#255#255#255#0
+  +#255#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#255#255#0#255#255#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#255#0#0#255#255#254#0#0#0#0#255#0#160' '#255#0#160' '#255#0#0#0
+  +#255#0#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#255#0#160' '#255#0#160' '#255#0#0#0#255
+  +#255#0#0#0'2'#146#229#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#255#0#160' '#255#0#160' '#255#0#0#0#255
+  +#0#8#155#0#241#152#7#0#0#8#155#0#241#152#7#0#0#255#0#0#255#0#0#0#0#0#129#0#0
+  +#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#160' '#255#0#160
+  +' '#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#140#181
+  +#0#23#186#137#0#0#0#0#255#0#160' '#255#0#160' '#255#0#160' '#255#0#160' '#255
+  +#0#160' '#255#0#160' '#255#0#160' '#255#0#160' '#255#0#160' '#255#0#160' '
+  +#255#0#160' '#255#0#160' '#255#0#0#0#255#255#255#0#0#22#221#138#0#0#0#0#255#0
+  +#160' '#255#0#160' '#255#0#160' '#255#0#160' '#255#0#160' '#255#0#160' '#255
+  +#0#160' '#255#0#160' '#255#0#160' '#255#0#160' '#255#0#160' '#255#0#160' '
+  +#255#0#0#0#255#229'%'#0#0''''#228#0#0#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255
+  +#0#0#0#255#0#0#0#255#0#160' '#255#0#160' '#255#0#0#0#255#0#0#0#255#0#0#0#255
+  +#0#0#0#255#0#0#0#255#0#0#0#255#0#0#30#0#0#0#255#0#0'8'#194#0#255#255#254#0#0
+  +#255#0#0#252#3#0#0#4#251#0#0#0#0#0#255#0#160' '#255#0#160' '#255#0#0#0#255'-'
+  +#227'T'#0'"'#0#0#0#0#0#0#0#0#0#255#0#0#229'$'#0#0'&'#228#0#0#229'$'#0#0'&'
+  +#228#0#0#255#0#0#255#0#0#0#0#0#130#0#0#0#255#0#0#0#0#255#0#160' '#255#0#160
+  +' '#255#0#0#0#255'&'#228#0#0#229'"'#0#0'$'#255#3#0#255#0#0#0#0#0#0#0#209'@'#0
+  +#0#204#8#0#0'('#0#0#0#0#0#255#0#0#142#178#0#22#183#139#0#0#142#178#0#0#0#0
+  ,#255#0#160' '#255#0#160' '#255#0#0#0#255#0#0#255#0#0#236'O'#0'"'#169#255#0#0
+  +#255#0#0#142#178#21#0#183#139#0#0#141#175#20#0#178#255#0#0#255#255#255#0#255
+  +#255#0#0'f'#0#0#0'q'#157#0#0#0#0#0#255#0#160' '#255#0#160' '#255#0#0#0#255#0
+  +#9#157#0#242#155#8#0#0#255#0#0#255#255#254#0#208#138#23#0#0#0#255#0#0'M'#220
+  +#0#222'i'#255#0#0#255#0#0#9#157#242#0#155#8#0#0#10#164#246#0#0#0#0#255#0#0#0
+  +#255#0#0#0#255#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0'('#222#183#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#255#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#160
+  +' '#0#0#160' '#0#0#0#0#0#255#255#255#0#255#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#255#255#255#0#255#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#255#255#254#0#0
+  +#0#0#0#0#160' '#0#0#160' '#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#160
+  +' '#0#0#160' '#0#0#0#0#0#255#0#0#0'2'#146#229#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#160' '#0#0
+  +#160' '#0#0#0#0#0#0#8#155#0#241#152#7#0#0#8#155#0#241#152#7#0#0#255#0#0#255#0
+  +#0#0#0#0#129#0#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0
+  +#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0
+  +#255#0#140#181#0#23#186#137#0#0#0#0#255#0#0''#255#0#0''#255#0#0''#255#0#0
+  +''#255#0#0''#255#0#0''#255#0#0''#255#0#0''#255#0#0''#255#0#0''#255#0#0
+  +''#255#0#0''#255#0#0#0#255#255#255#0#0#22#221#138#0#0#0#0#255#0#0''#255#0
+  +#0''#255#0#0''#255#0#0''#255#0#0''#255#0#0''#255#0#0''#255#0#0''#255#0
+  +#0''#255#0#0''#255#0#0''#255#0#0''#255#0#0#0#255#229'%'#0#0''''#228#0#0#0
+  +#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0
+  +#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#0#255#0#0#30#0#0#0
+  +#255#0#0'8'#194#0#255#255#254#0#0#255#0#0#252#3#0#0#4#251#0#0#0#0#0#0#0#160
+  +' '#0#0#160' '#0#0#0#0#0'-'#227'T'#0'"'#0#0#0#0#0#0#0#0#0#255#0#0#229'$'#0#0
+  +'&'#228#0#0#229'$'#0#0'&'#228#0#0#255#0#0#255#0#0#0#0#0#130#0#0#0#255#0#0#0#0
+  +#0#0#160' '#0#0#160' '#0#0#0#0#0'&'#228#0#0#229'"'#0#0'$'#255#3#0#255#0#0#0#0
+  +#0#0#0#209'@'#0#0#204#8#0#0'('#0#0#0#0#0#255#0#0#142#178#0#22#183#139#0#0#142
+  +#178#0#0#0#0#0#0#160' '#0#0#160' '#0#0#0#0#0#0#0#255#0#0#236'O'#0'"'#169#255
+  +#0#0#255#0#0#142#178#21#0#183#139#0#0#141#175#20#0#178#255#0#0#255#255#255#0
+  +#255#255#0#0'f'#0#0#0'q'#157#0#0#0#0#0#0#0#160' '#0#0#160' '#0#0#0#0#0#0#9
+  +#157#0#242#155#8#0#0#255#0#0#255#255#254#0#208#138#23#0#0#0#255#0#0'M'#220#0
+  +#222'i'#255#0#0#255#0#0#9#157#242#0#155#8#0#0#10#164#246#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'('
+  +#222#183#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#20'BI'#255#20'BI'#255#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'7G'#132
+  +#255'.B'#129#255'.B'#129#255'.B'#129#255'.B'#129#255#19#0#135#255#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#255#0#23'DK'#255':L'#135
+  +#255#190#194#221#255#30'-'#183#255'*5'#203#255#19#0#135#255#14#0'~'#255#15#0
+  +'o'#255#19#0#135#255#19#0#135#255#0#0#0#0#0#0#0#0#255#255#255#0#255#255#0#0#0
+  +#0#0#0#0#0#0#0'1D'#130#255#223#225#238#255#30'-'#183#255'*5'#203#255#19#0#135
+  +#255#0#160' '#0#0#0#0#0#0#255#0#0'((('#255#12#0'Z'#255#19#0#135#255#0#0#0#0
+  +#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'5E|'#255#181#191#220#255'*5'#203#255#19#0
+  +#135#255#0#160' '#0#0#160' '#0#0#0#0#0#255#0#0#0'2'#146#229#0#0#0#0#0'((('
+  +#255#19#0#135#255#0#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0',?{'#255'}'#132#198#255
+  +'HQ'#207#255#19#0#135#255#0#160' '#0#0#160' '#0#0#0#0#0#0#8#155#0#241#152#7#0
+  +#0#8#155#0#241#152#7#0#0#255#0#0#255#0#0#0'*>'#255'*8}'#255'*>'#255',?{'
+  +#255'fm'#181#255'HQ'#207#255#19#0#135#255#19#0#135#255#19#0#135#255#19#0#135
+  +#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#140#181#0#23#186#137#0'(7'#133
+  +#255#191#194#220#255'}'#132#198#255' +'#197#255#27'#'#190#255'=c'#156#255'T]'
+  +#213#255'&6k'#255#0#0''#0#0#0''#0':::'#255#0#0''#0#0#0''#0#0#0#0#0#255
+  +#255#0#0#22#221#138#0#0#0#0#0'8Eq'#255#205#207#228#255#27'#'#190#255'=f'#158
+  +#255'T`'#211#255'&6k'#255#0#0''#0#0#0''#0'EEE'#255#195#195#195#255'((('#255
+  +#0#0''#0#0#0#0#0#229'%'#0#0''''#228#0#0#0#0#0#0#0#0#0#0#31'4x'#255#191#194
+  +#220#255'S\'#210#255'&6k'#255#0#0#0#0#0#0#0#0',,,'#255#196#196#196#255'mmm'
+  +#255'mmm'#255'((('#255#0#0#0#0#0#0#30#0#0#0#255#0#0'8'#194#0#255#255#254#0#0
+  +#255#0#0'&6k'#255'&6k'#255#0#0#0#0#0#160' '#0'((('#255#182#182#182#255'rrr'
+  ,#255'MMM'#255'UUU'#255'mmm'#255'((('#255#0'&'#228#0#0#229'$'#0#0'&'#228#0#0
+  +#255#0#0#255#0#0#0#0#0#130#0#0#0#255#0#0#0#0#0'666'#255'666'#255'+++'#255#143
+  +#143#143#255'QQQ'#255#143#143#143#255'666'#255'666'#255'666'#255#204#8#0#0'('
+  +#0#0#0#0#0#255#0#0#142#178#0#22#183#139#0#0#142#178#0#0#0#0#0#0#160' '#0#0
+  +#160' '#0'SSS'#255#174#174#174#255'VVV'#255'((('#255#0#255#0#0#142#178#21#0
+  +#183#139#0#0#141#175#20#0#178#255#0#0#255#255#255#0#255#255#0#0'f'#0#0#0'q'
+  +#157#0#0#0#0#0#0#0#160' '#0#0#160' '#0'((('#255#148#148#148#255'hhh'#255'==='
+  +#255#255#255#254#0#208#138#23#0#0#0#255#0#0'M'#220#0#222'i'#255#0#0#255#0#0
+  +'((('#255'((('#255#10#164#246#0#0#0#0#0#0#0#0#0'((('#255#190#190#190#255'rrr'
+  +#255'bbb'#255'((('#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'777'
+  +#255'==='#255'((('#255')))'#255'mmm'#255#163#163#163#255'vvv'#255'[[['#255'2'
+  +'22'#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#20'BI'#0#20'BI'#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0'7G'#132#0'.B'
+  +#129#0'.B'#129#0'.B'#129#0'.B'#129#0#19#0#135#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#255#0#23'DK'#0':L'#135#0#190#194#221#0#30'-'
+  +#183#0#156#156#156#255#131#131#131#255#184#184#184#255#15#0'o'#0#19#0#135#0
+  +#19#0#135#0#0#0#0#0#0#0#0#0#255#255#255#0#255#255#0#0#0#0#0#0#0#0#0#0'1D'#130
+  +#0#223#225#238#0#30'-'#183#0#230#230#230#255'[[['#255'666'#255#170#170#170
+  +#255#0#255#0#0'((('#0#12#0'Z'#0#19#0#135#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0
+  +#0#0#0#0'5E|'#0#181#191#220#0'*5'#203#0#184#184#184#255')))'#255'$$$'#255#166
+  +#166#166#255#220#220#220#255'2'#146#229#0#0#0#0#0'((('#0#19#0#135#0#0#255#0#0
+  +#0#0#0#0#0#0#0#0#0#0#0#0',?{'#0'}'#132#198#0#236#236#236#255'qqq'#255#20#20
+  +#20#255'999'#255#158#158#158#255#223#223#223#255#222#222#222#255#0#8#155#0
+  +#241#152#7#0#0#255#0#0#255#0#0#0'*>'#0'*8}'#0'*>'#0',?{'#0'fm'#181#0#198
+  +#198#198#255'111'#255#25#25#25#255'iii'#255#172#172#172#255#199#199#199#255
+  +#228#228#228#255#0#0#0#0#0#0#0#0#0#0#0#0#0#140#181#0#23#186#137#0'(7'#133#0
+  +#191#194#220#0'}'#132#198#0' +'#197#0#129#129#129#255#22#22#22#255'<<<'#255
+  +#157#157#157#255#172#172#172#255#173#173#173#255#225#225#225#255#224#224#224
+  +#255#0#0''#0#0#0#0#0#255#255#0#0#22#221#138#0#0#0#0#0'8Eq'#0#205#207#228#0
+  +#214#214#214#255'AAA'#255#26#26#26#255'jjj'#255#179#179#179#255#177#177#177
+  +#255#174#174#174#255#190#190#190#255#224#224#224#255#0#0''#0#0#0#0#0#229'%'
+  +#0#0''''#228#0#0#0#0#0#0#0#0#0#0#31'4x'#0#137#137#137#255#24#24#24#255'///'
+  +#255#152#152#152#255#180#180#180#255#178#178#178#255#175#175#175#255#168#168
+  +#168#255#220#220#220#255#225#225#225#255#0#0#0#0#0#0#30#0#0#0#255#0#0'8'#194
+  +#0#255#255#254#0#210#210#210#255'BBB'#255#21#21#21#255'[[['#255#173#173#173
+  +#255#176#176#176#255#175#175#175#255#172#172#172#255#172#172#172#255#199#199
+  +#199#255#227#227#227#255'((('#0#0'&'#228#0#0#229'$'#0#0'&'#228#0#0#255#0#0
+  +#152#152#152#255#30#30#30#255'...'#255#147#147#147#255#175#175#175#255#172
+  +#172#172#255#169#169#169#255#167#167#167#255#169#169#169#255#172#172#172#255
+  +#212#212#212#255#229#229#229#255'666'#0#204#8#0#0'('#0#0#0#216#216#216#255'S'
+  +'SS'#255#23#23#23#255'\\\'#255#174#174#174#255#176#176#176#255#179#179#179
+  +#255#178#178#178#255#170#170#170#255#167#167#167#255#169#169#169#255#179#179
+  +#179#255#211#211#211#255#210#210#210#255#141#175#20#0#178#255#0#0#176#176#176
+  +#255'HHH'#255'WWW'#255#206#206#206#255#234#234#234#255#234#234#234#255#234
+  +#234#234#255#234#234#234#255#234#234#234#255#234#234#234#255#234#234#234#255
+  +#234#234#234#255#255#255#255#255#255#255#255#255#0'M'#220#0#222'i'#255#0#184
+  +#184#184#255#147#147#147#255#213#213#213#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#0#0#0#0
+  +#0#0#0#0#212#212#212#255#224#224#224#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#20'BI'#0#20'BI'
+  +#0#0#0#0#0#0#255#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#255#0#0#212
+  +#212#212#255#224#224#224#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#0#255#0
+  +#0#0#0#0#0#184#184#184#255#147#147#147#255#213#213#213#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255#255
+  +#255#255#255#255#255#0#255#255#0#0#176#176#176#255'HHH'#255'WWW'#255#206#206
+  +#206#255#234#234#234#255#234#234#234#255#234#234#234#255#234#234#234#255#234
+  +#234#234#255#234#234#234#255#234#234#234#255#234#234#234#255#255#255#255#255
+  ,#255#255#255#255#255#0#0#0#0#0#0#0#216#216#216#255'SSS'#255#23#23#23#255'\\\'
+  +#255#174#174#174#255#176#176#176#255#179#179#179#255#178#178#178#255#170#170
+  +#170#255#167#167#167#255#169#169#169#255#179#179#179#255#211#211#211#255#210
+  +#210#210#255#0#255#0#0#0#0#0#0#0#0#0#0#152#152#152#255#30#30#30#255'...'#255
+  +#147#147#147#255#175#175#175#255#172#172#172#255#169#169#169#255#167#167#167
+  +#255#169#169#169#255#172#172#172#255#212#212#212#255#229#229#229#255#0#255#0
+  +#0#255#0#0#0'*>'#0'*8}'#0#210#210#210#255'BBB'#255#21#21#21#255'[[['#255#173
+  +#173#173#255#176#176#176#255#175#175#175#255#172#172#172#255#172#172#172#255
+  +#199#199#199#255#227#227#227#255#0#0#0#0#0#0#0#0#0#140#181#0#23#186#137#0'(7'
+  +#133#0#191#194#220#0#137#137#137#255#24#24#24#255'///'#255#152#152#152#255
+  +#180#180#180#255#178#178#178#255#175#175#175#255#168#168#168#255#220#220#220
+  +#255#225#225#225#255#0#0''#0#0#0#0#0#255#255#0#0#22#221#138#0#0#0#0#0'8Eq'#0
+  +#214#214#214#255'AAA'#255#26#26#26#255'jjj'#255#179#179#179#255#177#177#177
+  +#255#174#174#174#255#190#190#190#255#224#224#224#255#224#224#224#0#0#0''#0#0
+  +#0#0#0#229'%'#0#0''''#228#0#0#0#0#0#0#0#0#0#0#31'4x'#0#129#129#129#255#22#22
+  +#22#255'<<<'#255#157#157#157#255#172#172#172#255#173#173#173#255#225#225#225
+  +#255#224#224#224#255#220#220#220#0#225#225#225#0#0#0#0#0#0#0#30#0#0#0#255#0#0
+  +'8'#194#0#255#255#254#0#210#210#210#0#198#198#198#255'111'#255#25#25#25#255
+  +'iii'#255#172#172#172#255#199#199#199#255#228#228#228#255#172#172#172#0#199
+  +#199#199#0#227#227#227#0'((('#0#0'&'#228#0#0#229'$'#0#0'&'#228#0#0#255#0#0
+  +#152#152#152#0#236#236#236#255'qqq'#255#20#20#20#255'999'#255#158#158#158#255
+  +#223#223#223#255#222#222#222#255#169#169#169#0#172#172#172#0#212#212#212#0
+  +#229#229#229#0'666'#0#204#8#0#0'('#0#0#0#216#216#216#0'SSS'#0#23#23#23#0#184
+  +#184#184#255')))'#255'$$$'#255#166#166#166#255#220#220#220#255#170#170#170#0
+  +#167#167#167#0#169#169#169#0#179#179#179#0#211#211#211#0#210#210#210#0#141
+  +#175#20#0#178#255#0#0#176#176#176#0'HHH'#0'WWW'#0#230#230#230#255'[[['#255'6'
+  +'66'#255#170#170#170#255#234#234#234#0#234#234#234#0#234#234#234#0#234#234
+  +#234#0#234#234#234#0#255#255#255#0#255#255#255#0#0'M'#220#0#222'i'#255#0#184
+  +#184#184#0#147#147#147#0#213#213#213#0#255#255#255#0#156#156#156#255#131#131
+  +#131#255#184#184#184#255#255#255#255#0#255#255#255#0#255#255#255#0#255#255
+  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#0#0#0#0#0#0#0#0#212#212#212
+  +#0#224#224#224#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
+  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
+  +#255#0#255#255#255#0#255#255#255#0#0#0#0
 ]);
diff --git a/ide/exttooldialog.pas b/ide/exttooldialog.pas
index f87b48b113..cb42707fba 100644
--- a/ide/exttooldialog.pas
+++ b/ide/exttooldialog.pas
@@ -44,7 +44,7 @@ uses
   LazConfigStorage, FileUtil,
   IDEExternToolIntf,
   ExtToolEditDlg, IDECommands, KeyMapping, TransferMacros, IDEProcs,
-  CompilerOptions, OutputFilter, LazarusIDEStrConsts;
+  CompilerOptions, OutputFilter, LazarusIDEStrConsts, ExtCtrls;
 
 const
   MaxExtTools = ecExtToolLast-ecExtToolFirst+1;
@@ -111,6 +111,7 @@ type
     OKButton: TBitBtn;
     CancelButton: TBitBtn;
     ListBox: TListBox;
+    BtnPanel: TPanel;
     ToolBar: TToolBar;
     AddButton: TToolButton;
     RemoveButton: TToolButton;
diff --git a/ide/findreplacedialog.lfm b/ide/findreplacedialog.lfm
index 182bfb64a9..64e0bb235b 100644
--- a/ide/findreplacedialog.lfm
+++ b/ide/findreplacedialog.lfm
@@ -22,7 +22,7 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     Left = 6
     Height = 20
     Top = 14
-    Width = 98
+    Width = 97
     Alignment = taRightJustify
     BorderSpacing.Left = 6
     Caption = 'TextToFindLabel'
@@ -48,10 +48,10 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     AnchorSideLeft.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 116
+    Left = 115
     Height = 25
     Top = 12
-    Width = 298
+    Width = 299
     Anchors = [akTop, akLeft, akRight]
     AutoComplete = True
     AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactRetainPrefixCase, cbactSearchAscending]
@@ -87,7 +87,7 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Control = BtnPanel
     Left = 6
-    Height = 253
+    Height = 252
     Top = 70
     Width = 199
     Anchors = [akTop, akLeft, akBottom]
@@ -95,7 +95,7 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     BorderSpacing.Top = 6
     BorderSpacing.Bottom = 6
     Caption = 'OptionsGroupBox'
-    ClientHeight = 234
+    ClientHeight = 233
     ClientWidth = 195
     TabOrder = 2
     OnResize = OptionsGroupBoxResize
@@ -295,19 +295,19 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     end
   end
   object BtnPanel: TPanel
-    Height = 44
-    Top = 329
+    Height = 45
+    Top = 328
     Width = 420
     Align = alBottom
     AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 44
+    ClientHeight = 45
     ClientWidth = 420
     TabOrder = 6
     object ReplaceAllButton: TBitBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 211
-      Height = 32
+      Left = 209
+      Height = 33
       Top = 6
       Width = 50
       Align = alRight
@@ -315,8 +315,6 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
       BorderSpacing.Around = 6
       BorderSpacing.InnerBorder = 2
       Caption = '&All'
-      Constraints.MaxHeight = 33
-      Constraints.MinHeight = 28
       Kind = bkAll
       NumGlyphs = 0
       OnClick = ReplaceAllButtonClick
@@ -324,17 +322,15 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     end
     object OKButton: TBitBtn
       AnchorSideBottom.Side = asrBottom
-      Left = 267
-      Height = 32
+      Left = 265
+      Height = 33
       Top = 6
-      Width = 57
+      Width = 61
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
       BorderSpacing.InnerBorder = 2
       Caption = '&OK'
-      Constraints.MaxHeight = 33
-      Constraints.MinHeight = 28
       Default = True
       Kind = bkOK
       NumGlyphs = 0
@@ -344,18 +340,16 @@ object LazFindReplaceDialog: TLazFindReplaceDialog
     object CancelButton: TBitBtn
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Side = asrBottom
-      Left = 330
-      Height = 32
+      Left = 332
+      Height = 33
       Top = 6
-      Width = 84
+      Width = 82
       Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
       BorderSpacing.InnerBorder = 2
       Cancel = True
       Caption = 'Cancel'
-      Constraints.MaxHeight = 33
-      Constraints.MinHeight = 28
       Kind = bkCancel
       ModalResult = 2
       NumGlyphs = 0
diff --git a/ide/findreplacedialog.lrs b/ide/findreplacedialog.lrs
index 2782777678..e25407aa94 100644
--- a/ide/findreplacedialog.lrs
+++ b/ide/findreplacedialog.lrs
@@ -10,7 +10,7 @@ LazarusResources.Add('TLazFindReplaceDialog','FORMDATA',[
   +#14'OnChangeBounds'#7#16'FormChangeBounds'#0#6'TLabel'#15'TextToFindLabel'#22
   +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#18'TextToFin'
   +'dComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#20
-  +#3'Top'#2#14#5'Width'#2'b'#9'Alignment'#7#14'taRightJustify'#18'BorderSpacin'
+  +#3'Top'#2#14#5'Width'#2'a'#9'Alignment'#7#14'taRightJustify'#18'BorderSpacin'
   +'g.Left'#2#6#7'Caption'#6#15'TextToFindLabel'#12'FocusControl'#7#18'TextToFi'
   +'ndComboBox'#11'ParentColor'#8#0#0#6'TLabel'#16'ReplaceWithLabel'#22'AnchorS'
   +'ideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#19'ReplaceTextCombo'
@@ -20,7 +20,7 @@ LazarusResources.Add('TLazFindReplaceDialog','FORMDATA',[
   +'oBox'#11'ParentColor'#8#0#0#9'TComboBox'#18'TextToFindComboBox'#22'AnchorSi'
   +'deLeft.Control'#7#15'TextToFindLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'
   +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
-  +'om'#4'Left'#2't'#6'Height'#2#25#3'Top'#2#12#5'Width'#3'*'#1#7'Anchors'#11#5
+  +'om'#4'Left'#2's'#6'Height'#2#25#3'Top'#2#12#5'Width'#3'+'#1#7'Anchors'#11#5
   +'akTop'#6'akLeft'#7'akRight'#0#12'AutoComplete'#9#16'AutoCompleteText'#11#12
   +'cbactEnabled'#22'cbactEndOfLineComplete'#21'cbactRetainPrefixCase'#20'cbact'
   +'SearchAscending'#0#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'#2#6#9
@@ -36,10 +36,10 @@ LazarusResources.Add('TLazFindReplaceDialog','FORMDATA',[
   +#8'TabOrder'#2#1#4'Text'#6#19'ReplaceTextComboBox'#0#0#9'TGroupBox'#15'Optio'
   +'nsGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
   +#7#19'ReplaceTextComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSi'
-  +'deBottom.Control'#7#8'BtnPanel'#4'Left'#2#6#6'Height'#3#253#0#3'Top'#2'F'#5
+  +'deBottom.Control'#7#8'BtnPanel'#4'Left'#2#6#6'Height'#3#252#0#3'Top'#2'F'#5
   +'Width'#3#199#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#18'BorderSpac'
   +'ing.Left'#2#6#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#7'Capt'
-  +'ion'#6#15'OptionsGroupBox'#12'ClientHeight'#3#234#0#11'ClientWidth'#3#195#0
+  +'ion'#6#15'OptionsGroupBox'#12'ClientHeight'#3#233#0#11'ClientWidth'#3#195#0
   +#8'TabOrder'#2#2#8'OnResize'#7#21'OptionsGroupBoxResize'#0#9'TCheckBox'#23'P'
   +'romptOnReplaceCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6
   +'Height'#2#22#3'Top'#3#148#0#5'Width'#3#183#0#5'Align'#7#5'alTop'#17'BorderS'
@@ -107,24 +107,21 @@ LazarusResources.Add('TLazFindReplaceDialog','FORMDATA',[
   +#8'TabOrder'#2#0#0#0#12'TRadioButton'#22'EntireScopeRadioButton'#4'Left'#2#6
   +#6'Height'#2#22#3'Top'#2#30#5'Width'#3#183#0#8'AutoSize'#8#7'Caption'#6#22'E'
   +'ntireScopeRadioButton'#8'TabOrder'#2#1#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'
-  +#2','#3'Top'#3'I'#1#5'Width'#3#164#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#10
-  +'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2','#11'ClientWidth'#3#164#1#8'Tab'
+  +#2'-'#3'Top'#3'H'#1#5'Width'#3#164#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#10
+  +'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'-'#11'ClientWidth'#3#164#1#8'Tab'
   +'Order'#2#6#0#7'TBitBtn'#16'ReplaceAllButton'#21'AnchorSideBottom.Side'#7#9
-  +'asrBottom'#4'Left'#3#211#0#6'Height'#2' '#3'Top'#2#6#5'Width'#2'2'#5'Align'
+  +'asrBottom'#4'Left'#3#209#0#6'Height'#2'!'#3'Top'#2#6#5'Width'#2'2'#5'Align'
   +#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.In'
-  +'nerBorder'#2#2#7'Caption'#6#4'&All'#21'Constraints.MaxHeight'#2'!'#21'Const'
-  +'raints.MinHeight'#2#28#4'Kind'#7#5'bkAll'#9'NumGlyphs'#2#0#7'OnClick'#7#21
-  +'ReplaceAllButtonClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'OKButton'#21'Anchor'
-  +'SideBottom.Side'#7#9'asrBottom'#4'Left'#3#11#1#6'Height'#2' '#3'Top'#2#6#5
-  +'Width'#2'9'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6
-  +#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#3'&OK'#21'Constraints.MaxHei'
-  +'ght'#2'!'#21'Constraints.MinHeight'#2#28#7'Default'#9#4'Kind'#7#4'bkOK'#9'N'
-  +'umGlyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#1#0#0#7'TBitBtn'
-  +#12'CancelButton'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBotto'
-  +'m.Side'#7#9'asrBottom'#4'Left'#3'J'#1#6'Height'#2' '#3'Top'#2#6#5'Width'#2
-  +'T'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'Bord'
-  +'erSpacing.InnerBorder'#2#2#6'Cancel'#9#7'Caption'#6#6'Cancel'#21'Constraint'
-  +'s.MaxHeight'#2'!'#21'Constraints.MinHeight'#2#28#4'Kind'#7#8'bkCancel'#11'M'
-  +'odalResult'#2#2#9'NumGlyphs'#2#0#7'OnClick'#7#17'CancelButtonClick'#8'TabOr'
-  +'der'#2#2#0#0#0#0
+  +'nerBorder'#2#2#7'Caption'#6#4'&All'#4'Kind'#7#5'bkAll'#9'NumGlyphs'#2#0#7'O'
+  +'nClick'#7#21'ReplaceAllButtonClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#8'OKButt'
+  +'on'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#9#1#6'Height'#2'!'#3
+  +'Top'#2#6#5'Width'#2'='#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing'
+  +'.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#3'&OK'#7'Defaul'
+  +'t'#9#4'Kind'#7#4'bkOK'#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'Ta'
+  +'bOrder'#2#1#0#0#7'TBitBtn'#12'CancelButton'#20'AnchorSideRight.Side'#7#9'as'
+  +'rBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'L'#1#6'Height'#2
+  +'!'#3'Top'#2#6#5'Width'#2'R'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSp'
+  +'acing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#6'Cancel'#9#7'Caption'#6
+  +#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#7'OnCl'
+  +'ick'#7#17'CancelButtonClick'#8'TabOrder'#2#2#0#0#0#0
 ]);
diff --git a/ide/helpmanager.lfm b/ide/helpmanager.lfm
index 4bb97b38cd..b0b19a351e 100644
--- a/ide/helpmanager.lfm
+++ b/ide/helpmanager.lfm
@@ -1,64 +1,30 @@
 object HelpSelectorDialog: THelpSelectorDialog
   Left = 328
   Height = 300
-  Top = 573
+  Top = 414
   Width = 500
   HorzScrollBar.Page = 499
   VertScrollBar.Page = 299
-  ActiveControl = OKButton
   Caption = 'HelpSelectorDialog'
+  ClientHeight = 300
+  ClientWidth = 500
   OnClose = HelpSelectorDialogClose
   Position = poScreenCenter
-  object OKButton: TBitBtn
-    AnchorSideRight.Control = CancelButton
-    Left = 326
-    Height = 25
-    Top = 268
-    Width = 75
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Right = 6
-    Caption = '&OK'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    Default = True
-    Kind = bkOK
-    ModalResult = 1
-    NumGlyphs = 0
-    TabOrder = 0
-  end
-  object CancelButton: TBitBtn
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    Left = 407
-    Height = 25
-    Top = 268
-    Width = 87
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Right = 6
-    Caption = 'Cancel'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    Kind = bkCancel
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 1
-  end
   object NodesGroupBox: TGroupBox
     AnchorSideBottom.Control = CancelButton
     Left = 6
-    Height = 256
+    Height = 250
     Top = 6
     Width = 488
-    Align = alTop
-    Anchors = [akTop, akLeft, akRight, akBottom]
+    Align = alClient
     BorderSpacing.Around = 6
     Caption = 'NodesGroupBox'
-    TabOrder = 2
+    ClientHeight = 231
+    ClientWidth = 484
+    TabOrder = 0
     object NodesListBox: TListBox
       Left = 6
-      Height = 223
+      Height = 219
       Top = 6
       Width = 472
       Align = alClient
@@ -68,4 +34,45 @@ object HelpSelectorDialog: THelpSelectorDialog
       TopIndex = -1
     end
   end
+  object BtnPanel: TPanel
+    Height = 38
+    Top = 262
+    Width = 500
+    Align = alBottom
+    AutoSize = True
+    BevelOuter = bvNone
+    ClientHeight = 38
+    ClientWidth = 500
+    TabOrder = 1
+    object OKButton: TBitBtn
+      Left = 327
+      Height = 38
+      Width = 75
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Right = 6
+      Caption = '&OK'
+      Constraints.MinWidth = 75
+      Default = True
+      Kind = bkOK
+      ModalResult = 1
+      NumGlyphs = 0
+      TabOrder = 0
+    end
+    object CancelButton: TBitBtn
+      AnchorSideRight.Side = asrBottom
+      Left = 408
+      Height = 38
+      Width = 86
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Right = 6
+      Caption = 'Cancel'
+      Constraints.MinWidth = 75
+      Kind = bkCancel
+      ModalResult = 2
+      NumGlyphs = 0
+      TabOrder = 1
+    end
+  end
 end
diff --git a/ide/helpmanager.lrs b/ide/helpmanager.lrs
index 3e8f60b4e6..463c1d7b52 100644
--- a/ide/helpmanager.lrs
+++ b/ide/helpmanager.lrs
@@ -2,25 +2,25 @@
 
 LazarusResources.Add('THelpSelectorDialog','FORMDATA',[
   'TPF0'#19'THelpSelectorDialog'#18'HelpSelectorDialog'#4'Left'#3'H'#1#6'Height'
-  +#3','#1#3'Top'#3'='#2#5'Width'#3#244#1#18'HorzScrollBar.Page'#3#243#1#18'Ver'
-  +'tScrollBar.Page'#3'+'#1#13'ActiveControl'#7#8'OKButton'#7'Caption'#6#18'Hel'
-  +'pSelectorDialog'#7'OnClose'#7#23'HelpSelectorDialogClose'#8'Position'#7#14
-  +'poScreenCenter'#0#7'TBitBtn'#8'OKButton'#23'AnchorSideRight.Control'#7#12'C'
-  +'ancelButton'#4'Left'#3'F'#1#6'Height'#2#25#3'Top'#3#12#1#5'Width'#2'K'#7'An'
-  +'chors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6
-  +#7'Caption'#6#3'&OK'#21'Constraints.MaxHeight'#2#25#20'Constraints.MinWidth'
-  +#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8
-  +'TabOrder'#2#0#0#0#7'TBitBtn'#12'CancelButton'#23'AnchorSideRight.Control'#7
-  +#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#151#1#6'Height'#2
-  +#25#3'Top'#3#12#1#5'Width'#2'W'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'Aut'
-  +'oSize'#9#19'BorderSpacing.Right'#2#6#7'Caption'#6#6'Cancel'#21'Constraints.'
-  +'MaxHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'Moda'
-  +'lResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#9'TGroupBox'#13'NodesGrou'
-  +'pBox'#24'AnchorSideBottom.Control'#7#12'CancelButton'#4'Left'#2#6#6'Height'
-  +#3#0#1#3'Top'#2#6#5'Width'#3#232#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'
-  +#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#13'NodesGroupBox'#8'TabOrder'#2#2#0#8'TListBox'#12'NodesListBox'#4'Left'#2#6
-  +#6'Height'#3#223#0#3'Top'#2#6#5'Width'#3#216#1#5'Align'#7#8'alClient'#20'Bor'
-  +'derSpacing.Around'#2#6#10'OnDblClick'#7#20'NodesListBoxDblClick'#8'TabOrder'
-  +#2#0#8'TopIndex'#2#255#0#0#0#0
+  +#3','#1#3'Top'#3#158#1#5'Width'#3#244#1#18'HorzScrollBar.Page'#3#243#1#18'Ve'
+  +'rtScrollBar.Page'#3'+'#1#7'Caption'#6#18'HelpSelectorDialog'#12'ClientHeigh'
+  +'t'#3','#1#11'ClientWidth'#3#244#1#7'OnClose'#7#23'HelpSelectorDialogClose'#8
+  +'Position'#7#14'poScreenCenter'#0#9'TGroupBox'#13'NodesGroupBox'#24'AnchorSi'
+  +'deBottom.Control'#7#12'CancelButton'#4'Left'#2#6#6'Height'#3#250#0#3'Top'#2
+  +#6#5'Width'#3#232#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7'Ca'
+  +'ption'#6#13'NodesGroupBox'#12'ClientHeight'#3#231#0#11'ClientWidth'#3#228#1
+  +#8'TabOrder'#2#0#0#8'TListBox'#12'NodesListBox'#4'Left'#2#6#6'Height'#3#219#0
+  +#3'Top'#2#6#5'Width'#3#216#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'
+  +#2#6#10'OnDblClick'#7#20'NodesListBoxDblClick'#8'TabOrder'#2#0#8'TopIndex'#2
+  +#255#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2'&'#3'Top'#3#6#1#5'Width'#3#244#1
+  +#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHe'
+  +'ight'#2'&'#11'ClientWidth'#3#244#1#8'TabOrder'#2#1#0#7'TBitBtn'#8'OKButton'
+  +#4'Left'#3'G'#1#6'Height'#2'&'#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSiz'
+  +'e'#9#19'BorderSpacing.Right'#2#6#7'Caption'#6#3'&OK'#20'Constraints.MinWidt'
+  +'h'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0
+  +#8'TabOrder'#2#0#0#0#7'TBitBtn'#12'CancelButton'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#4'Left'#3#152#1#6'Height'#2'&'#5'Width'#2'V'#5'Align'#7#7'alRigh'
+  +'t'#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#7'Caption'#6#6'Cancel'#20'Cons'
+  +'traints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyph'
+  +'s'#2#0#8'TabOrder'#2#1#0#0#0#0
 ]);
diff --git a/ide/helpmanager.pas b/ide/helpmanager.pas
index e8776c6377..1161da50b1 100644
--- a/ide/helpmanager.pas
+++ b/ide/helpmanager.pas
@@ -124,6 +124,7 @@ type
     CancelButton: TBitBtn;
     NodesGroupBox: TGroupBox;
     NodesListBox: TListBox;
+    BtnPanel: TPanel;
     procedure HelpSelectorDialogClose(Sender: TObject;
       var CloseAction: TCloseAction);
     procedure NodesListBoxDblClick(Sender: TObject);
diff --git a/ide/helpoptions.lfm b/ide/helpoptions.lfm
index 3d024f2bc5..c1dfd8f7d7 100644
--- a/ide/helpoptions.lfm
+++ b/ide/helpoptions.lfm
@@ -9,39 +9,43 @@ object HelpOptionsDialog: THelpOptionsDialog
   ActiveControl = FPCDocHTMLEdit
   BorderIcons = [biSystemMenu]
   Caption = 'HelpOptionsDialog'
+  ClientHeight = 300
+  ClientWidth = 500
   OnClose = HelpOptionsDialogClose
   OnCreate = HelpOptionsDialogCreate
   Position = poScreenCenter
   object MainNotebook: TNotebook
-    AnchorSideBottom.Control = OkButton
+    AnchorSideBottom.Control = BtnPanel
     Left = 6
-    Height = 257
+    Height = 238
     Top = 6
     Width = 488
     Align = alTop
     Anchors = [akTop, akLeft, akBottom]
     BorderSpacing.Around = 6
-    PageIndex = 0
+    PageIndex = 1
+    TabOrder = 0
     object GeneralPage: TPage
       Caption = 'GeneralPage'
+      ClientWidth = 484
+      ClientHeight = 207
       object FPCDocHTMLLabel: TLabel
         AnchorSideTop.Control = FPCDocHTMLBrowseButton
         AnchorSideTop.Side = asrCenter
         Left = 14
-        Height = 17
-        Top = 14
-        Width = 146
+        Height = 20
+        Top = 12
+        Width = 119
         Caption = 'FPCDocHTMLLabel'
-        Color = clNone
         ParentColor = False
       end
       object FPCDocHTMLEdit: TEdit
         AnchorSideLeft.Control = FPCDocHTMLLabel
         AnchorSideLeft.Side = asrBottom
-        Left = 166
+        Left = 139
         Height = 23
         Top = 10
-        Width = 276
+        Width = 303
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Left = 6
         TabOrder = 0
@@ -61,14 +65,15 @@ object HelpOptionsDialog: THelpOptionsDialog
     end
     object ViewersPage: TPage
       Caption = 'ViewersPage'
+      ClientWidth = 484
+      ClientHeight = 207
       object ViewersLabel: TLabel
         AnchorSideTop.Control = ViewerPropsGroupBox
         Left = 6
-        Height = 17
+        Height = 20
         Top = 6
-        Width = 97
+        Width = 84
         Caption = 'ViewersLabel'
-        Color = clNone
         ParentColor = False
       end
       object ViewersListBox: TListBox
@@ -76,8 +81,8 @@ object HelpOptionsDialog: THelpOptionsDialog
         AnchorSideTop.Control = ViewersLabel
         AnchorSideTop.Side = asrBottom
         Left = 6
-        Height = 190
-        Top = 29
+        Height = 168
+        Top = 32
         Width = 152
         Anchors = [akTop, akLeft, akBottom]
         BorderSpacing.Left = 6
@@ -91,7 +96,7 @@ object HelpOptionsDialog: THelpOptionsDialog
         AnchorSideLeft.Control = ViewersListBox
         AnchorSideLeft.Side = asrBottom
         Left = 164
-        Height = 211
+        Height = 195
         Top = 6
         Width = 314
         Align = alRight
@@ -103,6 +108,8 @@ object HelpOptionsDialog: THelpOptionsDialog
     end
     object DataBasePage: TPage
       Caption = 'DataBasePage'
+      ClientWidth = 484
+      ClientHeight = 226
       object DatabasesLabel: TLabel
         AnchorSideTop.Control = DataBasesPropsGroupBox
         Left = 6
@@ -110,7 +117,6 @@ object HelpOptionsDialog: THelpOptionsDialog
         Top = 6
         Width = 118
         Caption = 'DatabasesLabel'
-        Color = clNone
         ParentColor = False
       end
       object DatabasesListBox: TListBox
@@ -133,7 +139,7 @@ object HelpOptionsDialog: THelpOptionsDialog
         AnchorSideLeft.Control = DatabasesListBox
         AnchorSideLeft.Side = asrBottom
         Left = 164
-        Height = 211
+        Height = 214
         Top = 6
         Width = 314
         Align = alRight
@@ -144,46 +150,52 @@ object HelpOptionsDialog: THelpOptionsDialog
       end
     end
   end
-  object OkButton: TBitBtn
-    AnchorSideRight.Control = CancelButton
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 326
-    Height = 25
-    Top = 269
-    Width = 75
-    Anchors = [akRight, akBottom]
+  object BtnPanel: TPanel
+    Height = 50
+    Top = 250
+    Width = 500
+    Align = alBottom
     AutoSize = True
-    BorderSpacing.Around = 6
-    Caption = '&OK'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    Default = True
-    Kind = bkOK
-    ModalResult = 1
-    NumGlyphs = 0
-    OnClick = OkButtonClick
+    BevelOuter = bvNone
+    ClientHeight = 50
+    ClientWidth = 500
     TabOrder = 1
-  end
-  object CancelButton: TBitBtn
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 407
-    Height = 25
-    Top = 269
-    Width = 87
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Around = 6
-    Cancel = True
-    Caption = 'Cancel'
-    Constraints.MaxHeight = 25
-    Constraints.MinWidth = 75
-    Kind = bkCancel
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 2
+    OnClick = BtnPanelClick
+    object OkButton: TBitBtn
+      AnchorSideBottom.Side = asrBottom
+      Left = 327
+      Height = 38
+      Top = 6
+      Width = 75
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Caption = '&OK'
+      Constraints.MinWidth = 75
+      Default = True
+      Kind = bkOK
+      ModalResult = 1
+      NumGlyphs = 0
+      OnClick = OkButtonClick
+      TabOrder = 0
+    end
+    object CancelButton: TBitBtn
+      AnchorSideRight.Side = asrBottom
+      AnchorSideBottom.Side = asrBottom
+      Left = 408
+      Height = 38
+      Top = 6
+      Width = 86
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Cancel = True
+      Caption = 'Cancel'
+      Constraints.MinWidth = 75
+      Kind = bkCancel
+      ModalResult = 2
+      NumGlyphs = 0
+      TabOrder = 1
+    end
   end
 end
diff --git a/ide/helpoptions.lrs b/ide/helpoptions.lrs
index 0c1fa3d520..f3c40dfaa7 100644
--- a/ide/helpoptions.lrs
+++ b/ide/helpoptions.lrs
@@ -5,62 +5,64 @@ LazarusResources.Add('THelpOptionsDialog','FORMDATA',[
   +#7#9'asrBottom'#4'Left'#3'8'#1#6'Height'#3','#1#3'Top'#3'f'#1#5'Width'#3#244
   +#1#18'HorzScrollBar.Page'#3#243#1#18'VertScrollBar.Page'#3'+'#1#13'ActiveCon'
   +'trol'#7#14'FPCDocHTMLEdit'#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'
-  +#6#17'HelpOptionsDialog'#7'OnClose'#7#22'HelpOptionsDialogClose'#8'OnCreate'
-  +#7#23'HelpOptionsDialogCreate'#8'Position'#7#14'poScreenCenter'#0#9'TNoteboo'
-  +'k'#12'MainNotebook'#24'AnchorSideBottom.Control'#7#8'OkButton'#4'Left'#2#6#6
-  +'Height'#3#1#1#3'Top'#2#6#5'Width'#3#232#1#5'Align'#7#5'alTop'#7'Anchors'#11
-  +#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#9'PageIndex'#2
-  +#0#0#5'TPage'#11'GeneralPage'#7'Caption'#6#11'GeneralPage'#0#6'TLabel'#15'FP'
-  +'CDocHTMLLabel'#21'AnchorSideTop.Control'#7#22'FPCDocHTMLBrowseButton'#18'An'
-  +'chorSideTop.Side'#7#9'asrCenter'#4'Left'#2#14#6'Height'#2#17#3'Top'#2#14#5
-  +'Width'#3#146#0#7'Caption'#6#15'FPCDocHTMLLabel'#5'Color'#7#6'clNone'#11'Par'
-  +'entColor'#8#0#0#5'TEdit'#14'FPCDocHTMLEdit'#22'AnchorSideLeft.Control'#7#15
-  +'FPCDocHTMLLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#166#0#6'H'
-  +'eight'#2#23#3'Top'#2#10#5'Width'#3#20#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#18'BorderSpacing.Left'#2#6#8'TabOrder'#2#0#4'Text'#6#14'FPCDocHT'
-  +'MLEdit'#0#0#7'TButton'#22'FPCDocHTMLBrowseButton'#4'Left'#3#191#1#6'Height'
-  +#2#25#3'Top'#2#10#5'Width'#2#30#7'Anchors'#11#5'akTop'#7'akRight'#0#25'Borde'
-  +'rSpacing.InnerBorder'#2#4#7'Caption'#6#3'...'#7'OnClick'#7#27'FPCDocHTMLBro'
-  +'wseButtonClick'#8'TabOrder'#2#1#0#0#0#5'TPage'#11'ViewersPage'#7'Caption'#6
-  +#11'ViewersPage'#0#6'TLabel'#12'ViewersLabel'#21'AnchorSideTop.Control'#7#19
-  +'ViewerPropsGroupBox'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#6#5'Width'#2'a'#7
-  +'Caption'#6#12'ViewersLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#8'TL'
-  +'istBox'#14'ViewersListBox'#22'AnchorSideLeft.Control'#7#11'ViewersPage'#21
-  +'AnchorSideTop.Control'#7#12'ViewersLabel'#18'AnchorSideTop.Side'#7#9'asrBot'
-  +'tom'#4'Left'#2#6#6'Height'#3#190#0#3'Top'#2#29#5'Width'#3#152#0#7'Anchors'
+  +#6#17'HelpOptionsDialog'#12'ClientHeight'#3','#1#11'ClientWidth'#3#244#1#7'O'
+  +'nClose'#7#22'HelpOptionsDialogClose'#8'OnCreate'#7#23'HelpOptionsDialogCrea'
+  +'te'#8'Position'#7#14'poScreenCenter'#0#9'TNotebook'#12'MainNotebook'#24'Anc'
+  +'horSideBottom.Control'#7#8'BtnPanel'#4'Left'#2#6#6'Height'#3#238#0#3'Top'#2
+  +#6#5'Width'#3#232#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#8'a'
+  +'kBottom'#0#20'BorderSpacing.Around'#2#6#9'PageIndex'#2#1#8'TabOrder'#2#0#0#5
+  +'TPage'#11'GeneralPage'#7'Caption'#6#11'GeneralPage'#11'ClientWidth'#3#228#1
+  +#12'ClientHeight'#3#207#0#0#6'TLabel'#15'FPCDocHTMLLabel'#21'AnchorSideTop.C'
+  +'ontrol'#7#22'FPCDocHTMLBrowseButton'#18'AnchorSideTop.Side'#7#9'asrCenter'#4
+  +'Left'#2#14#6'Height'#2#20#3'Top'#2#12#5'Width'#2'w'#7'Caption'#6#15'FPCDocH'
+  +'TMLLabel'#11'ParentColor'#8#0#0#5'TEdit'#14'FPCDocHTMLEdit'#22'AnchorSideLe'
+  +'ft.Control'#7#15'FPCDocHTMLLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4
+  +'Left'#3#139#0#6'Height'#2#23#3'Top'#2#10#5'Width'#3'/'#1#7'Anchors'#11#5'ak'
+  +'Top'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#8'TabOrder'#2#0#4'Te'
+  +'xt'#6#14'FPCDocHTMLEdit'#0#0#7'TButton'#22'FPCDocHTMLBrowseButton'#4'Left'#3
+  +#191#1#6'Height'#2#25#3'Top'#2#10#5'Width'#2#30#7'Anchors'#11#5'akTop'#7'akR'
+  +'ight'#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'...'#7'OnClick'#7
+  +#27'FPCDocHTMLBrowseButtonClick'#8'TabOrder'#2#1#0#0#0#5'TPage'#11'ViewersPa'
+  +'ge'#7'Caption'#6#11'ViewersPage'#11'ClientWidth'#3#228#1#12'ClientHeight'#3
+  +#207#0#0#6'TLabel'#12'ViewersLabel'#21'AnchorSideTop.Control'#7#19'ViewerPro'
+  +'psGroupBox'#4'Left'#2#6#6'Height'#2#20#3'Top'#2#6#5'Width'#2'T'#7'Caption'#6
+  +#12'ViewersLabel'#11'ParentColor'#8#0#0#8'TListBox'#14'ViewersListBox'#22'An'
+  +'chorSideLeft.Control'#7#11'ViewersPage'#21'AnchorSideTop.Control'#7#12'View'
+  +'ersLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#168
+  +#0#3'Top'#2' '#5'Width'#3#152#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'
+  +#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#16'ClickOnSelChange'
+  +#8#17'OnSelectionChange'#7#29'ViewersListBoxSelectionChange'#8'TabOrder'#2#0
+  +#8'TopIndex'#2#255#0#0#9'TGroupBox'#19'ViewerPropsGroupBox'#22'AnchorSideLef'
+  +'t.Control'#7#14'ViewersListBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Le'
+  +'ft'#3#164#0#6'Height'#3#195#0#3'Top'#2#6#5'Width'#3':'#1#5'Align'#7#7'alRig'
+  +'ht'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpac'
+  +'ing.Around'#2#6#7'Caption'#6#19'ViewerPropsGroupBox'#8'TabOrder'#2#1#0#0#0#5
+  +'TPage'#12'DataBasePage'#7'Caption'#6#12'DataBasePage'#11'ClientWidth'#3#228
+  +#1#12'ClientHeight'#3#226#0#0#6'TLabel'#14'DatabasesLabel'#21'AnchorSideTop.'
+  +'Control'#7#22'DataBasesPropsGroupBox'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#6
+  +#5'Width'#2'v'#7'Caption'#6#14'DatabasesLabel'#11'ParentColor'#8#0#0#8'TList'
+  +'Box'#16'DatabasesListBox'#22'AnchorSideLeft.Control'#7#12'DataBasePage'#21
+  +'AnchorSideTop.Control'#7#14'DatabasesLabel'#18'AnchorSideTop.Side'#7#9'asrB'
+  +'ottom'#4'Left'#2#6#6'Height'#3#188#0#3'Top'#2#29#5'Width'#3#152#0#7'Anchors'
   +#11#5'akTop'#6'akLeft'#8'akBottom'#0#18'BorderSpacing.Left'#2#6#17'BorderSpa'
-  +'cing.Top'#2#6#16'ClickOnSelChange'#8#17'OnSelectionChange'#7#29'ViewersList'
-  +'BoxSelectionChange'#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#9'TGroupBox'#19'V'
-  +'iewerPropsGroupBox'#22'AnchorSideLeft.Control'#7#14'ViewersListBox'#19'Anch'
-  +'orSideLeft.Side'#7#9'asrBottom'#4'Left'#3#164#0#6'Height'#3#211#0#3'Top'#2#6
-  +#5'Width'#3':'#1#5'Align'#7#7'alRight'#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
-  +'Right'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'ViewerPro'
-  +'psGroupBox'#8'TabOrder'#2#1#0#0#0#5'TPage'#12'DataBasePage'#7'Caption'#6#12
-  +'DataBasePage'#0#6'TLabel'#14'DatabasesLabel'#21'AnchorSideTop.Control'#7#22
-  +'DataBasesPropsGroupBox'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#6#5'Width'#2'v'
-  +#7'Caption'#6#14'DatabasesLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#8
-  +'TListBox'#16'DatabasesListBox'#22'AnchorSideLeft.Control'#7#12'DataBasePage'
-  +#21'AnchorSideTop.Control'#7#14'DatabasesLabel'#18'AnchorSideTop.Side'#7#9'a'
-  +'srBottom'#4'Left'#2#6#6'Height'#3#188#0#3'Top'#2#29#5'Width'#3#152#0#7'Anch'
-  +'ors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#18'BorderSpacing.Left'#2#6#17'Bord'
-  +'erSpacing.Top'#2#6#16'ClickOnSelChange'#8#17'OnSelectionChange'#7#31'Databa'
-  +'sesListBoxSelectionChange'#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#9'TGroupBo'
-  +'x'#22'DataBasesPropsGroupBox'#22'AnchorSideLeft.Control'#7#16'DatabasesList'
-  +'Box'#19'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#164#0#6'Height'#3#211
-  +#0#3'Top'#2#6#5'Width'#3':'#1#5'Align'#7#7'alRight'#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#22'DataBasesPropsGroupBox'#8'TabOrder'#2#1#0#0#0#0#7'TBitBtn'#8'OkButton'#23
-  +'AnchorSideRight.Control'#7#12'CancelButton'#24'AnchorSideBottom.Control'#7#5
-  +'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'F'#1#6'Height'#2
-  +#25#3'Top'#3#13#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'Aut'
-  +'oSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#21'Constraints.Ma'
-  +'xHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4'bkOK'
-  +#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8'TabOr'
-  +'der'#2#1#0#0#7'TBitBtn'#12'CancelButton'#23'AnchorSideRight.Control'#7#5'Ow'
-  +'ner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7
-  +#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#151#1#6'Height'
-  +#2#25#3'Top'#3#13#1#5'Width'#2'W'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'A'
-  +'utoSize'#9#20'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'
-  +#21'Constraints.MaxHeight'#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bk'
-  +'Cancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#0
+  +'cing.Top'#2#6#16'ClickOnSelChange'#8#17'OnSelectionChange'#7#31'DatabasesLi'
+  +'stBoxSelectionChange'#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#9'TGroupBox'#22
+  +'DataBasesPropsGroupBox'#22'AnchorSideLeft.Control'#7#16'DatabasesListBox'#19
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#4'Left'#3#164#0#6'Height'#3#214#0#3'Top'
+  +#2#6#5'Width'#3':'#1#5'Align'#7#7'alRight'#7'Anchors'#11#5'akTop'#6'akLeft'#7
+  +'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#22'DataBas'
+  +'esPropsGroupBox'#8'TabOrder'#2#1#0#0#0#0#6'TPanel'#8'BtnPanel'#6'Height'#2
+  +'2'#3'Top'#3#250#0#5'Width'#3#244#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#10
+  +'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'2'#11'ClientWidth'#3#244#1#8'Tab'
+  +'Order'#2#1#7'OnClick'#7#13'BtnPanelClick'#0#7'TBitBtn'#8'OkButton'#21'Ancho'
+  +'rSideBottom.Side'#7#9'asrBottom'#4'Left'#3'G'#1#6'Height'#2'&'#3'Top'#2#6#5
+  +'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6
+  +#7'Caption'#6#3'&OK'#20'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#4
+  +'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonClick'#8
+  +'TabOrder'#2#0#0#0#7'TBitBtn'#12'CancelButton'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#152#1#6'Heigh'
+  +'t'#2'&'#3'Top'#2#6#5'Width'#2'V'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Bor'
+  +'derSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#20'Constraints.Mi'
+  +'nWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'T'
+  +'abOrder'#2#1#0#0#0#0
 ]);
diff --git a/ide/helpoptions.pas b/ide/helpoptions.pas
index 52d28169e4..97faf6a8e4 100644
--- a/ide/helpoptions.pas
+++ b/ide/helpoptions.pas
@@ -80,6 +80,7 @@ type
     DataBasesPropsGroupBox: TGroupBox;
     DatabasesListBox: TListBox;
     GeneralPage: TPage;
+    BtnPanel: TPanel;
     ViewerPropsGroupBox: TGroupBox;
     ViewersLabel: TLabel;
     ViewersListBox: TListBox;
@@ -92,6 +93,7 @@ type
       var CloseAction: TCloseAction);
     procedure HelpOptionsDialogCreate(Sender: TObject);
     procedure OkButtonClick(Sender: TObject);
+    procedure BtnPanelClick(Sender: TObject);
     procedure ViewersListBoxSelectionChange(Sender: TObject; User: boolean);
   private
   public
@@ -173,6 +175,11 @@ begin
   ModalResult:=mrOk;
 end;
 
+procedure THelpOptionsDialog.BtnPanelClick(Sender: TObject);
+begin
+
+end;
+
 procedure THelpOptionsDialog.ViewersListBoxSelectionChange(Sender: TObject;
   User: boolean);
 begin
diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp
index b29f3807bb..65528807b4 100644
--- a/ide/uniteditor.pp
+++ b/ide/uniteditor.pp
@@ -4035,8 +4035,12 @@ end;
 function TSourceNotebook.AddContextPopupMenuItem(const NewCaption: string;
   const NewEnabled: boolean; const NewOnClick: TNotifyEvent): TIDEMenuItem;
 begin
+  //DebugLn(['TSourceNotebook.AddContextPopupMenuItem ',NewCaption]);
   Result:=RegisterIDEMenuCommand(SrcEditMenuSectionFileDynamic.GetPath,
     'FileDynamic',NewCaption,NewOnClick);
+  //DebugLn(['TSourceNotebook.AddContextPopupMenuItem CHECKING CONSISTENCY']);
+  //SourceEditorMenuRoot.WriteDebugReport('',true);
+  //SourceEditorMenuRoot.ConsistencyCheck;
   Result.Enabled:=NewEnabled;
 end;
 
diff --git a/ideintf/menuintf.pas b/ideintf/menuintf.pas
index df783b2371..919ba2ae37 100644
--- a/ideintf/menuintf.pas
+++ b/ideintf/menuintf.pas
@@ -749,8 +749,8 @@ end;
 procedure TIDEMenuItem.WriteDebugReport(const Prefix: string;
   MenuItemDebugReport: boolean);
 begin
-  debugln(Prefix,'SectionIndex=',dbgs(SectionIndex),' Name="',DbgStr(Name),'"',
-    ' VisibleActive=',dbgs(VisibleActive));
+  debugln([Prefix,'SectionIndex=',dbgs(SectionIndex),' Name="',DbgStr(Name),'"',
+    ' VisibleActive=',dbgs(VisibleActive),' Handle=',((MenuItem<>nil) and (MenuItem.HandleAllocated))]);
   if MenuItemDebugReport and (MenuItem<>nil) then
     MenuItem.WriteDebugReport(Prefix);
 end;
@@ -1355,7 +1355,7 @@ begin
     ' ChildsAsSubMenu=',ChildsAsSubMenu,
     ' ContainerIndex=',GetContainerIndex(false),
     ' NeedSep:Top=',NeedTopSeparator,',Bottom=',NeedBottomSeparator,
-    ' Size='+dbgs(Size)]);
+    ' Size=',dbgs(Size)]);
   for i:=0 to Count-1 do Items[i].WriteDebugReport(Prefix+'  ',false);
   if MenuItemDebugReport and (MenuItem<>nil) then
     MenuItem.WriteDebugReport(Prefix);
diff --git a/ideintf/stringspropeditdlg.lfm b/ideintf/stringspropeditdlg.lfm
index 00c3d7678f..b338e97ce2 100644
--- a/ideintf/stringspropeditdlg.lfm
+++ b/ideintf/stringspropeditdlg.lfm
@@ -13,36 +13,36 @@ object StringsPropEditorFrm: TStringsPropEditorFrm
   Constraints.MinWidth = 180
   OnCreate = FormCreate
   Position = poScreenCenter
-  object GroupBox1: TGroupBox
-    AnchorSideBottom.Control = OKButton
+  object TextGroupBox: TGroupBox
+    AnchorSideBottom.Control = BtnPanel
     Left = 6
-    Height = 259
+    Height = 240
     Top = 6
     Width = 388
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Around = 6
-    ClientHeight = 241
+    ClientHeight = 221
     ClientWidth = 384
     TabOrder = 0
     object StatusLabel: TLabel
-      AnchorSideBottom.Control = GroupBox1
+      AnchorSideBottom.Control = TextGroupBox
       AnchorSideBottom.Side = asrBottom
       Left = 9
-      Height = 14
-      Top = 221
-      Width = 57
+      Height = 20
+      Top = 195
+      Width = 77
       Anchors = [akLeft, akBottom]
       BorderSpacing.Around = 6
       Caption = 'StatusLabel'
       ParentColor = False
     end
     object Memo: TMemo
-      AnchorSideLeft.Control = GroupBox1
+      AnchorSideLeft.Control = TextGroupBox
       AnchorSideRight.Control = SortButton
       AnchorSideBottom.Control = StatusLabel
       Left = 6
-      Height = 209
+      Height = 183
       Top = 6
       Width = 291
       Anchors = [akTop, akLeft, akRight, akBottom]
@@ -55,10 +55,10 @@ object StringsPropEditorFrm: TStringsPropEditorFrm
     object SortButton: TButton
       AnchorSideLeft.Control = Memo
       AnchorSideLeft.Side = asrBottom
-      AnchorSideRight.Control = GroupBox1
+      AnchorSideRight.Control = TextGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 303
-      Height = 25
+      Height = 31
       Top = 6
       Width = 75
       Anchors = [akTop, akRight]
@@ -66,54 +66,56 @@ object StringsPropEditorFrm: TStringsPropEditorFrm
       BorderSpacing.Around = 6
       BorderSpacing.InnerBorder = 4
       Caption = 'Sort'
-      Constraints.MaxHeight = 25
-      Constraints.MinHeight = 25
       Constraints.MinWidth = 75
       OnClick = SortButtonClick
       TabOrder = 1
     end
   end
-  object OKButton: TBitBtn
-    AnchorSideRight.Control = CancelButton
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 233
-    Height = 25
-    Top = 271
-    Width = 75
-    Anchors = [akRight, akBottom]
+  object BtnPanel: TPanel
+    Height = 50
+    Top = 252
+    Width = 400
+    Align = alBottom
     AutoSize = True
-    BorderSpacing.Around = 6
-    Caption = '&OK'
-    Constraints.MaxHeight = 25
-    Constraints.MinHeight = 25
-    Constraints.MinWidth = 75
-    Default = True
-    Kind = bkOK
-    ModalResult = 1
-    NumGlyphs = 0
+    BevelOuter = bvNone
+    ClientHeight = 50
+    ClientWidth = 400
     TabOrder = 1
-  end
-  object CancelButton: TBitBtn
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 314
-    Height = 25
-    Top = 271
-    Width = 80
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Around = 6
-    Cancel = True
-    Caption = 'Cancel'
-    Constraints.MaxHeight = 25
-    Constraints.MinHeight = 25
-    Constraints.MinWidth = 75
-    Kind = bkCancel
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 2
+    OnClick = BtnPanelClick
+    object CancelButton: TBitBtn
+      AnchorSideRight.Side = asrBottom
+      AnchorSideBottom.Side = asrBottom
+      Left = 308
+      Height = 38
+      Top = 6
+      Width = 86
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Cancel = True
+      Caption = 'Cancel'
+      Constraints.MinWidth = 75
+      Kind = bkCancel
+      ModalResult = 2
+      NumGlyphs = 0
+      TabOrder = 0
+    end
+    object OKButton: TBitBtn
+      AnchorSideBottom.Side = asrBottom
+      Left = 227
+      Height = 38
+      Top = 6
+      Width = 75
+      Align = alRight
+      AutoSize = True
+      BorderSpacing.Around = 6
+      Caption = '&OK'
+      Constraints.MinWidth = 75
+      Default = True
+      Kind = bkOK
+      ModalResult = 1
+      NumGlyphs = 0
+      TabOrder = 1
+    end
   end
 end
diff --git a/ideintf/stringspropeditdlg.lrs b/ideintf/stringspropeditdlg.lrs
index bbf27ed0e8..cd170fb821 100644
--- a/ideintf/stringspropeditdlg.lrs
+++ b/ideintf/stringspropeditdlg.lrs
@@ -6,39 +6,37 @@ LazarusResources.Add('TStringsPropEditorFrm','FORMDATA',[
   +#18'VertScrollBar.Page'#3'-'#1#13'ActiveControl'#7#4'Memo'#7'Caption'#6#20'S'
   +'tringsPropEditorFrm'#12'ClientHeight'#3'.'#1#11'ClientWidth'#3#144#1#21'Con'
   +'straints.MinHeight'#3#160#0#20'Constraints.MinWidth'#3#180#0#8'OnCreate'#7
-  +#10'FormCreate'#8'Position'#7#14'poScreenCenter'#0#9'TGroupBox'#9'GroupBox1'
-  +#24'AnchorSideBottom.Control'#7#8'OKButton'#4'Left'#2#6#6'Height'#3#3#1#3'To'
-  +'p'#2#6#5'Width'#3#132#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'
-  +#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#12'ClientHeight'#3#241
-  +#0#11'ClientWidth'#3#128#1#8'TabOrder'#2#0#0#6'TLabel'#11'StatusLabel'#24'An'
-  +'chorSideBottom.Control'#7#9'GroupBox1'#21'AnchorSideBottom.Side'#7#9'asrBot'
-  +'tom'#4'Left'#2#9#6'Height'#2#14#3'Top'#3#221#0#5'Width'#2'9'#7'Anchors'#11#6
-  +'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'StatusLa'
-  +'bel'#11'ParentColor'#8#0#0#5'TMemo'#4'Memo'#22'AnchorSideLeft.Control'#7#9
-  +'GroupBox1'#23'AnchorSideRight.Control'#7#10'SortButton'#24'AnchorSideBottom'
-  +'.Control'#7#11'StatusLabel'#4'Left'#2#6#6'Height'#3#209#0#3'Top'#2#6#5'Widt'
-  +'h'#3'#'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'Bord'
-  +'erSpacing.Around'#2#6#8'OnChange'#7#10'MemoChange'#10'ScrollBars'#7#10'ssAu'
-  +'toBoth'#8'TabOrder'#2#0#8'WordWrap'#8#0#0#7'TButton'#10'SortButton'#22'Anch'
-  +'orSideLeft.Control'#7#4'Memo'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'Anc'
-  +'horSideRight.Control'#7#9'GroupBox1'#20'AnchorSideRight.Side'#7#9'asrBottom'
-  +#4'Left'#3'/'#1#6'Height'#2#25#3'Top'#2#6#5'Width'#2'K'#7'Anchors'#11#5'akTo'
-  +'p'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing'
-  +'.InnerBorder'#2#4#7'Caption'#6#4'Sort'#21'Constraints.MaxHeight'#2#25#21'Co'
-  +'nstraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'OnClick'#7#15'Sor'
-  +'tButtonClick'#8'TabOrder'#2#1#0#0#0#7'TBitBtn'#8'OKButton'#23'AnchorSideRig'
-  +'ht.Control'#7#12'CancelButton'#24'AnchorSideBottom.Control'#7#5'Owner'#21'A'
-  +'nchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#233#0#6'Height'#2#25#3'Top'#3
-  +#15#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#21'Constraints.MaxHeight'#2#25
-  +#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'Default'#9#4
-  +'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#7
-  +'TBitBtn'#12'CancelButton'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorS'
-  +'ideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'An'
-  +'chorSideBottom.Side'#7#9'asrBottom'#4'Left'#3':'#1#6'Height'#2#25#3'Top'#3
-  +#15#1#5'Width'#2'P'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20
-  +'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#21'Constraints'
-  +'.MaxHeight'#2#25#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2
-  +'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2
-  +#2#0#0#0
+  +#10'FormCreate'#8'Position'#7#14'poScreenCenter'#0#9'TGroupBox'#12'TextGroup'
+  +'Box'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#4'Left'#2#6#6'Height'#3#240
+  +#0#3'Top'#2#6#5'Width'#3#132#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6
+  +'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#12'ClientHeig'
+  +'ht'#3#221#0#11'ClientWidth'#3#128#1#8'TabOrder'#2#0#0#6'TLabel'#11'StatusLa'
+  +'bel'#24'AnchorSideBottom.Control'#7#12'TextGroupBox'#21'AnchorSideBottom.Si'
+  +'de'#7#9'asrBottom'#4'Left'#2#9#6'Height'#2#20#3'Top'#3#195#0#5'Width'#2'M'#7
+  +'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'
+  +#6#11'StatusLabel'#11'ParentColor'#8#0#0#5'TMemo'#4'Memo'#22'AnchorSideLeft.'
+  +'Control'#7#12'TextGroupBox'#23'AnchorSideRight.Control'#7#10'SortButton'#24
+  +'AnchorSideBottom.Control'#7#11'StatusLabel'#4'Left'#2#6#6'Height'#3#183#0#3
+  +'Top'#2#6#5'Width'#3'#'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBo'
+  +'ttom'#0#20'BorderSpacing.Around'#2#6#8'OnChange'#7#10'MemoChange'#10'Scroll'
+  +'Bars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#8'WordWrap'#8#0#0#7'TButton'#10'Sort'
+  +'Button'#22'AnchorSideLeft.Control'#7#4'Memo'#19'AnchorSideLeft.Side'#7#9'as'
+  +'rBottom'#23'AnchorSideRight.Control'#7#12'TextGroupBox'#20'AnchorSideRight.'
+  +'Side'#7#9'asrBottom'#4'Left'#3'/'#1#6'Height'#2#31#3'Top'#2#6#5'Width'#2'K'
+  +#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2
+  +#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#4'Sort'#20'Constraints.Min'
+  +'Width'#2'K'#7'OnClick'#7#15'SortButtonClick'#8'TabOrder'#2#1#0#0#0#6'TPanel'
+  +#8'BtnPanel'#6'Height'#2'2'#3'Top'#3#252#0#5'Width'#3#144#1#5'Align'#7#8'alB'
+  +'ottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'2'#11'Cl'
+  +'ientWidth'#3#144#1#8'TabOrder'#2#1#7'OnClick'#7#13'BtnPanelClick'#0#7'TBitB'
+  +'tn'#12'CancelButton'#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideB'
+  +'ottom.Side'#7#9'asrBottom'#4'Left'#3'4'#1#6'Height'#2'&'#3'Top'#2#6#5'Width'
+  +#2'V'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#6'Can'
+  +'cel'#9#7'Caption'#6#6'Cancel'#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkC'
+  +'ancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#8
+  +'OKButton'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#227#0#6'Height'
+  +#2'&'#3'Top'#2#6#5'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'Border'
+  +'Spacing.Around'#2#6#7'Caption'#6#3'&OK'#20'Constraints.MinWidth'#2'K'#7'Def'
+  +'ault'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2
+  +#1#0#0#0#0
 ]);
diff --git a/ideintf/stringspropeditdlg.pas b/ideintf/stringspropeditdlg.pas
index 7b3ec385b5..5d157ad256 100644
--- a/ideintf/stringspropeditdlg.pas
+++ b/ideintf/stringspropeditdlg.pas
@@ -23,7 +23,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Buttons, Dialogs, StdCtrls,
-  TextTools, ObjInspStrConsts;
+  TextTools, ObjInspStrConsts, ExtCtrls;
   
 type
 
@@ -32,12 +32,14 @@ type
   TStringsPropEditorFrm = class(TForm)
     OKButton: TBitBtn;
     CancelButton: TBitBtn;
+    BtnPanel: TPanel;
     StatusLabel: TLabel;
     SortButton: TButton;
-    GroupBox1: TGroupBox;
+    TextGroupBox: TGroupBox;
     Memo: TMemo;
     procedure FormCreate(Sender: TObject);
     procedure MemoChange(Sender: TObject);
+    procedure BtnPanelClick(Sender: TObject);
     procedure SortButtonClick(Sender: TObject);
   public
     procedure AddButtons; virtual;
@@ -73,6 +75,11 @@ begin
     StatusLabel.Caption := Format(oisDLinesDChars, [Memo.Lines.Count, NumChars]);
 end;
 
+procedure TStringsPropEditorFrm.BtnPanelClick(Sender: TObject);
+begin
+
+end;
+
 procedure TStringsPropEditorFrm.SortButtonClick(Sender: TObject);
 var
   OldText, NewSortedText: String;
diff --git a/lcl/dirsel.lfm b/lcl/dirsel.lfm
index 5f9fe56499..b9697b24ae 100644
--- a/lcl/dirsel.lfm
+++ b/lcl/dirsel.lfm
@@ -16,72 +16,57 @@ object DirSelDlg: TDirSelDlg
   OnShow = FormShow
   Position = poScreenCenter
   object Panel1: TPanel
-    Height = 41
-    Top = 289
+    Height = 43
+    Top = 287
     Width = 335
     Align = alBottom
+    AutoSize = True
     BevelOuter = bvNone
-    ClientHeight = 41
+    ClientHeight = 43
     ClientWidth = 335
-    TabOrder = 4
+    TabOrder = 2
     TabStop = True
     object btnOK: TButton
-      AnchorSideRight.Control = btnCancel
-      AnchorSideBottom.Control = btnCancel
       AnchorSideBottom.Side = asrBottom
-      Left = 161
-      Height = 25
-      Top = 10
+      Left = 164
+      Height = 31
+      Top = 6
       Width = 75
-      Anchors = [akRight, akBottom]
+      Align = alRight
       AutoSize = True
+      BorderSpacing.Around = 6
       BorderSpacing.InnerBorder = 4
       Caption = 'btnOK'
-      Constraints.MaxHeight = 25
-      Constraints.MinHeight = 25
       Constraints.MinWidth = 75
       ModalResult = 1
       TabOrder = 0
     end
     object btnCancel: TButton
-      AnchorSideRight.Control = Panel1
       AnchorSideRight.Side = asrBottom
-      AnchorSideBottom.Control = Panel1
       AnchorSideBottom.Side = asrBottom
-      Left = 242
-      Height = 25
-      Top = 10
-      Width = 87
-      Anchors = [akRight, akBottom]
+      Left = 245
+      Height = 31
+      Top = 6
+      Width = 84
+      Align = alRight
       AutoSize = True
       BorderSpacing.Around = 6
       BorderSpacing.InnerBorder = 4
       Cancel = True
       Caption = 'btnCancel'
-      Constraints.MaxHeight = 25
-      Constraints.MinHeight = 25
       Constraints.MinWidth = 75
       ModalResult = 2
       TabOrder = 1
     end
   end
-  object Panel2: TPanel
-    Height = 265
-    Top = 24
-    Width = 7
-    Align = alLeft
-    BevelOuter = bvNone
-    TabOrder = 1
-    TabStop = True
-  end
-  object Panel3: TPanel
+  object DirectoryPanel: TPanel
     Height = 24
     Width = 335
     Align = alTop
     BevelOuter = bvNone
     ClientHeight = 24
     ClientWidth = 335
-    TabOrder = 2
+    TabOrder = 1
     TabStop = True
     object lblDirectory: TLabel
       Left = 140
@@ -89,31 +74,21 @@ object DirSelDlg: TDirSelDlg
       Top = 4
       Width = 76
       Caption = '&Directory'
-      Color = clNone
       FocusControl = TV
       Layout = tlCenter
       ParentColor = False
     end
   end
-  object Panel4: TPanel
-    Left = 328
-    Height = 265
-    Top = 24
-    Width = 7
-    Align = alRight
-    BevelOuter = bvNone
-    TabOrder = 3
-    TabStop = True
-  end
   object TV: TTreeView
-    Left = 7
-    Height = 265
-    Top = 24
-    Width = 321
+    Left = 6
+    Height = 251
+    Top = 30
+    Width = 323
     Align = alClient
+    BorderSpacing.Around = 6
     Constraints.MinHeight = 100
     Constraints.MinWidth = 100
-    DefaultItemHeight = 18
+    DefaultItemHeight = 19
     ParentColor = True
     ParentCtl3D = False
     ParentFont = True
diff --git a/lcl/dirsel.lrs b/lcl/dirsel.lrs
index 06ce76f318..617e99e785 100644
--- a/lcl/dirsel.lrs
+++ b/lcl/dirsel.lrs
@@ -7,33 +7,26 @@ LazarusResources.Add('TDirSelDlg','FORMDATA',[
   +'ntrol'#7#2'TV'#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#16'Select Directo'
   +'ry'#12'ClientHeight'#3'J'#1#11'ClientWidth'#3'O'#1#9'FormStyle'#7#11'fsStay'
   +'OnTop'#6'OnShow'#7#8'FormShow'#8'Position'#7#14'poScreenCenter'#0#6'TPanel'
-  +#6'Panel1'#6'Height'#2')'#3'Top'#3'!'#1#5'Width'#3'O'#1#5'Align'#7#8'alBotto'
-  +'m'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2')'#11'ClientWidth'#3'O'#1#8
-  +'TabOrder'#2#4#7'TabStop'#9#0#7'TButton'#5'btnOK'#23'AnchorSideRight.Control'
-  +#7#9'btnCancel'#24'AnchorSideBottom.Control'#7#9'btnCancel'#21'AnchorSideBot'
-  +'tom.Side'#7#9'asrBottom'#4'Left'#3#161#0#6'Height'#2#25#3'Top'#2#10#5'Width'
-  +#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#25'BorderSpacing.'
-  +'InnerBorder'#2#4#7'Caption'#6#5'btnOK'#21'Constraints.MaxHeight'#2#25#21'Co'
-  +'nstraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#11'ModalResult'#2#1
-  +#8'TabOrder'#2#0#0#0#7'TButton'#9'btnCancel'#23'AnchorSideRight.Control'#7#6
-  +'Panel1'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'
-  +#7#6'Panel1'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#242#0#6'Heig'
-  +'ht'#2#25#3'Top'#2#10#5'Width'#2'W'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8
-  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#6
-  +'Cancel'#9#7'Caption'#6#9'btnCancel'#21'Constraints.MaxHeight'#2#25#21'Const'
-  +'raints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#11'ModalResult'#2#2#8
-  +'TabOrder'#2#1#0#0#0#6'TPanel'#6'Panel2'#6'Height'#3#9#1#3'Top'#2#24#5'Width'
-  +#2#7#5'Align'#7#6'alLeft'#10'BevelOuter'#7#6'bvNone'#8'TabOrder'#2#1#7'TabSt'
-  +'op'#9#0#0#6'TPanel'#6'Panel3'#6'Height'#2#24#5'Width'#3'O'#1#5'Align'#7#5'a'
-  +'lTop'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2#24#11'ClientWidth'#3'O'
-  +#1#8'TabOrder'#2#2#7'TabStop'#9#0#6'TLabel'#12'lblDirectory'#4'Left'#3#140#0
-  +#6'Height'#2#17#3'Top'#2#4#5'Width'#2'L'#7'Caption'#6#10'&Directory'#5'Color'
-  +#7#6'clNone'#12'FocusControl'#7#2'TV'#6'Layout'#7#8'tlCenter'#11'ParentColor'
-  +#8#0#0#0#6'TPanel'#6'Panel4'#4'Left'#3'H'#1#6'Height'#3#9#1#3'Top'#2#24#5'Wi'
-  +'dth'#2#7#5'Align'#7#7'alRight'#10'BevelOuter'#7#6'bvNone'#8'TabOrder'#2#3#7
-  +'TabStop'#9#0#0#9'TTreeView'#2'TV'#4'Left'#2#7#6'Height'#3#9#1#3'Top'#2#24#5
-  +'Width'#3'A'#1#5'Align'#7#8'alClient'#21'Constraints.MinHeight'#2'd'#20'Cons'
-  +'traints.MinWidth'#2'd'#17'DefaultItemHeight'#2#18#11'ParentColor'#9#11'Pare'
-  +'ntCtl3D'#8#10'ParentFont'#9#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#0
-  +#10'OnExpanded'#7#10'TVExpanded'#0#0#0
+  +#6'Panel1'#6'Height'#2'+'#3'Top'#3#31#1#5'Width'#3'O'#1#5'Align'#7#8'alBotto'
+  +'m'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'+'#11'Client'
+  +'Width'#3'O'#1#8'TabOrder'#2#2#7'TabStop'#9#0#7'TButton'#5'btnOK'#21'AnchorS'
+  +'ideBottom.Side'#7#9'asrBottom'#4'Left'#3#164#0#6'Height'#2#31#3'Top'#2#6#5
+  +'Width'#2'K'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6
+  +#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#5'btnOK'#20'Constraints.MinW'
+  +'idth'#2'K'#11'ModalResult'#2#1#8'TabOrder'#2#0#0#0#7'TButton'#9'btnCancel'
+  +#20'AnchorSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBo'
+  +'ttom'#4'Left'#3#245#0#6'Height'#2#31#3'Top'#2#6#5'Width'#2'T'#5'Align'#7#7
+  +'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerB'
+  +'order'#2#4#6'Cancel'#9#7'Caption'#6#9'btnCancel'#20'Constraints.MinWidth'#2
+  +'K'#11'ModalResult'#2#2#8'TabOrder'#2#1#0#0#0#6'TPanel'#14'DirectoryPanel'#6
+  +'Height'#2#24#5'Width'#3'O'#1#5'Align'#7#5'alTop'#10'BevelOuter'#7#6'bvNone'
+  +#12'ClientHeight'#2#24#11'ClientWidth'#3'O'#1#8'TabOrder'#2#1#7'TabStop'#9#0
+  +#6'TLabel'#12'lblDirectory'#4'Left'#3#140#0#6'Height'#2#17#3'Top'#2#4#5'Widt'
+  +'h'#2'L'#7'Caption'#6#10'&Directory'#12'FocusControl'#7#2'TV'#6'Layout'#7#8
+  +'tlCenter'#11'ParentColor'#8#0#0#0#9'TTreeView'#2'TV'#4'Left'#2#6#6'Height'#3
+  +#251#0#3'Top'#2#30#5'Width'#3'C'#1#5'Align'#7#8'alClient'#20'BorderSpacing.A'
+  +'round'#2#6#21'Constraints.MinHeight'#2'd'#20'Constraints.MinWidth'#2'd'#17
+  +'DefaultItemHeight'#2#19#11'ParentColor'#9#11'ParentCtl3D'#8#10'ParentFont'#9
+  +#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#0#10'OnExpanded'#7#10'TVExpan'
+  +'ded'#0#0#0
 ]);
diff --git a/lcl/dirsel.pas b/lcl/dirsel.pas
index f718127c42..ac77a89fd3 100644
--- a/lcl/dirsel.pas
+++ b/lcl/dirsel.pas
@@ -31,14 +31,15 @@ uses
   StdCtrls, ComCtrls, ExtCtrls;
 
 type
+
+  { TDirSelDlg }
+
   TDirSelDlg = class(TForm)
     btnOK: TButton;
     btnCancel: TButton;
     lblDirectory: TLabel;
     Panel1: TPanel;
-    Panel2: TPanel;
-    Panel3: TPanel;
-    Panel4: TPanel;
+    DirectoryPanel: TPanel;
     TV: TTreeview;
     procedure FormShow(Sender: TObject);
     procedure TVExpanded(Sender: TObject; Node: TTreeNode);
diff --git a/lcl/include/menuitem.inc b/lcl/include/menuitem.inc
index 17fdab3f44..83b607b0d8 100644
--- a/lcl/include/menuitem.inc
+++ b/lcl/include/menuitem.inc
@@ -892,6 +892,7 @@ begin
   if Enabled then Flags:=Flags+'E';
   if RadioItem then Flags:=Flags+'R';
   if Checked then Flags:=Flags+'C';
+  if HandleAllocated then Flags:=Flags+'H';
   DbgOut(Prefix,' Name="',Name,'" Caption="',DbgStr(Caption),'" Flags=',Flags);
   if Parent<>nil then
     DbgOut(' ',dbgs(MenuIndex),'/',dbgs(Parent.Count));