diff --git a/debugger/watchesdlg.lfm b/debugger/watchesdlg.lfm
index d014c78813..26757b1bcc 100644
--- a/debugger/watchesdlg.lfm
+++ b/debugger/watchesdlg.lfm
@@ -1,66 +1,70 @@
 object WatchesDlg: TWatchesDlg
+  Caption = 'Watch list'
+  ClientHeight = 200
+  ClientWidth = 500
+  HorzScrollBar.Page = 501
+  VertScrollBar.Page = 201
   Left = 359
+  Height = 200
   Top = 126
   Width = 500
-  Height = 200
-  Caption = 'Watch list'
   object lvWatches: TListView
-    Left = 0
-    Top = 0
-    Width = 484
-    Height = 200
-    Align = alClient
-    Columns = <
+    Align = ALCLIENT
+    Columns = <    
       item
         Caption = 'Expression'
+        Visible = True
         Width = 150
-      end
+      end    
       item
         Caption = 'Value'
+        Visible = True
         Width = 400
       end>
-    PopupMenu = mnuPopup
     MultiSelect = True
-    ViewStyle = vsReport
+    PopupMenu = mnuPopup
+    ViewStyle = VSREPORT
     OnClick = lvWatchesClick
     OnSelectItem = lvWatchesSelectItem
+    Height = 200
+    Width = 500
   end
   object mnuPopup: TPopupMenu
-    Left = 100
-    Top = 96
+    left = 100
+    top = 96
     object popAdd: TMenuItem
       Caption = '&Add'
-      OnClick = popAddClick 
+      OnClick = popAddClick
     end
     object N1: TMenuItem
       Caption = '-'
     end
     object popProperties: TMenuItem
       Caption = '&Properties'
-      OnClick = popPropertiesClick 
+      OnClick = popPropertiesClick
     end
     object popEnabled: TMenuItem
       Caption = '&Enabled'
-      OnClick = popEnabledClick 
+      OnClick = popEnabledClick
     end
     object popDelete: TMenuItem
       Caption = '&Delete'
-      OnClick = popDeleteClick 
+      OnClick = popDeleteClick
     end
     object N2: TMenuItem
       Caption = '-'
     end
     object popDisableAll: TMenuItem
       Caption = 'D&isable All'
-      OnClick = popDisableAllClick 
+      OnClick = popDisableAllClick
     end
     object popEnableAll: TMenuItem
       Caption = 'E&nable All'
-      OnClick = popEnableAllClick 
+      OnClick = popEnableAllClick
     end
     object popDeleteAll: TMenuItem
       Caption = 'De&lete All'
-      OnClick = popDeleteAllClick 
+      OnClick = popDeleteAllClick
     end
   end
-end 
+end
diff --git a/debugger/watchesdlg.lrs b/debugger/watchesdlg.lrs
index 4450b1ebc5..12806cbfe3 100644
--- a/debugger/watchesdlg.lrs
+++ b/debugger/watchesdlg.lrs
@@ -1,20 +1,23 @@
-  LazarusResources.Add('TWatchesDlg','FORMDATA',
-    'TPF0'#11'TWatchesDlg'#10'WatchesDlg'#4'Left'#3'g'#1#3'Top'#2'~'#5'Width'#3
-    +#244#1#6'Height'#3#200#0#7'Caption'#6#10'Watch list'#0#9'TListView'#9'lvW'
-    +'atches'#4'Left'#2#0#3'Top'#2#0#5'Width'#3#228#1#6'Height'#3#200#0#5'Alig'
-    +'n'#7#8'alClient'#7'Columns'#14#1#7'Caption'#6#10'Expression'#5'Width'#3
-    +#150#0#0#1#7'Caption'#6#5'Value'#5'Width'#3#144#1#0#0#9'PopupMenu'#7#8'mn'
-    +'uPopup'#11'MultiSelect'#9#9'ViewStyle'#7#8'vsReport'#7'OnClick'#7#14'lvW'
-    +'atchesClick'#12'OnSelectItem'#7#19'lvWatchesSelectItem'#0#0#10'TPopupMen'
-    +'u'#8'mnuPopup'#4'Left'#2'd'#3'Top'#2'`'#0#9'TMenuItem'#6'popAdd'#7'Capti'
-    +'on'#6#4'&Add'#7'OnClick'#7#11'popAddClick'#0#0#9'TMenuItem'#2'N1'#7'Capt'
-    +'ion'#6#1'-'#0#0#9'TMenuItem'#13'popProperties'#7'Caption'#6#11'&Properti'
-    +'es'#7'OnClick'#7#18'popPropertiesClick'#0#0#9'TMenuItem'#10'popEnabled'#7
-    +'Caption'#6#8'&Enabled'#7'OnClick'#7#15'popEnabledClick'#0#0#9'TMenuItem'
-    +#9'popDelete'#7'Caption'#6#7'&Delete'#7'OnClick'#7#14'popDeleteClick'#0#0
-    +#9'TMenuItem'#2'N2'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#13'popDisableAll'#7
-    +'Caption'#6#12'D&isable All'#7'OnClick'#7#18'popDisableAllClick'#0#0#9'TM'
-    +'enuItem'#12'popEnableAll'#7'Caption'#6#11'E&nable All'#7'OnClick'#7#17'p'
-    +'opEnableAllClick'#0#0#9'TMenuItem'#12'popDeleteAll'#7'Caption'#6#11'De&l'
-    +'ete All'#7'OnClick'#7#17'popDeleteAllClick'#0#0#0#0
-  );
+{ This is an automatically generated lazarus resource file }
+
+LazarusResources.Add('TWatchesDlg','FORMDATA',[
+  'TPF0'#11'TWatchesDlg'#10'WatchesDlg'#7'Caption'#6#10'Watch list'#12'ClientHe'
+  +'ight'#3#200#0#11'ClientWidth'#3#244#1#18'HorzScrollBar.Page'#3#245#1#18'Ver'
+  +'tScrollBar.Page'#3#201#0#4'Left'#3'g'#1#6'Height'#3#200#0#3'Top'#2'~'#5'Wid'
+  +'th'#3#244#1#0#9'TListView'#9'lvWatches'#5'Align'#7#8'ALCLIENT'#7'Columns'#14
+  +#1#7'Caption'#6#10'Expression'#7'Visible'#9#5'Width'#3#150#0#0#1#7'Caption'#6
+  +#5'Value'#7'Visible'#9#5'Width'#3#144#1#0#0#11'MultiSelect'#9#9'PopupMenu'#7
+  +#8'mnuPopup'#9'ViewStyle'#7#8'VSREPORT'#7'OnClick'#7#14'lvWatchesClick'#12'O'
+  +'nSelectItem'#7#19'lvWatchesSelectItem'#6'Height'#3#200#0#5'Width'#3#244#1#0
+  +#0#10'TPopupMenu'#8'mnuPopup'#4'left'#2'd'#3'top'#2'`'#0#9'TMenuItem'#6'popA'
+  +'dd'#7'Caption'#6#4'&Add'#7'OnClick'#7#11'popAddClick'#0#0#9'TMenuItem'#2'N1'
+  +#7'Caption'#6#1'-'#0#0#9'TMenuItem'#13'popProperties'#7'Caption'#6#11'&Prope'
+  +'rties'#7'OnClick'#7#18'popPropertiesClick'#0#0#9'TMenuItem'#10'popEnabled'#7
+  +'Caption'#6#8'&Enabled'#7'OnClick'#7#15'popEnabledClick'#0#0#9'TMenuItem'#9
+  +'popDelete'#7'Caption'#6#7'&Delete'#7'OnClick'#7#14'popDeleteClick'#0#0#9'TM'
+  +'enuItem'#2'N2'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#13'popDisableAll'#7'Capti'
+  +'on'#6#12'D&isable All'#7'OnClick'#7#18'popDisableAllClick'#0#0#9'TMenuItem'
+  +#12'popEnableAll'#7'Caption'#6#11'E&nable All'#7'OnClick'#7#17'popEnableAllC'
+  +'lick'#0#0#9'TMenuItem'#12'popDeleteAll'#7'Caption'#6#11'De&lete All'#7'OnCl'
+  +'ick'#7#17'popDeleteAllClick'#0#0#0#0
+]);
diff --git a/debugger/watchpropertydlg.lfm b/debugger/watchpropertydlg.lfm
index 3d467f9256..6526b48e96 100644
--- a/debugger/watchpropertydlg.lfm
+++ b/debugger/watchpropertydlg.lfm
@@ -1,66 +1,86 @@
-object TWatchPropertyDlg
-  CAPTION = 'Watch Properties'
-  POSITION = poscreencenter
-  HEIGHT = 200
-  WIDTH = 420
-  object lblExpression: TLABEL
-    CAPTION = 'Expression:'
-    LEFT = 15
-    HEIGHT = 17
-    TOP = 20
-    WIDTH = 65
+object WatchPropertyDlg: TWatchPropertyDlg
+  Caption = 'Watch Properties'
+  ClientHeight = 200
+  ClientWidth = 420
+  Position = POSCREENCENTER
+  HorzScrollBar.Page = 421
+  VertScrollBar.Page = 201
+  Height = 200
+  Width = 420
+  object lblExpression: TLabel
+    Caption = 'Expression:'
+    Layout = TLTOP
+    Left = 15
+    Height = 17
+    Top = 20
+    Width = 65
   end
-  object txtExpression: TEDIT
-    LEFT = 105
-    TOP = 17
-    WIDTH = 300
+  object txtExpression: TEdit
+    TabOrder = 2
+    Left = 105
+    Height = 1
+    Top = 17
+    Width = 300
   end
-  object lblRepCount: TLABEL
-    CAPTION = 'Repeat Count:'
-    LEFT = 15
-    HEIGHT = 17
-    TOP = 45
-    WIDTH = 80
+  object lblRepCount: TLabel
+    Caption = 'Repeat Count:'
+    Layout = TLTOP
+    Left = 15
+    Height = 17
+    Top = 45
+    Width = 80
   end
-  object txtRepCount: TEDIT
-    TEXT = '0'
-    LEFT = 105
-    TOP = 42
-    WIDTH = 60
+  object txtRepCount: TEdit
+    Text = '0'
+    TabOrder = 4
+    Left = 105
+    Height = 1
+    Top = 42
+    Width = 60
   end
-  object lblDigits: TLABEL
-    CAPTION = 'Digits:'
-    LEFT = 175
-    HEIGHT = 17
-    TOP = 45
-    WIDTH = 40
+  object lblDigits: TLabel
+    Caption = 'Digits:'
+    Layout = TLTOP
+    Left = 175
+    Height = 17
+    Top = 45
+    Width = 40
   end
-  object txtDigits: TEDIT
-    TEXT = '0'
-    LEFT = 225
-    TOP = 45
-    WIDTH = 180
+  object txtDigits: TEdit
+    Text = '0'
+    TabOrder = 6
+    Left = 225
+    Height = 1
+    Top = 45
+    Width = 180
   end
-  object chkEnabled: TCHECKBOX
-    CAPTION = 'Enabled'
-    STATE = cbchecked
-    DRAGCURSOR = 0
-    TABORDER = 0
-    LEFT = 15
-    TOP = 65
-    WIDTH = 60
+  object chkEnabled: TCheckBox
+    AllowGrayed = True
+    AutoSize = True
+    Caption = 'Enabled'
+    DragCursor = 65524
+    TabOrder = 7
+    Left = 15
+    Height = 20
+    Top = 65
+    Width = 60
   end
-  object chkAllowFunc: TCHECKBOX
-    CAPTION = 'Allow Function Calls'
-    DRAGCURSOR = 0
-    TABORDER = 0
-    LEFT = 105
-    TOP = 65
+  object chkAllowFunc: TCheckBox
+    AllowGrayed = True
+    AutoSize = True
+    Caption = 'Allow Function Calls'
+    DragCursor = 65524
+    TabOrder = 0
+    Left = 105
+    Height = 20
+    Top = 65
+    Width = 1
   end
