diff --git a/ide/compileroptionsdlg.lfm b/ide/compileroptionsdlg.lfm
index fb7991395d..f197f0b2b8 100644
--- a/ide/compileroptionsdlg.lfm
+++ b/ide/compileroptionsdlg.lfm
@@ -1,7 +1,7 @@
 object frmCompilerOptions: TfrmCompilerOptions
-  Left = 399
+  Left = 377
   Height = 528
-  Top = 211
+  Top = 231
   Width = 669
   ActiveControl = MainNotebook
   BorderIcons = [biSystemMenu]
@@ -1021,80 +1021,17 @@ object frmCompilerOptions: TfrmCompilerOptions
         ClientWidth = 663
         TabOrder = 2
         Visible = True
-        inherited ModesGroupBox: TGroupBox
+        inherited BuildModesGroupBox: TGroupBox
           Height = 230
+          Width = 663
           ClientHeight = 211
-          inherited NewSpeedButton: TSpeedButton
-            Top = 189
-          end
-          inherited DeleteSpeedButton: TSpeedButton
-            Top = 189
-          end
-          inherited MoveDownSpeedButton: TSpeedButton
-            Top = 189
-          end
-          inherited MoveUpSpeedButton: TSpeedButton
-            Top = 189
-          end
-          inherited ModesGrid: TStringGrid
-            Height = 189
+          ClientWidth = 659
+          inherited BuildModesTreeView: TTreeView
+            Height = 211
+            Width = 659
           end
         end
-        inherited ValuesGroupBox: TGroupBox
-          Height = 230
-          Width = 472
-          ClientHeight = 211
-          ClientWidth = 468
-          inherited ValuesStringGrid: TStringGrid
-            Height = 96
-            Width = 468
-          end
-          inherited DefaultValueGroupBox: TGroupBox
-            Top = 102
-            Width = 468
-            ClientWidth = 464
-            inline DefaultValueEditor: TCompOptsConditionalsFrame
-              Height = 90
-              Width = 464
-              Align = alClient
-              ClientHeight = 86
-              ClientWidth = 460
-              Visible = True
-              DesignLeft = 434
-              DesignTop = 329
-              inherited COCTreeView: TTreeView
-                Height = 86
-                Width = 460
-              end
-              inherited COCPopupMenu: TPopupMenu
-                inherited InsertAboveMenuItem: TMenuItem
-                end
-                inherited InsertBelowMenuItem: TMenuItem
-                end
-                inherited InsertChildMenuItem: TMenuItem
-                end
-                inherited DeleteMenuItem: TMenuItem
-                end
-                inherited MoveUpMenuItem: TMenuItem
-                end
-                inherited MoveDownMenuItem: TMenuItem
-                end
-                inherited MoveLvlUpMenuItem: TMenuItem
-                end
-                inherited MoveLvlDownMenuItem: TMenuItem
-                end
-                inherited PropertiesMenuItem: TMenuItem
-                end
-              end
-            end
-          end
-          inherited ValuesSplitter: TSplitter
-            Top = 96
-            Width = 468
-          end
-        end
-        inherited MainSplitter: TSplitter
-          Height = 230
+        inherited BuildModeTVPopupMenu: TPopupMenu
         end
       end
     end
diff --git a/ide/compileroptionsdlg.lrs b/ide/compileroptionsdlg.lrs
index e22b336b93..db3cb81d8f 100644
--- a/ide/compileroptionsdlg.lrs
+++ b/ide/compileroptionsdlg.lrs
@@ -1,113 +1,113 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
-  'TPF0'#19'TfrmCompilerOptions'#18'frmCompilerOptions'#4'Left'#3#143#1#6'Heigh'
-  +'t'#3#16#2#3'Top'#3#211#0#5'Width'#3#157#2#13'ActiveControl'#7#12'MainNotebo'
-  +'ok'#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#18'frmCompilerOption'
-  +'s'#12'ClientHeight'#3#16#2#11'ClientWidth'#3#157#2#21'Constraints.MinHeight'
-  +#3#244#1#20'Constraints.MinWidth'#3'X'#2#7'OnClose'#7#23'frmCompilerOptionsC'
-  +'lose'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#9'TNote'
-  +'book'#12'MainNotebook'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#4'Left'#2
-  +#0#6'Height'#3#224#1#3'Top'#2#0#5'Width'#3#157#2#5'Align'#7#5'alTop'#7'Ancho'
-  +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#6#8'TabOr'
-  +'der'#2#0#0#5'TPage'#8'PathPage'#7'Caption'#6#8'PathPage'#11'ClientWidth'#3
-  +#155#2#12'ClientHeight'#3#197#1#0#6'TLabel'#13'lblOtherUnits'#4'Left'#2#6#6
-  +'Height'#2#20#3'Top'#2#6#5'Width'#3#143#2#5'Align'#7#5'alTop'#18'BorderSpaci'
-  +'ng.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Captio'
-  +'n'#6#13'lblOtherUnits'#11'ParentColor'#8#0#0#6'TLabel'#15'lblIncludeFiles'
-  +#22'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7#13'edt'
-  +'OtherUnits'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20
-  +#3'Top'#2'7'#5'Width'#2'W'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2
-  +#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#15'lblIncludeFiles'#11'ParentCol'
-  +'or'#8#0#0#6'TLabel'#15'lblOtherSources'#22'AnchorSideLeft.Control'#7#8'Path'
-  +'Page'#21'AnchorSideTop.Control'#7#15'edtIncludeFiles'#18'AnchorSideTop.Side'
-  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'h'#5'Width'#2'g'#18'Bord'
-  +'erSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7
-  +'Caption'#6#15'lblOtherSources'#11'ParentColor'#8#0#0#6'TLabel'#12'lblLibrar'
-  +'ies'#22'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7#15
-  +'edtOtherSources'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
-  +#2#20#3'Top'#3#153#0#5'Width'#2'E'#18'BorderSpacing.Left'#2#6#17'BorderSpaci'
-  +'ng.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#12'lblLibraries'#11'Pa'
-  +'rentColor'#8#0#0#6'TLabel'#16'lblUnitOutputDir'#22'AnchorSideLeft.Control'#7
-  +#8'PathPage'#21'AnchorSideTop.Control'#7#12'edtLibraries'#18'AnchorSideTop.S'
-  +'ide'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#3#202#0#5'Width'#2'g'
-  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'
-  +#2#6#7'Caption'#6#16'lblUnitOutputDir'#11'ParentColor'#8#0#0#6'TLabel'#12'lb'
-  +'lDebugPath'#22'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Contr'
-  +'ol'#7#16'edtUnitOutputDir'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6
-  +#6'Height'#2#20#3'Top'#3#251#0#5'Width'#2'U'#18'BorderSpacing.Left'#2#6#17'B'
-  +'orderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#12'lblDebugP'
-  +'ath'#11'ParentColor'#8#0#0#6'TLabel'#18'LCLWidgetTypeLabel'#22'AnchorSideLe'
-  +'ft.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7#12'edtDebugPath'#18'A'
-  +'nchorSideTop.Side'#7#9'asrBottom'#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'Captio'
-  +'n'#6#18'LCLWidgetTypeLabel'#11'ParentColor'#8#0#0#5'TEdit'#13'edtOtherUnits'
-  +#22'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7#13'lbl'
-  +'OtherUnits'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Contro'
-  +'l'#7#8'PathPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heig'
-  +'ht'#2#23#3'Top'#2#26#5'Width'#3#143#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
-  +'Right'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSp'
-  +'acing.Bottom'#2#6#8'TabOrder'#2#0#4'Text'#6#13'edtOtherUnits'#0#0#5'TEdit'
-  +#15'edtIncludeFiles'#22'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideT'
-  +'op.Control'#7#15'lblIncludeFiles'#18'AnchorSideTop.Side'#7#9'asrBottom'#23
-  +'AnchorSideRight.Control'#7#8'PathPage'#20'AnchorSideRight.Side'#7#9'asrBott'
-  +'om'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'K'#5'Width'#3#143#2#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.R'
-  +'ight'#2#6#20'BorderSpacing.Bottom'#2#6#8'TabOrder'#2#1#4'Text'#6#15'edtIncl'
-  +'udeFiles'#0#0#5'TEdit'#15'edtOtherSources'#22'AnchorSideLeft.Control'#7#8'P'
-  +'athPage'#21'AnchorSideTop.Control'#7#15'lblOtherSources'#18'AnchorSideTop.S'
-  +'ide'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#8'PathPage'#20'AnchorSide'
-  +'Right.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'|'#5'Width'#3
-  +#143#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'AnchorSideTop.Control'#7#12'lblLibraries'#18'Anc'
-  +'horSideTop.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#173
-  +#0#5'Width'#3#143#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#3#4'Text'#6#12'edtLibraries'#0#0#5'TEdit'#16'edtUnitOutputDir'
-  +#22'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7#16'lbl'
-  +'UnitOutputDir'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Con'
-  +'trol'#7#8'PathPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
-  +'eight'#2#23#3'Top'#3#222#0#5'Width'#3#143#2#7'Anchors'#11#5'akTop'#6'akLeft'
-  +#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'Bord'
-  +'erSpacing.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'AnchorS'
-  +'ideTop.Control'#7#12'lblDebugPath'#18'AnchorSideTop.Side'#7#9'asrBottom'#23
-  +'AnchorSideRight.Control'#7#8'PathPage'#20'AnchorSideRight.Side'#7#9'asrBott'
-  +'om'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#15#1#5'Width'#3#143#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#5#4'Text'#6#12'edtDe'
-  +'bugPath'#0#0#9'TComboBox'#21'LCLWidgetTypeComboBox'#22'AnchorSideLeft.Contr'
-  +'ol'#7#18'LCLWidgetTypeLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Anch'
-  +'orSideTop.Control'#7#18'LCLWidgetTypeLabel'#18'AnchorSideTop.Side'#7#9'asrC'
-  +'enter'#4'Left'#3#139#0#6'Height'#2#25#3'Top'#3'0'#1#5'Width'#3#171#0#12'Aut'
-  +'oComplete'#8#18'BorderSpacing.Left'#2#6#5'Ctl3D'#8#10'ItemHeight'#2#0#9'Ite'
-  +'mWidth'#2#0#8'TabOrder'#2#6#4'Text'#6#21'LCLWidgetTypeComboBox'#0#0#0#5'TPa'
-  +'ge'#11'ParsingPage'#7'Caption'#6#11'ParsingPage'#11'ClientWidth'#3#155#2#12
-  +'ClientHeight'#3#197#1#0#11'TRadioGroup'#11'grpAsmStyle'#4'Left'#2#6#6'Heigh'
-  +'t'#2'('#3'Top'#3'P'#1#5'Width'#3#143#2#5'Align'#7#5'alTop'#8'AutoFill'#9#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#11'grpAsmStyle'#28'ChildSizing.LeftR'
-  +'ightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.Enlarg'
-  +'eHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'
-  +#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsSca'
-  +'leChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizin'
-  +'g.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLin'
-  +'e'#2#3#7'Columns'#2#3#5'Ctl3D'#8#8'TabOrder'#2#0#0#0#11'TCheckGroup'#16'grp'
-  +'SyntaxOptions'#4'Left'#2#6#6'Height'#3#2#1#3'Top'#2'H'#5'Width'#3#143#2#5'A'
-  +'lign'#7#5'alTop'#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#16
-  +'grpSyntaxOptions'#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#1#5'Ctl3D'#8#8'TabOrder'#2#1#0#0
-  +#9'TGroupBox'#13'grpSyntaxMode'#4'Left'#2#6#6'Height'#2'<'#3'Top'#2#6#5'Widt'
-  +'h'#3#143#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#13'grpSyntaxMode'#12'ClientHeight'#2')'#11'ClientWidth'#3#139#2#5
-  +'Ctl3D'#8#8'TabOrder'#2#2#0#9'TComboBox'#13'cmbSyntaxMode'#4'Left'#2#6#6'Hei'
-  +'ght'#2#29#3'Top'#2#6#5'Width'#3'Q'#1#5'Align'#7#6'alLeft'#12'AutoComplete'#8
+  'TPF0'#19'TfrmCompilerOptions'#18'frmCompilerOptions'#4'Left'#3'y'#1#6'Height'
+  +#3#16#2#3'Top'#3#231#0#5'Width'#3#157#2#13'ActiveControl'#7#12'MainNotebook'
+  +#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#18'frmCompilerOptions'#12
+  +'ClientHeight'#3#16#2#11'ClientWidth'#3#157#2#21'Constraints.MinHeight'#3#244
+  +#1#20'Constraints.MinWidth'#3'X'#2#7'OnClose'#7#23'frmCompilerOptionsClose'#8
+  +'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#9'TNotebook'#12
+  +'MainNotebook'#24'AnchorSideBottom.Control'#7#8'BtnPanel'#4'Left'#2#0#6'Heig'
+  +'ht'#3#224#1#3'Top'#2#0#5'Width'#3#157#2#5'Align'#7#5'alTop'#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#6#8'TabOrder'#2#0#0
+  +#5'TPage'#8'PathPage'#7'Caption'#6#8'PathPage'#11'ClientWidth'#3#155#2#12'Cl'
+  +'ientHeight'#3#197#1#0#6'TLabel'#13'lblOtherUnits'#4'Left'#2#6#6'Height'#2#20
+  +#3'Top'#2#6#5'Width'#3#143#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'lblOt'
+  +'herUnits'#11'ParentColor'#8#0#0#6'TLabel'#15'lblIncludeFiles'#22'AnchorSide'
+  +'Left.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7#13'edtOtherUnits'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'7'#5
+  +'Width'#2'W'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderS'
+  +'pacing.Right'#2#6#7'Caption'#6#15'lblIncludeFiles'#11'ParentColor'#8#0#0#6
+  +'TLabel'#15'lblOtherSources'#22'AnchorSideLeft.Control'#7#8'PathPage'#21'Anc'
+  +'horSideTop.Control'#7#15'edtIncludeFiles'#18'AnchorSideTop.Side'#7#9'asrBot'
+  +'tom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'h'#5'Width'#2'g'#18'BorderSpacing.'
+  +'Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6
+  +#15'lblOtherSources'#11'ParentColor'#8#0#0#6'TLabel'#12'lblLibraries'#22'Anc'
+  +'horSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7#15'edtOtherS'
+  +'ources'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3
+  +'Top'#3#153#0#5'Width'#2'E'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'
+  +#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#12'lblLibraries'#11'ParentColo'
+  +'r'#8#0#0#6'TLabel'#16'lblUnitOutputDir'#22'AnchorSideLeft.Control'#7#8'Path'
+  +'Page'#21'AnchorSideTop.Control'#7#12'edtLibraries'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#3#202#0#5'Width'#2'g'#18'Bor'
+  +'derSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7
+  +'Caption'#6#16'lblUnitOutputDir'#11'ParentColor'#8#0#0#6'TLabel'#12'lblDebug'
+  +'Path'#22'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7
+  +#16'edtUnitOutputDir'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'He'
+  +'ight'#2#20#3'Top'#3#251#0#5'Width'#2'U'#18'BorderSpacing.Left'#2#6#17'Borde'
+  +'rSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#12'lblDebugPath'
+  +#11'ParentColor'#8#0#0#6'TLabel'#18'LCLWidgetTypeLabel'#22'AnchorSideLeft.Co'
+  +'ntrol'#7#8'PathPage'#21'AnchorSideTop.Control'#7#12'edtDebugPath'#18'Anchor'
+  +'SideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#3'2'#1#5'Wid'
+  +'th'#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'lblOth'
+  +'erUnits'#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#26#5'Width'#3#143#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
+  +#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.B'
+  +'ottom'#2#6#8'TabOrder'#2#0#4'Text'#6#13'edtOtherUnits'#0#0#5'TEdit'#15'edtI'
+  +'ncludeFiles'#22'AnchorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Cont'
+  +'rol'#7#15'lblIncludeFiles'#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'K'#5'Width'#3#143#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#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'asr'
+  +'Bottom'#23'AnchorSideRight.Control'#7#8'PathPage'#20'AnchorSideRight.Side'#7
+  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2'|'#5'Width'#3#143#2#7'Anch'
+  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#19'Borde'
+  +'rSpacing.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'AnchorSideTop.Control'#7#12'lblLibraries'#18'AnchorSideTop'
+  +'.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#8'PathPage'#20'AnchorSi'
+  +'deRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#173#0#5'Wi'
+  +'dth'#3#143#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'TabOr'
+  +'der'#2#3#4'Text'#6#12'edtLibraries'#0#0#5'TEdit'#16'edtUnitOutputDir'#22'An'
+  +'chorSideLeft.Control'#7#8'PathPage'#21'AnchorSideTop.Control'#7#16'lblUnitO'
+  +'utputDir'#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'#3#222#0#5'Width'#3#143#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akR'
+  +'ight'#0#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpa'
+  +'cing.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'lblDebugPath'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anchor'
+  +'SideRight.Control'#7#8'PathPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#2#23#3'Top'#3#15#1#5'Width'#3#143#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#5#4'Text'#6#12'edtDebugPa'
+  +'th'#0#0#9'TComboBox'#21'LCLWidgetTypeComboBox'#22'AnchorSideLeft.Control'#7
+  +#18'LCLWidgetTypeLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSide'
+  +'Top.Control'#7#18'LCLWidgetTypeLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'
+  +#4'Left'#3#139#0#6'Height'#2#25#3'Top'#3'0'#1#5'Width'#3#171#0#12'AutoComple'
+  +'te'#8#18'BorderSpacing.Left'#2#6#5'Ctl3D'#8#10'ItemHeight'#2#0#9'ItemWidth'
+  +#2#0#8'TabOrder'#2#6#4'Text'#6#21'LCLWidgetTypeComboBox'#0#0#0#5'TPage'#11'P'
+  +'arsingPage'#7'Caption'#6#11'ParsingPage'#11'ClientWidth'#3#155#2#12'ClientH'
+  +'eight'#3#197#1#0#11'TRadioGroup'#11'grpAsmStyle'#4'Left'#2#6#6'Height'#2'('
+  +#3'Top'#3'P'#1#5'Width'#3#143#2#5'Align'#7#5'alTop'#8'AutoFill'#9#20'BorderS'
+  +'pacing.Around'#2#6#7'Caption'#6#11'grpAsmStyle'#28'ChildSizing.LeftRightSpa'
+  +'cing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizo'
+  +'ntal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'c'
+  +'rsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChil'
+  +'ds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layo'
+  +'ut'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#3
+  +#7'Columns'#2#3#5'Ctl3D'#8#8'TabOrder'#2#0#0#0#11'TCheckGroup'#16'grpSyntaxO'
+  +'ptions'#4'Left'#2#6#6'Height'#3#2#1#3'Top'#2'H'#5'Width'#3#143#2#5'Align'#7
+  +#5'alTop'#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'grpSynt'
+  +'axOptions'#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'cclLeftToRightThenTopToBotto'
+  +'m'#27'ChildSizing.ControlsPerLine'#2#1#5'Ctl3D'#8#8'TabOrder'#2#1#0#0#9'TGr'
+  +'oupBox'#13'grpSyntaxMode'#4'Left'#2#6#6'Height'#2'<'#3'Top'#2#6#5'Width'#3
+  +#143#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Capt'
+  +'ion'#6#13'grpSyntaxMode'#12'ClientHeight'#2')'#11'ClientWidth'#3#139#2#5'Ct'
+  +'l3D'#8#8'TabOrder'#2#2#0#9'TComboBox'#13'cmbSyntaxMode'#4'Left'#2#6#6'Heigh'
+  +'t'#2#29#3'Top'#2#6#5'Width'#3'Q'#1#5'Align'#7#6'alLeft'#12'AutoComplete'#8
   +#20'BorderSpacing.Around'#2#6#5'Ctl3D'#8#10'ItemHeight'#2#0#9'ItemWidth'#2#0
   +#8'TabOrder'#2#0#4'Text'#6#13'cmbSyntaxMode'#0#0#0#0#5'TPage'#11'CodeGenPage'
   +#7'Caption'#6#11'CodeGenPage'#11'ClientWidth'#3#155#2#12'ClientHeight'#3#197
