diff --git a/debugger/breakpropertydlg.lfm b/debugger/breakpropertydlg.lfm
index 30106311f9..5495c86289 100644
--- a/debugger/breakpropertydlg.lfm
+++ b/debugger/breakpropertydlg.lfm
@@ -1,8 +1,8 @@
 inherited BreakPropertyDlg: TBreakPropertyDlg
-  Left = 973
-  Height = 379
-  Top = 224
-  Width = 370
+  Left = 597
+  Height = 391
+  Top = 137
+  Width = 412
   HorzScrollBar.Page = 386
   VertScrollBar.Page = 366
   VertScrollBar.Range = 325
@@ -11,17 +11,17 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
   BorderIcons = [biSystemMenu]
   BorderStyle = bsDialog
   Caption = 'Breakpoint Properties'
-  ClientHeight = 379
-  ClientWidth = 370
+  ClientHeight = 391
+  ClientWidth = 412
   Position = poScreenCenter
   object lblFileName: TLabel[0]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = edtFilename
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 11
-    Width = 47
+    Height = 13
+    Top = 12
+    Width = 55
     BorderSpacing.Around = 6
     Caption = 'Filename:'
     ParentColor = False
@@ -31,9 +31,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = edtLine
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 40
-    Width = 24
+    Height = 13
+    Top = 41
+    Width = 28
     BorderSpacing.Around = 6
     Caption = 'Line:'
     ParentColor = False
@@ -43,9 +43,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = edtCondition
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 69
-    Width = 50
+    Height = 13
+    Top = 70
+    Width = 57
     BorderSpacing.Around = 6
     Caption = 'Condition:'
     ParentColor = False
@@ -55,11 +55,11 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = edtCounter
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 98
-    Width = 55
+    Height = 13
+    Top = 99
+    Width = 50
     BorderSpacing.Around = 6
-    Caption = 'Hitcounter:'
+    Caption = 'Hitcount:'
     ParentColor = False
   end
   object lblGroup: TLabel[4]
@@ -67,9 +67,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = cmbGroup
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 155
-    Width = 34
+    Height = 13
+    Top = 156
+    Width = 38
     BorderSpacing.Around = 6
     Caption = 'Group:'
     ParentColor = False
@@ -79,147 +79,151 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
     AnchorSideTop.Control = edtAutocontinueMS
     AnchorSideTop.Side = asrCenter
     Left = 6
-    Height = 14
-    Top = 127
-    Width = 92
+    Height = 13
+    Top = 128
+    Width = 107
     BorderSpacing.Around = 6
-    Caption = 'Auto continue (ms)'
+    Caption = 'Auto continue after'
     ParentColor = False
   end
-  object edtAutocontinueMS: TEdit[6]
+  object lblMS: TLabel[6]
+    AnchorSideLeft.Control = edtAutocontinueMS
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = lblAutoContinue
+    AnchorSideTop.Side = asrCenter
+    Left = 191
+    Height = 13
+    Top = 128
+    Width = 24
+    BorderSpacing.Left = 6
+    Caption = '(ms)'
+    ParentColor = False
+  end
+  object edtAutocontinueMS: TEdit[7]
     AnchorSideLeft.Control = lblAutoContinue
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = edtCounter
     AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 114
+    Left = 125
     Height = 23
     Top = 123
-    Width = 250
-    Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 10
+    Width = 60
+    BorderSpacing.Left = 6
     BorderSpacing.Around = 6
     TabOrder = 4
     Text = 'edtAutocontinueMS'
   end
-  object edtCounter: TEdit[7]
+  object edtCounter: TEdit[8]
     AnchorSideLeft.Control = lblAutoContinue
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = edtCondition
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 114
+    Left = 125
     Height = 23
     Top = 94
-    Width = 250
+    Width = 281
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 10
+    BorderSpacing.Left = 6
     BorderSpacing.Around = 6
     TabOrder = 3
     Text = 'edtCounter'
   end
-  object edtCondition: TEdit[8]
+  object edtCondition: TEdit[9]
     AnchorSideLeft.Control = lblAutoContinue
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = edtLine
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 114
+    Left = 125
     Height = 23
     Top = 65
-    Width = 250
+    Width = 281
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 10
+    BorderSpacing.Left = 6
     BorderSpacing.Around = 6
     TabOrder = 2
     Text = 'edtCondition'
   end
-  object edtLine: TEdit[9]
+  object edtLine: TEdit[10]
     AnchorSideLeft.Control = lblAutoContinue
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = edtFilename
     AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 114
+    Left = 125
     Height = 23
     Top = 36
-    Width = 250
-    Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 10
+    Width = 60
+    BorderSpacing.Left = 6
     BorderSpacing.Around = 6
     Color = clBtnFace
     ReadOnly = True
     TabOrder = 1
     Text = 'edtLine'
   end
-  object edtFilename: TEdit[10]
+  object edtFilename: TEdit[11]
     AnchorSideLeft.Control = lblAutoContinue
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = Owner
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 114
+    Left = 125
     Height = 24
     Top = 6
-    Width = 250
+    Width = 281
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 10
+    BorderSpacing.Left = 6
     BorderSpacing.Around = 6
     Color = clBtnFace
     ReadOnly = True
     TabOrder = 0
     Text = 'edtFilename'
   end
-  object cmbGroup: TComboBox[11]
+  object cmbGroup: TComboBox[12]
     AnchorSideLeft.Control = lblAutoContinue
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = edtAutocontinueMS
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 114
+    Left = 125
     Height = 21
     Top = 152
-    Width = 250
+    Width = 281
     Anchors = [akTop, akLeft, akRight]
-    AutoComplete = False
-    BorderSpacing.Left = 10
+    BorderSpacing.Left = 6
     BorderSpacing.Around = 6
-    Ctl3D = False
-    ItemHeight = 13
-    ItemWidth = 0
     TabOrder = 5
     Text = 'cmbGroup'
   end
-  object gbActions: TGroupBox[12]
+  object gbActions: TGroupBox[13]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = cmbGroup
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 6
-    Height = 163
+    Height = 165
     Top = 179
-    Width = 358
+    Width = 400
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Around = 6
     Caption = 'Actions'
-    ClientHeight = 145
-    ClientWidth = 354
-    Ctl3D = False
+    ClientHeight = 148
+    ClientWidth = 396
     TabOrder = 6
     object chkActionBreak: TCheckBox
       AnchorSideLeft.Control = gbActions
       AnchorSideTop.Control = gbActions
       Left = 6
-      Height = 17
+      Height = 20
       Top = 6
-      Width = 46
+      Width = 56
       BorderSpacing.Around = 6
       Caption = 'Break'
       TabOrder = 0
@@ -229,9 +233,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Control = edtEnableGroups
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 17
-      Top = 32
-      Width = 83
+      Height = 20
+      Top = 33
+      Width = 101
       BorderSpacing.Around = 6
       Caption = 'Enable goups'
       TabOrder = 1
@@ -241,9 +245,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Control = edtDisableGroups
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 17
-      Top = 61
-      Width = 88
+      Height = 20
+      Top = 62
+      Width = 108
       BorderSpacing.Around = 6
       Caption = 'Disable groups'
       TabOrder = 2