-  object rgStyle: TRADIOGROUP
-    CAPTION = 'Style'
-    ITEMINDEX = 7
-    ITEMS.Strings = (
+  object rgStyle: TRadioGroup
+    Caption = 'Style'
+    Columns = 3
+    ItemIndex = 7
+    Items.Strings = (
       'Character'
       'String'
       'Decimal'
@@ -71,34 +91,36 @@ object TWatchPropertyDlg
       'Default'
       'Memory Dump'
     )
-    COLUMNS = 3
-    LEFT = 15
-    HEIGHT = 70
-    TOP = 90
-    WIDTH = 390
+    Left = 15
+    Height = 70
+    Top = 90
+    Width = 390
   end
-  object btnOK: TBUTTON
-    MODALRESULT = 1
-    CAPTION = 'OK'
-    LEFT = 170
-    HEIGHT = 25
-    TOP = 170
-    WIDTH = 75  
+  object btnOK: TButton
+    ModalResult = 1
+    Caption = 'OK'
+    TabOrder = 9
     OnClick = btnOKClick
+    Left = 170
+    Height = 25
+    Top = 170
+    Width = 75
   end
-  object btnCancel: TBUTTON
-    MODALRESULT = 2
-    CAPTION = 'Cancel'
-    LEFT = 250
-    HEIGHT = 25
-    TOP = 170
-    WIDTH = 75
+  object btnCancel: TButton
+    ModalResult = 2
+    Caption = 'Cancel'
+    TabOrder = 10
+    Left = 250
+    Height = 25
+    Top = 170
+    Width = 75
   end
-  object btnHelp: TBUTTON
-    CAPTION = 'Help'
-    LEFT = 330
-    HEIGHT = 25
-    TOP = 170
-    WIDTH = 75
+  object btnHelp: TButton
+    Caption = 'Help'
+    TabOrder = 11
+    Left = 330
+    Height = 25
+    Top = 170
+    Width = 75
   end
 end
diff --git a/debugger/watchpropertydlg.lrs b/debugger/watchpropertydlg.lrs
index 54d6cddb36..d0c80a0139 100644
--- a/debugger/watchpropertydlg.lrs
+++ b/debugger/watchpropertydlg.lrs
@@ -1,26 +1,33 @@
-  LazarusResources.Add('TWatchPropertyDlg','FORMDATA',
-    'TPF0'#17'TWatchPropertyDlg'#0#7'CAPTION'#6#16'Watch Properties'#8'POSITIO'
-    +'N'#7#14'poscreencenter'#6'HEIGHT'#3#200#0#5'WIDTH'#3#164#1#0#6'TLABEL'#13
-    +'lblExpression'#7'CAPTION'#6#11'Expression:'#4'LEFT'#2#15#6'HEIGHT'#2#17#3
-    +'TOP'#2#20#5'WIDTH'#2'A'#0#0#5'TEDIT'#13'txtExpression'#4'LEFT'#2'i'#3'TO'
-    +'P'#2#17#5'WIDTH'#3','#1#0#0#6'TLABEL'#11'lblRepCount'#7'CAPTION'#6#13'Re'
-    +'peat Count:'#4'LEFT'#2#15#6'HEIGHT'#2#17#3'TOP'#2'-'#5'WIDTH'#2'P'#0#0#5
-    +'TEDIT'#11'txtRepCount'#4'TEXT'#6#1'0'#4'LEFT'#2'i'#3'TOP'#2'*'#5'WIDTH'#2
-    +'<'#0#0#6'TLABEL'#9'lblDigits'#7'CAPTION'#6#7'Digits:'#4'LEFT'#3#175#0#6
-    +'HEIGHT'#2#17#3'TOP'#2'-'#5'WIDTH'#2'('#0#0#5'TEDIT'#9'txtDigits'#4'TEXT'
-    +#6#1'0'#4'LEFT'#3#225#0#3'TOP'#2'-'#5'WIDTH'#3#180#0#0#0#9'TCHECKBOX'#10
-    +'chkEnabled'#7'CAPTION'#6#7'Enabled'#5'STATE'#7#9'cbchecked'#10'DRAGCURSO'
-    +'R'#2#0#8'TABORDER'#2#0#4'LEFT'#2#15#3'TOP'#2'A'#5'WIDTH'#2'<'#0#0#9'TCHE'
-    +'CKBOX'#12'chkAllowFunc'#7'CAPTION'#6#20'Allow Function Calls'#10'DRAGCUR'
-    +'SOR'#2#0#8'TABORDER'#2#0#4'LEFT'#2'i'#3'TOP'#2'A'#0#0#11'TRADIOGROUP'#7
-    +'rgStyle'#7'CAPTION'#6#5'Style'#9'ITEMINDEX'#2#7#13'ITEMS.Strings'#1#6#9
-    +'Character'#6#6'String'#6#7'Decimal'#6#11'Hexadecimal'#6#14'Floating Poin'
-    +'t'#6#7'Pointer'#6#16'Record/Structure'#6#7'Default'#6#11'Memory Dump'#0#7
-    +'COLUMNS'#2#3#4'LEFT'#2#15#6'HEIGHT'#2'F'#3'TOP'#2'Z'#5'WIDTH'#3#134#1#0#0
-    +#7'TBUTTON'#5'btnOK'#11'MODALRESULT'#2#1#7'CAPTION'#6#2'OK'#4'LEFT'#3#170
-    +#0#6'HEIGHT'#2#25#3'TOP'#3#170#0#5'WIDTH'#2'K'#7'OnClick'#7#10'btnOKClick'
-    +#0#0#7'TBUTTON'#9'btnCancel'#11'MODALRESULT'#2#2#7'CAPTION'#6#6'Cancel'#4
-    +'LEFT'#3#250#0#6'HEIGHT'#2#25#3'TOP'#3#170#0#5'WIDTH'#2'K'#0#0#7'TBUTTON'
-    +#7'btnHelp'#7'CAPTION'#6#4'Help'#4'LEFT'#3'J'#1#6'HEIGHT'#2#25#3'TOP'#3
-    +#170#0#5'WIDTH'#2'K'#0#0#0
-  );
+{ This is an automatically generated lazarus resource file }
+
+LazarusResources.Add('TWatchPropertyDlg','FORMDATA',[
+  'TPF0'#17'TWatchPropertyDlg'#16'WatchPropertyDlg'#7'Caption'#6#16'Watch Prope'
+  +'rties'#12'ClientHeight'#3#200#0#11'ClientWidth'#3#164#1#8'Position'#7#14'PO'
+  +'SCREENCENTER'#18'HorzScrollBar.Page'#3#165#1#18'VertScrollBar.Page'#3#201#0
+  +#6'Height'#3#200#0#5'Width'#3#164#1#0#6'TLabel'#13'lblExpression'#7'Caption'
+  +#6#11'Expression:'#6'Layout'#7#5'TLTOP'#4'Left'#2#15#6'Height'#2#17#3'Top'#2
+  +#20#5'Width'#2'A'#0#0#5'TEdit'#13'txtExpression'#8'TabOrder'#2#2#4'Left'#2'i'
+  +#6'Height'#2#1#3'Top'#2#17#5'Width'#3','#1#0#0#6'TLabel'#11'lblRepCount'#7'C'
+  +'aption'#6#13'Repeat Count:'#6'Layout'#7#5'TLTOP'#4'Left'#2#15#6'Height'#2#17
+  +#3'Top'#2'-'#5'Width'#2'P'#0#0#5'TEdit'#11'txtRepCount'#4'Text'#6#1'0'#8'Tab'
+  +'Order'#2#4#4'Left'#2'i'#6'Height'#2#1#3'Top'#2'*'#5'Width'#2'<'#0#0#6'TLabe'
+  +'l'#9'lblDigits'#7'Caption'#6#7'Digits:'#6'Layout'#7#5'TLTOP'#4'Left'#3#175#0
+  +#6'Height'#2#17#3'Top'#2'-'#5'Width'#2'('#0#0#5'TEdit'#9'txtDigits'#4'Text'#6
+  +#1'0'#8'TabOrder'#2#6#4'Left'#3#225#0#6'Height'#2#1#3'Top'#2'-'#5'Width'#3
+  +#180#0#0#0#9'TCheckBox'#10'chkEnabled'#11'AllowGrayed'#9#8'AutoSize'#9#7'Cap'
+  +'tion'#6#7'Enabled'#10'DragCursor'#4#244#255#0#0#8'TabOrder'#2#7#4'Left'#2#15
+  +#6'Height'#2#20#3'Top'#2'A'#5'Width'#2'<'#0#0#9'TCheckBox'#12'chkAllowFunc'
+  +#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6#20'Allow Function Calls'#10'Dr'
+  +'agCursor'#4#244#255#0#0#8'TabOrder'#2#0#4'Left'#2'i'#6'Height'#2#20#3'Top'#2
+  +'A'#5'Width'#2#1#0#0#11'TRadioGroup'#7'rgStyle'#7'Caption'#6#5'Style'#7'Colu'
+  +'mns'#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/St'
+  +'ructure'#6#7'Default'#6#11'Memory Dump'#0#4'Left'#2#15#6'Height'#2'F'#3'Top'
+  +#2'Z'#5'Width'#3#134#1#0#0#7'TButton'#5'btnOK'#11'ModalResult'#2#1#7'Caption'
+  +#6#2'OK'#8'TabOrder'#2#9#7'OnClick'#7#10'btnOKClick'#4'Left'#3#170#0#6'Heigh'
+  +'t'#2#25#3'Top'#3#170#0#5'Width'#2'K'#0#0#7'TButton'#9'btnCancel'#11'ModalRe'
+  +'sult'#2#2#7'Caption'#6#6'Cancel'#8'TabOrder'#2#10#4'Left'#3#250#0#6'Height'
+  +#2#25#3'Top'#3#170#0#5'Width'#2'K'#0#0#7'TButton'#7'btnHelp'#7'Caption'#6#4
+  +'Help'#8'TabOrder'#2#11#4'Left'#3'J'#1#6'Height'#2#25#3'Top'#3#170#0#5'Width'
+  +#2'K'#0#0#0
+]);
diff --git a/designer/taborderdlg.lfm b/designer/taborderdlg.lfm
index 682af473af..b521ea6970 100644
--- a/designer/taborderdlg.lfm
+++ b/designer/taborderdlg.lfm
@@ -11,7 +11,7 @@ object TabOrderDialog: TTabOrderDialog
   Top = 167
   Width = 310
   object UpSpeedbutton: TSpeedButton
-    Anchors = [aktop, akright]
+    Anchors = [AKTOP, AKRIGHT]
     NumGlyphs = 0
     OnClick = UpSpeedbuttonCLICK
     ShowHint = True
@@ -23,7 +23,7 @@ object TabOrderDialog: TTabOrderDialog
     Width = 25
   end
   object DownSpeedbutton: TSpeedButton
-    Anchors = [aktop, akright]
+    Anchors = [AKTOP, AKRIGHT]
     NumGlyphs = 0
     OnClick = DownSpeedbuttonCLICK
     ShowHint = True
@@ -35,7 +35,7 @@ object TabOrderDialog: TTabOrderDialog
     Width = 25
   end
   object OkButton: TButton
-    Anchors = [akright, akbottom]
+    Anchors = [AKRIGHT, AKBOTTOM]
     Caption = 'Ok'
     TabStop = True
     TabOrder = 0
@@ -46,7 +46,7 @@ object TabOrderDialog: TTabOrderDialog
     Width = 75
   end
   object CancelButton: TButton
-    Anchors = [akright, akbottom]
+    Anchors = [AKRIGHT, AKBOTTOM]
     ModalResult = 2
     Caption = 'Cancel'
     TabStop = True
@@ -57,14 +57,14 @@ object TabOrderDialog: TTabOrderDialog
     Width = 75
   end
   object ItemTreeview: TTreeView
-    Anchors = [aktop, akleft, akright, akbottom]
+    Anchors = [AKTOP, AKLEFT, AKRIGHT, AKBOTTOM]
     DefaultItemHeight = 17
-    DragCursor = crDefault
+    DragCursor = 65524
     HideSelection = False
     ParentCtl3D = False
     RightClickSelect = True
     TabOrder = 2
-    Options = [tvoautoitemheight, tvokeepcollapsednodes, tvorightclickselect, tvoshowbuttons, tvoshowlines, tvoshowroot, tvotooltips]
+    Options = [TVOAUTOITEMHEIGHT, TVOKEEPCOLLAPSEDNODES, TVORIGHTCLICKSELECT, TVOSHOWBUTTONS, TVOSHOWLINES, TVOSHOWROOT, TVOTOOLTIPS]
     Left = 9
     Height = 304
     Top = 8
@@ -72,10 +72,10 @@ object TabOrderDialog: TTabOrderDialog
   end
   object ShowOldValuesCheckbox: TCheckBox
     AllowGrayed = True
-    Anchors = [akleft, akbottom]
+    Anchors = [AKLEFT, AKBOTTOM]
     AutoSize = True
     Caption = 'ShowOldValuesCheckbox'
-    DragCursor = crDefault
+    DragCursor = 65524
     OnClick = ShowOldValuesCheckboxCLICK
     TabOrder = 3
     TabStop = True
diff --git a/designer/taborderdlg.lrs b/designer/taborderdlg.lrs
index 8cb25ee337..b8b1400b41 100644
--- a/designer/taborderdlg.lrs
+++ b/designer/taborderdlg.lrs
@@ -6,26 +6,26 @@ LazarusResources.Add('TTabOrderDialog','FORMDATA',[
   +'logCLOSE'#8'OnCreate'#7#20'TabOrderDialogCREATE'#18'HorzScrollBar.Page'#3'7'
   +#1#18'VertScrollBar.Page'#3#132#1#4'Left'#3'}'#1#6'Height'#3#131#1#3'Top'#3
   +#167#0#5'Width'#3'6'#1#0#12'TSpeedButton'#13'UpSpeedbutton'#7'Anchors'#11#5
-  +'aktop'#7'akright'#0#9'NumGlyphs'#2#0#7'OnClick'#7#18'UpSpeedbuttonCLICK'#8
+  +'AKTOP'#7'AKRIGHT'#0#9'NumGlyphs'#2#0#7'OnClick'#7#18'UpSpeedbuttonCLICK'#8
   +'ShowHint'#9#14'ParentShowHint'#8#4'Left'#3#9#1#6'Height'#2#25#4'Hint'#6#7'M'
   +'ove Up'#3'Top'#2'w'#5'Width'#2#25#0#0#12'TSpeedButton'#15'DownSpeedbutton'#7
-  +'Anchors'#11#5'aktop'#7'akright'#0#9'NumGlyphs'#2#0#7'OnClick'#7#20'DownSpee'
+  +'Anchors'#11#5'AKTOP'#7'AKRIGHT'#0#9'NumGlyphs'#2#0#7'OnClick'#7#20'DownSpee'
   +'dbuttonCLICK'#8'ShowHint'#9#14'ParentShowHint'#8#4'Left'#3#9#1#6'Height'#2
   +#25#4'Hint'#6#9'Move Down'#3'Top'#3#165#0#5'Width'#2#25#0#0#7'TButton'#8'OkB'
-  +'utton'#7'Anchors'#11#7'akright'#8'akbottom'#0#7'Caption'#6#2'Ok'#7'TabStop'
+  +'utton'#7'Anchors'#11#7'AKRIGHT'#8'AKBOTTOM'#0#7'Caption'#6#2'Ok'#7'TabStop'
   +#9#8'TabOrder'#2#0#7'OnClick'#7#13'OkButtonCLICK'#4'Left'#2'x'#6'Height'#2#25
   +#3'Top'#3'^'#1#5'Width'#2'K'#0#0#7'TButton'#12'CancelButton'#7'Anchors'#11#7
-  +'akright'#8'akbottom'#0#11'ModalResult'#2#2#7'Caption'#6#6'Cancel'#7'TabStop'
+  +'AKRIGHT'#8'AKBOTTOM'#0#11'ModalResult'#2#2#7'Caption'#6#6'Cancel'#7'TabStop'
   +#9#8'TabOrder'#2#1#4'Left'#3#216#0#6'Height'#2#25#3'Top'#3'^'#1#5'Width'#2'K'
-  +#0#0#9'TTreeView'#12'ItemTreeview'#7'Anchors'#11#5'aktop'#6'akleft'#7'akrigh'
-  +'t'#8'akbottom'#0#17'DefaultItemHeight'#2#17#10'DragCursor'#7#9'crDefault'#13
+  +#0#0#9'TTreeView'#12'ItemTreeview'#7'Anchors'#11#5'AKTOP'#6'AKLEFT'#7'AKRIGH'
+  +'T'#8'AKBOTTOM'#0#17'DefaultItemHeight'#2#17#10'DragCursor'#4#244#255#0#0#13
   +'HideSelection'#8#11'ParentCtl3D'#8#16'RightClickSelect'#9#8'TabOrder'#2#2#7
-  +'Options'#11#17'tvoautoitemheight'#21'tvokeepcollapsednodes'#19'tvorightclic'
-  +'kselect'#14'tvoshowbuttons'#12'tvoshowlines'#11'tvoshowroot'#11'tvotooltips'
+  +'Options'#11#17'TVOAUTOITEMHEIGHT'#21'TVOKEEPCOLLAPSEDNODES'#19'TVORIGHTCLIC'
+  +'KSELECT'#14'TVOSHOWBUTTONS'#12'TVOSHOWLINES'#11'TVOSHOWROOT'#11'TVOTOOLTIPS'
   +#0#4'Left'#2#9#6'Height'#3'0'#1#3'Top'#2#8#5'Width'#3#238#0#0#0#9'TCheckBox'
-  +#21'ShowOldValuesCheckbox'#11'AllowGrayed'#9#7'Anchors'#11#6'akleft'#8'akbot'
-  +'tom'#0#8'AutoSize'#9#7'Caption'#6#21'ShowOldValuesCheckbox'#10'DragCursor'#7
-  +#9'crDefault'#7'OnClick'#7#26'ShowOldValuesCheckboxCLICK'#8'TabOrder'#2#3#7
-  +'TabStop'#9#4'Left'#2#9#6'Height'#2#20#3'Top'#3'@'#1#5'Width'#3#171#0#0#0#10
+  +#21'ShowOldValuesCheckbox'#11'AllowGrayed'#9#7'Anchors'#11#6'AKLEFT'#8'AKBOT'
+  +'TOM'#0#8'AutoSize'#9#7'Caption'#6#21'ShowOldValuesCheckbox'#10'DragCursor'#4
+  +#244#255#0#0#7'OnClick'#7#26'ShowOldValuesCheckboxCLICK'#8'TabOrder'#2#3#7'T'
+  +'abStop'#9#4'Left'#2#9#6'Height'#2#20#3'Top'#3'@'#1#5'Width'#3#171#0#0#0#10
   +'TImageList'#10'Imagelist1'#4'left'#2'8'#3'top'#3#4#1#0#0#0
 ]);
diff --git a/doceditor/doceditor.lfm b/doceditor/doceditor.lfm
index c9e9f0f35d..c099677c63 100644
--- a/doceditor/doceditor.lfm
+++ b/doceditor/doceditor.lfm
@@ -22,7 +22,6 @@ object DocEditorWnd: TDocEditorWnd
   object ContextTreeview: TTreeView
     Align = alleft
     DefaultItemHeight = 17
-    DragCursor = crDefault
     ParentCtl3D = False
     TabOrder = 1
     Height = 368
diff --git a/examples/treeview/tv_add_remove_u1.lfm b/examples/treeview/tv_add_remove_u1.lfm
index ca514002fb..fb4396d072 100644
--- a/examples/treeview/tv_add_remove_u1.lfm
+++ b/examples/treeview/tv_add_remove_u1.lfm
@@ -14,7 +14,6 @@ object Form1: TForm1
   object tv_eg1: TTreeView
     Align = alleft
     DefaultItemHeight = 17
-    DragCursor = crDefault
     HideSelection = False
     Indent = 19
     ParentCtl3D = False
diff --git a/ide/buildfiledlg.lfm b/ide/buildfiledlg.lfm
index 0e27a435d6..6b9ff98658 100644
--- a/ide/buildfiledlg.lfm
+++ b/ide/buildfiledlg.lfm
@@ -1,255 +1,260 @@
 object BuildFileDialog: TBuildFileDialog
-  CAPTION = 'BuildFileDialog'
-  CLIENTHEIGHT = 344
-  CLIENTWIDTH = 414
-  KEYPREVIEW = True
-  ONCREATE = BuildFileDialogCREATE
-  ONKEYDOWN = BuildFileDialogKEYDOWN
-  POSITION = poscreencenter
-  HORZSCROLLBAR.PAGE = 415
-  VERTSCROLLBAR.PAGE = 345
-  LEFT = 336
-  HEIGHT = 344
-  TOP = 221
-  WIDTH = 414
-  object OkButton: TBUTTON
-    ANCHORS = [akleft, akbottom]
-    CAPTION = 'Ok'
-    TABSTOP = True
-    TABORDER = 0
-    ONCLICK = OkButtonCLICK
-    LEFT = 106
-    HEIGHT = 25
-    TOP = 310
-    WIDTH = 75
+  Caption = 'BuildFileDialog'
+  ClientHeight = 344
+  ClientWidth = 414
+  KeyPreview = True
+  OnCreate = BuildFileDialogCREATE
+  OnKeyDown = BuildFileDialogKEYDOWN
+  Position = POSCREENCENTER
+  HorzScrollBar.Page = 415
+  VertScrollBar.Page = 345
+  Left = 336
+  Height = 344
+  Top = 221
+  Width = 414
+  object OkButton: TButton
+    Anchors = [AKLEFT, AKBOTTOM]
+    Caption = 'Ok'
+    TabStop = True
+    TabOrder = 0
+    OnClick = OkButtonCLICK
+    Left = 106
+    Height = 25
+    Top = 310
+    Width = 75
   end
-  object CancelButton: TBUTTON
-    ANCHORS = [akleft, akbottom]
-    MODALRESULT = 2
-    CAPTION = 'Cancel'
-    TABSTOP = True
-    TABORDER = 1
-    LEFT = 234
-    HEIGHT = 25
-    TOP = 310
-    WIDTH = 75
+  object CancelButton: TButton
+    Anchors = [AKLEFT, AKBOTTOM]
+    ModalResult = 2
+    Caption = 'Cancel'
+    TabStop = True
+    TabOrder = 1
+    Left = 234
+    Height = 25
+    Top = 310
+    Width = 75
   end
-  object Notebook1: TNOTEBOOK
-    ALIGN = altop
-    ANCHORS = [aktop, akleft, akright, akbottom]
-    PAGEINDEX = 2
-    HEIGHT = 304
-    WIDTH = 414
-    object GeneralPage: TPAGE
-      CAPTION = 'Options'
-      CLIENTWIDTH = 410
-      CLIENTHEIGHT = 274
-      LEFT = 2
-      HEIGHT = 274
-      TOP = 28
-      WIDTH = 410
-      object WhenFileIsActiveGroupbox: TGROUPBOX
-        CAPTION = 'When this file is active in source editor ...'
-        CLIENTHEIGHT = 64
-        CLIENTWIDTH = 397
-        PARENTCTL3D = False
-        TABORDER = 0
-        LEFT = 6
-        HEIGHT = 81
-        TOP = 12
-        WIDTH = 401
-        object OverrideBuildProjectCheckbox: TCHECKBOX
-          ALLOWGRAYED = True
-          AUTOSIZE = True
-          CAPTION = 'On build project execute the Build File command instead'
-          DRAGCURSOR = 0
-          TABORDER = 0
-          TABSTOP = True
-          LEFT = 6
-          HEIGHT = 20
-          TOP = 9
-          WIDTH = 384
+  object Notebook1: TNotebook
+    Align = ALTOP
+    Anchors = [AKTOP, AKLEFT, AKRIGHT, AKBOTTOM]
+    PageIndex = 2
+    Height = 304
+    Width = 414
+    object GeneralPage: TPage
+      Caption = 'Options'
+      ClientWidth = 410
+      ClientHeight = 274
+      Left = 2
+      Height = 274
+      Top = 28
+      Width = 410
+      object WhenFileIsActiveGroupbox: TGroupBox
+        Caption = 'When this file is active in source editor ...'
+        ClientHeight = 64
+        ClientWidth = 397
+        ParentColor = True
+        ParentCtl3D = False
+        TabOrder = 0
+        Left = 6
+        Height = 81
+        Top = 12
+        Width = 401
+        object OverrideBuildProjectCheckbox: TCheckBox
+          AllowGrayed = True
+          AutoSize = True
+          Caption = 'On build project execute the Build File command instead'
+          DragCursor = 65524
+          TabOrder = 0
+          TabStop = True
+          Left = 6
+          Height = 20
+          Top = 9
+          Width = 384
         end
-        object OverrideRunProjectCheckbox: TCHECKBOX
-          ALLOWGRAYED = True
-          AUTOSIZE = True
-          CAPTION = 'On run project execute the Run File command instead'
-          DRAGCURSOR = 0
-          TABORDER = 1
-          TABSTOP = True
-          LEFT = 6
-          HEIGHT = 20
-          TOP = 33
-          WIDTH = 384
+        object OverrideRunProjectCheckbox: TCheckBox
+          AllowGrayed = True
+          AutoSize = True
+          Caption = 'On run project execute the Run File command instead'
+          DragCursor = 65524
+          TabOrder = 1
+          TabStop = True
+          Left = 6
+          Height = 20
+          Top = 33
+          Width = 384
         end
       end
     end
-    object BuildPage: TPAGE
-      CAPTION = 'Build'
-      CLIENTWIDTH = 410
-      CLIENTHEIGHT = 274
-      ONRESIZE = BuildPageRESIZE
-      LEFT = 2
-      HEIGHT = 274
-      TOP = 28
-      WIDTH = 410
-      object BuildCommandGroupbox: TGROUPBOX
-        ANCHORS = [aktop, akleft, akright]
-        CAPTION = 'Build Command'
-        CLIENTHEIGHT = 53
-        CLIENTWIDTH = 398
-        PARENTCTL3D = False
-        TABORDER = 0
-        LEFT = 4
-        HEIGHT = 70
-        TOP = 52
-        WIDTH = 402
-        object BuildCommandMemo: TMEMO
-          ALIGN = alclient
-          LINES.Strings = (
+    object BuildPage: TPage
+      Caption = 'Build'
+      ClientWidth = 410
+      ClientHeight = 274
+      OnResize = BuildPageRESIZE
+      Left = 2
+      Height = 274
+      Top = 28
+      Width = 410
+      object BuildCommandGroupbox: TGroupBox
+        Anchors = [AKTOP, AKLEFT, AKRIGHT]
+        Caption = 'Build Command'
+        ClientHeight = 53
+        ClientWidth = 398
+        ParentColor = True
+        ParentCtl3D = False
+        TabOrder = 0
+        Left = 4
+        Height = 70
+        Top = 52
+        Width = 402
+        object BuildCommandMemo: TMemo
+          Align = ALCLIENT
+          Lines.Strings = (
             'CompileCommandMemo'
           )
-          TABSTOP = True
-          TABSTOP = True
-          TABORDER = 0
-          HEIGHT = 53
-          WIDTH = 398
+          Tabstop = True
+          TabStop = True
+          TabOrder = 0
+          Height = 53
+          Width = 398
         end
       end
-      object BuildScanForFPCMsgCheckbox: TCHECKBOX
-        ALLOWGRAYED = True
-        ANCHORS = [aktop, akleft, akright]
-        AUTOSIZE = True
-        CAPTION = 'Scan for FPC messages'
-        DRAGCURSOR = 0
-        TABORDER = 1
-        TABSTOP = True
-        LEFT = 10
-        HEIGHT = 20
-        TOP = 122
-        WIDTH = 388
+      object BuildScanForFPCMsgCheckbox: TCheckBox
+        AllowGrayed = True
+        Anchors = [AKTOP, AKLEFT, AKRIGHT]
+        AutoSize = True
+        Caption = 'Scan for FPC messages'
+        DragCursor = 65524
+        TabOrder = 1
+        TabStop = True
+        Left = 10
+        Height = 20
+        Top = 122
+        Width = 388
       end
-      object BuildScanForMakeMsgCheckbox: TCHECKBOX
-        ALLOWGRAYED = True
-        ANCHORS = [aktop, akleft, akright]
-        AUTOSIZE = True
-        CAPTION = 'Scan for Make messages'
-        DRAGCURSOR = 0
-        TABORDER = 2
-        TABSTOP = True
-        LEFT = 10
-        HEIGHT = 20
-        TOP = 146
-        WIDTH = 388
+      object BuildScanForMakeMsgCheckbox: TCheckBox
+        AllowGrayed = True
+        Anchors = [AKTOP, AKLEFT, AKRIGHT]
+        AutoSize = True
+        Caption = 'Scan for Make messages'
+        DragCursor = 65524
+        TabOrder = 2
+        TabStop = True
+        Left = 10
+        Height = 20
+        Top = 146
+        Width = 388
       end
-      object BuildWorkingDirGroupbox: TGROUPBOX
-        CAPTION = 'Working directory (Leave empty for file path)'
-        CLIENTHEIGHT = 31
-        CLIENTWIDTH = 398
-        PARENTCTL3D = False
-        TABORDER = 3
-        LEFT = 4
-        HEIGHT = 48
-        TOP = 4
-        WIDTH = 402
-        object BuildWorkDirCombobox: TCOMBOBOX
-          ANCHORS = [aktop, akleft, akright]
-          MAXLENGTH = 0
-          PARENTCTL3D = False
-          TABORDER = 0
-          TABSTOP = True
-          TEXT = 'BuildWorkDirCombobox'
-          HEIGHT = 25
-          WIDTH = 368
+      object BuildWorkingDirGroupbox: TGroupBox
+        Caption = 'Working directory (Leave empty for file path)'
+        ClientHeight = 31
+        ClientWidth = 398
+        ParentColor = True
+        ParentCtl3D = False
+        TabOrder = 3
+        Left = 4
+        Height = 48
+        Top = 4
+        Width = 402
+        object BuildWorkDirCombobox: TComboBox
+          Anchors = [AKTOP, AKLEFT, AKRIGHT]
+          MaxLength = 0
+          ParentCtl3D = False
+          TabOrder = 0
+          TabStop = True
+          Text = 'BuildWorkDirCombobox'
+          Height = 25
+          Width = 368
         end
-        object BuildBrowseWorkDirButton: TBUTTON
-          ANCHORS = [aktop, akright]
-          CAPTION = '...'
-          TABSTOP = True
-          TABORDER = 1
-          ONCLICK = BuildBrowseWorkDirButtonCLICK
-          LEFT = 368
-          HEIGHT = 23
-          WIDTH = 24
+        object BuildBrowseWorkDirButton: TButton
+          Anchors = [AKTOP, AKRIGHT]
+          Caption = '...'
+          TabStop = True
+          TabOrder = 1
+          OnClick = BuildBrowseWorkDirButtonCLICK
+          Left = 368
+          Height = 23
+          Width = 24
         end
       end
     end
-    object RunPage: TPAGE
-      CAPTION = 'Run'
-      CLIENTWIDTH = 410
-      CLIENTHEIGHT = 274
-      ONRESIZE = RunPageRESIZE
-      LEFT = 2
-      HEIGHT = 274
-      TOP = 28
-      WIDTH = 410
-      object AlwaysCompileFirstCheckbox: TCHECKBOX
-        ALLOWGRAYED = True
-        ANCHORS = [aktop, akleft, akright]
-        AUTOSIZE = True
-        CAPTION = 'Always Build before Run'
-        DRAGCURSOR = 0
-        TABORDER = 0
-        TABSTOP = True
-        LEFT = 10
-        HEIGHT = 20
-        TOP = 4
-        WIDTH = 392
+    object RunPage: TPage
+      Caption = 'Run'
+      ClientWidth = 410
+      ClientHeight = 274
+      OnResize = RunPageRESIZE
+      Left = 2
+      Height = 274
+      Top = 28
+      Width = 410
+      object AlwaysCompileFirstCheckbox: TCheckBox
+        AllowGrayed = True
+        Anchors = [AKTOP, AKLEFT, AKRIGHT]
+        AutoSize = True
+        Caption = 'Always Build before Run'
+        DragCursor = 65524
+        TabOrder = 0
+        TabStop = True
+        Left = 10
+        Height = 20
+        Top = 4
+        Width = 392
       end
-      object RunCommandGroupbox: TGROUPBOX
-        ANCHORS = [aktop, akleft, akright]
-        CAPTION = 'Run Command'
-        CLIENTHEIGHT = 53
-        CLIENTWIDTH = 400
-        PARENTCTL3D = False
-        TABORDER = 1
-        LEFT = 4
-        HEIGHT = 70
-        TOP = 92
-        WIDTH = 404
-        object RunCommandMemo: TMEMO
-          ALIGN = alclient
-          LINES.Strings = (
+      object RunCommandGroupbox: TGroupBox
+        Anchors = [AKTOP, AKLEFT, AKRIGHT]
+        Caption = 'Run Command'
+        ClientHeight = 53
+        ClientWidth = 400
+        ParentColor = True
+        ParentCtl3D = False
+        TabOrder = 1
+        Left = 4
+        Height = 70
+        Top = 92
+        Width = 404
+        object RunCommandMemo: TMemo
+          Align = ALCLIENT
+          Lines.Strings = (
             'CompileCommandMemo'
           )
-          TABSTOP = True
-          TABSTOP = True
-          TABORDER = 0
-          HEIGHT = 53
-          WIDTH = 400
+          Tabstop = True
+          TabStop = True
+          TabOrder = 0
+          Height = 53
+          Width = 400
         end
       end
-      object RunWorkDirGroupbox: TGROUPBOX
-        ANCHORS = [aktop, akleft, akright]
-        CAPTION = 'Working Directory (Leave empty for file path)'
-        CLIENTHEIGHT = 32
-        CLIENTWIDTH = 400
-        PARENTCTL3D = False
-        TABORDER = 2
-        LEFT = 4
-        HEIGHT = 49
-        TOP = 36
-        WIDTH = 404
-        object RunWorkDirCombobox: TCOMBOBOX
-          ANCHORS = [aktop, akleft, akright]
-          MAXLENGTH = 0
-          PARENTCTL3D = False
-          TABORDER = 0
-          TABSTOP = True
-          TEXT = 'RunWorkDirCombobox'
-          HEIGHT = 25
-          WIDTH = 364
+      object RunWorkDirGroupbox: TGroupBox
+        Anchors = [AKTOP, AKLEFT, AKRIGHT]
+        Caption = 'Working Directory (Leave empty for file path)'
+        ClientHeight = 32
+        ClientWidth = 400
+        ParentColor = True
+        ParentCtl3D = False
+        TabOrder = 2
+        Left = 4
+        Height = 49
+        Top = 36
+        Width = 404
+        object RunWorkDirCombobox: TComboBox
+          Anchors = [AKTOP, AKLEFT, AKRIGHT]
+          MaxLength = 0
+          ParentCtl3D = False
+          TabOrder = 0
+          TabStop = True
+          Text = 'RunWorkDirCombobox'
+          Height = 25
+          Width = 364
         end
-        object RunBrowseWorkDirButton: TBUTTON
-          ANCHORS = [aktop, akright]
-          CAPTION = '...'
-          TABSTOP = True
-          TABORDER = 1
-          ONCLICK = BuildBrowseWorkDirButtonCLICK
-          LEFT = 368
-          HEIGHT = 23
-          WIDTH = 27
-          HELPTYPE = htkeyword
+        object RunBrowseWorkDirButton: TButton
+          Anchors = [AKTOP, AKRIGHT]
+          Caption = '...'
+          TabStop = True
+          TabOrder = 1
+          OnClick = BuildBrowseWorkDirButtonCLICK
+          Left = 368
+          Height = 23
+          Width = 27
+          HelpType = HTKEYWORD
         end
       end
     end
diff --git a/ide/buildfiledlg.lrs b/ide/buildfiledlg.lrs
index 957019a1df..73d87cc9a6 100644
--- a/ide/buildfiledlg.lrs
+++ b/ide/buildfiledlg.lrs
@@ -1,75 +1,77 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TBuildFileDialog','FORMDATA',[
-  'TPF0'#16'TBuildFileDialog'#15'BuildFileDialog'#7'CAPTION'#6#15'BuildFileDial'
-  +'og'#12'CLIENTHEIGHT'#3'X'#1#11'CLIENTWIDTH'#3#158#1#10'KEYPREVIEW'#9#8'ONCR'
-  +'EATE'#7#21'BuildFileDialogCREATE'#9'ONKEYDOWN'#7#22'BuildFileDialogKEYDOWN'
-  +#8'POSITION'#7#14'poscreencenter'#18'HORZSCROLLBAR.PAGE'#3#159#1#18'VERTSCRO'
-  +'LLBAR.PAGE'#3'Y'#1#4'LEFT'#3'P'#1#6'HEIGHT'#3'X'#1#3'TOP'#3#221#0#5'WIDTH'#3
-  +#158#1#0#7'TBUTTON'#8'OkButton'#7'ANCHORS'#11#6'akleft'#8'akbottom'#0#7'CAPT'
-  +'ION'#6#2'Ok'#7'TABSTOP'#9#8'TABORDER'#2#0#7'ONCLICK'#7#13'OkButtonCLICK'#4
-  +'LEFT'#2'j'#6'HEIGHT'#2#25#3'TOP'#3'6'#1#5'WIDTH'#2'K'#0#0#7'TBUTTON'#12'Can'
-  +'celButton'#7'ANCHORS'#11#6'akleft'#8'akbottom'#0#11'MODALRESULT'#2#2#7'CAPT'
-  +'ION'#6#6'Cancel'#7'TABSTOP'#9#8'TABORDER'#2#1#4'LEFT'#3#234#0#6'HEIGHT'#2#25
-  +#3'TOP'#3'6'#1#5'WIDTH'#2'K'#0#0#9'TNOTEBOOK'#9'Notebook1'#5'ALIGN'#7#5'alto'
-  +'p'#7'ANCHORS'#11#5'aktop'#6'akleft'#7'akright'#8'akbottom'#0#9'PAGEINDEX'#2
-  +#2#6'HEIGHT'#3'0'#1#5'WIDTH'#3#158#1#0#5'TPAGE'#11'GeneralPage'#7'CAPTION'#6
-  +#7'Options'#11'CLIENTWIDTH'#3#154#1#12'CLIENTHEIGHT'#3#18#1#4'LEFT'#2#2#6'HE'
-  +'IGHT'#3#18#1#3'TOP'#2#28#5'WIDTH'#3#154#1#0#9'TGROUPBOX'#24'WhenFileIsActiv'
-  +'eGroupbox'#7'CAPTION'#6'-When this file is active in source editor ...'#12
-  +'CLIENTHEIGHT'#2'@'#11'CLIENTWIDTH'#3#141#1#11'PARENTCTL3D'#8#8'TABORDER'#2#0
-  +#4'LEFT'#2#6#6'HEIGHT'#2'Q'#3'TOP'#2#12#5'WIDTH'#3#145#1#0#9'TCHECKBOX'#28'O'
-  +'verrideBuildProjectCheckbox'#11'ALLOWGRAYED'#9#8'AUTOSIZE'#9#7'CAPTION'#6'7'
-  +'On build project execute the Build File command instead'#10'DRAGCURSOR'#2#0
-  +#8'TABORDER'#2#0#7'TABSTOP'#9#4'LEFT'#2#6#6'HEIGHT'#2#20#3'TOP'#2#9#5'WIDTH'
-  +#3#128#1#0#0#9'TCHECKBOX'#26'OverrideRunProjectCheckbox'#11'ALLOWGRAYED'#9#8
-  +'AUTOSIZE'#9#7'CAPTION'#6'3On run project execute the Run File command inste'
-  +'ad'#10'DRAGCURSOR'#2#0#8'TABORDER'#2#1#7'TABSTOP'#9#4'LEFT'#2#6#6'HEIGHT'#2
-  +#20#3'TOP'#2'!'#5'WIDTH'#3#128#1#0#0#0#0#5'TPAGE'#9'BuildPage'#7'CAPTION'#6#5
-  +'Build'#11'CLIENTWIDTH'#3#154#1#12'CLIENTHEIGHT'#3#18#1#8'ONRESIZE'#7#15'Bui'
-  +'ldPageRESIZE'#4'LEFT'#2#2#6'HEIGHT'#3#18#1#3'TOP'#2#28#5'WIDTH'#3#154#1#0#9
-  +'TGROUPBOX'#20'BuildCommandGroupbox'#7'ANCHORS'#11#5'aktop'#6'akleft'#7'akri'
-  +'ght'#0#7'CAPTION'#6#13'Build Command'#12'CLIENTHEIGHT'#2'5'#11'CLIENTWIDTH'
-  +#3#142#1#11'PARENTCTL3D'#8#8'TABORDER'#2#0#4'LEFT'#2#4#6'HEIGHT'#2'F'#3'TOP'
-  +#2'4'#5'WIDTH'#3#146#1#0#5'TMEMO'#16'BuildCommandMemo'#5'ALIGN'#7#8'alclient'
-  +#13'LINES.Strings'#1#6#18'CompileCommandMemo'#0#7'TABSTOP'#9#7'TABSTOP'#9#8
-  +'TABORDER'#2#0#6'HEIGHT'#2'5'#5'WIDTH'#3#142#1#0#0#0#9'TCHECKBOX'#26'BuildSc'
-  +'anForFPCMsgCheckbox'#11'ALLOWGRAYED'#9#7'ANCHORS'#11#5'aktop'#6'akleft'#7'a'
-  +'kright'#0#8'AUTOSIZE'#9#7'CAPTION'#6#21'Scan for FPC messages'#10'DRAGCURSO'
-  +'R'#2#0#8'TABORDER'#2#1#7'TABSTOP'#9#4'LEFT'#2#10#6'HEIGHT'#2#20#3'TOP'#2'z'
-  +#5'WIDTH'#3#132#1#0#0#9'TCHECKBOX'#27'BuildScanForMakeMsgCheckbox'#11'ALLOWG'
-  +'RAYED'#9#7'ANCHORS'#11#5'aktop'#6'akleft'#7'akright'#0#8'AUTOSIZE'#9#7'CAPT'
-  +'ION'#6#22'Scan for Make messages'#10'DRAGCURSOR'#2#0#8'TABORDER'#2#2#7'TABS'
-  +'TOP'#9#4'LEFT'#2#10#6'HEIGHT'#2#20#3'TOP'#3#146#0#5'WIDTH'#3#132#1#0#0#9'TG'
-  +'ROUPBOX'#23'BuildWorkingDirGroupbox'#7'CAPTION'#6'-Working directory (Leave'
-  +' empty for file path)'#12'CLIENTHEIGHT'#2#31#11'CLIENTWIDTH'#3#142#1#11'PAR'
-  +'ENTCTL3D'#8#8'TABORDER'#2#3#4'LEFT'#2#4#6'HEIGHT'#2'0'#3'TOP'#2#4#5'WIDTH'#3
-  +#146#1#0#9'TCOMBOBOX'#20'BuildWorkDirCombobox'#7'ANCHORS'#11#5'aktop'#6'akle'
-  +'ft'#7'akright'#0#9'MAXLENGTH'#2#0#11'PARENTCTL3D'#8#8'TABORDER'#2#0#7'TABST'
-  +'OP'#9#4'TEXT'#6#20'BuildWorkDirCombobox'#6'HEIGHT'#2#25#5'WIDTH'#3'p'#1#0#0
-  +#7'TBUTTON'#24'BuildBrowseWorkDirButton'#7'ANCHORS'#11#5'aktop'#7'akright'#0
-  +#7'CAPTION'#6#3'...'#7'TABSTOP'#9#8'TABORDER'#2#1#7'ONCLICK'#7#29'BuildBrows'
-  +'eWorkDirButtonCLICK'#4'LEFT'#3'p'#1#6'HEIGHT'#2#23#5'WIDTH'#2#24#0#0#0#0#5
-  +'TPAGE'#7'RunPage'#7'CAPTION'#6#3'Run'#11'CLIENTWIDTH'#3#154#1#12'CLIENTHEIG'
-  +'HT'#3#18#1#8'ONRESIZE'#7#13'RunPageRESIZE'#4'LEFT'#2#2#6'HEIGHT'#3#18#1#3'T'
-  +'OP'#2#28#5'WIDTH'#3#154#1#0#9'TCHECKBOX'#26'AlwaysCompileFirstCheckbox'#11
-  +'ALLOWGRAYED'#9#7'ANCHORS'#11#5'aktop'#6'akleft'#7'akright'#0#8'AUTOSIZE'#9#7
-  +'CAPTION'#6#23'Always Build before Run'#10'DRAGCURSOR'#2#0#8'TABORDER'#2#0#7
-  +'TABSTOP'#9#4'LEFT'#2#10#6'HEIGHT'#2#20#3'TOP'#2#4#5'WIDTH'#3#136#1#0#0#9'TG'
-  +'ROUPBOX'#18'RunCommandGroupbox'#7'ANCHORS'#11#5'aktop'#6'akleft'#7'akright'
-  +#0#7'CAPTION'#6#11'Run Command'#12'CLIENTHEIGHT'#2'5'#11'CLIENTWIDTH'#3#144#1
-  +#11'PARENTCTL3D'#8#8'TABORDER'#2#1#4'LEFT'#2#4#6'HEIGHT'#2'F'#3'TOP'#2'\'#5
-  +'WIDTH'#3#148#1#0#5'TMEMO'#14'RunCommandMemo'#5'ALIGN'#7#8'alclient'#13'LINE'
-  +'S.Strings'#1#6#18'CompileCommandMemo'#0#7'TABSTOP'#9#7'TABSTOP'#9#8'TABORDE'
-  +'R'#2#0#6'HEIGHT'#2'5'#5'WIDTH'#3#144#1#0#0#0#9'TGROUPBOX'#18'RunWorkDirGrou'
-  +'pbox'#7'ANCHORS'#11#5'aktop'#6'akleft'#7'akright'#0#7'CAPTION'#6'-Working D'
-  +'irectory (Leave empty for file path)'#12'CLIENTHEIGHT'#2' '#11'CLIENTWIDTH'
-  +#3#144#1#11'PARENTCTL3D'#8#8'TABORDER'#2#2#4'LEFT'#2#4#6'HEIGHT'#2'1'#3'TOP'
-  ,#2'$'#5'WIDTH'#3#148#1#0#9'TCOMBOBOX'#18'RunWorkDirCombobox'#7'ANCHORS'#11#5
-  +'aktop'#6'akleft'#7'akright'#0#9'MAXLENGTH'#2#0#11'PARENTCTL3D'#8#8'TABORDER'
-  +#2#0#7'TABSTOP'#9#4'TEXT'#6#18'RunWorkDirCombobox'#6'HEIGHT'#2#25#5'WIDTH'#3
-  +'l'#1#0#0#7'TBUTTON'#22'RunBrowseWorkDirButton'#7'ANCHORS'#11#5'aktop'#7'akr'
-  +'ight'#0#7'CAPTION'#6#3'...'#7'TABSTOP'#9#8'TABORDER'#2#1#7'ONCLICK'#7#29'Bu'
-  +'ildBrowseWorkDirButtonCLICK'#4'LEFT'#3'p'#1#6'HEIGHT'#2#23#5'WIDTH'#2#27#8
-  +'HELPTYPE'#7#9'htkeyword'#0#0#0#0#0#0
+  'TPF0'#16'TBuildFileDialog'#15'BuildFileDialog'#7'Caption'#6#15'BuildFileDial'
+  +'og'#12'ClientHeight'#3'X'#1#11'ClientWidth'#3#158#1#10'KeyPreview'#9#8'OnCr'
+  +'eate'#7#21'BuildFileDialogCREATE'#9'OnKeyDown'#7#22'BuildFileDialogKEYDOWN'
+  +#8'Position'#7#14'POSCREENCENTER'#18'HorzScrollBar.Page'#3#159#1#18'VertScro'
+  +'llBar.Page'#3'Y'#1#4'Left'#3'P'#1#6'Height'#3'X'#1#3'Top'#3#221#0#5'Width'#3
+  +#158#1#0#7'TButton'#8'OkButton'#7'Anchors'#11#6'AKLEFT'#8'AKBOTTOM'#0#7'Capt'
+  +'ion'#6#2'Ok'#7'TabStop'#9#8'TabOrder'#2#0#7'OnClick'#7#13'OkButtonCLICK'#4
+  +'Left'#2'j'#6'Height'#2#25#3'Top'#3'6'#1#5'Width'#2'K'#0#0#7'TButton'#12'Can'
+  +'celButton'#7'Anchors'#11#6'AKLEFT'#8'AKBOTTOM'#0#11'ModalResult'#2#2#7'Capt'
+  +'ion'#6#6'Cancel'#7'TabStop'#9#8'TabOrder'#2#1#4'Left'#3#234#0#6'Height'#2#25
+  +#3'Top'#3'6'#1#5'Width'#2'K'#0#0#9'TNotebook'#9'Notebook1'#5'Align'#7#5'ALTO'
+  +'P'#7'Anchors'#11#5'AKTOP'#6'AKLEFT'#7'AKRIGHT'#8'AKBOTTOM'#0#9'PageIndex'#2
+  +#2#6'Height'#3'0'#1#5'Width'#3#158#1#0#5'TPage'#11'GeneralPage'#7'Caption'#6
+  +#7'Options'#11'ClientWidth'#3#154#1#12'ClientHeight'#3#18#1#4'Left'#2#2#6'He'
+  +'ight'#3#18#1#3'Top'#2#28#5'Width'#3#154#1#0#9'TGroupBox'#24'WhenFileIsActiv'
+  +'eGroupbox'#7'Caption'#6'-When this file is active in source editor ...'#12
+  +'ClientHeight'#2'@'#11'ClientWidth'#3#141#1#11'ParentColor'#9#11'ParentCtl3D'
+  +#8#8'TabOrder'#2#0#4'Left'#2#6#6'Height'#2'Q'#3'Top'#2#12#5'Width'#3#145#1#0
+  +#9'TCheckBox'#28'OverrideBuildProjectCheckbox'#11'AllowGrayed'#9#8'AutoSize'
+  +#9#7'Caption'#6'7On build project execute the Build File command instead'#10
+  +'DragCursor'#4#244#255#0#0#8'TabOrder'#2#0#7'TabStop'#9#4'Left'#2#6#6'Height'
+  +#2#20#3'Top'#2#9#5'Width'#3#128#1#0#0#9'TCheckBox'#26'OverrideRunProjectChec'
+  +'kbox'#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6'3On run project execute '
+  +'the Run File command instead'#10'DragCursor'#4#244#255#0#0#8'TabOrder'#2#1#7
+  +'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3'Top'#2'!'#5'Width'#3#128#1#0#0#0#0#5
+  +'TPage'#9'BuildPage'#7'Caption'#6#5'Build'#11'ClientWidth'#3#154#1#12'Client'
+  +'Height'#3#18#1#8'OnResize'#7#15'BuildPageRESIZE'#4'Left'#2#2#6'Height'#3#18
+  +#1#3'Top'#2#28#5'Width'#3#154#1#0#9'TGroupBox'#20'BuildCommandGroupbox'#7'An'
+  +'chors'#11#5'AKTOP'#6'AKLEFT'#7'AKRIGHT'#0#7'Caption'#6#13'Build Command'#12
+  +'ClientHeight'#2'5'#11'ClientWidth'#3#142#1#11'ParentColor'#9#11'ParentCtl3D'
+  +#8#8'TabOrder'#2#0#4'Left'#2#4#6'Height'#2'F'#3'Top'#2'4'#5'Width'#3#146#1#0
+  +#5'TMemo'#16'BuildCommandMemo'#5'Align'#7#8'ALCLIENT'#13'Lines.Strings'#1#6
+  +#18'CompileCommandMemo'#0#7'Tabstop'#9#7'TabStop'#9#8'TabOrder'#2#0#6'Height'
+  +#2'5'#5'Width'#3#142#1#0#0#0#9'TCheckBox'#26'BuildScanForFPCMsgCheckbox'#11
+  +'AllowGrayed'#9#7'Anchors'#11#5'AKTOP'#6'AKLEFT'#7'AKRIGHT'#0#8'AutoSize'#9#7
+  +'Caption'#6#21'Scan for FPC messages'#10'DragCursor'#4#244#255#0#0#8'TabOrde'
+  +'r'#2#1#7'TabStop'#9#4'Left'#2#10#6'Height'#2#20#3'Top'#2'z'#5'Width'#3#132#1
+  +#0#0#9'TCheckBox'#27'BuildScanForMakeMsgCheckbox'#11'AllowGrayed'#9#7'Anchor'
+  +'s'#11#5'AKTOP'#6'AKLEFT'#7'AKRIGHT'#0#8'AutoSize'#9#7'Caption'#6#22'Scan fo'
+  +'r Make messages'#10'DragCursor'#4#244#255#0#0#8'TabOrder'#2#2#7'TabStop'#9#4
+  +'Left'#2#10#6'Height'#2#20#3'Top'#3#146#0#5'Width'#3#132#1#0#0#9'TGroupBox'
+  +#23'BuildWorkingDirGroupbox'#7'Caption'#6'-Working directory (Leave empty fo'
+  +'r file path)'#12'ClientHeight'#2#31#11'ClientWidth'#3#142#1#11'ParentColor'
+  +#9#11'ParentCtl3D'#8#8'TabOrder'#2#3#4'Left'#2#4#6'Height'#2'0'#3'Top'#2#4#5
+  +'Width'#3#146#1#0#9'TComboBox'#20'BuildWorkDirCombobox'#7'Anchors'#11#5'AKTO'
+  +'P'#6'AKLEFT'#7'AKRIGHT'#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#0
+  +#7'TabStop'#9#4'Text'#6#20'BuildWorkDirCombobox'#6'Height'#2#25#5'Width'#3'p'
+  +#1#0#0#7'TButton'#24'BuildBrowseWorkDirButton'#7'Anchors'#11#5'AKTOP'#7'AKRI'
+  +'GHT'#0#7'Caption'#6#3'...'#7'TabStop'#9#8'TabOrder'#2#1#7'OnClick'#7#29'Bui'
+  +'ldBrowseWorkDirButtonCLICK'#4'Left'#3'p'#1#6'Height'#2#23#5'Width'#2#24#0#0
+  +#0#0#5'TPage'#7'RunPage'#7'Caption'#6#3'Run'#11'ClientWidth'#3#154#1#12'Clie'
+  +'ntHeight'#3#18#1#8'OnResize'#7#13'RunPageRESIZE'#4'Left'#2#2#6'Height'#3#18
+  +#1#3'Top'#2#28#5'Width'#3#154#1#0#9'TCheckBox'#26'AlwaysCompileFirstCheckbox'
+  +#11'AllowGrayed'#9#7'Anchors'#11#5'AKTOP'#6'AKLEFT'#7'AKRIGHT'#0#8'AutoSize'
+  +#9#7'Caption'#6#23'Always Build before Run'#10'DragCursor'#4#244#255#0#0#8'T'
+  +'abOrder'#2#0#7'TabStop'#9#4'Left'#2#10#6'Height'#2#20#3'Top'#2#4#5'Width'#3
+  +#136#1#0#0#9'TGroupBox'#18'RunCommandGroupbox'#7'Anchors'#11#5'AKTOP'#6'AKLE'
+  +'FT'#7'AKRIGHT'#0#7'Caption'#6#11'Run Command'#12'ClientHeight'#2'5'#11'Clie'
+  +'ntWidth'#3#144#1#11'ParentColor'#9#11'ParentCtl3D'#8#8'TabOrder'#2#1#4'Left'
+  +#2#4#6'Height'#2'F'#3'Top'#2'\'#5'Width'#3#148#1#0#5'TMemo'#14'RunCommandMem'
+  +'o'#5'Align'#7#8'ALCLIENT'#13'Lines.Strings'#1#6#18'CompileCommandMemo'#0#7
+  +'Tabstop'#9#7'TabStop'#9#8'TabOrder'#2#0#6'Height'#2'5'#5'Width'#3#144#1#0#0
+  +#0#9'TGroupBox'#18'RunWorkDirGroupbox'#7'Anchors'#11#5'AKTOP'#6'AKLEFT'#7'AK'
+  +'RIGHT'#0#7'Caption'#6'-Working Directory (Leave empty for file path)'#12'Cl'
+  ,'ientHeight'#2' '#11'ClientWidth'#3#144#1#11'ParentColor'#9#11'ParentCtl3D'#8
+  +#8'TabOrder'#2#2#4'Left'#2#4#6'Height'#2'1'#3'Top'#2'$'#5'Width'#3#148#1#0#9
+  +'TComboBox'#18'RunWorkDirCombobox'#7'Anchors'#11#5'AKTOP'#6'AKLEFT'#7'AKRIGH'
+  +'T'#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#0#7'TabStop'#9#4'Text'
+  +#6#18'RunWorkDirCombobox'#6'Height'#2#25#5'Width'#3'l'#1#0#0#7'TButton'#22'R'
+  +'unBrowseWorkDirButton'#7'Anchors'#11#5'AKTOP'#7'AKRIGHT'#0#7'Caption'#6#3'.'
+  +'..'#7'TabStop'#9#8'TabOrder'#2#1#7'OnClick'#7#29'BuildBrowseWorkDirButtonCL'
+  +'ICK'#4'Left'#3'p'#1#6'Height'#2#23#5'Width'#2#27#8'HelpType'#7#9'HTKEYWORD'
+  +#0#0#0#0#0#0
 ]);
diff --git a/ide/buildfiledlg.pas b/ide/buildfiledlg.pas
index 40bb3faedb..5bc555e98a 100644
--- a/ide/buildfiledlg.pas
+++ b/ide/buildfiledlg.pas
@@ -25,7 +25,7 @@ type
     idedRunFlags       // Flags for run. See TIDEDirRunFlag
     );
   TIDEDirectives = set of TIDEDirective;