@@ -318,307 +318,290 @@ LazarusResources.Add('TfrmCompilerOptions','FORMDATA',[
   +'p'#3#214#0#5'Width'#3#155#2#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akTop'
   +#0#0#244#23'TCompOptBuildModesFrame'#15'BuildModesFrame'#6'Height'#3#234#0#3
   +'Top'#3#219#0#5'Width'#3#155#2#5'Align'#7#8'alClient'#12'ClientHeight'#3#230
-  +#0#11'ClientWidth'#3#151#2#8'TabOrder'#2#2#7'Visible'#9#0#241#9'TGroupBox'#13
-  +'ModesGroupBox'#6'Height'#3#230#0#12'ClientHeight'#3#211#0#0#241#12'TSpeedBu'
-  +'tton'#14'NewSpeedButton'#3'Top'#3#189#0#0#0#241#12'TSpeedButton'#17'DeleteS'
-  ,'peedButton'#3'Top'#3#189#0#0#0#241#12'TSpeedButton'#19'MoveDownSpeedButton'
-  +#3'Top'#3#189#0#0#0#241#12'TSpeedButton'#17'MoveUpSpeedButton'#3'Top'#3#189#0
-  +#0#0#241#11'TStringGrid'#9'ModesGrid'#6'Height'#3#189#0#0#0#0#241#9'TGroupBo'
-  +'x'#14'ValuesGroupBox'#6'Height'#3#230#0#5'Width'#3#216#1#12'ClientHeight'#3
-  +#211#0#11'ClientWidth'#3#212#1#0#241#11'TStringGrid'#16'ValuesStringGrid'#6
-  +'Height'#2'`'#5'Width'#3#212#1#0#0#241#9'TGroupBox'#20'DefaultValueGroupBox'
-  +#3'Top'#2'f'#5'Width'#3#212#1#11'ClientWidth'#3#208#1#0#244#26'TCompOptsCond'
-  +'itionalsFrame'#18'DefaultValueEditor'#6'Height'#2'Z'#5'Width'#3#208#1#5'Ali'
-  +'gn'#7#8'alClient'#12'ClientHeight'#2'V'#11'ClientWidth'#3#204#1#7'Visible'#9
-  +#10'DesignLeft'#3#178#1#9'DesignTop'#3'I'#1#0#241#9'TTreeView'#11'COCTreeVie'
-  +'w'#6'Height'#2'V'#5'Width'#3#204#1#0#0#241#10'TPopupMenu'#12'COCPopupMenu'#0
-  +#241#9'TMenuItem'#19'InsertAboveMenuItem'#0#0#241#9'TMenuItem'#19'InsertBelo'
-  +'wMenuItem'#0#0#241#9'TMenuItem'#19'InsertChildMenuItem'#0#0#241#9'TMenuItem'
-  +#14'DeleteMenuItem'#0#0#241#9'TMenuItem'#14'MoveUpMenuItem'#0#0#241#9'TMenuI'
-  +'tem'#16'MoveDownMenuItem'#0#0#241#9'TMenuItem'#17'MoveLvlUpMenuItem'#0#0#241
-  +#9'TMenuItem'#19'MoveLvlDownMenuItem'#0#0#241#9'TMenuItem'#18'PropertiesMenu'
-  +'Item'#0#0#0#0#0#241#9'TSplitter'#14'ValuesSplitter'#3'Top'#2'`'#5'Width'#3
-  +#212#1#0#0#0#241#9'TSplitter'#12'MainSplitter'#6'Height'#3#230#0#0#0#0#0#5'T'
-  +'Page'#13'InheritedPage'#7'Caption'#6#13'InheritedPage'#11'ClientWidth'#3#155
-  +#2#12'ClientHeight'#3#197#1#0#6'TLabel'#12'InhNoteLabel'#4'Left'#2#6#6'Heigh'
-  +'t'#2#20#3'Top'#2#6#5'Width'#3#143#2#5'Align'#7#5'alTop'#20'BorderSpacing.Ar'
-  +'ound'#2#6#7'Caption'#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#143#2#5
-  +'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#5
-  +'Ctl3D'#8#17'DefaultItemHeight'#2#19#8'TabOrder'#2#0#18'OnSelectionChanged'#7
-  +#27'InhTreeViewSelectionChanged'#0#0#5'TMemo'#11'InhItemMemo'#4'Left'#2#6#6
-  +'Height'#3#163#0#3'Top'#3#28#1#5'Width'#3#143#2#5'Align'#7#8'alClient'#18'Bo'
-  +'rderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2
-  +#6#8'ReadOnly'#9#10'ScrollBars'#7#14'ssAutoVertical'#8'TabOrder'#2#1#0#0#9'T'
-  +'Splitter'#11'InhSplitter'#6'Cursor'#7#8'crVSplit'#4'Left'#2#0#6'Height'#2#5
-  +#3'Top'#3#23#1#5'Width'#3#155#2#5'Align'#7#5'alTop'#12'ResizeAnchor'#7#5'akT'
-  +'op'#0#0#0#5'TPage'#15'CompilationPage'#7'Caption'#6#15'CompilationPage'#11
-  +'ClientWidth'#3#155#2#12'ClientHeight'#3#197#1#0#9'TCheckBox'#17'chkCreateMa'
-  +'kefile'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3#143#2#5'Align'#7#5
-  +'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'chkCreateMakefile'#8'Ta'
-  +'bOrder'#2#0#0#0#9'TGroupBox'#20'ExecuteAfterGroupBox'#4'Left'#2#6#6'Height'
-  +#2'l'#3'Top'#3#233#0#5'Width'#3#143#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'B'
-  +'orderSpacing.Around'#2#6#7'Caption'#6#20'ExecuteAfterGroupBox'#12'ClientHei'
-  +'ght'#2'Y'#11'ClientWidth'#3#139#2#5'Ctl3D'#8#8'TabOrder'#2#1#0#6'TLabel'#17
-  +'lblRunIfExecAfter'#22'AnchorSideLeft.Control'#7#20'ExecuteAfterGroupBox'#21
-  +'AnchorSideTop.Control'#7#20'ExecuteAfterGroupBox'#4'Left'#2#6#6'Height'#2#20
-  +#3'Top'#2#6#5'Width'#2'j'#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'lblRu'
-  +'nIfExecAfter'#11'ParentColor'#8#0#0#6'TLabel'#24'ExecuteAfterCommandLabel'
-  +#22'AnchorSideLeft.Control'#7#20'ExecuteAfterGroupBox'#21'AnchorSideTop.Cont'
-  +'rol'#7#17'lblRunIfExecAfter'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
-  +#6#6'Height'#2#20#3'Top'#2' '#5'Width'#3#184#0#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#24'ExecuteAfterCommandLabel'#11'ParentColor'#8#0#0#9'TCheckBox'
-  +#19'chkExecAfterCompile'#22'AnchorSideLeft.Control'#7#17'lblRunIfExecAfter'
-  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#20'Execu'
-  +'teAfterGroupBox'#4'Left'#3#142#0#6'Height'#2#22#3'Top'#2#6#5'Width'#3#159#0
-  +#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'ch'
-  +'kExecAfterCompile'#8'TabOrder'#2#0#0#0#9'TCheckBox'#17'chkExecAfterBuild'#22
-  +'AnchorSideLeft.Control'#7#19'chkExecAfterCompile'#19'AnchorSideLeft.Side'#7
-  +#9'asrBottom'#21'AnchorSideTop.Control'#7#20'ExecuteAfterGroupBox'#4'Left'#3
-  +'K'#1#6'Height'#2#22#3'Top'#2#6#5'Width'#3#138#0#18'BorderSpacing.Left'#2#24
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'chkExecAfterBuild'#8'TabOrder'
-  +#2#1#0#0#9'TCheckBox'#15'chkExecAfterRun'#22'AnchorSideLeft.Control'#7#17'ch'
-  +'kExecAfterBuild'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Co'
-  +'ntrol'#7#20'ExecuteAfterGroupBox'#4'Left'#3#243#1#6'Height'#2#22#3'Top'#2#6
-  +#5'Width'#3#130#0#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#15'chkExecAfterRun'#8'TabOrder'#2#2#0#0#5'TEdit'#23'ExecuteAfter'
-  +'CommandEdit'#22'AnchorSideLeft.Control'#7#24'ExecuteAfterCommandLabel'#19'A'
-  +'nchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'lblRunIfE'
-  +'xecAfter'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'
-  ,#7#20'ExecuteAfterGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3
-  +#208#0#6'Height'#2#23#3'Top'#2' '#5'Width'#3#181#1#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#12#20'BorderSpacing.Around'#2
-  +#6#8'TabOrder'#2#3#4'Text'#6#23'ExecuteAfterCommandEdit'#0#0#9'TCheckBox'#27
-  +'ExecuteAfterScanFPCCheckBox'#22'AnchorSideLeft.Control'#7#28'ExecuteAfterSc'
-  +'anMakeCheckBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Con'
-  +'trol'#7#23'ExecuteAfterCommandEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
-  +'Left'#3#15#1#6'Height'#2#22#3'Top'#2'='#5'Width'#3#225#0#18'BorderSpacing.L'
-  +'eft'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#27'ExecuteAfterScanFPCC'
-  +'heckBox'#8'TabOrder'#2#4#0#0#9'TCheckBox'#28'ExecuteAfterScanMakeCheckBox'
-  +#22'AnchorSideLeft.Control'#7#20'ExecuteAfterGroupBox'#21'AnchorSideTop.Cont'
-  +'rol'#7#23'ExecuteAfterCommandEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
-  +'Left'#2#6#6'Height'#2#22#3'Top'#2'='#5'Width'#3#235#0#20'BorderSpacing.Arou'
-  +'nd'#2#6#7'Caption'#6#28'ExecuteAfterScanMakeCheckBox'#8'TabOrder'#2#5#0#0#9
-  +'TCheckBox'#27'ExecuteAfterShowAllCheckBox'#22'AnchorSideLeft.Control'#7#27
-  +'ExecuteAfterScanFPCCheckBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Anch'
-  +'orSideTop.Control'#7#23'ExecuteAfterCommandEdit'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#4'Left'#3#14#2#6'Height'#2#22#3'Top'#2'='#5'Width'#3#218#0#18'Bo'
-  +'rderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#27'Execute'
-  +'AfterShowAllCheckBox'#8'TabOrder'#2#6#0#0#0#9'TGroupBox'#11'grpCompiler'#4
-  +'Left'#2#6#6'Height'#2'O'#3'Top'#3#148#0#5'Width'#3#143#2#5'Align'#7#5'alTop'
-  +#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'grpCompiler'#12
-  +'ClientHeight'#2'<'#11'ClientWidth'#3#139#2#5'Ctl3D'#8#8'TabOrder'#2#2#0#6'T'
-  +'Label'#16'lblRunIfCompiler'#22'AnchorSideLeft.Control'#7#11'grpCompiler'#21
-  +'AnchorSideTop.Control'#7#11'grpCompiler'#4'Left'#2#6#6'Height'#2#20#3'Top'#2
-  +#6#5'Width'#2'f'#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'lblRunIfCompil'
-  +'er'#11'ParentColor'#8#0#0#6'TLabel'#11'lblCompiler'#22'AnchorSideLeft.Contr'
-  +'ol'#7#11'grpCompiler'#21'AnchorSideTop.Control'#7#16'lblRunIfCompiler'#18'A'
-  +'nchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2' '#5
-  +'Width'#2'H'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderS'
-  +'pacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#11'lblCompiler'
-  +#11'ParentColor'#8#0#0#9'TCheckBox'#18'chkCompilerCompile'#22'AnchorSideLeft'
-  +'.Control'#7#16'lblRunIfCompiler'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
-  +'AnchorSideTop.Control'#7#11'grpCompiler'#4'Left'#3#138#0#6'Height'#2#22#3'T'
-  +'op'#2#6#5'Width'#3#155#0#18'BorderSpacing.Left'#2#30#17'BorderSpacing.Top'#2
-  +#6#7'Caption'#6#18'chkCompilerCompile'#8'TabOrder'#2#0#0#0#9'TCheckBox'#16'c'
-  +'hkCompilerBuild'#22'AnchorSideLeft.Control'#7#18'chkCompilerCompile'#19'Anc'
-  +'horSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#11'grpCompiler'
-  +#4'Left'#3'C'#1#6'Height'#2#22#3'Top'#2#6#5'Width'#3#134#0#18'BorderSpacing.'
-  +'Left'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'chkCompilerBuild'#8
-  +'TabOrder'#2#1#0#0#9'TCheckBox'#14'chkCompilerRun'#22'AnchorSideLeft.Control'
-  +#7#16'chkCompilerBuild'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSide'
-  +'Top.Control'#7#11'grpCompiler'#4'Left'#3#231#1#6'Height'#2#22#3'Top'#2#6#5
-  +'Width'#2'~'#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'Capt'
-  +'ion'#6#14'chkCompilerRun'#8'TabOrder'#2#2#0#0#5'TEdit'#11'edtCompiler'#22'A'
-  +'nchorSideLeft.Control'#7#11'lblCompiler'#19'AnchorSideLeft.Side'#7#9'asrBot'
-  +'tom'#21'AnchorSideTop.Control'#7#11'lblCompiler'#18'AnchorSideTop.Side'#7#9
-  +'asrCenter'#23'AnchorSideRight.Control'#7#11'grpCompiler'#20'AnchorSideRight'
-  +'.Side'#7#9'asrBottom'#4'Left'#2'`'#6'Height'#2#23#3'Top'#2#31#5'Width'#3'%'
-  +#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#12
-  +#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#3#4'Text'#6#11'edtCompiler'#0#0#0
-  +#9'TGroupBox'#21'ExecuteBeforeGroupBox'#4'Left'#2#6#6'Height'#2'l'#3'Top'#2
-  +'"'#5'Width'#3#143#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Arou'
-  +'nd'#2#6#7'Caption'#6#21'ExecuteBeforeGroupBox'#12'ClientHeight'#2'Y'#11'Cli'
-  +'entWidth'#3#139#2#5'Ctl3D'#8#8'TabOrder'#2#3#0#6'TLabel'#18'lblRunIfExecBef'
-  +'ore'#22'AnchorSideLeft.Control'#7#21'ExecuteBeforeGroupBox'#21'AnchorSideTo'
-  +'p.Control'#7#21'ExecuteBeforeGroupBox'#4'Left'#2#6#6'Height'#2#20#3'Top'#2#6
-  +#5'Width'#2'u'#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'lblRunIfExecBefo'
-  +'re'#11'ParentColor'#8#0#0#6'TLabel'#25'ExecuteBeforeCommandLabel'#22'Anchor'
-  +'SideLeft.Control'#7#21'ExecuteBeforeGroupBox'#21'AnchorSideTop.Control'#7#18
-  +'lblRunIfExecBefore'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Hei'
-  +'ght'#2#20#3'Top'#2' '#5'Width'#3#195#0#20'BorderSpacing.Around'#2#6#7'Capti'
-  +'on'#6#25'ExecuteBeforeCommandLabel'#11'ParentColor'#8#0#0#9'TCheckBox'#20'c'
-  +'hkExecBeforeCompile'#22'AnchorSideLeft.Control'#7#18'lblRunIfExecBefore'#19
-  ,'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#21'ExecuteB'
-  +'eforeGroupBox'#4'Left'#3#153#0#6'Height'#2#22#3'Top'#2#6#5'Width'#3#170#0#18
-  +'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#20'chkEx'
-  +'ecBeforeCompile'#8'TabOrder'#2#0#0#0#9'TCheckBox'#18'chkExecBeforeBuild'#22
-  +'AnchorSideLeft.Control'#7#20'chkExecBeforeCompile'#19'AnchorSideLeft.Side'#7
-  +#9'asrBottom'#21'AnchorSideTop.Control'#7#21'ExecuteBeforeGroupBox'#4'Left'#3
-  +'a'#1#6'Height'#2#22#3'Top'#2#6#5'Width'#3#149#0#18'BorderSpacing.Left'#2#24
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'chkExecBeforeBuild'#8'TabOrder'
-  +#2#1#0#0#9'TCheckBox'#16'chkExecBeforeRun'#22'AnchorSideLeft.Control'#7#18'c'
-  +'hkExecBeforeBuild'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.'
-  +'Control'#7#21'ExecuteBeforeGroupBox'#4'Left'#3#20#2#6'Height'#2#22#3'Top'#2
-  +#6#5'Width'#3#141#0#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6
-  +#7'Caption'#6#16'chkExecBeforeRun'#8'TabOrder'#2#2#0#0#5'TEdit'#24'ExecuteBe'
-  +'foreCommandEdit'#22'AnchorSideLeft.Control'#7#25'ExecuteBeforeCommandLabel'
-  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#18'lblRu'
-  +'nIfExecBefore'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Con'
-  +'trol'#7#21'ExecuteBeforeGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
-  +'Left'#3#219#0#6'Height'#2#23#3'Top'#2' '#5'Width'#3#170#1#7'Anchors'#11#5'a'
-  +'kTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#12#20'BorderSpacing.A'
-  +'round'#2#6#8'TabOrder'#2#3#4'Text'#6#24'ExecuteBeforeCommandEdit'#0#0#9'TCh'
-  +'eckBox'#28'ExecuteBeforeScanFPCCheckBox'#22'AnchorSideLeft.Control'#7#29'Ex'
-  +'ecuteBeforeScanMakeCheckBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Anch'
-  +'orSideTop.Control'#7#24'ExecuteBeforeCommandEdit'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#4'Left'#3#26#1#6'Height'#2#22#3'Top'#2'='#5'Width'#3#236#0#18'Bo'
-  +'rderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#28'Execute'
-  +'BeforeScanFPCCheckBox'#8'TabOrder'#2#4#0#0#9'TCheckBox'#29'ExecuteBeforeSca'
-  +'nMakeCheckBox'#22'AnchorSideLeft.Control'#7#21'ExecuteBeforeGroupBox'#21'An'
-  +'chorSideTop.Control'#7#24'ExecuteBeforeCommandEdit'#18'AnchorSideTop.Side'#7
-  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'='#5'Width'#3#246#0#20'Bor'
-  +'derSpacing.Around'#2#6#7'Caption'#6#29'ExecuteBeforeScanMakeCheckBox'#8'Tab'
-  +'Order'#2#5#0#0#9'TCheckBox'#28'ExecuteBeforeShowAllCheckBox'#22'AnchorSideL'
-  +'eft.Control'#7#28'ExecuteBeforeScanFPCCheckBox'#19'AnchorSideLeft.Side'#7#9
-  +'asrBottom'#21'AnchorSideTop.Control'#7#24'ExecuteBeforeCommandEdit'#18'Anch'
-  +'orSideTop.Side'#7#9'asrBottom'#4'Left'#3'$'#2#6'Height'#2#22#3'Top'#2'='#5
-  +'Width'#3#229#0#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'C'
-  +'aption'#6#28'ExecuteBeforeShowAllCheckBox'#8'TabOrder'#2#6#0#0#0#0#0#6'TPan'
-  +'el'#8'BtnPanel'#4'Left'#2#0#6'Height'#2'0'#3'Top'#3#224#1#5'Width'#3#157#2#5
-  +'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#12'ClientHeig'
-  +'ht'#2'0'#11'ClientWidth'#3#157#2#8'TabOrder'#2#1#0#7'TBitBtn'#10'HelpButton'
-  +#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.Around'
-  +#2#6#7'Caption'#6#5'&Help'#21'Constraints.MinHeight'#2#25#20'Constraints.Min'
-  +'Width'#2'K'#4'Kind'#7#6'bkHelp'#9'NumGlyphs'#2#0#7'OnClick'#7#15'HelpButton'
-  +'Click'#8'TabOrder'#2#0#0#0#7'TBitBtn'#14'btnShowOptions'#21'AnchorSideBotto'
-  +'m.Side'#7#9'asrBottom'#4'Left'#3#137#0#6'Height'#2'$'#3'Top'#2#6#5'Width'#3
-  +#135#0#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Ca'
-  +'ption'#6#14'btnShowOptions'#21'Constraints.MinHeight'#2#25#20'Constraints.M'
-  +'inWidth'#2'K'#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'#0#0#0'd'#0#0#0#0#0
-  +#0#0#0#0#0#0#4'_'#205#255#4'_'#205#255#4'_'#205#255#255#255#255#0#255#255#255
-  +#0#255#255#255#0#255#255#255#0#255#255#255#0'{'#196#232#255#133#165#188#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#4'_'#205#255'7'#149#247#255'7'#149#247#255#4'_'#205#255#225#227
-  +#226#255#185#187#186#255#185#187#186#255'{'#196#232#255'{'#196#232#255#133
-  +#165#188#255#133#165#188#255#225#227#226#255#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#4'_'#205#255'7'#149#247#255'7'#149#247#255'7'#149
-  +#247#255#4'_'#205#255#185#187#186#255'{'#196#232#255'{'#196#232#255'{'#196
-  +#232#255#133#165#188#255#133#165#188#255#133#165#188#255#185#187#186#255#225
-  +#227#226#255#255#255#255#0#255#255#255#0#255#255#255#0#4'_'#205#255'7'#149
-  +#247#255'7'#149#247#255'7'#149#247#255#4'_'#205#255'{'#196#232#255'{'#196#232
-  +#255#174#228#253#255#174#228#253#255#133#165#188#255#133#165#188#255#185#187
-  +#186#255#185#187#186#255#255#255#255#0#255#255#255#0#255#255#255#0#225#227
-  +#226#255#4'_'#205#255'7'#149#247#255#4'_'#205#255#0#0#0#255#0#0#0#255'jjj'
-  +#255#170#228#251#255#174#228#253#255#174#228#253#255#133#165#188#255#225#227
-  ,#226#255#185#187#186#255#225#227#226#255#255#255#255#0#255#255#255#0#185#187
-  +#186#255#185#187#186#255#4'_'#205#255#0#0#0#255#213#213#213#255#187#187#187
-  +#255#0#0#0#255#0#0#0#255#0#0#0#255#174#228#253#255#174#228#253#255#255#255
-  +#255#0#185#187#186#255#185#187#186#255#255#255#255#0#255#255#255#0#185#187
-  +#186#255#192#140#134#255#205#147#138#255#0#0#0#255#203#203#203#255#210#210
-  +#210#255#201#201#201#255#210#210#210#255#198#198#198#255#0#0#0#255#236#245
-  +#252'_'#255#255#255#0#225#227#226#255#185#187#186#255#255#255#255#0#255#255
-  +#255#0#185#128'x'#255#211#147#140#255#211#155#149#255'jjj'#255#0#0#0#255#214
-  +#214#214#255#0#0#0#255#0#0#0#255#192#192#192#255#0#0#0#255#255#255#255#0#255
-  +#255#255#0#255#255#255#0#185#187#186#255#255#255#255#0#174#128'w'#255#205#147
-  +#139#255#215#165#160#255#220#175#171#255#226#187#183#255#0#0#0#255#230#230
-  +#230#255#0#0#0#255#249#249#250#0#0#0#0#255'jjj'#255#128#133#173#255#255#255
-  +#255#0#255#255#255#0#185#187#186#255#255#255#255#0#183#128'z'#255#215#155#149
-  +#255#218#177#172#255#233#202#197#255#227#197#191#255#0#0#0#255#225#225#225
-  +#255#210#210#210#255#0#0#0#255#255#255#255#0#128#133#173#255#128#133#173#255
-  +'u'#148#243#255#146#163#224#255#185#187#186#255#255#255#255#0#197#155#150#255
-  +#209#155#148#255#218#180#173#255#238#214#205#255#226#194#186#255'jjj'#255#0#0
-  +#0#255#0#0#0#255'jjj'#255#128#133#173#255#128#133#173#255#128#133#173#255'u'
-  +#148#243#255'u'#148#243#255#179#190#225#255#255#255#255#0#255#255#255#0#204
-  +#155#151#255#214#163#157#255#220#174#170#255#218#173#168#255#209#165#159#255
-  +#255#255#255#0#255#255#255#0#191#191#207#255#128#133#173#255#128#133#173#255
-  +'p'#128#190#255'u'#148#243#255'u'#148#243#255'u'#148#243#255#255#255#255#0
-  +#255#255#255#0#255#255#255#0#185#187#186#255#212#172#170#255#213#174#173#255
-  +#255#255#255#0#254#254#253#0#255#255#255#0#255#255#255#0#128#133#173#255#128
-  +#133#173#255't'#128#204#255'u'#148#243#255'u'#148#243#255#158#167#218#255#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#185#187#186#255#185#187
-  +#186#255#189#191#190#255#225#227#226#255#255#255#255#0#255#255#255#0#170#170
-  +#193#255#128#133#173#255'u'#135#214#255'q'#147#243#255#149#164#224#255#254
-  +#254#254#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#225#227#226#255#185#187#186#255#185#187#186#255#185#187#186#255#185
-  +#187#186#255#185#187#186#255#128#131#176#255'u'#140#222#255'u'#148#243#255
-  +#254#254#254#0#250#250#252#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#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'OnClick'
-  +#7#24'ButtonShowOptionsClicked'#8'TabOrder'#2#1#0#0#7'TBitBtn'#8'btnCheck'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#22#1#6'Height'#2'$'#3'Top'#2
-  +#6#5'Width'#2'c'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'
-  +#2#6#7'Caption'#6#8'btnCheck'#21'Constraints.MinHeight'#2#25#20'Constraints.'
-  +'MinWidth'#2'K'#7'Default'#9#4'Kind'#7#5'bkYes'#9'NumGlyphs'#2#0#7'OnClick'#7
-  +#14'btnTestClicked'#8'TabOrder'#2#2#0#0#7'TBitBtn'#11'btnLoadSave'#21'Anchor'
-  +'SideBottom.Side'#7#9'asrBottom'#4'Left'#3''#1#6'Height'#2'$'#3'Top'#2#6#5
-  +'Width'#2's'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6
-  +#7'Caption'#6#11'btnLoadSave'#21'Constraints.MinHeight'#2#25#20'Constraints.'
-  +'MinWidth'#2'K'#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'#0#0#0'd'#0#0#0#0#0
-  +#0#0#0#0#0#0#186'j6'#143#185'i5'#181#184'i5'#238#183'h5'#255#181'h5'#255#180
-  +'g4'#255#178'f4'#255#176'e3'#255#174'd3'#255#172'c2'#255#170'b2'#255#169'a2'
-  +#255#168'`1'#255#167'`1'#254#166'`1'#241#168'a1'#196#186'j5'#222#235#198#173
-  +#255#234#197#173#255#254#251#248#255#254#251#248#255#254#251#248#255#254#251
-  +#248#255#254#251#248#255#254#251#248#255#254#251#248#255#254#251#248#255#254
-  +#251#248#255#254#251#248#255#200#154'|'#255#199#152'y'#255#167'`1'#237#186'k'
-  +'7'#254#237#202#179#255#224#162'z'#255#254#250#247#255'b'#192#136#255'b'#192
-  +#136#255'b'#192#136#255'b'#192#136#255'b'#192#136#255'b'#192#136#255'b'#192
-  +#136#255'b'#192#136#255#253#249#246#255#202#141'e'#255#201#155'|'#255#167'`1'
-  +#254#187'l8'#255#238#204#182#255#225#162'z'#255#254#250#247#255#191#220#194
-  +#255#191#220#194#255#191#220#194#255#191#220#194#255#191#220#194#255#191#220
-  +#194#255#191#220#194#255#191#220#194#255#253#249#246#255#205#144'h'#255#204
-  +#158#129#255#168'a2'#255#187'k8'#255#239#206#184#255#225#162'y'#255#254#250
-  +#247#255'b'#192#136#255'b'#192#136#255'b'#192#136#255'b'#192#136#255'b'#192
-  +#136#255'b'#192#136#255'b'#192#136#255'b'#192#136#255#253#249#246#255#207#147
-  +'j'#255#206#163#132#255#170'a2'#255#186'j6'#255#239#208#187#255#226#162'z'
+  +#0#11'ClientWidth'#3#151#2#8'TabOrder'#2#2#7'Visible'#9#0#241#9'TGroupBox'#18
+  +'BuildModesGroupBox'#6'Height'#3#230#0#5'Width'#3#151#2#12'ClientHeight'#3
+  +#211#0#11'ClientWidth'#3#147#2#0#241#9'TTreeView'#18'BuildModesTreeView'#6'H'
+  ,'eight'#3#211#0#5'Width'#3#147#2#0#0#0#241#10'TPopupMenu'#20'BuildModeTVPopu'
+  +'pMenu'#0#0#0#0#5'TPage'#13'InheritedPage'#7'Caption'#6#13'InheritedPage'#11
+  +'ClientWidth'#3#155#2#12'ClientHeight'#3#197#1#0#6'TLabel'#12'InhNoteLabel'#4
+  +'Left'#2#6#6'Height'#2#20#3'Top'#2#6#5'Width'#3#143#2#5'Align'#7#5'alTop'#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#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#143#2#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpac'
+  +'ing.Right'#2#6#5'Ctl3D'#8#17'DefaultItemHeight'#2#19#8'TabOrder'#2#0#18'OnS'
+  +'electionChanged'#7#27'InhTreeViewSelectionChanged'#0#0#5'TMemo'#11'InhItemM'
+  +'emo'#4'Left'#2#6#6'Height'#3#163#0#3'Top'#3#28#1#5'Width'#3#143#2#5'Align'#7
+  +#8'alClient'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#20'Borde'
+  +'rSpacing.Bottom'#2#6#8'ReadOnly'#9#10'ScrollBars'#7#14'ssAutoVertical'#8'Ta'
+  +'bOrder'#2#1#0#0#9'TSplitter'#11'InhSplitter'#6'Cursor'#7#8'crVSplit'#4'Left'
+  +#2#0#6'Height'#2#5#3'Top'#3#23#1#5'Width'#3#155#2#5'Align'#7#5'alTop'#12'Res'
+  +'izeAnchor'#7#5'akTop'#0#0#0#5'TPage'#15'CompilationPage'#7'Caption'#6#15'Co'
+  +'mpilationPage'#11'ClientWidth'#3#155#2#12'ClientHeight'#3#197#1#0#9'TCheckB'
+  +'ox'#17'chkCreateMakefile'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#6#5'Width'#3
+  +#143#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'chkC'
+  +'reateMakefile'#8'TabOrder'#2#0#0#0#9'TGroupBox'#20'ExecuteAfterGroupBox'#4
+  +'Left'#2#6#6'Height'#2'l'#3'Top'#3#233#0#5'Width'#3#143#2#5'Align'#7#5'alTop'
+  +#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#20'ExecuteAfterGrou'
+  +'pBox'#12'ClientHeight'#2'Y'#11'ClientWidth'#3#139#2#5'Ctl3D'#8#8'TabOrder'#2
+  +#1#0#6'TLabel'#17'lblRunIfExecAfter'#22'AnchorSideLeft.Control'#7#20'Execute'
+  +'AfterGroupBox'#21'AnchorSideTop.Control'#7#20'ExecuteAfterGroupBox'#4'Left'
+  +#2#6#6'Height'#2#20#3'Top'#2#6#5'Width'#2'j'#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#17'lblRunIfExecAfter'#11'ParentColor'#8#0#0#6'TLabel'#24'Execute'
+  +'AfterCommandLabel'#22'AnchorSideLeft.Control'#7#20'ExecuteAfterGroupBox'#21
+  +'AnchorSideTop.Control'#7#17'lblRunIfExecAfter'#18'AnchorSideTop.Side'#7#9'a'
+  +'srBottom'#4'Left'#2#6#6'Height'#2#20#3'Top'#2' '#5'Width'#3#184#0#20'Border'
+  +'Spacing.Around'#2#6#7'Caption'#6#24'ExecuteAfterCommandLabel'#11'ParentColo'
+  +'r'#8#0#0#9'TCheckBox'#19'chkExecAfterCompile'#22'AnchorSideLeft.Control'#7
+  +#17'lblRunIfExecAfter'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideT'
+  +'op.Control'#7#20'ExecuteAfterGroupBox'#4'Left'#3#142#0#6'Height'#2#22#3'Top'
+  +#2#6#5'Width'#3#159#0#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#19'chkExecAfterCompile'#8'TabOrder'#2#0#0#0#9'TCheckBox'#17
+  +'chkExecAfterBuild'#22'AnchorSideLeft.Control'#7#19'chkExecAfterCompile'#19
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#20'ExecuteA'
+  +'fterGroupBox'#4'Left'#3'K'#1#6'Height'#2#22#3'Top'#2#6#5'Width'#3#138#0#18
+  +'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'chkEx'
+  +'ecAfterBuild'#8'TabOrder'#2#1#0#0#9'TCheckBox'#15'chkExecAfterRun'#22'Ancho'
+  +'rSideLeft.Control'#7#17'chkExecAfterBuild'#19'AnchorSideLeft.Side'#7#9'asrB'
+  +'ottom'#21'AnchorSideTop.Control'#7#20'ExecuteAfterGroupBox'#4'Left'#3#243#1
+  +#6'Height'#2#22#3'Top'#2#6#5'Width'#3#130#0#18'BorderSpacing.Left'#2#24#20'B'
+  +'orderSpacing.Around'#2#6#7'Caption'#6#15'chkExecAfterRun'#8'TabOrder'#2#2#0
+  +#0#5'TEdit'#23'ExecuteAfterCommandEdit'#22'AnchorSideLeft.Control'#7#24'Exec'
+  +'uteAfterCommandLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideT'
+  +'op.Control'#7#17'lblRunIfExecAfter'#18'AnchorSideTop.Side'#7#9'asrBottom'#23
+  +'AnchorSideRight.Control'#7#20'ExecuteAfterGroupBox'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#4'Left'#3#208#0#6'Height'#2#23#3'Top'#2' '#5'Width'#3#181#1#7
+  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#12#20
+  +'BorderSpacing.Around'#2#6#8'TabOrder'#2#3#4'Text'#6#23'ExecuteAfterCommandE'
+  +'dit'#0#0#9'TCheckBox'#27'ExecuteAfterScanFPCCheckBox'#22'AnchorSideLeft.Con'
+  +'trol'#7#28'ExecuteAfterScanMakeCheckBox'#19'AnchorSideLeft.Side'#7#9'asrBot'
+  +'tom'#21'AnchorSideTop.Control'#7#23'ExecuteAfterCommandEdit'#18'AnchorSideT'
+  +'op.Side'#7#9'asrBottom'#4'Left'#3#15#1#6'Height'#2#22#3'Top'#2'='#5'Width'#3
+  +#225#0#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#27'ExecuteAfterScanFPCCheckBox'#8'TabOrder'#2#4#0#0#9'TCheckBox'#28'Execute'
+  +'AfterScanMakeCheckBox'#22'AnchorSideLeft.Control'#7#20'ExecuteAfterGroupBox'
+  +#21'AnchorSideTop.Control'#7#23'ExecuteAfterCommandEdit'#18'AnchorSideTop.Si'
+  +'de'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'='#5'Width'#3#235#0
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#28'ExecuteAfterScanMakeCheckBox'#8
+  +'TabOrder'#2#5#0#0#9'TCheckBox'#27'ExecuteAfterShowAllCheckBox'#22'AnchorSid'
+  +'eLeft.Control'#7#27'ExecuteAfterScanFPCCheckBox'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#21'AnchorSideTop.Control'#7#23'ExecuteAfterCommandEdit'#18'Ancho'
+  ,'rSideTop.Side'#7#9'asrBottom'#4'Left'#3#14#2#6'Height'#2#22#3'Top'#2'='#5'W'
+  +'idth'#3#218#0#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'Ca'
+  +'ption'#6#27'ExecuteAfterShowAllCheckBox'#8'TabOrder'#2#6#0#0#0#9'TGroupBox'
+  +#11'grpCompiler'#4'Left'#2#6#6'Height'#2'O'#3'Top'#3#148#0#5'Width'#3#143#2#5
+  +'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#11
+  +'grpCompiler'#12'ClientHeight'#2'<'#11'ClientWidth'#3#139#2#5'Ctl3D'#8#8'Tab'
+  +'Order'#2#2#0#6'TLabel'#16'lblRunIfCompiler'#22'AnchorSideLeft.Control'#7#11
+  +'grpCompiler'#21'AnchorSideTop.Control'#7#11'grpCompiler'#4'Left'#2#6#6'Heig'
+  +'ht'#2#20#3'Top'#2#6#5'Width'#2'f'#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#16'lblRunIfCompiler'#11'ParentColor'#8#0#0#6'TLabel'#11'lblCompiler'#22'Anc'
+  +'horSideLeft.Control'#7#11'grpCompiler'#21'AnchorSideTop.Control'#7#16'lblRu'
+  +'nIfCompiler'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#20#3'Top'#2' '#5'Width'#2'H'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.To'
+  +'p'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Caption'#6
+  +#11'lblCompiler'#11'ParentColor'#8#0#0#9'TCheckBox'#18'chkCompilerCompile'#22
+  +'AnchorSideLeft.Control'#7#16'lblRunIfCompiler'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#21'AnchorSideTop.Control'#7#11'grpCompiler'#4'Left'#3#138#0#6'He'
+  +'ight'#2#22#3'Top'#2#6#5'Width'#3#155#0#18'BorderSpacing.Left'#2#30#17'Borde'
+  +'rSpacing.Top'#2#6#7'Caption'#6#18'chkCompilerCompile'#8'TabOrder'#2#0#0#0#9
+  +'TCheckBox'#16'chkCompilerBuild'#22'AnchorSideLeft.Control'#7#18'chkCompiler'
+  +'Compile'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
+  +#11'grpCompiler'#4'Left'#3'C'#1#6'Height'#2#22#3'Top'#2#6#5'Width'#3#134#0#18
+  +'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'chkCo'
+  +'mpilerBuild'#8'TabOrder'#2#1#0#0#9'TCheckBox'#14'chkCompilerRun'#22'AnchorS'
+  +'ideLeft.Control'#7#16'chkCompilerBuild'#19'AnchorSideLeft.Side'#7#9'asrBott'
+  +'om'#21'AnchorSideTop.Control'#7#11'grpCompiler'#4'Left'#3#231#1#6'Height'#2
+  +#22#3'Top'#2#6#5'Width'#2'~'#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Ar'
+  +'ound'#2#6#7'Caption'#6#14'chkCompilerRun'#8'TabOrder'#2#2#0#0#5'TEdit'#11'e'
+  +'dtCompiler'#22'AnchorSideLeft.Control'#7#11'lblCompiler'#19'AnchorSideLeft.'
+  +'Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#11'lblCompiler'#18'AnchorS'
+  +'ideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#11'grpCompiler'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'`'#6'Height'#2#23#3'Top'#2#31
+  +#5'Width'#3'%'#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpac'
+  +'ing.Left'#2#12#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#3#4'Text'#6#11'ed'
+  +'tCompiler'#0#0#0#9'TGroupBox'#21'ExecuteBeforeGroupBox'#4'Left'#2#6#6'Heigh'
+  +'t'#2'l'#3'Top'#2'"'#5'Width'#3#143#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'B'
+  +'orderSpacing.Around'#2#6#7'Caption'#6#21'ExecuteBeforeGroupBox'#12'ClientHe'
+  +'ight'#2'Y'#11'ClientWidth'#3#139#2#5'Ctl3D'#8#8'TabOrder'#2#3#0#6'TLabel'#18
+  +'lblRunIfExecBefore'#22'AnchorSideLeft.Control'#7#21'ExecuteBeforeGroupBox'
+  +#21'AnchorSideTop.Control'#7#21'ExecuteBeforeGroupBox'#4'Left'#2#6#6'Height'
+  +#2#20#3'Top'#2#6#5'Width'#2'u'#20'BorderSpacing.Around'#2#6#7'Caption'#6#18
+  +'lblRunIfExecBefore'#11'ParentColor'#8#0#0#6'TLabel'#25'ExecuteBeforeCommand'
+  +'Label'#22'AnchorSideLeft.Control'#7#21'ExecuteBeforeGroupBox'#21'AnchorSide'
+  +'Top.Control'#7#18'lblRunIfExecBefore'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#4'Left'#2#6#6'Height'#2#20#3'Top'#2' '#5'Width'#3#195#0#20'BorderSpacing.Ar'
+  +'ound'#2#6#7'Caption'#6#25'ExecuteBeforeCommandLabel'#11'ParentColor'#8#0#0#9
+  +'TCheckBox'#20'chkExecBeforeCompile'#22'AnchorSideLeft.Control'#7#18'lblRunI'
+  +'fExecBefore'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contro'
+  +'l'#7#21'ExecuteBeforeGroupBox'#4'Left'#3#153#0#6'Height'#2#22#3'Top'#2#6#5
+  +'Width'#3#170#0#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'C'
+  +'aption'#6#20'chkExecBeforeCompile'#8'TabOrder'#2#0#0#0#9'TCheckBox'#18'chkE'
+  +'xecBeforeBuild'#22'AnchorSideLeft.Control'#7#20'chkExecBeforeCompile'#19'An'
+  +'chorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#21'ExecuteBef'
+  +'oreGroupBox'#4'Left'#3'a'#1#6'Height'#2#22#3'Top'#2#6#5'Width'#3#149#0#18'B'
+  +'orderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'chkExe'
+  +'cBeforeBuild'#8'TabOrder'#2#1#0#0#9'TCheckBox'#16'chkExecBeforeRun'#22'Anch'
+  +'orSideLeft.Control'#7#18'chkExecBeforeBuild'#19'AnchorSideLeft.Side'#7#9'as'
+  +'rBottom'#21'AnchorSideTop.Control'#7#21'ExecuteBeforeGroupBox'#4'Left'#3#20
+  +#2#6'Height'#2#22#3'Top'#2#6#5'Width'#3#141#0#18'BorderSpacing.Left'#2#24#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#16'chkExecBeforeRun'#8'TabOrder'#2#2
+  +#0#0#5'TEdit'#24'ExecuteBeforeCommandEdit'#22'AnchorSideLeft.Control'#7#25'E'
+  +'xecuteBeforeCommandLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorS'
+  +'ideTop.Control'#7#18'lblRunIfExecBefore'#18'AnchorSideTop.Side'#7#9'asrBott'
+  +'om'#23'AnchorSideRight.Control'#7#21'ExecuteBeforeGroupBox'#20'AnchorSideRi'
+  ,'ght.Side'#7#9'asrBottom'#4'Left'#3#219#0#6'Height'#2#23#3'Top'#2' '#5'Width'
+  +#3#170#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'
+  +#2#12#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#3#4'Text'#6#24'ExecuteBefor'
+  +'eCommandEdit'#0#0#9'TCheckBox'#28'ExecuteBeforeScanFPCCheckBox'#22'AnchorSi'
+  +'deLeft.Control'#7#29'ExecuteBeforeScanMakeCheckBox'#19'AnchorSideLeft.Side'
+  +#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'ExecuteBeforeCommandEdit'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#26#1#6'Height'#2#22#3'Top'#2'='
+  +#5'Width'#3#236#0#18'BorderSpacing.Left'#2#24#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#28'ExecuteBeforeScanFPCCheckBox'#8'TabOrder'#2#4#0#0#9'TCheckBox'
+  +#29'ExecuteBeforeScanMakeCheckBox'#22'AnchorSideLeft.Control'#7#21'ExecuteBe'
+  +'foreGroupBox'#21'AnchorSideTop.Control'#7#24'ExecuteBeforeCommandEdit'#18'A'
+  +'nchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'='#5
+  +'Width'#3#246#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#29'ExecuteBeforeSc'
+  +'anMakeCheckBox'#8'TabOrder'#2#5#0#0#9'TCheckBox'#28'ExecuteBeforeShowAllChe'
+  +'ckBox'#22'AnchorSideLeft.Control'#7#28'ExecuteBeforeScanFPCCheckBox'#19'Anc'
+  +'horSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'ExecuteBefo'
+  +'reCommandEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3'$'#2#6'Heigh'
+  +'t'#2#22#3'Top'#2'='#5'Width'#3#229#0#18'BorderSpacing.Left'#2#24#20'BorderS'
+  +'pacing.Around'#2#6#7'Caption'#6#28'ExecuteBeforeShowAllCheckBox'#8'TabOrder'
+  +#2#6#0#0#0#0#0#6'TPanel'#8'BtnPanel'#4'Left'#2#0#6'Height'#2'0'#3'Top'#3#224
+  +#1#5'Width'#3#157#2#5'Align'#7#8'alBottom'#8'AutoSize'#9#10'BevelOuter'#7#6
+  +'bvNone'#12'ClientHeight'#2'0'#11'ClientWidth'#3#157#2#8'TabOrder'#2#1#0#7'T'
+  +'BitBtn'#10'HelpButton'#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.Around'#2#6#7'Caption'#6#5'&Help'#21'Constraints.MinHeight'
+  +#2#25#20'Constraints.MinWidth'#2'K'#4'Kind'#7#6'bkHelp'#9'NumGlyphs'#2#0#7'O'
+  +'nClick'#7#15'HelpButtonClick'#8'TabOrder'#2#0#0#0#7'TBitBtn'#14'btnShowOpti'
+  +'ons'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#137#0#6'Height'#2'$'
+  +#3'Top'#2#6#5'Width'#3#135#0#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#14'btnShowOptions'#21'Constraints.MinHeight'
+  +#2#25#20'Constraints.MinWidth'#2'K'#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'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#4'_'#205#255#4'_'#205#255#4'_'#205#255#255
+  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'{'#196#232
+  +#255#133#165#188#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#4'_'#205#255'7'#149#247#255'7'#149#247#255#4'_'
+  +#205#255#225#227#226#255#185#187#186#255#185#187#186#255'{'#196#232#255'{'
+  +#196#232#255#133#165#188#255#133#165#188#255#225#227#226#255#255#255#255#0
+  +#255#255#255#0#255#255#255#0#255#255#255#0#4'_'#205#255'7'#149#247#255'7'#149
+  +#247#255'7'#149#247#255#4'_'#205#255#185#187#186#255'{'#196#232#255'{'#196
+  +#232#255'{'#196#232#255#133#165#188#255#133#165#188#255#133#165#188#255#185
+  +#187#186#255#225#227#226#255#255#255#255#0#255#255#255#0#255#255#255#0#4'_'
+  +#205#255'7'#149#247#255'7'#149#247#255'7'#149#247#255#4'_'#205#255'{'#196#232
+  +#255'{'#196#232#255#174#228#253#255#174#228#253#255#133#165#188#255#133#165
+  +#188#255#185#187#186#255#185#187#186#255#255#255#255#0#255#255#255#0#255#255
+  +#255#0#225#227#226#255#4'_'#205#255'7'#149#247#255#4'_'#205#255#0#0#0#255#0#0
+  +#0#255'jjj'#255#170#228#251#255#174#228#253#255#174#228#253#255#133#165#188
+  +#255#225#227#226#255#185#187#186#255#225#227#226#255#255#255#255#0#255#255
+  +#255#0#185#187#186#255#185#187#186#255#4'_'#205#255#0#0#0#255#213#213#213#255
+  +#187#187#187#255#0#0#0#255#0#0#0#255#0#0#0#255#174#228#253#255#174#228#253
+  +#255#255#255#255#0#185#187#186#255#185#187#186#255#255#255#255#0#255#255#255
+  +#0#185#187#186#255#192#140#134#255#205#147#138#255#0#0#0#255#203#203#203#255
+  +#210#210#210#255#201#201#201#255#210#210#210#255#198#198#198#255#0#0#0#255
+  +#236#245#252'_'#255#255#255#0#225#227#226#255#185#187#186#255#255#255#255#0
+  +#255#255#255#0#185#128'x'#255#211#147#140#255#211#155#149#255'jjj'#255#0#0#0
+  +#255#214#214#214#255#0#0#0#255#0#0#0#255#192#192#192#255#0#0#0#255#255#255
+  +#255#0#255#255#255#0#255#255#255#0#185#187#186#255#255#255#255#0#174#128'w'
+  +#255#205#147#139#255#215#165#160#255#220#175#171#255#226#187#183#255#0#0#0
+  +#255#230#230#230#255#0#0#0#255#249#249#250#0#0#0#0#255'jjj'#255#128#133#173
+  +#255#255#255#255#0#255#255#255#0#185#187#186#255#255#255#255#0#183#128'z'#255
+  +#215#155#149#255#218#177#172#255#233#202#197#255#227#197#191#255#0#0#0#255
+  +#225#225#225#255#210#210#210#255#0#0#0#255#255#255#255#0#128#133#173#255#128
+  +#133#173#255'u'#148#243#255#146#163#224#255#185#187#186#255#255#255#255#0#197
+  +#155#150#255#209#155#148#255#218#180#173#255#238#214#205#255#226#194#186#255
+  ,'jjj'#255#0#0#0#255#0#0#0#255'jjj'#255#128#133#173#255#128#133#173#255#128
+  +#133#173#255'u'#148#243#255'u'#148#243#255#179#190#225#255#255#255#255#0#255
+  +#255#255#0#204#155#151#255#214#163#157#255#220#174#170#255#218#173#168#255
+  +#209#165#159#255#255#255#255#0#255#255#255#0#191#191#207#255#128#133#173#255
+  +#128#133#173#255'p'#128#190#255'u'#148#243#255'u'#148#243#255'u'#148#243#255
+  +#255#255#255#0#255#255#255#0#255#255#255#0#185#187#186#255#212#172#170#255
+  +#213#174#173#255#255#255#255#0#254#254#253#0#255#255#255#0#255#255#255#0#128
+  +#133#173#255#128#133#173#255't'#128#204#255'u'#148#243#255'u'#148#243#255#158
+  +#167#218#255#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#185#187
+  +#186#255#185#187#186#255#189#191#190#255#225#227#226#255#255#255#255#0#255
+  +#255#255#0#170#170#193#255#128#133#173#255'u'#135#214#255'q'#147#243#255#149
+  +#164#224#255#254#254#254#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
+  +#255#0#255#255#255#0#225#227#226#255#185#187#186#255#185#187#186#255#185#187
+  +#186#255#185#187#186#255#185#187#186#255#128#131#176#255'u'#140#222#255'u'
+  +#148#243#255#254#254#254#0#250#250#252#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#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
+  +'OnClick'#7#24'ButtonShowOptionsClicked'#8'TabOrder'#2#1#0#0#7'TBitBtn'#8'bt'
+  +'nCheck'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#22#1#6'Height'#2
+  +'$'#3'Top'#2#6#5'Width'#2'c'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#8'btnCheck'#21'Constraints.MinHeight'#2#25#20
+  +'Constraints.MinWidth'#2'K'#7'Default'#9#4'Kind'#7#5'bkYes'#9'NumGlyphs'#2#0
+  +#7'OnClick'#7#14'btnTestClicked'#8'TabOrder'#2#2#0#0#7'TBitBtn'#11'btnLoadSa'
+  +'ve'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3''#1#6'Height'#2'$'#3
+  +'Top'#2#6#5'Width'#2's'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing'
+  +'.Around'#2#6#7'Caption'#6#11'btnLoadSave'#21'Constraints.MinHeight'#2#25#20
+  +'Constraints.MinWidth'#2'K'#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'#0#0#0
+  +'d'#0#0#0#0#0#0#0#0#0#0#0#186'j6'#143#185'i5'#181#184'i5'#238#183'h5'#255#181
+  +'h5'#255#180'g4'#255#178'f4'#255#176'e3'#255#174'd3'#255#172'c2'#255#170'b2'
+  +#255#169'a2'#255#168'`1'#255#167'`1'#254#166'`1'#241#168'a1'#196#186'j5'#222
+  +#235#198#173#255#234#197#173#255#254#251#248#255#254#251#248#255#254#251#248
   +#255#254#251#248#255#254#251#248#255#254#251#248#255#254#251#248#255#254#251
-  +#248#255#254#251#248#255#254#251#248#255#254#251#248#255#254#251#248#255#254
-  ,#251#248#255#211#150'm'#255#210#167#138#255#171'b2'#255#187'j6'#255#240#210
-  +#190#255#226#163'z'#255#226#163'z'#255#225#163'z'#255#226#163'{'#255#225#163
-  +'{'#255#224#161'x'#255#222#159'w'#255#221#159'v'#255#220#157't'#255#217#155
-  +'r'#255#216#153'q'#255#214#153'p'#255#213#171#142#255#173'c3'#255#187'j6'#255
-  +#242#213#194#255#227#163'z'#255#227#163'z'#255#226#163'{'#255#226#163'{'#255
-  +#226#164'{'#255#225#162'y'#255#224#161'x'#255#222#160'w'#255#222#158'u'#255
-  +#220#157't'#255#218#155's'#255#217#155's'#255#218#176#149#255#175'd3'#255#187
-  +'j6'#255#242#216#197#255#227#164'{'#255#227#163'z'#255#227#164'z'#255#226#164
-  +'{'#255#226#163'{'#255#225#163'{'#255#225#162'y'#255#223#160'w'#255#222#159
-  +'v'#255#221#158't'#255#219#156'r'#255#220#157't'#255#221#181#154#255#177'e4'
-  +#255#187'k6'#255#244#217#199#255#230#166'}'#255#200#140'd'#255#201#141'e'#255
-  +#201#142'g'#255#203#146'l'#255#203#146'm'#255#202#144'i'#255#200#140'e'#255
-  +#200#140'd'#255#200#140'd'#255#200#140'd'#255#218#156't'#255#225#186#159#255
-  +#179'f4'#255#187'k6'#254#244#220#201#255#231#167'}'#255#249#236#225#255#249
-  +#236#225#255#249#237#227#255#252#244#238#255#253#250#247#255#253#247#243#255
-  +#250#237#229#255#247#231#219#255#247#229#217#255#246#229#216#255#222#160'w'
-  +#255#228#190#164#255#180'g4'#255#188'k6'#250#245#221#204#255#231#168'~'#255
-  +#250#240#232#255#250#240#232#255#201#141'f'#255#250#240#233#255#253#248#243
-  +#255#254#250#248#255#252#244#239#255#249#233#223#255#247#231#219#255#247#229
-  +#217#255#224#162'x'#255#231#194#169#255#182'h5'#255#188'k6'#240#246#223#208
-  +#255#232#168'~'#255#252#246#241#255#252#246#241#255#200#140'd'#255#250#241
-  +#233#255#251#244#238#255#253#250#247#255#253#249#246#255#250#240#232#255#248
-  +#232#221#255#247#230#219#255#225#163'z'#255#239#213#195#255#183'i5'#254#188
-  +'k6'#216#246#223#209#255#233#170#128#255#254#250#246#255#253#250#246#255#200
-  +#140'd'#255#251#243#238#255#251#241#234#255#252#246#242#255#254#251#248#255
-  +#252#246#241#255#249#236#226#255#248#231#219#255#238#208#186#255#236#208#189
-  +#255#187'p>'#248#188'k6'#155#246#224#209#255#247#224#209#255#254#251#248#255
-  +#254#251#247#255#253#249#246#255#252#245#240#255#250#240#234#255#251#242#237
-  +#255#253#249#246#255#253#250#247#255#251#241#235#255#248#233#223#254#236#208
-  +#189#251#201#137'^'#236#181'i5c'#188'k6q'#188'k6'#144#188'k6'#204#188'k6'#238
-  +#188'k6'#250#187'k6'#254#187'k6'#255#187'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'NumGly'
-  +'phs'#2#0#7'OnClick'#7#19'ButtonLoadSaveClick'#14'ParentShowHint'#8#8'ShowHi'
-  +'nt'#9#8'TabOrder'#2#3#0#0#7'TBitBtn'#5'btnOK'#21'AnchorSideBottom.Side'#7#9
-  +'asrBottom'#4'Left'#3#248#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'I'#2#6'Height'#2'$'#3'Top'#2#6#5'Widt'
-  +'h'#2'N'#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
+  +#248#255#254#251#248#255#254#251#248#255#200#154'|'#255#199#152'y'#255#167'`'
+  +'1'#237#186'k7'#254#237#202#179#255#224#162'z'#255#254#250#247#255'b'#192#136
+  +#255'b'#192#136#255'b'#192#136#255'b'#192#136#255'b'#192#136#255'b'#192#136
+  +#255'b'#192#136#255'b'#192#136#255#253#249#246#255#202#141'e'#255#201#155'|'
+  +#255#167'`1'#254#187'l8'#255#238#204#182#255#225#162'z'#255#254#250#247#255
+  +#191#220#194#255#191#220#194#255#191#220#194#255#191#220#194#255#191#220#194
+  +#255#191#220#194#255#191#220#194#255#191#220#194#255#253#249#246#255#205#144
+  +'h'#255#204#158#129#255#168'a2'#255#187'k8'#255#239#206#184#255#225#162'y'
+  +#255#254#250#247#255'b'#192#136#255'b'#192#136#255'b'#192#136#255'b'#192#136
+  +#255'b'#192#136#255'b'#192#136#255'b'#192#136#255'b'#192#136#255#253#249#246
+  +#255#207#147'j'#255#206#163#132#255#170'a2'#255#186'j6'#255#239#208#187#255
+  +#226#162'z'#255#254#251#248#255#254#251#248#255#254#251#248#255#254#251#248
+  +#255#254#251#248#255#254#251#248#255#254#251#248#255#254#251#248#255#254#251
+  +#248#255#254#251#248#255#211#150'm'#255#210#167#138#255#171'b2'#255#187'j6'
+  +#255#240#210#190#255#226#163'z'#255#226#163'z'#255#225#163'z'#255#226#163'{'
+  +#255#225#163'{'#255#224#161'x'#255#222#159'w'#255#221#159'v'#255#220#157't'
+  +#255#217#155'r'#255#216#153'q'#255#214#153'p'#255#213#171#142#255#173'c3'#255
+  +#187'j6'#255#242#213#194#255#227#163'z'#255#227#163'z'#255#226#163'{'#255#226
+  +#163'{'#255#226#164'{'#255#225#162'y'#255#224#161'x'#255#222#160'w'#255#222
+  +#158'u'#255#220#157't'#255#218#155's'#255#217#155's'#255#218#176#149#255#175
+  +'d3'#255#187'j6'#255#242#216#197#255#227#164'{'#255#227#163'z'#255#227#164'z'
+  +#255#226#164'{'#255#226#163'{'#255#225#163'{'#255#225#162'y'#255#223#160'w'
+  +#255#222#159'v'#255#221#158't'#255#219#156'r'#255#220#157't'#255#221#181#154
+  +#255#177'e4'#255#187'k6'#255#244#217#199#255#230#166'}'#255#200#140'd'#255
+  +#201#141'e'#255#201#142'g'#255#203#146'l'#255#203#146'm'#255#202#144'i'#255
+  +#200#140'e'#255#200#140'd'#255#200#140'd'#255#200#140'd'#255#218#156't'#255
+  +#225#186#159#255#179'f4'#255#187'k6'#254#244#220#201#255#231#167'}'#255#249
+  +#236#225#255#249#236#225#255#249#237#227#255#252#244#238#255#253#250#247#255
+  +#253#247#243#255#250#237#229#255#247#231#219#255#247#229#217#255#246#229#216
+  +#255#222#160'w'#255#228#190#164#255#180'g4'#255#188'k6'#250#245#221#204#255
+  ,#231#168'~'#255#250#240#232#255#250#240#232#255#201#141'f'#255#250#240#233
+  +#255#253#248#243#255#254#250#248#255#252#244#239#255#249#233#223#255#247#231
+  +#219#255#247#229#217#255#224#162'x'#255#231#194#169#255#182'h5'#255#188'k6'
+  +#240#246#223#208#255#232#168'~'#255#252#246#241#255#252#246#241#255#200#140
+  +'d'#255#250#241#233#255#251#244#238#255#253#250#247#255#253#249#246#255#250
+  +#240#232#255#248#232#221#255#247#230#219#255#225#163'z'#255#239#213#195#255
+  +#183'i5'#254#188'k6'#216#246#223#209#255#233#170#128#255#254#250#246#255#253
+  +#250#246#255#200#140'd'#255#251#243#238#255#251#241#234#255#252#246#242#255
+  +#254#251#248#255#252#246#241#255#249#236#226#255#248#231#219#255#238#208#186
+  +#255#236#208#189#255#187'p>'#248#188'k6'#155#246#224#209#255#247#224#209#255
+  +#254#251#248#255#254#251#247#255#253#249#246#255#252#245#240#255#250#240#234
+  +#255#251#242#237#255#253#249#246#255#253#250#247#255#251#241#235#255#248#233
+  +#223#254#236#208#189#251#201#137'^'#236#181'i5c'#188'k6q'#188'k6'#144#188'k6'
+  +#204#188'k6'#238#188'k6'#250#187'k6'#254#187'k6'#255#187'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'ButtonLoadSaveClick'#14'ParentShowHi'
+  +'nt'#8#8'ShowHint'#9#8'TabOrder'#2#3#0#0#7'TBitBtn'#5'btnOK'#21'AnchorSideBo'
+  +'ttom.Side'#7#9'asrBottom'#4'Left'#3#248#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'Cap'
+  +'tion'#6#3'&OK'#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'
+  +#4'Kind'#7#4'bkOK'#9'NumGlyphs'#2#0#7'OnClick'#7#15'ButtonOKClicked'#8'TabOr'
+  +'der'#2#4#0#0#7'TBitBtn'#9'btnCancel'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'I'#2#6'Height'#2'$'#3'To'
+  +'p'#2#6#5'Width'#2'N'#5'Align'#7#7'alRight'#8'AutoSize'#9#20'BorderSpacing.A'
+  +'round'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#21'Constraints.MinHeight'#2#25
+  +#20'Constraints.MinWidth'#2'K'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'N'
+  +'umGlyphs'#2#0#8'TabOrder'#2#5#0#0#0#0
 ]);