@@ -254,16 +258,15 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Control = chkActionBreak
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Side = asrBottom
-      Left = 132
+      Left = 142
       Height = 23
-      Top = 29
-      Width = 193
+      Top = 32
+      Width = 225
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 80
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 6
       ButtonWidth = 23
-      Ctl3D = False
       Enabled = False
       NumGlyphs = 1
       OnButtonClick = edtEnableGroupsButtonClick
@@ -275,16 +278,15 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Control = edtEnableGroups
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Side = asrBottom
-      Left = 132
+      Left = 142
       Height = 23
-      Top = 58
-      Width = 193
+      Top = 61
+      Width = 225
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 80
       BorderSpacing.Top = 6
       BorderSpacing.Bottom = 6
       ButtonWidth = 23
-      Ctl3D = False
       Enabled = False
       NumGlyphs = 1
       OnButtonClick = edtDisableGroupsButtonClick
@@ -295,9 +297,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Control = edtEvalExpression
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 17
-      Top = 90
-      Width = 92
+      Height = 20
+      Top = 91
+      Width = 113
       BorderSpacing.Around = 6
       Caption = 'Eval expression'
       Enabled = False
@@ -308,9 +310,9 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Control = edtLogMessage
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 17
-      Top = 119
-      Width = 81
+      Height = 20
+      Top = 120
+      Width = 98
       BorderSpacing.Around = 6
       Caption = 'Log message'
       Enabled = False
@@ -323,10 +325,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = gbActions
       AnchorSideRight.Side = asrBottom
-      Left = 132
+      Left = 142
       Height = 23
-      Top = 87
-      Width = 216
+      Top = 90
+      Width = 248
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 80
       BorderSpacing.Top = 6
@@ -342,10 +344,10 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       AnchorSideTop.Side = asrBottom
       AnchorSideRight.Control = gbActions
       AnchorSideRight.Side = asrBottom
-      Left = 132
+      Left = 142
       Height = 23
-      Top = 116
-      Width = 216
+      Top = 119
+      Width = 248
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 80
       BorderSpacing.Top = 6
@@ -355,67 +357,17 @@ inherited BreakPropertyDlg: TBreakPropertyDlg
       TabOrder = 8
     end
   end
-  object btnHelp: TBitBtn[13]
+  object ButtonPanel: TButtonPanel[14]
     AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = gbActions
-    AnchorSideTop.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 6
-    Height = 25
-    Top = 348
-    Width = 75
-    AutoSize = True
-    BorderSpacing.Around = 6
-    Caption = 'Help'
-    Constraints.MinHeight = 25
-    Constraints.MinWidth = 75
-    NumGlyphs = 0
-    OnClick = btnHelpClick
-    TabOrder = 7
-  end
-  object btnOK: TBitBtn[14]
-    AnchorSideTop.Control = gbActions
-    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = btnCancel
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 208
-    Height = 25
-    Top = 348
-    Width = 75
-    Anchors = [akTop, akRight]
-    AutoSize = True
-    BorderSpacing.Around = 6
-    Caption = 'OK'
-    Constraints.MinHeight = 25
-    Constraints.MinWidth = 75
-    Default = True
-    ModalResult = 1
-    NumGlyphs = 0
-    OnClick = btnOKClick
-    TabOrder = 8
-  end
-  object btnCancel: TBitBtn[15]
-    AnchorSideTop.Control = gbActions
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 289
-    Height = 25
-    Top = 348
-    Width = 75
-    Anchors = [akTop, akRight]
+    Height = 42
+    Top = 349
+    Width = 412
+    Align = alBottom
     AutoSize = True
-    BorderSpacing.Around = 6
-    Cancel = True
-    Caption = 'Cancel'
-    Constraints.MinHeight = 25
-    Constraints.MinWidth = 75
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 9
+    TabOrder = 7
+    ShowButtons = [pbOK, pbCancel, pbHelp]
   end
 end
diff --git a/debugger/breakpropertydlg.lrs b/debugger/breakpropertydlg.lrs
index 35d137590b..67f3e59ca2 100644
--- a/debugger/breakpropertydlg.lrs
+++ b/debugger/breakpropertydlg.lrs
@@ -1,149 +1,133 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TBreakPropertyDlg','FORMDATA',[
-  'TPF0'#241#17'TBreakPropertyDlg'#16'BreakPropertyDlg'#4'Left'#3#205#3#6'Heigh'
-  +'t'#3'{'#1#3'Top'#3#224#0#5'Width'#3'r'#1#18'HorzScrollBar.Page'#3#130#1#18
-  +'VertScrollBar.Page'#3'n'#1#19'VertScrollBar.Range'#3'E'#1#10'AutoScroll'#8#8
+  'TPF0'#241#17'TBreakPropertyDlg'#16'BreakPropertyDlg'#4'Left'#3'U'#2#6'Height'
+  +#3#135#1#3'Top'#3#137#0#5'Width'#3#156#1#18'HorzScrollBar.Page'#3#130#1#18'V'
+  +'ertScrollBar.Page'#3'n'#1#19'VertScrollBar.Range'#3'E'#1#10'AutoScroll'#8#8
   +'AutoSize'#9#11'BorderIcons'#11#12'biSystemMenu'#0#11'BorderStyle'#7#8'bsDia'
-  +'log'#7'Caption'#6#21'Breakpoint Properties'#12'ClientHeight'#3'{'#1#11'Clie'
-  +'ntWidth'#3'r'#1#8'Position'#7#14'poScreenCenter'#0#242#2#0#6'TLabel'#11'lbl'
-  +'FileName'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
-  +#11'edtFilename'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'
-  +#2#14#3'Top'#2#11#5'Width'#2'/'#20'BorderSpacing.Around'#2#6#7'Caption'#6#9
-  +'Filename:'#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#7'lblLine'#22'AnchorSide'
-  +'Left.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#7'edtLine'#18'AnchorSi'
-  +'deTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'('#5'Width'#2
-  +#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#5'Line:'#11'ParentColor'#8#0#0
-  +#242#2#2#6'TLabel'#12'lblCondition'#22'AnchorSideLeft.Control'#7#5'Owner'#21
-  +'AnchorSideTop.Control'#7#12'edtCondition'#18'AnchorSideTop.Side'#7#9'asrCen'
-  +'ter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'E'#5'Width'#2'2'#20'BorderSpacing.'
-  +'Around'#2#6#7'Caption'#6#10'Condition:'#11'ParentColor'#8#0#0#242#2#3#6'TLa'
-  +'bel'#11'lblHitCount'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop'
-  +'.Control'#7#10'edtCounter'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6
-  +#6'Height'#2#14#3'Top'#2'b'#5'Width'#2'7'#20'BorderSpacing.Around'#2#6#7'Cap'
-  +'tion'#6#11'Hitcounter:'#11'ParentColor'#8#0#0#242#2#4#6'TLabel'#8'lblGroup'
+  +'log'#7'Caption'#6#21'Breakpoint Properties'#12'ClientHeight'#3#135#1#11'Cli'
+  +'entWidth'#3#156#1#8'Position'#7#14'poScreenCenter'#0#242#2#0#6'TLabel'#11'l'
+  +'blFileName'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
+  +#7#11'edtFilename'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Heigh'
+  +'t'#2#13#3'Top'#2#12#5'Width'#2'7'#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#9'Filename:'#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#7'lblLine'#22'AnchorSi'
+  +'deLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#7'edtLine'#18'Anchor'
+  +'SideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#13#3'Top'#2')'#5'Width'
+  +#2#28#20'BorderSpacing.Around'#2#6#7'Caption'#6#5'Line:'#11'ParentColor'#8#0
+  +#0#242#2#2#6'TLabel'#12'lblCondition'#22'AnchorSideLeft.Control'#7#5'Owner'
+  +#21'AnchorSideTop.Control'#7#12'edtCondition'#18'AnchorSideTop.Side'#7#9'asr'
+  +'Center'#4'Left'#2#6#6'Height'#2#13#3'Top'#2'F'#5'Width'#2'9'#20'BorderSpaci'
+  +'ng.Around'#2#6#7'Caption'#6#10'Condition:'#11'ParentColor'#8#0#0#242#2#3#6
+  +'TLabel'#11'lblHitCount'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSide'
+  +'Top.Control'#7#10'edtCounter'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'
+  +#2#6#6'Height'#2#13#3'Top'#2'c'#5'Width'#2'2'#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#9'Hitcount:'#11'ParentColor'#8#0#0#242#2#4#6'TLabel'#8'lblGroup'
   +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#8'cmbGrou'
