diff --git a/ide/projectopts.lfm b/ide/projectopts.lfm
index ade65e70f3..2c6443b089 100644
--- a/ide/projectopts.lfm
+++ b/ide/projectopts.lfm
@@ -1,7 +1,7 @@
 object ProjectOptionsDialog: TProjectOptionsDialog
-  Left = 327
+  Left = 353
   Height = 378
-  Top = 80
+  Top = 195
   Width = 457
   HorzScrollBar.Page = 456
   VertScrollBar.Page = 377
@@ -15,7 +15,8 @@ object ProjectOptionsDialog: TProjectOptionsDialog
     Width = 457
     Align = alTop
     Anchors = [akTop, akLeft, akRight, akBottom]
-    PageIndex = 6
+    OnChangeBounds = NotebookChangeBounds
+    PageIndex = 1
     object ApplicationPage: TPage
       Caption = 'ApplicationPage'
       object AppSettingsGroupBox: TGroupBox
@@ -29,7 +30,7 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         TabOrder = 0
         object TitleLabel: TLabel
           Left = 6
-          Height = 14
+          Height = 15
           Top = 6
           Width = 425
           Align = alTop
@@ -43,7 +44,7 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         object TitleEdit: TEdit
           Left = 6
           Height = 23
-          Top = 20
+          Top = 21
           Width = 425
           Align = alTop
           BorderSpacing.Left = 6
@@ -63,7 +64,7 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         TabOrder = 1
         object TargetFileLabel: TLabel
           Left = 6
-          Height = 14
+          Height = 15
           Top = 6
           Width = 425
           Align = alTop
@@ -77,7 +78,7 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         object TargetFileEdit: TEdit
           Left = 6
           Height = 23
-          Top = 20
+          Top = 21
           Width = 425
           Align = alTop
           BorderSpacing.Left = 6
@@ -92,9 +93,9 @@ object ProjectOptionsDialog: TProjectOptionsDialog
       OnResize = FormsPageResize
       object FormsAutoCreatedLabel: TLabel
         Left = 36
-        Height = 14
+        Height = 15
         Top = 10
-        Width = 117
+        Width = 153
         Caption = 'FormsAutoCreatedLabel'
         Color = clNone
         ParentColor = False
@@ -102,9 +103,9 @@ object ProjectOptionsDialog: TProjectOptionsDialog
       object FormsAvailFormsLabel: TLabel
         AnchorSideLeft.Control = FormsAvailFormsListBox
         Left = 240
-        Height = 14
+        Height = 15
         Top = 10
-        Width = 107
+        Width = 143
         Caption = 'FormsAvailFormsLabel'
         Color = clNone
         ParentColor = False
@@ -114,7 +115,7 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         AnchorSideLeft.Side = asrBottom
         AnchorSideBottom.Control = FormsAutoCreateNewFormsCheckBox
         Left = 36
-        Height = 254
+        Height = 243
         Top = 32
         Width = 168
         Anchors = [akTop, akLeft, akBottom]
@@ -126,11 +127,13 @@ object ProjectOptionsDialog: TProjectOptionsDialog
       object FormsAvailFormsListBox: TListBox
         AnchorSideLeft.Control = FormsAddToAutoCreatedFormsBtn
         AnchorSideLeft.Side = asrBottom
+        AnchorSideRight.Control = FormsPage
+        AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = FormsAutoCreateNewFormsCheckBox
         Left = 240
-        Height = 254
+        Height = 243
         Top = 32
-        Width = 199
+        Width = 207
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         MultiSelect = True
@@ -174,8 +177,8 @@ object ProjectOptionsDialog: TProjectOptionsDialog
       end
       object FormsAutoCreateNewFormsCheckBox: TCheckBox
         Left = 6
-        Height = 13
-        Top = 292
+        Height = 22
+        Top = 281
         Width = 441
         Align = alBottom
         BorderSpacing.Around = 6
@@ -283,7 +286,7 @@ object ProjectOptionsDialog: TProjectOptionsDialog
           Left = 6
           Height = 108
           Top = 6