diff --git a/packager/frames/compiler_buildmodes_options.lfm b/packager/frames/compiler_buildmodes_options.lfm
index 6ef4d5f206..2d340f8d7c 100644
--- a/packager/frames/compiler_buildmodes_options.lfm
+++ b/packager/frames/compiler_buildmodes_options.lfm
@@ -8,167 +8,34 @@ object CompOptBuildModesFrame: TCompOptBuildModesFrame
   Ctl3D = False
   TabOrder = 0
   Visible = False
-  DesignLeft = 334
-  DesignTop = 448
-  object ModesGroupBox: TGroupBox
+  DesignLeft = 339
+  DesignTop = 472
+  object BuildModesGroupBox: TGroupBox
     Left = 0
     Height = 229
     Top = 0
-    Width = 186
-    Align = alLeft
-    Caption = 'ModesGroupBox'
+    Width = 488
+    Align = alClient
+    Caption = 'BuildModesGroupBox'
     ClientHeight = 210
-    ClientWidth = 182
+    ClientWidth = 484
     Ctl3D = False
     TabOrder = 0
-    object NewSpeedButton: TSpeedButton
-      AnchorSideLeft.Control = ModesGroupBox
-      AnchorSideBottom.Control = ModesGroupBox
-      AnchorSideBottom.Side = asrBottom
+    object BuildModesTreeView: TTreeView
       Left = 0