-  +'p'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#3
-  +#155#0#5'Width'#2'"'#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'Group:'#11
+  +'p'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#13#3'Top'#3
+  +#156#0#5'Width'#2'&'#20'BorderSpacing.Around'#2#6#7'Caption'#6#6'Group:'#11
   +'ParentColor'#8#0#0#242#2#5#6'TLabel'#15'lblAutoContinue'#22'AnchorSideLeft.'
   +'Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#17'edtAutocontinueMS'#18'An'
-  +'chorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2''#5'W'
-  +'idth'#2'\'#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'Auto continue (ms)'
-  +#11'ParentColor'#8#0#0#242#2#6#5'TEdit'#17'edtAutocontinueMS'#22'AnchorSideL'
-  +'eft.Control'#7#15'lblAutoContinue'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
-  +'AnchorSideTop.Control'#7#10'edtCounter'#18'AnchorSideTop.Side'#7#9'asrBotto'
-  +'m'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrB'
-  +'ottom'#4'Left'#2'r'#6'Height'#2#23#3'Top'#2'{'#5'Width'#3#250#0#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#10#20'BorderSpa'
-  +'cing.Around'#2#6#8'TabOrder'#2#4#4'Text'#6#17'edtAutocontinueMS'#0#0#242#2#7
-  +#5'TEdit'#10'edtCounter'#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19
-  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#12'edtCondi'
-  +'tion'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5
-  +'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'r'#6'Height'#2#23#3
-  +'Top'#2'^'#5'Width'#3#250#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18
-  +'BorderSpacing.Left'#2#10#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#3#4'Tex'
-  +'t'#6#10'edtCounter'#0#0#242#2#8#5'TEdit'#12'edtCondition'#22'AnchorSideLeft'
-  +'.Control'#7#15'lblAutoContinue'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'A'
-  +'nchorSideTop.Control'#7#7'edtLine'#18'AnchorSideTop.Side'#7#9'asrBottom'#23
-  +'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'
-  +#4'Left'#2'r'#6'Height'#2#23#3'Top'#2'A'#5'Width'#3#250#0#7'Anchors'#11#5'ak'
-  +'Top'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#10#20'BorderSpacing.Ar'
-  +'ound'#2#6#8'TabOrder'#2#2#4'Text'#6#12'edtCondition'#0#0#242#2#9#5'TEdit'#7
-  +'edtLine'#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19'AnchorSideLeft'
-  +'.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#11'edtFilename'#18'Anchor'
-  +'SideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anch'
-  +'orSideRight.Side'#7#9'asrBottom'#4'Left'#2'r'#6'Height'#2#23#3'Top'#2'$'#5
-  +'Width'#3#250#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpaci'
-  +'ng.Left'#2#10#20'BorderSpacing.Around'#2#6#5'Color'#7#9'clBtnFace'#8'ReadOn'
-  +'ly'#9#8'TabOrder'#2#1#4'Text'#6#7'edtLine'#0#0#242#2#10#5'TEdit'#11'edtFile'
-  +'name'#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19'AnchorSideLeft.Si'
-  +'de'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.'
-  +'Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'r'#6
-  +'Height'#2#24#3'Top'#2#6#5'Width'#3#250#0#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#18'BorderSpacing.Left'#2#10#20'BorderSpacing.Around'#2#6#5'Color'
-  +#7#9'clBtnFace'#8'ReadOnly'#9#8'TabOrder'#2#0#4'Text'#6#11'edtFilename'#0#0
-  +#242#2#11#9'TComboBox'#8'cmbGroup'#22'AnchorSideLeft.Control'#7#15'lblAutoCo'
-  +'ntinue'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
-  +#17'edtAutocontinueMS'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRi'
-  ,'ght.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2'r'
-  +#6'Height'#2#21#3'Top'#3#152#0#5'Width'#3#250#0#7'Anchors'#11#5'akTop'#6'akL'
-  +'eft'#7'akRight'#0#12'AutoComplete'#8#18'BorderSpacing.Left'#2#10#20'BorderS'
-  +'pacing.Around'#2#6#5'Ctl3D'#8#10'ItemHeight'#2#13#9'ItemWidth'#2#0#8'TabOrd'
-  +'er'#2#5#4'Text'#6#8'cmbGroup'#0#0#242#2#12#9'TGroupBox'#9'gbActions'#22'Anc'
-  +'horSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#8'cmbGroup'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20
-  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#163#0#3'Top'#3
-  +#179#0#5'Width'#3'f'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoS'
-  +'ize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#7'Actions'#12'ClientHeight'
-  +#3#145#0#11'ClientWidth'#3'b'#1#5'Ctl3D'#8#8'TabOrder'#2#6#0#9'TCheckBox'#14
+  +'chorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#13#3'Top'#3#128#0#5
+  +'Width'#2'k'#20'BorderSpacing.Around'#2#6#7'Caption'#6#19'Auto continue afte'
+  +'r'#11'ParentColor'#8#0#0#242#2#6#6'TLabel'#5'lblMS'#22'AnchorSideLeft.Contr'
+  +'ol'#7#17'edtAutocontinueMS'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Ancho'
+  +'rSideTop.Control'#7#15'lblAutoContinue'#18'AnchorSideTop.Side'#7#9'asrCente'
+  +'r'#4'Left'#3#191#0#6'Height'#2#13#3'Top'#3#128#0#5'Width'#2#24#18'BorderSpa'
+  +'cing.Left'#2#6#7'Caption'#6#4'(ms)'#11'ParentColor'#8#0#0#242#2#7#5'TEdit'
+  +#17'edtAutocontinueMS'#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19'A'
+  +'nchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#10'edtCounte'
+  +'r'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBo'
+  +'ttom'#4'Left'#2'}'#6'Height'#2#23#3'Top'#2'{'#5'Width'#2'<'#18'BorderSpacin'
+  +'g.Left'#2#6#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#4#4'Text'#6#17'edtAu'
+  +'tocontinueMS'#0#0#242#2#8#5'TEdit'#10'edtCounter'#22'AnchorSideLeft.Control'
+  +#7#15'lblAutoContinue'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideT'
+  +'op.Control'#7#12'edtCondition'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Anc'
+  +'horSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2'}'#6'Height'#2#23#3'Top'#2'^'#5'Width'#3#25#1#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'#2
+  +#6#8'TabOrder'#2#3#4'Text'#6#10'edtCounter'#0#0#242#2#9#5'TEdit'#12'edtCondi'
+  +'tion'#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19'AnchorSideLeft.Si'
+  +'de'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#7'edtLine'#18'AnchorSideTop.'
+  +'Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRi'
+  +'ght.Side'#7#9'asrBottom'#4'Left'#2'}'#6'Height'#2#23#3'Top'#2'A'#5'Width'#3
+  +#25#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2
+  +#6#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#2#4'Text'#6#12'edtCondition'#0
+  +#0#242#2#10#5'TEdit'#7'edtLine'#22'AnchorSideLeft.Control'#7#15'lblAutoConti'
+  +'nue'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#11
+  +'edtFilename'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#4'Left'#2'}'#6'Height'#2#23#3'Top'#2'$'#5'Width'#2'<'#18'Bor'
+  +'derSpacing.Left'#2#6#20'BorderSpacing.Around'#2#6#5'Color'#7#9'clBtnFace'#8
+  +'ReadOnly'#9#8'TabOrder'#2#1#4'Text'#6#7'edtLine'#0#0#242#2#11#5'TEdit'#11'e'
+  +'dtFilename'#22'AnchorSideLeft.Control'#7#15'lblAutoContinue'#19'AnchorSideL'
+  +'eft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSide'
+  +'Right.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2
+  +'}'#6'Height'#2#24#3'Top'#2#6#5'Width'#3#25#1#7'Anchors'#11#5'akTop'#6'akLef'
+  +'t'#7'akRight'#0#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'#2#6#5'C'
+  +'olor'#7#9'clBtnFace'#8'ReadOnly'#9#8'TabOrder'#2#0#4'Text'#6#11'edtFilename'
+  +#0#0#242#2#12#9'TComboBox'#8'cmbGroup'#22'AnchorSideLeft.Control'#7#15'lblAu'
+  ,'toContinue'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'
+  +#7#17'edtAutocontinueMS'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSide'
+  +'Right.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2
+  +'}'#6'Height'#2#21#3'Top'#3#152#0#5'Width'#3#25#1#7'Anchors'#11#5'akTop'#6'a'
+  +'kLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#20'BorderSpacing.Around'#2#6
+  +#8'TabOrder'#2#5#4'Text'#6#8'cmbGroup'#0#0#242#2#13#9'TGroupBox'#9'gbActions'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#8'cmbGrou'
+  +'p'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Ow'
+  +'ner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#3#165#0#3
+  +'Top'#3#179#0#5'Width'#3#144#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#7'Actions'#12'Clien'
+  +'tHeight'#3#148#0#11'ClientWidth'#3#140#1#8'TabOrder'#2#6#0#9'TCheckBox'#14
   +'chkActionBreak'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSideTop.'
