diff --git a/components/printers/samples/dialogs/frmselprinter.lfm b/components/printers/samples/dialogs/frmselprinter.lfm
index 133780e976..e0a1f568d5 100644
--- a/components/printers/samples/dialogs/frmselprinter.lfm
+++ b/components/printers/samples/dialogs/frmselprinter.lfm
@@ -57,7 +57,6 @@ object Form1: TForm1
     DefaultColWidth = 90
     FixedColor = clBtnFace
     Flat = True
-    GridLineWidth = 0
     Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goSmoothScroll]
     RowCount = 15
     ScrollBars = ssAutoBoth
diff --git a/components/printers/samples/dialogs/frmselprinter.lrs b/components/printers/samples/dialogs/frmselprinter.lrs
index 2003c84b32..a20c1dbbc4 100644
--- a/components/printers/samples/dialogs/frmselprinter.lrs
+++ b/components/printers/samples/dialogs/frmselprinter.lrs
@@ -16,29 +16,29 @@ LazarusResources.Add('TForm1','FORMDATA',[
   +#1#3'Top'#3#192#0#5'Width'#3'@'#1#15'AutoFillColumns'#9#11'BorderStyle'#7#6
   +'bsNone'#8'ColCount'#2#2#7'Columns'#14#1#7'MinSize'#2'<'#7'MaxSize'#3'^'#1#8
   +'ReadOnly'#9#13'Title.Caption'#6#11'Information'#5'Width'#3#230#0#0#0#15'Def'
-  +'aultColWidth'#2'Z'#10'FixedColor'#7#9'clBtnFace'#4'Flat'#9#13'GridLineWidth'
-  +#2#0#7'Options'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10
-  +'goHorzLine'#13'goRangeSelect'#14'goSmoothScroll'#0#8'RowCount'#2#15#10'Scro'
-  +'llBars'#7#10'ssAutoBoth'#8'TabOrder'#2#7#7'TabStop'#9#0#0#7'TButton'#7'Butt'
-  +'on3'#4'Left'#2#8#6'Height'#2#27#3'Top'#2'i'#5'Width'#3'@'#1#25'BorderSpacin'
-  +'g.InnerBorder'#2#4#7'Caption'#6#24'Get default printer info'#7'OnClick'#7#12
-  +'Button3Click'#8'TabOrder'#2#2#0#0#7'TButton'#7'Button4'#4'Left'#3#0#1#6'Hei'
-  +'ght'#2#27#3'Top'#3#155#0#5'Width'#2'E'#25'BorderSpacing.InnerBorder'#2#4#7
-  +'Caption'#6#10'Print test'#7'OnClick'#7#12'Button4Click'#8'TabOrder'#2#3#0#0
-  +#7'TButton'#7'Button5'#4'Left'#2#8#6'Height'#2#25#3'Top'#3#132#0#5'Width'#3
-  +#224#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#25'Update printer stat'
-  +'e info'#7'OnClick'#7#12'Button5Click'#8'TabOrder'#2#4#0#0#7'TButton'#7'Butt'
-  +'on6'#4'Left'#2#8#6'Height'#2#25#3'Top'#3#157#0#5'Width'#3#224#0#25'BorderSp'
-  +'acing.InnerBorder'#2#4#7'Caption'#6#23'Show printer properties'#7'OnClick'#7
-  +#12'Button6Click'#8'TabOrder'#2#5#0#0#7'TButton'#7'Button7'#4'Left'#2#8#6'He'
-  +'ight'#2#27#3'Top'#2#24#5'Width'#3'@'#1#25'BorderSpacing.InnerBorder'#2#4#7
-  +'Caption'#6#24'Execute TPageSetupDialog'#7'OnClick'#7#12'Button7Click'#8'Tab'
-  +'Order'#2#6#0#0#19'TPrinterSetupDialog'#3'PSD'#5'Title'#6#20'Testing dialog '
-  +'title'#4'left'#3#176#0#3'top'#3#240#0#0#0#12'TPrintDialog'#2'PD'#5'Title'#6
-  +#13'Testing title'#7'Collate'#9#6'Copies'#2#1#8'FromPage'#2#2#7'MinPage'#2#2
-  +#7'MaxPage'#2#5#7'Options'#11#13'poPrintToFile'#10'poPageNums'#11'poSelectio'
-  +'n'#9'poWarning'#6'poHelp'#0#11'PrintToFile'#9#6'ToPage'#2#3#4'left'#3#176#0
-  +#3'top'#3#16#1#0#0#10'TPopupMenu'#10'PopupMenu1'#4'left'#3#216#0#3'top'#3#240
-  +#0#0#0#16'TPageSetupDialog'#5'PAGED'#5'Title'#6#25'Ustawienie strony raportu'
-  +#4'left'#3#176#0#3'top'#3'0'#1#0#0#0
+  +'aultColWidth'#2'Z'#10'FixedColor'#7#9'clBtnFace'#4'Flat'#9#7'Options'#11#15
+  +'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLine'#13'goRan'
+  +'geSelect'#14'goSmoothScroll'#0#8'RowCount'#2#15#10'ScrollBars'#7#10'ssAutoB'
+  +'oth'#8'TabOrder'#2#7#7'TabStop'#9#0#0#7'TButton'#7'Button3'#4'Left'#2#8#6'H'
+  +'eight'#2#27#3'Top'#2'i'#5'Width'#3'@'#1#25'BorderSpacing.InnerBorder'#2#4#7
+  +'Caption'#6#24'Get default printer info'#7'OnClick'#7#12'Button3Click'#8'Tab'
+  +'Order'#2#2#0#0#7'TButton'#7'Button4'#4'Left'#3#0#1#6'Height'#2#27#3'Top'#3
+  +#155#0#5'Width'#2'E'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#10'Print'
+  +' test'#7'OnClick'#7#12'Button4Click'#8'TabOrder'#2#3#0#0#7'TButton'#7'Butto'
+  +'n5'#4'Left'#2#8#6'Height'#2#25#3'Top'#3#132#0#5'Width'#3#224#0#25'BorderSpa'
+  +'cing.InnerBorder'#2#4#7'Caption'#6#25'Update printer state info'#7'OnClick'
+  +#7#12'Button5Click'#8'TabOrder'#2#4#0#0#7'TButton'#7'Button6'#4'Left'#2#8#6
+  +'Height'#2#25#3'Top'#3#157#0#5'Width'#3#224#0#25'BorderSpacing.InnerBorder'#2
+  +#4#7'Caption'#6#23'Show printer properties'#7'OnClick'#7#12'Button6Click'#8
+  +'TabOrder'#2#5#0#0#7'TButton'#7'Button7'#4'Left'#2#8#6'Height'#2#27#3'Top'#2
+  +#24#5'Width'#3'@'#1#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#24'Execut'
+  +'e TPageSetupDialog'#7'OnClick'#7#12'Button7Click'#8'TabOrder'#2#6#0#0#19'TP'
+  +'rinterSetupDialog'#3'PSD'#5'Title'#6#20'Testing dialog title'#4'left'#3#176
+  +#0#3'top'#3#240#0#0#0#12'TPrintDialog'#2'PD'#5'Title'#6#13'Testing title'#7
+  +'Collate'#9#6'Copies'#2#1#8'FromPage'#2#2#7'MinPage'#2#2#7'MaxPage'#2#5#7'Op'
+  +'tions'#11#13'poPrintToFile'#10'poPageNums'#11'poSelection'#9'poWarning'#6'p'
+  +'oHelp'#0#11'PrintToFile'#9#6'ToPage'#2#3#4'left'#3#176#0#3'top'#3#16#1#0#0
+  +#10'TPopupMenu'#10'PopupMenu1'#4'left'#3#216#0#3'top'#3#240#0#0#0#16'TPageSe'
+  +'tupDialog'#5'PAGED'#5'Title'#6#25'Ustawienie strony raportu'#4'left'#3#176#0
+  +#3'top'#3'0'#1#0#0#0
 ]);
diff --git a/components/projecttemplates/frmtemplatevariables.lfm b/components/projecttemplates/frmtemplatevariables.lfm
index 624f15863a..9718c2bd46 100644
--- a/components/projecttemplates/frmtemplatevariables.lfm
+++ b/components/projecttemplates/frmtemplatevariables.lfm
@@ -55,7 +55,6 @@ object ProjectVariablesForm: TProjectVariablesForm
     ColCount = 3
     DefaultColWidth = 120
     FixedColor = clBtnFace
-    GridLineWidth = 0
     Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goColSizing, goEditing, goAlwaysShowEditor, goDblClickAutoSize, goSmoothScroll]
     RowCount = 5
     ScrollBars = ssAutoBoth
diff --git a/components/projecttemplates/frmtemplatevariables.lrs b/components/projecttemplates/frmtemplatevariables.lrs
index dd3e8601d3..f64ec30faf 100644
--- a/components/projecttemplates/frmtemplatevariables.lrs
+++ b/components/projecttemplates/frmtemplatevariables.lrs
@@ -19,20 +19,19 @@ LazarusResources.Add('TProjectVariablesForm','FORMDATA',[
   +'id'#11'SGVariables'#4'Left'#2#10#6'Height'#3#140#0#3'Top'#3#144#0#5'Width'#3
   +#227#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#15'AutoFill'
   +'Columns'#9#8'ColCount'#2#3#15'DefaultColWidth'#2'x'#10'FixedColor'#7#9'clBt'
-  +'nFace'#13'GridLineWidth'#2#0#7'Options'#11#15'goFixedVertLine'#15'goFixedHo'
-  +'rzLine'#10'goVertLine'#10'goHorzLine'#13'goRangeSelect'#11'goColSizing'#9'g'
-  +'oEditing'#18'goAlwaysShowEditor'#18'goDblClickAutoSize'#14'goSmoothScroll'#0
-  +#8'RowCount'#2#5#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#5#7'TabStop'#9
-  +#0#0#7'TButton'#3'BOK'#4'Left'#3#155#1#6'Height'#2#25#3'Top'#3'$'#1#5'Width'
-  +#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2
-  +#4#7'Caption'#6#3'&OK'#7'Default'#9#11'ModalResult'#2#1#7'OnClick'#7#8'BOKCl'
-  +'ick'#8'TabOrder'#2#1#0#0#7'TButton'#7'BCancel'#4'Left'#3'C'#1#6'Height'#2#25
-  +#3'Top'#3'$'#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#25'Borde'
-  +'rSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#7'&Cancel'#11'ModalResul'
-  +'t'#2#2#8'TabOrder'#2#2#0#0#5'TEdit'#12'EProjectName'#4'Left'#3#152#0#6'Heig'
-  +'ht'#2#23#3'Top'#2#16#5'Width'#3#237#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
-  +'Right'#0#8'TabOrder'#2#3#0#0#14'TDirectoryEdit'#9'DEProject'#4'Left'#3#152#0
-  +#6'Height'#2#23#3'Top'#2'0'#5'Width'#3'='#1#11'ButtonWidth'#2#23#9'NumGlyphs'
-  +#2#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#11'ParentColor'#8#8'TabOr'
-  +'der'#2#4#0#0#0
+  +'nFace'#7'Options'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'
+  +#10'goHorzLine'#13'goRangeSelect'#11'goColSizing'#9'goEditing'#18'goAlwaysSh'
+  +'owEditor'#18'goDblClickAutoSize'#14'goSmoothScroll'#0#8'RowCount'#2#5#10'Sc'
+  +'rollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#5#7'TabStop'#9#0#0#7'TButton'#3'BO'
+  +'K'#4'Left'#3#155#1#6'Height'#2#25#3'Top'#3'$'#1#5'Width'#2'K'#7'Anchors'#11
+  +#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'&'
+  +'OK'#7'Default'#9#11'ModalResult'#2#1#7'OnClick'#7#8'BOKClick'#8'TabOrder'#2
+  +#1#0#0#7'TButton'#7'BCancel'#4'Left'#3'C'#1#6'Height'#2#25#3'Top'#3'$'#1#5'W'
+  +'idth'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#25'BorderSpacing.InnerBor'
+  +'der'#2#4#6'Cancel'#9#7'Caption'#6#7'&Cancel'#11'ModalResult'#2#2#8'TabOrder'
+  +#2#2#0#0#5'TEdit'#12'EProjectName'#4'Left'#3#152#0#6'Height'#2#23#3'Top'#2#16
+  +#5'Width'#3#237#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2
+  +#3#0#0#14'TDirectoryEdit'#9'DEProject'#4'Left'#3#152#0#6'Height'#2#23#3'Top'
+  +#2'0'#5'Width'#3'='#1#11'ButtonWidth'#2#23#9'NumGlyphs'#2#1#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#11'ParentColor'#8#8'TabOrder'#2#4#0#0#0
 ]);
