diff --git a/ide/publishprojectdlg.lfm b/ide/publishprojectdlg.lfm
index 1ebdb3f508..3c3c03e5b9 100644
--- a/ide/publishprojectdlg.lfm
+++ b/ide/publishprojectdlg.lfm
@@ -1,191 +1,184 @@
 object PublishProjectDialog: TPublishProjectDialog
+  ActiveControl = DestDirComboBox
+  BorderIcons = [biSystemMenu]
   Caption = 'Publish Project'
-  ClientHeight = 499
-  ClientWidth = 469
+  ClientHeight = 505
+  ClientWidth = 484
   OnCreate = FormCreate
   OnResize = PublishProjectDialogRESIZE
   PixelsPerInch = 112
   Position = poScreenCenter
-  HorzScrollBar.Page = 468
-  VertScrollBar.Page = 498
+  HorzScrollBar.Page = 483
+  VertScrollBar.Page = 504
   Left = 307
-  Height = 499
+  Height = 505
   Top = 165
-  Width = 469
-  object OkButton: TButton
-    Anchors = [akTop, akRight, akBottom]
-    Caption = 'Ok'
-    ModalResult = 1
-    OnClick = OkButtonCLICK
-    TabOrder = 0
-    AnchorSideBottom.Control = SaveSettingsButton
-    AnchorSideBottom.Side = asrBottom
-    Left = 72
-    Height = 25
-    Top = 464
-    Width = 75
-  end
-  object CancelButton: TButton
-    Anchors = [akTop, akRight, akBottom]
-    Caption = 'Cancel'
-    ModalResult = 2
-    TabOrder = 1
-    AnchorSideBottom.Control = SaveSettingsButton
-    AnchorSideBottom.Side = asrBottom
-    Left = 371
-    Height = 25
-    Top = 464
-    Width = 75
-  end
+  Width = 484
   object DestDirGroupBox: TGroupBox
-    Anchors = [akTop, akLeft, akRight]
+    Align = alTop
+    BorderSpacing.Around = 6
     Caption = 'Destination directory'
     ClientHeight = 94
-    ClientWidth = 446
-    ParentColor = True
+    ClientWidth = 468
     ParentCtl3D = False
-    TabOrder = 2
+    TabOrder = 0
     OnResize = DestDirGroupBoxRESIZE
-    Left = 8
+    Left = 6
     Height = 111
-    Top = 8
-    Width = 450
+    Top = 6
+    Width = 472
     object CommandAfterLabel: TLabel
       Anchors = [akTop, akLeft, akRight]
       Caption = 'Command after:'
       Color = clNone
+      ParentColor = False
       Left = 6
-      Height = 17
+      Height = 13
       Top = 33
-      Width = 428
+      Width = 450
     end
     object DestDirComboBox: TComboBox
       Anchors = [akTop, akLeft, akRight]
+      AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
       MaxLength = 0
       ParentCtl3D = False
       TabOrder = 0
       Text = 'DestDirComboBox'
       Left = 6
-      Height = 25
+      Height = 21
       Top = 1
-      Width = 376
+      Width = 414
     end
     object BrowseDestDirBitBtn: TBitBtn
       Anchors = [akTop, akRight, akBottom]
       AutoSize = True
+      BorderSpacing.InnerBorder = 2
       Caption = '...'
+      NumGlyphs = 0
       OnClick = BrowseDestDirBitBtnCLICK
       TabOrder = 1
       AnchorSideBottom.Control = DestDirComboBox
       AnchorSideBottom.Side = asrBottom
-      Left = 390
-      Height = 25
+      Left = 436
+      Height = 21
       Top = 1
-      Width = 48
+      Width = 22
     end
     object CommandAfterCombobox: TComboBox
       Anchors = [akTop, akLeft, akRight]
+      AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
       MaxLength = 0
       ParentCtl3D = False
       TabOrder = 2
       Text = 'CommandAfterCombobox'
       Left = 6
-      Height = 25
+      Height = 21
       Top = 58
-      Width = 430
+      Width = 452
     end
   end
   object FilesGroupbox: TGroupBox