-  +'Control'#7#9'gbActions'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#6#5'Width'#2'.'
+  +'Control'#7#9'gbActions'#4'Left'#2#6#6'Height'#2#20#3'Top'#2#6#5'Width'#2'8'
   +#20'BorderSpacing.Around'#2#6#7'Caption'#6#5'Break'#8'TabOrder'#2#0#0#0#9'TC'
   +'heckBox'#15'chkEnableGroups'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'A'
   +'nchorSideTop.Control'#7#15'edtEnableGroups'#18'AnchorSideTop.Side'#7#9'asrC'
-  +'enter'#4'Left'#2#6#6'Height'#2#17#3'Top'#2' '#5'Width'#2'S'#20'BorderSpacin'
+  +'enter'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'!'#5'Width'#2'e'#20'BorderSpacin'
   +'g.Around'#2#6#7'Caption'#6#12'Enable goups'#8'TabOrder'#2#1#0#0#9'TCheckBox'
   +#16'chkDisableGroups'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSid'
   +'eTop.Control'#7#16'edtDisableGroups'#18'AnchorSideTop.Side'#7#9'asrCenter'#4
-  +'Left'#2#6#6'Height'#2#17#3'Top'#2'='#5'Width'#2'X'#20'BorderSpacing.Around'
+  +'Left'#2#6#6'Height'#2#20#3'Top'#2'>'#5'Width'#2'l'#20'BorderSpacing.Around'
   +#2#6#7'Caption'#6#14'Disable groups'#8'TabOrder'#2#2#0#0#11'TEditButton'#15
   +'edtEnableGroups'#22'AnchorSideLeft.Control'#7#14'chkActionBreak'#19'AnchorS'
   +'ideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#14'chkActionBreak'
   +#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBotto'
-  +'m'#4'Left'#3#132#0#6'Height'#2#23#3'Top'#2#29#5'Width'#3#193#0#7'Anchors'#11
+  +'m'#4'Left'#3#142#0#6'Height'#2#23#3'Top'#2' '#5'Width'#3#225#0#7'Anchors'#11
   +#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2'P'#17'BorderSpacin'