-          Width = 429
+          Width = 425
           Align = alTop
           BorderSpacing.Around = 6
           TabOrder = 0
@@ -313,13 +316,13 @@ object ProjectOptionsDialog: TProjectOptionsDialog
           Left = 6
           Height = 23
           Top = 154
-          Width = 365
+          Width = 361
           Anchors = [akTop, akLeft, akRight]
           TabOrder = 3
           Text = 'LazDocPathEdit'
         end
         object LazDocBrowseButton: TButton
-          Left = 376
+          Left = 372
           Height = 23
           Top = 154
           Width = 23
@@ -564,7 +567,7 @@ object ProjectOptionsDialog: TProjectOptionsDialog
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Side = asrBottom
         Left = 6
-        Height = 107
+        Height = 105
         Top = 198
         Width = 441
         Align = alBottom
@@ -634,7 +637,7 @@ object ProjectOptionsDialog: TProjectOptionsDialog
           AnchorSideBottom.Side = asrBottom
           Left = 341
           Height = 26
-          Top = 75
+          Top = 73
           Width = 94
           Anchors = [akRight, akBottom]
           AutoSize = True
@@ -694,8 +697,8 @@ object ProjectOptionsDialog: TProjectOptionsDialog
   end
   object CancelButton: TButton
     Left = 371
-    Height = 26
-    Top = 346
+    Height = 28
+    Top = 344
     Width = 75
     Anchors = [akRight, akBottom]
     AutoSize = True
@@ -709,8 +712,8 @@ object ProjectOptionsDialog: TProjectOptionsDialog
   object OKButton: TButton
     AnchorSideRight.Control = CancelButton
     Left = 280
-    Height = 26
-    Top = 346
+    Height = 28
+    Top = 344
     Width = 75
     Anchors = [akRight, akBottom]
     AutoSize = True
