diff --git a/packager/pkgoptionsdlg.lfm b/packager/pkgoptionsdlg.lfm
index 51350c3dbf..5aed01e3cb 100644
--- a/packager/pkgoptionsdlg.lfm
+++ b/packager/pkgoptionsdlg.lfm
@@ -12,29 +12,27 @@ object PackageOptionsDialog: TPackageOptionsDialog
   LCLVersion = '0.9.27'
   object Notebook: TNotebook
     Left = 0
-    Height = 392
+    Height = 393
     Top = 0
     Width = 528
-    Align = alTop
-    Anchors = [akTop, akLeft, akRight, akBottom]
+    Align = alClient
     PageIndex = 1
     TabOrder = 0
     object UsagePage: TPage
       Caption = 'Usage'
-      ClientWidth = 526
-      ClientHeight = 365
+      ClientWidth = 520
+      ClientHeight = 366
       object AddPathsGroupBox: TGroupBox
         AnchorSideRight.Side = asrBottom
         Left = 6
         Height = 128
         Top = 6
-        Width = 514
+        Width = 508
         Align = alTop
         BorderSpacing.Around = 6
         Caption = 'Add paths to dependent packages/projects'
-        ClientHeight = 109
-        ClientWidth = 510
-        Ctl3D = False
+        ClientHeight = 110
+        ClientWidth = 504
         TabOrder = 0
         object UnitPathLabel: TLabel
           Left = 6
@@ -75,7 +73,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           Left = 80
           Height = 23
           Top = 0
-          Width = 380
+          Width = 374
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Right = 50
           TabOrder = 0
@@ -87,7 +85,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           Left = 80
           Height = 23
           Top = 27
-          Width = 380
+          Width = 374
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Right = 50
           TabOrder = 1
@@ -99,7 +97,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           Left = 80
           Height = 23
           Top = 54
-          Width = 380
+          Width = 374
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Right = 50
           TabOrder = 2
@@ -111,7 +109,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           Left = 80
           Height = 23
           Top = 81
-          Width = 380
+          Width = 374
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Left = 80
           BorderSpacing.Right = 50
@@ -123,15 +121,14 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 172
+        Height = 173
         Top = 140
-        Width = 514
+        Width = 508
         Align = alClient
         BorderSpacing.Around = 6
         Caption = 'Add options to dependent packages and projects'
-        ClientHeight = 153
-        ClientWidth = 510
-        Ctl3D = False
+        ClientHeight = 155
+        ClientWidth = 504
         TabOrder = 1
         object LinkerOptionsLabel: TLabel
           AnchorSideTop.Control = LinkerOptionsMemo
@@ -159,7 +156,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           Left = 67
           Height = 62
           Top = 6
-          Width = 437
+          Width = 431
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Top = 6
           BorderSpacing.Right = 6
@@ -176,9 +173,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideBottom.Control = AddOptionsGroupBox
           AnchorSideBottom.Side = asrBottom
           Left = 67
-          Height = 73
+          Height = 75
           Top = 74
-          Width = 437
+          Width = 431
           Anchors = [akTop, akLeft, akRight, akBottom]
           BorderSpacing.Left = 10
           BorderSpacing.Top = 6
@@ -191,21 +188,20 @@ object PackageOptionsDialog: TPackageOptionsDialog
       object ProjectGroupBox: TGroupBox
         Left = 6
         Height = 41
-        Top = 318
-        Width = 514
+        Top = 319
+        Width = 508
         Align = alBottom
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'ProjectGroupBox'
-        ClientHeight = 22
-        ClientWidth = 510
-        Ctl3D = False
+        ClientHeight = 23
+        ClientWidth = 504
         TabOrder = 2
         object AddPackageUnitToProjectCheckBox: TCheckBox
           Left = 6
           Height = 22
           Top = 0
-          Width = 498
+          Width = 492
           Align = alTop
           BorderSpacing.Left = 6
           BorderSpacing.Right = 6
@@ -216,23 +212,22 @@ object PackageOptionsDialog: TPackageOptionsDialog
     end
     object Usage2Page: TPage
       Caption = 'Usage2'
-      ClientWidth = 526
-      ClientHeight = 365
+      ClientWidth = 520
+      ClientHeight = 367
       object ConditionalsGroupBox: TGroupBox
         Left = 0
         Height = 199
         Top = 0
-        Width = 526
+        Width = 520
         Align = alTop
         Caption = 'ConditionalsGroupBox'
-        Ctl3D = False
         TabOrder = 0
       end
     end
     object DescriptionPage: TPage
       Caption = 'Description'
-      ClientWidth = 526
-      ClientHeight = 365
+      ClientWidth = 520
+      ClientHeight = 366
       object DescriptionGroupBox: TGroupBox
         AnchorSideLeft.Control = DescriptionPage
         AnchorSideTop.Control = DescriptionPage
@@ -241,13 +236,12 @@ object PackageOptionsDialog: TPackageOptionsDialog
         Left = 6
         Height = 96
         Top = 6
-        Width = 514
+        Width = 508
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Around = 6
         Caption = 'Description/Abstract'
-        ClientHeight = 77
-        ClientWidth = 510
-        Ctl3D = False
+        ClientHeight = 78
+        ClientWidth = 504
         TabOrder = 0
         object DescriptionMemo: TMemo
           AnchorSideLeft.Control = DescriptionGroupBox
@@ -257,9 +251,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideBottom.Control = DescriptionGroupBox
           AnchorSideBottom.Side = asrBottom
           Left = 6
-          Height = 65
+          Height = 66
           Top = 6
-          Width = 498
+          Width = 492
           Align = alClient
           BorderSpacing.Around = 6
           ScrollBars = ssAutoBoth
@@ -276,14 +270,13 @@ object PackageOptionsDialog: TPackageOptionsDialog
         Left = 6
         Height = 39
         Top = 108
-        Width = 514
+        Width = 508
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'Author:'
-        ClientHeight = 20
-        ClientWidth = 510
-        Ctl3D = False
+        ClientHeight = 21
+        ClientWidth = 504
         TabOrder = 1
         object AuthorEdit: TEdit
           AnchorSideRight.Side = asrBottom
@@ -292,7 +285,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           Left = 6
           Height = 23
           Top = 6
-          Width = 498
+          Width = 492
           Align = alTop
           BorderSpacing.Around = 6
           TabOrder = 0
@@ -306,15 +299,14 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = VersionGroupBox
         Left = 6
-        Height = 100
+        Height = 101
         Top = 153
-        Width = 514
+        Width = 508
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'License:'
-        ClientHeight = 81
-        ClientWidth = 510
-        Ctl3D = False
+        ClientHeight = 83
+        ClientWidth = 504
         TabOrder = 2
         object LicenseMemo: TMemo
           AnchorSideLeft.Control = LicenseGroupBox
@@ -324,9 +316,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideBottom.Control = LicenseGroupBox
           AnchorSideBottom.Side = asrBottom
           Left = 6
-          Height = 69
+          Height = 71
           Top = 6
-          Width = 498
+          Width = 492
           Align = alClient
           BorderSpacing.Around = 6
           ScrollBars = ssAutoBoth
@@ -343,14 +335,13 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideBottom.Side = asrBottom
         Left = 6
         Height = 100
-        Top = 259
-        Width = 514
+        Top = 260
+        Width = 508
         Align = alBottom
         BorderSpacing.Around = 6
         Caption = 'Version'
-        ClientHeight = 81
-        ClientWidth = 510
-        Ctl3D = False
+        ClientHeight = 82
+        ClientWidth = 504
         TabOrder = 3
         object VersionMajorLabel: TLabel
           Left = 6
@@ -435,8 +426,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
     end
     object IDEPage: TPage
       Caption = 'IDE Integration'
-      ClientWidth = 526
-      ClientHeight = 365
+      ClientWidth = 520
+      ClientHeight = 366
       object PkgTypeRadioGroup: TRadioGroup
         AnchorSideLeft.Control = IDEPage
         AnchorSideTop.Control = IDEPage
@@ -445,7 +436,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
         Left = 6
         Height = 116
         Top = 6
-        Width = 514
+        Width = 508
         Anchors = [akTop, akLeft, akRight]
         AutoFill = True
         BorderSpacing.Around = 6