-  +'g.Top'#2#6#20'BorderSpacing.Bottom'#2#6#11'ButtonWidth'#2#23#5'Ctl3D'#8#7'E'
-  +'nabled'#8#9'NumGlyphs'#2#1#13'OnButtonClick'#7#26'edtEnableGroupsButtonClic'
-  +'k'#8'TabOrder'#2#5#0#0#11'TEditButton'#16'edtDisableGroups'#22'AnchorSideLe'
-  +'ft.Control'#7#14'chkActionBreak'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
-  +'AnchorSideTop.Control'#7#15'edtEnableGroups'#18'AnchorSideTop.Side'#7#9'asr'
-  +'Bottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#132#0#6'Height'#2
-  +#23#3'Top'#2':'#5'Width'#3#193#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
-  +#0#18'BorderSpacing.Left'#2'P'#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Bo'
-  +'ttom'#2#6#11'ButtonWidth'#2#23#5'Ctl3D'#8#7'Enabled'#8#9'NumGlyphs'#2#1#13
-  +'OnButtonClick'#7#27'edtDisableGroupsButtonClick'#8'TabOrder'#2#6#0#0#9'TChe'
-  +'ckBox'#17'chkEvalExpression'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'A'
-  +'nchorSideTop.Control'#7#17'edtEvalExpression'#18'AnchorSideTop.Side'#7#9'as'
-  +'rCenter'#4'Left'#2#6#6'Height'#2#17#3'Top'#2'Z'#5'Width'#2'\'#20'BorderSpac'
-  +'ing.Around'#2#6#7'Caption'#6#15'Eval expression'#7'Enabled'#8#8'TabOrder'#2
-  +#3#0#0#9'TCheckBox'#13'chkLogMessage'#22'AnchorSideLeft.Control'#7#9'gbActio'
-  +'ns'#21'AnchorSideTop.Control'#7#13'edtLogMessage'#18'AnchorSideTop.Side'#7#9
-  +'asrCenter'#4'Left'#2#6#6'Height'#2#17#3'Top'#2'w'#5'Width'#2'Q'#20'BorderSp'
-  +'acing.Around'#2#6#7'Caption'#6#11'Log message'#7'Enabled'#8#8'TabOrder'#2#4
-  +#0#0#5'TEdit'#17'edtEvalExpression'#22'AnchorSideLeft.Control'#7#14'chkActio'
-  +'nBreak'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
-  +#16'edtDisableGroups'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRig'
-  +'ht.Control'#7#9'gbActions'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3
-  +#132#0#6'Height'#2#23#3'Top'#2'W'#5'Width'#3#216#0#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2'P'#17'BorderSpacing.Top'#2#6
-  +#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Enabled'#8#8'Tab'
-  +'Order'#2#7#0#0#5'TEdit'#13'edtLogMessage'#22'AnchorSideLeft.Control'#7#14'c'
-  +'hkActionBreak'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Cont'
-  +'rol'#7#17'edtEvalExpression'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'Ancho'
-  +'rSideRight.Control'#7#9'gbActions'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
-  +'Left'#3#132#0#6'Height'#2#23#3'Top'#2't'#5'Width'#3#216#0#7'Anchors'#11#5'a'
-  +'kTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2'P'#17'BorderSpacing.T'
-  +'op'#2#6#19'BorderSpacing.Right'#2#6#20'BorderSpacing.Bottom'#2#6#7'Enabled'
-  +#8#8'TabOrder'#2#8#0#0#0#242#2#13#7'TBitBtn'#7'btnHelp'#22'AnchorSideLeft.Co'
-  +'ntrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#9'gbActions'#18'AnchorSideTop'
-  +'.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSide'
-  +'Bottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#25#3'Top'#3'\'#1#5'Widt'
-  +'h'#2'K'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#4'Help'#21
-  ,'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#9'NumGlyphs'#2#0#7
-  +'OnClick'#7#12'btnHelpClick'#8'TabOrder'#2#7#0#0#242#2#14#7'TBitBtn'#5'btnOK'
-  +#21'AnchorSideTop.Control'#7#9'gbActions'#18'AnchorSideTop.Side'#7#9'asrBott'
-  +'om'#23'AnchorSideRight.Control'#7#9'btnCancel'#24'AnchorSideBottom.Control'
-  +#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#208#0#6'Heigh'
-  +'t'#2#25#3'Top'#3'\'#1#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'A'
-  +'utoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#2'OK'#21'Constraints.M'
-  +'inHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'Default'#9#11'ModalResult'#2
-  +#1#9'NumGlyphs'#2#0#7'OnClick'#7#10'btnOKClick'#8'TabOrder'#2#8#0#0#242#2#15
-  +#7'TBitBtn'#9'btnCancel'#21'AnchorSideTop.Control'#7#9'gbActions'#18'AnchorS'
-  +'ideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'Ancho'
-  +'rSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'!'#1#6'Height'#2#25#3'Top'#3
-  +'\'#1#5'Width'#2'K'#7'Anchors'#11#5'akTop'#7'akRight'#0#8'AutoSize'#9#20'Bor'
-  +'derSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#21'Constraints.Mi'
-  +'nHeight'#2#25#20'Constraints.MinWidth'#2'K'#11'ModalResult'#2#2#9'NumGlyphs'
-  +#2#0#8'TabOrder'#2#9#0#0#0
+  +'g.Top'#2#6#20'BorderSpacing.Bottom'#2#6#11'ButtonWidth'#2#23#7'Enabled'#8#9
+  +'NumGlyphs'#2#1#13'OnButtonClick'#7#26'edtEnableGroupsButtonClick'#8'TabOrde'
+  +'r'#2#5#0#0#11'TEditButton'#16'edtDisableGroups'#22'AnchorSideLeft.Control'#7
+  +#14'chkActionBreak'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.'
+  +'Control'#7#15'edtEnableGroups'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'Anc'
+  +'horSideRight.Side'#7#9'asrBottom'#4'Left'#3#142#0#6'Height'#2#23#3'Top'#2'='
+  +#5'Width'#3#225#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpa'
+  +'cing.Left'#2'P'#17'BorderSpacing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#11'B'
+  +'uttonWidth'#2#23#7'Enabled'#8#9'NumGlyphs'#2#1#13'OnButtonClick'#7#27'edtDi'
+  +'sableGroupsButtonClick'#8'TabOrder'#2#6#0#0#9'TCheckBox'#17'chkEvalExpressi'
+  +'on'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSideTop.Control'#7#17
+  +'edtEvalExpression'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Heig'
+  +'ht'#2#20#3'Top'#2'['#5'Width'#2'q'#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#15'Eval expression'#7'Enabled'#8#8'TabOrder'#2#3#0#0#9'TCheckBox'#13'chkLog'
+  +'Message'#22'AnchorSideLeft.Control'#7#9'gbActions'#21'AnchorSideTop.Control'
+  +#7#13'edtLogMessage'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Hei'
+  +'ght'#2#20#3'Top'#2'x'#5'Width'#2'b'#20'BorderSpacing.Around'#2#6#7'Caption'
+  +#6#11'Log message'#7'Enabled'#8#8'TabOrder'#2#4#0#0#5'TEdit'#17'edtEvalExpre'
+  +'ssion'#22'AnchorSideLeft.Control'#7#14'chkActionBreak'#19'AnchorSideLeft.Si'
+  +'de'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16'edtDisableGroups'#18'Anch'
+  +'orSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#9'gbActions'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#142#0#6'Height'#2#23#3'Top'#2
+  +'Z'#5'Width'#3#248#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'Border'
+  +'Spacing.Left'#2'P'#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#20
+  +'BorderSpacing.Bottom'#2#6#7'Enabled'#8#8'TabOrder'#2#7#0#0#5'TEdit'#13'edtL'
+  +'ogMessage'#22'AnchorSideLeft.Control'#7#14'chkActionBreak'#19'AnchorSideLef'
+  +'t.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'edtEvalExpression'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#9'gbAction'
+  +'s'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#142#0#6'Height'#2#23#3
+  +'Top'#2'w'#5'Width'#3#248#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18
+  +'BorderSpacing.Left'#2'P'#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2
+  +#6#20'BorderSpacing.Bottom'#2#6#7'Enabled'#8#8'TabOrder'#2#8#0#0#0#242#2#14
+  +#12'TButtonPanel'#11'ButtonPanel'#22'AnchorSideLeft.Control'#7#5'Owner'#18'A'
+  +'nchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20
+  +'AnchorSideRight.Side'#7#9'asrBottom'#6'Height'#2'*'#3'Top'#3']'#1#5'Width'#3
+  +#156#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#8'TabOrder'#2#7#11'ShowButtons'
+  ,#11#4'pbOK'#8'pbCancel'#6'pbHelp'#0#0#0#0
 ]);
diff --git a/debugger/breakpropertydlg.pas b/debugger/breakpropertydlg.pas
index 1e46881a10..43659a49c9 100644
--- a/debugger/breakpropertydlg.pas
+++ b/debugger/breakpropertydlg.pas
@@ -7,16 +7,14 @@ interface
 uses
   Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
   ExtCtrls, StdCtrls, Buttons, DebuggerDlg, Debugger, ButtonPanel, EditBtn,