diff --git a/ide/projectopts.lrs b/ide/projectopts.lrs
index e4bd55d11d..cd06a5a14a 100644
--- a/ide/projectopts.lrs
+++ b/ide/projectopts.lrs
@@ -1,50 +1,52 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TProjectOptionsDialog','FORMDATA',[
-  'TPF0'#21'TProjectOptionsDialog'#20'ProjectOptionsDialog'#4'Left'#3'G'#1#6'He'
-  +'ight'#3'z'#1#3'Top'#2'P'#5'Width'#3#201#1#18'HorzScrollBar.Page'#3#200#1#18
-  +'VertScrollBar.Page'#3'y'#1#13'ActiveControl'#7#13'RSTOutDirEdit'#7'Caption'
-  +#6#20'ProjectOptionsDialog'#7'OnClose'#7#19'ProjectOptionsClose'#8'OnCreate'
-  +#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'#0#9'TNotebook'#8'Notebook'
-  +#6'Height'#3'U'#1#5'Width'#3#201#1#5'Align'#7#5'alTop'#7'Anchors'#11#5'akTop'
-  +#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#6#0#5'TPage'#15'Applicati'
-  +'onPage'#7'Caption'#6#15'ApplicationPage'#0#9'TGroupBox'#19'AppSettingsGroup'
-  +'Box'#4'Left'#2#6#6'Height'#2'I'#3'Top'#2#6#5'Width'#3#185#1#5'Align'#7#5'al'
-  +'Top'#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'AppSettingsGroupBox'#8'Ta'
-  +'bOrder'#2#0#0#6'TLabel'#10'TitleLabel'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6
-  +#5'Width'#3#169#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSp'
-  +'acing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#10'TitleLabel'#5'Co'
-  +'lor'#7#6'clNone'#11'ParentColor'#8#0#0#5'TEdit'#9'TitleEdit'#4'Left'#2#6#6
-  +'Height'#2#23#3'Top'#2#20#5'Width'#3#169#1#5'Align'#7#5'alTop'#18'BorderSpac'
-  +'ing.Left'#2#6#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#0#4'Text'#6#9'Title'
-  +'Edit'#0#0#0#9'TGroupBox'#22'OutputSettingsGroupBox'#4'Left'#2#6#6'Height'#2
-  +'I'#3'Top'#2'U'#5'Width'#3#185#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'
-  +#2#6#7'Caption'#6#22'OutputSettingsGroupBox'#8'TabOrder'#2#1#0#6'TLabel'#15
-  +'TargetFileLabel'#4'Left'#2#6#6'Height'#2#14#3'Top'#2#6#5'Width'#3#169#1#5'A'
-  +'lign'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'Bo'
-  +'rderSpacing.Right'#2#6#7'Caption'#6#15'TargetFileLabel'#5'Color'#7#6'clNone'
-  +#11'ParentColor'#8#0#0#5'TEdit'#14'TargetFileEdit'#4'Left'#2#6#6'Height'#2#23
-  +#3'Top'#2#20#5'Width'#3#169#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6
-  +#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#0#4'Text'#6#14'TargetFileEdit'#0#0
-  +#0#0#5'TPage'#9'FormsPage'#7'Caption'#6#9'FormsPage'#8'OnResize'#7#15'FormsP'
-  +'ageResize'#0#6'TLabel'#21'FormsAutoCreatedLabel'#4'Left'#2'$'#6'Height'#2#14
-  +#3'Top'#2#10#5'Width'#2'u'#7'Caption'#6#21'FormsAutoCreatedLabel'#5'Color'#7
-  +#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#20'FormsAvailFormsLabel'#22'Ancho'
-  +'rSideLeft.Control'#7#22'FormsAvailFormsListBox'#4'Left'#3#240#0#6'Height'#2
-  +#14#3'Top'#2#10#5'Width'#2'k'#7'Caption'#6#20'FormsAvailFormsLabel'#5'Color'
-  +#7#6'clNone'#11'ParentColor'#8#0#0#8'TListBox'#23'FormsAutoCreatedListBox'#22
-  +'AnchorSideLeft.Control'#7#29'FormsMoveAutoCreatedFormUpBtn'#19'AnchorSideLe'
-  +'ft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#31'FormsAutoCreateNe'
-  +'wFormsCheckBox'#4'Left'#2'$'#6'Height'#3#254#0#3'Top'#2' '#5'Width'#3#168#0
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6
-  +#11'MultiSelect'#9#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#8'TListBox'#22'Form'
-  +'sAvailFormsListBox'#22'AnchorSideLeft.Control'#7#29'FormsAddToAutoCreatedFo'
-  +'rmsBtn'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'
-  +#7#31'FormsAutoCreateNewFormsCheckBox'#4'Left'#3#240#0#6'Height'#3#254#0#3'T'
-  +'op'#2' '#5'Width'#3#199#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akB'
-  +'ottom'#0#20'BorderSpacing.Around'#2#6#11'MultiSelect'#9#8'TabOrder'#2#1#8'T'
-  +'opIndex'#2#255#0#0#6'TArrow'#29'FormsMoveAutoCreatedFormUpBtn'#4'Left'#2#6#6
-  +'Height'#2#24#3'Top'#2' '#5'Width'#2#24#9'ArrowType'#7#4'atUp'#7'OnClick'#7
+  'TPF0'#21'TProjectOptionsDialog'#20'ProjectOptionsDialog'#4'Left'#3'a'#1#6'He'
+  +'ight'#3'z'#1#3'Top'#3#195#0#5'Width'#3#201#1#18'HorzScrollBar.Page'#3#200#1
+  +#18'VertScrollBar.Page'#3'y'#1#13'ActiveControl'#7#13'RSTOutDirEdit'#7'Capti'
+  +'on'#6#20'ProjectOptionsDialog'#7'OnClose'#7#19'ProjectOptionsClose'#8'OnCre'
+  +'ate'#7#10'FormCreate'#8'Position'#7#14'poScreenCenter'#0#9'TNotebook'#8'Not'
+  +'ebook'#6'Height'#3'U'#1#5'Width'#3#201#1#5'Align'#7#5'alTop'#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#14'OnChangeBounds'#7#20'NotebookC'
+  +'hangeBounds'#9'PageIndex'#2#1#0#5'TPage'#15'ApplicationPage'#7'Caption'#6#15
+  +'ApplicationPage'#0#9'TGroupBox'#19'AppSettingsGroupBox'#4'Left'#2#6#6'Heigh'
+  +'t'#2'I'#3'Top'#2#6#5'Width'#3#185#1#5'Align'#7#5'alTop'#20'BorderSpacing.Ar'
+  +'ound'#2#6#7'Caption'#6#19'AppSettingsGroupBox'#8'TabOrder'#2#0#0#6'TLabel'
+  +#10'TitleLabel'#4'Left'#2#6#6'Height'#2#15#3'Top'#2#6#5'Width'#3#169#1#5'Ali'
+  +'gn'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'Bord'
+  +'erSpacing.Right'#2#6#7'Caption'#6#10'TitleLabel'#5'Color'#7#6'clNone'#11'Pa'
+  +'rentColor'#8#0#0#5'TEdit'#9'TitleEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2
+  +#21#5'Width'#3#169#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'Borde'
+  +'rSpacing.Right'#2#6#8'TabOrder'#2#0#4'Text'#6#9'TitleEdit'#0#0#0#9'TGroupBo'
+  +'x'#22'OutputSettingsGroupBox'#4'Left'#2#6#6'Height'#2'I'#3'Top'#2'U'#5'Widt'
+  +'h'#3#185#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#22
+  +'OutputSettingsGroupBox'#8'TabOrder'#2#1#0#6'TLabel'#15'TargetFileLabel'#4'L'
+  +'eft'#2#6#6'Height'#2#15#3'Top'#2#6#5'Width'#3#169#1#5'Align'#7#5'alTop'#18
+  +'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2
+  +#6#7'Caption'#6#15'TargetFileLabel'#5'Color'#7#6'clNone'#11'ParentColor'#8#0
+  +#0#5'TEdit'#14'TargetFileEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#21#5'Widt'
+  +'h'#3#169#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.'
+  +'Right'#2#6#8'TabOrder'#2#0#4'Text'#6#14'TargetFileEdit'#0#0#0#0#5'TPage'#9
+  +'FormsPage'#7'Caption'#6#9'FormsPage'#8'OnResize'#7#15'FormsPageResize'#0#6
+  +'TLabel'#21'FormsAutoCreatedLabel'#4'Left'#2'$'#6'Height'#2#15#3'Top'#2#10#5
+  +'Width'#3#153#0#7'Caption'#6#21'FormsAutoCreatedLabel'#5'Color'#7#6'clNone'
+  +#11'ParentColor'#8#0#0#6'TLabel'#20'FormsAvailFormsLabel'#22'AnchorSideLeft.'
+  +'Control'#7#22'FormsAvailFormsListBox'#4'Left'#3#240#0#6'Height'#2#15#3'Top'
+  +#2#10#5'Width'#3#143#0#7'Caption'#6#20'FormsAvailFormsLabel'#5'Color'#7#6'cl'
+  +'None'#11'ParentColor'#8#0#0#8'TListBox'#23'FormsAutoCreatedListBox'#22'Anch'
+  +'orSideLeft.Control'#7#29'FormsMoveAutoCreatedFormUpBtn'#19'AnchorSideLeft.S'
+  +'ide'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#31'FormsAutoCreateNewFor'
+  +'msCheckBox'#4'Left'#2'$'#6'Height'#3#243#0#3'Top'#2' '#5'Width'#3#168#0#7'A'
+  +'nchors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#11
+  +'MultiSelect'#9#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#8'TListBox'#22'FormsAv'
+  +'ailFormsListBox'#22'AnchorSideLeft.Control'#7#29'FormsAddToAutoCreatedForms'
+  +'Btn'#19'AnchorSideLeft.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#9
+  +'FormsPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Cont'
+  +'rol'#7#31'FormsAutoCreateNewFormsCheckBox'#4'Left'#3#240#0#6'Height'#3#243#0
+  +#3'Top'#2' '#5'Width'#3#207#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
+  +'akBottom'#0#20'BorderSpacing.Around'#2#6#11'MultiSelect'#9#8'TabOrder'#2#1#8
+  +'TopIndex'#2#255#0#0#6'TArrow'#29'FormsMoveAutoCreatedFormUpBtn'#4'Left'#2#6
+  +#6'Height'#2#24#3'Top'#2' '#5'Width'#2#24#9'ArrowType'#7#4'atUp'#7'OnClick'#7
   +'"FormsMoveAutoCreatedFormUpBtnClick'#0#0#6'TArrow FormsMoveAutoCreatedForms'
   +'DownBtn'#4'Left'#2#6#6'Height'#2#24#3'Top'#2'<'#5'Width'#2#24#9'ArrowType'#7
   +#6'atDown'#7'OnClick'#7'$FormsMoveAutoCreatedFormDownBtnClick'#0#0#6'TArrow"'