-      Height = 22
-      Top = 188
-      Width = 23
-      Anchors = [akLeft, akBottom]
-      Color = clBtnFace
-      NumGlyphs = 0
-      OnClick = NewSpeedButtonClick
-    end
-    object DeleteSpeedButton: TSpeedButton
-      AnchorSideLeft.Control = NewSpeedButton
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = NewSpeedButton
-      Left = 23
-      Height = 22
-      Top = 188
-      Width = 23
-      Color = clBtnFace
-      NumGlyphs = 0
-      OnClick = DeleteSpeedButtonClick
-    end
-    object MoveDownSpeedButton: TSpeedButton
-      AnchorSideLeft.Control = DeleteSpeedButton
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = NewSpeedButton
-      Left = 46
-      Height = 22
-      Top = 188
-      Width = 23
-      Color = clBtnFace
-      NumGlyphs = 0
-      OnClick = MoveDownSpeedButtonClick
-    end
-    object MoveUpSpeedButton: TSpeedButton
-      AnchorSideLeft.Control = MoveDownSpeedButton
-      AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = NewSpeedButton
-      Left = 69
-      Height = 22
-      Top = 188
-      Width = 23
-      Color = clBtnFace
-      NumGlyphs = 0
-      OnClick = MoveUpSpeedButtonClick
-    end
-    object ModesGrid: TStringGrid
-      AnchorSideBottom.Control = NewSpeedButton
-      Left = 0
-      Height = 188
+      Height = 210
       Top = 0