-  BaseDebugManager, IDEContextHelpEdit;
+  BaseDebugManager, IDEContextHelpEdit, LazarusIDEStrConsts;
 
 type
 
   { TBreakPropertyDlg }
 
   TBreakPropertyDlg = class(TDebuggerDlg)
-    btnCancel: TBitBtn;
-    btnHelp: TBitBtn;
-    btnOK: TBitBtn;
+    ButtonPanel: TButtonPanel;
     chkEnableGroups: TCheckBox;
     chkDisableGroups: TCheckBox;
     chkEvalExpression: TCheckBox;
@@ -33,6 +31,7 @@ type
     edtFilename: TEdit;
     edtLine: TEdit;
     gbActions: TGroupBox;
+    lblMS: TLabel;
     lblFileName: TLabel;
     lblLine: TLabel;
     lblCondition: TLabel;
@@ -48,14 +47,12 @@ type
     procedure edtDisableGroupsButtonClick(Sender: TObject);
     procedure edtEnableGroupsButtonClick(Sender: TObject);
   private
-    { private declarations }
     FBreakpointsNotification : TIDEBreakPointsNotification;
     FBreakpoint: TIDEBreakPoint;
   protected
     procedure DoEndUpdate; override;
     procedure UpdateInfo;
   public
-    { public declarations }
     constructor Create(AOwner: TComponent; ABreakPoint: TIDEBreakPoint);overload;
     destructor Destroy; override;
   end;
@@ -72,7 +69,7 @@ end;
 
 procedure TBreakPropertyDlg.btnHelpClick(Sender: TObject);
 begin
