diff --git a/ide/diskdiffsdialog.lfm b/ide/diskdiffsdialog.lfm
index 9a32c60f66..834b4c0fc9 100644
--- a/ide/diskdiffsdialog.lfm
+++ b/ide/diskdiffsdialog.lfm
@@ -1,10 +1,10 @@
 object DiskDiffsDlg: TDiskDiffsDlg
-  ActiveControl = IgnoreDiskChangesButton
+  ActiveControl = RevertAllButton
   Caption = 'DiskDiffsDlg'
   ClientHeight = 300
   ClientWidth = 600
   OnKeyDown = DiskDiffsDlgKeyDown
-  PixelsPerInch = 96
+  PixelsPerInch = 112
   Position = poScreenCenter
   HorzScrollBar.Page = 599
   VertScrollBar.Page = 299
@@ -21,10 +21,10 @@ object DiskDiffsDlg: TDiskDiffsDlg
     ModalResult = 5
     TabOrder = 0
     AnchorSideRight.Control = RevertAllButton
-    Left = 342
-    Height = 29
-    Top = 264
-    Width = 148
+    Left = 338
+    Height = 26
+    Top = 267
+    Width = 154
   end
   object RevertAllButton: TButton
     Anchors = [akRight, akBottom]
@@ -34,10 +34,10 @@ object DiskDiffsDlg: TDiskDiffsDlg
     Default = True
     ModalResult = 10
     TabOrder = 1
-    Left = 496
-    Height = 29
-    Top = 264
-    Width = 98
+    Left = 498
+    Height = 26
+    Top = 267
+    Width = 96
   end
   object FilesListBox: TListBox
     Align = alTop
@@ -45,6 +45,7 @@ object DiskDiffsDlg: TDiskDiffsDlg
     BorderSpacing.Top = 6
     OnMouseUp = FilesListBoxMouseUp
     TabOrder = 2
+    TopIndex = -1
     Left = 6
     Height = 86
     Top = 6
@@ -63,9 +64,7 @@ object DiskDiffsDlg: TDiskDiffsDlg
     TabOrder = 3
     Width = 588
     BookMarkOptions.Xoffset = -18
-    BookMarkOptions.OnChange = nil
     Gutter.Visible = False
-    Gutter.OnChange = nil
     Gutter.CodeFoldingWidth = 14
     Keystrokes = <    
       item
@@ -392,7 +391,6 @@ object DiskDiffsDlg: TDiskDiffsDlg
       'DiffSynEdit'
     )
     ReadOnly = True
-    SelectedColor.OnChange = nil
     Cursor = crIBeam
     Left = 6
     Height = 159