-      Width = 182
-      Align = alTop
-      Anchors = [akTop, akLeft, akRight, akBottom]
-      ColCount = 1
-      FixedCols = 0
-      FixedRows = 0
-      Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goDblClickAutoSize, goSmoothScroll]
-      TabOrder = 0
-      OnSelection = ModesGridSelection
-      OnSelectCell = ModesGridSelectCell
-    end
-  end
-  object ValuesGroupBox: TGroupBox
-    Left = 191
-    Height = 229
-    Top = 0
-    Width = 297
-    Align = alClient
-    Caption = 'ValuesGroupBox'
-    ClientHeight = 210
-    ClientWidth = 293
-    Ctl3D = False
-    TabOrder = 1
-    object ValuesStringGrid: TStringGrid
-      Left = 0
-      Height = 95
-      Top = 0
-      Width = 293
+      Width = 484
       Align = alClient
-      ColCount = 2
-      FixedCols = 0
-      Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goColSizing, goEditing, goDblClickAutoSize, goSmoothScroll]
+      Ctl3D = False
+      DefaultItemHeight = 19
+      PopupMenu = BuildModeTVPopupMenu
       TabOrder = 0
     end
-    object DefaultValueGroupBox: TGroupBox
-      Left = 0
-      Height = 109
-      Top = 101
-      Width = 293
-      Align = alBottom
-      Caption = 'DefaultValueGroupBox'
-      ClientHeight = 90
-      ClientWidth = 289
-      Ctl3D = False
-      TabOrder = 1
-      inline DefaultValueEditor: TCompOptsConditionalsFrame
-        Height = 90
-        Width = 289
-        Align = alClient
-        ClientHeight = 86
-        ClientWidth = 285
-        Visible = True
-        DesignLeft = 434
-        DesignTop = 329
-        inherited COCTreeView: TTreeView
-          Height = 86
-          Width = 285
-        end
-        inherited COCPopupMenu: TPopupMenu
-          inherited InsertAboveMenuItem: TMenuItem
-          end
-          inherited InsertBelowMenuItem: TMenuItem
-          end
-          inherited InsertChildMenuItem: TMenuItem
-          end
-          inherited DeleteMenuItem: TMenuItem
-          end
-          inherited MoveUpMenuItem: TMenuItem
-          end
-          inherited MoveDownMenuItem: TMenuItem
-          end
-          inherited MoveLvlUpMenuItem: TMenuItem
-          end
-          inherited MoveLvlDownMenuItem: TMenuItem
-          end
-          inherited PropertiesMenuItem: TMenuItem
-          end
-        end
-      end
-    end
-    object ValuesSplitter: TSplitter
-      Cursor = crVSplit
-      Left = 0
-      Height = 6
-      Top = 95
-      Width = 293
-      Align = alBottom
-      ResizeAnchor = akBottom
-    end
   end