diff --git a/doceditor/frmbuild.lfm b/doceditor/frmbuild.lfm
index 9fe5ee841b..7082ad133b 100644
--- a/doceditor/frmbuild.lfm
+++ b/doceditor/frmbuild.lfm
@@ -1,220 +1,215 @@
 object BuildForm: TBuildForm
-  Caption = 'Build documentation'
-  ClientHeight = 337
-  ClientWidth = 477
-  OnCloseQuery = BuildFormCloseQuery
-  OnCreate = BuildFormCreate
-  PixelsPerInch = 75
-  HorzScrollBar.Page = 476
-  VertScrollBar.Page = 336
   Left = 303
   Height = 337
   Top = 145
   Width = 477
+  HorzScrollBar.Page = 476
+  VertScrollBar.Page = 336
+  Caption = 'Build documentation'
+  OnCloseQuery = BuildFormCloseQuery
+  OnCreate = BuildFormCreate
   object LCBPackage: TLabel
+    Left = 7
+    Height = 13
+    Top = 12
+    Width = 59
     Caption = '&Package'
     FocusControl = CBPackage
     Layout = tlCenter
-    ParentColor = True
-    Left = 7
-    Height = 12
-    Top = 12
-    Width = 58
+    Transparent = False
   end
   object LCBFormat: TLabel
+    Left = 7
+    Height = 13
+    Top = 40
+    Width = 48
     Caption = '&Format'
     FocusControl = CBFormat
     Layout = tlCenter
-    ParentColor = True
-    Left = 7
-    Height = 12
-    Top = 40
-    Width = 47
+    Transparent = False
   end
   object Label1: TLabel
+    Left = 8
+    Height = 13
+    Top = 75
+    Width = 47
     Caption = '&Output'
     Layout = tlCenter
-    ParentColor = True
-    Left = 8
-    Height = 12
-    Top = 75
-    Width = 46
+    Transparent = False
   end
   object CBPackage: TComboBox
-    MaxLength = 0
-    TabOrder = 0
     Left = 112
     Height = 25
     Top = 8
     Width = 100
+    AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+    MaxLength = 0
+    TabOrder = 0
   end
   object BClose: TButton
-    Anchors = [akTop, akRight]
-    Caption = '&Close'
-    OnClick = BCloseClick
-    TabOrder = 1
     Left = 397
     Height = 25
     Top = 104
     Width = 75
+    Anchors = [akTop, akRight]
+    BorderSpacing.InnerBorder = 4
+    Caption = '&Close'
+    OnClick = BCloseClick
+    TabOrder = 1
   end
   object BBuild: TButton
-    Action = ABuild
-    Anchors = [akTop, akRight]
-    TabOrder = 2
     Left = 397
     Height = 25
     Top = 8
     Width = 75
+    Action = ABuild
+    Anchors = [akTop, akRight]
+    BorderSpacing.InnerBorder = 4
+    TabOrder = 2
   end
   object BLoad: TButton
-    Action = ALoad
-    Anchors = [akTop, akRight]
-    TabOrder = 3
     Left = 397
     Height = 25
     Top = 40
     Width = 75
+    Action = ALoad
+    Anchors = [akTop, akRight]
+    BorderSpacing.InnerBorder = 4
+    TabOrder = 3
   end
   object BSave: TButton
-    Action = ASave
-    Anchors = [akTop, akRight]
-    TabOrder = 4
     Left = 397
     Height = 25
     Top = 72
     Width = 75
+    Action = ASave
+    Anchors = [akTop, akRight]
+    BorderSpacing.InnerBorder = 4
+    TabOrder = 4
   end
   object CBFormat: TComboBox
+    Left = 112
+    Height = 25
+    Top = 39
+    Width = 100
+    AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
+    ItemIndex = 0
     Items.Strings = (
       'html'
       'latex'
       'man'
       'txt'
     )
-    ItemIndex = 0
     MaxLength = 0
     Style = csDropDownList
     TabOrder = 5
     Text = 'html'
-    Left = 112
-    Height = 25
-    Top = 39
-    Width = 100
   end
   object PCOptions: TPageControl
-    ActivePage = TSDescription
-    Align = alBottom
-    TabIndex = 0
-    TabOrder = 6
     Height = 200
     Top = 137
     Width = 477
+    ActivePage = TSSources
+    Align = alBottom
+    TabIndex = 1
+    TabOrder = 6
     object TSDescription: TTabSheet
       Caption = 'Description'
-      ClientHeight = 170
-      ClientWidth = 473
-      Left = 2
-      Height = 170
-      Top = 28
-      Width = 473
       object PBDescr: TPanel
-        Align = alRight
-        BevelOuter = bvNone
-        ClientHeight = 170
-        ClientWidth = 92
-        FullRepaint = False
-        TabOrder = 0
         Left = 381
         Height = 170
         Width = 92
+        Align = alRight
+        BevelOuter = bvNone
+        FullRepaint = False
+        TabOrder = 0
         object BAddDescription: TButton
-          Action = ADescrAdd
-          TabOrder = 0
           Left = 10
           Height = 25
           Top = 6
           Width = 75
+          Action = ADescrAdd
+          BorderSpacing.InnerBorder = 4
+          TabOrder = 0
         end
         object BDeleteDescription: TButton
-          Action = ADescrDelete
-          TabOrder = 1
           Left = 10
           Height = 25
           Top = 38
           Width = 75
+          Action = ADescrDelete
+          BorderSpacing.InnerBorder = 4
+          TabOrder = 1
         end
         object BEditDescription: TButton
-          Action = ADescrEdit
-          TabOrder = 2
           Left = 10
           Height = 25
           Top = 70
           Width = 75
+          Action = ADescrEdit
+          BorderSpacing.InnerBorder = 4
+          TabOrder = 2
         end
         object BAddAll: TButton
-          Action = ADescrAddAll
-          BorderSpacing.OnChange = nil
-          TabOrder = 3
           Left = 10
           Height = 25
           Top = 100
           Width = 75
+          Action = ADescrAddAll
+          BorderSpacing.InnerBorder = 4
+          TabOrder = 3
         end
       end
       object LBDescrFiles: TListBox
+        Height = 170
+        Width = 381
         Align = alClient
         ClickOnSelChange = False
         TabOrder = 1
         TopIndex = -1
-        Height = 170
-        Width = 381
       end
     end
     object TSSources: TTabSheet
       Caption = 'Sources'
-      ClientHeight = 170
-      ClientWidth = 473
-      Left = 2
-      Height = 170
-      Top = 28
-      Width = 473
       object PSources: TPanel
-        Align = alRight
-        BevelOuter = bvNone
-        ClientHeight = 170
-        ClientWidth = 92
-        FullRepaint = False
-        TabOrder = 0
         Left = 381
         Height = 170
         Width = 92
+        Align = alRight
+        BevelOuter = bvNone
+        FullRepaint = False
+        TabOrder = 0
         object BSourceAdd: TButton
-          Action = ASourceAdd
-          TabOrder = 0
           Left = 12
           Height = 25
           Top = 6
           Width = 75
+          Action = ASourceAdd
+          BorderSpacing.InnerBorder = 4
+          TabOrder = 0
         end
         object BSourceDelete: TButton
-          Action = ASourceDelete
-          TabOrder = 1
           Left = 12
           Height = 25
           Top = 38
           Width = 75
+          Action = ASourceDelete
+          BorderSpacing.InnerBorder = 4
+          TabOrder = 1
         end
         object BSourceEdit: TButton
-          Action = ASourceEdit
-          TabOrder = 2
           Left = 12
           Height = 25
           Top = 70
           Width = 75
+          Action = ASourceEdit
+          BorderSpacing.InnerBorder = 4
+          TabOrder = 2
         end
       end
       object SGSources: TStringGrid
+        Height = 170
+        Width = 381
         Align = alClient
         Color = clWhite
         ColCount = 2
@@ -222,12 +217,11 @@ object BuildForm: TBuildForm
         DefaultRowHeight = 24
         FixedColor = clBtnFace
         FixedCols = 0
-        GridLineWidth = 0
         Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goColSizing, goSmoothScroll]
         RowCount = 2
         ScrollBars = ssAutoBoth