diff --git a/ide/diskdiffsdialog.lrs b/ide/diskdiffsdialog.lrs
index 1b7ba6079f..d4123ff1de 100644
--- a/ide/diskdiffsdialog.lrs
+++ b/ide/diskdiffsdialog.lrs
@@ -1,73 +1,72 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TDiskDiffsDlg','FORMDATA',[
-  'TPF0'#13'TDiskDiffsDlg'#12'DiskDiffsDlg'#13'ActiveControl'#7#23'IgnoreDiskCh'
-  +'angesButton'#7'Caption'#6#12'DiskDiffsDlg'#12'ClientHeight'#3','#1#11'Clien'
-  +'tWidth'#3'X'#2#9'OnKeyDown'#7#19'DiskDiffsDlgKeyDown'#13'PixelsPerInch'#2'`'
-  +#8'Position'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3'W'#2#18'VertScrol'
-  +'lBar.Page'#3'+'#1#4'Left'#3'T'#1#6'Height'#3','#1#3'Top'#3'{'#2#5'Width'#3
-  +'X'#2#0#7'TButton'#23'IgnoreDiskChangesButton'#7'Anchors'#11#7'akRight'#8'ak'
-  +'Bottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#25'BorderSpacing.InnerB'
-  +'order'#2#2#7'Caption'#6#23'IgnoreDiskChangesButton'#11'ModalResult'#2#5#8'T'
-  +'abOrder'#2#0#23'AnchorSideRight.Control'#7#15'RevertAllButton'#4'Left'#3'V'
-  +#1#6'Height'#2#29#3'Top'#3#8#1#5'Width'#3#148#0#0#0#7'TButton'#15'RevertAllB'
-  +'utton'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#25'BorderSpacin'
-  +'g.InnerBorder'#2#2#7'Caption'#6#15'RevertAllButton'#7'Default'#9#11'ModalRe'
-  +'sult'#2#10#8'TabOrder'#2#1#4'Left'#3#240#1#6'Height'#2#29#3'Top'#3#8#1#5'Wi'
-  +'dth'#2'b'#0#0#8'TListBox'#12'FilesListBox'#5'Align'#7#5'alTop'#18'BorderSpa'
-  +'cing.Left'#2#6#17'BorderSpacing.Top'#2#6#9'OnMouseUp'#7#19'FilesListBoxMous'
-  +'eUp'#8'TabOrder'#2#2#4'Left'#2#6#6'Height'#2'V'#3'Top'#2#6#5'Width'#3'R'#2#0
+  'TPF0'#13'TDiskDiffsDlg'#12'DiskDiffsDlg'#13'ActiveControl'#7#15'RevertAllBut'
+  +'ton'#7'Caption'#6#12'DiskDiffsDlg'#12'ClientHeight'#3','#1#11'ClientWidth'#3
+  +'X'#2#9'OnKeyDown'#7#19'DiskDiffsDlgKeyDown'#13'PixelsPerInch'#2'p'#8'Positi'
+  +'on'#7#14'poScreenCenter'#18'HorzScrollBar.Page'#3'W'#2#18'VertScrollBar.Pag'
+  +'e'#3'+'#1#4'Left'#3'T'#1#6'Height'#3','#1#3'Top'#3'{'#2#5'Width'#3'X'#2#0#7
+  +'TButton'#23'IgnoreDiskChangesButton'#7'Anchors'#11#7'akRight'#8'akBottom'#0
+  +#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#25'BorderSpacing.InnerBorder'#2#2
+  +#7'Caption'#6#23'IgnoreDiskChangesButton'#11'ModalResult'#2#5#8'TabOrder'#2#0
+  +#23'AnchorSideRight.Control'#7#15'RevertAllButton'#4'Left'#3'R'#1#6'Height'#2
+  +#26#3'Top'#3#11#1#5'Width'#3#154#0#0#0#7'TButton'#15'RevertAllButton'#7'Anch'
+  +'ors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#25'BorderSpacing.InnerBorder'
+  +#2#2#7'Caption'#6#15'RevertAllButton'#7'Default'#9#11'ModalResult'#2#10#8'Ta'
+  +'bOrder'#2#1#4'Left'#3#242#1#6'Height'#2#26#3'Top'#3#11#1#5'Width'#2'`'#0#0#8
+  +'TListBox'#12'FilesListBox'#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17
+  +'BorderSpacing.Top'#2#6#9'OnMouseUp'#7#19'FilesListBoxMouseUp'#8'TabOrder'#2
+  +#2#8'TopIndex'#2#255#4'Left'#2#6#6'Height'#2'V'#3'Top'#2#6#5'Width'#3'R'#2#0
   +#0#8'TSynEdit'#11'DiffSynEdit'#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6
   +#19'BorderSpacing.Right'#2#6#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'a'
   +'kBottom'#0#11'Font.Height'#2#244#9'Font.Name'#6#7'courier'#6'Height'#3#159#0
   +#4'Name'#6#11'DiffSynEdit'#11'ParentColor'#8#8'TabOrder'#2#3#5'Width'#3'L'#2