-  object MainSplitter: TSplitter
-    Left = 186
-    Height = 229
-    Top = 0
-    Width = 5
+  object BuildModeTVPopupMenu: TPopupMenu
+    OnPopup = BuildModeTVPopupMenuPopup
+    left = 99
+    top = 77
   end
 end
diff --git a/packager/frames/compiler_buildmodes_options.lrs b/packager/frames/compiler_buildmodes_options.lrs
index bf11c96f14..4346afd5d6 100644
--- a/packager/frames/compiler_buildmodes_options.lrs
+++ b/packager/frames/compiler_buildmodes_options.lrs
@@ -3,57 +3,13 @@
 LazarusResources.Add('TCompOptBuildModesFrame','FORMDATA',[
   'TPF0'#23'TCompOptBuildModesFrame'#22'CompOptBuildModesFrame'#4'Left'#2#0#6'H'
   +'eight'#3#233#0#3'Top'#2#0#5'Width'#3#236#1#12'ClientHeight'#3#229#0#11'Clie'
-  +'ntWidth'#3#232#1#5'Ctl3D'#8#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3'N'
-  +#1#9'DesignTop'#3#192#1#0#9'TGroupBox'#13'ModesGroupBox'#4'Left'#2#0#6'Heigh'
-  +'t'#3#229#0#3'Top'#2#0#5'Width'#3#186#0#5'Align'#7#6'alLeft'#7'Caption'#6#13
-  +'ModesGroupBox'#12'ClientHeight'#3#210#0#11'ClientWidth'#3#182#0#5'Ctl3D'#8#8
-  +'TabOrder'#2#0#0#12'TSpeedButton'#14'NewSpeedButton'#22'AnchorSideLeft.Contr'
-  +'ol'#7#13'ModesGroupBox'#24'AnchorSideBottom.Control'#7#13'ModesGroupBox'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#22#3'Top'#3
-  +#188#0#5'Width'#2#23#7'Anchors'#11#6'akLeft'#8'akBottom'#0#5'Color'#7#9'clBt'
-  +'nFace'#9'NumGlyphs'#2#0#7'OnClick'#7#19'NewSpeedButtonClick'#0#0#12'TSpeedB'
-  +'utton'#17'DeleteSpeedButton'#22'AnchorSideLeft.Control'#7#14'NewSpeedButton'
-  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#14'NewSp'
-  +'eedButton'#4'Left'#2#23#6'Height'#2#22#3'Top'#3#188#0#5'Width'#2#23#5'Color'
-  +#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#22'DeleteSpeedButtonClick'#0#0
-  +#12'TSpeedButton'#19'MoveDownSpeedButton'#22'AnchorSideLeft.Control'#7#17'De'
-  +'leteSpeedButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Co'
-  +'ntrol'#7#14'NewSpeedButton'#4'Left'#2'.'#6'Height'#2#22#3'Top'#3#188#0#5'Wi'
-  +'dth'#2#23#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#24'MoveDown'
-  +'SpeedButtonClick'#0#0#12'TSpeedButton'#17'MoveUpSpeedButton'#22'AnchorSideL'
-  +'eft.Control'#7#19'MoveDownSpeedButton'#19'AnchorSideLeft.Side'#7#9'asrBotto'
-  +'m'#21'AnchorSideTop.Control'#7#14'NewSpeedButton'#4'Left'#2'E'#6'Height'#2
-  +#22#3'Top'#3#188#0#5'Width'#2#23#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7
-  +'OnClick'#7#22'MoveUpSpeedButtonClick'#0#0#11'TStringGrid'#9'ModesGrid'#24'A'
-  +'nchorSideBottom.Control'#7#14'NewSpeedButton'#4'Left'#2#0#6'Height'#3#188#0
-  +#3'Top'#2#0#5'Width'#3#182#0#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'#6'ak'
-  +'Left'#7'akRight'#8'akBottom'#0#8'ColCount'#2#1#9'FixedCols'#2#0#9'FixedRows'
-  +#2#0#7'Options'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10
-  +'goHorzLine'#13'goRangeSelect'#9'goEditing'#18'goDblClickAutoSize'#14'goSmoo'
-  +'thScroll'#0#8'TabOrder'#2#0#11'OnSelection'#7#18'ModesGridSelection'#12'OnS'
-  +'electCell'#7#19'ModesGridSelectCell'#0#0#0#9'TGroupBox'#14'ValuesGroupBox'#4
-  +'Left'#3#191#0#6'Height'#3#229#0#3'Top'#2#0#5'Width'#3')'#1#5'Align'#7#8'alC'
-  +'lient'#7'Caption'#6#14'ValuesGroupBox'#12'ClientHeight'#3#210#0#11'ClientWi'
-  +'dth'#3'%'#1#5'Ctl3D'#8#8'TabOrder'#2#1#0#11'TStringGrid'#16'ValuesStringGri'
-  +'d'#4'Left'#2#0#6'Height'#2'_'#3'Top'#2#0#5'Width'#3'%'#1#5'Align'#7#8'alCli'
-  +'ent'#8'ColCount'#2#2#9'FixedCols'#2#0#7'Options'#11#15'goFixedVertLine'#15
-  +'goFixedHorzLine'#10'goVertLine'#10'goHorzLine'#13'goRangeSelect'#11'goColSi'
-  +'zing'#9'goEditing'#18'goDblClickAutoSize'#14'goSmoothScroll'#0#8'TabOrder'#2
-  +#0#0#0#9'TGroupBox'#20'DefaultValueGroupBox'#4'Left'#2#0#6'Height'#2'm'#3'To'
-  +'p'#2'e'#5'Width'#3'%'#1#5'Align'#7#8'alBottom'#7'Caption'#6#20'DefaultValue'
-  +'GroupBox'#12'ClientHeight'#2'Z'#11'ClientWidth'#3'!'#1#5'Ctl3D'#8#8'TabOrde'
-  +'r'#2#1#0#244#26'TCompOptsConditionalsFrame'#18'DefaultValueEditor'#6'Height'
-  +#2'Z'#5'Width'#3'!'#1#5'Align'#7#8'alClient'#12'ClientHeight'#2'V'#11'Client'
-  +'Width'#3#29#1#7'Visible'#9#10'DesignLeft'#3#178#1#9'DesignTop'#3'I'#1#0#241
-  +#9'TTreeView'#11'COCTreeView'#6'Height'#2'V'#5'Width'#3#29#1#0#0#241#10'TPop'
-  +'upMenu'#12'COCPopupMenu'#0#241#9'TMenuItem'#19'InsertAboveMenuItem'#0#0#241
-  +#9'TMenuItem'#19'InsertBelowMenuItem'#0#0#241#9'TMenuItem'#19'InsertChildMen'
-  +'uItem'#0#0#241#9'TMenuItem'#14'DeleteMenuItem'#0#0#241#9'TMenuItem'#14'Move'
-  +'UpMenuItem'#0#0#241#9'TMenuItem'#16'MoveDownMenuItem'#0#0#241#9'TMenuItem'
-  +#17'MoveLvlUpMenuItem'#0#0#241#9'TMenuItem'#19'MoveLvlDownMenuItem'#0#0#241#9
-  +'TMenuItem'#18'PropertiesMenuItem'#0#0#0#0#0#9'TSplitter'#14'ValuesSplitter'
-  +#6'Cursor'#7#8'crVSplit'#4'Left'#2#0#6'Height'#2#6#3'Top'#2'_'#5'Width'#3'%'
-  +#1#5'Align'#7#8'alBottom'#12'ResizeAnchor'#7#8'akBottom'#0#0#0#9'TSplitter'
-  +#12'MainSplitter'#4'Left'#3#186#0#6'Height'#3#229#0#3'Top'#2#0#5'Width'#2#5#0
-  +#0#0
+  +'ntWidth'#3#232#1#5'Ctl3D'#8#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3'S'
+  +#1#9'DesignTop'#3#216#1#0#9'TGroupBox'#18'BuildModesGroupBox'#4'Left'#2#0#6
+  +'Height'#3#229#0#3'Top'#2#0#5'Width'#3#232#1#5'Align'#7#8'alClient'#7'Captio'
+  +'n'#6#18'BuildModesGroupBox'#12'ClientHeight'#3#210#0#11'ClientWidth'#3#228#1
+  +#5'Ctl3D'#8#8'TabOrder'#2#0#0#9'TTreeView'#18'BuildModesTreeView'#4'Left'#2#0
+  +#6'Height'#3#210#0#3'Top'#2#0#5'Width'#3#228#1#5'Align'#7#8'alClient'#5'Ctl3'
+  +'D'#8#17'DefaultItemHeight'#2#19#9'PopupMenu'#7#20'BuildModeTVPopupMenu'#8'T'
+  +'abOrder'#2#0#0#0#0#10'TPopupMenu'#20'BuildModeTVPopupMenu'#7'OnPopup'#7#25
+  +'BuildModeTVPopupMenuPopup'#4'left'#2'c'#3'top'#2'M'#0#0#0
 ]);