@@ -55,17 +57,17 @@ LazarusResources.Add('TProjectOptionsDialog','FORMDATA',[
   +#0#6'TArrow'#29'FormsAddToAutoCreatedFormsBtn'#22'AnchorSideLeft.Control'#7
   +'"FormsRemoveFromAutoCreatedFormsBtn'#4'Left'#3#210#0#6'Height'#2#24#3'Top'#2
   +'<'#5'Width'#2#24#7'OnClick'#7'"FormsAddToAutoCreatedFormsBtnClick'#0#0#9'TC'
-  +'heckBox'#31'FormsAutoCreateNewFormsCheckBox'#4'Left'#2#6#6'Height'#2#13#3'T'
-  +'op'#3'$'#1#5'Width'#3#185#1#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'
+  +'heckBox'#31'FormsAutoCreateNewFormsCheckBox'#4'Left'#2#6#6'Height'#2#22#3'T'
+  +'op'#3#25#1#5'Width'#3#185#1#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'
   +#2#6#7'Caption'#6#31'FormsAutoCreateNewFormsCheckBox'#8'TabOrder'#2#2#0#0#0#5
   +'TPage'#8'MiscPage'#7'Caption'#6#8'MiscPage'#0#9'TCheckBox)MainUnitHasUsesSe'
   +'ctionForAllUnitsCheckBox'#21'AnchorSideTop.Control'#7#30'MainUnitIsPascalSo'
   +'urceCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
   +#20#3'Top'#2' '#5'Width'#3#185#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2
   +#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2#6#7'Caption'#6')MainU'
-  +'nitHasUsesSectionForAllUnitsCheckBox'#8'TabOrder'#2#0#0#0#9'TCheckBox''Main'
+  ,'nitHasUsesSectionForAllUnitsCheckBox'#8'TabOrder'#2#0#0#0#9'TCheckBox''Main'
   +'UnitHasCreateFormStatementsCheckBox'#21'AnchorSideTop.Control'#7')MainUnitH'
-  ,'asUsesSectionForAllUnitsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L'
+  +'asUsesSectionForAllUnitsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L'
   +'eft'#2#6#6'Height'#2#20#3'Top'#2'6'#5'Width'#3#185#1#5'Align'#7#5'alTop'#18
   +'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#2#19'BorderSpacing.Right'#2
   +#6#7'Caption'#6'''MainUnitHasCreateFormStatementsCheckBox'#8'TabOrder'#2#1#0
@@ -91,7 +93,7 @@ LazarusResources.Add('TProjectOptionsDialog','FORMDATA',[
   +'oupBox'#19'LazDocPathsGroupBox'#4'Left'#2#6#6'Height'#3#210#0#3'Top'#2#6#5
   +'Width'#3#185#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6
   +#19'LazDocPathsGroupBox'#8'TabOrder'#2#0#0#8'TListBox'#13'LazDocListBox'#4'L'
-  +'eft'#2#6#6'Height'#2'l'#3'Top'#2#6#5'Width'#3#173#1#5'Align'#7#5'alTop'#20
+  +'eft'#2#6#6'Height'#2'l'#3'Top'#2#6#5'Width'#3#169#1#5'Align'#7#5'alTop'#20
   +'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#8'TopIndex'#2#255#0#0#7'TButton'
   +#19'LazDocAddPathButton'#4'Left'#2#6#6'Height'#2#25#3'Top'#2'z'#5'Width'#2'K'
   +#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#19'LazDocAddPathButton'#7'On'
@@ -99,9 +101,9 @@ LazarusResources.Add('TProjectOptionsDialog','FORMDATA',[
   +'DocDeletePathButton'#4'Left'#2'Z'#6'Height'#2#25#3'Top'#2'z'#5'Width'#2'K'
   +#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#22'LazDocDeletePathButton'#7
   +'OnClick'#7#27'LazDocDeletePathButtonClick'#8'TabOrder'#2#2#0#0#5'TEdit'#14
-  +'LazDocPathEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#154#0#5'Width'#3'm'#1#7
+  +'LazDocPathEdit'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#154#0#5'Width'#3'i'#1#7
   +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#3#4'Text'#6#14'La'
-  +'zDocPathEdit'#0#0#7'TButton'#18'LazDocBrowseButton'#4'Left'#3'x'#1#6'Height'
+  +'zDocPathEdit'#0#0#7'TButton'#18'LazDocBrowseButton'#4'Left'#3't'#1#6'Height'
   +#2#23#3'Top'#3#154#0#5'Width'#2#23#7'Anchors'#11#5'akTop'#7'akRight'#0#25'Bo'
   +'rderSpacing.InnerBorder'#2#4#7'Caption'#6#3'...'#7'OnClick'#7#23'LazDocBrow'
   +'seButtonClick'#8'TabOrder'#2#4#0#0#0#0#5'TPage'#8'SavePage'#7'Caption'#6#8
@@ -127,9 +129,9 @@ LazarusResources.Add('TProjectOptionsDialog','FORMDATA',[
   +'ption'#6#15'VersionInfoPage'#0#9'TGroupBox'#19'VersionInfoGroupBox'#22'Anch'
   +'orSideLeft.Control'#7#24'LanguageSettingsGroupBox'#21'AnchorSideTop.Control'
   +#7#22'UseVersionInfoCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Ancho'
-  +'rSideRight.Control'#7#24'LanguageSettingsGroupBox'#20'AnchorSideRight.Side'
+  ,'rSideRight.Control'#7#24'LanguageSettingsGroupBox'#20'AnchorSideRight.Side'
   +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'I'#3'Top'#2' '#5'Width'#3#185#1#7'An'
-  ,'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#7'Capti'
+  +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#7'Capti'
   +'on'#6#17'Version Numbering'#8'TabOrder'#2#0#0#6'TLabel'#12'VersionLabel'#4
   +'Left'#2#6#6'Height'#2#13#3'Top'#2#2#5'Width'#2'/'#7'Caption'#6#8'Version:'#5
   +'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#18'MajorRevisionLabel'#22
@@ -183,7 +185,7 @@ LazarusResources.Add('TProjectOptionsDialog','FORMDATA',[
   +#4'Text'#6#12'Multilingual'#0#0#0#9'TGroupBox'#17'OtherInfoGroupBox'#21'Anch'
   +'orSideTop.Control'#7#24'LanguageSettingsGroupBox'#18'AnchorSideTop.Side'#7#9
   +'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
-  +'k'#3'Top'#3#198#0#5'Width'#3#185#1#5'Align'#7#8'alBottom'#7'Anchors'#11#5'a'
+  +'i'#3'Top'#3#198#0#5'Width'#3#185#1#5'Align'#7#8'alBottom'#7'Anchors'#11#5'a'
   +'kTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#10'O'
   +'ther Info'#8'TabOrder'#2#3#0#6'TLabel'#16'DescriptionLabel'#21'AnchorSideTo'
   +'p.Control'#7#15'DescriptionEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Le'
@@ -191,9 +193,9 @@ LazarusResources.Add('TProjectOptionsDialog','FORMDATA',[
   +':'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#6'TLabel'#14'CopyrightLabel'
   +#21'AnchorSideTop.Control'#7#13'CopyrightEdit'#18'AnchorSideTop.Side'#7#9'as'
   +'rCenter'#4'Left'#2#6#6'Height'#2#13#3'Top'#2#30#5'Width'#2':'#7'Caption'#6
-  +#10'Copyright:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5'TEdit'#15'Descr'
+  ,#10'Copyright:'#5'Color'#7#6'clNone'#11'ParentColor'#8#0#0#5'TEdit'#15'Descr'
   +'iptionEdit'#22'AnchorSideLeft.Control'#7#16'DescriptionLabel'#19'AnchorSide'
-  ,'Left.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#17'OtherInfoGroupBo'
+  +'Left.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#17'OtherInfoGroupBo'
   +'x'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'O'#6'Height'#2#21#3'To'
   +'p'#2#255#5'Width'#3'd'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'B'
   +'orderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#0#0#0#5'TE'
@@ -208,7 +210,7 @@ LazarusResources.Add('TProjectOptionsDialog','FORMDATA',[
   +'ttom'#23'AnchorSideRight.Control'#7#17'OtherInfoGroupBox'#20'AnchorSideRigh'
   +'t.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'OtherInfoGroupBox'
   +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'U'#1#6'Height'#2#26#3'To'
-  +'p'#2'K'#5'Width'#2'^'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9
+  +'p'#2'I'#5'Width'#2'^'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9
   +#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6
   +#15'Additional Info'#7'OnClick'#7#25'AdditionalInfoButtonClick'#8'TabOrder'#2
   +#2#0#0#0#0#5'TPage'#8'i18nPage'#7'Caption'#6#4'i18n'#0#9'TGroupBox'#11'RSTGr'
@@ -228,11 +230,11 @@ LazarusResources.Add('TProjectOptionsDialog','FORMDATA',[
   +'h'#2#23#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#8'AutoSize'#9#25'Bo'
   +'rderSpacing.InnerBorder'#2#4#7'Caption'#6#3'...'#7'OnClick'#7#20'RSTOutDirB'
   +'uttonClick'#8'TabOrder'#2#1#0#0#0#0#0#7'TButton'#12'CancelButton'#4'Left'#3
-  +'s'#1#6'Height'#2#26#3'Top'#3'Z'#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8
+  +'s'#1#6'Height'#2#28#3'Top'#3'X'#1#5'Width'#2'K'#7'Anchors'#11#7'akRight'#8
   +'akBottom'#0#8'AutoSize'#9#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'C'
   +'aption'#6#6'Cancel'#20'Constraints.MinWidth'#2'K'#11'ModalResult'#2#2#8'Tab'
   +'Order'#2#1#0#0#7'TButton'#8'OKButton'#23'AnchorSideRight.Control'#7#12'Canc'
-  +'elButton'#4'Left'#3#24#1#6'Height'#2#26#3'Top'#3'Z'#1#5'Width'#2'K'#7'Ancho'
+  +'elButton'#4'Left'#3#24#1#6'Height'#2#28#3'Top'#3'X'#1#5'Width'#2'K'#7'Ancho'
   +'rs'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#10
   +#20'BorderSpacing.Around'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6
   +#2'OK'#20'Constraints.MinWidth'#2'K'#7'Default'#9#11'ModalResult'#2#1#8'TabO'
diff --git a/ide/projectopts.pp b/ide/projectopts.pp
index 36f0d4ee5d..cb0cf2703b 100644
--- a/ide/projectopts.pp
+++ b/ide/projectopts.pp
@@ -138,6 +138,7 @@ type
     procedure LazDocAddPathButtonClick(Sender: TObject);
     procedure LazDocBrowseButtonClick(Sender: TObject);
     procedure LazDocDeletePathButtonClick(Sender: TObject);
+    procedure NotebookChangeBounds(Sender: TObject);
     procedure ProjectOptionsClose(Sender: TObject;
                                   var CloseAction: TCloseAction);
     procedure FormsAddToAutoCreatedFormsBtnClick(Sender: TObject);
@@ -520,6 +521,11 @@ begin
     LazDocListBox.Items.Delete(LazDocListBox.ItemIndex);
 end;
 
+procedure TProjectOptionsDialog.NotebookChangeBounds(Sender: TObject);
+begin
+
+end;
+
 function TProjectOptionsDialog.GetAutoCreatedFormsList: TStrings;
 var
   i, j: Integer;