-    Anchors = [akTop, akLeft, akRight]
+    Align = alTop
+    AutoSize = True
+    BorderSpacing.Around = 6
     Caption = 'Files'
-    ClientHeight = 31
-    ClientWidth = 446
-    ParentColor = True
+    ClientHeight = 36
+    ClientWidth = 468
     ParentCtl3D = False
-    TabOrder = 3
+    TabOrder = 1
     OnResize = FilesGroupboxRESIZE
-    Left = 8
-    Height = 48
-    Top = 128
-    Width = 450
+    Left = 6
+    Height = 53
+    Top = 123
+    Width = 472
     object IgnoreBinariesCheckbox: TCheckBox
+      Align = alTop
       AllowGrayed = True
-      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Around = 6
       Caption = 'Ignore binaries'
       TabOrder = 0
       Left = 6
-      Height = 20
-      Top = 1
-      Width = 428
+      Height = 24
+      Top = 6
+      Width = 456
     end
   end
   object ProjectInfoGroupbox: TGroupBox
-    Anchors = [akTop, akLeft, akRight]
+    Align = alTop
+    AutoSize = True
+    BorderSpacing.Around = 6
     Caption = 'Project Information'
-    ClientHeight = 55
-    ClientWidth = 446
-    ParentColor = True
+    ClientHeight = 66
+    ClientWidth = 468
     ParentCtl3D = False
-    TabOrder = 4
+    TabOrder = 2
     OnResize = ProjectInfoGroupboxRESIZE
-    Left = 8
-    Height = 72
-    Top = 376
-    Width = 450
+    Left = 6
+    Height = 83
+    Top = 370
+    Width = 472
     object SaveClosedEditorFilesInfoCheckbox: TCheckBox
+      Align = alTop
       AllowGrayed = True
-      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Around = 6
       Caption = 'Save editor info of closed files'
       TabOrder = 0
-      Left = 4
-      Height = 20
-      Top = 1
-      Width = 432
+      Left = 6
+      Height = 24
+      Top = 6
+      Width = 456
     end
     object SaveEditorInfoOfNonProjectFilesCheckbox: TCheckBox
+      Align = alTop
       AllowGrayed = True
-      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Around = 6
       Caption = 'Save editor info of non project files'
       TabOrder = 1
-      Left = 4
-      Height = 20
-      Top = 26
-      Width = 432
+      Left = 6
+      Height = 24
+      Top = 36
+      Width = 456
     end
   end
   object SaveSettingsButton: TButton
-    Anchors = [akTop, akRight]
+    Anchors = [akTop, akRight, akBottom]
     AutoSize = True
+    BorderSpacing.Right = 6
+    BorderSpacing.InnerBorder = 2
     Caption = 'Save settings'
     OnClick = SaveSettingsButtonCLICK
-    TabOrder = 5
-    Left = 198
-    Height = 25
-    Top = 464
-    Width = 120
+    TabOrder = 3
+    AnchorSideTop.Control = CancelButton
+    AnchorSideRight.Control = CancelButton
+    AnchorSideBottom.Control = CancelButton
+    AnchorSideBottom.Side = asrBottom
+    Left = 257
+    Height = 28
+    Top = 471
+    Width = 85
   end
   object IncludeFilterGroupbox: TGroupBox
-    Anchors = [akTop, akLeft, akRight]
+    Align = alTop
+    BorderSpacing.Around = 6
     Caption = 'Include Filter'
     ClientHeight = 71
-    ClientWidth = 446
-    ParentColor = True
+    ClientWidth = 468
     ParentCtl3D = False
-    TabOrder = 6
+    TabOrder = 4
     TabStop = True
     OnResize = IncludeFilterGroupboxRESIZE
-    Left = 8
+    Left = 6
     Height = 88
-    Top = 184
-    Width = 450
+    Top = 182
+    Width = 472
     object UseIncludeFilterCheckbox: TCheckBox
       AllowGrayed = True
       Caption = 'Use Include Filter'
       TabOrder = 0
       Left = 6