@@ -458,9 +449,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
         ChildSizing.ShrinkVertical = crsScaleChilds
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 97
-        ClientWidth = 510
-        Ctl3D = False
+        ClientHeight = 98
+        ClientWidth = 504
         ItemIndex = 2
         Items.Strings = (
           'Designtime only'
@@ -479,7 +469,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
         Left = 6
         Height = 116
         Top = 128
-        Width = 514
+        Width = 508
         Anchors = [akTop, akLeft, akRight]
         AutoFill = True
         BorderSpacing.Around = 6
@@ -492,9 +482,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
         ChildSizing.ShrinkVertical = crsScaleChilds
         ChildSizing.Layout = cclLeftToRightThenTopToBottom
         ChildSizing.ControlsPerLine = 1
-        ClientHeight = 97
-        ClientWidth = 510
-        Ctl3D = False
+        ClientHeight = 98
+        ClientWidth = 504
         ItemIndex = 0
         Items.Strings = (
           'Automatically rebuild as needed'
@@ -512,14 +501,13 @@ object PackageOptionsDialog: TPackageOptionsDialog
         Left = 6
         Height = 54
         Top = 250
-        Width = 514
+        Width = 508
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'LazDoc - Lazarus documentation'
-        ClientHeight = 35
-        ClientWidth = 510
-        Ctl3D = False
+        ClientHeight = 36
+        ClientWidth = 504
         TabOrder = 2
         object LazDocPathEdit: TEdit
           AnchorSideLeft.Control = LazDocGroupBox
@@ -527,7 +515,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           Left = 6
           Height = 23
           Top = 6
-          Width = 418
+          Width = 412
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 6
           TabOrder = 0
@@ -536,8 +524,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
     end
     object ProvidesPage: TPage
       Caption = 'Provides'
-      ClientWidth = 526
-      ClientHeight = 365
+      ClientWidth = 520
+      ClientHeight = 366
       object ProvidesGroupBox: TGroupBox
         AnchorSideLeft.Control = ProvidesPage
         AnchorSideTop.Control = ProvidesPage
@@ -546,16 +534,15 @@ object PackageOptionsDialog: TPackageOptionsDialog
         AnchorSideBottom.Control = ProvidesPage
         AnchorSideBottom.Side = asrBottom
         Left = 6
-        Height = 353
+        Height = 354
         Top = 6
-        Width = 514
+        Width = 508
         Align = alBottom
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Around = 6
         Caption = 'This package provides the same as the following packages:'
-        ClientHeight = 334
-        ClientWidth = 510
-        Ctl3D = False
+        ClientHeight = 336
+        ClientWidth = 504
         TabOrder = 0
         object ProvidesMemo: TMemo
           AnchorSideLeft.Control = ProvidesGroupBox
@@ -564,9 +551,9 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideBottom.Control = ProvidesGroupBox
           AnchorSideBottom.Side = asrBottom
           Left = 6
-          Height = 322
+          Height = 324
           Top = 6
-          Width = 498
+          Width = 492
           Align = alClient
           BorderSpacing.Around = 6
           ScrollBars = ssAutoVertical
@@ -576,8 +563,8 @@ object PackageOptionsDialog: TPackageOptionsDialog
     end
     object i18n: TPage
       Caption = 'i18n'
-      ClientWidth = 526
-      ClientHeight = 365
+      ClientWidth = 520
+      ClientHeight = 366
       object I18NGroupBox: TGroupBox
         AnchorSideLeft.Control = i18n
         AnchorSideTop.Control = EnableI18NCheckBox
@@ -587,14 +574,13 @@ object PackageOptionsDialog: TPackageOptionsDialog
         Left = 6
         Height = 84
         Top = 35
-        Width = 514
+        Width = 508
         Anchors = [akTop, akLeft, akRight]
         AutoSize = True
         BorderSpacing.Around = 6
         Caption = 'i18n Options'
-        ClientHeight = 65
-        ClientWidth = 510
-        Ctl3D = False
+        ClientHeight = 66
+        ClientWidth = 504
         TabOrder = 0
         object PoOutDirLabel: TLabel
           AnchorSideLeft.Control = I18NGroupBox
@@ -615,7 +601,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           Left = 6
           Height = 23
           Top = 30
-          Width = 468
+          Width = 462
           Anchors = [akTop, akLeft, akRight]
           BorderSpacing.Around = 6
           TabOrder = 0
@@ -626,7 +612,7 @@ object PackageOptionsDialog: TPackageOptionsDialog
           AnchorSideRight.Side = asrBottom
           AnchorSideBottom.Control = POOutDirEdit
           AnchorSideBottom.Side = asrBottom
-          Left = 480
+          Left = 474
           Height = 23
           Top = 30
           Width = 24
@@ -649,106 +635,12 @@ object PackageOptionsDialog: TPackageOptionsDialog
       end
     end
   end
-  object CancelButton: TBitBtn
-    Left = 442
-    Height = 29
-    Top = 402
-    Width = 75
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    Cancel = True
-    Caption = 'Cancel'
-    Constraints.MinWidth = 75
-    Glyph.Data = {
-      36040000424D3604000000000000360000002800000010000000100000000100
-      2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF003F3DED413B38EB08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00211FE3081E1CE241FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF004A47F0414F4CF2FF403EEDFD3C39EB08FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF002725E5082422E4FC312FEAFF1F1DE241FFFFFF00FFFFFF00FFFFFF005451
-      F3415856F5FF6361FAFF5855F6FF413FEDFC3D3AEC08FFFFFF00FFFFFF00302D
-      E7082C2AE6FC413FF1FF4C4AF6FF312FEAFF1F1DE241FFFFFF00FFFFFF005956
-      F52B5B58F6FF6562FAFF7170FFFF5956F6FF4240EEFC3E3BEC083937EB083532
-      E9FC4745F2FF6362FFFF4A48F4FF2F2DE9FF2220E32BFFFFFF00FFFFFF00FFFF
-      FF005A57F52B5B59F6FF6663FAFF7471FFFF5A58F6FF4341EEFC3E3CECFD504D
-      F4FF6867FFFF504EF5FF3634EBFF2A27E52BFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF005B58F62B5C5AF6FF6764FAFF7472FFFF7370FFFF706EFFFF6E6C
-      FFFF5755F7FF3F3DEEFF3230E82BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF005C59F62B5D5BF7FF7976FFFF5956FFFF5754FFFF7270
-      FFFF4846F0FF3C39EB2BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00615EF8085D5AF6FD7D79FFFF5E5BFFFF5B58FFFF7674
-      FFFF4643EFFD413FED08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF006967FB086663F9FC706DFBFF807EFFFF7E7BFFFF7C79FFFF7977
-      FFFF5E5CF7FF4744EFFC4240EE08FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00716EFD086E6BFCFC7774FDFF8682FFFF7673FCFF6462F8FF605DF7FF6D6A
-      FAFF7B79FFFF605DF7FF4845EFFC4341EE08FFFFFF00FFFFFF00FFFFFF007673
-      FF087471FEFD7D7AFEFF8A87FFFF7C79FDFF6C69FBFF6361F92B5F5CF72B615E
-      F8FF6E6CFAFF7D7AFFFF615FF7FF4946F0FC4441EE05FFFFFF00FFFFFF007774
-      FF1F7A77FFFF817EFFFF817EFEFF7471FDFF6C69FB2BFFFFFF00FFFFFF00605D
-      F72B625FF8FF6F6DFBFF7E7CFFFF625FF8FF4A47F06F4542EE02FFFFFF00FFFF
-      FF007774FF1F7A77FFFF7976FEFF726FFD2BFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00615EF82B6461F8FF6A68F9FF5451F3A84F4DF229FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF007774FF1F7774FF2BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00625FF82B5D5BF76F5956F53EFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF006360F80AFFFFFF00FFFFFF00FFFFFF00
-    }
-    ModalResult = 2
-    NumGlyphs = 0
+  object ButtonPanel1: TButtonPanel
+    Left = 6
+    Height = 34
+    Top = 399
+    Width = 516
     TabOrder = 1
-  end
-  object OKButton: TBitBtn
-    Left = 357
-    Height = 29
-    Top = 402
-    Width = 75
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Around = 10
-    Caption = 'OK'
-    Constraints.MinWidth = 75
-    Default = True
-    Glyph.Data = {
-      36040000424D3604000000000000360000002800000010000000100000000100
-      2000000000000004000064000000640000000000000000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00317A360A2D753207FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF003985400A37833DFF317B37FB2E763307FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF004292490A408E47FF54A35CFF4F9F57FF327C38FE2E773408FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF004B9E530A499A51FF5BAC64FF77CA82FF74C87EFF51A059FF337D39FE2F78
-      3508FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0053A9
-      5C0A51A65AFF63B56DFF7ECE89FF7BCC87FF76CA81FF76C981FF52A25AFF347E
-      3AFE30793508FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF005AB4650959B0
-      63FF6BBD76FF84D290FF7AC985FF60B26AFF63B46DFF78C983FF78CB82FF53A3
-      5CFF347F3AFD317A3608FFFFFF00FFFFFF00FFFFFF00FFFFFF005EB969465BB5
-      66E479C986FF80CE8DFF51A65AFC4DA1566F499C518B5CAD67FF7CCC86FF79CB
-      85FF54A45DFF35803BFC317B3708FFFFFF00FFFFFF00FFFFFF00FFFFFF005FBA
-      6A3C5CB666E66DC079FF55AC5F6FFFFFFF00FFFFFF004A9D52915EAE68FF7DCD
-      89FF7CCD87FF56A55FFF36813CFC327C3808FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF005FBB6A435CB76765FFFFFF00FFFFFF00FFFFFF00FFFFFF004B9E53915FAF
-      69FF7FCE8AFF7ECE89FF57A660FF37823DFC337D3908FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF004B9F
-      549160B06AFF81CF8DFF7FCF8BFF58A761FF398540FF347E3A08FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF004CA0559162B26CFF82D18FFF7AC885FF57A660FF38843F7BFFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF004DA1569163B36DFF5FAF69FF41914979FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF004EA257914A9D527FFFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00
-    }
-    ModalResult = 1
-    NumGlyphs = 0
-    OnClick = OkButtonClick
-    TabOrder = 2
+    ShowButtons = [pbOK, pbCancel]
   end
 end
diff --git a/packager/pkgoptionsdlg.lrs b/packager/pkgoptionsdlg.lrs
index 7ddbc19eed..914ef3be9d 100644
--- a/packager/pkgoptionsdlg.lrs
+++ b/packager/pkgoptionsdlg.lrs
@@ -6,317 +6,216 @@ LazarusResources.Add('TPackageOptionsDialog','FORMDATA',[
   +'Caption'#6#20'PackageOptionsDialog'#12'ClientHeight'#3#183#1#11'ClientWidth'
   +#3#16#2#7'OnClose'#7#25'PackageOptionsDialogClose'#8'OnCreate'#7#10'FormCrea'
   +'te'#10'LCLVersion'#6#6'0.9.27'#0#9'TNotebook'#8'Notebook'#4'Left'#2#0#6'Hei'
-  +'ght'#3#136#1#3'Top'#2#0#5'Width'#3#16#2#5'Align'#7#5'alTop'#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#9'PageIndex'#2#1#8'TabOrder'#2#0#0
-  +#5'TPage'#9'UsagePage'#7'Caption'#6#5'Usage'#11'ClientWidth'#3#14#2#12'Clien'
-  +'tHeight'#3'm'#1#0#9'TGroupBox'#16'AddPathsGroupBox'#20'AnchorSideRight.Side'
-  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#128#0#3'Top'#2#6#5'Width'#3#2#2#5'Al'
-  +'ign'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6'(Add paths to dep'
-  +'endent packages/projects'#12'ClientHeight'#2'm'#11'ClientWidth'#3#254#1#5'C'
-  +'tl3D'#8#8'TabOrder'#2#0#0#6'TLabel'#13'UnitPathLabel'#4'Left'#2#6#6'Height'
-  +#2#18#3'Top'#2#3#5'Width'#2#27#7'Caption'#6#4'Unit'#11'ParentColor'#8#0#0#6
-  +'TLabel'#16'IncludePathLabel'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#30#5'Width'
-  +#2'.'#7'Caption'#6#7'Include'#11'ParentColor'#8#0#0#6'TLabel'#15'ObjectPathL'
-  +'abel'#4'Left'#2#6#6'Height'#2#18#3'Top'#2'9'#5'Width'#2'*'#7'Caption'#6#6'O'
-  +'bject'#11'ParentColor'#8#0#0#6'TLabel'#16'LibraryPathLabel'#4'Left'#2#6#6'H'
-  +'eight'#2#18#3'Top'#2'T'#5'Width'#2','#7'Caption'#6#7'Library'#11'ParentColo'
-  +'r'#8#0#0#5'TEdit'#12'UnitPathEdit'#22'AnchorSideLeft.Control'#7#15'LibraryP'
-  +'athEdit'#23'AnchorSideRight.Control'#7#16'AddPathsGroupBox'#20'AnchorSideRi'
-  +'ght.Side'#7#9'asrBottom'#4'Left'#2'P'#6'Height'#2#23#3'Top'#2#0#5'Width'#3
-  +'|'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2
-  +'2'#8'TabOrder'#2#0#0#0#5'TEdit'#15'IncludePathEdit'#22'AnchorSideLeft.Contr'
-  +'ol'#7#15'LibraryPathEdit'#23'AnchorSideRight.Control'#7#16'AddPathsGroupBox'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'P'#6'Height'#2#23#3'Top'#2
-  +#27#5'Width'#3'|'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderS'
-  +'pacing.Right'#2'2'#8'TabOrder'#2#1#0#0#5'TEdit'#14'ObjectPathEdit'#22'Ancho'
-  +'rSideLeft.Control'#7#15'LibraryPathEdit'#23'AnchorSideRight.Control'#7#16'A'
-  +'ddPathsGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'P'#6'Hei'
-  +'ght'#2#23#3'Top'#2'6'#5'Width'#3'|'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
-  +'Right'#0#19'BorderSpacing.Right'#2'2'#8'TabOrder'#2#2#0#0#5'TEdit'#15'Libra'
-  +'ryPathEdit'#22'AnchorSideLeft.Control'#7#16'AddPathsGroupBox'#23'AnchorSide'
-  +'Right.Control'#7#16'AddPathsGroupBox'#20'AnchorSideRight.Side'#7#9'asrBotto'
-  +'m'#4'Left'#2'P'#6'Height'#2#23#3'Top'#2'Q'#5'Width'#3'|'#1#7'Anchors'#11#5
-  +'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2'P'#19'BorderSpacing.'
-  +'Right'#2'2'#8'TabOrder'#2#3#0#0#0#9'TGroupBox'#18'AddOptionsGroupBox'#18'An'
-  +'chorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#172#0#3'Top'#3
-  +#140#0#5'Width'#3#2#2#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6'.Add options to dependent packages and projects'#12'ClientHeight'
-  +#3#153#0#11'ClientWidth'#3#254#1#5'Ctl3D'#8#8'TabOrder'#2#1#0#6'TLabel'#18'L'
-  +'inkerOptionsLabel'#21'AnchorSideTop.Control'#7#17'LinkerOptionsMemo'#4'Left'
-  +#2#6#6'Height'#2#18#3'Top'#2#6#5'Width'#2''''#7'Caption'#6#6'Linker'#11'Pare'
-  +'ntColor'#8#0#0#6'TLabel'#18'CustomOptionsLabel'#21'AnchorSideTop.Control'#7
-  +#17'CustomOptionsMemo'#4'Left'#2#6#6'Height'#2#18#3'Top'#2'J'#5'Width'#2'3'#7
-  +'Caption'#6#6'Custom'#11'ParentColor'#8#0#0#5'TMemo'#17'LinkerOptionsMemo'#22
+  +'ght'#3#137#1#3'Top'#2#0#5'Width'#3#16#2#5'Align'#7#8'alClient'#9'PageIndex'
+  +#2#1#8'TabOrder'#2#0#0#5'TPage'#9'UsagePage'#7'Caption'#6#5'Usage'#11'Client'
+  +'Width'#3#8#2#12'ClientHeight'#3'n'#1#0#9'TGroupBox'#16'AddPathsGroupBox'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#128#0#3'Top'#2
+  +#6#5'Width'#3#252#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Capti'
+  +'on'#6'(Add paths to dependent packages/projects'#12'ClientHeight'#2'n'#11'C'
+  +'lientWidth'#3#248#1#8'TabOrder'#2#0#0#6'TLabel'#13'UnitPathLabel'#4'Left'#2
+  +#6#6'Height'#2#18#3'Top'#2#3#5'Width'#2#27#7'Caption'#6#4'Unit'#11'ParentCol'
+  +'or'#8#0#0#6'TLabel'#16'IncludePathLabel'#4'Left'#2#6#6'Height'#2#18#3'Top'#2
+  +#30#5'Width'#2'.'#7'Caption'#6#7'Include'#11'ParentColor'#8#0#0#6'TLabel'#15
+  +'ObjectPathLabel'#4'Left'#2#6#6'Height'#2#18#3'Top'#2'9'#5'Width'#2'*'#7'Cap'
+  +'tion'#6#6'Object'#11'ParentColor'#8#0#0#6'TLabel'#16'LibraryPathLabel'#4'Le'
+  +'ft'#2#6#6'Height'#2#18#3'Top'#2'T'#5'Width'#2','#7'Caption'#6#7'Library'#11
+  +'ParentColor'#8#0#0#5'TEdit'#12'UnitPathEdit'#22'AnchorSideLeft.Control'#7#15
+  +'LibraryPathEdit'#23'AnchorSideRight.Control'#7#16'AddPathsGroupBox'#20'Anch'
+  +'orSideRight.Side'#7#9'asrBottom'#4'Left'#2'P'#6'Height'#2#23#3'Top'#2#0#5'W'
+  +'idth'#3'v'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing'
+  +'.Right'#2'2'#8'TabOrder'#2#0#0#0#5'TEdit'#15'IncludePathEdit'#22'AnchorSide'
+  +'Left.Control'#7#15'LibraryPathEdit'#23'AnchorSideRight.Control'#7#16'AddPat'
+  +'hsGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'P'#6'Height'#2
+  +#23#3'Top'#2#27#5'Width'#3'v'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#19'BorderSpacing.Right'#2'2'#8'TabOrder'#2#1#0#0#5'TEdit'#14'ObjectPathEdit'
+  +#22'AnchorSideLeft.Control'#7#15'LibraryPathEdit'#23'AnchorSideRight.Control'
+  +#7#16'AddPathsGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'P'
+  +#6'Height'#2#23#3'Top'#2'6'#5'Width'#3'v'#1#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#19'BorderSpacing.Right'#2'2'#8'TabOrder'#2#2#0#0#5'TEdit'#15'L'
+  +'ibraryPathEdit'#22'AnchorSideLeft.Control'#7#16'AddPathsGroupBox'#23'Anchor'
+  +'SideRight.Control'#7#16'AddPathsGroupBox'#20'AnchorSideRight.Side'#7#9'asrB'
+  +'ottom'#4'Left'#2'P'#6'Height'#2#23#3'Top'#2'Q'#5'Width'#3'v'#1#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2'P'#19'BorderSpacin'
+  +'g.Right'#2'2'#8'TabOrder'#2#3#0#0#0#9'TGroupBox'#18'AddOptionsGroupBox'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#173#0#3'To'
+  +'p'#3#140#0#5'Width'#3#252#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'
+  +#2#6#7'Caption'#6'.Add options to dependent packages and projects'#12'Client'
+  +'Height'#3#155#0#11'ClientWidth'#3#248#1#8'TabOrder'#2#1#0#6'TLabel'#18'Link'
+  +'erOptionsLabel'#21'AnchorSideTop.Control'#7#17'LinkerOptionsMemo'#4'Left'#2
+  +#6#6'Height'#2#18#3'Top'#2#6#5'Width'#2''''#7'Caption'#6#6'Linker'#11'Parent'
+  +'Color'#8#0#0#6'TLabel'#18'CustomOptionsLabel'#21'AnchorSideTop.Control'#7#17
+  +'CustomOptionsMemo'#4'Left'#2#6#6'Height'#2#18#3'Top'#2'J'#5'Width'#2'3'#7'C'
+  +'aption'#6#6'Custom'#11'ParentColor'#8#0#0#5'TMemo'#17'LinkerOptionsMemo'#22
   +'AnchorSideLeft.Control'#7#17'CustomOptionsMemo'#21'AnchorSideTop.Control'#7
   +#18'AddOptionsGroupBox'#23'AnchorSideRight.Control'#7#18'AddOptionsGroupBox'
   +#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'C'#6'Height'#2'>'#3'Top'#2
-  +#6#5'Width'#3#181#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderS'
+  +#6#5'Width'#3#175#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderS'
   +'pacing.Top'#2#6#19'BorderSpacing.Right'#2#6#10'ScrollBars'#7#14'ssAutoVerti'
   +'cal'#8'TabOrder'#2#0#0#0#5'TMemo'#17'CustomOptionsMemo'#22'AnchorSideLeft.C'
   +'ontrol'#7#18'CustomOptionsLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
   +'AnchorSideTop.Control'#7#17'LinkerOptionsMemo'#18'AnchorSideTop.Side'#7#9'a'
   +'srBottom'#23'AnchorSideRight.Control'#7#18'AddOptionsGroupBox'#20'AnchorSid'
   +'eRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#18'AddOptionsGro'
-  +'upBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'C'#6'Height'#2'I'
-  +#3'Top'#2'J'#5'Width'#3#181#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
+  +'upBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2'C'#6'Height'#2'K'
+  +#3'Top'#2'J'#5'Width'#3#175#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
   +'akBottom'#0#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'#2#6#19'Border'
   +'Spacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#10'ScrollBars'#7#14'ssAutoV'
   +'ertical'#8'TabOrder'#2#1#0#0#0#9'TGroupBox'#15'ProjectGroupBox'#4'Left'#2#6
-  +#6'Height'#2')'#3'Top'#3'>'#1#5'Width'#3#2#2#5'Align'#7#8'alBottom'#8'AutoSi'
-  +'ze'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'ProjectGroupBox'#12'Clie'
-  ,'ntHeight'#2#22#11'ClientWidth'#3#254#1#5'Ctl3D'#8#8'TabOrder'#2#2#0#9'TChec'
-  +'kBox'#31'AddPackageUnitToProjectCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'
-  +#2#0#5'Width'#3#242#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'Bord'
-  +'erSpacing.Right'#2#6#7'Caption'#6#31'AddPackageUnitToProjectCheckBox'#8'Tab'
-  +'Order'#2#0#0#0#0#0#5'TPage'#10'Usage2Page'#7'Caption'#6#6'Usage2'#11'Client'
-  +'Width'#3#14#2#12'ClientHeight'#3'm'#1#0#9'TGroupBox'#20'ConditionalsGroupBo'
-  +'x'#4'Left'#2#0#6'Height'#3#199#0#3'Top'#2#0#5'Width'#3#14#2#5'Align'#7#5'al'
-  +'Top'#7'Caption'#6#20'ConditionalsGroupBox'#5'Ctl3D'#8#8'TabOrder'#2#0#0#0#0
-  +#5'TPage'#15'DescriptionPage'#7'Caption'#6#11'Description'#11'ClientWidth'#3
-  +#14#2#12'ClientHeight'#3'm'#1#0#9'TGroupBox'#19'DescriptionGroupBox'#22'Anch'
-  +'orSideLeft.Control'#7#15'DescriptionPage'#21'AnchorSideTop.Control'#7#15'De'
-  +'scriptionPage'#23'AnchorSideRight.Control'#7#15'DescriptionPage'#20'AnchorS'
-  +'ideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'`'#3'Top'#2#6#5'Width'
-  +#3#2#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'
-  +#2#6#7'Caption'#6#20'Description/Abstract'#12'ClientHeight'#2'M'#11'ClientWi'
-  +'dth'#3#254#1#5'Ctl3D'#8#8'TabOrder'#2#0#0#5'TMemo'#15'DescriptionMemo'#22'A'
-  +'nchorSideLeft.Control'#7#19'DescriptionGroupBox'#21'AnchorSideTop.Control'#7
-  +#19'DescriptionGroupBox'#23'AnchorSideRight.Control'#7#19'DescriptionGroupBo'
-  +'x'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#19
-  +'DescriptionGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6
-  +'Height'#2'A'#3'Top'#2#6#5'Width'#3#242#1#5'Align'#7#8'alClient'#20'BorderSp'
-  +'acing.Around'#2#6#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#9'T'
-  +'GroupBox'#14'AuthorGroupBox'#22'AnchorSideLeft.Control'#7#15'DescriptionPag'
-  +'e'#21'AnchorSideTop.Control'#7#19'DescriptionGroupBox'#18'AnchorSideTop.Sid'
-  +'e'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#15'DescriptionPage'#20'Anch'
-  +'orSideRight.Side'#7#9'asrBottom'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
-  +'Left'#2#6#6'Height'#2''''#3'Top'#2'l'#5'Width'#3#2#2#7'Anchors'#11#5'akTop'
-  +#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'
-  +#6#7'Author:'#12'ClientHeight'#2#20#11'ClientWidth'#3#254#1#5'Ctl3D'#8#8'Tab'
-  +'Order'#2#1#0#5'TEdit'#10'AuthorEdit'#20'AnchorSideRight.Side'#7#9'asrBottom'
-  +#24'AnchorSideBottom.Control'#7#14'AuthorGroupBox'#21'AnchorSideBottom.Side'
-  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#6#5'Width'#3#242#1#5'Ali'
-  +'gn'#7#5'alTop'#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#0#0#0#9'TGroupB'
-  +'ox'#15'LicenseGroupBox'#22'AnchorSideLeft.Control'#7#15'DescriptionPage'#21
-  +'AnchorSideTop.Control'#7#14'AuthorGroupBox'#18'AnchorSideTop.Side'#7#9'asrB'
-  +'ottom'#23'AnchorSideRight.Control'#7#15'DescriptionPage'#20'AnchorSideRight'
-  +'.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#15'VersionGroupBox'#4
-  +'Left'#2#6#6'Height'#2'd'#3'Top'#3#153#0#5'Width'#3#2#2#7'Anchors'#11#5'akTo'
-  +'p'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Captio'
-  +'n'#6#8'License:'#12'ClientHeight'#2'Q'#11'ClientWidth'#3#254#1#5'Ctl3D'#8#8
-  +'TabOrder'#2#2#0#5'TMemo'#11'LicenseMemo'#22'AnchorSideLeft.Control'#7#15'Li'
-  +'censeGroupBox'#21'AnchorSideTop.Control'#7#15'LicenseGroupBox'#23'AnchorSid'
-  +'eRight.Control'#7#15'LicenseGroupBox'#20'AnchorSideRight.Side'#7#9'asrBotto'
-  +'m'#24'AnchorSideBottom.Control'#7#15'LicenseGroupBox'#21'AnchorSideBottom.S'
-  +'ide'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'E'#3'Top'#2#6#5'Width'#3#242#1#5
-  +'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#10'ScrollBars'#7#10'ssAut'
-  +'oBoth'#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#15'VersionGroupBox'#22'AnchorSide'
-  +'Left.Control'#7#15'DescriptionPage'#21'AnchorSideTop.Control'#7#15'LicenseG'
-  +'roupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
-  +#15'DescriptionPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBo'
-  +'ttom.Control'#7#15'DescriptionPage'#21'AnchorSideBottom.Side'#7#9'asrBottom'
-  +#4'Left'#2#6#6'Height'#2'd'#3'Top'#3#3#1#5'Width'#3#2#2#5'Align'#7#8'alBotto'
-  +'m'#20'BorderSpacing.Around'#2#6#7'Caption'#6#7'Version'#12'ClientHeight'#2
-  +'Q'#11'ClientWidth'#3#254#1#5'Ctl3D'#8#8'TabOrder'#2#3#0#6'TLabel'#17'Versio'
-  +'nMajorLabel'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#3#5'Width'#2'$'#7'Caption'
-  +#6#5'Major'#11'ParentColor'#8#0#0#6'TLabel'#17'VersionMinorLabel'#4'Left'#2
-  +'n'#6'Height'#2#18#3'Top'#2#3#5'Width'#2'$'#7'Caption'#6#5'Minor'#11'ParentC'
-  +'olor'#8#0#0#6'TLabel'#19'VersionReleaseLabel'#4'Left'#3#214#0#6'Height'#2#18
-  +#3'Top'#2#3#5'Width'#2'2'#7'Caption'#6#7'Release'#11'ParentColor'#8#0#0#6'TL'
-  +'abel'#17'VersionBuildLabel'#4'Left'#3'>'#1#6'Height'#2#18#3'Top'#2#3#5'Widt'
-  +'h'#2'X'#7'Caption'#6#12'Build Number'#11'ParentColor'#8#0#0#9'TSpinEdit'#20
-  +'VersionMajorSpinEdit'#22'AnchorSideLeft.Control'#7#15'VersionGroupBox'#4'Le'
-  +'ft'#2#6#6'Height'#2#23#3'Top'#2#20#5'Width'#2'D'#18'BorderSpacing.Left'#2#6
-  +#8'MaxValue'#3#15''''#8'TabOrder'#2#0#0#0#9'TSpinEdit'#20'VersionMinorSpinEd'
-  ,'it'#4'Left'#2'n'#6'Height'#2#23#3'Top'#2#20#5'Width'#2'D'#8'MaxValue'#3#15
-  +''''#8'TabOrder'#2#1#0#0#9'TSpinEdit'#22'VersionReleaseSpinEdit'#4'Left'#3
-  +#214#0#6'Height'#2#23#3'Top'#2#20#5'Width'#2'D'#8'MaxValue'#3#15''''#8'TabOr'
-  +'der'#2#2#0#0#9'TSpinEdit'#20'VersionBuildSpinEdit'#4'Left'#3'>'#1#6'Height'
-  +#2#23#3'Top'#2#20#5'Width'#2'D'#8'MaxValue'#3#15''''#8'TabOrder'#2#3#0#0#9'T'
-  +'CheckBox'#28'AutoIncrementOnBuildCheckBox'#22'AnchorSideLeft.Control'#7#20
-  +'VersionMajorSpinEdit'#21'AnchorSideTop.Control'#7#20'VersionMajorSpinEdit'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#22#3'Top'#2'1'
-  +#5'Width'#3#28#1#17'BorderSpacing.Top'#2#6#7'Caption'#6'(Automatically incre'
-  +'ment version on build'#7'Enabled'#8#8'TabOrder'#2#4#0#0#0#0#5'TPage'#7'IDEP'
-  +'age'#7'Caption'#6#15'IDE Integration'#11'ClientWidth'#3#14#2#12'ClientHeigh'
-  +'t'#3'm'#1#0#11'TRadioGroup'#17'PkgTypeRadioGroup'#22'AnchorSideLeft.Control'
-  +#7#7'IDEPage'#21'AnchorSideTop.Control'#7#7'IDEPage'#23'AnchorSideRight.Cont'
-  +'rol'#7#7'IDEPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Hei'
-  +'ght'#2't'#3'Top'#2#6#5'Width'#3#2#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRi'
-  +'ght'#0#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'PackageTy'
-  +'pe'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2
-  +#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'Child'
-  +'Sizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.Shrin'
-  +'kHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsSc'
-  +'aleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'Ch'
-  +'ildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'a'#11'ClientWidth'#3#254#1
-  +#5'Ctl3D'#8#9'ItemIndex'#2#2#13'Items.Strings'#1#6#15'Designtime only'#6#12
-  +'Runtime only'#6#22'Designtime and Runtime'#0#7'OnClick'#7#22'PkgTypeRadioGr'
-  +'oupClick'#8'TabOrder'#2#0#0#0#11'TRadioGroup'#16'UpdateRadioGroup'#22'Ancho'
-  +'rSideLeft.Control'#7#7'IDEPage'#21'AnchorSideTop.Control'#7#17'PkgTypeRadio'
-  +'Group'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#7
-  +'IDEPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2't'
-  +#3'Top'#3#128#0#5'Width'#3#2#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
-  +#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'Update/Rebuild'
-  +#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29
-  +'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizin'
-  +'g.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHori'
-  +'zontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleCh'
-  +'ilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSi'
-  +'zing.ControlsPerLine'#2#1#12'ClientHeight'#2'a'#11'ClientWidth'#3#254#1#5'C'
-  +'tl3D'#8#9'ItemIndex'#2#0#13'Items.Strings'#1#6#31'Automatically rebuild as '
-  +'needed'#6' Auto rebuild when rebuilding all'#6'(Manual compilation (never a'
-  +'utomatically)'#0#8'TabOrder'#2#1#0#0#9'TGroupBox'#14'LazDocGroupBox'#22'Anc'
-  +'horSideLeft.Control'#7#7'IDEPage'#21'AnchorSideTop.Control'#7#16'UpdateRadi'
-  +'oGroup'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7
-  +#7'IDEPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
-  +'6'#3'Top'#3#250#0#5'Width'#3#2#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
-  +#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#30'LazDoc - Lazar'
-  +'us documentation'#12'ClientHeight'#2'#'#11'ClientWidth'#3#254#1#5'Ctl3D'#8#8
-  +'TabOrder'#2#2#0#5'TEdit'#14'LazDocPathEdit'#22'AnchorSideLeft.Control'#7#14
-  +'LazDocGroupBox'#21'AnchorSideTop.Control'#7#14'LazDocGroupBox'#4'Left'#2#6#6
-  +'Height'#2#23#3'Top'#2#6#5'Width'#3#162#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#0#0#0#0#5'TPage'#12
-  +'ProvidesPage'#7'Caption'#6#8'Provides'#11'ClientWidth'#3#14#2#12'ClientHeig'
-  +'ht'#3'm'#1#0#9'TGroupBox'#16'ProvidesGroupBox'#22'AnchorSideLeft.Control'#7
-  +#12'ProvidesPage'#21'AnchorSideTop.Control'#7#12'ProvidesPage'#23'AnchorSide'
-  +'Right.Control'#7#12'ProvidesPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24
-  +'AnchorSideBottom.Control'#7#12'ProvidesPage'#21'AnchorSideBottom.Side'#7#9
-  +'asrBottom'#4'Left'#2#6#6'Height'#3'a'#1#3'Top'#2#6#5'Width'#3#2#2#5'Align'#7
-  +#8'alBottom'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'Bo'
-  +'rderSpacing.Around'#2#6#7'Caption'#6'9This package provides the same as the'
-  +' following packages:'#12'ClientHeight'#3'N'#1#11'ClientWidth'#3#254#1#5'Ctl'
-  +'3D'#8#8'TabOrder'#2#0#0#5'TMemo'#12'ProvidesMemo'#22'AnchorSideLeft.Control'
-  +#7#16'ProvidesGroupBox'#21'AnchorSideTop.Control'#7#16'ProvidesGroupBox'#23
-  +'AnchorSideRight.Control'#7#16'ProvidesGroupBox'#24'AnchorSideBottom.Control'
-  +#7#16'ProvidesGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6
-  +#6'Height'#3'B'#1#3'Top'#2#6#5'Width'#3#242#1#5'Align'#7#8'alClient'#20'Bord'
-  +'erSpacing.Around'#2#6#10'ScrollBars'#7#14'ssAutoVertical'#8'TabOrder'#2#0#0
-  ,#0#0#0#5'TPage'#4'i18n'#7'Caption'#6#4'i18n'#11'ClientWidth'#3#14#2#12'Clien'
-  +'tHeight'#3'm'#1#0#9'TGroupBox'#12'I18NGroupBox'#22'AnchorSideLeft.Control'#7
-  +#4'i18n'#21'AnchorSideTop.Control'#7#18'EnableI18NCheckBox'#18'AnchorSideTop'
-  +'.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#4'i18n'#20'AnchorSideRi'
-  +'ght.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'T'#3'Top'#2'#'#5'Width'#3#2
-  +#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpac'
-  +'ing.Around'#2#6#7'Caption'#6#12'i18n Options'#12'ClientHeight'#2'A'#11'Clie'
-  +'ntWidth'#3#254#1#5'Ctl3D'#8#8'TabOrder'#2#0#0#6'TLabel'#13'PoOutDirLabel'#22
-  +'AnchorSideLeft.Control'#7#12'I18NGroupBox'#21'AnchorSideTop.Control'#7#12'I'
-  +'18NGroupBox'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#6#5'Width'#3#132#0#20'Bord'
-  +'erSpacing.Around'#2#6#7'Caption'#6#20'PO Output Directory:'#11'ParentColor'
-  +#8#0#0#5'TEdit'#12'POOutDirEdit'#22'AnchorSideLeft.Control'#7#12'I18NGroupBo'
-  +'x'#21'AnchorSideTop.Control'#7#13'PoOutDirLabel'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#23'AnchorSideRight.Control'#7#14'POOutDirButton'#4'Left'#2#6#6'H'
-  +'eight'#2#23#3'Top'#2#30#5'Width'#3#212#1#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#0#0#7'TButton'#14'P'
-  +'OOutDirButton'#21'AnchorSideTop.Control'#7#12'POOutDirEdit'#23'AnchorSideRi'
-  +'ght.Control'#7#12'I18NGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#24
-  +'AnchorSideBottom.Control'#7#12'POOutDirEdit'#21'AnchorSideBottom.Side'#7#9
-  +'asrBottom'#4'Left'#3#224#1#6'Height'#2#23#3'Top'#2#30#5'Width'#2#24#7'Ancho'
-  +'rs'#11#5'akTop'#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Rig'
-  +'ht'#2#6#7'Caption'#6#3'...'#7'OnClick'#7#28'POOutputDirectoryButtonClick'#8
-  +'TabOrder'#2#1#0#0#0#9'TCheckBox'#18'EnableI18NCheckBox'#4'Left'#2#6#6'Heigh'
-  +'t'#2#22#3'Top'#2#7#5'Width'#2'b'#7'Caption'#6#11'Enable i18n'#8'OnChange'#7
-  +#24'EnableI18NCheckBoxChange'#8'TabOrder'#2#1#0#0#0#0#7'TBitBtn'#12'CancelBu'
-  +'tton'#4'Left'#3#186#1#6'Height'#2#29#3'Top'#3#146#1#5'Width'#2'K'#7'Anchors'
-  +#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#6'Cancel'#9#7'Caption'#6#6'Cancel'
-  +#20'Constraints.MinWidth'#2'K'#10'Glyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0
-  +#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'#0#0
-  +#0'd'#0#0#0#0#0#0#0#0#0#0#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'?='#237'A'
-  +';8'#235#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0'!'#31#227#8#30#28#226'A'#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0'JG'#240'AOL'#242#255'@>'#237#253'<9'
-  +#235#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'''%'#229#8'$"'
-  +#228#252'1/'#234#255#31#29#226'A'#255#255#255#0#255#255#255#0#255#255#255#0
-  +'TQ'#243'AXV'#245#255'ca'#250#255'XU'#246#255'A?'#237#252'=:'#236#8#255#255
-  +#255#0#255#255#255#0'0-'#231#8',*'#230#252'A?'#241#255'LJ'#246#255'1/'#234
-  +#255#31#29#226'A'#255#255#255#0#255#255#255#0'YV'#245'+[X'#246#255'eb'#250
-  +#255'qp'#255#255'YV'#246#255'B@'#238#252'>;'#236#8'97'#235#8'52'#233#252'GE'
-  +#242#255'cb'#255#255'JH'#244#255'/-'#233#255'" '#227'+'#255#255#255#0#255#255
-  +#255#0#255#255#255#0'ZW'#245'+[Y'#246#255'fc'#250#255'tq'#255#255'ZX'#246#255
-  +'CA'#238#252'><'#236#253'PM'#244#255'hg'#255#255'PN'#245#255'64'#235#255'*'''
-  +#229'+'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +'[X'#246'+\Z'#246#255'gd'#250#255'tr'#255#255'sp'#255#255'pn'#255#255'nl'#255
-  +#255'WU'#247#255'?='#238#255'20'#232'+'#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'\Y'#246'+]['
-  +#247#255'yv'#255#255'YV'#255#255'WT'#255#255'rp'#255#255'HF'#240#255'<9'#235
-  +'+'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0'a^'#248#8']Z'#246#253'}y'#255#255'^['
-  +#255#255'[X'#255#255'vt'#255#255'FC'#239#253'A?'#237#8#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +'ig'#251#8'fc'#249#252'pm'#251#255#128'~'#255#255'~{'#255#255'|y'#255#255'yw'
-  +#255#255'^\'#247#255'GD'#239#252'B@'#238#8#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0'qn'#253#8'nk'#252#252'wt'#253#255#134
-  +#130#255#255'vs'#252#255'db'#248#255'`]'#247#255'mj'#250#255'{y'#255#255'`]'
-  +#247#255'HE'#239#252'CA'#238#8#255#255#255#0#255#255#255#0#255#255#255#0'vs'
-  +#255#8'tq'#254#253'}z'#254#255#138#135#255#255'|y'#253#255'li'#251#255'ca'
-  +#249'+_\'#247'+a^'#248#255'nl'#250#255'}z'#255#255'a_'#247#255'IF'#240#252'D'
-  +'A'#238#5#255#255#255#0#255#255#255#0'wt'#255#31'zw'#255#255#129'~'#255#255
-  +#129'~'#254#255'tq'#253#255'li'#251'+'#255#255#255#0#255#255#255#0'`]'#247'+'
-  +'b_'#248#255'om'#251#255'~|'#255#255'b_'#248#255'JG'#240'oEB'#238#2#255#255
-  ,#255#0#255#255#255#0'wt'#255#31'zw'#255#255'yv'#254#255'ro'#253'+'#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0'a^'#248'+da'#248#255'jh'#249
-  +#255'TQ'#243#168'OM'#242')'#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0'wt'#255#31'wt'#255'+'#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0'b_'#248'+]['#247'oYV'#245'>'#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0'c`'#248#10#255#255#255#0#255#255#255#0
-  +#255#255#255#0#11'ModalResult'#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#7'TB'
-  +'itBtn'#8'OKButton'#4'Left'#3'e'#1#6'Height'#2#29#3'Top'#3#146#1#5'Width'#2
-  +'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Ar'
-  +'ound'#2#10#7'Caption'#6#2'OK'#20'Constraints.MinWidth'#2'K'#7'Default'#9#10
-  +'Glyph.Data'#10':'#4#0#0'6'#4#0#0'BM6'#4#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#16#0#0
-  +#0#16#0#0#0#1#0' '#0#0#0#0#0#0#4#0#0'd'#0#0#0'd'#0#0#0#0#0#0#0#0#0#0#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'1z6'#10'-'
-  +'u2'#7#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0'9'#133'@'#10'7'#131'='#255'1{7'#251'.'
-  +'v3'#7#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0'B'#146'I'#10'@'#142'G'#255'T'#163'\'#255'O'#159'W'#255'2|8'#254'.'
-  +'w4'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'K'#158'S'#10'I'#154
-  +'Q'#255'['#172'd'#255'w'#202#130#255't'#200'~'#255'Q'#160'Y'#255'3}9'#254'/x'
-  +'5'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0'S'#169'\'#10'Q'#166'Z'#255'c'#181'm'#255'~'#206
-  +#137#255'{'#204#135#255'v'#202#129#255'v'#201#129#255'R'#162'Z'#255'4~:'#254
-  +'0y5'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +'Z'#180'e'#9'Y'#176'c'#255'k'#189'v'#255#132#210#144#255'z'#201#133#255'`'
-  +#178'j'#255'c'#180'm'#255'x'#201#131#255'x'#203#130#255'S'#163'\'#255'4:'
-  +#253'1z6'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'^'#185'i'
-  +'F['#181'f'#228'y'#201#134#255#128#206#141#255'Q'#166'Z'#252'M'#161'VoI'#156
-  +'Q'#139'\'#173'g'#255'|'#204#134#255'y'#203#133#255'T'#164']'#255'5'#128';'
-  +#252'1{7'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'_'#186'j'
-  +'<\'#182'f'#230'm'#192'y'#255'U'#172'_o'#255#255#255#0#255#255#255#0'J'#157
-  +'R'#145'^'#174'h'#255'}'#205#137#255'|'#205#135#255'V'#165'_'#255'6'#129'<'
-  +#252'2|8'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'_'#187'j'
-  +'C\'#183'ge'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0'K'#158
-  +'S'#145'_'#175'i'#255''#206#138#255'~'#206#137#255'W'#166'`'#255'7'#130'='
-  +#252'3}9'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +'K'#159'T'#145'`'#176'j'#255#129#207#141#255''#207#139#255'X'#167'a'#255'9'
-  +#133'@'#255'4~:'#8#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0'L'#160'U'#145'b'#178'l'#255#130#209#143#255'z'#200#133#255'W'#166
-  +'`'#255'8'#132'?{'#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0'M'#161'V'#145'c'#179'm'#255'_'#175'i'#255'A'#145'Iy'
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0'N'#162'W'#145'J'#157'R'#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255
-  +#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0
-  +#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255#255#255#0#255
-  +#255#255#0#11'ModalResult'#2#1#9'NumGlyphs'#2#0#7'OnClick'#7#13'OkButtonClic'
-  +'k'#8'TabOrder'#2#2#0#0#0
+  +#6'Height'#2')'#3'Top'#3'?'#1#5'Width'#3#252#1#5'Align'#7#8'alBottom'#8'Auto'
+  +'Size'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#15'ProjectGroupBox'#12'Cl'
+  +'ientHeight'#2#23#11'ClientWidth'#3#248#1#8'TabOrder'#2#2#0#9'TCheckBox'#31
+  ,'AddPackageUnitToProjectCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#0#5'Wi'
+  +'dth'#3#236#1#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#19'BorderSpacin'
+  +'g.Right'#2#6#7'Caption'#6#31'AddPackageUnitToProjectCheckBox'#8'TabOrder'#2
+  +#0#0#0#0#0#5'TPage'#10'Usage2Page'#7'Caption'#6#6'Usage2'#11'ClientWidth'#3#8
+  +#2#12'ClientHeight'#3'o'#1#0#9'TGroupBox'#20'ConditionalsGroupBox'#4'Left'#2
+  +#0#6'Height'#3#199#0#3'Top'#2#0#5'Width'#3#8#2#5'Align'#7#5'alTop'#7'Caption'
+  +#6#20'ConditionalsGroupBox'#8'TabOrder'#2#0#0#0#0#5'TPage'#15'DescriptionPag'
+  +'e'#7'Caption'#6#11'Description'#11'ClientWidth'#3#8#2#12'ClientHeight'#3'n'
+  +#1#0#9'TGroupBox'#19'DescriptionGroupBox'#22'AnchorSideLeft.Control'#7#15'De'
+  +'scriptionPage'#21'AnchorSideTop.Control'#7#15'DescriptionPage'#23'AnchorSid'
+  +'eRight.Control'#7#15'DescriptionPage'#20'AnchorSideRight.Side'#7#9'asrBotto'
+  +'m'#4'Left'#2#6#6'Height'#2'`'#3'Top'#2#6#5'Width'#3#252#1#7'Anchors'#11#5'a'
+  +'kTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#20'D'
+  +'escription/Abstract'#12'ClientHeight'#2'N'#11'ClientWidth'#3#248#1#8'TabOrd'
+  +'er'#2#0#0#5'TMemo'#15'DescriptionMemo'#22'AnchorSideLeft.Control'#7#19'Desc'
+  +'riptionGroupBox'#21'AnchorSideTop.Control'#7#19'DescriptionGroupBox'#23'Anc'
+  +'horSideRight.Control'#7#19'DescriptionGroupBox'#20'AnchorSideRight.Side'#7#9
+  +'asrBottom'#24'AnchorSideBottom.Control'#7#19'DescriptionGroupBox'#21'Anchor'
+  +'SideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'B'#3'Top'#2#6#5'Wid'
+  +'th'#3#236#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#10'ScrollBa'
+  +'rs'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#14'AuthorGroupBox'
+  +#22'AnchorSideLeft.Control'#7#15'DescriptionPage'#21'AnchorSideTop.Control'#7
+  +#19'DescriptionGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSide'
+  +'Right.Control'#7#15'DescriptionPage'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2''''#3'Top'
+  +#2'l'#5'Width'#3#252#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoS'
+  +'ize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#7'Author:'#12'ClientHeight'
+  +#2#21#11'ClientWidth'#3#248#1#8'TabOrder'#2#1#0#5'TEdit'#10'AuthorEdit'#20'A'
+  +'nchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#14'Autho'
+  +'rGroupBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#23#3'Top'#2#6#5'Width'#3#236#1#5'Align'#7#5'alTop'#20'BorderSpacing.Around'
+  +#2#6#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#15'LicenseGroupBox'#22'AnchorSideLef'
+  +'t.Control'#7#15'DescriptionPage'#21'AnchorSideTop.Control'#7#14'AuthorGroup'
+  +'Box'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#15
+  +'DescriptionPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBotto'
+  +'m.Control'#7#15'VersionGroupBox'#4'Left'#2#6#6'Height'#2'e'#3'Top'#3#153#0#5
+  +'Width'#3#252#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#8'License:'#12'ClientHeight'#2'S'#11
+  +'ClientWidth'#3#248#1#8'TabOrder'#2#2#0#5'TMemo'#11'LicenseMemo'#22'AnchorSi'
+  +'deLeft.Control'#7#15'LicenseGroupBox'#21'AnchorSideTop.Control'#7#15'Licens'
+  +'eGroupBox'#23'AnchorSideRight.Control'#7#15'LicenseGroupBox'#20'AnchorSideR'
+  +'ight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#15'LicenseGroupBox'
+  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'G'#3'Top'#2
+  +#6#5'Width'#3#236#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2#6#10'S'
+  +'crollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0#9'TGroupBox'#15'VersionGr'
+  +'oupBox'#22'AnchorSideLeft.Control'#7#15'DescriptionPage'#21'AnchorSideTop.C'
+  +'ontrol'#7#15'LicenseGroupBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anch'
+  +'orSideRight.Control'#7#15'DescriptionPage'#20'AnchorSideRight.Side'#7#9'asr'
+  +'Bottom'#24'AnchorSideBottom.Control'#7#15'DescriptionPage'#21'AnchorSideBot'
+  +'tom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'd'#3'Top'#3#4#1#5'Width'#3
+  +#252#1#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#6#7'Caption'#6#7'Ve'
+  +'rsion'#12'ClientHeight'#2'R'#11'ClientWidth'#3#248#1#8'TabOrder'#2#3#0#6'TL'
+  +'abel'#17'VersionMajorLabel'#4'Left'#2#6#6'Height'#2#18#3'Top'#2#3#5'Width'#2
+  +'$'#7'Caption'#6#5'Major'#11'ParentColor'#8#0#0#6'TLabel'#17'VersionMinorLab'
+  +'el'#4'Left'#2'n'#6'Height'#2#18#3'Top'#2#3#5'Width'#2'$'#7'Caption'#6#5'Min'
+  +'or'#11'ParentColor'#8#0#0#6'TLabel'#19'VersionReleaseLabel'#4'Left'#3#214#0
+  +#6'Height'#2#18#3'Top'#2#3#5'Width'#2'2'#7'Caption'#6#7'Release'#11'ParentCo'
+  +'lor'#8#0#0#6'TLabel'#17'VersionBuildLabel'#4'Left'#3'>'#1#6'Height'#2#18#3
+  +'Top'#2#3#5'Width'#2'X'#7'Caption'#6#12'Build Number'#11'ParentColor'#8#0#0#9
+  +'TSpinEdit'#20'VersionMajorSpinEdit'#22'AnchorSideLeft.Control'#7#15'Version'
+  +'GroupBox'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#20#5'Width'#2'D'#18'BorderSpa'
+  +'cing.Left'#2#6#8'MaxValue'#3#15''''#8'TabOrder'#2#0#0#0#9'TSpinEdit'#20'Ver'
+  +'sionMinorSpinEdit'#4'Left'#2'n'#6'Height'#2#23#3'Top'#2#20#5'Width'#2'D'#8
+  +'MaxValue'#3#15''''#8'TabOrder'#2#1#0#0#9'TSpinEdit'#22'VersionReleaseSpinEd'
+  ,'it'#4'Left'#3#214#0#6'Height'#2#23#3'Top'#2#20#5'Width'#2'D'#8'MaxValue'#3
+  +#15''''#8'TabOrder'#2#2#0#0#9'TSpinEdit'#20'VersionBuildSpinEdit'#4'Left'#3
+  +'>'#1#6'Height'#2#23#3'Top'#2#20#5'Width'#2'D'#8'MaxValue'#3#15''''#8'TabOrd'
+  +'er'#2#3#0#0#9'TCheckBox'#28'AutoIncrementOnBuildCheckBox'#22'AnchorSideLeft'
+  +'.Control'#7#20'VersionMajorSpinEdit'#21'AnchorSideTop.Control'#7#20'Version'
+  +'MajorSpinEdit'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#22#3'Top'#2'1'#5'Width'#3#28#1#17'BorderSpacing.Top'#2#6#7'Caption'#6'(Auto'
+  +'matically increment version on build'#7'Enabled'#8#8'TabOrder'#2#4#0#0#0#0#5
+  +'TPage'#7'IDEPage'#7'Caption'#6#15'IDE Integration'#11'ClientWidth'#3#8#2#12
+  +'ClientHeight'#3'n'#1#0#11'TRadioGroup'#17'PkgTypeRadioGroup'#22'AnchorSideL'
+  +'eft.Control'#7#7'IDEPage'#21'AnchorSideTop.Control'#7#7'IDEPage'#23'AnchorS'
+  +'ideRight.Control'#7#7'IDEPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Le'
+  +'ft'#2#6#6'Height'#2't'#3'Top'#2#6#5'Width'#3#252#1#7'Anchors'#11#5'akTop'#6
+  +'akLeft'#7'akRight'#0#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#11'PackageType'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBott'
+  +'omSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildRes'
+  +'ize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'Chil'
+  +'dSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertica'
+  +'l'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopTo'
+  +'Bottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'b'#11'Client'
+  +'Width'#3#248#1#9'ItemIndex'#2#2#13'Items.Strings'#1#6#15'Designtime only'#6
+  +#12'Runtime only'#6#22'Designtime and Runtime'#0#7'OnClick'#7#22'PkgTypeRadi'
+  +'oGroupClick'#8'TabOrder'#2#0#0#0#11'TRadioGroup'#16'UpdateRadioGroup'#22'An'
+  +'chorSideLeft.Control'#7#7'IDEPage'#21'AnchorSideTop.Control'#7#17'PkgTypeRa'
+  +'dioGroup'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'
+  +#7#7'IDEPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +'t'#3'Top'#3#128#0#5'Width'#3#252#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRig'
+  +'ht'#0#8'AutoFill'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'Update/Reb'
+  +'uild'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'
+  +#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'Chi'
+  +'ldSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.Shr'
+  +'inkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crs'
+  +'ScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27
+  +'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'b'#11'ClientWidth'#3#248
+  +#1#9'ItemIndex'#2#0#13'Items.Strings'#1#6#31'Automatically rebuild as needed'
+  +#6' Auto rebuild when rebuilding all'#6'(Manual compilation (never automatic'
+  +'ally)'#0#8'TabOrder'#2#1#0#0#9'TGroupBox'#14'LazDocGroupBox'#22'AnchorSideL'
+  +'eft.Control'#7#7'IDEPage'#21'AnchorSideTop.Control'#7#16'UpdateRadioGroup'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#7'IDEPa'
+  +'ge'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2'6'#3'To'
+  +'p'#3#250#0#5'Width'#3#252#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8
+  +'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#30'LazDoc - Lazarus d'
+  +'ocumentation'#12'ClientHeight'#2'$'#11'ClientWidth'#3#248#1#8'TabOrder'#2#2
+  +#0#5'TEdit'#14'LazDocPathEdit'#22'AnchorSideLeft.Control'#7#14'LazDocGroupBo'
+  +'x'#21'AnchorSideTop.Control'#7#14'LazDocGroupBox'#4'Left'#2#6#6'Height'#2#23
+  +#3'Top'#2#6#5'Width'#3#156#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20
+  +'BorderSpacing.Around'#2#6#8'TabOrder'#2#0#0#0#0#0#5'TPage'#12'ProvidesPage'
+  +#7'Caption'#6#8'Provides'#11'ClientWidth'#3#8#2#12'ClientHeight'#3'n'#1#0#9
+  +'TGroupBox'#16'ProvidesGroupBox'#22'AnchorSideLeft.Control'#7#12'ProvidesPag'
+  +'e'#21'AnchorSideTop.Control'#7#12'ProvidesPage'#23'AnchorSideRight.Control'
+  +#7#12'ProvidesPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBot'
+  +'tom.Control'#7#12'ProvidesPage'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#3'b'#1#3'Top'#2#6#5'Width'#3#252#1#5'Align'#7#8'alBotto'
+  +'m'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpaci'
+  +'ng.Around'#2#6#7'Caption'#6'9This package provides the same as the followin'
+  +'g packages:'#12'ClientHeight'#3'P'#1#11'ClientWidth'#3#248#1#8'TabOrder'#2#0
+  +#0#5'TMemo'#12'ProvidesMemo'#22'AnchorSideLeft.Control'#7#16'ProvidesGroupBo'
+  +'x'#21'AnchorSideTop.Control'#7#16'ProvidesGroupBox'#23'AnchorSideRight.Cont'
+  +'rol'#7#16'ProvidesGroupBox'#24'AnchorSideBottom.Control'#7#16'ProvidesGroup'
+  +'Box'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3'D'#1#3
+  +'Top'#2#6#5'Width'#3#236#1#5'Align'#7#8'alClient'#20'BorderSpacing.Around'#2
+  +#6#10'ScrollBars'#7#14'ssAutoVertical'#8'TabOrder'#2#0#0#0#0#0#5'TPage'#4'i1'
+  +'8n'#7'Caption'#6#4'i18n'#11'ClientWidth'#3#8#2#12'ClientHeight'#3'n'#1#0#9
+  +'TGroupBox'#12'I18NGroupBox'#22'AnchorSideLeft.Control'#7#4'i18n'#21'AnchorS'
+  ,'ideTop.Control'#7#18'EnableI18NCheckBox'#18'AnchorSideTop.Side'#7#9'asrBott'
+  +'om'#23'AnchorSideRight.Control'#7#4'i18n'#20'AnchorSideRight.Side'#7#9'asrB'
+  +'ottom'#4'Left'#2#6#6'Height'#2'T'#3'Top'#2'#'#5'Width'#3#252#1#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#12'i18n Options'#12'ClientHeight'#2'B'#11'ClientWidth'#3#248#1#8
+  +'TabOrder'#2#0#0#6'TLabel'#13'PoOutDirLabel'#22'AnchorSideLeft.Control'#7#12
+  +'I18NGroupBox'#21'AnchorSideTop.Control'#7#12'I18NGroupBox'#4'Left'#2#6#6'He'
+  +'ight'#2#18#3'Top'#2#6#5'Width'#3#132#0#20'BorderSpacing.Around'#2#6#7'Capti'
+  +'on'#6#20'PO Output Directory:'#11'ParentColor'#8#0#0#5'TEdit'#12'POOutDirEd'
+  +'it'#22'AnchorSideLeft.Control'#7#12'I18NGroupBox'#21'AnchorSideTop.Control'
+  +#7#13'PoOutDirLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRigh'
+  +'t.Control'#7#14'POOutDirButton'#4'Left'#2#6#6'Height'#2#23#3'Top'#2#30#5'Wi'
+  +'dth'#3#206#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing'
+  +'.Around'#2#6#8'TabOrder'#2#0#0#0#7'TButton'#14'POOutDirButton'#21'AnchorSid'
+  +'eTop.Control'#7#12'POOutDirEdit'#23'AnchorSideRight.Control'#7#12'I18NGroup'
+  +'Box'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7
+  +#12'POOutDirEdit'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#218#1#6
+  +'Height'#2#23#3'Top'#2#30#5'Width'#2#24#7'Anchors'#11#5'akTop'#7'akRight'#8
+  +'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#7'Caption'#6#3'...'#7
+  +'OnClick'#7#28'POOutputDirectoryButtonClick'#8'TabOrder'#2#1#0#0#0#9'TCheckB'
+  +'ox'#18'EnableI18NCheckBox'#4'Left'#2#6#6'Height'#2#22#3'Top'#2#7#5'Width'#2
+  +'b'#7'Caption'#6#11'Enable i18n'#8'OnChange'#7#24'EnableI18NCheckBoxChange'#8
+  +'TabOrder'#2#1#0#0#0#0#12'TButtonPanel'#12'ButtonPanel1'#4'Left'#2#6#6'Heigh'
+  +'t'#2'"'#3'Top'#3#143#1#5'Width'#3#4#2#8'TabOrder'#2#1#11'ShowButtons'#11#4
+  +'pbOK'#8'pbCancel'#0#0#0#0
 ]);
diff --git a/packager/pkgoptionsdlg.pas b/packager/pkgoptionsdlg.pas
index 248811e00b..3bee85d01c 100644
--- a/packager/pkgoptionsdlg.pas
+++ b/packager/pkgoptionsdlg.pas
@@ -42,7 +42,8 @@ uses
   ExtCtrls, StdCtrls, Spin, Dialogs, PathEditorDlg, IDEProcs, IDEWindowIntf,
   IDEDialogs, MacroIntf,
   LazarusIDEStrConsts,
-  BrokenDependenciesDlg, PackageDefs, PackageSystem, CompilerOptions;
+  BrokenDependenciesDlg, PackageDefs, PackageSystem, CompilerOptions,
+  ButtonPanel;
 
 type
 
@@ -51,10 +52,9 @@ type
   TPackageOptionsDialog = class(TForm)
     AdditionalInfoButton: TButton;
     AddPackageUnitToProjectCheckBox: TCheckBox;
-    CancelButton: TBitBtn;
+    ButtonPanel1: TButtonPanel;
     EnableI18NCheckBox: TCheckBox;
     ConditionalsGroupBox: TGroupBox;
-    OKButton: TBitBtn;
     Usage2Page: TPage;
     ProjectGroupBox: TGroupBox;
     I18NGroupBox: TGroupBox;
@@ -404,8 +404,7 @@ begin
   Notebook.Page[4].Caption:=lisPckOptsProvides;
   Notebook.Page[5].Caption:=dlgPOI18n;
 
-  OKButton.Caption:=lisLazBuildOk;
-  CancelButton.Caption:=dlgCancel;
+  ButtonPanel1.OKButton.OnClick:=@OkButtonClick;
 
   SetupUsagePage;
   SetupIDEPage;
@@ -536,7 +535,7 @@ procedure TPackageOptionsDialog.ReadOptionsFromPackage;
 begin
   if LazPackage=nil then exit;
   
-  OkButton.Enabled:=not LazPackage.ReadOnly;
+  ButtonPanel1.OKButton.Enabled:=not LazPackage.ReadOnly;
 
   // Description page
   DescriptionMemo.Text:=LazPackage.Description;