diff --git a/packager/frames/compiler_buildmodes_options.pas b/packager/frames/compiler_buildmodes_options.pas
index 4f2f46f44f..d3ab6b972a 100644
--- a/packager/frames/compiler_buildmodes_options.pas
+++ b/packager/frames/compiler_buildmodes_options.pas
@@ -25,7 +25,7 @@ interface
 
 uses
   Classes, SysUtils, FileUtil, Controls, LResources, Forms, StdCtrls, Grids,
-  Buttons, ExtCtrls, Dialogs,
+  Buttons, ExtCtrls, Dialogs, ComCtrls, Menus,
   IDEImagesIntf, ProjectIntf, CompilerOptions,
   Compiler_Conditionals_Options, LazarusIDEStrConsts, CompOptsModes;
 
@@ -34,33 +34,20 @@ type
   { TCompOptBuildModesFrame }
 
   TCompOptBuildModesFrame = class(TFrame)
-    DefaultValueEditor: TCompOptsConditionalsFrame;
-    DefaultValueGroupBox: TGroupBox;
-    ModesGrid: TStringGrid;
-    ValuesGroupBox: TGroupBox;
-    ModesGroupBox: TGroupBox;
-    NewSpeedButton: TSpeedButton;
-    DeleteSpeedButton: TSpeedButton;
-    MoveDownSpeedButton: TSpeedButton;
-    MoveUpSpeedButton: TSpeedButton;
-    MainSplitter: TSplitter;
-    ValuesSplitter: TSplitter;
-    ValuesStringGrid: TStringGrid;
+    BuildModesGroupBox: TGroupBox;
+    BuildModesTreeView: TTreeView;
+    BuildModeTVPopupMenu: TPopupMenu;
+    procedure BuildModeTVPopupMenuPopup(Sender: TObject);
     procedure DeleteSpeedButtonClick(Sender: TObject);