-      Height = 20
+      Height = 24
       Top = 1
-      Width = 171
+      Width = 125
     end
     object IncFilterSimpleSyntaxCheckbox: TCheckBox
       AllowGrayed = True
@@ -194,44 +187,45 @@ object PublishProjectDialog: TPublishProjectDialog
       ShowHint = True
       TabOrder = 1
       Left = 199
-      Height = 20
+      Height = 24
       Top = 1
-      Width = 215
+      Width = 106
     end
     object IncludeFilterCombobox: TComboBox
       Anchors = [akTop, akLeft, akRight]
+      AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
       MaxLength = 0
       ParentCtl3D = False
       TabOrder = 2
       Text = 'IncludeFilterCombobox'
       Left = 6
-      Height = 25
+      Height = 21
       Top = 33
-      Width = 430
+      Width = 452
     end
   end
   object ExcludeFilterGroupbox: TGroupBox
-    Anchors = [akTop, akLeft, akRight]
+    Align = alTop
+    BorderSpacing.Around = 6
     Caption = 'Exclude Filter'
     ClientHeight = 71
-    ClientWidth = 444
-    ParentColor = True
+    ClientWidth = 468
     ParentCtl3D = False
-    TabOrder = 7
+    TabOrder = 5
     TabStop = True
     OnResize = ExcludeFilterGroupboxRESIZE
-    Left = 8
+    Left = 6
     Height = 88
-    Top = 280
-    Width = 448
+    Top = 276
+    Width = 472
     object UseExcludeFilterCheckbox: TCheckBox
       AllowGrayed = True
       Caption = 'Use Exclude Filter'
       TabOrder = 0
       Left = 6
-      Height = 20
+      Height = 24
       Top = 1
-      Width = 184
+      Width = 129
     end
     object ExcFilterSimpleSyntaxCheckbox: TCheckBox
       AllowGrayed = True
@@ -240,20 +234,60 @@ object PublishProjectDialog: TPublishProjectDialog
       ShowHint = True
       TabOrder = 1
       Left = 199
-      Height = 20
+      Height = 24
       Top = 1
-      Width = 212
+      Width = 106
     end
     object ExcludeFilterCombobox: TComboBox
       Anchors = [akTop, akLeft, akRight]
+      AutoCompleteText = [cbactEndOfLineComplete, cbactSearchAscending]
       MaxLength = 0
       ParentCtl3D = False
       TabOrder = 2
       Text = 'ExcludeFilterCombobox'
       Left = 6
-      Height = 25
+      Height = 21
       Top = 33
-      Width = 430
+      Width = 454
     end
   end
+  object OkButton: TBitBtn
+    Anchors = [akRight, akBottom]
+    AutoSize = True
+    BorderSpacing.Around = 6
+    BorderSpacing.InnerBorder = 2
+    Caption = '&OK'
+    Default = True
+    Kind = bkOK
+    ModalResult = 1
+    NumGlyphs = 0
+    TabOrder = 6
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 427
+    Height = 28
+    Top = 471
+    Width = 51
+  end
+  object CancelButton: TBitBtn
+    Anchors = [akRight, akBottom]
+    AutoSize = True
+    BorderSpacing.Around = 6
+    BorderSpacing.InnerBorder = 2
+    Cancel = True
+    Caption = 'Cancel'
+    Kind = bkCancel
+    ModalResult = 2
+    NumGlyphs = 0
+    TabOrder = 7
+    AnchorSideRight.Control = OkButton
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Left = 348
+    Height = 28
+    Top = 471
+    Width = 73
+  end
 end