-        Height = 170
-        Width = 381
+        TabOrder = 1
+        TabStop = True
         ColWidths = (
           242
           119
@@ -245,159 +239,142 @@ object BuildForm: TBuildForm
     end
     object TSOther: TTabSheet
       Caption = 'Other options'
-      ClientHeight = 170
-      ClientWidth = 473
-      Left = 2
-      Height = 170
-      Top = 28
-      Width = 473
       object Label2: TLabel
-        Alignment = taRightJustify
-        Caption = 'Import content file'
-        Color = clNone
-        Layout = tlCenter
         Left = -2
         Height = 23
         Top = 106
         Width = 113
-      end
-      object Label3: TLabel
         Alignment = taRightJustify
-        Caption = 'Target OS'
+        Caption = 'Import content file'
         Color = clNone
         Layout = tlCenter
+        ParentColor = False
+      end
+      object Label3: TLabel
         Left = 46
         Height = 23
         Top = 137
         Width = 65
-      end
-      object LTargetCPU: TLabel
         Alignment = taRightJustify
-        Caption = 'CPU'
+        Caption = 'Target OS'
         Color = clNone
         Layout = tlCenter
+        ParentColor = False
+      end
+      object LTargetCPU: TLabel
         Left = 198
         Height = 23
         Top = 137
         Width = 40
+        Alignment = taRightJustify
+        Caption = 'CPU'
+        Color = clNone
+        Layout = tlCenter
+        ParentColor = False
       end
       object CBShowPrivate: TCheckBox
-        BorderSpacing.OnChange = nil
-        Caption = 'Show p&rivate methods'
-        TabOrder = 0
         Left = 14
         Height = 23
         Top = 35
         Width = 141
+        Caption = 'Show p&rivate methods'
+        TabOrder = 0
       end
       object CBHideProtected: TCheckBox
-        BorderSpacing.OnChange = nil
-        Caption = '&Hide protected methods'
-        TabOrder = 1
         Left = 14
         Height = 23
         Top = 11
         Width = 172
+        Caption = '&Hide protected methods'
+        TabOrder = 1
       end
       object CBWarnNoNode: TCheckBox
-        Caption = 'Warn if no documentation node found'
-        TabOrder = 2
         Left = 14
         Height = 23
         Top = 59
         Width = 232
+        Caption = 'Warn if no documentation node found'
+        TabOrder = 2
       end
       object FEImportFIle: TFileNameEdit
-        ButtonWidth = 23
-        NumGlyphs = 1
-        Anchors = [akTop, akLeft, akRight]
-        TabOrder = 3
-        Anchors = [akTop, akLeft, akRight]
-        TabOrder = 3
         Left = 118
         Height = 23
         Top = 106
         Width = 318
+        ButtonWidth = 23
+        NumGlyphs = 1
+        Anchors = [akTop, akLeft, akRight]
+        ParentColor = False
+        TabOrder = 3
       end
       object ETargetOS: TEdit
-        TabOrder = 4
         Left = 118
         Height = 23
         Top = 137
         Width = 80
+        TabOrder = 4
       end
       object ETargetCPU: TEdit
-        TabOrder = 5
         Left = 246
         Height = 23
         Top = 137
         Width = 80
+        TabOrder = 5
       end
     end
     object TSBuild: TTabSheet
       Caption = 'Build output'
-      ClientHeight = 170
-      ClientWidth = 473
-      Left = 2
-      Height = 170
-      Top = 28
-      Width = 473
       object MLog: TMemo
-        Align = alClient
-        BorderSpacing.OnChange = nil
-        TabOrder = 0
         Height = 170
         Width = 473
+        Align = alClient
+        TabOrder = 0
       end
     end
   end
   object EOutput: TEditButton
-    Anchors = [akTop, akLeft, akRight]
-    ButtonWidth = 23
-    OnButtonClick = EOutputButtonClick
-    TabOrder = 7
-    Anchors = [akTop, akLeft, akRight]
-    TabOrder = 7
     Left = 112
     Height = 23
     Top = 72
     Width = 239
+    Anchors = [akTop, akLeft, akRight]
+    ButtonWidth = 23
+    OnButtonClick = EOutputButtonClick
+    ParentColor = False
+    TabOrder = 7
   end
   object CBContent: TCheckBox
+    Left = 112
+    Height = 22
+    Top = 101
+    Width = 126
     Caption = 'Create cont&ent file'
     TabOrder = 8
-    Left = 112
-    Height = 23
-    Top = 101
-    Width = 170
   end
   object ODSettings: TOpenDialog
-    Options = [ofFileMustExist, ofEnableSizing, ofViewDetail]
     Title = 'Open existing file'
     DefaultExt = '.ldp'
     Filter = 'Documentation project files|*.ldp|All files|*.*'
     FilterIndex = 0
-    Title = 'Open existing file'
+    Options = [ofFileMustExist, ofEnableSizing, ofViewDetail]
     left = 8
     top = 286
   end
   object SDSettings: TSaveDialog
-    Options = [ofPathMustExist, ofEnableSizing, ofViewDetail]
     Title = 'Save file as'
     DefaultExt = '.ldp'
     Filter = 'Documentation project files|*.ldp|All files|*.*'
     FilterIndex = 0
-    Title = 'Save file as'
+    Options = [ofPathMustExist, ofEnableSizing, ofViewDetail]
     left = 8
     top = 248
   end
   object ODDescription: TOpenDialog
-    Options = [ofFileMustExist, ofEnableSizing, ofViewDetail]
     Title = 'Open existing file'
     DefaultExt = '.xml'
     Filter = 'XML files|*.xml|All files|*.*'
     FilterIndex = 0
-    Title = 'Open existing file'
+    Options = [ofFileMustExist, ofEnableSizing, ofViewDetail]
     left = 296
     top = 360
   end
@@ -406,48 +383,58 @@ object BuildForm: TBuildForm
     top = 51
     object ADescrAdd: TAction
       Caption = '&Add'
+      DisableIfNoHandler = True
       OnExecute = ADescrAddExecute
     end
     object ADescrEdit: TAction
       Caption = '&Edit'
+      DisableIfNoHandler = True
       OnExecute = ADescrEditExecute
       OnUpdate = ADescrEditUpdate
     end
     object ADescrDelete: TAction
       Caption = '&Delete'
+      DisableIfNoHandler = True
       OnExecute = ADescrDeleteExecute
       OnUpdate = ADescrDeleteUpdate
     end
     object ABuild: TAction
       Caption = '&Build'
+      DisableIfNoHandler = True
       OnExecute = ABuildExecute
       OnUpdate = ABuildUpdate
     end
     object ASourceAdd: TAction
       Caption = '&Add'
+      DisableIfNoHandler = True
       OnExecute = ASourceAddExecute
     end
     object ASourceEdit: TAction
       Caption = '&Edit'
+      DisableIfNoHandler = True
       OnExecute = ASourceEditExecute
       OnUpdate = ASourceEditUpdate
     end
     object ASourceDelete: TAction
       Caption = '&Delete'
+      DisableIfNoHandler = True
       OnExecute = ASourceDeleteExecute
       OnUpdate = ASourceDeleteUpdate
     end
     object ADescrAddAll: TAction
       Caption = 'Add All'
+      DisableIfNoHandler = True
       OnExecute = ADescrAddAllExecute
       OnUpdate = ADescrAddAllUpdate
     end
     object ALoad: TAction
       Caption = '&Load'
+      DisableIfNoHandler = True
       OnExecute = ALoadExecute
     end
     object ASave: TAction
       Caption = '&Save'
+      DisableIfNoHandler = True
       OnExecute = ASaveExecute
     end
   end
diff --git a/doceditor/frmbuild.lrs b/doceditor/frmbuild.lrs
index 40ac5c1009..4c6da0b8e9 100644
--- a/doceditor/frmbuild.lrs
+++ b/doceditor/frmbuild.lrs
@@ -1,120 +1,121 @@
+{ This is an automatically generated lazarus resource file }
+
 LazarusResources.Add('TBuildForm','FORMDATA',[
-  'TPF0'#10'TBuildForm'#9'BuildForm'#7'Caption'#6#19'Build documentation'#12'Cl'
-  +'ientHeight'#3'Q'#1#11'ClientWidth'#3#221#1#12'OnCloseQuery'#7#19'BuildFormC'
-  +'loseQuery'#8'OnCreate'#7#15'BuildFormCreate'#13'PixelsPerInch'#2'K'#18'Horz'
-  +'ScrollBar.Page'#3#220#1#18'VertScrollBar.Page'#3'P'#1#4'Left'#3'/'#1#6'Heig'
-  +'ht'#3'Q'#1#3'Top'#3#145#0#5'Width'#3#221#1#0#6'TLabel'#10'LCBPackage'#7'Cap'
-  +'tion'#6#8'&Package'#12'FocusControl'#7#9'CBPackage'#6'Layout'#7#8'tlCenter'
-  +#11'ParentColor'#9#4'Left'#2#7#6'Height'#2#12#3'Top'#2#12#5'Width'#2':'#0#0#6
-  +'TLabel'#9'LCBFormat'#7'Caption'#6#7'&Format'#12'FocusControl'#7#8'CBFormat'
-  +#6'Layout'#7#8'tlCenter'#11'ParentColor'#9#4'Left'#2#7#6'Height'#2#12#3'Top'
-  +#2'('#5'Width'#2'/'#0#0#6'TLabel'#6'Label1'#7'Caption'#6#7'&Output'#6'Layout'
-  +#7#8'tlCenter'#11'ParentColor'#9#4'Left'#2#8#6'Height'#2#12#3'Top'#2'K'#5'Wi'
-  +'dth'#2'.'#0#0#9'TComboBox'#9'CBPackage'#9'MaxLength'#2#0#8'TabOrder'#2#0#4
-  +'Left'#2'p'#6'Height'#2#25#3'Top'#2#8#5'Width'#2'd'#0#0#7'TButton'#6'BClose'
-  +#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#6'&Close'#7'OnClick'#7#11
-  +'BCloseClick'#8'TabOrder'#2#1#4'Left'#3#141#1#6'Height'#2#25#3'Top'#2'h'#5'W'
-  +'idth'#2'K'#0#0#7'TButton'#6'BBuild'#6'Action'#7#6'ABuild'#7'Anchors'#11#5'a'
-  +'kTop'#7'akRight'#0#8'TabOrder'#2#2#4'Left'#3#141#1#6'Height'#2#25#3'Top'#2#8
-  +#5'Width'#2'K'#0#0#7'TButton'#5'BLoad'#6'Action'#7#5'ALoad'#7'Anchors'#11#5
-  +'akTop'#7'akRight'#0#8'TabOrder'#2#3#4'Left'#3#141#1#6'Height'#2#25#3'Top'#2
-  +'('#5'Width'#2'K'#0#0#7'TButton'#5'BSave'#6'Action'#7#5'ASave'#7'Anchors'#11
-  +#5'akTop'#7'akRight'#0#8'TabOrder'#2#4#4'Left'#3#141#1#6'Height'#2#25#3'Top'
-  +#2'H'#5'Width'#2'K'#0#0#9'TComboBox'#8'CBFormat'#13'Items.Strings'#1#6#4'htm'
-  +'l'#6#5'latex'#6#3'man'#6#3'txt'#0#9'ItemIndex'#2#0#9'MaxLength'#2#0#5'Style'
-  +#7#14'csDropDownList'#8'TabOrder'#2#5#4'Text'#6#4'html'#4'Left'#2'p'#6'Heigh'
-  +'t'#2#25#3'Top'#2''''#5'Width'#2'd'#0#0#12'TPageControl'#9'PCOptions'#10'Act'
-  +'ivePage'#7#13'TSDescription'#5'Align'#7#8'alBottom'#8'TabIndex'#2#0#8'TabOr'
-  +'der'#2#6#6'Height'#3#200#0#3'Top'#3#137#0#5'Width'#3#221#1#0#9'TTabSheet'#13
-  +'TSDescription'#7'Caption'#6#11'Description'#12'ClientHeight'#3#170#0#11'Cli'
-  +'entWidth'#3#217#1#4'Left'#2#2#6'Height'#3#170#0#3'Top'#2#28#5'Width'#3#217#1
-  +#0#6'TPanel'#7'PBDescr'#5'Align'#7#7'alRight'#10'BevelOuter'#7#6'bvNone'#12
-  +'ClientHeight'#3#170#0#11'ClientWidth'#2'\'#11'FullRepaint'#8#8'TabOrder'#2#0
-  +#4'Left'#3'}'#1#6'Height'#3#170#0#5'Width'#2'\'#0#7'TButton'#15'BAddDescript'
-  +'ion'#6'Action'#7#9'ADescrAdd'#8'TabOrder'#2#0#4'Left'#2#10#6'Height'#2#25#3
-  +'Top'#2#6#5'Width'#2'K'#0#0#7'TButton'#18'BDeleteDescription'#6'Action'#7#12
-  +'ADescrDelete'#8'TabOrder'#2#1#4'Left'#2#10#6'Height'#2#25#3'Top'#2'&'#5'Wid'
-  +'th'#2'K'#0#0#7'TButton'#16'BEditDescription'#6'Action'#7#10'ADescrEdit'#8'T'
-  +'abOrder'#2#2#4'Left'#2#10#6'Height'#2#25#3'Top'#2'F'#5'Width'#2'K'#0#0#7'TB'
-  +'utton'#7'BAddAll'#6'Action'#7#12'ADescrAddAll'#22'BorderSpacing.OnChange'#13
-  +#8'TabOrder'#2#3#4'Left'#2#10#6'Height'#2#25#3'Top'#2'd'#5'Width'#2'K'#0#0#0
-  +#8'TListBox'#12'LBDescrFiles'#5'Align'#7#8'alClient'#16'ClickOnSelChange'#8#8
-  +'TabOrder'#2#1#8'TopIndex'#2#255#6'Height'#3#170#0#5'Width'#3'}'#1#0#0#0#9'T'
-  +'TabSheet'#9'TSSources'#7'Caption'#6#7'Sources'#12'ClientHeight'#3#170#0#11
-  +'ClientWidth'#3#217#1#4'Left'#2#2#6'Height'#3#170#0#3'Top'#2#28#5'Width'#3
-  +#217#1#0#6'TPanel'#8'PSources'#5'Align'#7#7'alRight'#10'BevelOuter'#7#6'bvNo'
-  +'ne'#12'ClientHeight'#3#170#0#11'ClientWidth'#2'\'#11'FullRepaint'#8#8'TabOr'
-  +'der'#2#0#4'Left'#3'}'#1#6'Height'#3#170#0#5'Width'#2'\'#0#7'TButton'#10'BSo'
-  +'urceAdd'#6'Action'#7#10'ASourceAdd'#8'TabOrder'#2#0#4'Left'#2#12#6'Height'#2
-  +#25#3'Top'#2#6#5'Width'#2'K'#0#0#7'TButton'#13'BSourceDelete'#6'Action'#7#13
-  +'ASourceDelete'#8'TabOrder'#2#1#4'Left'#2#12#6'Height'#2#25#3'Top'#2'&'#5'Wi'
-  +'dth'#2'K'#0#0#7'TButton'#11'BSourceEdit'#6'Action'#7#11'ASourceEdit'#8'TabO'
-  +'rder'#2#2#4'Left'#2#12#6'Height'#2#25#3'Top'#2'F'#5'Width'#2'K'#0#0#0#11'TS'
-  +'tringGrid'#9'SGSources'#5'Align'#7#8'alClient'#5'Color'#7#7'clWhite'#8'ColC'
-  +'ount'#2#2#15'DefaultColWidth'#3#150#0#16'DefaultRowHeight'#2#24#10'FixedCol'
-  +'or'#7#9'clBtnFace'#9'FixedCols'#2#0#13'GridLineWidth'#2#0#7'Options'#11#15
-  +'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLine'#13'goRan'
-  +'geSelect'#11'goColSizing'#14'goSmoothScroll'#0#8'RowCount'#2#2#10'ScrollBar'
-  +'s'#7#10'ssAutoBoth'#6'Height'#3#170#0#5'Width'#3'}'#1#9'ColWidths'#1#3#242#0
-  +#2'w'#0#5'Cells'#1#2#2#2#0#2#0#6#8'Filename'#2#1#2#0#6#13'Other options'#0#0
-  +#0#0#9'TTabSheet'#7'TSOther'#7'Caption'#6#13'Other options'#12'ClientHeight'
-  +#3#170#0#11'ClientWidth'#3#217#1#4'Left'#2#2#6'Height'#3#170#0#3'Top'#2#28#5
-  +'Width'#3#217#1#0#6'TLabel'#6'Label2'#9'Alignment'#7#14'taRightJustify'#7'Ca'
-  +'ption'#6#19'Import content file'#5'Color'#7#6'clNone'#6'Layout'#7#8'tlCente'
-  +'r'#4'Left'#2#254#6'Height'#2#23#3'Top'#2'j'#5'Width'#2'q'#0#0#6'TLabel'#6'L'
-  +'abel3'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#9'Target OS'#5'Color'
-  ,#7#6'clNone'#6'Layout'#7#8'tlCenter'#4'Left'#2'.'#6'Height'#2#23#3'Top'#3#137
-  +#0#5'Width'#2'A'#0#0#6'TLabel'#10'LTargetCPU'#9'Alignment'#7#14'taRightJusti'
-  +'fy'#7'Caption'#6#3'CPU'#5'Color'#7#6'clNone'#6'Layout'#7#8'tlCenter'#4'Left'
-  +#3#198#0#6'Height'#2#23#3'Top'#3#137#0#5'Width'#2'('#0#0#9'TCheckBox'#13'CBS'
-  +'howPrivate'#22'BorderSpacing.OnChange'#13#7'Caption'#6#21'Show p&rivate met'
-  +'hods'#8'TabOrder'#2#0#4'Left'#2#14#6'Height'#2#23#3'Top'#2'#'#5'Width'#3#141
-  +#0#0#0#9'TCheckBox'#15'CBHideProtected'#22'BorderSpacing.OnChange'#13#7'Capt'
-  +'ion'#6#23'&Hide protected methods'#8'TabOrder'#2#1#4'Left'#2#14#6'Height'#2
-  +#23#3'Top'#2#11#5'Width'#3#172#0#0#0#9'TCheckBox'#12'CBWarnNoNode'#7'Caption'
-  +#6'#Warn if no documentation node found'#8'TabOrder'#2#2#4'Left'#2#14#6'Heig'
-  +'ht'#2#23#3'Top'#2';'#5'Width'#3#232#0#0#0#13'TFileNameEdit'#12'FEImportFIle'
-  +#11'ButtonWidth'#2#23#9'NumGlyphs'#2#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
-  +'Right'#0#8'TabOrder'#2#3#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'Ta'
-  +'bOrder'#2#3#4'Left'#2'v'#6'Height'#2#23#3'Top'#2'j'#5'Width'#3'>'#1#0#0#5'T'
-  +'Edit'#9'ETargetOS'#8'TabOrder'#2#4#4'Left'#2'v'#6'Height'#2#23#3'Top'#3#137
-  +#0#5'Width'#2'P'#0#0#5'TEdit'#10'ETargetCPU'#8'TabOrder'#2#5#4'Left'#3#246#0
-  +#6'Height'#2#23#3'Top'#3#137#0#5'Width'#2'P'#0#0#0#9'TTabSheet'#7'TSBuild'#7
-  +'Caption'#6#12'Build output'#12'ClientHeight'#3#170#0#11'ClientWidth'#3#217#1
-  +#4'Left'#2#2#6'Height'#3#170#0#3'Top'#2#28#5'Width'#3#217#1#0#5'TMemo'#4'MLo'
-  +'g'#5'Align'#7#8'alClient'#22'BorderSpacing.OnChange'#13#8'TabOrder'#2#0#6'H'
-  +'eight'#3#170#0#5'Width'#3#217#1#0#0#0#0#11'TEditButton'#7'EOutput'#7'Anchor'
-  +'s'#11#5'akTop'#6'akLeft'#7'akRight'#0#11'ButtonWidth'#2#23#13'OnButtonClick'
-  +#7#18'EOutputButtonClick'#8'TabOrder'#2#7#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#8'TabOrder'#2#7#4'Left'#2'p'#6'Height'#2#23#3'Top'#2'H'#5'Width'
-  +#3#239#0#0#0#9'TCheckBox'#9'CBContent'#7'Caption'#6#20'Create cont&ent file'
-  +#8'TabOrder'#2#8#4'Left'#2'p'#6'Height'#2#23#3'Top'#2'e'#5'Width'#3#170#0#0#0
-  +#11'TOpenDialog'#10'ODSettings'#7'Options'#11#15'ofFileMustExist'#14'ofEnabl'
-  +'eSizing'#12'ofViewDetail'#0#5'Title'#6#18'Open existing file'#10'DefaultExt'
-  +#6#4'.ldp'#6'Filter'#6'/Documentation project files|*.ldp|All files|*.*'#11
-  +'FilterIndex'#2#0#5'Title'#6#18'Open existing file'#4'left'#2#8#3'top'#3#30#1
-  +#0#0#11'TSaveDialog'#10'SDSettings'#7'Options'#11#15'ofPathMustExist'#14'ofE'
-  +'nableSizing'#12'ofViewDetail'#0#5'Title'#6#12'Save file as'#10'DefaultExt'#6
-  +#4'.ldp'#6'Filter'#6'/Documentation project files|*.ldp|All files|*.*'#11'Fi'
-  +'lterIndex'#2#0#5'Title'#6#12'Save file as'#4'left'#2#8#3'top'#3#248#0#0#0#11
-  +'TOpenDialog'#13'ODDescription'#7'Options'#11#15'ofFileMustExist'#14'ofEnabl'
-  +'eSizing'#12'ofViewDetail'#0#5'Title'#6#18'Open existing file'#10'DefaultExt'
-  +#6#4'.xml'#6'Filter'#6#29'XML files|*.xml|All files|*.*'#11'FilterIndex'#2#0
-  +#5'Title'#6#18'Open existing file'#4'left'#3'('#1#3'top'#3'h'#1#0#0#11'TActi'
-  +'onList'#11'ActionList1'#4'left'#2'i'#3'top'#2'3'#0#7'TAction'#9'ADescrAdd'#7
-  +'Caption'#6#4'&Add'#9'OnExecute'#7#16'ADescrAddExecute'#0#0#7'TAction'#10'AD'
-  +'escrEdit'#7'Caption'#6#5'&Edit'#9'OnExecute'#7#17'ADescrEditExecute'#8'OnUp'
-  +'date'#7#16'ADescrEditUpdate'#0#0#7'TAction'#12'ADescrDelete'#7'Caption'#6#7
-  +'&Delete'#9'OnExecute'#7#19'ADescrDeleteExecute'#8'OnUpdate'#7#18'ADescrDele'
-  +'teUpdate'#0#0#7'TAction'#6'ABuild'#7'Caption'#6#6'&Build'#9'OnExecute'#7#13
-  +'ABuildExecute'#8'OnUpdate'#7#12'ABuildUpdate'#0#0#7'TAction'#10'ASourceAdd'
-  +#7'Caption'#6#4'&Add'#9'OnExecute'#7#17'ASourceAddExecute'#0#0#7'TAction'#11
-  +'ASourceEdit'#7'Caption'#6#5'&Edit'#9'OnExecute'#7#18'ASourceEditExecute'#8
-  +'OnUpdate'#7#17'ASourceEditUpdate'#0#0#7'TAction'#13'ASourceDelete'#7'Captio'
-  +'n'#6#7'&Delete'#9'OnExecute'#7#20'ASourceDeleteExecute'#8'OnUpdate'#7#19'AS'
-  +'ourceDeleteUpdate'#0#0#7'TAction'#12'ADescrAddAll'#7'Caption'#6#7'Add All'#9
-  +'OnExecute'#7#19'ADescrAddAllExecute'#8'OnUpdate'#7#18'ADescrAddAllUpdate'#0
-  +#0#7'TAction'#5'ALoad'#7'Caption'#6#5'&Load'#9'OnExecute'#7#12'ALoadExecute'
-  +#0#0#7'TAction'#5'ASave'#7'Caption'#6#5'&Save'#9'OnExecute'#7#12'ASaveExecut'
-  +'e'#0#0#0#0
+  'TPF0'#10'TBuildForm'#9'BuildForm'#4'Left'#3'/'#1#6'Height'#3'Q'#1#3'Top'#3
+  +#145#0#5'Width'#3#221#1#18'HorzScrollBar.Page'#3#220#1#18'VertScrollBar.Page'
+  +#3'P'#1#7'Caption'#6#19'Build documentation'#12'OnCloseQuery'#7#19'BuildForm'
+  +'CloseQuery'#8'OnCreate'#7#15'BuildFormCreate'#0#6'TLabel'#10'LCBPackage'#4
+  +'Left'#2#7#6'Height'#2#13#3'Top'#2#12#5'Width'#2';'#7'Caption'#6#8'&Package'
+  +#12'FocusControl'#7#9'CBPackage'#6'Layout'#7#8'tlCenter'#11'Transparent'#8#0
+  +#0#6'TLabel'#9'LCBFormat'#4'Left'#2#7#6'Height'#2#13#3'Top'#2'('#5'Width'#2
+  +'0'#7'Caption'#6#7'&Format'#12'FocusControl'#7#8'CBFormat'#6'Layout'#7#8'tlC'
+  +'enter'#11'Transparent'#8#0#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'Height'#2#13
+  +#3'Top'#2'K'#5'Width'#2'/'#7'Caption'#6#7'&Output'#6'Layout'#7#8'tlCenter'#11
+  +'Transparent'#8#0#0#9'TComboBox'#9'CBPackage'#4'Left'#2'p'#6'Height'#2#25#3
+  +'Top'#2#8#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20
+  +'cbactSearchAscending'#0#9'MaxLength'#2#0#8'TabOrder'#2#0#0#0#7'TButton'#6'B'
+  +'Close'#4'Left'#3#141#1#6'Height'#2#25#3'Top'#2'h'#5'Width'#2'K'#7'Anchors'
+  +#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#6'&'
+  +'Close'#7'OnClick'#7#11'BCloseClick'#8'TabOrder'#2#1#0#0#7'TButton'#6'BBuild'
+  +#4'Left'#3#141#1#6'Height'#2#25#3'Top'#2#8#5'Width'#2'K'#6'Action'#7#6'ABuil'
+  +'d'#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#8
+  +'TabOrder'#2#2#0#0#7'TButton'#5'BLoad'#4'Left'#3#141#1#6'Height'#2#25#3'Top'
+  +#2'('#5'Width'#2'K'#6'Action'#7#5'ALoad'#7'Anchors'#11#5'akTop'#7'akRight'#0
+  +#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#3#0#0#7'TButton'#5'BSave'#4
+  +'Left'#3#141#1#6'Height'#2#25#3'Top'#2'H'#5'Width'#2'K'#6'Action'#7#5'ASave'
+  +#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#8'Tab'
+  +'Order'#2#4#0#0#9'TComboBox'#8'CBFormat'#4'Left'#2'p'#6'Height'#2#25#3'Top'#2
+  +''''#5'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cba'
+  +'ctSearchAscending'#0#9'ItemIndex'#2#0#13'Items.Strings'#1#6#4'html'#6#5'lat'
+  +'ex'#6#3'man'#6#3'txt'#0#9'MaxLength'#2#0#5'Style'#7#14'csDropDownList'#8'Ta'
+  +'bOrder'#2#5#4'Text'#6#4'html'#0#0#12'TPageControl'#9'PCOptions'#6'Height'#3
+  +#200#0#3'Top'#3#137#0#5'Width'#3#221#1#10'ActivePage'#7#9'TSSources'#5'Align'
+  +#7#8'alBottom'#8'TabIndex'#2#1#8'TabOrder'#2#6#0#9'TTabSheet'#13'TSDescripti'
+  +'on'#7'Caption'#6#11'Description'#0#6'TPanel'#7'PBDescr'#4'Left'#3'}'#1#6'He'
+  +'ight'#3#170#0#5'Width'#2'\'#5'Align'#7#7'alRight'#10'BevelOuter'#7#6'bvNone'
+  +#11'FullRepaint'#8#8'TabOrder'#2#0#0#7'TButton'#15'BAddDescription'#4'Left'#2
+  +#10#6'Height'#2#25#3'Top'#2#6#5'Width'#2'K'#6'Action'#7#9'ADescrAdd'#25'Bord'
+  +'erSpacing.InnerBorder'#2#4#8'TabOrder'#2#0#0#0#7'TButton'#18'BDeleteDescrip'
+  +'tion'#4'Left'#2#10#6'Height'#2#25#3'Top'#2'&'#5'Width'#2'K'#6'Action'#7#12
+  +'ADescrDelete'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#1#0#0#7'TButt'
+  +'on'#16'BEditDescription'#4'Left'#2#10#6'Height'#2#25#3'Top'#2'F'#5'Width'#2
+  +'K'#6'Action'#7#10'ADescrEdit'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'
+  +#2#2#0#0#7'TButton'#7'BAddAll'#4'Left'#2#10#6'Height'#2#25#3'Top'#2'd'#5'Wid'
+  +'th'#2'K'#6'Action'#7#12'ADescrAddAll'#25'BorderSpacing.InnerBorder'#2#4#8'T'
+  +'abOrder'#2#3#0#0#0#8'TListBox'#12'LBDescrFiles'#6'Height'#3#170#0#5'Width'#3
+  +'}'#1#5'Align'#7#8'alClient'#16'ClickOnSelChange'#8#8'TabOrder'#2#1#8'TopInd'
+  +'ex'#2#255#0#0#0#9'TTabSheet'#9'TSSources'#7'Caption'#6#7'Sources'#0#6'TPane'
+  +'l'#8'PSources'#4'Left'#3'}'#1#6'Height'#3#170#0#5'Width'#2'\'#5'Align'#7#7
+  +'alRight'#10'BevelOuter'#7#6'bvNone'#11'FullRepaint'#8#8'TabOrder'#2#0#0#7'T'
+  +'Button'#10'BSourceAdd'#4'Left'#2#12#6'Height'#2#25#3'Top'#2#6#5'Width'#2'K'
+  +#6'Action'#7#10'ASourceAdd'#25'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#0
+  +#0#0#7'TButton'#13'BSourceDelete'#4'Left'#2#12#6'Height'#2#25#3'Top'#2'&'#5
+  +'Width'#2'K'#6'Action'#7#13'ASourceDelete'#25'BorderSpacing.InnerBorder'#2#4
+  +#8'TabOrder'#2#1#0#0#7'TButton'#11'BSourceEdit'#4'Left'#2#12#6'Height'#2#25#3
+  +'Top'#2'F'#5'Width'#2'K'#6'Action'#7#11'ASourceEdit'#25'BorderSpacing.InnerB'
+  +'order'#2#4#8'TabOrder'#2#2#0#0#0#11'TStringGrid'#9'SGSources'#6'Height'#3
+  +#170#0#5'Width'#3'}'#1#5'Align'#7#8'alClient'#5'Color'#7#7'clWhite'#8'ColCou'
+  +'nt'#2#2#15'DefaultColWidth'#3#150#0#16'DefaultRowHeight'#2#24#10'FixedColor'
+  +#7#9'clBtnFace'#9'FixedCols'#2#0#7'Options'#11#15'goFixedVertLine'#15'goFixe'
+  +'dHorzLine'#10'goVertLine'#10'goHorzLine'#13'goRangeSelect'#11'goColSizing'
+  +#14'goSmoothScroll'#0#8'RowCount'#2#2#10'ScrollBars'#7#10'ssAutoBoth'#8'TabO'
+  +'rder'#2#1#7'TabStop'#9#9'ColWidths'#1#3#242#0#2'w'#0#5'Cells'#1#2#2#2#0#2#0
+  +#6#8'Filename'#2#1#2#0#6#13'Other options'#0#0#0#0#9'TTabSheet'#7'TSOther'#7
+  +'Caption'#6#13'Other options'#0#6'TLabel'#6'Label2'#4'Left'#2#254#6'Height'#2
+  +#23#3'Top'#2'j'#5'Width'#2'q'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6
+  +#19'Import content file'#5'Color'#7#6'clNone'#6'Layout'#7#8'tlCenter'#11'Par'
+  +'entColor'#8#0#0#6'TLabel'#6'Label3'#4'Left'#2'.'#6'Height'#2#23#3'Top'#3#137
+  ,#0#5'Width'#2'A'#9'Alignment'#7#14'taRightJustify'#7'Caption'#6#9'Target OS'
+  +#5'Color'#7#6'clNone'#6'Layout'#7#8'tlCenter'#11'ParentColor'#8#0#0#6'TLabel'
+  +#10'LTargetCPU'#4'Left'#3#198#0#6'Height'#2#23#3'Top'#3#137#0#5'Width'#2'('#9
+  +'Alignment'#7#14'taRightJustify'#7'Caption'#6#3'CPU'#5'Color'#7#6'clNone'#6
+  +'Layout'#7#8'tlCenter'#11'ParentColor'#8#0#0#9'TCheckBox'#13'CBShowPrivate'#4
+  +'Left'#2#14#6'Height'#2#23#3'Top'#2'#'#5'Width'#3#141#0#7'Caption'#6#21'Show'
+  +' p&rivate methods'#8'TabOrder'#2#0#0#0#9'TCheckBox'#15'CBHideProtected'#4'L'
+  +'eft'#2#14#6'Height'#2#23#3'Top'#2#11#5'Width'#3#172#0#7'Caption'#6#23'&Hide'
+  +' protected methods'#8'TabOrder'#2#1#0#0#9'TCheckBox'#12'CBWarnNoNode'#4'Lef'
+  +'t'#2#14#6'Height'#2#23#3'Top'#2';'#5'Width'#3#232#0#7'Caption'#6'#Warn if n'
+  +'o documentation node found'#8'TabOrder'#2#2#0#0#13'TFileNameEdit'#12'FEImpo'
+  +'rtFIle'#4'Left'#2'v'#6'Height'#2#23#3'Top'#2'j'#5'Width'#3'>'#1#11'ButtonWi'
+  +'dth'#2#23#9'NumGlyphs'#2#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#11
+  +'ParentColor'#8#8'TabOrder'#2#3#0#0#5'TEdit'#9'ETargetOS'#4'Left'#2'v'#6'Hei'
+  +'ght'#2#23#3'Top'#3#137#0#5'Width'#2'P'#8'TabOrder'#2#4#0#0#5'TEdit'#10'ETar'
+  +'getCPU'#4'Left'#3#246#0#6'Height'#2#23#3'Top'#3#137#0#5'Width'#2'P'#8'TabOr'
+  +'der'#2#5#0#0#0#9'TTabSheet'#7'TSBuild'#7'Caption'#6#12'Build output'#0#5'TM'
+  +'emo'#4'MLog'#6'Height'#3#170#0#5'Width'#3#217#1#5'Align'#7#8'alClient'#8'Ta'
+  +'bOrder'#2#0#0#0#0#0#11'TEditButton'#7'EOutput'#4'Left'#2'p'#6'Height'#2#23#3
+  +'Top'#2'H'#5'Width'#3#239#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#11
+  +'ButtonWidth'#2#23#13'OnButtonClick'#7#18'EOutputButtonClick'#11'ParentColor'
+  +#8#8'TabOrder'#2#7#0#0#9'TCheckBox'#9'CBContent'#4'Left'#2'p'#6'Height'#2#22
+  +#3'Top'#2'e'#5'Width'#2'~'#7'Caption'#6#20'Create cont&ent file'#8'TabOrder'
+  +#2#8#0#0#11'TOpenDialog'#10'ODSettings'#5'Title'#6#18'Open existing file'#10
+  +'DefaultExt'#6#4'.ldp'#6'Filter'#6'/Documentation project files|*.ldp|All fi'
+  +'les|*.*'#11'FilterIndex'#2#0#7'Options'#11#15'ofFileMustExist'#14'ofEnableS'
+  +'izing'#12'ofViewDetail'#0#4'left'#2#8#3'top'#3#30#1#0#0#11'TSaveDialog'#10
+  +'SDSettings'#5'Title'#6#12'Save file as'#10'DefaultExt'#6#4'.ldp'#6'Filter'#6
+  +'/Documentation project files|*.ldp|All files|*.*'#11'FilterIndex'#2#0#7'Opt'
+  +'ions'#11#15'ofPathMustExist'#14'ofEnableSizing'#12'ofViewDetail'#0#4'left'#2
+  +#8#3'top'#3#248#0#0#0#11'TOpenDialog'#13'ODDescription'#5'Title'#6#18'Open e'
+  +'xisting file'#10'DefaultExt'#6#4'.xml'#6'Filter'#6#29'XML files|*.xml|All f'
+  +'iles|*.*'#11'FilterIndex'#2#0#7'Options'#11#15'ofFileMustExist'#14'ofEnable'
+  +'Sizing'#12'ofViewDetail'#0#4'left'#3'('#1#3'top'#3'h'#1#0#0#11'TActionList'
+  +#11'ActionList1'#4'left'#2'i'#3'top'#2'3'#0#7'TAction'#9'ADescrAdd'#7'Captio'
+  +'n'#6#4'&Add'#18'DisableIfNoHandler'#9#9'OnExecute'#7#16'ADescrAddExecute'#0
+  +#0#7'TAction'#10'ADescrEdit'#7'Caption'#6#5'&Edit'#18'DisableIfNoHandler'#9#9
+  +'OnExecute'#7#17'ADescrEditExecute'#8'OnUpdate'#7#16'ADescrEditUpdate'#0#0#7
+  +'TAction'#12'ADescrDelete'#7'Caption'#6#7'&Delete'#18'DisableIfNoHandler'#9#9
+  +'OnExecute'#7#19'ADescrDeleteExecute'#8'OnUpdate'#7#18'ADescrDeleteUpdate'#0
+  +#0#7'TAction'#6'ABuild'#7'Caption'#6#6'&Build'#18'DisableIfNoHandler'#9#9'On'
+  +'Execute'#7#13'ABuildExecute'#8'OnUpdate'#7#12'ABuildUpdate'#0#0#7'TAction'
+  +#10'ASourceAdd'#7'Caption'#6#4'&Add'#18'DisableIfNoHandler'#9#9'OnExecute'#7
+  +#17'ASourceAddExecute'#0#0#7'TAction'#11'ASourceEdit'#7'Caption'#6#5'&Edit'
+  +#18'DisableIfNoHandler'#9#9'OnExecute'#7#18'ASourceEditExecute'#8'OnUpdate'#7
+  +#17'ASourceEditUpdate'#0#0#7'TAction'#13'ASourceDelete'#7'Caption'#6#7'&Dele'
+  +'te'#18'DisableIfNoHandler'#9#9'OnExecute'#7#20'ASourceDeleteExecute'#8'OnUp'
+  +'date'#7#19'ASourceDeleteUpdate'#0#0#7'TAction'#12'ADescrAddAll'#7'Caption'#6
+  +#7'Add All'#18'DisableIfNoHandler'#9#9'OnExecute'#7#19'ADescrAddAllExecute'#8
+  +'OnUpdate'#7#18'ADescrAddAllUpdate'#0#0#7'TAction'#5'ALoad'#7'Caption'#6#5'&'
+  +'Load'#18'DisableIfNoHandler'#9#9'OnExecute'#7#12'ALoadExecute'#0#0#7'TActio'
+  +'n'#5'ASave'#7'Caption'#6#5'&Save'#18'DisableIfNoHandler'#9#9'OnExecute'#7#12
+  +'ASaveExecute'#0#0#0#0
 ]);
diff --git a/examples/fontenum/mainunit.lfm b/examples/fontenum/mainunit.lfm
index a4577018a9..08fafe4b28 100644
--- a/examples/fontenum/mainunit.lfm
+++ b/examples/fontenum/mainunit.lfm
@@ -185,7 +185,6 @@ object frmMain: TfrmMain
     FixedColor = clBtnFace
     FixedCols = 0
     FixedRows = 0
-    GridLineWidth = 0
     Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goSmoothScroll]
     RowCount = 5
     ScrollBars = ssAutoBoth
diff --git a/examples/fontenum/mainunit.lrs b/examples/fontenum/mainunit.lrs
index 3b2eaf5de0..8e64a45101 100644
--- a/examples/fontenum/mainunit.lrs
+++ b/examples/fontenum/mainunit.lrs
@@ -1,4 +1,4 @@
-{ Das ist eine automatisch erzeugte Lazarus-Ressourcendatei }
+{ This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TfrmMain','FORMDATA',[
   'TPF0'#8'TfrmMain'#7'frmMain'#4'Left'#2'!'#6'Height'#3#184#1#3'Top'#2't'#5'Wi'
@@ -46,9 +46,9 @@ LazarusResources.Add('TfrmMain','FORMDATA',[
   +'OnClick'#7#12'Button1Click'#8'TabOrder'#2#10#0#0#11'TStringGrid'#4'grid'#4
   +'Left'#3#216#0#6'Height'#2'x'#3'Top'#3'8'#1#5'Width'#3'p'#1#15'AutoFillColum'
   +'ns'#9#8'ColCount'#2#1#16'DefaultRowHeight'#2#17#10'FixedColor'#7#9'clBtnFac'
-  +'e'#9'FixedCols'#2#0#9'FixedRows'#2#0#13'GridLineWidth'#2#0#7'Options'#11#15
-  +'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLine'#13'goRan'
-  +'geSelect'#9'goEditing'#14'goSmoothScroll'#0#8'RowCount'#2#5#10'ScrollBars'#7
-  +#10'ssAutoBoth'#8'TabOrder'#2#11#7'TabStop'#9#0#0#11'TFontDialog'#11'FontDia'
-  +'log1'#5'Title'#6#13'Select a font'#4'left'#3'8'#1#3'top'#3#128#1#0#0#0
+  +'e'#9'FixedCols'#2#0#9'FixedRows'#2#0#7'Options'#11#15'goFixedVertLine'#15'g'
+  +'oFixedHorzLine'#10'goVertLine'#10'goHorzLine'#13'goRangeSelect'#9'goEditing'
+  +#14'goSmoothScroll'#0#8'RowCount'#2#5#10'ScrollBars'#7#10'ssAutoBoth'#8'TabO'
+  +'rder'#2#11#7'TabStop'#9#0#0#11'TFontDialog'#11'FontDialog1'#5'Title'#6#13'S'
+  +'elect a font'#4'left'#3'8'#1#3'top'#3#128#1#0#0#0
 ]);
diff --git a/examples/grid_semaphor/example/unit1.lfm b/examples/grid_semaphor/example/unit1.lfm
index e2a2c0ecfc..4c242f49c5 100644
--- a/examples/grid_semaphor/example/unit1.lfm
+++ b/examples/grid_semaphor/example/unit1.lfm
@@ -191,7 +191,6 @@ object Form1: TForm1
     ColCount = 5
     DefaultRowHeight = 24
     FixedColor = clBtnFace
-    GridLineWidth = 0
     Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goSmoothScroll]
     RowCount = 5
     ScrollBars = ssAutoBoth
@@ -287,7 +286,6 @@ object Form1: TForm1
     Width = 288
     ColCount = 5
     FixedColor = clBtnFace
-    GridLineWidth = 0
     Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goSmoothScroll]
     RowCount = 5
     ScrollBars = ssAutoBoth
@@ -305,7 +303,6 @@ object Form1: TForm1
     Width = 279
     ColCount = 5
     FixedColor = clBtnFace
-    GridLineWidth = 0
     Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goSmoothScroll]
     RowCount = 5
     ScrollBars = ssAutoBoth
diff --git a/examples/grid_semaphor/example/unit1.lrs b/examples/grid_semaphor/example/unit1.lrs
index c6e9cd7c92..b5be575fbe 100644
--- a/examples/grid_semaphor/example/unit1.lrs
+++ b/examples/grid_semaphor/example/unit1.lrs
@@ -50,37 +50,36 @@ LazarusResources.Add('TForm1','FORMDATA',[
   +'order'#2#4#7'Caption'#6#7'AutoFit'#7'OnClick'#7#13'Button13Click'#8'TabOrde'
   +'r'#2#18#0#0#13'TSemaphorGrid'#13'SemaphorGrid1'#4'Left'#2#8#6'Height'#3#152
   +#0#3'Top'#2#4#5'Width'#3'^'#1#5'Color'#7#7'clWhite'#8'ColCount'#2#5#16'Defau'
-  +'ltRowHeight'#2#24#10'FixedColor'#7#9'clBtnFace'#13'GridLineWidth'#2#0#7'Opt'
-  +'ions'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLi'
-  +'ne'#13'goRangeSelect'#14'goSmoothScroll'#0#8'RowCount'#2#5#10'ScrollBars'#7
-  +#10'ssAutoBoth'#8'TabOrder'#2#0#7'TabStop'#9#21'Constraints.MaxHeight'#3#160
-  +#0#20'Constraints.MaxWidth'#3'^'#1#9'Alignment'#7#8'taCenter'#8'Semaphor'#9#9
+  +'ltRowHeight'#2#24#10'FixedColor'#7#9'clBtnFace'#7'Options'#11#15'goFixedVer'
+  +'tLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLine'#13'goRangeSelect'
+  +#14'goSmoothScroll'#0#8'RowCount'#2#5#10'ScrollBars'#7#10'ssAutoBoth'#8'TabO'
+  +'rder'#2#0#7'TabStop'#9#21'Constraints.MaxHeight'#3#160#0#20'Constraints.Max'
+  +'Width'#3'^'#1#9'Alignment'#7#8'taCenter'#8'Semaphor'#9#9'StringRed'#6#2'no'
+  +#12'StringYellow'#6#5'maybe'#11'StringGreen'#6#3'yes'#13'SemaphorShape'#7#6
+  +'ssDisk'#5'Cells'#1#2#24#2#0#2#0#6#3'a\n'#2#0#2#1#6#1'a'#2#0#2#2#6#1'b'#2#0#2
+  +#3#6#1'c'#2#0#2#4#6#1'd'#2#1#2#0#6#1'1'#2#1#2#1#6#2'no'#2#1#2#2#6#5'alpha'#2
+  +#1#2#3#6#3'zed'#2#1#2#4#6#5'maybe'#2#2#2#0#6#1'2'#2#2#2#1#6#3'yes'#2#2#2#2#6
+  +#8'Semaphor'#2#2#2#3#6#6'0.9877'#2#2#2#4#6#3'yes'#2#3#2#0#6#1'3'#2#3#2#2#6#2
+  +'no'#2#3#2#3#6#4'Grid'#2#3#2#4#6#5'maybe'#2#4#2#0#6#1'4'#2#4#2#1#6#1'5'#2#4#2
+  +#2#6#2'12'#2#4#2#3#6#2'-1'#2#4#2#4#6#1'2'#0#0#0#13'TSemaphorGrid'#13'Semapho'
+  +'rGrid2'#6'Height'#2'o'#3'Top'#3'1'#1#5'Width'#3' '#1#8'ColCount'#2#5#10'Fix'
+  +'edColor'#7#9'clBtnFace'#7'Options'#11#15'goFixedVertLine'#15'goFixedHorzLin'
+  +'e'#10'goVertLine'#10'goHorzLine'#13'goRangeSelect'#14'goSmoothScroll'#0#8'R'
+  ,'owCount'#2#5#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#21#7'TabStop'#9#9
   +'StringRed'#6#2'no'#12'StringYellow'#6#5'maybe'#11'StringGreen'#6#3'yes'#13
-  +'SemaphorShape'#7#6'ssDisk'#5'Cells'#1#2#24#2#0#2#0#6#3'a\n'#2#0#2#1#6#1'a'#2
-  +#0#2#2#6#1'b'#2#0#2#3#6#1'c'#2#0#2#4#6#1'd'#2#1#2#0#6#1'1'#2#1#2#1#6#2'no'#2
-  +#1#2#2#6#5'alpha'#2#1#2#3#6#3'zed'#2#1#2#4#6#5'maybe'#2#2#2#0#6#1'2'#2#2#2#1
-  +#6#3'yes'#2#2#2#2#6#8'Semaphor'#2#2#2#3#6#6'0.9877'#2#2#2#4#6#3'yes'#2#3#2#0
-  +#6#1'3'#2#3#2#2#6#2'no'#2#3#2#3#6#4'Grid'#2#3#2#4#6#5'maybe'#2#4#2#0#6#1'4'#2
-  +#4#2#1#6#1'5'#2#4#2#2#6#2'12'#2#4#2#3#6#2'-1'#2#4#2#4#6#1'2'#0#0#0#13'TSemap'
-  +'horGrid'#13'SemaphorGrid2'#6'Height'#2'o'#3'Top'#3'1'#1#5'Width'#3' '#1#8'C'
-  +'olCount'#2#5#10'FixedColor'#7#9'clBtnFace'#13'GridLineWidth'#2#0#7'Options'
-  +#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLine'#13
-  ,'goRangeSelect'#14'goSmoothScroll'#0#8'RowCount'#2#5#10'ScrollBars'#7#10'ssA'
-  +'utoBoth'#8'TabOrder'#2#21#7'TabStop'#9#9'StringRed'#6#2'no'#12'StringYellow'
-  +#6#5'maybe'#11'StringGreen'#6#3'yes'#13'SemaphorShape'#7#6'ssDisk'#0#0#13'TS'
-  +'emaphorGrid'#13'SemaphorGrid3'#4'Left'#3'('#1#6'Height'#2'p'#3'Top'#3'0'#1#5
-  +'Width'#3#23#1#8'ColCount'#2#5#10'FixedColor'#7#9'clBtnFace'#13'GridLineWidt'
-  +'h'#2#0#7'Options'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'
-  +#10'goHorzLine'#13'goRangeSelect'#14'goSmoothScroll'#0#8'RowCount'#2#5#10'Sc'
-  +'rollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#22#7'TabStop'#9#8'Semaphor'#9#9'St'
-  +'ringRed'#6#2'no'#12'StringYellow'#6#5'maybe'#11'StringGreen'#6#3'yes'#13'Se'
-  +'maphorShape'#7#6'ssDisk'#0#0#7'TButton'#8'Button14'#4'Left'#3'G'#1#6'Height'
-  +#2#25#3'Top'#3#8#1#5'Width'#2'W'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'
-  +#6#6'Assign'#7'OnClick'#7#13'Button14Click'#8'TabOrder'#2#19#0#0#7'TButton'#8
-  +'Button15'#4'Left'#3#161#1#6'Height'#2#25#3'Top'#3#8#1#5'Width'#2'r'#25'Bord'
-  +'erSpacing.InnerBorder'#2#4#7'Caption'#6#12'Show Content'#7'OnClick'#7#13'Bu'
-  +'tton15Click'#8'TabOrder'#2#20#0#0#11'TSaveDialog'#11'SaveDialog1'#5'Title'#6
-  +#12'Save file as'#11'FilterIndex'#2#0#4'left'#2'('#3'top'#3'x'#1#0#0#11'TOpe'
-  +'nDialog'#11'OpenDialog1'#5'Title'#6#18'Open existing file'#11'FilterIndex'#2
-  +#0#4'left'#2#8#3'top'#3'x'#1#0#0#0
+  +'SemaphorShape'#7#6'ssDisk'#0#0#13'TSemaphorGrid'#13'SemaphorGrid3'#4'Left'#3
+  +'('#1#6'Height'#2'p'#3'Top'#3'0'#1#5'Width'#3#23#1#8'ColCount'#2#5#10'FixedC'
+  +'olor'#7#9'clBtnFace'#7'Options'#11#15'goFixedVertLine'#15'goFixedHorzLine'
+  +#10'goVertLine'#10'goHorzLine'#13'goRangeSelect'#14'goSmoothScroll'#0#8'RowC'
+  +'ount'#2#5#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#22#7'TabStop'#9#8'S'
+  +'emaphor'#9#9'StringRed'#6#2'no'#12'StringYellow'#6#5'maybe'#11'StringGreen'
+  +#6#3'yes'#13'SemaphorShape'#7#6'ssDisk'#0#0#7'TButton'#8'Button14'#4'Left'#3
+  +'G'#1#6'Height'#2#25#3'Top'#3#8#1#5'Width'#2'W'#25'BorderSpacing.InnerBorder'
+  +#2#4#7'Caption'#6#6'Assign'#7'OnClick'#7#13'Button14Click'#8'TabOrder'#2#19#0
+  +#0#7'TButton'#8'Button15'#4'Left'#3#161#1#6'Height'#2#25#3'Top'#3#8#1#5'Widt'
+  +'h'#2'r'#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#12'Show Content'#7'O'
+  +'nClick'#7#13'Button15Click'#8'TabOrder'#2#20#0#0#11'TSaveDialog'#11'SaveDia'
+  +'log1'#5'Title'#6#12'Save file as'#11'FilterIndex'#2#0#4'left'#2'('#3'top'#3
+  +'x'#1#0#0#11'TOpenDialog'#11'OpenDialog1'#5'Title'#6#18'Open existing file'
+  +#11'FilterIndex'#2#0#4'left'#2#8#3'top'#3'x'#1#0#0#0
 ]);
diff --git a/examples/gridcelleditor/unit1.lfm b/examples/gridcelleditor/unit1.lfm
index 9b23a012ad..8782e73151 100644
--- a/examples/gridcelleditor/unit1.lfm
+++ b/examples/gridcelleditor/unit1.lfm
@@ -15,7 +15,6 @@ object Form1: TForm1
     Width = 360
     ColCount = 5
     FixedColor = clBtnFace
-    GridLineWidth = 0
     Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goEditing, goAlwaysShowEditor, goSmoothScroll]
     RowCount = 5
     ScrollBars = ssAutoBoth
diff --git a/examples/gridcelleditor/unit1.lrs b/examples/gridcelleditor/unit1.lrs
index 367e3d3c91..259657deb1 100644
--- a/examples/gridcelleditor/unit1.lrs
+++ b/examples/gridcelleditor/unit1.lrs
@@ -5,14 +5,14 @@ LazarusResources.Add('TForm1','FORMDATA',[
   +'dth'#3#144#1#18'HorzScrollBar.Page'#3#143#1#18'VertScrollBar.Page'#3'+'#1#13
   +'ActiveControl'#7#11'StringGrid1'#7'Caption'#6#5'Form1'#8'OnCreate'#7#10'For'
   +'mCreate'#0#11'TStringGrid'#11'StringGrid1'#4'Left'#2#25#6'Height'#3#227#0#3
-  +'Top'#2'-'#5'Width'#3'h'#1#8'ColCount'#2#5#10'FixedColor'#7#9'clBtnFace'#13
-  +'GridLineWidth'#2#0#7'Options'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10
-  +'goVertLine'#10'goHorzLine'#13'goRangeSelect'#9'goEditing'#18'goAlwaysShowEd'
-  +'itor'#14'goSmoothScroll'#0#8'RowCount'#2#5#10'ScrollBars'#7#10'ssAutoBoth'#8
-  +'TabOrder'#2#0#7'TabStop'#9#14'OnSelectEditor'#7#23'StringGrid1SelectEditor'
-  +#0#0#9'TComboBox'#9'ComboBox1'#4'Left'#2'x'#6'Height'#2#25#3'Top'#3#175#0#5
-  +'Width'#2'd'#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSear'
-  +'chAscending'#0#9'ItemIndex'#2#0#13'Items.Strings'#1#6#1'A'#6#1'B'#6#1'C'#0#9
-  +'MaxLength'#2#0#13'OnEditingDone'#7#20'ComboBox1EditingDone'#8'TabOrder'#2#1
-  +#4'Text'#6#1'A'#7'Visible'#8#0#0#0
+  +'Top'#2'-'#5'Width'#3'h'#1#8'ColCount'#2#5#10'FixedColor'#7#9'clBtnFace'#7'O'
+  +'ptions'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorz'
+  +'Line'#13'goRangeSelect'#9'goEditing'#18'goAlwaysShowEditor'#14'goSmoothScro'
+  +'ll'#0#8'RowCount'#2#5#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#7'Tab'
+  +'Stop'#9#14'OnSelectEditor'#7#23'StringGrid1SelectEditor'#0#0#9'TComboBox'#9
+  +'ComboBox1'#4'Left'#2'x'#6'Height'#2#25#3'Top'#3#175#0#5'Width'#2'd'#16'Auto'
+  +'CompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'It'
+  +'emIndex'#2#0#13'Items.Strings'#1#6#1'A'#6#1'B'#6#1'C'#0#9'MaxLength'#2#0#13
+  +'OnEditingDone'#7#20'ComboBox1EditingDone'#8'TabOrder'#2#1#4'Text'#6#1'A'#7
+  +'Visible'#8#0#0#0
 ]);
diff --git a/ide/charactermapdlg.lfm b/ide/charactermapdlg.lfm
index 8bee8d8bf2..944e3c9b71 100644
--- a/ide/charactermapdlg.lfm
+++ b/ide/charactermapdlg.lfm
@@ -49,15 +49,14 @@ object CharacterMapDialog: TCharacterMapDialog
     end
     object StringGrid1: TStringGrid
       Left = 6
-      Height = 305
+      Height = 288
       Top = 6
-      Width = 329
+      Width = 325
       Anchors = [akTop, akLeft, akRight, akBottom]
       BorderSpacing.Around = 6
       ColCount = 17
       DefaultColWidth = 16
       FixedColor = clBtnFace
-      GridLineWidth = 0
       Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goSmoothScroll]
       RowCount = 15
       ScrollBars = ssAutoBoth
diff --git a/ide/charactermapdlg.lrs b/ide/charactermapdlg.lrs
index 1edcf76cce..b63b8a3b44 100644
--- a/ide/charactermapdlg.lrs
+++ b/ide/charactermapdlg.lrs
@@ -16,11 +16,11 @@ LazarusResources.Add('TCharacterMapDialog','FORMDATA',[
   +'arInfoLabel'#4'Left'#2#6#6'Height'#2#13#3'Top'#3'<'#1#5'Width'#3'I'#1#5'Ali'
   +'gn'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#13'CharInfoLabe'
   +'l'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#11'TStringGrid'#11'StringGrid'
-  +'1'#4'Left'#2#6#6'Height'#3'1'#1#3'Top'#2#6#5'Width'#3'I'#1#7'Anchors'#11#5
+  +'1'#4'Left'#2#6#6'Height'#3' '#1#3'Top'#2#6#5'Width'#3'E'#1#7'Anchors'#11#5
   +'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#8'Co'
-  +'lCount'#2#17#15'DefaultColWidth'#2#16#10'FixedColor'#7#9'clBtnFace'#13'Grid'
-  +'LineWidth'#2#0#7'Options'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goV'
-  +'ertLine'#10'goHorzLine'#14'goSmoothScroll'#0#8'RowCount'#2#15#10'ScrollBars'
-  +#7#10'ssAutoBoth'#8'TabOrder'#2#0#7'TabStop'#9#11'OnMouseDown'#7#20'StringGr'
-  +'id1MouseDown'#11'OnMouseMove'#7#20'StringGrid1MouseMove'#0#0#0#0
+  +'lCount'#2#17#15'DefaultColWidth'#2#16#10'FixedColor'#7#9'clBtnFace'#7'Optio'
+  +'ns'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLine'
+  +#14'goSmoothScroll'#0#8'RowCount'#2#15#10'ScrollBars'#7#10'ssAutoBoth'#8'Tab'
+  +'Order'#2#0#7'TabStop'#9#11'OnMouseDown'#7#20'StringGrid1MouseDown'#11'OnMou'
+  +'seMove'#7#20'StringGrid1MouseMove'#0#0#0#0
 ]);
diff --git a/ideintf/lazstringgridedit.lfm b/ideintf/lazstringgridedit.lfm
index e91595eaef..d876435f9d 100644
--- a/ideintf/lazstringgridedit.lfm
+++ b/ideintf/lazstringgridedit.lfm
@@ -7,8 +7,6 @@ object StringGridEditorDlg: TStringGridEditorDlg
   VertScrollBar.Page = 269
   ActiveControl = StringGrid
   Caption = 'StringGridEditorDlg'
-  ClientHeight = 270
-  ClientWidth = 520
   Constraints.MinHeight = 270
   Constraints.MinWidth = 340
   OnCreate = FormCreate
@@ -24,8 +22,6 @@ object StringGridEditorDlg: TStringGridEditorDlg
     BorderSpacing.Around = 6
     BorderSpacing.InnerBorder = 6
     Caption = 'String Grid'
-    ClientHeight = 210
-    ClientWidth = 504
     TabOrder = 0
     object LabelMove: TLabel
       AnchorSideLeft.Control = ArrowDown
@@ -149,7 +145,6 @@ object StringGridEditorDlg: TStringGridEditorDlg
       FixedColor = clBtnFace
       FixedCols = 0
       FixedRows = 0
-      GridLineWidth = 0
       Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRowSizing, goColSizing, goRowMoving, goColMoving, goEditing, goSmoothScroll]
       RowCount = 5
       ScrollBars = ssAutoBoth
diff --git a/ideintf/lazstringgridedit.lrs b/ideintf/lazstringgridedit.lrs
index 00d08f96bc..a5b447b8ec 100644
--- a/ideintf/lazstringgridedit.lrs
+++ b/ideintf/lazstringgridedit.lrs
@@ -4,79 +4,78 @@ LazarusResources.Add('TStringGridEditorDlg','FORMDATA',[
   'TPF0'#20'TStringGridEditorDlg'#19'StringGridEditorDlg'#4'Left'#3#3#1#6'Heigh'
   +'t'#3#14#1#3'Top'#3#167#0#5'Width'#3#8#2#18'HorzScrollBar.Page'#3#7#2#18'Ver'
   +'tScrollBar.Page'#3#13#1#13'ActiveControl'#7#10'StringGrid'#7'Caption'#6#19
-  +'StringGridEditorDlg'#12'ClientHeight'#3#14#1#11'ClientWidth'#3#8#2#21'Const'
-  +'raints.MinHeight'#3#14#1#20'Constraints.MinWidth'#3'T'#1#8'OnCreate'#7#10'F'
-  +'ormCreate'#8'Position'#7#14'poScreenCenter'#0#9'TGroupBox'#8'GroupBox'#24'A'
-  +'nchorSideBottom.Control'#7#5'BtnOK'#4'Left'#2#6#6'Height'#3#227#0#3'Top'#2#6
-  +#5'Width'#3#252#1#5'Align'#7#5'alTop'#7'Anchors'#11#7'akRight'#8'akBottom'#0
-  +#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#6#7'Caption'#6
-  +#11'String Grid'#12'ClientHeight'#3#210#0#11'ClientWidth'#3#248#1#8'TabOrder'
-  +#2#0#0#6'TLabel'#9'LabelMove'#22'AnchorSideLeft.Control'#7#9'ArrowDown'#19'A'
-  +'nchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Control'#7#9'ArrowDown'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#151#1#6'Height'#2#13#3'Top'
-  +#3#181#0#5'Width'#2'`'#7'Caption'#6#14'Move Cols/Rows'#5'Color'#7#6'clNone'
-  +#11'ParentColor'#8#0#0#6'TArrow'#9'ArrowLeft'#22'AnchorSideLeft.Control'#7#7
-  +'ArrowUp'#21'AnchorSideTop.Control'#7#10'ArrowRight'#18'AnchorSideTop.Side'#7
-  +#9'asrCenter'#23'AnchorSideRight.Control'#7#7'ArrowUp'#4'Left'#3#160#1#6'Hei'
-  +'ght'#2#26#3'Top'#3#129#0#5'Width'#2#26#7'Anchors'#11#5'akTop'#7'akRight'#0#7
-  +'OnClick'#7#10'SwapRowCol'#0#0#6'TArrow'#10'ArrowRight'#22'AnchorSideLeft.Co'
-  +'ntrol'#7#7'ArrowUp'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop'
-  +'.Control'#7#7'ArrowUp'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#212#1
-  +#6'Height'#2#26#3'Top'#3#129#0#5'Width'#2#26#9'ArrowType'#7#7'atRight'#7'OnC'
-  +'lick'#7#10'SwapRowCol'#0#0#6'TArrow'#9'ArrowDown'#22'AnchorSideLeft.Control'
-  +#7#9'ArrowLeft'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Cont'
-  +'rol'#7#9'ArrowLeft'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#186#1#6
-  +'Height'#2#26#3'Top'#3#155#0#5'Width'#2#26#9'ArrowType'#7#6'atDown'#7'OnClic'
-  +'k'#7#10'SwapRowCol'#0#0#6'TArrow'#7'ArrowUp'#22'AnchorSideLeft.Control'#7#8
-  +'BtnClean'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Control'#7
-  +#8'BtnClean'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#186#1#6'Height'
-  +#2#26#3'Top'#2'g'#5'Width'#2#26#9'ArrowType'#7#4'atUp'#17'BorderSpacing.Top'
-  +#2#10#7'OnClick'#7#10'SwapRowCol'#0#0#7'TButton'#7'BtnLoad'#22'AnchorSideLef'
-  +'t.Control'#7#10'StringGrid'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Ancho'
-  +'rSideTop.Control'#7#8'GroupBox'#23'AnchorSideRight.Control'#7#8'GroupBox'#20
-  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#157#1#6'Height'#2#25#3'Top'#2
-  +#6#5'Width'#2'U'#7'Anchors'#11#5'akTop'#7'akRight'#0#20'BorderSpacing.Around'
-  +#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#7'Load...'#7'OnClick'#7
-  +#12'BtnLoadClick'#8'TabOrder'#2#0#0#0#7'TButton'#7'BtnSave'#22'AnchorSideLef'
-  +'t.Control'#7#7'BtnLoad'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSid'
-  +'eTop.Control'#7#7'BtnLoad'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3
-  +#157#1#6'Height'#2#25#3'Top'#2'%'#5'Width'#2'U'#20'BorderSpacing.Around'#2#6
-  +#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#7'BtnSave'#7'OnClick'#7#12'B'
-  +'tnSaveClick'#8'TabOrder'#2#1#0#0#7'TButton'#8'BtnClean'#22'AnchorSideLeft.C'
-  +'ontrol'#7#7'BtnSave'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTo'
-  +'p.Control'#7#7'BtnSave'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#157
-  +#1#6'Height'#2#25#3'Top'#2'D'#5'Width'#2'U'#20'BorderSpacing.Around'#2#6#25
-  +'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#8'BtnClean'#7'OnClick'#7#13'Btn'
-  +'CleanClick'#8'TabOrder'#2#2#0#0#11'TStringGrid'#10'StringGrid'#23'AnchorSid'
-  +'eRight.Control'#7#7'BtnLoad'#4'Left'#2#6#6'Height'#3#198#0#3'Top'#2#6#5'Wid'
-  +'th'#3#145#1#5'Align'#7#6'alLeft'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
-  +#8'akBottom'#0#20'BorderSpacing.Around'#2#6#8'ColCount'#2#5#10'FixedColor'#7
-  +#9'clBtnFace'#9'FixedCols'#2#0#9'FixedRows'#2#0#13'GridLineWidth'#2#0#7'Opti'
-  +'ons'#11#15'goFixedVertLine'#15'goFixedHorzLine'#10'goVertLine'#10'goHorzLin'
-  +'e'#11'goRowSizing'#11'goColSizing'#11'goRowMoving'#11'goColMoving'#9'goEdit'
-  +'ing'#14'goSmoothScroll'#0#8'RowCount'#2#5#10'ScrollBars'#7#10'ssAutoBoth'#8
-  +'TabOrder'#2#3#7'TabStop'#9#15'OnPrepareCanvas'#7#23'StringGridPrepareCanvas'
-  +#0#0#0#7'TBitBtn'#5'BtnOK'#23'AnchorSideRight.Control'#7#9'BtnCancel'#24'Anc'
-  +'horSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
-  +'Left'#3#196#0#6'Height'#2#25#3'Top'#3#239#0#5'Width'#2'K'#7'Anchors'#11#7'a'
-  +'kRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#3'&OK'#7'De'
-  +'fault'#9#4'Kind'#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'
-  +#2#1#0#0#7'TBitBtn'#9'BtnCancel'#23'AnchorSideRight.Control'#7#8'BtnApply'#24
-  +'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBotto'
-  +'m'#4'Left'#3#21#1#6'Height'#2#25#3'Top'#3#239#0#5'Width'#2'K'#7'Anchors'#11
-  +#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'Cancel'
-  ,#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0
-  +#0#7'TBitBtn'#8'BtnApply'#23'AnchorSideRight.Control'#7#7'BtnHelp'#24'Anchor'
-  +'SideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'L'
-  +'eft'#3'f'#1#6'Height'#2#25#3'Top'#3#239#0#5'Width'#2'K'#7'Anchors'#11#7'akR'
-  +'ight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'&Apply'#9'N'
-  +'umGlyphs'#2#0#7'OnClick'#7#13'BtnApplyClick'#8'TabOrder'#2#3#0#0#7'TBitBtn'
-  +#7'BtnHelp'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7
-  +#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Si'
-  +'de'#7#9'asrBottom'#4'Left'#3#183#1#6'Height'#2#25#3'Top'#3#239#0#5'Width'#2
-  +'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Ca'
-  +'ption'#6#5'&Help'#4'Kind'#7#6'bkHelp'#9'NumGlyphs'#2#0#8'TabOrder'#2#4#0#0
-  +#11'TOpenDialog'#10'OpenDialog'#5'Title'#6#4'Open'#11'FilterIndex'#2#0#4'lef'
-  +'t'#3#135#0#3'top'#3'W'#1#0#0#11'TSaveDialog'#10'SaveDialog'#5'Title'#6#4'Sa'
-  +'ve'#11'FilterIndex'#2#0#4'left'#3#168#0#3'top'#3'W'#1#0#0#0
+  +'StringGridEditorDlg'#21'Constraints.MinHeight'#3#14#1#20'Constraints.MinWid'
+  +'th'#3'T'#1#8'OnCreate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'#0#9
+  +'TGroupBox'#8'GroupBox'#24'AnchorSideBottom.Control'#7#5'BtnOK'#4'Left'#2#6#6
+  +'Height'#3#227#0#3'Top'#2#6#5'Width'#3#252#1#5'Align'#7#5'alTop'#7'Anchors'
+  +#11#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#25'BorderSpacing.I'
+  +'nnerBorder'#2#6#7'Caption'#6#11'String Grid'#8'TabOrder'#2#0#0#6'TLabel'#9
+  +'LabelMove'#22'AnchorSideLeft.Control'#7#9'ArrowDown'#19'AnchorSideLeft.Side'
+  +#7#9'asrCenter'#21'AnchorSideTop.Control'#7#9'ArrowDown'#18'AnchorSideTop.Si'
+  +'de'#7#9'asrBottom'#4'Left'#3#151#1#6'Height'#2#13#3'Top'#3#181#0#5'Width'#2
+  +'`'#7'Caption'#6#14'Move Cols/Rows'#5'Color'#7#6'clNone'#11'ParentColor'#8#0
+  +#0#6'TArrow'#9'ArrowLeft'#22'AnchorSideLeft.Control'#7#7'ArrowUp'#21'AnchorS'
+  +'ideTop.Control'#7#10'ArrowRight'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'A'
+  +'nchorSideRight.Control'#7#7'ArrowUp'#4'Left'#3#160#1#6'Height'#2#26#3'Top'#3
+  +#129#0#5'Width'#2#26#7'Anchors'#11#5'akTop'#7'akRight'#0#7'OnClick'#7#10'Swa'
+  +'pRowCol'#0#0#6'TArrow'#10'ArrowRight'#22'AnchorSideLeft.Control'#7#7'ArrowU'
+  +'p'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#7'Arr'
+  +'owUp'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#212#1#6'Height'#2#26#3
+  +'Top'#3#129#0#5'Width'#2#26#9'ArrowType'#7#7'atRight'#7'OnClick'#7#10'SwapRo'
+  +'wCol'#0#0#6'TArrow'#9'ArrowDown'#22'AnchorSideLeft.Control'#7#9'ArrowLeft'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'ArrowL'
+  +'eft'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#186#1#6'Height'#2#26#3
+  +'Top'#3#155#0#5'Width'#2#26#9'ArrowType'#7#6'atDown'#7'OnClick'#7#10'SwapRow'
+  +'Col'#0#0#6'TArrow'#7'ArrowUp'#22'AnchorSideLeft.Control'#7#8'BtnClean'#19'A'
+  +'nchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Control'#7#8'BtnClean'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#186#1#6'Height'#2#26#3'Top'
+  +#2'g'#5'Width'#2#26#9'ArrowType'#7#4'atUp'#17'BorderSpacing.Top'#2#10#7'OnCl'
+  +'ick'#7#10'SwapRowCol'#0#0#7'TButton'#7'BtnLoad'#22'AnchorSideLeft.Control'#7
+  +#10'StringGrid'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Cont'
+  +'rol'#7#8'GroupBox'#23'AnchorSideRight.Control'#7#8'GroupBox'#20'AnchorSideR'
+  +'ight.Side'#7#9'asrBottom'#4'Left'#3#157#1#6'Height'#2#25#3'Top'#2#6#5'Width'
+  +#2'U'#7'Anchors'#11#5'akTop'#7'akRight'#0#20'BorderSpacing.Around'#2#6#25'Bo'
+  +'rderSpacing.InnerBorder'#2#4#7'Caption'#6#7'Load...'#7'OnClick'#7#12'BtnLoa'
+  +'dClick'#8'TabOrder'#2#0#0#0#7'TButton'#7'BtnSave'#22'AnchorSideLeft.Control'
+  +#7#7'BtnLoad'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Contro'
+  +'l'#7#7'BtnLoad'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#157#1#6'Hei'
+  +'ght'#2#25#3'Top'#2'%'#5'Width'#2'U'#20'BorderSpacing.Around'#2#6#25'BorderS'
+  +'pacing.InnerBorder'#2#4#7'Caption'#6#7'BtnSave'#7'OnClick'#7#12'BtnSaveClic'
+  +'k'#8'TabOrder'#2#1#0#0#7'TButton'#8'BtnClean'#22'AnchorSideLeft.Control'#7#7
+  +'BtnSave'#19'AnchorSideLeft.Side'#7#9'asrCenter'#21'AnchorSideTop.Control'#7
+  +#7'BtnSave'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#157#1#6'Height'#2
+  +#25#3'Top'#2'D'#5'Width'#2'U'#20'BorderSpacing.Around'#2#6#25'BorderSpacing.'
+  +'InnerBorder'#2#4#7'Caption'#6#8'BtnClean'#7'OnClick'#7#13'BtnCleanClick'#8
+  +'TabOrder'#2#2#0#0#11'TStringGrid'#10'StringGrid'#23'AnchorSideRight.Control'
+  +#7#7'BtnLoad'#4'Left'#2#6#6'Height'#3#198#0#3'Top'#2#6#5'Width'#3#145#1#5'Al'
+  +'ign'#7#6'alLeft'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0
+  +#20'BorderSpacing.Around'#2#6#8'ColCount'#2#5#10'FixedColor'#7#9'clBtnFace'#9
+  +'FixedCols'#2#0#9'FixedRows'#2#0#7'Options'#11#15'goFixedVertLine'#15'goFixe'
+  +'dHorzLine'#10'goVertLine'#10'goHorzLine'#11'goRowSizing'#11'goColSizing'#11
+  +'goRowMoving'#11'goColMoving'#9'goEditing'#14'goSmoothScroll'#0#8'RowCount'#2
+  +#5#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#3#7'TabStop'#9#15'OnPrepare'
+  +'Canvas'#7#23'StringGridPrepareCanvas'#0#0#0#7'TBitBtn'#5'BtnOK'#23'AnchorSi'
+  +'deRight.Control'#7#9'BtnCancel'#24'AnchorSideBottom.Control'#7#5'Owner'#21
+  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#196#0#6'Height'#2#25#3'Top'
+  +#3#239#0#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'BorderSpaci'
+  +'ng.Around'#2#6#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'#11'ModalR'
+  +'esult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#7'TBitBtn'#9'BtnCancel'#23
+  +'AnchorSideRight.Control'#7#8'BtnApply'#24'AnchorSideBottom.Control'#7#5'Own'
+  +'er'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#21#1#6'Height'#2#25#3
+  +'Top'#3#239#0#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'Border'
+  +'Spacing.Around'#2#6#7'Caption'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalRe'
+  +'sult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#2#0#0#7'TBitBtn'#8'BtnApply'#23'An'
+  ,'chorSideRight.Control'#7#7'BtnHelp'#24'AnchorSideBottom.Control'#7#5'Owner'
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'f'#1#6'Height'#2#25#3'To'
+  +'p'#3#239#0#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#20'BorderSp'
+  +'acing.Around'#2#6#7'Caption'#6#6'&Apply'#9'NumGlyphs'#2#0#7'OnClick'#7#13'B'
+  +'tnApplyClick'#8'TabOrder'#2#3#0#0#7'TBitBtn'#7'BtnHelp'#23'AnchorSideRight.'
+  +'Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBo'
+  +'ttom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3
+  +#183#1#6'Height'#2#25#3'Top'#3#239#0#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8
+  +'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#5'&Help'#4'Kind'#7#6
+  +'bkHelp'#9'NumGlyphs'#2#0#8'TabOrder'#2#4#0#0#11'TOpenDialog'#10'OpenDialog'
+  +#5'Title'#6#4'Open'#11'FilterIndex'#2#0#4'left'#3#135#0#3'top'#3'W'#1#0#0#11
+  +'TSaveDialog'#10'SaveDialog'#5'Title'#6#4'Save'#11'FilterIndex'#2#0#4'left'#3
+  +#168#0#3'top'#3'W'#1#0#0#0
 ]);