-  
+
   TIDEDirBuildScanFlag = (
     idedbsfNone,
     idedbsfFPC, // scan for FPC messages. FPC+ means on (default) and FPC- off.
diff --git a/ide/cleandirdlg.lfm b/ide/cleandirdlg.lfm
index a9f63c4c97..045757561b 100644
--- a/ide/cleandirdlg.lfm
+++ b/ide/cleandirdlg.lfm
@@ -30,7 +30,7 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
     Width = 97
   end
   object DirGroupbox: TGroupBox
-    Anchors = [aktop, akleft, akright]
+    Anchors = [AKTOP, AKLEFT, AKRIGHT]
     Caption = 'Directory'
     ClientHeight = 63
     ClientWidth = 482
@@ -42,7 +42,7 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
     Top = 8
     Width = 486
     object DirCombobox: TComboBox
-      Anchors = [aktop, akleft, akright]
+      Anchors = [AKTOP, AKLEFT, AKRIGHT]
       MaxLength = 0
       ParentCtl3D = False
       TabOrder = 0
@@ -55,10 +55,10 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
     end
     object SubDirsCheckbox: TCheckBox
       AllowGrayed = True
-      Anchors = [aktop, akleft, akright]
+      Anchors = [AKTOP, AKLEFT, AKRIGHT]
       AutoSize = True
       Caption = 'Clean sub directories'
-      DragCursor = crDefault
+      DragCursor = 65524
       TabOrder = 1
       TabStop = True
       Left = 6
@@ -68,7 +68,7 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
     end
   end
   object RemoveGroupbox: TGroupBox
-    Anchors = [aktop, akleft, akright]
+    Anchors = [AKTOP, AKLEFT, AKRIGHT]
     Caption = 'Remove files matching filter:'
     ClientHeight = 68
     ClientWidth = 482
@@ -80,7 +80,7 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
     Top = 96
     Width = 486
     object RemoveCombobox: TComboBox
-      Anchors = [aktop, akleft, akright]
+      Anchors = [AKTOP, AKLEFT, AKRIGHT]
       MaxLength = 0
       ParentCtl3D = False
       TabOrder = 0
@@ -95,7 +95,7 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
       AllowGrayed = True
       AutoSize = True
       Caption = 'Simple syntax (e.g. * instead of .*)'
-      DragCursor = crDefault
+      DragCursor = 65524
       TabOrder = 1
       TabStop = True
       Left = 6
@@ -105,7 +105,7 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
     end
   end
   object KeepGroupbox: TGroupBox
-    Anchors = [aktop, akleft, akright]
+    Anchors = [AKTOP, AKLEFT, AKRIGHT]
     Caption = 'Keep files matching filter:'
     ClientHeight = 89
     ClientWidth = 482
@@ -117,7 +117,7 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
     Top = 190
     Width = 486
     object KeepCombobox: TComboBox
-      Anchors = [aktop, akleft, akright]
+      Anchors = [AKTOP, AKLEFT, AKRIGHT]
       MaxLength = 0
       ParentCtl3D = False
       TabOrder = 0
@@ -132,7 +132,7 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
       AllowGrayed = True
       AutoSize = True
       Caption = 'Simple syntax (e.g. * instead of .*)'
-      DragCursor = crDefault
+      DragCursor = 65524
       TabOrder = 1
       TabStop = True
       Left = 6
@@ -144,7 +144,7 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
       AllowGrayed = True
       AutoSize = True
       Caption = 'Keep Text Files'
-      DragCursor = crDefault
+      DragCursor = 65524
       TabOrder = 2
       TabStop = True
       Left = 6
diff --git a/ide/cleandirdlg.lrs b/ide/cleandirdlg.lrs
index 35e25ce561..8324acb49c 100644
--- a/ide/cleandirdlg.lrs
+++ b/ide/cleandirdlg.lrs
@@ -10,37 +10,37 @@ LazarusResources.Add('TCleanDirectoryDialog','FORMDATA',[
   +#1#5'Width'#2'a'#0#0#7'TButton'#12'CancelButton'#11'ModalResult'#2#2#7'Capti'
   +'on'#6#6'Cancel'#7'TabStop'#9#8'TabOrder'#2#1#4'Left'#3#13#1#6'Height'#2#25#3
   +'Top'#3'8'#1#5'Width'#2'a'#0#0#9'TGroupBox'#11'DirGroupbox'#7'Anchors'#11#5
-  +'aktop'#6'akleft'#7'akright'#0#7'Caption'#6#9'Directory'#12'ClientHeight'#2
+  +'AKTOP'#6'AKLEFT'#7'AKRIGHT'#0#7'Caption'#6#9'Directory'#12'ClientHeight'#2
   +'?'#11'ClientWidth'#3#226#1#11'ParentColor'#9#11'ParentCtl3D'#8#8'TabOrder'#2
   +#2#4'Left'#2#8#6'Height'#2'P'#3'Top'#2#8#5'Width'#3#230#1#0#9'TComboBox'#11
-  +'DirCombobox'#7'Anchors'#11#5'aktop'#6'akleft'#7'akright'#0#9'MaxLength'#2#0
+  +'DirCombobox'#7'Anchors'#11#5'AKTOP'#6'AKLEFT'#7'AKRIGHT'#0#9'MaxLength'#2#0
   +#11'ParentCtl3D'#8#8'TabOrder'#2#0#7'TabStop'#9#4'Text'#6#11'DirCombobox'#4
   +'Left'#2#6#6'Height'#2#25#3'Top'#2#9#5'Width'#3#212#1#0#0#9'TCheckBox'#15'Su'
-  +'bDirsCheckbox'#11'AllowGrayed'#9#7'Anchors'#11#5'aktop'#6'akleft'#7'akright'
-  +#0#8'AutoSize'#9#7'Caption'#6#21'Clean sub directories'#10'DragCursor'#7#9'c'
-  +'rDefault'#8'TabOrder'#2#1#7'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3'Top'#2
-  +''''#5'Width'#3#212#1#0#0#0#9'TGroupBox'#14'RemoveGroupbox'#7'Anchors'#11#5
-  +'aktop'#6'akleft'#7'akright'#0#7'Caption'#6#29'Remove files matching filter:'
-  +#12'ClientHeight'#2'D'#11'ClientWidth'#3#226#1#11'ParentColor'#9#11'ParentCt'
-  +'l3D'#8#8'TabOrder'#2#3#4'Left'#2#8#6'Height'#2'U'#3'Top'#2'`'#5'Width'#3#230
-  +#1#0#9'TComboBox'#14'RemoveCombobox'#7'Anchors'#11#5'aktop'#6'akleft'#7'akri'
-  +'ght'#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#0#7'TabStop'#9#4'Te'
-  +'xt'#6#14'RemoveCombobox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#8#5'Width'#3
-  +#212#1#0#0#9'TCheckBox'#26'SimpleSyntaxRemoveCheckbox'#11'AllowGrayed'#9#8'A'
-  +'utoSize'#9#7'Caption'#6'$Simple syntax (e.g. * instead of .*)'#10'DragCurso'
-  +'r'#7#9'crDefault'#8'TabOrder'#2#1#7'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3
-  +'Top'#2'%'#5'Width'#3#212#1#0#0#0#9'TGroupBox'#12'KeepGroupbox'#7'Anchors'#11
-  +#5'aktop'#6'akleft'#7'akright'#0#7'Caption'#6#27'Keep files matching filter:'
-  +#12'ClientHeight'#2'Y'#11'ClientWidth'#3#226#1#11'ParentColor'#9#11'ParentCt'
-  +'l3D'#8#8'TabOrder'#2#4#4'Left'#2#8#6'Height'#2'j'#3'Top'#3#190#0#5'Width'#3
-  +#230#1#0#9'TComboBox'#12'KeepCombobox'#7'Anchors'#11#5'aktop'#6'akleft'#7'ak'
-  +'right'#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#0#7'TabStop'#9#4
-  +'Text'#6#12'KeepCombobox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#8#5'Width'#3
-  +#212#1#0#0#9'TCheckBox'#24'SimpleSyntaxKeepCheckbox'#11'AllowGrayed'#9#8'Aut'
-  +'oSize'#9#7'Caption'#6'$Simple syntax (e.g. * instead of .*)'#10'DragCursor'
-  +#7#9'crDefault'#8'TabOrder'#2#1#7'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3'To'
-  +'p'#2'#'#5'Width'#3#212#1#0#0#9'TCheckBox'#21'KeepTextFilesCheckbox'#11'Allo'
-  +'wGrayed'#9#8'AutoSize'#9#7'Caption'#6#15'Keep Text Files'#10'DragCursor'#7#9
-  +'crDefault'#8'TabOrder'#2#2#7'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3'Top'#2
-  +'='#5'Width'#3#212#1#0#0#0#0
+  +'bDirsCheckbox'#11'AllowGrayed'#9#7'Anchors'#11#5'AKTOP'#6'AKLEFT'#7'AKRIGHT'
+  +#0#8'AutoSize'#9#7'Caption'#6#21'Clean sub directories'#10'DragCursor'#4#244
+  +#255#0#0#8'TabOrder'#2#1#7'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3'Top'#2''''
+  +#5'Width'#3#212#1#0#0#0#9'TGroupBox'#14'RemoveGroupbox'#7'Anchors'#11#5'AKTO'
+  +'P'#6'AKLEFT'#7'AKRIGHT'#0#7'Caption'#6#29'Remove files matching filter:'#12
+  +'ClientHeight'#2'D'#11'ClientWidth'#3#226#1#11'ParentColor'#9#11'ParentCtl3D'
+  +#8#8'TabOrder'#2#3#4'Left'#2#8#6'Height'#2'U'#3'Top'#2'`'#5'Width'#3#230#1#0
+  +#9'TComboBox'#14'RemoveCombobox'#7'Anchors'#11#5'AKTOP'#6'AKLEFT'#7'AKRIGHT'
+  +#0#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#0#7'TabStop'#9#4'Text'#6
+  +#14'RemoveCombobox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#8#5'Width'#3#212#1#0
+  +#0#9'TCheckBox'#26'SimpleSyntaxRemoveCheckbox'#11'AllowGrayed'#9#8'AutoSize'
+  +#9#7'Caption'#6'$Simple syntax (e.g. * instead of .*)'#10'DragCursor'#4#244
+  +#255#0#0#8'TabOrder'#2#1#7'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3'Top'#2'%'
+  +#5'Width'#3#212#1#0#0#0#9'TGroupBox'#12'KeepGroupbox'#7'Anchors'#11#5'AKTOP'
+  +#6'AKLEFT'#7'AKRIGHT'#0#7'Caption'#6#27'Keep files matching filter:'#12'Clie'
+  +'ntHeight'#2'Y'#11'ClientWidth'#3#226#1#11'ParentColor'#9#11'ParentCtl3D'#8#8
+  +'TabOrder'#2#4#4'Left'#2#8#6'Height'#2'j'#3'Top'#3#190#0#5'Width'#3#230#1#0#9
+  +'TComboBox'#12'KeepCombobox'#7'Anchors'#11#5'AKTOP'#6'AKLEFT'#7'AKRIGHT'#0#9
+  +'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#0#7'TabStop'#9#4'Text'#6#12
+  +'KeepCombobox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#8#5'Width'#3#212#1#0#0#9
+  +'TCheckBox'#24'SimpleSyntaxKeepCheckbox'#11'AllowGrayed'#9#8'AutoSize'#9#7'C'
+  +'aption'#6'$Simple syntax (e.g. * instead of .*)'#10'DragCursor'#4#244#255#0
+  +#0#8'TabOrder'#2#1#7'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3'Top'#2'#'#5'Wid'
+  +'th'#3#212#1#0#0#9'TCheckBox'#21'KeepTextFilesCheckbox'#11'AllowGrayed'#9#8
+  +'AutoSize'#9#7'Caption'#6#15'Keep Text Files'#10'DragCursor'#4#244#255#0#0#8
+  +'TabOrder'#2#2#7'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3'Top'#2'='#5'Width'#3
+  +#212#1#0#0#0#0
 ]);
diff --git a/ide/codeexplorer.lfm b/ide/codeexplorer.lfm
index 99ea7ca347..36026db560 100644
--- a/ide/codeexplorer.lfm
+++ b/ide/codeexplorer.lfm
@@ -31,7 +31,6 @@ object CodeExplorerView: TCodeExplorerView
   object CodeTreeview: TTreeView
     Align = albottom
     DefaultItemHeight = 17
-    DragCursor = crDefault
     HideSelection = False
     Images = Imagelist1
     Indent = 15
diff --git a/ide/debugoptionsfrm.lfm b/ide/debugoptionsfrm.lfm
index d24c22c3eb..992630e1de 100644
--- a/ide/debugoptionsfrm.lfm
+++ b/ide/debugoptionsfrm.lfm
@@ -144,7 +144,7 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AllowGrayed = True
           AutoSize = True
           Caption = 'Clear log on run'
-          DragCursor = crDefault
+          DragCursor = 65524
           TabOrder = 0
           TabStop = True
           Left = 4
@@ -156,7 +156,7 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AllowGrayed = True
           AutoSize = True
           Caption = 'Limit linecount to'
-          DragCursor = crDefault
+          DragCursor = 65524
           TabOrder = 1
           TabStop = True
           Left = 4
@@ -192,7 +192,7 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AllowGrayed = True
           AutoSize = True
           Caption = 'Breakpoint'
-          DragCursor = crDefault
+          DragCursor = 65524
           TabOrder = 0
           TabStop = True
           Left = 4
@@ -204,7 +204,7 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AllowGrayed = True
           AutoSize = True
           Caption = 'Process'
-          DragCursor = crDefault
+          DragCursor = 65524
           TabOrder = 1
           TabStop = True
           Left = 4
@@ -216,7 +216,7 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AllowGrayed = True
           AutoSize = True
           Caption = 'Thread'
-          DragCursor = crDefault
+          DragCursor = 65524
           TabOrder = 2
           TabStop = True
           Left = 4
@@ -228,7 +228,7 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AllowGrayed = True
           AutoSize = True
           Caption = 'Module'
-          DragCursor = crDefault
+          DragCursor = 65524
           TabOrder = 3
           TabStop = True
           Left = 4
@@ -240,7 +240,7 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AllowGrayed = True
           AutoSize = True
           Caption = 'Output'
-          DragCursor = crDefault
+          DragCursor = 65524
           TabOrder = 4
           TabStop = True
           Left = 4
@@ -252,7 +252,7 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AllowGrayed = True
           AutoSize = True
           Caption = 'Window'
-          DragCursor = crDefault
+          DragCursor = 65524
           TabOrder = 5
           TabStop = True
           Left = 4
@@ -264,7 +264,7 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
           AllowGrayed = True
           AutoSize = True
           Caption = 'Interface'
-          DragCursor = crDefault
+          DragCursor = 65524
           TabOrder = 6
           TabStop = True
           Left = 4
@@ -329,7 +329,7 @@ object DebuggerOptionsForm: TDebuggerOptionsForm
         AllowGrayed = True
         AutoSize = True
         Caption = 'Break on Lazarus Exceptions'
-        DragCursor = crDefault
+        DragCursor = 65524
         TabOrder = 1
         TabStop = True
         Left = 2
diff --git a/ide/debugoptionsfrm.lrs b/ide/debugoptionsfrm.lrs
index f7a7f3369e..cdf0be5d65 100644
--- a/ide/debugoptionsfrm.lrs
+++ b/ide/debugoptionsfrm.lrs
@@ -39,56 +39,56 @@ LazarusResources.Add('TDebuggerOptionsForm','FORMDATA',[
   +'eral'#12'ClientHeight'#2's'#11'ClientWidth'#3#226#0#11'ParentColor'#9#11'Pa'
   +'rentCtl3D'#8#8'TabOrder'#2#0#4'Left'#2#4#6'Height'#3#132#0#3'Top'#2#8#5'Wid'
   +'th'#3#230#0#0#9'TCheckBox'#16'chkClearLogOnRun'#11'AllowGrayed'#9#8'AutoSiz'
-  +'e'#9#7'Caption'#6#16'Clear log on run'#10'DragCursor'#7#9'crDefault'#8'TabO'
-  +'rder'#2#0#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#2#5#5'Width'#3#135
-  +#0#0#0#9'TCheckBox'#17'chkLimitLinecount'#11'AllowGrayed'#9#8'AutoSize'#9#7
-  +'Caption'#6#18'Limit linecount to'#10'DragCursor'#7#9'crDefault'#8'TabOrder'
-  +#2#1#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#2#29#5'Width'#2'w'#0#0#9
-  +'TSpinEdit'#16'seLimitLinecount'#7'Enabled'#8#10'Climb_Rate'#5#0#0#0#0#0#144
-  +'?'#236#144'?'#8'MinValue'#5#0#0#0#0#0#144'?'#236#144'?'#8'MaxValue'#5#0#0#0
-  +#0#0#144'?'#236#144'?'#5'Value'#5#0#0#0#0#0#144'?'#236#144'?'#4'Left'#2#28#6
-  +'Height'#2#20#3'Top'#2'5'#5'Width'#2'>'#0#0#0#9'TGroupBox'#10'gbMessages'#7
-  +'Caption'#6#8'Messages'#12'ClientHeight'#3#171#0#11'ClientWidth'#3#228#0#7'E'
-  +'nabled'#8#11'ParentColor'#9#11'ParentCtl3D'#8#8'TabOrder'#2#1#4'Left'#3#242
-  +#0#6'Height'#3#188#0#3'Top'#2#8#5'Width'#3#232#0#0#9'TCheckBox'#21'chkMessag'
-  +'esBreakpoint'#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6#10'Breakpoint'#10
-  +'DragCursor'#7#9'crDefault'#8'TabOrder'#2#0#7'TabStop'#9#4'Left'#2#4#6'Heigh'
-  +'t'#2#20#3'Top'#2#5#5'Width'#3#161#0#0#0#9'TCheckBox'#18'chkMessagesProcess'
-  +#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6#7'Process'#10'DragCursor'#7#9
-  +'crDefault'#8'TabOrder'#2#1#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#2
-  +#29#5'Width'#3#147#0#0#0#9'TCheckBox'#17'chkMessagesThread'#11'AllowGrayed'#9
-  +#8'AutoSize'#9#7'Caption'#6#6'Thread'#10'DragCursor'#7#9'crDefault'#8'TabOrd'
-  +'er'#2#2#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#2'5'#5'Width'#3#141#0
-  +#0#0#9'TCheckBox'#17'chkMessagesModule'#11'AllowGrayed'#9#8'AutoSize'#9#7'Ca'
-  +'ption'#6#6'Module'#10'DragCursor'#7#9'crDefault'#8'TabOrder'#2#3#7'TabStop'
-  +#9#4'Left'#2#4#6'Height'#2#20#3'Top'#2'M'#5'Width'#3#144#0#0#0#9'TCheckBox'
-  +#17'chkMessagesOutput'#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6#6'Output'
-  +#10'DragCursor'#7#9'crDefault'#8'TabOrder'#2#4#7'TabStop'#9#4'Left'#2#4#6'He'
-  +'ight'#2#20#3'Top'#2'e'#5'Width'#3#139#0#0#0#9'TCheckBox'#17'chkMessagesWind'
-  ,'ow'#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6#6'Window'#10'DragCursor'#7
-  +#9'crDefault'#8'TabOrder'#2#5#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'
-  +#2'}'#5'Width'#3#146#0#0#0#9'TCheckBox'#20'chkMessagesInterface'#11'AllowGra'
-  +'yed'#9#8'AutoSize'#9#7'Caption'#6#9'Interface'#10'DragCursor'#7#9'crDefault'
-  +#8'TabOrder'#2#6#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#3#149#0#5'Wi'
-  +'dth'#3#150#0#0#0#0#0#5'TPage'#12'pgExceptions'#7'Caption'#6#19'Language Exc'
-  +'eptions'#11'ClientWidth'#3#220#1#12'ClientHeight'#3'p'#1#4'Left'#2#2#6'Heig'
-  +'ht'#3'p'#1#3'Top'#2#28#5'Width'#3#220#1#0#9'TGroupBox'#18'bgIgnoreException'
-  +'s'#7'Caption'#6#23'Ignore these exceptions'#12'ClientHeight'#3'7'#1#11'Clie'
-  +'ntWidth'#3#208#1#11'ParentColor'#9#11'ParentCtl3D'#8#8'TabOrder'#2#0#4'Left'
-  +#2#4#6'Height'#3'H'#1#3'Top'#2#8#5'Width'#3#212#1#0#7'TButton'#18'cmdExcepti'
-  +'onRemove'#7'Enabled'#8#7'Caption'#6#6'Remove'#7'TabStop'#9#8'TabOrder'#2#0#7
-  +'OnClick'#7#23'cmdExceptionRemoveCLICK'#4'Left'#3'|'#1#6'Height'#2#25#3'Top'
-  +#3#21#1#5'Width'#2'K'#0#0#7'TButton'#15'cmdExceptionAdd'#7'Caption'#6#3'Add'
-  +#7'TabStop'#9#8'TabOrder'#2#1#7'OnClick'#7#20'cmdExceptionAddCLICK'#4'Left'#3
-  +','#1#6'Height'#2#25#3'Top'#3#21#1#5'Width'#2'K'#0#0#13'TCheckListBox'#13'cl'
-  +'bExceptions'#7'OnClick'#7#18'clbExceptionsCLICK'#8'TabOrder'#2#2#7'TabStop'
-  +#9#8'TopIndex'#2#255#4'Left'#2#8#6'Height'#3#8#1#3'Top'#2#5#5'Width'#3#192#1
-  +#0#0#0#9'TCheckBox'#19'chkBreakOnException'#11'AllowGrayed'#9#8'AutoSize'#9#7
-  +'Caption'#6#27'Break on Lazarus Exceptions'#10'DragCursor'#7#9'crDefault'#8
-  +'TabOrder'#2#1#7'TabStop'#9#4'Left'#2#2#6'Height'#2#20#3'Top'#3'T'#1#5'Width'
-  +#3#188#0#0#0#0#5'TPage'#9'pgSignals'#7'Caption'#6#13'OS Exceptions'#11'Clien'
-  +'tWidth'#3#220#1#12'ClientHeight'#3'p'#1#4'Left'#2#2#6'Height'#3'p'#1#3'Top'
-  +#2#28#5'Width'#3#220#1#0#9'TGroupBox'#9'gbSignals'#7'Caption'#6#7'Signals'#12
+  +'e'#9#7'Caption'#6#16'Clear log on run'#10'DragCursor'#4#244#255#0#0#8'TabOr'
+  +'der'#2#0#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#2#5#5'Width'#3#135#0
+  +#0#0#9'TCheckBox'#17'chkLimitLinecount'#11'AllowGrayed'#9#8'AutoSize'#9#7'Ca'
+  +'ption'#6#18'Limit linecount to'#10'DragCursor'#4#244#255#0#0#8'TabOrder'#2#1
+  +#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#2#29#5'Width'#2'w'#0#0#9'TSp'
+  +'inEdit'#16'seLimitLinecount'#7'Enabled'#8#10'Climb_Rate'#5#0#0#0#0#0#144'?'
+  +#236#144'?'#8'MinValue'#5#0#0#0#0#0#144'?'#236#144'?'#8'MaxValue'#5#0#0#0#0#0
+  +#144'?'#236#144'?'#5'Value'#5#0#0#0#0#0#144'?'#236#144'?'#4'Left'#2#28#6'Hei'
+  +'ght'#2#20#3'Top'#2'5'#5'Width'#2'>'#0#0#0#9'TGroupBox'#10'gbMessages'#7'Cap'
+  +'tion'#6#8'Messages'#12'ClientHeight'#3#171#0#11'ClientWidth'#3#228#0#7'Enab'
+  +'led'#8#11'ParentColor'#9#11'ParentCtl3D'#8#8'TabOrder'#2#1#4'Left'#3#242#0#6
+  +'Height'#3#188#0#3'Top'#2#8#5'Width'#3#232#0#0#9'TCheckBox'#21'chkMessagesBr'
+  +'eakpoint'#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6#10'Breakpoint'#10'Dr'
+  +'agCursor'#4#244#255#0#0#8'TabOrder'#2#0#7'TabStop'#9#4'Left'#2#4#6'Height'#2
+  +#20#3'Top'#2#5#5'Width'#3#161#0#0#0#9'TCheckBox'#18'chkMessagesProcess'#11'A'
+  +'llowGrayed'#9#8'AutoSize'#9#7'Caption'#6#7'Process'#10'DragCursor'#4#244#255
+  +#0#0#8'TabOrder'#2#1#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#2#29#5'W'
+  +'idth'#3#147#0#0#0#9'TCheckBox'#17'chkMessagesThread'#11'AllowGrayed'#9#8'Au'
+  +'toSize'#9#7'Caption'#6#6'Thread'#10'DragCursor'#4#244#255#0#0#8'TabOrder'#2
+  +#2#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#2'5'#5'Width'#3#141#0#0#0#9
+  +'TCheckBox'#17'chkMessagesModule'#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'
+  +#6#6'Module'#10'DragCursor'#4#244#255#0#0#8'TabOrder'#2#3#7'TabStop'#9#4'Lef'
+  +'t'#2#4#6'Height'#2#20#3'Top'#2'M'#5'Width'#3#144#0#0#0#9'TCheckBox'#17'chkM'
+  +'essagesOutput'#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6#6'Output'#10'Dr'
+  +'agCursor'#4#244#255#0#0#8'TabOrder'#2#4#7'TabStop'#9#4'Left'#2#4#6'Height'#2
+  +#20#3'Top'#2'e'#5'Width'#3#139#0#0#0#9'TCheckBox'#17'chkMessagesWindow'#11'A'
+  ,'llowGrayed'#9#8'AutoSize'#9#7'Caption'#6#6'Window'#10'DragCursor'#4#244#255
+  +#0#0#8'TabOrder'#2#5#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#2'}'#5'W'
+  +'idth'#3#146#0#0#0#9'TCheckBox'#20'chkMessagesInterface'#11'AllowGrayed'#9#8
+  +'AutoSize'#9#7'Caption'#6#9'Interface'#10'DragCursor'#4#244#255#0#0#8'TabOrd'
+  +'er'#2#6#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#3#149#0#5'Width'#3
+  +#150#0#0#0#0#0#5'TPage'#12'pgExceptions'#7'Caption'#6#19'Language Exceptions'
+  +#11'ClientWidth'#3#220#1#12'ClientHeight'#3'p'#1#4'Left'#2#2#6'Height'#3'p'#1
+  +#3'Top'#2#28#5'Width'#3#220#1#0#9'TGroupBox'#18'bgIgnoreExceptions'#7'Captio'
+  +'n'#6#23'Ignore these exceptions'#12'ClientHeight'#3'7'#1#11'ClientWidth'#3
+  +#208#1#11'ParentColor'#9#11'ParentCtl3D'#8#8'TabOrder'#2#0#4'Left'#2#4#6'Hei'
+  +'ght'#3'H'#1#3'Top'#2#8#5'Width'#3#212#1#0#7'TButton'#18'cmdExceptionRemove'
+  +#7'Enabled'#8#7'Caption'#6#6'Remove'#7'TabStop'#9#8'TabOrder'#2#0#7'OnClick'
+  +#7#23'cmdExceptionRemoveCLICK'#4'Left'#3'|'#1#6'Height'#2#25#3'Top'#3#21#1#5
+  +'Width'#2'K'#0#0#7'TButton'#15'cmdExceptionAdd'#7'Caption'#6#3'Add'#7'TabSto'
+  +'p'#9#8'TabOrder'#2#1#7'OnClick'#7#20'cmdExceptionAddCLICK'#4'Left'#3','#1#6
+  +'Height'#2#25#3'Top'#3#21#1#5'Width'#2'K'#0#0#13'TCheckListBox'#13'clbExcept'
+  +'ions'#7'OnClick'#7#18'clbExceptionsCLICK'#8'TabOrder'#2#2#7'TabStop'#9#8'To'
+  +'pIndex'#2#255#4'Left'#2#8#6'Height'#3#8#1#3'Top'#2#5#5'Width'#3#192#1#0#0#0
+  +#9'TCheckBox'#19'chkBreakOnException'#11'AllowGrayed'#9#8'AutoSize'#9#7'Capt'
+  +'ion'#6#27'Break on Lazarus Exceptions'#10'DragCursor'#4#244#255#0#0#8'TabOr'
+  +'der'#2#1#7'TabStop'#9#4'Left'#2#2#6'Height'#2#20#3'Top'#3'T'#1#5'Width'#3
+  +#188#0#0#0#0#5'TPage'#9'pgSignals'#7'Caption'#6#13'OS Exceptions'#11'ClientW'
+  +'idth'#3#220#1#12'ClientHeight'#3'p'#1#4'Left'#2#2#6'Height'#3'p'#1#3'Top'#2
+  +#28#5'Width'#3#220#1#0#9'TGroupBox'#9'gbSignals'#7'Caption'#6#7'Signals'#12
   +'ClientHeight'#3'Q'#1#11'ClientWidth'#3#208#1#11'ParentColor'#9#11'ParentCtl'
   +'3D'#8#8'TabOrder'#2#0#4'Left'#2#4#6'Height'#3'b'#1#3'Top'#2#8#5'Width'#3#212
   +#1#0#7'TButton'#15'cmdSignalRemove'#7'Enabled'#8#7'Caption'#6#6'Remove'#7'Ta'
diff --git a/ide/publishprojectdlg.lfm b/ide/publishprojectdlg.lfm
index 0a1ba0adbc..d7c501bbc4 100644
--- a/ide/publishprojectdlg.lfm
+++ b/ide/publishprojectdlg.lfm
@@ -3,7 +3,7 @@ object PublishProjectDialog: TPublishProjectDialog
   ClientHeight = 462
   ClientWidth = 469
   OnResize = PublishProjectDialogRESIZE
-  Position = poscreencenter
+  Position = POSCREENCENTER
   HorzScrollBar.Page = 470
   VertScrollBar.Page = 463
   Left = 307
@@ -11,7 +11,7 @@ object PublishProjectDialog: TPublishProjectDialog
   Top = 165
   Width = 469
   object OkButton: TButton
-    Anchors = [aktop, akright]
+    Anchors = [AKTOP, AKRIGHT]
     ModalResult = 1
     Caption = 'Ok'
     TabStop = True
@@ -23,7 +23,7 @@ object PublishProjectDialog: TPublishProjectDialog
     Width = 75
   end
   object CancelButton: TButton
-    Anchors = [aktop, akright]
+    Anchors = [AKTOP, AKRIGHT]
     ModalResult = 2
     Caption = 'Cancel'
     TabStop = True
@@ -37,6 +37,7 @@ object PublishProjectDialog: TPublishProjectDialog
     Caption = 'Destination directory'
     ClientHeight = 94
     ClientWidth = 446
+    ParentColor = True
     ParentCtl3D = False
     TabOrder = 2
     OnResize = DestDirGroupBoxRESIZE
@@ -83,7 +84,7 @@ object PublishProjectDialog: TPublishProjectDialog
     end
     object CommandAfterLabel: TLabel
       Caption = 'Command after:'
-      Layout = tltop
+      Layout = TLTOP
       Left = 6
       Height = 17
       Top = 33
@@ -94,6 +95,7 @@ object PublishProjectDialog: TPublishProjectDialog
     Caption = 'Files'
     ClientHeight = 27
     ClientWidth = 446
+    ParentColor = True
     ParentCtl3D = False
     TabOrder = 3
     OnResize = FilesGroupboxRESIZE
@@ -105,7 +107,7 @@ object PublishProjectDialog: TPublishProjectDialog
       AllowGrayed = True
       AutoSize = True
       Caption = 'Ignore binaries'
-      DragCursor = crDefault
+      DragCursor = 65524
       TabOrder = 0
       TabStop = True
       Left = 6
@@ -118,6 +120,7 @@ object PublishProjectDialog: TPublishProjectDialog
     Caption = 'Project Information'
     ClientHeight = 52
     ClientWidth = 446
+    ParentColor = True
     ParentCtl3D = False
     TabOrder = 4
     OnResize = ProjectInfoGroupboxRESIZE
@@ -129,7 +132,7 @@ object PublishProjectDialog: TPublishProjectDialog
       AllowGrayed = True
       AutoSize = True
       Caption = 'Save editor info of closed files'
-      DragCursor = crDefault
+      DragCursor = 65524
       TabOrder = 0
       TabStop = True
       Left = 4
@@ -141,7 +144,7 @@ object PublishProjectDialog: TPublishProjectDialog
       AllowGrayed = True
       AutoSize = True
       Caption = 'Save editor info of non project files'
-      DragCursor = crDefault
+      DragCursor = 65524
       TabOrder = 1
       TabStop = True
       Left = 4
@@ -151,7 +154,7 @@ object PublishProjectDialog: TPublishProjectDialog
     end
   end
   object SaveSettingsButton: TButton
-    Anchors = [aktop, akright]
+    Anchors = [AKTOP, AKRIGHT]
     Caption = 'Save settings'
     TabStop = True
     TabOrder = 5
@@ -165,6 +168,7 @@ object PublishProjectDialog: TPublishProjectDialog
     Caption = 'Include Filter'
     ClientHeight = 58
     ClientWidth = 446
+    ParentColor = True
     ParentCtl3D = False
     TabOrder = 6
     TabStop = True
@@ -177,7 +181,7 @@ object PublishProjectDialog: TPublishProjectDialog
       AllowGrayed = True
       AutoSize = True
       Caption = 'Use Include Filter'
-      DragCursor = crDefault
+      DragCursor = 65524
       TabOrder = 0
       TabStop = True
       Left = 6
@@ -189,7 +193,7 @@ object PublishProjectDialog: TPublishProjectDialog
       AllowGrayed = True
       AutoSize = True
       Caption = 'Simple Syntax'
-      DragCursor = crDefault
+      DragCursor = 65524
       TabOrder = 1
       TabStop = True
       Left = 196
@@ -213,6 +217,7 @@ object PublishProjectDialog: TPublishProjectDialog
     Caption = 'Exclude Filter'
     ClientHeight = 62
     ClientWidth = 444
+    ParentColor = True
     ParentCtl3D = False
     TabOrder = 7
     TabStop = True
@@ -225,7 +230,7 @@ object PublishProjectDialog: TPublishProjectDialog
       AllowGrayed = True
       AutoSize = True
       Caption = 'Use Exclude Filter'
-      DragCursor = crDefault
+      DragCursor = 65524
       TabOrder = 0
       TabStop = True
       Left = 6
@@ -237,7 +242,7 @@ object PublishProjectDialog: TPublishProjectDialog
       AllowGrayed = True
       AutoSize = True
       Caption = 'Simple Syntax'
-      DragCursor = crDefault
+      DragCursor = 65524
       TabOrder = 1
       TabStop = True
       Left = 199
diff --git a/ide/publishprojectdlg.lrs b/ide/publishprojectdlg.lrs
index bf31c26247..43c27b54cf 100644
--- a/ide/publishprojectdlg.lrs
+++ b/ide/publishprojectdlg.lrs
@@ -3,71 +3,72 @@
 LazarusResources.Add('TPublishProjectDialog','FORMDATA',[
   'TPF0'#21'TPublishProjectDialog'#20'PublishProjectDialog'#7'Caption'#6#15'Pub'
   +'lish Project'#12'ClientHeight'#3#206#1#11'ClientWidth'#3#213#1#8'OnResize'#7
-  +#26'PublishProjectDialogRESIZE'#8'Position'#7#14'poscreencenter'#18'HorzScro'
+  +#26'PublishProjectDialogRESIZE'#8'Position'#7#14'POSCREENCENTER'#18'HorzScro'
   +'llBar.Page'#3#214#1#18'VertScrollBar.Page'#3#207#1#4'Left'#3'3'#1#6'Height'
   +#3#206#1#3'Top'#3#165#0#5'Width'#3#213#1#0#7'TButton'#8'OkButton'#7'Anchors'
-  +#11#5'aktop'#7'akright'#0#11'ModalResult'#2#1#7'Caption'#6#2'Ok'#7'TabStop'#9
+  +#11#5'AKTOP'#7'AKRIGHT'#0#11'ModalResult'#2#1#7'Caption'#6#2'Ok'#7'TabStop'#9
   +#8'TabOrder'#2#0#7'OnClick'#7#13'OkButtonCLICK'#4'Left'#2'H'#6'Height'#2#25#3
   +'Top'#3#176#1#5'Width'#2'K'#0#0#7'TButton'#12'CancelButton'#7'Anchors'#11#5
-  +'aktop'#7'akright'#0#11'ModalResult'#2#2#7'Caption'#6#6'Cancel'#7'TabStop'#9
+  +'AKTOP'#7'AKRIGHT'#0#11'ModalResult'#2#2#7'Caption'#6#6'Cancel'#7'TabStop'#9
   +#8'TabOrder'#2#1#4'Left'#3's'#1#6'Height'#2#25#3'Top'#3#176#1#5'Width'#2'K'#0
   +#0#9'TGroupBox'#15'DestDirGroupBox'#7'Caption'#6#21'Destination directory'#12
-  +'ClientHeight'#2'^'#11'ClientWidth'#3#190#1#11'ParentCtl3D'#8#8'TabOrder'#2#2
-  +#8'OnResize'#7#21'DestDirGroupBoxRESIZE'#4'Left'#2#8#6'Height'#2'o'#3'Top'#2
-  +#8#5'Width'#3#194#1#0#9'TComboBox'#15'DestDirComboBox'#9'MaxLength'#2#0#11'P'
-  +'arentCtl3D'#8#8'TabOrder'#2#0#7'TabStop'#9#4'Text'#6#15'DestDirComboBox'#4
-  +'Left'#2#6#6'Height'#2#25#3'Top'#2#1#5'Width'#3'^'#1#0#0#7'TBitBtn'#19'Brows'
-  +'eDestDirBitBtn'#10'Glyph.Data'#10'>'#0#0#0':'#0#0#0'BM:'#0#0#0#0#0#0#0'6'#0
-  +#0#0'('#0#0#0#1#0#0#0#1#0#0#0#1#0#16#0#0#0#0#0#4#0#0#0'Z'#0#0#0'`'#0#0#0'@'#0
-  +#0#0'@'#0#0#0#0#0#0#0#7'Spacing'#2#3#7'Caption'#6#6'Browse'#7'TabStop'#9#8'T'
-  +'abOrder'#2#1#7'OnClick'#7#24'BrowseDestDirBitBtnCLICK'#4'Left'#3'n'#1#6'Hei'
-  +'ght'#2#25#3'Top'#2#1#5'Width'#2'H'#0#0#9'TComboBox'#20'CommandAfterCombobox'
-  +#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#2#7'TabStop'#9#4'Text'#6#20
-  +'CommandAfterCombobox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2':'#5'Width'#3#174
-  +#1#0#0#6'TLabel'#17'CommandAfterLabel'#7'Caption'#6#14'Command after:'#6'Lay'
-  +'out'#7#5'tltop'#4'Left'#2#6#6'Height'#2#17#3'Top'#2'!'#5'Width'#3#172#1#0#0
-  +#0#9'TGroupBox'#13'FilesGroupbox'#7'Caption'#6#5'Files'#12'ClientHeight'#2#27
-  +#11'ClientWidth'#3#190#1#11'ParentCtl3D'#8#8'TabOrder'#2#3#8'OnResize'#7#19
-  +'FilesGroupboxRESIZE'#4'Left'#2#8#6'Height'#2','#3'Top'#3#128#0#5'Width'#3
-  +#194#1#0#9'TCheckBox'#22'IgnoreBinariesCheckbox'#11'AllowGrayed'#9#8'AutoSiz'
-  +'e'#9#7'Caption'#6#15'Ignore binaries'#10'DragCursor'#7#9'crDefault'#8'TabOr'
-  +'der'#2#0#7'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3'Top'#2#1#5'Width'#3#161#0
-  +#0#0#0#9'TGroupBox'#19'ProjectInfoGroupbox'#7'Caption'#6#19'Project Informat'
-  +'ion'#12'ClientHeight'#2'4'#11'ClientWidth'#3#190#1#11'ParentCtl3D'#8#8'TabO'
-  +'rder'#2#4#8'OnResize'#7#25'ProjectInfoGroupboxRESIZE'#4'Left'#2#8#6'Height'
-  +#2'E'#3'Top'#3'X'#1#5'Width'#3#194#1#0#9'TCheckBox!SaveClosedEditorFilesInfo'
-  +'Checkbox'#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6' Save editor info of'
-  +' closed files'#10'DragCursor'#7#9'crDefault'#8'TabOrder'#2#0#7'TabStop'#9#4
-  +'Left'#2#4#6'Height'#2#20#3'Top'#2#1#5'Width'#3#176#1#0#0#9'TCheckBox''SaveE'
-  +'ditorInfoOfNonProjectFilesCheckbox'#11'AllowGrayed'#9#8'AutoSize'#9#7'Capti'
-  +'on'#6'%Save editor info of non project files'#10'DragCursor'#7#9'crDefault'
-  +#8'TabOrder'#2#1#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#2#26#5'Width'
-  +#3#176#1#0#0#0#7'TButton'#18'SaveSettingsButton'#7'Anchors'#11#5'aktop'#7'ak'
-  +'right'#0#7'Caption'#6#13'Save settings'#7'TabStop'#9#8'TabOrder'#2#5#7'OnCl'
-  +'ick'#7#23'SaveSettingsButtonCLICK'#4'Left'#3#198#0#6'Height'#2#25#3'Top'#3
-  +#176#1#5'Width'#2'x'#0#0#9'TGroupBox'#21'IncludeFilterGroupbox'#7'Caption'#6
-  +#14'Include Filter'#12'ClientHeight'#2':'#11'ClientWidth'#3#190#1#11'ParentC'
-  +'tl3D'#8#8'TabOrder'#2#6#7'TabStop'#9#8'OnResize'#7#27'IncludeFilterGroupbox'
-  +'RESIZE'#4'Left'#2#8#6'Height'#2'K'#3'Top'#3#176#0#5'Width'#3#194#1#0#9'TChe'
-  +'ckBox'#24'UseIncludeFilterCheckbox'#11'AllowGrayed'#9#8'AutoSize'#9#7'Capti'
-  +'on'#6#18'Use Include Filter'#10'DragCursor'#7#9'crDefault'#8'TabOrder'#2#0#7
-  +'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3'Top'#2#1#5'Width'#3#171#0#0#0#9'TCh'
-  +'eckBox'#29'IncFilterSimpleSyntaxCheckbox'#11'AllowGrayed'#9#8'AutoSize'#9#7
-  +'Caption'#6#13'Simple Syntax'#10'DragCursor'#7#9'crDefault'#8'TabOrder'#2#1#7
-  +'TabStop'#9#4'Left'#3#196#0#6'Height'#2#20#3'Top'#2#2#5'Width'#3#201#0#0#0#9
-  +'TComboBox'#21'IncludeFilterCombobox'#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'T'
-  +'abOrder'#2#2#7'TabStop'#9#4'Text'#6#21'IncludeFilterCombobox'#4'Left'#2#6#6
-  +'Height'#2#25#3'Top'#2#25#5'Width'#3#174#1#0#0#0#9'TGroupBox'#21'ExcludeFilt'
-  +'erGroupbox'#7'Caption'#6#14'Exclude Filter'#12'ClientHeight'#2'>'#11'Client'
-  +'Width'#3#188#1#11'ParentCtl3D'#8#8'TabOrder'#2#7#7'TabStop'#9#8'OnResize'#7
-  +#27'ExcludeFilterGroupboxRESIZE'#4'Left'#2#8#6'Height'#2'O'#3'Top'#3#0#1#5'W'
-  +'idth'#3#192#1#0#9'TCheckBox'#24'UseExcludeFilterCheckbox'#11'AllowGrayed'#9
-  +#8'AutoSize'#9#7'Caption'#6#18'Use Exclude Filter'#10'DragCursor'#7#9'crDefa'
-  +'ult'#8'TabOrder'#2#0#7'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3'Top'#2#5#5'W'
-  +'idth'#3#151#0#0#0#9'TCheckBox'#29'ExcFilterSimpleSyntaxCheckbox'#11'AllowGr'
-  ,'ayed'#9#8'AutoSize'#9#7'Caption'#6#13'Simple Syntax'#10'DragCursor'#7#9'crD'
-  +'efault'#8'TabOrder'#2#1#7'TabStop'#9#4'Left'#3#199#0#6'Height'#2#20#3'Top'#2
-  +#6#5'Width'#3#212#0#0#0#9'TComboBox'#21'ExcludeFilterCombobox'#9'MaxLength'#2
-  +#0#11'ParentCtl3D'#8#8'TabOrder'#2#2#7'TabStop'#9#4'Text'#6#21'ExcludeFilter'
-  +'Combobox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#30#5'Width'#3#174#1#0#0#0#0
+  +'ClientHeight'#2'^'#11'ClientWidth'#3#190#1#11'ParentColor'#9#11'ParentCtl3D'
+  +#8#8'TabOrder'#2#2#8'OnResize'#7#21'DestDirGroupBoxRESIZE'#4'Left'#2#8#6'Hei'
+  +'ght'#2'o'#3'Top'#2#8#5'Width'#3#194#1#0#9'TComboBox'#15'DestDirComboBox'#9
+  +'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#0#7'TabStop'#9#4'Text'#6#15
+  +'DestDirComboBox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#1#5'Width'#3'^'#1#0#0#7
+  +'TBitBtn'#19'BrowseDestDirBitBtn'#10'Glyph.Data'#10'>'#0#0#0':'#0#0#0'BM:'#0
+  +#0#0#0#0#0#0'6'#0#0#0'('#0#0#0#1#0#0#0#1#0#0#0#1#0#16#0#0#0#0#0#4#0#0#0'Z'#0
+  +#0#0'`'#0#0#0'@'#0#0#0'@'#0#0#0#0#0#0#0#7'Spacing'#2#3#7'Caption'#6#6'Browse'
+  +#7'TabStop'#9#8'TabOrder'#2#1#7'OnClick'#7#24'BrowseDestDirBitBtnCLICK'#4'Le'
+  +'ft'#3'n'#1#6'Height'#2#25#3'Top'#2#1#5'Width'#2'H'#0#0#9'TComboBox'#20'Comm'
+  +'andAfterCombobox'#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#2#7'TabS'
+  +'top'#9#4'Text'#6#20'CommandAfterCombobox'#4'Left'#2#6#6'Height'#2#25#3'Top'
+  +#2':'#5'Width'#3#174#1#0#0#6'TLabel'#17'CommandAfterLabel'#7'Caption'#6#14'C'
+  +'ommand after:'#6'Layout'#7#5'TLTOP'#4'Left'#2#6#6'Height'#2#17#3'Top'#2'!'#5
+  +'Width'#3#172#1#0#0#0#9'TGroupBox'#13'FilesGroupbox'#7'Caption'#6#5'Files'#12
+  +'ClientHeight'#2#27#11'ClientWidth'#3#190#1#11'ParentColor'#9#11'ParentCtl3D'
+  +#8#8'TabOrder'#2#3#8'OnResize'#7#19'FilesGroupboxRESIZE'#4'Left'#2#8#6'Heigh'
+  +'t'#2','#3'Top'#3#128#0#5'Width'#3#194#1#0#9'TCheckBox'#22'IgnoreBinariesChe'
+  +'ckbox'#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6#15'Ignore binaries'#10
+  +'DragCursor'#4#244#255#0#0#8'TabOrder'#2#0#7'TabStop'#9#4'Left'#2#6#6'Height'
+  +#2#20#3'Top'#2#1#5'Width'#3#161#0#0#0#0#9'TGroupBox'#19'ProjectInfoGroupbox'
+  +#7'Caption'#6#19'Project Information'#12'ClientHeight'#2'4'#11'ClientWidth'#3
+  +#190#1#11'ParentColor'#9#11'ParentCtl3D'#8#8'TabOrder'#2#4#8'OnResize'#7#25
+  +'ProjectInfoGroupboxRESIZE'#4'Left'#2#8#6'Height'#2'E'#3'Top'#3'X'#1#5'Width'
+  +#3#194#1#0#9'TCheckBox!SaveClosedEditorFilesInfoCheckbox'#11'AllowGrayed'#9#8
+  +'AutoSize'#9#7'Caption'#6' Save editor info of closed files'#10'DragCursor'#4
+  +#244#255#0#0#8'TabOrder'#2#0#7'TabStop'#9#4'Left'#2#4#6'Height'#2#20#3'Top'#2
+  +#1#5'Width'#3#176#1#0#0#9'TCheckBox''SaveEditorInfoOfNonProjectFilesCheckbox'
+  +#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6'%Save editor info of non proje'
+  +'ct files'#10'DragCursor'#4#244#255#0#0#8'TabOrder'#2#1#7'TabStop'#9#4'Left'
+  +#2#4#6'Height'#2#20#3'Top'#2#26#5'Width'#3#176#1#0#0#0#7'TButton'#18'SaveSet'
+  +'tingsButton'#7'Anchors'#11#5'AKTOP'#7'AKRIGHT'#0#7'Caption'#6#13'Save setti'
+  +'ngs'#7'TabStop'#9#8'TabOrder'#2#5#7'OnClick'#7#23'SaveSettingsButtonCLICK'#4
+  +'Left'#3#198#0#6'Height'#2#25#3'Top'#3#176#1#5'Width'#2'x'#0#0#9'TGroupBox'
+  +#21'IncludeFilterGroupbox'#7'Caption'#6#14'Include Filter'#12'ClientHeight'#2
+  +':'#11'ClientWidth'#3#190#1#11'ParentColor'#9#11'ParentCtl3D'#8#8'TabOrder'#2
+  +#6#7'TabStop'#9#8'OnResize'#7#27'IncludeFilterGroupboxRESIZE'#4'Left'#2#8#6
+  +'Height'#2'K'#3'Top'#3#176#0#5'Width'#3#194#1#0#9'TCheckBox'#24'UseIncludeFi'
+  +'lterCheckbox'#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6#18'Use Include F'
+  +'ilter'#10'DragCursor'#4#244#255#0#0#8'TabOrder'#2#0#7'TabStop'#9#4'Left'#2#6
+  +#6'Height'#2#20#3'Top'#2#1#5'Width'#3#171#0#0#0#9'TCheckBox'#29'IncFilterSim'
+  +'pleSyntaxCheckbox'#11'AllowGrayed'#9#8'AutoSize'#9#7'Caption'#6#13'Simple S'
+  +'yntax'#10'DragCursor'#4#244#255#0#0#8'TabOrder'#2#1#7'TabStop'#9#4'Left'#3
+  +#196#0#6'Height'#2#20#3'Top'#2#2#5'Width'#3#201#0#0#0#9'TComboBox'#21'Includ'
+  +'eFilterCombobox'#9'MaxLength'#2#0#11'ParentCtl3D'#8#8'TabOrder'#2#2#7'TabSt'
+  +'op'#9#4'Text'#6#21'IncludeFilterCombobox'#4'Left'#2#6#6'Height'#2#25#3'Top'
+  +#2#25#5'Width'#3#174#1#0#0#0#9'TGroupBox'#21'ExcludeFilterGroupbox'#7'Captio'
+  +'n'#6#14'Exclude Filter'#12'ClientHeight'#2'>'#11'ClientWidth'#3#188#1#11'Pa'
+  +'rentColor'#9#11'ParentCtl3D'#8#8'TabOrder'#2#7#7'TabStop'#9#8'OnResize'#7#27
+  +'ExcludeFilterGroupboxRESIZE'#4'Left'#2#8#6'Height'#2'O'#3'Top'#3#0#1#5'Widt'
+  +'h'#3#192#1#0#9'TCheckBox'#24'UseExcludeFilterCheckbox'#11'AllowGrayed'#9#8
+  +'AutoSize'#9#7'Caption'#6#18'Use Exclude Filter'#10'DragCursor'#4#244#255#0#0
+  +#8'TabOrder'#2#0#7'TabStop'#9#4'Left'#2#6#6'Height'#2#20#3'Top'#2#5#5'Width'
+  ,#3#151#0#0#0#9'TCheckBox'#29'ExcFilterSimpleSyntaxCheckbox'#11'AllowGrayed'#9
+  +#8'AutoSize'#9#7'Caption'#6#13'Simple Syntax'#10'DragCursor'#4#244#255#0#0#8
+  +'TabOrder'#2#1#7'TabStop'#9#4'Left'#3#199#0#6'Height'#2#20#3'Top'#2#6#5'Widt'
+  +'h'#3#212#0#0#0#9'TComboBox'#21'ExcludeFilterCombobox'#9'MaxLength'#2#0#11'P'
+  +'arentCtl3D'#8#8'TabOrder'#2#2#7'TabStop'#9#4'Text'#6#21'ExcludeFilterCombob'
+  +'ox'#4'Left'#2#6#6'Height'#2#25#3'Top'#2#30#5'Width'#3#174#1#0#0#0#0
 ]);
diff --git a/ideintf/propedits.pp b/ideintf/propedits.pp
index 5c4e6ee597..c3a2b1f2c0 100644
--- a/ideintf/propedits.pp
+++ b/ideintf/propedits.pp
@@ -612,7 +612,7 @@ type
   TModalResultPropertyEditor = class(TIntegerPropertyEditor)
   public
     function GetAttributes: TPropertyAttributes; override;
-    function GetValue: ansistring; override;
+    function OrdValueToVisualValue(OrdValue: longint): string; override;
     procedure GetValues(Proc: TGetStringProc); override;
     procedure SetValue(const NewValue:ansistring); override;
   end;
@@ -630,7 +630,7 @@ type
   end;
 
 { TTabOrderPropertyEditor
-  Property editor for the TabOrder property.  Prevents the property from being
+  Property editor for the TabOrder property. Prevents the property from being
   displayed when more than one component is selected. }
 
   TTabOrderPropertyEditor = class(TIntegerPropertyEditor)
@@ -639,7 +639,7 @@ type
   end;
 
 { TCaptionPropertyEditor
-  Property editor for the Caption and Text properties.  Updates the value of
+  Property editor for the Caption and Text properties. Updates the value of
   the property for each change instead on when the property is approved. }
 
   TCaptionPropertyEditor = class(TStringPropertyEditor)
@@ -648,8 +648,8 @@ type
   end;
 
 { TCaptionMultilinePropertyEditor
-  PropertyEditor editor for the Caption property when the Caption can be multiline.
-  Brings up the dialog for entering text. }
+  PropertyEditor editor for the Caption property when the Caption can be
+  multiline. Brings up the dialog for entering text. }
 
   TCaptionMultilinePropertyEditor = class(TCaptionPropertyEditor)
   public
@@ -684,7 +684,7 @@ type
   TCursorPropertyEditor = class(TIntegerPropertyEditor)
   public
     function GetAttributes: TPropertyAttributes; override;
-    function GetValue: ansistring; override;
+    function OrdValueToVisualValue(OrdValue: longint): string; override;
     procedure GetValues(Proc: TGetStringProc); override;
     procedure SetValue(const NewValue: ansistring); override;
   end;
@@ -3843,14 +3843,15 @@ const
 
 function TModalResultPropertyEditor.GetAttributes: TPropertyAttributes;
 begin
-  Result := [paMultiSelect, paValueList, paRevertable];
+  Result := [paMultiSelect, paValueList, paRevertable, paHasDefaultValue];
 end;
 
-function TModalResultPropertyEditor.GetValue: ansistring;
+function TModalResultPropertyEditor.OrdValueToVisualValue(OrdValue: longint
+  ): string;
 var
   CurValue: Longint;
 begin
-  CurValue := GetOrdValue;
+  CurValue := OrdValue;
   case CurValue of
     Low(ModalResults)..High(ModalResults):
       Result := ModalResults[CurValue];
@@ -4206,12 +4207,13 @@ end;
 
 function TCursorPropertyEditor.GetAttributes: TPropertyAttributes;
 begin
-  Result := [paMultiSelect, paSortList, paValueList, paRevertable];
+  Result:=[paMultiSelect,paSortList,paValueList,paRevertable,paHasDefaultValue];
 end;
 
-function TCursorPropertyEditor.GetValue: ansistring;
+function TCursorPropertyEditor.OrdValueToVisualValue(OrdValue: longint
+  ): string;
 begin
-  Result := CursorToString(TCursor(GetOrdValue));
+  Result := CursorToString(TCursor(OrdValue));
 end;
 
 procedure TCursorPropertyEditor.GetValues(Proc: TGetStringProc);
diff --git a/lcl/controls.pp b/lcl/controls.pp
index e8809a200d..be03ca0ce3 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -678,6 +678,7 @@ type
     procedure SetClientWidth(Value: Integer);
     procedure SetConstraints(const Value : TSizeConstraints);
     procedure SetCursor(Value : TCursor);
+    procedure SetDragCursor(const AValue: TCursor);
     procedure SetFont(Value: TFont);
     procedure SetHeight(Value: Integer);
     procedure SetHelpContext(const AValue: THelpContext);
@@ -803,7 +804,7 @@ type
   protected
     property ActionLink: TControlActionLink read FActionLink write FActionLink;
     property AutoSize: Boolean read FAutoSize write SetAutoSize default FALSE;
-    property DragCursor: TCursor read FDragCursor write FDragCursor default crDrag;
+    property DragCursor: TCursor read FDragCursor write SetDragCursor default crDrag;
     property DragKind: TDragKind read FDragKind write FDragKind default dkDrag;
     property DragMode: TDragMode read fDragMode write SetDragMode default dmManual;
     property IsControl: Boolean read FIsControl write FIsControl;
@@ -1853,6 +1854,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.164  2004/01/03 18:16:25  mattias
+  set DragCursor props to default
+
   Revision 1.163  2003/12/29 14:22:22  micha
   fix a lot of range check errors win32
 
diff --git a/lcl/dirsel.lfm b/lcl/dirsel.lfm
index 3b5d8f2b51..9d5e65a60e 100644
--- a/lcl/dirsel.lfm
+++ b/lcl/dirsel.lfm
@@ -97,7 +97,6 @@ object DirSelDlg: TDirSelDlg
     Constraints.MinHeight = 100
     Constraints.MinWidth = 100
     DefaultItemHeight = 17
-    DragCursor = crDefault
     ParentColor = True
     ParentCtl3D = False
     ParentFont = True
diff --git a/lcl/include/control.inc b/lcl/include/control.inc
index 22014dcb54..eb2332534a 100644
--- a/lcl/include/control.inc
+++ b/lcl/include/control.inc
@@ -1632,6 +1632,12 @@ begin
   end;
 end;
 
+procedure TControl.SetDragCursor(const AValue: TCursor);
+begin
+  if FDragCursor=AValue then exit;
+  FDragCursor:=AValue;
+end;
+
 procedure TControl.SetFont(Value: TFont);
 begin
   FFont.Assign(Value);
@@ -2610,6 +2616,9 @@ end;
 
 { =============================================================================
   $Log$
+  Revision 1.162  2004/01/03 18:16:25  mattias
+  set DragCursor props to default
+
   Revision 1.161  2003/12/29 14:22:22  micha
   fix a lot of range check errors win32
 
diff --git a/tools/apiwizz/apiwizard.lfm b/tools/apiwizz/apiwizard.lfm
index 2ad0ed6a8e..12051830b7 100644
--- a/tools/apiwizz/apiwizard.lfm
+++ b/tools/apiwizz/apiwizard.lfm
@@ -101,7 +101,6 @@ object ApiWizForm: TApiWizForm
       Caption = 'Independent'
       Checked = True
       State = cbchecked
-      DragCursor = crDefault
       TabOrder = 1
       TabStop = True
       OnClick = rbPlatformDependencyClick
@@ -114,7 +113,6 @@ object ApiWizForm: TApiWizForm
       AutoSize = True
       AllowGrayed = True
       Caption = 'Dependent'
-      DragCursor = crDefault
       TabOrder = 2
       TabStop = True
       OnClick = rbPlatformDependencyClick