diff --git a/ide/publishprojectdlg.lrs b/ide/publishprojectdlg.lrs
index 582062bdbf..b57a267020 100644
--- a/ide/publishprojectdlg.lrs
+++ b/ide/publishprojectdlg.lrs
@@ -1,80 +1,93 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TPublishProjectDialog','FORMDATA',[
-  'TPF0'#21'TPublishProjectDialog'#20'PublishProjectDialog'#7'Caption'#6#15'Pub'
-  +'lish Project'#12'ClientHeight'#3#243#1#11'ClientWidth'#3#213#1#8'OnCreate'#7
-  +#10'FormCreate'#8'OnResize'#7#26'PublishProjectDialogRESIZE'#13'PixelsPerInc'
-  +'h'#2'p'#8'Position'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3#212#1#18
-  +'VertScrollBar.Page'#3#242#1#4'Left'#3'3'#1#6'Height'#3#243#1#3'Top'#3#165#0
-  +#5'Width'#3#213#1#0#7'TButton'#8'OkButton'#7'Anchors'#11#5'akTop'#7'akRight'
-  +#8'akBottom'#0#7'Caption'#6#2'Ok'#11'ModalResult'#2#1#7'OnClick'#7#13'OkButt'
-  +'onCLICK'#8'TabOrder'#2#0#24'AnchorSideBottom.Control'#7#18'SaveSettingsButt'
-  +'on'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'H'#6'Height'#2#25#3
-  +'Top'#3#208#1#5'Width'#2'K'#0#0#7'TButton'#12'CancelButton'#7'Anchors'#11#5
-  +'akTop'#7'akRight'#8'akBottom'#0#7'Caption'#6#6'Cancel'#11'ModalResult'#2#2#8
-  +'TabOrder'#2#1#24'AnchorSideBottom.Control'#7#18'SaveSettingsButton'#21'Anch'
-  +'orSideBottom.Side'#7#9'asrBottom'#4'Left'#3's'#1#6'Height'#2#25#3'Top'#3#208
-  +#1#5'Width'#2'K'#0#0#9'TGroupBox'#15'DestDirGroupBox'#7'Anchors'#11#5'akTop'
-  +#6'akLeft'#7'akRight'#0#7'Caption'#6#21'Destination directory'#12'ClientHeig'
-  +'ht'#2'^'#11'ClientWidth'#3#190#1#11'ParentColor'#9#11'ParentCtl3D'#8#8'TabO'
-  +'rder'#2#2#8'OnResize'#7#21'DestDirGroupBoxRESIZE'#4'Left'#2#8#6'Height'#2'o'
-  +#3'Top'#2#8#5'Width'#3#194#1#0#6'TLabel'#17'CommandAfterLabel'#7'Anchors'#11
-  +#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6#14'Command after:'#5'Color'#7#6
-  +'clNone'#4'Left'#2#6#6'Height'#2#17#3'Top'#2'!'#5'Width'#3#172#1#0#0#9'TComb'
-  +'oBox'#15'DestDirComboBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#9'M'
-  +'axLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#0#4'Text'#6#15'DestDirComboBo'
-  +'x'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#1#5'Width'#3'x'#1#0#0#7'TBitBtn'#19
-  +'BrowseDestDirBitBtn'#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#8'Auto'
-  +'Size'#9#7'Caption'#6#3'...'#7'OnClick'#7#24'BrowseDestDirBitBtnCLICK'#8'Tab'
-  +'Order'#2#1#24'AnchorSideBottom.Control'#7#15'DestDirComboBox'#21'AnchorSide'
-  +'Bottom.Side'#7#9'asrBottom'#4'Left'#3#134#1#6'Height'#2#25#3'Top'#2#1#5'Wid'
-  +'th'#2'0'#0#0#9'TComboBox'#20'CommandAfterCombobox'#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#2#4'T'
-  +'ext'#6#20'CommandAfterCombobox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2':'#5'Wi'
-  +'dth'#3#174#1#0#0#0#9'TGroupBox'#13'FilesGroupbox'#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#7'Caption'#6#5'Files'#12'ClientHeight'#2#31#11'ClientW'
-  +'idth'#3#190#1#11'ParentColor'#9#11'ParentCtl3D'#8#8'TabOrder'#2#3#8'OnResiz'
-  +'e'#7#19'FilesGroupboxRESIZE'#4'Left'#2#8#6'Height'#2'0'#3'Top'#3#128#0#5'Wi'
-  +'dth'#3#194#1#0#9'TCheckBox'#22'IgnoreBinariesCheckbox'#11'AllowGrayed'#9#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6#15'Ignore binaries'
-  +#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#20#3'Top'#2#1#5'Width'#3#172#1#0#0#0
-  +#9'TGroupBox'#19'ProjectInfoGroupbox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akR'
-  +'ight'#0#7'Caption'#6#19'Project Information'#12'ClientHeight'#2'7'#11'Clien'
-  +'tWidth'#3#190#1#11'ParentColor'#9#11'ParentCtl3D'#8#8'TabOrder'#2#4#8'OnRes'
-  +'ize'#7#25'ProjectInfoGroupboxRESIZE'#4'Left'#2#8#6'Height'#2'H'#3'Top'#3'x'
-  +#1#5'Width'#3#194#1#0#9'TCheckBox!SaveClosedEditorFilesInfoCheckbox'#11'Allo'
-  +'wGrayed'#9#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6' Save'
-  +' editor info of closed files'#8'TabOrder'#2#0#4'Left'#2#4#6'Height'#2#20#3
-  +'Top'#2#1#5'Width'#3#176#1#0#0#9'TCheckBox''SaveEditorInfoOfNonProjectFilesC'
-  +'heckbox'#11'AllowGrayed'#9#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7
-  +'Caption'#6'%Save editor info of non project files'#8'TabOrder'#2#1#4'Left'#2
-  +#4#6'Height'#2#20#3'Top'#2#26#5'Width'#3#176#1#0#0#0#7'TButton'#18'SaveSetti'
-  +'ngsButton'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#7'Caption'#6#13
-  +'Save settings'#7'OnClick'#7#23'SaveSettingsButtonCLICK'#8'TabOrder'#2#5#4'L'
-  +'eft'#3#198#0#6'Height'#2#25#3'Top'#3#208#1#5'Width'#2'x'#0#0#9'TGroupBox'#21
-  +'IncludeFilterGroupbox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#7'Capt'
-  +'ion'#6#14'Include Filter'#12'ClientHeight'#2'G'#11'ClientWidth'#3#190#1#11
-  +'ParentColor'#9#11'ParentCtl3D'#8#8'TabOrder'#2#6#7'TabStop'#9#8'OnResize'#7
-  +#27'IncludeFilterGroupboxRESIZE'#4'Left'#2#8#6'Height'#2'X'#3'Top'#3#184#0#5
-  +'Width'#3#194#1#0#9'TCheckBox'#24'UseIncludeFilterCheckbox'#11'AllowGrayed'#9
-  +#7'Caption'#6#18'Use Include Filter'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2
-  +#20#3'Top'#2#1#5'Width'#3#171#0#0#0#9'TCheckBox'#29'IncFilterSimpleSyntaxChe'
-  +'ckbox'#11'AllowGrayed'#9#7'Caption'#6#13'Simple Syntax'#14'ParentShowHint'#8
-  +#8'ShowHint'#9#8'TabOrder'#2#1#4'Left'#3#199#0#6'Height'#2#20#3'Top'#2#1#5'W'
-  +'idth'#3#215#0#0#0#9'TComboBox'#21'IncludeFilterCombobox'#7'Anchors'#11#5'ak'
-  +'Top'#6'akLeft'#7'akRight'#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2
-  +#2#4'Text'#6#21'IncludeFilterCombobox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'!'
-  +#5'Width'#3#174#1#0#0#0#9'TGroupBox'#21'ExcludeFilterGroupbox'#7'Anchors'#11
-  ,#5'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6#14'Exclude Filter'#12'ClientHe'
-  +'ight'#2'G'#11'ClientWidth'#3#188#1#11'ParentColor'#9#11'ParentCtl3D'#8#8'Ta'
-  +'bOrder'#2#7#7'TabStop'#9#8'OnResize'#7#27'ExcludeFilterGroupboxRESIZE'#4'Le'
-  +'ft'#2#8#6'Height'#2'X'#3'Top'#3#24#1#5'Width'#3#192#1#0#9'TCheckBox'#24'Use'
-  +'ExcludeFilterCheckbox'#11'AllowGrayed'#9#7'Caption'#6#18'Use Exclude Filter'
-  +#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#20#3'Top'#2#1#5'Width'#3#184#0#0#0#9
-  +'TCheckBox'#29'ExcFilterSimpleSyntaxCheckbox'#11'AllowGrayed'#9#7'Caption'#6
-  +#13'Simple Syntax'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#1#4'Left'
-  +#3#199#0#6'Height'#2#20#3'Top'#2#1#5'Width'#3#212#0#0#0#9'TComboBox'#21'Excl'
-  +'udeFilterCombobox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#9'MaxLengt'
-  +'h'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#2#4'Text'#6#21'ExcludeFilterCombobox'
-  +#4'Left'#2#6#6'Height'#2#25#3'Top'#2'!'#5'Width'#3#174#1#0#0#0#0
+  'TPF0'#21'TPublishProjectDialog'#20'PublishProjectDialog'#13'ActiveControl'#7
+  +#15'DestDirComboBox'#11'BorderIcons'#11#12'biSystemMenu'#0#7'Caption'#6#15'P'
+  +'ublish Project'#12'ClientHeight'#3#249#1#11'ClientWidth'#3#228#1#8'OnCreate'
+  +#7#10'FormCreate'#8'OnResize'#7#26'PublishProjectDialogRESIZE'#13'PixelsPerI'
+  +'nch'#2'p'#8'Position'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3#227#1#18
+  +'VertScrollBar.Page'#3#248#1#4'Left'#3'3'#1#6'Height'#3#249#1#3'Top'#3#165#0
+  +#5'Width'#3#228#1#0#9'TGroupBox'#15'DestDirGroupBox'#5'Align'#7#5'alTop'#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#21'Destination directory'#12'ClientH'
+  +'eight'#2'^'#11'ClientWidth'#3#212#1#11'ParentCtl3D'#8#8'TabOrder'#2#0#8'OnR'
+  +'esize'#7#21'DestDirGroupBoxRESIZE'#4'Left'#2#6#6'Height'#2'o'#3'Top'#2#6#5
+  +'Width'#3#216#1#0#6'TLabel'#17'CommandAfterLabel'#7'Anchors'#11#5'akTop'#6'a'
+  +'kLeft'#7'akRight'#0#7'Caption'#6#14'Command after:'#5'Color'#7#6'clNone'#11
+  +'ParentColor'#8#4'Left'#2#6#6'Height'#2#13#3'Top'#2'!'#5'Width'#3#194#1#0#0#9
+  +'TComboBox'#15'DestDirComboBox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'
+  +#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#0#4'Text'#6#15'DestDirCo'
+  +'mboBox'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#1#5'Width'#3#158#1#0#0#7'TBitBt'
+  +'n'#19'BrowseDestDirBitBtn'#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#8
+  +'AutoSize'#9#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#3'...'#9'NumGlyp'
+  +'hs'#2#0#7'OnClick'#7#24'BrowseDestDirBitBtnCLICK'#8'TabOrder'#2#1#24'Anchor'
+  +'SideBottom.Control'#7#15'DestDirComboBox'#21'AnchorSideBottom.Side'#7#9'asr'
+  +'Bottom'#4'Left'#3#180#1#6'Height'#2#21#3'Top'#2#1#5'Width'#2#22#0#0#9'TComb'
+  +'oBox'#20'CommandAfterCombobox'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cbactSearchAscending'
+  +#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#2#4'Text'#6#20'CommandAf'
+  +'terCombobox'#4'Left'#2#6#6'Height'#2#21#3'Top'#2':'#5'Width'#3#196#1#0#0#0#9
+  +'TGroupBox'#13'FilesGroupbox'#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpa'
+  +'cing.Around'#2#6#7'Caption'#6#5'Files'#12'ClientHeight'#2'$'#11'ClientWidth'
+  +#3#212#1#11'ParentCtl3D'#8#8'TabOrder'#2#1#8'OnResize'#7#19'FilesGroupboxRES'
+  +'IZE'#4'Left'#2#6#6'Height'#2'5'#3'Top'#2'{'#5'Width'#3#216#1#0#9'TCheckBox'
+  +#22'IgnoreBinariesCheckbox'#5'Align'#7#5'alTop'#11'AllowGrayed'#9#20'BorderS'
+  +'pacing.Around'#2#6#7'Caption'#6#15'Ignore binaries'#8'TabOrder'#2#0#4'Left'
+  +#2#6#6'Height'#2#24#3'Top'#2#6#5'Width'#3#200#1#0#0#0#9'TGroupBox'#19'Projec'
+  +'tInfoGroupbox'#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#19'Project Information'#12'ClientHeight'#2'B'#11'ClientWidth'
+  +#3#212#1#11'ParentCtl3D'#8#8'TabOrder'#2#2#8'OnResize'#7#25'ProjectInfoGroup'
+  +'boxRESIZE'#4'Left'#2#6#6'Height'#2'S'#3'Top'#3'r'#1#5'Width'#3#216#1#0#9'TC'
+  +'heckBox!SaveClosedEditorFilesInfoCheckbox'#5'Align'#7#5'alTop'#11'AllowGray'
+  +'ed'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6' Save editor info of closed'
+  +' files'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#24#3'Top'#2#6#5'Width'#3#200
+  +#1#0#0#9'TCheckBox''SaveEditorInfoOfNonProjectFilesCheckbox'#5'Align'#7#5'al'
+  +'Top'#11'AllowGrayed'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6'%Save edit'
+  +'or info of non project files'#8'TabOrder'#2#1#4'Left'#2#6#6'Height'#2#24#3
+  +'Top'#2'$'#5'Width'#3#200#1#0#0#0#7'TButton'#18'SaveSettingsButton'#7'Anchor'
+  +'s'#11#5'akTop'#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Righ'
+  +'t'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#13'Save settings'#7'O'
+  +'nClick'#7#23'SaveSettingsButtonCLICK'#8'TabOrder'#2#3#21'AnchorSideTop.Cont'
+  +'rol'#7#12'CancelButton'#23'AnchorSideRight.Control'#7#12'CancelButton'#24'A'
+  +'nchorSideBottom.Control'#7#12'CancelButton'#21'AnchorSideBottom.Side'#7#9'a'
+  +'srBottom'#4'Left'#3#1#1#6'Height'#2#28#3'Top'#3#215#1#5'Width'#2'U'#0#0#9'T'
+  +'GroupBox'#21'IncludeFilterGroupbox'#5'Align'#7#5'alTop'#20'BorderSpacing.Ar'
+  +'ound'#2#6#7'Caption'#6#14'Include Filter'#12'ClientHeight'#2'G'#11'ClientWi'
+  +'dth'#3#212#1#11'ParentCtl3D'#8#8'TabOrder'#2#4#7'TabStop'#9#8'OnResize'#7#27
+  +'IncludeFilterGroupboxRESIZE'#4'Left'#2#6#6'Height'#2'X'#3'Top'#3#182#0#5'Wi'
+  +'dth'#3#216#1#0#9'TCheckBox'#24'UseIncludeFilterCheckbox'#11'AllowGrayed'#9#7
+  +'Caption'#6#18'Use Include Filter'#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2#24
+  +#3'Top'#2#1#5'Width'#2'}'#0#0#9'TCheckBox'#29'IncFilterSimpleSyntaxCheckbox'
+  +#11'AllowGrayed'#9#7'Caption'#6#13'Simple Syntax'#14'ParentShowHint'#8#8'Sho'
+  +'wHint'#9#8'TabOrder'#2#1#4'Left'#3#199#0#6'Height'#2#24#3'Top'#2#1#5'Width'
+  +#2'j'#0#0#9'TComboBox'#21'IncludeFilterCombobox'#7'Anchors'#11#5'akTop'#6'ak'
+  +'Left'#7'akRight'#0#16'AutoCompleteText'#11#22'cbactEndOfLineComplete'#20'cb'
+  +'actSearchAscending'#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#2#4
+  +'Text'#6#21'IncludeFilterCombobox'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'!'#5
+  +'Width'#3#196#1#0#0#0#9'TGroupBox'#21'ExcludeFilterGroupbox'#5'Align'#7#5'al'
+  ,'Top'#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'Exclude Filter'#12'Client'
+  +'Height'#2'G'#11'ClientWidth'#3#212#1#11'ParentCtl3D'#8#8'TabOrder'#2#5#7'Ta'
+  +'bStop'#9#8'OnResize'#7#27'ExcludeFilterGroupboxRESIZE'#4'Left'#2#6#6'Height'
+  +#2'X'#3'Top'#3#20#1#5'Width'#3#216#1#0#9'TCheckBox'#24'UseExcludeFilterCheck'
+  +'box'#11'AllowGrayed'#9#7'Caption'#6#18'Use Exclude Filter'#8'TabOrder'#2#0#4
+  +'Left'#2#6#6'Height'#2#24#3'Top'#2#1#5'Width'#3#129#0#0#0#9'TCheckBox'#29'Ex'
+  +'cFilterSimpleSyntaxCheckbox'#11'AllowGrayed'#9#7'Caption'#6#13'Simple Synta'
+  +'x'#14'ParentShowHint'#8#8'ShowHint'#9#8'TabOrder'#2#1#4'Left'#3#199#0#6'Hei'
+  +'ght'#2#24#3'Top'#2#1#5'Width'#2'j'#0#0#9'TComboBox'#21'ExcludeFilterCombobo'
+  +'x'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#16'AutoCompleteText'#11#22
+  +'cbactEndOfLineComplete'#20'cbactSearchAscending'#0#9'MaxLength'#2#0#11'Pare'
+  +'ntCtl3D'#8#8'TabOrder'#2#2#4'Text'#6#21'ExcludeFilterCombobox'#4'Left'#2#6#6
+  +'Height'#2#21#3'Top'#2'!'#5'Width'#3#198#1#0#0#0#7'TBitBtn'#8'OkButton'#7'An'
+  +'chors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2
+  +#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'
+  +#7#4'bkOK'#11'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#6#23'AnchorSid'
+  +'eRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'Ancho'
+  +'rSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
+  +'Left'#3#171#1#6'Height'#2#28#3'Top'#3#215#1#5'Width'#2'3'#0#0#7'TBitBtn'#12
+  +'CancelButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'Borde'
+  +'rSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#2#6'Cancel'#9#7'Captio'
+  +'n'#6#6'Cancel'#4'Kind'#7#8'bkCancel'#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8
+  +'TabOrder'#2#7#23'AnchorSideRight.Control'#7#8'OkButton'#24'AnchorSideBottom'
+  +'.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'\'#1
+  +#6'Height'#2#28#3'Top'#3#215#1#5'Width'#2'I'#0#0#0
 ]);
diff --git a/ide/publishprojectdlg.pas b/ide/publishprojectdlg.pas
index 93ea80e3d7..1c6a310064 100644
--- a/ide/publishprojectdlg.pas
+++ b/ide/publishprojectdlg.pas
@@ -47,6 +47,8 @@ type
   { TPublishProjectDialog }
 
   TPublishProjectDialog = class(TForm)
+    OkButton: TBitBtn;
+    CancelButton: TBitBtn;
     DestDirGroupBox: TGroupBox;
     DestDirComboBox: TComboBox;
     BrowseDestDirBitBtn: TBitBtn;
@@ -70,9 +72,7 @@ type
     SaveEditorInfoOfNonProjectFilesCheckbox: TCheckBox;
     SaveClosedEditorFilesInfoCheckbox: TCheckBox;
 
-    OkButton: TButton;
     SaveSettingsButton: TButton;
-    CancelButton: TButton;
     procedure BrowseDestDirBitBtnCLICK(Sender: TObject);
     procedure DestDirGroupBoxRESIZE(Sender: TObject);
     procedure ExcludeFilterGroupboxRESIZE(Sender: TObject);