-  ShowContextHelpForIDE(btnHelp);
+  ShowContextHelpForIDE(Self);
 end;
 
 procedure TBreakPropertyDlg.BreakPointRemove(
@@ -167,9 +164,12 @@ begin
   FBreakpointsNotification.OnRemove := @BreakPointRemove;
   UpdateInfo;
 
-  btnOK.LoadGlyphFromLazarusResource('btn_ok');
-  btnCancel.LoadGlyphFromLazarusResource('btn_cancel');
-  btnHelp.LoadGlyphFromLazarusResource('btn_help');
+  ButtonPanel.OKButton.Caption:= lisOkBtn;
+  ButtonPanel.CancelButton.Caption:= dlgCancel;
+  ButtonPanel.HelpButton.Caption:= lisPckEditHelp;
+
+  ButtonPanel.OKButton.OnClick := @btnOKClick;
+  ButtonPanel.HelpButton.OnClick := @btnHelpClick;
 end;
 
 destructor TBreakPropertyDlg.Destroy;
diff --git a/debugger/watchpropertydlg.lfm b/debugger/watchpropertydlg.lfm
index 9f463d418a..ed15e6ee41 100644
--- a/debugger/watchpropertydlg.lfm
+++ b/debugger/watchpropertydlg.lfm
@@ -1,86 +1,128 @@
 object WatchPropertyDlg: TWatchPropertyDlg
-  Left = 336
-  Height = 206
-  Top = 227
+  Left = 331
+  Height = 213
+  Top = 184
   Width = 420
   ActiveControl = chkAllowFunc
   Caption = 'Watch Properties'
-  ClientHeight = 206
+  ClientHeight = 213
   ClientWidth = 420
-  ParentFont = False
   Position = poScreenCenter
   LCLVersion = '0.9.27'
   object lblExpression: TLabel
-    Left = 16
-    Height = 14
-    Top = 14
-    Width = 57
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = txtExpression
+    AnchorSideTop.Side = asrCenter
+    Left = 6
+    Height = 13
+    Top = 11
+    Width = 65
+    BorderSpacing.Left = 6
     Caption = 'Expression:'
     ParentColor = False
   end
   object lblRepCount: TLabel
-    Left = 15
-    Height = 14
-    Top = 45
-    Width = 72
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = txtRepCount
+    AnchorSideTop.Side = asrCenter
+    Left = 6
+    Height = 13
+    Top = 40
+    Width = 80
+    BorderSpacing.Left = 6
     Caption = 'Repeat Count:'
     ParentColor = False
   end
   object lblDigits: TLabel
-    Left = 176
-    Height = 14
-    Top = 45
-    Width = 31
+    AnchorSideLeft.Control = txtRepCount
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = txtDigits
+    AnchorSideTop.Side = asrCenter
+    Left = 171
+    Height = 13
+    Top = 40
+    Width = 35
+    BorderSpacing.Left = 6
     Caption = 'Digits:'
     ParentColor = False
   end
   object txtExpression: TEdit
+    AnchorSideTop.Control = Owner
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
     Left = 105
     Height = 23
-    Top = 8
-    Width = 300
+    Top = 6
+    Width = 309
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
     TabOrder = 1
   end
   object txtRepCount: TEdit
+    AnchorSideTop.Control = txtExpression
+    AnchorSideTop.Side = asrBottom
     Left = 105
     Height = 23
-    Top = 39
+    Top = 35
     Width = 60
+    BorderSpacing.Top = 6
     TabOrder = 2
     Text = '0'
   end
   object txtDigits: TEdit
-    Left = 225
+    AnchorSideLeft.Control = lblDigits
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = txtExpression
+    AnchorSideTop.Side = asrBottom
+    Left = 212
     Height = 23
-    Top = 39
-    Width = 180
+    Top = 35
+    Width = 60
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
     TabOrder = 4
     Text = '0'
   end
   object chkEnabled: TCheckBox
-    Left = 15
-    Height = 19
-    Top = 65
-    Width = 64
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = chkAllowFunc
+    Left = 6
+    Height = 20
+    Top = 64
+    Width = 70
     AllowGrayed = True
+    BorderSpacing.Left = 6
     Caption = 'Enabled'
     TabOrder = 5
   end
   object chkAllowFunc: TCheckBox
+    AnchorSideTop.Control = txtRepCount
+    AnchorSideTop.Side = asrBottom
     Left = 105
-    Height = 19
-    Top = 65
-    Width = 120
+    Height = 20
+    Top = 64
+    Width = 140
     AllowGrayed = True
+    BorderSpacing.Top = 6
     Caption = 'Allow Function Calls'
     TabOrder = 0
   end
   object rgStyle: TRadioGroup
-    Left = 15
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = chkAllowFunc
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 6
     Height = 78
     Top = 90
-    Width = 390
+    Width = 408
+    Anchors = [akTop, akLeft, akRight]
     AutoFill = True
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    BorderSpacing.Right = 6
     Caption = 'Style'
     ChildSizing.LeftRightSpacing = 6
     ChildSizing.TopBottomSpacing = 6
@@ -90,8 +132,8 @@ object WatchPropertyDlg: TWatchPropertyDlg
     ChildSizing.ShrinkVertical = crsScaleChilds
     ChildSizing.Layout = cclLeftToRightThenTopToBottom
     ChildSizing.ControlsPerLine = 3
-    ClientHeight = 60
-    ClientWidth = 386
+    ClientHeight = 61
+    ClientWidth = 404
     Columns = 3
     ItemIndex = 7
     Items.Strings = (
@@ -107,56 +149,14 @@ object WatchPropertyDlg: TWatchPropertyDlg
     )
     TabOrder = 3
   end
-  object btnHelp: TBitBtn
-    AnchorSideLeft.Control = Owner
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 6
-    Height = 23
-    Top = 177
-    Width = 47
-    Anchors = [akLeft, akBottom]
+  object ButtonPanel: TButtonPanel
+    AnchorSideTop.Side = asrBottom
+    Height = 42
+    Top = 171
+    Width = 420
+    Align = alBottom
     AutoSize = True
-    BorderSpacing.Around = 6
-    Caption = 'Help'
-    NumGlyphs = 0
-    OnClick = btnHelpClick
     TabOrder = 6
-  end
-  object btnCancel: TBitBtn
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 356
-    Height = 23
-    Top = 177
-    Width = 58
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Around = 6
-    Cancel = True
-    Caption = 'Cancel'
-    ModalResult = 2
-    NumGlyphs = 0
-    TabOrder = 7
-  end
-  object btnOK: TBitBtn
-    AnchorSideRight.Control = btnCancel
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 310
-    Height = 23
-    Top = 177
-    Width = 40
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Around = 6
-    Caption = 'OK'
-    Default = True
-    ModalResult = 1
-    NumGlyphs = 0
-    OnClick = btnOKClick
-    TabOrder = 8
+    ShowButtons = [pbOK, pbCancel, pbHelp]
   end
 end
diff --git a/debugger/watchpropertydlg.lrs b/debugger/watchpropertydlg.lrs
index dce9107252..b115a83599 100644
--- a/debugger/watchpropertydlg.lrs
+++ b/debugger/watchpropertydlg.lrs
@@ -1,48 +1,56 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TWatchPropertyDlg','FORMDATA',[
-  'TPF0'#17'TWatchPropertyDlg'#16'WatchPropertyDlg'#4'Left'#3'P'#1#6'Height'#3
-  +#206#0#3'Top'#3#227#0#5'Width'#3#164#1#13'ActiveControl'#7#12'chkAllowFunc'#7
-  +'Caption'#6#16'Watch Properties'#12'ClientHeight'#3#206#0#11'ClientWidth'#3
-  +#164#1#10'ParentFont'#8#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6
-  +'0.9.27'#0#6'TLabel'#13'lblExpression'#4'Left'#2#16#6'Height'#2#14#3'Top'#2
-  +#14#5'Width'#2'9'#7'Caption'#6#11'Expression:'#11'ParentColor'#8#0#0#6'TLabe'
-  +'l'#11'lblRepCount'#4'Left'#2#15#6'Height'#2#14#3'Top'#2'-'#5'Width'#2'H'#7
-  +'Caption'#6#13'Repeat Count:'#11'ParentColor'#8#0#0#6'TLabel'#9'lblDigits'#4
-  +'Left'#3#176#0#6'Height'#2#14#3'Top'#2'-'#5'Width'#2#31#7'Caption'#6#7'Digit'
-  +'s:'#11'ParentColor'#8#0#0#5'TEdit'#13'txtExpression'#4'Left'#2'i'#6'Height'
-  +#2#23#3'Top'#2#8#5'Width'#3','#1#8'TabOrder'#2#1#0#0#5'TEdit'#11'txtRepCount'
-  +#4'Left'#2'i'#6'Height'#2#23#3'Top'#2''''#5'Width'#2'<'#8'TabOrder'#2#2#4'Te'
-  +'xt'#6#1'0'#0#0#5'TEdit'#9'txtDigits'#4'Left'#3#225#0#6'Height'#2#23#3'Top'#2
-  +''''#5'Width'#3#180#0#8'TabOrder'#2#4#4'Text'#6#1'0'#0#0#9'TCheckBox'#10'chk'
-  +'Enabled'#4'Left'#2#15#6'Height'#2#19#3'Top'#2'A'#5'Width'#2'@'#11'AllowGray'
-  +'ed'#9#7'Caption'#6#7'Enabled'#8'TabOrder'#2#5#0#0#9'TCheckBox'#12'chkAllowF'
-  +'unc'#4'Left'#2'i'#6'Height'#2#19#3'Top'#2'A'#5'Width'#2'x'#11'AllowGrayed'#9
-  +#7'Caption'#6#20'Allow Function Calls'#8'TabOrder'#2#0#0#0#11'TRadioGroup'#7
-  +'rgStyle'#4'Left'#2#15#6'Height'#2'N'#3'Top'#2'Z'#5'Width'#3#134#1#8'AutoFil'
-  +'l'#9#7'Caption'#6#5'Style'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSiz'
-  +'ing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogen'
-  +'ousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResi'
-  +'ze'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.Sh'
-  +'rinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRig'
-  +'htThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#3#12'ClientHeight'#2'<'
-  +#11'ClientWidth'#3#130#1#7'Columns'#2#3#9'ItemIndex'#2#7#13'Items.Strings'#1
-  +#6#9'Character'#6#6'String'#6#7'Decimal'#6#11'Hexadecimal'#6#14'Floating Poi'
-  +'nt'#6#7'Pointer'#6#16'Record/Structure'#6#7'Default'#6#11'Memory Dump'#0#8
-  +'TabOrder'#2#3#0#0#7'TBitBtn'#7'btnHelp'#22'AnchorSideLeft.Control'#7#5'Owne'
-  +'r'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'as'
-  +'rBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#177#0#5'Width'#2'/'#7'Anchors'
-  +#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Cap'
-  +'tion'#6#4'Help'#9'NumGlyphs'#2#0#7'OnClick'#7#12'btnHelpClick'#8'TabOrder'#2
-  +#6#0#0#7'TBitBtn'#9'btnCancel'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anc'
-  +'horSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'd'#1#6'Height'#2#23#3'Top'#3
-  +#177#0#5'Width'#2':'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20
-  +'BorderSpacing.Around'#2#6#6'Cancel'#9#7'Caption'#6#6'Cancel'#11'ModalResult'
-  +#2#2#9'NumGlyphs'#2#0#8'TabOrder'#2#7#0#0#7'TBitBtn'#5'btnOK'#23'AnchorSideR'
-  +'ight.Control'#7#9'btnCancel'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Anc'
-  +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#3'6'#1#6'Height'#2#23#3'Top'#3
-  +#177#0#5'Width'#2'('#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#2'OK'#7'Default'#9#11'ModalResult'#2
-  +#1#9'NumGlyphs'#2#0#7'OnClick'#7#10'btnOKClick'#8'TabOrder'#2#8#0#0#0
+  'TPF0'#17'TWatchPropertyDlg'#16'WatchPropertyDlg'#4'Left'#3'K'#1#6'Height'#3
+  +#213#0#3'Top'#3#184#0#5'Width'#3#164#1#13'ActiveControl'#7#12'chkAllowFunc'#7
+  +'Caption'#6#16'Watch Properties'#12'ClientHeight'#3#213#0#11'ClientWidth'#3
+  +#164#1#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0#6'TLabe'
+  +'l'#13'lblExpression'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop'
+  +'.Control'#7#13'txtExpression'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'
+  +#2#6#6'Height'#2#13#3'Top'#2#11#5'Width'#2'A'#18'BorderSpacing.Left'#2#6#7'C'
+  +'aption'#6#11'Expression:'#11'ParentColor'#8#0#0#6'TLabel'#11'lblRepCount'#22
+  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#11'txtRepCou'
+  +'nt'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#13#3'Top'
+  +#2'('#5'Width'#2'P'#18'BorderSpacing.Left'#2#6#7'Caption'#6#13'Repeat Count:'
+  +#11'ParentColor'#8#0#0#6'TLabel'#9'lblDigits'#22'AnchorSideLeft.Control'#7#11
+  +'txtRepCount'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contro'
+  +'l'#7#9'txtDigits'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#171#0#6'H'
+  +'eight'#2#13#3'Top'#2'('#5'Width'#2'#'#18'BorderSpacing.Left'#2#6#7'Caption'
+  +#6#7'Digits:'#11'ParentColor'#8#0#0#5'TEdit'#13'txtExpression'#21'AnchorSide'
+  +'Top.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSid'
+  +'eRight.Side'#7#9'asrBottom'#4'Left'#2'i'#6'Height'#2#23#3'Top'#2#6#5'Width'
+  +#3'5'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2
+  +#6#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#1#0#0#5'TEdit'#11'txtRepCount'
+  +#21'AnchorSideTop.Control'#7#13'txtExpression'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#4'Left'#2'i'#6'Height'#2#23#3'Top'#2'#'#5'Width'#2'<'#17'BorderSpa'
+  +'cing.Top'#2#6#8'TabOrder'#2#2#4'Text'#6#1'0'#0#0#5'TEdit'#9'txtDigits'#22'A'
+  +'nchorSideLeft.Control'#7#9'lblDigits'#19'AnchorSideLeft.Side'#7#9'asrBottom'
+  +#21'AnchorSideTop.Control'#7#13'txtExpression'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#4'Left'#3#212#0#6'Height'#2#23#3'Top'#2'#'#5'Width'#2'<'#18'Border'
+  +'Spacing.Left'#2#6#17'BorderSpacing.Top'#2#6#8'TabOrder'#2#4#4'Text'#6#1'0'#0
+  +#0#9'TCheckBox'#10'chkEnabled'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anch'
+  +'orSideTop.Control'#7#12'chkAllowFunc'#4'Left'#2#6#6'Height'#2#20#3'Top'#2'@'
+  +#5'Width'#2'F'#11'AllowGrayed'#9#18'BorderSpacing.Left'#2#6#7'Caption'#6#7'E'
+  +'nabled'#8'TabOrder'#2#5#0#0#9'TCheckBox'#12'chkAllowFunc'#21'AnchorSideTop.'
+  +'Control'#7#11'txtRepCount'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+  +'i'#6'Height'#2#20#3'Top'#2'@'#5'Width'#3#140#0#11'AllowGrayed'#9#17'BorderS'
+  +'pacing.Top'#2#6#7'Caption'#6#20'Allow Function Calls'#8'TabOrder'#2#0#0#0#11
+  +'TRadioGroup'#7'rgStyle'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSide'
+  +'Top.Control'#7#12'chkAllowFunc'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'An'
+  +'chorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#2'N'#3'Top'#2'Z'#5'Width'#3#152#1#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#0#8'AutoFill'#9#18'BorderSpacing.Left'#2#6#17'BorderSp'
+  +'acing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#5'Style'#28'ChildSi'
+  +'zing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSiz'
+  +'ing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.Enlarg'
+  +'eVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7
+  +#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'C'
+  +'hildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Contr'
+  +'olsPerLine'#2#3#12'ClientHeight'#2'='#11'ClientWidth'#3#148#1#7'Columns'#2#3
+  +#9'ItemIndex'#2#7#13'Items.Strings'#1#6#9'Character'#6#6'String'#6#7'Decimal'
+  +#6#11'Hexadecimal'#6#14'Floating Point'#6#7'Pointer'#6#16'Record/Structure'#6
+  +#7'Default'#6#11'Memory Dump'#0#8'TabOrder'#2#3#0#0#12'TButtonPanel'#11'Butt'
+  +'onPanel'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#2'*'#3'Top'#3#171#0
+  +#5'Width'#3#164#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#8'TabOrder'#2#6#11'Sh'
+  +'owButtons'#11#4'pbOK'#8'pbCancel'#6'pbHelp'#0#0#0#0
 ]);
diff --git a/debugger/watchpropertydlg.pp b/debugger/watchpropertydlg.pp
index 71523ff5eb..dc7dad22db 100644
--- a/debugger/watchpropertydlg.pp
+++ b/debugger/watchpropertydlg.pp
@@ -41,16 +41,14 @@ interface
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, LResources, StdCtrls,
   Buttons, Extctrls, Menus,
-  IDEContextHelpEdit, Debugger, BaseDebugManager;
+  IDEContextHelpEdit, Debugger, BaseDebugManager, ButtonPanel;
 
 type
 
   { TWatchPropertyDlg }
 
   TWatchPropertyDlg = class(TForm)
-    btnCancel: TBitBtn;
-    btnHelp: TBitBtn;
-    btnOK: TBitBtn;
+    ButtonPanel: TButtonPanel;
     lblExpression: TLabel;
     lblRepCount: TLabel;
     lblDigits: TLabel;
@@ -90,7 +88,7 @@ end;
 
 procedure TWatchPropertyDlg.btnHelpClick(Sender: TObject);
 begin
-  ShowContextHelpForIDE(btnHelp);
+  ShowContextHelpForIDE(Self);
 end;
 
 constructor TWatchPropertyDlg.Create(AOwner: TComponent; const AWatch: TIDEWatch);
@@ -119,9 +117,9 @@ begin
   lblDigits.Caption:= lisDigits;
   chkEnabled.Caption:= lisEnabled;
   chkAllowFunc.Caption:= lisAllowFunctio;
-  btnOK.Caption:= lisOkBtn;
-  btnCancel.Caption:= dlgCancel;
-  btnHelp.Caption:= lisPckEditHelp;
+  ButtonPanel.OKButton.Caption:= lisOkBtn;
+  ButtonPanel.CancelButton.Caption:= dlgCancel;
+  ButtonPanel.HelpButton.Caption:= lisPckEditHelp;
   rgStyle.Caption:= lisStyle;
   rgStyle.Items[0]:= lisCharacter;
   rgStyle.Items[1]:= lisString;
@@ -132,9 +130,9 @@ begin
   rgStyle.Items[6]:= lisRecordStruct;
   rgStyle.Items[7]:= dlgAssemblerDefault;
   rgStyle.Items[8]:= lisMemoryDump;
-  btnOK.LoadGlyphFromLazarusResource('btn_ok');
-  btnCancel.LoadGlyphFromLazarusResource('btn_cancel');
-  btnHelp.LoadGlyphFromLazarusResource('btn_help');
+
+  ButtonPanel.OKButton.OnClick := @btnOKClick;
+  ButtonPanel.HelpButton.OnClick := @btnHelpClick;
 end;
 
 destructor TWatchPropertyDlg.destroy;