-  +#23'BookMarkOptions.Xoffset'#2#238#24'BookMarkOptions.OnChange'#13#14'Gutter'
-  +'.Visible'#8#15'Gutter.OnChange'#13#23'Gutter.CodeFoldingWidth'#2#14#10'Keys'
-  +'trokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'
-  +#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCu'
-  +'t'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'Shor'
-  +'tCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'Short'
-  +'Cut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'Short'
-  +'Cut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'Short'
-  +'Cut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'Sho'
-  +'rtCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'Sh'
-  +'ortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'S'
-  +'hortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'Sh'
-  +'ortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'S'
-  +'hortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'Sh'
-  +'ortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'S'
-  +'hortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'Sh'
-  +'ortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'S'
-  +'hortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201
-  +#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3
-  +#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Comman'
-  +'d'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7
-  +'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8
-  +#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1
-  +#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3
-  +#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Comma'
-  +'nd'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7
-  +'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0
-  +#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X'
-  +'@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortC'
-  +'ut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'S'
-  +'hortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1
-  +#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3
-  +'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Comman'
-  +'d'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'C'
-  +'ommand'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1
-  +#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'
-  +#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3
-  +'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCu'
-  +'t'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'Sh'
-  +'ortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1
-  +#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3
-  +#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Comm'
-  +'and'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7
-  +'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'
-  ,#0#0#13'Lines.Strings'#1#6#11'DiffSynEdit'#0#8'ReadOnly'#9#22'SelectedColor.'
-  +'OnChange'#13#6'Cursor'#7#7'crIBeam'#4'Left'#2#6#6'Height'#3#159#0#3'Top'#2
-  +'a'#5'Width'#3'L'#2#0#0#9'TSplitter'#8'Splitter'#5'Align'#7#5'alTop'#6'Curso'
-  +'r'#7#8'crVSplit'#6'Height'#2#5#5'Width'#3'X'#2#12'ResizeAnchor'#7#5'akTop'#6
-  +'Cursor'#7#8'crVSplit'#6'Height'#2#5#3'Top'#2'\'#5'Width'#3'X'#2#0#0#0
+  +#23'BookMarkOptions.Xoffset'#2#238#14'Gutter.Visible'#8#23'Gutter.CodeFoldin'
+  +'gWidth'#2#14#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Comm'
+  +'and'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7
+  +'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'C'
+  +'ommand'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7
+  +'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7
+  +'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7
+  +'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7
+  +'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7
+  +'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7
+  +'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'C'
+  +'ommand'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7
+  +'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'C'
+  +'ommand'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7
+  +'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'C'
+  +'ommand'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7
+  +'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1
+  +#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '
+  +#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3
+  +'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCu'
+  +'t'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8
+  +'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'C'
+  +'ommand'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0
+  +#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3
+  +'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'Short'
+  +'Cut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8
+  +'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['
+  +#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'
+  +#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Com'
+  +'mand'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7
+  +'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0
+  +#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4'
+  +'@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'
+  +#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'Short'
+  +'Cut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8
+  +'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'
+  +#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3
+  +'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Comman'
+  +'d'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'C'
+  +'ommand'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1
+  +#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C'
+  +'`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCu'
+  +'t'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'Sh'
+  +'ortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#11'DiffSynEdit'#0#8'ReadOnly'#9#6'C'
+  ,'ursor'#7#7'crIBeam'#4'Left'#2#6#6'Height'#3#159#0#3'Top'#2'a'#5'Width'#3'L'
+  +#2#0#0#9'TSplitter'#8'Splitter'#5'Align'#7#5'alTop'#6'Cursor'#7#8'crVSplit'#6
+  +'Height'#2#5#5'Width'#3'X'#2#12'ResizeAnchor'#7#5'akTop'#6'Cursor'#7#8'crVSp'
+  +'lit'#6'Height'#2#5#3'Top'#2'\'#5'Width'#3'X'#2#0#0#0
 ]);