-    procedure ModesGridSelectCell(Sender: TObject; aCol, aRow: Integer;
-      var CanSelect: Boolean);
-    procedure ModesGridSelection(Sender: TObject; aCol, aRow: Integer);
-    procedure MoveDownSpeedButtonClick(Sender: TObject);
-    procedure MoveUpSpeedButtonClick(Sender: TObject);
     procedure NewSpeedButtonClick(Sender: TObject);
   private
     FBuildModes: TIDEBuildModes;
+    fModeImgID: LongInt;
+    fValuesImgID: LongInt;
+    fValueImgID: LongInt;
+    fDefValueImgID: LongInt;
     procedure SetBuildModes(const AValue: TIDEBuildModes);
-    procedure UpdateModes;
-    procedure UpdateValues;
-    procedure UpdateDefaultValue;
-    procedure UpdateButtons;
-    function GetSelectedBuildMode(out BuildMode: TIDEBuildMode): boolean;
+    procedure RebuildTreeView;
   public
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
@@ -72,22 +59,22 @@ implementation
 { TCompOptBuildModesFrame }
 
 procedure TCompOptBuildModesFrame.NewSpeedButtonClick(Sender: TObject);
-var
-  NewIdentifier: String;
+{var
+  NewIdentifier: String;}
 begin
-  NewIdentifier:=GlobalBuildModeSet.GetUniqueModeName(BuildModes);
+{  NewIdentifier:=GlobalBuildModeSet.GetUniqueModeName(BuildModes);
   BuildModes.Add(NewIdentifier);
   ModesGrid.RowCount:=BuildModes.Count;
   ModesGrid.Cells[0,BuildModes.Count-1]:=NewIdentifier;
-  ModesGrid.Row:=BuildModes.Count-1;
+  ModesGrid.Row:=BuildModes.Count-1;}
 end;
 
 procedure TCompOptBuildModesFrame.DeleteSpeedButtonClick(Sender: TObject);
-var
+{var
   BuildMode: TIDEBuildMode;
-  i: LongInt;
+  i: LongInt;}
 begin
-  if not GetSelectedBuildMode(BuildMode) then exit;
+{  if not GetSelectedBuildMode(BuildMode) then exit;
   i:=ModesGrid.Row;
   if MessageDlg('Confirm delete',
     'Delete build mode "'+BuildMode.Identifier+'"?',
@@ -97,49 +84,21 @@ begin
   ModesGrid.DeleteColRow(false,i);
   if i=ModesGrid.RowCount then
     dec(i);
-  ModesGrid.Row:=i;
+  ModesGrid.Row:=i;}
 end;
 
-procedure TCompOptBuildModesFrame.ModesGridSelectCell(Sender: TObject; aCol,
-  aRow: Integer; var CanSelect: Boolean);
-begin
-
-end;
-
-procedure TCompOptBuildModesFrame.ModesGridSelection(Sender: TObject; aCol,
-  aRow: Integer);
-begin
-  UpdateValues;
-  UpdateButtons;
-end;
-
-procedure TCompOptBuildModesFrame.MoveDownSpeedButtonClick(Sender: TObject);
+procedure TCompOptBuildModesFrame.BuildModeTVPopupMenuPopup(Sender: TObject);
 var
-  i: LongInt;
-  BuildMode: TIDEBuildMode;
+  SelTVNode: TTreeNode;
 begin
-  if not GetSelectedBuildMode(BuildMode) then exit;
-  i:=ModesGrid.Row;
-  if (i<ModesGrid.RowCount-1) and (i<BuildModes.Count-1) then begin
-    BuildModes.Move(i,i+1);
-    ModesGrid.Cells[0,i]:=BuildModes.Items[i].Identifier;
-    ModesGrid.Cells[0,i+1]:=BuildModes.Items[i+1].Identifier;
-    ModesGrid.Row:=i+1;
-  end;
-end;
+  SelTVNode:=BuildModesTreeView.Selected;
+  BuildModeTVPopupMenu.Items.Clear;
+
+  if SelTVNode=nil then begin
+    // no node selected
+
+  end else begin
 
-procedure TCompOptBuildModesFrame.MoveUpSpeedButtonClick(Sender: TObject);
-var
-  i: LongInt;
-  BuildMode: TIDEBuildMode;
-begin
-  if not GetSelectedBuildMode(BuildMode) then exit;
-  i:=ModesGrid.Row;
-  if (i>0) and (i<ModesGrid.RowCount) and (i<BuildModes.Count) then begin
-    BuildModes.Move(i,i-1);
-    ModesGrid.Cells[0,i]:=BuildModes.Items[i].Identifier;
-    ModesGrid.Cells[0,i-1]:=BuildModes.Items[i-1].Identifier;
-    ModesGrid.Row:=i-1;
   end;
 end;
 
@@ -147,108 +106,59 @@ procedure TCompOptBuildModesFrame.SetBuildModes(const AValue: TIDEBuildModes);
 begin
   if FBuildModes=AValue then exit;
   FBuildModes:=AValue;
-  UpdateModes;
+  RebuildTreeView;
 end;
 
-procedure TCompOptBuildModesFrame.UpdateModes;
+procedure TCompOptBuildModesFrame.RebuildTreeView;
 var
   i: Integer;
+  TVNode: TTreeNode;
+  BuildMode: TLazBuildMode;
+  j: Integer;
+  Values: TStrings;
+  ValueTVNode: TTreeNode;
+  ValuesTVNode: TTreeNode;
+  DefValueTVNode: TTreeNode;
 begin
-  ModesGrid.BeginUpdate;
-  ModesGrid.ColCount:=1;
-  ModesGrid.RowCount:=BuildModes.Count;
+  BuildModesTreeView.BeginUpdate;
+  BuildModesTreeView.Items.Clear;
   if BuildModes<>nil then begin
-    for i:=0 to BuildModes.Count-1 do
-      ModesGrid.Cells[0,i]:=BuildModes.Items[i].Identifier;
+    // first level: build modes
+    for i:=0 to BuildModes.Count-1 do begin
+      BuildMode:=BuildModes.Items[i];
+      TVNode:=BuildModesTreeView.Items.AddObject(nil,BuildMode.Identifier,BuildMode);
+      TVNode.ImageIndex:=fModeImgID;
+      TVNode.StateIndex:=TVNode.ImageIndex;
+      // second level: values and default values
+      ValuesTVNode:=BuildModesTreeView.Items.AddChild(TVNode,'Values');
+      ValuesTVNode.ImageIndex:=fValuesImgID;
+      ValuesTVNode.StateIndex:=ValuesTVNode.ImageIndex;
+      Values:=BuildMode.Values;
+      for j:=0 to Values.Count-1 do begin
+        ValueTVNode:=BuildModesTreeView.Items.AddChild(ValuesTVNode,Values[j]);
+        ValueTVNode.ImageIndex:=fValueImgID;
+        ValueTVNode.StateIndex:=ValueTVNode.ImageIndex;
+      end;
+      DefValueTVNode:=BuildModesTreeView.Items.AddChild(TVNode,'Default value');
+      DefValueTVNode.ImageIndex:=fDefValueImgID;
+      DefValueTVNode.StateIndex:=DefValueTVNode.ImageIndex;
+      // ToDo: add default value nodes
+      TVNode.Expand(true);
+    end;
   end;
-  ModesGrid.EndUpdate;
-  UpdateValues;
-  UpdateButtons;
-end;
-
-procedure TCompOptBuildModesFrame.UpdateValues;
-var
-  BuildMode: TIDEBuildMode;
-  i: Integer;
-begin
-  if not GetSelectedBuildMode(BuildMode) then exit;
-  ValuesStringGrid.ColCount:=2;
-  ValuesStringGrid.FixedCols:=0;
-  ValuesStringGrid.RowCount:=BuildMode.Values.Count+1;
-  ValuesStringGrid.FixedRows:=1;
-  ValuesStringGrid.Cells[0,0]:='Value';
-  ValuesStringGrid.Cells[1,0]:='Description';
-  ValuesStringGrid.ColWidths[0]:=90;
-  ValuesStringGrid.ColWidths[1]:=120;
-  for i:=0 to BuildMode.Values.Count-1 do begin
-    ValuesStringGrid.Cells[0,i+1]:=BuildMode.Values[i];
-    if i<BuildMode.ValueDescriptions.Count then
-      ValuesStringGrid.Cells[1,i+1]:=BuildMode.ValueDescriptions[i]
-    else
-      ValuesStringGrid.Cells[1,i+1]:='';
-  end;
-  UpdateDefaultValue;
-end;
-
-procedure TCompOptBuildModesFrame.UpdateDefaultValue;
-var
-  BuildMode: TIDEBuildMode;
-begin
-  if not GetSelectedBuildMode(BuildMode) then exit;
-  DefaultValueEditor.Conditionals:=TCompOptConditionals(BuildMode.DefaultValue);
-end;
-
-procedure TCompOptBuildModesFrame.UpdateButtons;
-var
-  BuildMode: TIDEBuildMode;
-begin
-  GetSelectedBuildMode(BuildMode);
-
-  NewSpeedButton.Enabled:=BuildModes<>nil;
-
-  NewSpeedButton.Hint:='Create new build mode';
-  if BuildMode<>nil then begin
-    DeleteSpeedButton.Enabled:=true;
-    MoveDownSpeedButton.Enabled:=(ModesGrid.Row<ModesGrid.RowCount-1);
-    MoveUpSpeedButton.Enabled:=(ModesGrid.Row>0);
-    DeleteSpeedButton.Hint:='Delete '+BuildMode.Identifier;
-    MoveDownSpeedButton.Hint:='Move '+BuildMode.Identifier+' down';
-    MoveUpSpeedButton.Hint:='Move '+BuildMode.Identifier+' up';
-  end else begin
-    DeleteSpeedButton.Enabled:=false;
-    MoveDownSpeedButton.Enabled:=false;
-    MoveUpSpeedButton.Enabled:=false;
-    DeleteSpeedButton.Hint:='Delete ...';
-    MoveDownSpeedButton.Hint:='Move down';
-    MoveUpSpeedButton.Hint:='Move up';
-  end;
-end;
-
-function TCompOptBuildModesFrame.GetSelectedBuildMode(
-  out BuildMode: TIDEBuildMode): boolean;
-begin
-  BuildMode:=nil;
-  if BuildModes=nil then exit(false);
-  if (ModesGrid.Row<0) or (ModesGrid.Row>=BuildModes.Count) then exit(false);
-  BuildMode:=TIDEBuildMode(BuildModes.Items[ModesGrid.Row]);
-  Result:=true;
+  BuildModesTreeView.EndUpdate;
 end;
 
 constructor TCompOptBuildModesFrame.Create(TheOwner: TComponent);
 begin
   inherited Create(TheOwner);
 
-  DefaultValueGroupBox.Caption:='Default value';
-  ValuesGroupBox.Caption:='Values';
-  ModesGroupBox.Caption:='Build modes';
-  NewSpeedButton.LoadGlyphFromLazarusResource('menu_new');
-  NewSpeedButton.ShowHint:=true;
-  DeleteSpeedButton.LoadGlyphFromLazarusResource('menu_project_remove');
-  DeleteSpeedButton.ShowHint:=true;
-  MoveDownSpeedButton.LoadGlyphFromLazarusResource('arrow_down');
-  MoveDownSpeedButton.ShowHint:=true;
-  MoveUpSpeedButton.LoadGlyphFromLazarusResource('arrow_up');
-  MoveUpSpeedButton.ShowHint:=true;
+  BuildModesTreeView.Images := IDEImages.Images_24;
+  fModeImgID:=IDEImages.LoadImage(24,'da_define');
+  fValueImgID:=IDEImages.LoadImage(24,'da_define');
+  fDefValueImgID:=IDEImages.LoadImage(24,'da_define');
+
+  BuildModesGroupBox.Caption:='Build modes';
 end;
 
 destructor TCompOptBuildModesFrame.Destroy;