diff --git a/ide/frames/options_editor_color.lfm b/ide/frames/options_editor_color.lfm
index f0829742e5..169bc1c388 100644
--- a/ide/frames/options_editor_color.lfm
+++ b/ide/frames/options_editor_color.lfm
@@ -3,10 +3,9 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
   Width = 531
   ClientHeight = 577
   ClientWidth = 531
-  TabOrder = 0
   Visible = False
-  DesignLeft = 176
-  DesignTop = 232
+  DesignLeft = 88
+  DesignTop = 116
   object FileExtensionsLabel: TLabel[0]
     AnchorSideLeft.Control = FileExtensionsComboBox
     AnchorSideLeft.Side = asrBottom
@@ -597,7 +596,6 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
     ParentFont = False
     TabOrder = 5
     BookMarkOptions.Xoffset = 30
-    BookMarkOptions.OnChange = nil
     Gutter.ShowCodeFolding = True
     Gutter.ShowChanges = True
     Gutter.ShowLineNumbers = True
@@ -926,6 +924,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
     Lines.Strings = (
       'ColorPreview'
     )
+    SelectedColor.OnChange = nil
     BracketHighlightStyle = sbhsBoth
   end
   object UseSyntaxHighlightCheckBox: TCheckBox[10]
diff --git a/ide/frames/options_editor_color.lrs b/ide/frames/options_editor_color.lrs
index 78daad8e6a..db78765a4a 100644
--- a/ide/frames/options_editor_color.lrs
+++ b/ide/frames/options_editor_color.lrs
@@ -2,94 +2,94 @@
 
 LazarusResources.Add('TEditorColorOptionsFrame','FORMDATA',[
   'TPF0'#241#24'TEditorColorOptionsFrame'#23'EditorColorOptionsFrame'#6'Height'
-  +#3'A'#2#5'Width'#3#19#2#12'ClientHeight'#3'A'#2#11'ClientWidth'#3#19#2#8'Tab'
-  +'Order'#2#0#7'Visible'#8#10'DesignLeft'#3#176#0#9'DesignTop'#3#232#0#0#242#2
-  +#0#6'TLabel'#19'FileExtensionsLabel'#22'AnchorSideLeft.Control'#7#22'FileExt'
-  +'ensionsComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Co'
-  +'ntrol'#7#22'FileExtensionsComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4
-  +'Left'#3#206#0#6'Height'#2#14#3'Top'#2'3'#5'Width'#2'^'#18'BorderSpacing.Lef'
-  +'t'#2#6#7'Caption'#6#19'FileExtensionsLabel'#11'ParentColor'#8#0#0#242#2#1#6
-  +'TLabel'#16'ColorSchemeLabel'#22'AnchorSideLeft.Control'#7#19'ColorSchemeCom'
-  +'boBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19
-  +'ColorSchemeComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#206#0#6
-  +'Height'#2#14#3'Top'#2#27#5'Width'#2'X'#18'BorderSpacing.Left'#2#6#7'Caption'
-  +#6#16'ColorSchemeLabel'#11'ParentColor'#8#0#0#242#2#2#6'TLabel'#13'LanguageL'
-  +'abel'#22'AnchorSideLeft.Control'#7#16'LanguageComboBox'#19'AnchorSideLeft.S'
-  +'ide'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#16'LanguageComboBox'#18'Anc'
-  +'horSideTop.Side'#7#9'asrCenter'#4'Left'#3#206#0#6'Height'#2#14#3'Top'#2#3#5
-  +'Width'#2'I'#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#7'Captio'
-  +'n'#6#13'LanguageLabel'#11'ParentColor'#8#0#0#242#2#3#6'TLabel'#12'BracketLa'
-  +'bel'#22'AnchorSideLeft.Control'#7#12'BracketCombo'#19'AnchorSideLeft.Side'#7
-  +#9'asrBottom'#24'AnchorSideBottom.Control'#7#12'BracketCombo'#21'AnchorSideB'
-  +'ottom.Side'#7#9'asrCenter'#4'Left'#3#170#1#6'Height'#2#14#3'Top'#2#27#5'Wid'
-  +'th'#2'>'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6
-  +#7'Caption'#6#12'BracketLabel'#11'ParentColor'#8#8'WordWrap'#9#0#0#242#2#4#9
-  +'TComboBox'#16'LanguageComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'An'
-  +'chorSideTop.Control'#7#5'Owner'#4'Left'#2#0#6'Height'#2#21#3'Top'#2#0#5'Wid'
-  +'th'#3#200#0#12'AutoComplete'#8#5'Ctl3D'#8#10'ItemHeight'#2#13#9'ItemWidth'#2
-  +#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKey'
-  +'Down'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#0#4'Text'#6#16'LanguageComboBox'
-  +#0#0#242#2#5#9'TComboBox'#19'ColorSchemeComboBox'#22'AnchorSideLeft.Control'
-  +#7#5'Owner'#21'AnchorSideTop.Control'#7#16'LanguageComboBox'#18'AnchorSideTo'
-  +'p.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#21#3'Top'#2#24#5'Width'#3#200
-  +#0#12'AutoComplete'#8#17'BorderSpacing.Top'#2#3#5'Ctl3D'#8#10'ItemHeight'#2
-  +#13#9'ItemWidth'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'Combo'
-  +'BoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#1#4'Text'#6#19
-  +'ColorSchemeComboBox'#0#0#242#2#6#9'TComboBox'#22'FileExtensionsComboBox'#22
-  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#19'ColorSche'
-  +'meComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#21
-  +#3'Top'#2'0'#5'Width'#3#200#0#12'AutoComplete'#8#17'BorderSpacing.Top'#2#3#5
-  +'Ctl3D'#8#10'ItemHeight'#2#13#13'Items.Strings'#1#6#26'pp;pas;inc;lpr;lrs;dp'
-  +'r;dpk'#6#18'pp;pas;inc;lpr;lrs'#6#10'pp;pas;inc'#0#9'ItemWidth'#2#0#8'OnCha'
-  +'nge'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17
-  +'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0#242#2#7#7'TButton'#31'SetAllAttribut'
-  +'esToDefaultButton'#22'AnchorSideLeft.Control'#7#19'FileExtensionsLabel'#19
-  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#22'FileExte'
-  +'nsionsComboBox'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.S'
-  +'ide'#7#9'asrBottom'#4'Left'#3'@'#1#6'Height'#2#25#3'Top'#2'0'#5'Width'#3#211
-  +#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#20
-  +#7'Caption'#6#31'SetAllAttributesToDefaultButton'#7'OnClick'#7'$SetAllAttrib'
-  +'utesToDefaultButtonClick'#8'TabOrder'#2#3#0#0#242#2#8#9'TGroupBox'#25'Eleme'
-  +'ntAttributesGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTo'
-  +'p.Control'#7#22'FileExtensionsComboBox'#18'AnchorSideTop.Side'#7#9'asrBotto'
-  +'m'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrB'
-  +'ottom'#24'AnchorSideBottom.Control'#7#19'ColorElementListBox'#21'AnchorSide'
-  +'Bottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#244#0#3'Top'#2'K'#5'Wid'
-  +'th'#3#19#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#17'B'
-  +'orderSpacing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#25'BorderSpacing.InnerBo'
-  +'rder'#2#6#7'Caption'#6#10'Attributes'#12'ClientHeight'#3#226#0#11'ClientWid'
-  +'th'#3#15#2#5'Ctl3D'#8#8'TabOrder'#2#4#0#6'TLabel'#15'ForeGroundLabel'#22'An'
-  +'chorSideLeft.Control'#7#19'ColorElementListBox'#19'AnchorSideLeft.Side'#7#9
-  +'asrBottom'#21'AnchorSideTop.Control'#7#27'SetAttributeToDefaultButton'#18'A'
-  +'nchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#14#3'Top'#2'%'
-  +#5'Width'#2'S'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Captio'
-  +'n'#6#15'ForeGroundLabel'#11'ParentColor'#8#0#0#6'TLabel'#15'BackGroundLabel'
-  +#22'AnchorSideLeft.Control'#7#19'ColorElementListBox'#19'AnchorSideLeft.Side'
-  ,#7#9'asrBottom'#21'AnchorSideTop.Control'#7#18'ForegroundColorBox'#18'Anchor'
-  +'SideTop.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#14#3'Top'#2'N'#5'W'
-  +'idth'#2'S'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#7'Caption'#6
-  +#15'BackGroundLabel'#11'ParentColor'#8#0#0#6'TLabel'#15'FrameColorLabel'#22
-  +'AnchorSideLeft.Control'#7#19'ColorElementListBox'#19'AnchorSideLeft.Side'#7
-  +#9'asrBottom'#21'AnchorSideTop.Control'#7#18'BackGroundColorBox'#18'AnchorSi'
-  +'deTop.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#14#3'Top'#2'w'#5'Wid'
-  +'th'#2'Q'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#7'Caption'#6
-  +#15'FrameColorLabel'#11'ParentColor'#8#0#0#8'TListBox'#19'ColorElementListBo'
-  +'x'#22'AnchorSideLeft.Control'#7#25'ElementAttributesGroupBox'#21'AnchorSide'
-  +'Top.Control'#7#25'ElementAttributesGroupBox'#24'AnchorSideBottom.Control'#7
-  +#18'TextItalicCheckBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6
-  +#6'Height'#3#214#0#3'Top'#2#6#5'Width'#3#200#0#7'Anchors'#11#5'akTop'#6'akLe'
-  +'ft'#8'akBottom'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'B'
-  +'orderSpacing.Right'#2#6#16'ClickOnSelChange'#8#10'ItemHeight'#2#0#7'OnClick'
-  +#7#24'ColorElementListBoxClick'#17'OnSelectionChange'#7'"ColorElementListBox'
-  +'SelectionChange'#8'TabOrder'#2#11#8'TopIndex'#2#0#0#0#9'TCheckBox'#28'ForeG'
-  +'roundUseDefaultCheckBox'#22'AnchorSideLeft.Control'#7#18'BackGroundColorBox'
-  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#18'Foreg'
-  +'roundColorBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'>'#1#6'Heigh'
-  +'t'#2#19#3'Top'#2'7'#5'Width'#3#183#0#18'BorderSpacing.Left'#2#6#7'Caption'#6
-  +#28'ForeGroundUseDefaultCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8
-  +'TabOrder'#2#0#11'UseOnChange'#8#0#0#9'TCheckBox'#28'BackGroundUseDefaultChe'
-  +'ckBox'#22'AnchorSideLeft.Control'#7#18'BackGroundColorBox'#19'AnchorSideLef'
-  +'t.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#18'BackGroundColorBox'#18
+  +#3'A'#2#5'Width'#3#19#2#12'ClientHeight'#3'A'#2#11'ClientWidth'#3#19#2#7'Vis'
+  +'ible'#8#10'DesignLeft'#2'X'#9'DesignTop'#2't'#0#242#2#0#6'TLabel'#19'FileEx'
+  +'tensionsLabel'#22'AnchorSideLeft.Control'#7#22'FileExtensionsComboBox'#19'A'
+  +'nchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#22'FileExten'
+  +'sionsComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#206#0#6'Heig'
+  +'ht'#2#14#3'Top'#2'3'#5'Width'#2'^'#18'BorderSpacing.Left'#2#6#7'Caption'#6
+  +#19'FileExtensionsLabel'#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#16'ColorSch'
+  +'emeLabel'#22'AnchorSideLeft.Control'#7#19'ColorSchemeComboBox'#19'AnchorSid'
+  +'eLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'ColorSchemeComboB'
+  +'ox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#206#0#6'Height'#2#14#3
+  +'Top'#2#27#5'Width'#2'X'#18'BorderSpacing.Left'#2#6#7'Caption'#6#16'ColorSch'
+  +'emeLabel'#11'ParentColor'#8#0#0#242#2#2#6'TLabel'#13'LanguageLabel'#22'Anch'
+  +'orSideLeft.Control'#7#16'LanguageComboBox'#19'AnchorSideLeft.Side'#7#9'asrB'
+  +'ottom'#21'AnchorSideTop.Control'#7#16'LanguageComboBox'#18'AnchorSideTop.Si'
+  +'de'#7#9'asrCenter'#4'Left'#3#206#0#6'Height'#2#14#3'Top'#2#3#5'Width'#2'I'
+  +#18'BorderSpacing.Left'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#13'Lang'
+  +'uageLabel'#11'ParentColor'#8#0#0#242#2#3#6'TLabel'#12'BracketLabel'#22'Anch'
+  +'orSideLeft.Control'#7#12'BracketCombo'#19'AnchorSideLeft.Side'#7#9'asrBotto'
+  +'m'#24'AnchorSideBottom.Control'#7#12'BracketCombo'#21'AnchorSideBottom.Side'
+  +#7#9'asrCenter'#4'Left'#3#170#1#6'Height'#2#14#3'Top'#2#27#5'Width'#2'>'#7'A'
+  +'nchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#12'BracketLabel'#11'ParentColor'#8#8'WordWrap'#9#0#0#242#2#4#9'TComboBox'#16
+  +'LanguageComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Co'
+  +'ntrol'#7#5'Owner'#4'Left'#2#0#6'Height'#2#21#3'Top'#2#0#5'Width'#3#200#0#12
+  +'AutoComplete'#8#5'Ctl3D'#8#10'ItemHeight'#2#13#9'ItemWidth'#2#0#8'OnChange'
+  +#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'Com'
+  +'boBoxOnKeyDown'#8'TabOrder'#2#0#4'Text'#6#16'LanguageComboBox'#0#0#242#2#5#9
+  +'TComboBox'#19'ColorSchemeComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+  +'AnchorSideTop.Control'#7#16'LanguageComboBox'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#4'Left'#2#0#6'Height'#2#21#3'Top'#2#24#5'Width'#3#200#0#12'AutoCom'
+  +'plete'#8#17'BorderSpacing.Top'#2#3#5'Ctl3D'#8#10'ItemHeight'#2#13#9'ItemWid'
+  +'th'#2#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9
+  +'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#1#4'Text'#6#19'ColorScheme'
+  +'ComboBox'#0#0#242#2#6#9'TComboBox'#22'FileExtensionsComboBox'#22'AnchorSide'
+  +'Left.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#19'ColorSchemeComboBox'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#21#3'Top'#2'0'
+  +#5'Width'#3#200#0#12'AutoComplete'#8#17'BorderSpacing.Top'#2#3#5'Ctl3D'#8#10
+  +'ItemHeight'#2#13#13'Items.Strings'#1#6#26'pp;pas;inc;lpr;lrs;dpr;dpk'#6#18
+  +'pp;pas;inc;lpr;lrs'#6#10'pp;pas;inc'#0#9'ItemWidth'#2#0#8'OnChange'#7#16'Co'
+  +'mboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOn'
+  +'KeyDown'#8'TabOrder'#2#2#0#0#242#2#7#7'TButton'#31'SetAllAttributesToDefaul'
+  +'tButton'#22'AnchorSideLeft.Control'#7#19'FileExtensionsLabel'#19'AnchorSide'
+  +'Left.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#22'FileExtensionsComb'
+  +'oBox'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'a'
+  +'srBottom'#4'Left'#3'@'#1#6'Height'#2#25#3'Top'#2'0'#5'Width'#3#211#0#7'Anch'
+  +'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#20#7'Capti'
+  +'on'#6#31'SetAllAttributesToDefaultButton'#7'OnClick'#7'$SetAllAttributesToD'
+  +'efaultButtonClick'#8'TabOrder'#2#3#0#0#242#2#8#9'TGroupBox'#25'ElementAttri'
+  +'butesGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Contr'
+  +'ol'#7#22'FileExtensionsComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'A'
+  +'nchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'
+  +#24'AnchorSideBottom.Control'#7#19'ColorElementListBox'#21'AnchorSideBottom.'
+  +'Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#244#0#3'Top'#2'K'#5'Width'#3#19
+  +#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#17'BorderSpac'
+  +'ing.Top'#2#6#20'BorderSpacing.Bottom'#2#6#25'BorderSpacing.InnerBorder'#2#6
+  +#7'Caption'#6#10'Attributes'#12'ClientHeight'#3#226#0#11'ClientWidth'#3#15#2
+  +#5'Ctl3D'#8#8'TabOrder'#2#4#0#6'TLabel'#15'ForeGroundLabel'#22'AnchorSideLef'
+  +'t.Control'#7#19'ColorElementListBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'
+  +#21'AnchorSideTop.Control'#7#27'SetAttributeToDefaultButton'#18'AnchorSideTo'
+  +'p.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#14#3'Top'#2'%'#5'Width'#2
+  +'S'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#15'For'
+  +'eGroundLabel'#11'ParentColor'#8#0#0#6'TLabel'#15'BackGroundLabel'#22'Anchor'
+  +'SideLeft.Control'#7#19'ColorElementListBox'#19'AnchorSideLeft.Side'#7#9'asr'
+  ,'Bottom'#21'AnchorSideTop.Control'#7#18'ForegroundColorBox'#18'AnchorSideTop'
+  +'.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#14#3'Top'#2'N'#5'Width'#2
+  +'S'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#7'Caption'#6#15'Bac'
+  +'kGroundLabel'#11'ParentColor'#8#0#0#6'TLabel'#15'FrameColorLabel'#22'Anchor'
+  +'SideLeft.Control'#7#19'ColorElementListBox'#19'AnchorSideLeft.Side'#7#9'asr'
+  +'Bottom'#21'AnchorSideTop.Control'#7#18'BackGroundColorBox'#18'AnchorSideTop'
+  +'.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#14#3'Top'#2'w'#5'Width'#2
+  +'Q'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#7'Caption'#6#15'Fra'
+  +'meColorLabel'#11'ParentColor'#8#0#0#8'TListBox'#19'ColorElementListBox'#22
+  +'AnchorSideLeft.Control'#7#25'ElementAttributesGroupBox'#21'AnchorSideTop.Co'
+  +'ntrol'#7#25'ElementAttributesGroupBox'#24'AnchorSideBottom.Control'#7#18'Te'
+  +'xtItalicCheckBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'He'
+  +'ight'#3#214#0#3'Top'#2#6#5'Width'#3#200#0#7'Anchors'#11#5'akTop'#6'akLeft'#8
+  +'akBottom'#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderS'
+  +'pacing.Right'#2#6#16'ClickOnSelChange'#8#10'ItemHeight'#2#0#7'OnClick'#7#24
+  +'ColorElementListBoxClick'#17'OnSelectionChange'#7'"ColorElementListBoxSelec'
+  +'tionChange'#8'TabOrder'#2#11#8'TopIndex'#2#0#0#0#9'TCheckBox'#28'ForeGround'
+  +'UseDefaultCheckBox'#22'AnchorSideLeft.Control'#7#18'BackGroundColorBox'#19
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#18'Foregrou'
+  +'ndColorBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'>'#1#6'Height'#2
+  +#19#3'Top'#2'7'#5'Width'#3#183#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#28
+  +'ForeGroundUseDefaultCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'T'
+  +'abOrder'#2#0#11'UseOnChange'#8#0#0#9'TCheckBox'#28'BackGroundUseDefaultChec'
+  +'kBox'#22'AnchorSideLeft.Control'#7#18'BackGroundColorBox'#19'AnchorSideLeft'
+  +'.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#18'BackGroundColorBox'#18
   +'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'>'#1#6'Height'#2#19#3'Top'#2'`'
   +#5'Width'#3#183#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#28'BackGroundUseDe'
   +'faultCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#1#11
@@ -217,57 +217,57 @@ LazarusResources.Add('TEditorColorOptionsFrame','FORMDATA',[
   +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#18'CFDividerDrawLevel'#2
   +#0#5'Ctl3D'#8#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#10'Font.Pitch'
   +#7#7'fpFixed'#12'Font.Quality'#7#16'fqNonAntialiased'#11'ParentColor'#8#10'P'
-  +'arentFont'#8#8'TabOrder'#2#5#23'BookMarkOptions.Xoffset'#2#30#24'BookMarkOp'
-  +'tions.OnChange'#13#22'Gutter.ShowCodeFolding'#9#18'Gutter.ShowChanges'#9#22
-  +'Gutter.ShowLineNumbers'#9#16'Gutter.ZeroStart'#8#10'Keystrokes'#14#1#7'Comm'
-  +'and'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Comma'
-  +'nd'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Com'
-  +'mand'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#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'C'
-  +'ommand'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'C'
-  +'ommand'#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'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'C'
-  +'ommand'#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'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'C'
-  +'ommand'#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'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'C'
-  +'ommand'#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'ShortCu'
-  +'t'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'S'
-  +'hortCut'#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'Command'#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'Short'
-  +'Cut'#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'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Comm'
-  +'and'#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'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'Short'
-  +'Cut'#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'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Comman'
-  ,'d'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'C'
-  +'ommand'#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'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#12
-  +'ColorPreview'#0#21'BracketHighlightStyle'#7#8'sbhsBoth'#0#0#242#2#10#9'TChe'
-  +'ckBox'#26'UseSyntaxHighlightCheckBox'#22'AnchorSideLeft.Control'#7#31'SetAl'
-  +'lAttributesToDefaultButton'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorS'
-  +'ideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
-  +#3'@'#1#6'Height'#2#19#3'Top'#2#0#5'Width'#3#166#0#7'Caption'#6#26'UseSyntax'
-  +'HighlightCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#6
+  +'arentFont'#8#8'TabOrder'#2#5#23'BookMarkOptions.Xoffset'#2#30#22'Gutter.Sho'
+  +'wCodeFolding'#9#18'Gutter.ShowChanges'#9#22'Gutter.ShowLineNumbers'#9#16'Gu'
+  +'tter.ZeroStart'#8#10'Keystrokes'#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'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7
+  +'Command'#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#12'ColorPreview'#0#22'SelectedColor'
+  +'.OnChange'#13#21'BracketHighlightStyle'#7#8'sbhsBoth'#0#0#242#2#10#9'TCheck'
+  +'Box'#26'UseSyntaxHighlightCheckBox'#22'AnchorSideLeft.Control'#7#31'SetAllA'
+  +'ttributesToDefaultButton'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSid'
+  +'eRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3
+  +'@'#1#6'Height'#2#19#3'Top'#2#0#5'Width'#3#166#0#7'Caption'#6#26'UseSyntaxHi'
+  +'ghlightCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#6
   +#11'UseOnChange'#8#0#0#242#2#11#9'TComboBox'#12'BracketCombo'#22'AnchorSideL'
   +'eft.Control'#7#26'UseSyntaxHighlightCheckBox'#21'AnchorSideTop.Control'#7#19
   +'ColorSchemeComboBox'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideB'
diff --git a/ide/frames/options_editor_color.pas b/ide/frames/options_editor_color.pas
index 09601cf81a..ca5be3063e 100644
--- a/ide/frames/options_editor_color.pas
+++ b/ide/frames/options_editor_color.pas
@@ -123,7 +123,6 @@ type
     procedure OnSpecialLineMarkup(Sender: TObject; Line: Integer;
       var Special: boolean; aMarkup: TSynSelectedColor);
 
-
     function GeneralPage: TEditorGeneralOptionsFrame; inline;
   public
     destructor Destroy; override;
@@ -153,7 +152,6 @@ begin
     Result := AColor;
 end;
 
-
 { TEditorColorOptionsFrame }
 
 procedure TEditorColorOptionsFrame.ColorElementListBoxClick(Sender: TObject);
@@ -957,10 +955,7 @@ begin
   BracketCombo.Items.Add(gldHighlightBothSidesOfCursor);
 
   with GeneralPage do
-  begin
-    SetLength(PreviewEdits, Length(PreviewEdits) + 1);
-    PreviewEdits[Length(PreviewEdits)-1] := ColorPreview;
-  end;
+    AddPreviewEdit(ColorPreview);
 end;
 
 procedure TEditorColorOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
diff --git a/ide/frames/options_editor_display.lfm b/ide/frames/options_editor_display.lfm
index 8cc87870a6..4552d2bb96 100644
--- a/ide/frames/options_editor_display.lfm
+++ b/ide/frames/options_editor_display.lfm
@@ -3,10 +3,9 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
   Width = 501
   ClientHeight = 441
   ClientWidth = 501
-  TabOrder = 0
   Visible = False
-  DesignLeft = 176
-  DesignTop = 232
+  DesignLeft = 88
+  DesignTop = 116
   object MarginAndGutterGroupBox: TGroupBox[0]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
@@ -16,7 +15,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
     Height = 128
     Top = 0
     Width = 501
-    HelpContext = 0
     Align = alTop
     AutoSize = True
     Caption = 'MarginAndGutterGroupBox'
@@ -33,7 +31,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 14
       Top = 9
       Width = 83
-      HelpContext = 0
       BorderSpacing.Left = 6
       Caption = 'RightMarginLabel'
       ParentColor = False
@@ -46,7 +43,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 14
       Top = 85
       Width = 110
-      HelpContext = 0
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
       Caption = 'Every n-th line number'
@@ -59,7 +55,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 19
       Top = 6
       Width = 159
-      HelpContext = 0
       BorderSpacing.Around = 6
       Caption = 'VisibleRightMarginCheckBox'
       OnChange = GeneralCheckBoxOnChange
@@ -74,7 +69,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 19
       Top = 31
       Width = 133
-      HelpContext = 0
       BorderSpacing.Around = 6
       Caption = 'VisibleGutterCheckBox'
       OnChange = GeneralCheckBoxOnChange
@@ -89,7 +83,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 19
       Top = 56
       Width = 160
-      HelpContext = 0
       BorderSpacing.Around = 6
       Caption = 'ShowLineNumbersCheckBox'
       OnChange = GeneralCheckBoxOnChange
@@ -105,7 +98,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 21
       Top = 6
       Width = 100
-      HelpContext = 0
       AutoComplete = False
       BorderSpacing.Left = 50
       BorderSpacing.Around = 6
@@ -131,7 +123,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 23
       Top = 81
       Width = 54
-      HelpContext = 0
       BorderSpacing.Around = 6
       MinValue = 1
       OnChange = GeneralCheckBoxOnChange
@@ -148,7 +139,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
     Height = 105
     Top = 134
     Width = 501
-    HelpContext = 0
     Align = alTop
     AutoSize = True
     BorderSpacing.Top = 6
@@ -166,7 +156,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 14
       Top = 36
       Width = 107
-      HelpContext = 0
       BorderSpacing.Around = 6
       Caption = 'EditorFontHeightLabel'
       ParentColor = False
@@ -180,7 +169,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 14
       Top = 36
       Width = 108
-      HelpContext = 0
       BorderSpacing.Around = 6
       Caption = 'ExtraLineSpacingLabel'
       ParentColor = False
@@ -194,7 +182,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 14
       Top = 63
       Width = 112
-      HelpContext = 0
       BorderSpacing.Around = 6
       Caption = 'ExtraCharSpacingLabel'
       ParentColor = False
@@ -207,7 +194,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 21
       Top = 6
       Width = 458
-      HelpContext = 0
       Anchors = [akTop, akLeft, akRight]
       AutoComplete = False
       BorderSpacing.Left = 6
@@ -230,7 +216,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 21
       Top = 6
       Width = 25
-      HelpContext = 0
       Anchors = [akTop, akRight, akBottom]
       BorderSpacing.Right = 6
       Caption = '...'
@@ -245,7 +230,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 21
       Top = 33
       Width = 100
-      HelpContext = 0
       AutoComplete = False
       BorderSpacing.Around = 6
       Ctl3D = False
@@ -275,7 +259,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 21
       Top = 33
       Width = 100
-      HelpContext = 0
       AutoComplete = False
       BorderSpacing.Left = 20
       BorderSpacing.Around = 6
@@ -299,7 +282,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 21
       Top = 60
       Width = 100
-      HelpContext = 0
       AutoComplete = False
       BorderSpacing.Bottom = 6
       Ctl3D = False
@@ -322,7 +304,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       Height = 21
       Top = 60
       Width = 161
-      HelpContext = 0
       Anchors = [akTop, akLeft, akBottom]
       BorderSpacing.Around = 6
       Caption = 'DisableAntialiasingCheckBox'
@@ -342,7 +323,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
     Height = 196
     Top = 245
     Width = 501
-    HelpContext = 0
     Align = alClient
     BorderSpacing.Top = 6
     CFDividerDrawLevel = 0
@@ -351,16 +331,15 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
     Font.Name = 'courier'
     Font.Pitch = fpFixed
     Font.Quality = fqNonAntialiased
-    Font.Style = []
     ParentColor = False
     ParentFont = False
     TabOrder = 2
     BookMarkOptions.Xoffset = 30
+    BookMarkOptions.OnChange = nil
     Gutter.ShowCodeFolding = True
     Gutter.ShowChanges = True
     Gutter.ShowLineNumbers = True
     Gutter.ZeroStart = False
-    Gutter.DigitCount = 2
     Keystrokes = <    
       item
         Command = 3
@@ -686,7 +665,6 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
       'DisplayPreview'
     )
     ReadOnly = True
-    SelectedColor.OnChange = nil
     BracketHighlightStyle = sbhsBoth
   end
 end
diff --git a/ide/frames/options_editor_display.lrs b/ide/frames/options_editor_display.lrs
index 5f52142113..ee6978246e 100644
--- a/ide/frames/options_editor_display.lrs
+++ b/ide/frames/options_editor_display.lrs
@@ -3,169 +3,164 @@
 LazarusResources.Add('TEditorDisplayOptionsFrame','FORMDATA',[
   'TPF0'#241#26'TEditorDisplayOptionsFrame'#25'EditorDisplayOptionsFrame'#6'Hei'
   +'ght'#3#185#1#5'Width'#3#245#1#12'ClientHeight'#3#185#1#11'ClientWidth'#3#245
-  +#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3#176#0#9'DesignTop'#3#232#0#0
-  +#242#2#0#9'TGroupBox'#23'MarginAndGutterGroupBox'#22'AnchorSideLeft.Control'
-  +#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'
-  +#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3
-  +#128#0#3'Top'#2#0#5'Width'#3#245#1#11'HelpContext'#2#0#5'Align'#7#5'alTop'#8
-  +'AutoSize'#9#7'Caption'#6#23'MarginAndGutterGroupBox'#12'ClientHeight'#2'n'
-  +#11'ClientWidth'#3#241#1#5'Ctl3D'#8#8'TabOrder'#2#0#0#6'TLabel'#16'RightMarg'
-  +'inLabel'#22'AnchorSideLeft.Control'#7#19'RightMarginComboBox'#19'AnchorSide'
-  +'Left.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'RightMarginComboBo'
-  +'x'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'R'#1#6'Height'#2#14#3'To'
-  +'p'#2#9#5'Width'#2'S'#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#7'Capti'
-  +'on'#6#16'RightMarginLabel'#11'ParentColor'#8#0#0#6'TLabel#ShowOnlyLineNumbe'
-  +'rsMultiplesOfLabel'#22'AnchorSideLeft.Control'#7#23'MarginAndGutterGroupBox'
-  +#21'AnchorSideTop.Control'#7'&ShowOnlyLineNumbersMultiplesOfSpinEdit'#18'Anc'
-  +'horSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'U'#5'Wi'
-  +'dth'#2'n'#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.T'
-  +'op'#2#6#7'Caption'#6#22'Every n-th line number'#11'ParentColor'#8#0#0#9'TCh'
-  +'eckBox'#26'VisibleRightMarginCheckBox'#22'AnchorSideLeft.Control'#7#23'Marg'
-  +'inAndGutterGroupBox'#21'AnchorSideTop.Control'#7#23'MarginAndGutterGroupBox'
-  +#4'Left'#2#6#6'Height'#2#19#3'Top'#2#6#5'Width'#3#159#0#11'HelpContext'#2#0
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#26'VisibleRightMarginCheckBox'#8
-  +'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#11'UseOnChange'#8#0
-  +#0#9'TCheckBox'#21'VisibleGutterCheckBox'#22'AnchorSideLeft.Control'#7#23'Ma'
-  +'rginAndGutterGroupBox'#21'AnchorSideTop.Control'#7#26'VisibleRightMarginChe'
-  +'ckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'T'
-  +'op'#2#31#5'Width'#3#133#0#11'HelpContext'#2#0#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#21'VisibleGutterCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChan'
-  +'ge'#8'TabOrder'#2#1#11'UseOnChange'#8#0#0#9'TCheckBox'#23'ShowLineNumbersCh'
-  +'eckBox'#22'AnchorSideLeft.Control'#7#23'MarginAndGutterGroupBox'#21'AnchorS'
-  +'ideTop.Control'#7#21'VisibleGutterCheckBox'#18'AnchorSideTop.Side'#7#9'asrB'
-  +'ottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'8'#5'Width'#3#160#0#11'HelpConte'
-  +'xt'#2#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'ShowLineNumbersCheckBo'
-  +'x'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#7'OnClick'#7#28'ShowLineNumber'
-  +'sCheckBoxClick'#8'TabOrder'#2#2#11'UseOnChange'#8#0#0#9'TComboBox'#19'Right'
-  +'MarginComboBox'#22'AnchorSideLeft.Control'#7'&ShowOnlyLineNumbersMultiplesO'
-  +'fSpinEdit'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'
-  +#7#23'MarginAndGutterGroupBox'#4'Left'#3#232#0#6'Height'#2#21#3'Top'#2#6#5'W'
-  +'idth'#2'd'#11'HelpContext'#2#0#12'AutoComplete'#8#18'BorderSpacing.Left'#2
-  +'2'#20'BorderSpacing.Around'#2#6#5'Ctl3D'#8#10'ItemHeight'#2#13#13'Items.Str'
-  +'ings'#1#6#2'80'#6#2'78'#6#2'76'#0#9'ItemWidth'#2#0#8'OnChange'#7#16'Combobo'
-  +'xOnChange'#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDo'
-  +'wn'#8'TabOrder'#2#3#0#0#9'TSpinEdit&ShowOnlyLineNumbersMultiplesOfSpinEdit'
-  +#22'AnchorSideLeft.Control'#7'#ShowOnlyLineNumbersMultiplesOfLabel'#19'Ancho'
-  +'rSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'ShowLineNumbe'
-  +'rsCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'z'#6'Height'#2
-  +#23#3'Top'#2'Q'#5'Width'#2'6'#11'HelpContext'#2#0#20'BorderSpacing.Around'#2
-  +#6#8'MinValue'#2#1#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#4
-  +#5'Value'#2#1#0#0#0#242#2#1#9'TGroupBox'#18'EditorFontGroupBox'#22'AnchorSid'
-  +'eLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#23'MarginAndGutterGro'
-  +'upBox'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9
-  +'asrBottom'#4'Left'#2#0#6'Height'#2'i'#3'Top'#3#134#0#5'Width'#3#245#1#11'He'
-  +'lpContext'#2#0#5'Align'#7#5'alTop'#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#7
-  +'Caption'#6#18'EditorFontGroupBox'#12'ClientHeight'#2'W'#11'ClientWidth'#3
-  +#241#1#5'Ctl3D'#8#8'TabOrder'#2#1#0#6'TLabel'#21'EditorFontHeightLabel'#22'A'
-  +'nchorSideLeft.Control'#7#24'EditorFontHeightComboBox'#19'AnchorSideLeft.Sid'
-  +'e'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'EditorFontHeightComboBox'
-  +#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Height'#2#14#3'Top'#2
-  +'$'#5'Width'#2'k'#11'HelpContext'#2#0#20'BorderSpacing.Around'#2#6#7'Caption'
-  +#6#21'EditorFontHeightLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'ExtraLineSpa'
-  +'cingLabel'#22'AnchorSideLeft.Control'#7#24'ExtraLineSpacingComboBox'#19'Anc'
-  +'horSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'ExtraLineSp'
-  +'acingComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'_'#1#6'Heigh'
-  ,'t'#2#14#3'Top'#2'$'#5'Width'#2'l'#11'HelpContext'#2#0#20'BorderSpacing.Arou'
-  +'nd'#2#6#7'Caption'#6#21'ExtraLineSpacingLabel'#11'ParentColor'#8#0#0#6'TLab'
-  +'el'#21'ExtraCharSpacingLabel'#22'AnchorSideLeft.Control'#7#24'ExtraCharSpac'
-  +'ingComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contro'
-  +'l'#7#24'ExtraCharSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'L'
-  +'eft'#3'_'#1#6'Height'#2#14#3'Top'#2'?'#5'Width'#2'p'#11'HelpContext'#2#0#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#21'ExtraCharSpacingLabel'#11'ParentC'
-  +'olor'#8#0#0#9'TComboBox'#18'EditorFontComboBox'#22'AnchorSideLeft.Control'#7
-  +#18'EditorFontGroupBox'#21'AnchorSideTop.Control'#7#18'EditorFontGroupBox'#23
-  +'AnchorSideRight.Control'#7#16'EditorFontButton'#4'Left'#2#6#6'Height'#2#21#3
-  +'Top'#2#6#5'Width'#3#202#1#11'HelpContext'#2#0#7'Anchors'#11#5'akTop'#6'akLe'
-  +'ft'#7'akRight'#0#12'AutoComplete'#8#18'BorderSpacing.Left'#2#6#17'BorderSpa'
-  +'cing.Top'#2#6#19'BorderSpacing.Right'#2#2#5'Ctl3D'#8#10'ItemHeight'#2#13#9
-  +'ItemWidth'#2#0#13'OnEditingDone'#7#29'EditorFontComboBoxEditingDone'#8'TabO'
-  +'rder'#2#0#4'Text'#6#18'EditorFontComboBox'#0#0#7'TButton'#16'EditorFontButt'
-  +'on'#21'AnchorSideTop.Control'#7#18'EditorFontComboBox'#23'AnchorSideRight.C'
-  +'ontrol'#7#18'EditorFontGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#24
-  +'AnchorSideBottom.Control'#7#18'EditorFontComboBox'#21'AnchorSideBottom.Side'
-  +#7#9'asrBottom'#4'Left'#3#210#1#6'Height'#2#21#3'Top'#2#6#5'Width'#2#25#11'H'
-  +'elpContext'#2#0#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#19'BorderSp'
-  +'acing.Right'#2#6#7'Caption'#6#3'...'#7'OnClick'#7#21'EditorFontButtonClick'
-  +#8'TabOrder'#2#1#0#0#9'TComboBox'#24'EditorFontHeightComboBox'#22'AnchorSide'
-  +'Left.Control'#7#18'EditorFontGroupBox'#21'AnchorSideTop.Control'#7#18'Edito'
-  +'rFontComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
-  +#21#3'Top'#2'!'#5'Width'#2'd'#11'HelpContext'#2#0#12'AutoComplete'#8#20'Bord'
-  +'erSpacing.Around'#2#6#5'Ctl3D'#8#10'ItemHeight'#2#13#13'Items.Strings'#1#6#2
-  +'10'#6#2'11'#6#2'12'#6#2'13'#6#2'14'#6#2'15'#6#2'16'#6#2'17'#6#2'18'#0#9'Ite'
-  +'mWidth'#2#0#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyD'
-  +'own'#8'TabOrder'#2#2#0#0#9'TComboBox'#24'ExtraLineSpacingComboBox'#22'Ancho'
-  +'rSideLeft.Control'#7#21'EditorFontHeightLabel'#19'AnchorSideLeft.Side'#7#9
-  +'asrBottom'#21'AnchorSideTop.Control'#7#18'EditorFontComboBox'#18'AnchorSide'
-  +'Top.Side'#7#9'asrBottom'#4'Left'#3#245#0#6'Height'#2#21#3'Top'#2'!'#5'Width'
-  +#2'd'#11'HelpContext'#2#0#12'AutoComplete'#8#18'BorderSpacing.Left'#2#20#20
+  +#1#7'Visible'#8#10'DesignLeft'#2'X'#9'DesignTop'#2't'#0#242#2#0#9'TGroupBox'
+  +#23'MarginAndGutterGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anchor'
+  +'SideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'#20'Ancho'
+  +'rSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#128#0#3'Top'#2#0#5
+  +'Width'#3#245#1#5'Align'#7#5'alTop'#8'AutoSize'#9#7'Caption'#6#23'MarginAndG'
+  +'utterGroupBox'#12'ClientHeight'#2'n'#11'ClientWidth'#3#241#1#5'Ctl3D'#8#8'T'
+  +'abOrder'#2#0#0#6'TLabel'#16'RightMarginLabel'#22'AnchorSideLeft.Control'#7
+  +#19'RightMarginComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSid'
+  +'eTop.Control'#7#19'RightMarginComboBox'#18'AnchorSideTop.Side'#7#9'asrCente'
+  +'r'#4'Left'#3'R'#1#6'Height'#2#14#3'Top'#2#9#5'Width'#2'S'#18'BorderSpacing.'
+  +'Left'#2#6#7'Caption'#6#16'RightMarginLabel'#11'ParentColor'#8#0#0#6'TLabel#'
+  +'ShowOnlyLineNumbersMultiplesOfLabel'#22'AnchorSideLeft.Control'#7#23'Margin'
+  +'AndGutterGroupBox'#21'AnchorSideTop.Control'#7'&ShowOnlyLineNumbersMultiple'
+  +'sOfSpinEdit'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2#6#6'Height'#2
+  +#14#3'Top'#2'U'#5'Width'#2'n'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.To'
+  +'p'#2#6#7'Caption'#6#22'Every n-th line number'#11'ParentColor'#8#0#0#9'TChe'
+  +'ckBox'#26'VisibleRightMarginCheckBox'#22'AnchorSideLeft.Control'#7#23'Margi'
+  +'nAndGutterGroupBox'#21'AnchorSideTop.Control'#7#23'MarginAndGutterGroupBox'
+  +#4'Left'#2#6#6'Height'#2#19#3'Top'#2#6#5'Width'#3#159#0#20'BorderSpacing.Aro'
+  +'und'#2#6#7'Caption'#6#26'VisibleRightMarginCheckBox'#8'OnChange'#7#23'Gener'
+  +'alCheckBoxOnChange'#8'TabOrder'#2#0#11'UseOnChange'#8#0#0#9'TCheckBox'#21'V'
+  +'isibleGutterCheckBox'#22'AnchorSideLeft.Control'#7#23'MarginAndGutterGroupB'
+  +'ox'#21'AnchorSideTop.Control'#7#26'VisibleRightMarginCheckBox'#18'AnchorSid'
+  +'eTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#31#5'Width'#3
+  +#133#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'VisibleGutterCheckBox'#8
+  +'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#1#11'UseOnChange'#8#0
+  +#0#9'TCheckBox'#23'ShowLineNumbersCheckBox'#22'AnchorSideLeft.Control'#7#23
+  +'MarginAndGutterGroupBox'#21'AnchorSideTop.Control'#7#21'VisibleGutterCheckB'
+  +'ox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'
+  +#2'8'#5'Width'#3#160#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'ShowLine'
+  +'NumbersCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#7'OnClick'#7#28
+  +'ShowLineNumbersCheckBoxClick'#8'TabOrder'#2#2#11'UseOnChange'#8#0#0#9'TComb'
+  +'oBox'#19'RightMarginComboBox'#22'AnchorSideLeft.Control'#7'&ShowOnlyLineNum'
+  +'bersMultiplesOfSpinEdit'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSi'
+  +'deTop.Control'#7#23'MarginAndGutterGroupBox'#4'Left'#3#232#0#6'Height'#2#21
+  +#3'Top'#2#6#5'Width'#2'd'#12'AutoComplete'#8#18'BorderSpacing.Left'#2'2'#20
   +'BorderSpacing.Around'#2#6#5'Ctl3D'#8#10'ItemHeight'#2#13#13'Items.Strings'#1
-  +#6#1'0'#6#1'1'#6#1'2'#0#9'ItemWidth'#2#0#6'OnExit'#7#14'ComboboxOnExit'#9'On'
-  +'KeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#4#0#0#9'TComboBox'#24'ExtraC'
-  +'harSpacingComboBox'#22'AnchorSideLeft.Control'#7#24'ExtraLineSpacingComboBo'
-  +'x'#21'AnchorSideTop.Control'#7#24'ExtraLineSpacingComboBox'#18'AnchorSideTo'
-  +'p.Side'#7#9'asrBottom'#4'Left'#3#245#0#6'Height'#2#21#3'Top'#2'<'#5'Width'#2
-  +'d'#11'HelpContext'#2#0#12'AutoComplete'#8#20'BorderSpacing.Bottom'#2#6#5'Ct'
-  +'l3D'#8#10'ItemHeight'#2#13#13'Items.Strings'#1#6#1'0'#6#1'1'#6#1'2'#0#9'Ite'
-  +'mWidth'#2#0#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyD'
-  +'own'#8'TabOrder'#2#3#0#0#9'TCheckBox'#27'DisableAntialiasingCheckBox'#22'An'
-  +'chorSideLeft.Control'#7#18'EditorFontGroupBox'#21'AnchorSideTop.Control'#7
-  +#24'EditorFontHeightComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
-  +#6#6'Height'#2#21#3'Top'#2'<'#5'Width'#3#161#0#11'HelpContext'#2#0#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'
-  +#6#27'DisableAntialiasingCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'
-  +#8'TabOrder'#2#5#11'UseOnChange'#8#0#0#0#242#2#2#8'TSynEdit'#14'DisplayPrevi'
-  +'ew'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#18'Ed'
-  +'itorFontGroupBox'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight'
-  +'.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSide'
-  +'Bottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#196#0#3'Top'#3#245#0#5
-  +'Width'#3#245#1#11'HelpContext'#2#0#5'Align'#7#8'alClient'#17'BorderSpacing.'
-  +'Top'#2#6#18'CFDividerDrawLevel'#2#0#5'Ctl3D'#8#11'Font.Height'#2#240#9'Font'
-  +'.Name'#6#7'courier'#10'Font.Pitch'#7#7'fpFixed'#12'Font.Quality'#7#16'fqNon'
-  +'Antialiased'#10'Font.Style'#11#0#11'ParentColor'#8#10'ParentFont'#8#8'TabOr'
-  +'der'#2#2#23'BookMarkOptions.Xoffset'#2#30#22'Gutter.ShowCodeFolding'#9#18'G'
-  +'utter.ShowChanges'#9#22'Gutter.ShowLineNumbers'#9#16'Gutter.ZeroStart'#8#17
-  +'Gutter.DigitCount'#2#2#10'Keystrokes'#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'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0
-  +#1#7'Command'#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#14'DisplayPreview'#0#8'ReadOnly'#9
-  +#22'SelectedColor.OnChange'#13#21'BracketHighlightStyle'#7#8'sbhsBoth'#0#0#0
+  +#6#2'80'#6#2'78'#6#2'76'#0#9'ItemWidth'#2#0#8'OnChange'#7#16'ComboboxOnChang'
+  +'e'#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'Ta'
+  +'bOrder'#2#3#0#0#9'TSpinEdit&ShowOnlyLineNumbersMultiplesOfSpinEdit'#22'Anch'
+  +'orSideLeft.Control'#7'#ShowOnlyLineNumbersMultiplesOfLabel'#19'AnchorSideLe'
+  +'ft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'ShowLineNumbersCheck'
+  +'Box'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'z'#6'Height'#2#23#3'To'
+  +'p'#2'Q'#5'Width'#2'6'#20'BorderSpacing.Around'#2#6#8'MinValue'#2#1#8'OnChan'
+  +'ge'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#4#5'Value'#2#1#0#0#0#242#2#1
+  +#9'TGroupBox'#18'EditorFontGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+  +'AnchorSideTop.Control'#7#23'MarginAndGutterGroupBox'#23'AnchorSideRight.Con'
+  +'trol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Heig'
+  +'ht'#2'i'#3'Top'#3#134#0#5'Width'#3#245#1#5'Align'#7#5'alTop'#8'AutoSize'#9
+  +#17'BorderSpacing.Top'#2#6#7'Caption'#6#18'EditorFontGroupBox'#12'ClientHeig'
+  +'ht'#2'W'#11'ClientWidth'#3#241#1#5'Ctl3D'#8#8'TabOrder'#2#1#0#6'TLabel'#21
+  +'EditorFontHeightLabel'#22'AnchorSideLeft.Control'#7#24'EditorFontHeightComb'
+  +'oBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24
+  +'EditorFontHeightComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'p'
+  +#6'Height'#2#14#3'Top'#2'$'#5'Width'#2'k'#20'BorderSpacing.Around'#2#6#7'Cap'
+  +'tion'#6#21'EditorFontHeightLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'ExtraL'
+  +'ineSpacingLabel'#22'AnchorSideLeft.Control'#7#24'ExtraLineSpacingComboBox'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'Extra'
+  +'LineSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'_'#1#6
+  +'Height'#2#14#3'Top'#2'$'#5'Width'#2'l'#20'BorderSpacing.Around'#2#6#7'Capti'
+  +'on'#6#21'ExtraLineSpacingLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'ExtraCha'
+  +'rSpacingLabel'#22'AnchorSideLeft.Control'#7#24'ExtraCharSpacingComboBox'#19
+  ,'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'ExtraCha'
+  +'rSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'_'#1#6'He'
+  +'ight'#2#14#3'Top'#2'?'#5'Width'#2'p'#20'BorderSpacing.Around'#2#6#7'Caption'
+  +#6#21'ExtraCharSpacingLabel'#11'ParentColor'#8#0#0#9'TComboBox'#18'EditorFon'
+  +'tComboBox'#22'AnchorSideLeft.Control'#7#18'EditorFontGroupBox'#21'AnchorSid'
+  +'eTop.Control'#7#18'EditorFontGroupBox'#23'AnchorSideRight.Control'#7#16'Edi'
+  +'torFontButton'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#6#5'Width'#3#202#1#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#12'AutoComplete'#8#18'BorderSpacin'
+  +'g.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#2#5'Ctl3D'#8
+  +#10'ItemHeight'#2#13#9'ItemWidth'#2#0#13'OnEditingDone'#7#29'EditorFontCombo'
+  +'BoxEditingDone'#8'TabOrder'#2#0#4'Text'#6#18'EditorFontComboBox'#0#0#7'TBut'
+  +'ton'#16'EditorFontButton'#21'AnchorSideTop.Control'#7#18'EditorFontComboBox'
+  +#23'AnchorSideRight.Control'#7#18'EditorFontGroupBox'#20'AnchorSideRight.Sid'
+  +'e'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#18'EditorFontComboBox'#21
+  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#210#1#6'Height'#2#21#3'Top'
+  +#2#6#5'Width'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#8'akBottom'#0#19'Border'
+  +'Spacing.Right'#2#6#7'Caption'#6#3'...'#7'OnClick'#7#21'EditorFontButtonClic'
+  +'k'#8'TabOrder'#2#1#0#0#9'TComboBox'#24'EditorFontHeightComboBox'#22'AnchorS'
+  +'ideLeft.Control'#7#18'EditorFontGroupBox'#21'AnchorSideTop.Control'#7#18'Ed'
+  +'itorFontComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heigh'
+  +'t'#2#21#3'Top'#2'!'#5'Width'#2'd'#12'AutoComplete'#8#20'BorderSpacing.Aroun'
+  +'d'#2#6#5'Ctl3D'#8#10'ItemHeight'#2#13#13'Items.Strings'#1#6#2'10'#6#2'11'#6
+  +#2'12'#6#2'13'#6#2'14'#6#2'15'#6#2'16'#6#2'17'#6#2'18'#0#9'ItemWidth'#2#0#6
+  +'OnExit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrde'
+  +'r'#2#2#0#0#9'TComboBox'#24'ExtraLineSpacingComboBox'#22'AnchorSideLeft.Cont'
+  +'rol'#7#21'EditorFontHeightLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
+  +'AnchorSideTop.Control'#7#18'EditorFontComboBox'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#3#245#0#6'Height'#2#21#3'Top'#2'!'#5'Width'#2'd'#12'Auto'
+  +'Complete'#8#18'BorderSpacing.Left'#2#20#20'BorderSpacing.Around'#2#6#5'Ctl3'
+  +'D'#8#10'ItemHeight'#2#13#13'Items.Strings'#1#6#1'0'#6#1'1'#6#1'2'#0#9'ItemW'
+  +'idth'#2#0#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDow'
+  +'n'#8'TabOrder'#2#4#0#0#9'TComboBox'#24'ExtraCharSpacingComboBox'#22'AnchorS'
+  +'ideLeft.Control'#7#24'ExtraLineSpacingComboBox'#21'AnchorSideTop.Control'#7
+  +#24'ExtraLineSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3
+  +#245#0#6'Height'#2#21#3'Top'#2'<'#5'Width'#2'd'#12'AutoComplete'#8#20'Border'
+  +'Spacing.Bottom'#2#6#5'Ctl3D'#8#10'ItemHeight'#2#13#13'Items.Strings'#1#6#1
+  +'0'#6#1'1'#6#1'2'#0#9'ItemWidth'#2#0#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyD'
+  +'own'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#3#0#0#9'TCheckBox'#27'DisableAnt'
+  +'ialiasingCheckBox'#22'AnchorSideLeft.Control'#7#18'EditorFontGroupBox'#21'A'
+  +'nchorSideTop.Control'#7#24'EditorFontHeightComboBox'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'<'#5'Width'#3#161#0#7'An'
+  +'chors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'C'
+  +'aption'#6#27'DisableAntialiasingCheckBox'#8'OnChange'#7#23'GeneralCheckBoxO'
+  +'nChange'#8'TabOrder'#2#5#11'UseOnChange'#8#0#0#0#242#2#2#8'TSynEdit'#14'Dis'
+  +'playPreview'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
+  +#7#18'EditorFontGroupBox'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSi'
+  +'deRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21'Anc'
+  +'horSideBottom.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#3#196#0#3'Top'#3
+  +#245#0#5'Width'#3#245#1#5'Align'#7#8'alClient'#17'BorderSpacing.Top'#2#6#18
+  +'CFDividerDrawLevel'#2#0#5'Ctl3D'#8#11'Font.Height'#2#240#9'Font.Name'#6#7'c'
+  +'ourier'#10'Font.Pitch'#7#7'fpFixed'#12'Font.Quality'#7#16'fqNonAntialiased'
+  +#11'ParentColor'#8#10'ParentFont'#8#8'TabOrder'#2#2#23'BookMarkOptions.Xoffs'
+  +'et'#2#30#24'BookMarkOptions.OnChange'#13#22'Gutter.ShowCodeFolding'#9#18'Gu'
+  +'tter.ShowChanges'#9#22'Gutter.ShowLineNumbers'#9#16'Gutter.ZeroStart'#8#10
+  +'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'Shor'
+  +'tCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'S'
+  +'hortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8
+  +'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'S'
+  +'hortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'S'
+  +'hortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'S'
+  +'hortCut'#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'Command'#2'm'#8'S'
+  ,'hortCut'#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'Command'#2'k'#8'S'
+  +'hortCut'#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'Command'#2'l'#8'S'
+  +'hortCut'#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'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#14'DisplayPreview'#0#8'ReadOnly'#9#21'BracketHigh'
+  +'lightStyle'#7#8'sbhsBoth'#0#0#0
 ]);
diff --git a/ide/frames/options_editor_display.pas b/ide/frames/options_editor_display.pas
index 70bab3334d..5435467d19 100644
--- a/ide/frames/options_editor_display.pas
+++ b/ide/frames/options_editor_display.pas
@@ -249,10 +249,7 @@ begin
   DisableAntialiasingCheckBox.Caption := dlgDisableAntialiasing;
 
   with GeneralPage do
-  begin
-    SetLength(PreviewEdits, Length(PreviewEdits) + 1);
-    PreviewEdits[Length(PreviewEdits)-1] := DisplayPreview;
-  end;
+    AddPreviewEdit(DisplayPreview);
 end;
 
 procedure TEditorDisplayOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
diff --git a/ide/frames/options_editor_general.lfm b/ide/frames/options_editor_general.lfm
index 78fa4b41d4..1730ba73e7 100644
--- a/ide/frames/options_editor_general.lfm
+++ b/ide/frames/options_editor_general.lfm
@@ -4,8 +4,8 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
   ClientHeight = 516
   ClientWidth = 459
   Visible = False
-  DesignLeft = 348
-  DesignTop = 237
+  DesignLeft = 66
+  DesignTop = 87
   object BlockIndentLabel: TLabel[0]
     AnchorSideLeft.Control = BlockIndentComboBox
     AnchorSideLeft.Side = asrBottom
@@ -15,7 +15,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 14
     Top = 192
     Width = 82
-    HelpContext = 0
     Anchors = [akLeft, akBottom]
     BorderSpacing.Around = 6
     Caption = 'BlockIndentLabel'
@@ -30,7 +29,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 14
     Top = 192
     Width = 77
-    HelpContext = 0
     Anchors = [akLeft, akBottom]
     BorderSpacing.Around = 6
     Caption = 'TabWidthsLabel'
@@ -46,7 +44,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 3
     Top = 6
     Width = 279
-    HelpContext = 0
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 180
   end
@@ -57,7 +54,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 14
     Top = 0
     Width = 80
-    HelpContext = 0
     Caption = 'UndoGroupLabel'
     ParentColor = False
   end
@@ -70,7 +66,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 14
     Top = 23
     Width = 72
-    HelpContext = 0
     BorderSpacing.Around = 6
     Caption = 'UndoLimitLabel'
     ParentColor = False
@@ -83,7 +78,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 14
     Top = 64
     Width = 80
-    HelpContext = 0
     BorderSpacing.Top = 6
     Caption = 'ScrollGroupLabel'
     ParentColor = False
@@ -98,7 +92,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 3
     Top = 70
     Width = 279
-    HelpContext = 0
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 180
   end
@@ -110,7 +103,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 14
     Top = 128
     Width = 115
-    HelpContext = 0
     BorderSpacing.Top = 6
     Caption = 'IndentsTabsGroupLabel'
     ParentColor = False
@@ -125,7 +117,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 3
     Top = 134
     Width = 279
-    HelpContext = 0
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 180
   end
@@ -137,7 +128,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 14
     Top = 216
     Width = 86
-    HelpContext = 0
     BorderSpacing.Top = 6
     Caption = 'MouseGroupLabel'
     ParentColor = False
@@ -152,7 +142,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 3
     Top = 222
     Width = 279
-    HelpContext = 0
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 180
   end
@@ -164,7 +153,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 14
     Top = 280
     Width = 87
-    HelpContext = 0
     BorderSpacing.Top = 6
     Caption = 'CursorGroupLabel'
     ParentColor = False
@@ -179,7 +167,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 3
     Top = 286
     Width = 279
-    HelpContext = 0
     Anchors = [akTop, akLeft, akRight]
     BorderSpacing.Left = 180
   end
@@ -192,7 +179,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 21
     Top = 189
     Width = 100
-    HelpContext = 0
     AutoComplete = False
     BorderSpacing.Left = 6
     BorderSpacing.Top = 3
@@ -219,7 +205,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 21
     Top = 189
     Width = 100
-    HelpContext = 0
     AutoComplete = False
     Ctl3D = False
     ItemHeight = 13
@@ -243,7 +228,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 21
     Top = 20
     Width = 100
-    HelpContext = 0
     AutoComplete = False
     BorderSpacing.Left = 230
     BorderSpacing.Around = 6
@@ -268,7 +252,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 39
     Width = 127
-    HelpContext = 0
     BorderSpacing.Left = 6
     Caption = 'GroupUndoCheckBox'
     OnChange = GroupUndoCheckBoxChange
@@ -283,7 +266,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 20
     Width = 147
-    HelpContext = 0
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'UndoAfterSaveCheckBox'
@@ -298,7 +280,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 84
     Width = 153
-    HelpContext = 0
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'ScrollPastEndFileCheckBox'
@@ -314,7 +295,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 103
     Width = 156
-    HelpContext = 0
     BorderSpacing.Left = 6
     Caption = 'ScrollPastEndLineCheckBox'
     OnChange = ScrollPastEndLineCheckBoxChange
@@ -329,7 +309,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 84
     Width = 151
-    HelpContext = 0
     BorderSpacing.Left = 230
     BorderSpacing.Around = 6
     Caption = 'ScrollByOneLessCheckBox'
@@ -344,7 +323,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 103
     Width = 141
-    HelpContext = 0
     Caption = 'HalfPageScrollCheckBox'
     OnChange = HalfPageScrollCheckBoxChange
     TabOrder = 8
@@ -358,7 +336,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 148
     Width = 128
-    HelpContext = 0
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'AutoIndentCheckBox'
@@ -374,7 +351,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 167
     Width = 152
-    HelpContext = 0
     BorderSpacing.Left = 6
     Caption = 'TabIndentBlocksCheckBox'
     OnChange = TabIndentBlocksCheckBoxChange
@@ -389,7 +365,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 148
     Width = 124
-    HelpContext = 0
     BorderSpacing.Left = 230
     BorderSpacing.Around = 6
     Caption = 'SmartTabsCheckBox'
@@ -404,7 +379,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 167
     Width = 142
-    HelpContext = 0
     Caption = 'TabsToSpacesCheckBox'
     OnChange = TabsToSpacesCheckBoxChange
     TabOrder = 12
@@ -418,7 +392,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 236
     Width = 146
-    HelpContext = 0
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'DoubleClickLineCheckBox'
@@ -434,7 +407,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 255
     Width = 127
-    HelpContext = 0
     BorderSpacing.Left = 6
     Caption = 'MouseLinksCheckBox'
     OnChange = MouseLinksCheckBoxChange
@@ -449,7 +421,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 236
     Width = 131
-    HelpContext = 0
     BorderSpacing.Left = 230
     BorderSpacing.Around = 6
     Caption = 'DragDropEdCheckBox'
@@ -464,7 +435,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 255
     Width = 117
-    HelpContext = 0
     Caption = 'DropFilesCheckBox'
     OnChange = DropFilesCheckBoxChange
     TabOrder = 16
@@ -478,7 +448,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 300
     Width = 135
-    HelpContext = 0
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'KeepCursorXCheckBox'
@@ -494,7 +463,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 319
     Width = 153
-    HelpContext = 0
     BorderSpacing.Left = 6
     Caption = 'PersistentCursorCheckBox'
     OnChange = PersistentCursorCheckBoxChange
@@ -509,7 +477,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 338
     Width = 168
-    HelpContext = 0
     BorderSpacing.Left = 6
     Caption = 'AlwaysVisibleCursorCheckBox'
     OnChange = AlwaysVisibleCursorCheckBoxChange
@@ -524,7 +491,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 300
     Width = 172
-    HelpContext = 0
     BorderSpacing.Left = 230
     BorderSpacing.Around = 6
     Caption = 'CursorSkipsSelectionCheckBox'
@@ -539,7 +505,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 319
     Width = 192
-    HelpContext = 0
     Caption = 'RightMouseMovesCursorCheckBox'
     OnChange = RightMouseMovesCursorCheckBoxChange
     TabOrder = 21
@@ -552,7 +517,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Height = 19
     Top = 338
     Width = 222
-    HelpContext = 0
     Caption = 'HomeKeyJumpsToNearestStartCheckBox'
     OnChange = HomeKeyJumpsToNearestStartCheckBoxChange
     TabOrder = 22
diff --git a/ide/frames/options_editor_general.lrs b/ide/frames/options_editor_general.lrs
index 07d1233628..56c9ef3e30 100644
--- a/ide/frames/options_editor_general.lrs
+++ b/ide/frames/options_editor_general.lrs
@@ -3,199 +3,189 @@
 LazarusResources.Add('TEditorGeneralOptionsFrame','FORMDATA',[
   'TPF0'#241#26'TEditorGeneralOptionsFrame'#25'EditorGeneralOptionsFrame'#6'Hei'
   +'ght'#3#4#2#5'Width'#3#203#1#12'ClientHeight'#3#4#2#11'ClientWidth'#3#203#1#7
-  +'Visible'#8#10'DesignLeft'#3'\'#1#9'DesignTop'#3#237#0#0#242#2#0#6'TLabel'#16
-  +'BlockIndentLabel'#22'AnchorSideLeft.Control'#7#19'BlockIndentComboBox'#19'A'
-  +'nchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#19'BlockI'
-  +'ndentComboBox'#21'AnchorSideBottom.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Heig'
-  +'ht'#2#14#3'Top'#3#192#0#5'Width'#2'R'#11'HelpContext'#2#0#7'Anchors'#11#6'a'
-  +'kLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'BlockInde'
-  +'ntLabel'#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#14'TabWidthsLabel'#22'Anch'
-  +'orSideLeft.Control'#7#17'TabWidthsComboBox'#19'AnchorSideLeft.Side'#7#9'asr'
-  +'Bottom'#24'AnchorSideBottom.Control'#7#17'TabWidthsComboBox'#21'AnchorSideB'
-  +'ottom.Side'#7#9'asrCenter'#4'Left'#3'V'#1#6'Height'#2#14#3'Top'#3#192#0#5'W'
-  +'idth'#2'M'#11'HelpContext'#2#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'Bor'
-  +'derSpacing.Around'#2#6#7'Caption'#6#14'TabWidthsLabel'#11'ParentColor'#8#0#0
-  +#242#2#2#6'TBevel'#6'Bevel1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anchor'
-  +'SideTop.Control'#7#14'UndoGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'
-  +#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBott'
-  +'om'#4'Left'#3#180#0#6'Height'#2#3#3'Top'#2#6#5'Width'#3#23#1#11'HelpContext'
-  +#2#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#3
-  +#180#0#0#0#242#2#3#6'TLabel'#14'UndoGroupLabel'#22'AnchorSideLeft.Control'#7
-  +#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#0#6'Height'#2#14#3
-  +'Top'#2#0#5'Width'#2'P'#11'HelpContext'#2#0#7'Caption'#6#14'UndoGroupLabel'
-  +#11'ParentColor'#8#0#0#242#2#4#6'TLabel'#14'UndoLimitLabel'#22'AnchorSideLef'
-  +'t.Control'#7#17'UndoLimitComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
-  +'AnchorSideTop.Control'#7#17'UndoLimitComboBox'#18'AnchorSideTop.Side'#7#9'a'
-  +'srCenter'#4'Left'#3'V'#1#6'Height'#2#14#3'Top'#2#23#5'Width'#2'H'#11'HelpCo'
-  +'ntext'#2#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'UndoLimitLabel'#11
-  +'ParentColor'#8#0#0#242#2#5#6'TLabel'#16'ScrollGroupLabel'#22'AnchorSideLeft'
-  +'.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#17'GroupUndoCheckBox'#18'A'
-  +'nchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#14#3'Top'#2'@'#5
-  +'Width'#2'P'#11'HelpContext'#2#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#16'S'
-  +'crollGroupLabel'#11'ParentColor'#8#0#0#242#2#6#6'TBevel'#6'Bevel2'#22'Ancho'
-  +'rSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'ScrollGroupLab'
-  +'el'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'O'
-  +'wner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#3
-  +#3'Top'#2'F'#5'Width'#3#23#1#11'HelpContext'#2#0#7'Anchors'#11#5'akTop'#6'ak'
-  +'Left'#7'akRight'#0#18'BorderSpacing.Left'#3#180#0#0#0#242#2#7#6'TLabel'#21
-  +'IndentsTabsGroupLabel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideT'
-  +'op.Control'#7#25'ScrollPastEndLineCheckBox'#18'AnchorSideTop.Side'#7#9'asrB'
-  +'ottom'#4'Left'#2#0#6'Height'#2#14#3'Top'#3#128#0#5'Width'#2's'#11'HelpConte'
-  +'xt'#2#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#21'IndentsTabsGroupLabel'#11
-  +'ParentColor'#8#0#0#242#2#8#6'TBevel'#6'Bevel3'#22'AnchorSideLeft.Control'#7
-  +#5'Owner'#21'AnchorSideTop.Control'#7#21'IndentsTabsGroupLabel'#18'AnchorSid'
-  +'eTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorS'
-  +'ideRight.Side'#7#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#3#3'Top'#3#134#0#5
-  +'Width'#3#23#1#11'HelpContext'#2#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRigh'
-  +'t'#0#18'BorderSpacing.Left'#3#180#0#0#0#242#2#9#6'TLabel'#15'MouseGroupLabe'
-  +'l'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#19'Blo'
-  +'ckIndentComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Heigh'
-  +'t'#2#14#3'Top'#3#216#0#5'Width'#2'V'#11'HelpContext'#2#0#17'BorderSpacing.T'
-  +'op'#2#6#7'Caption'#6#15'MouseGroupLabel'#11'ParentColor'#8#0#0#242#2#10#6'T'
-  +'Bevel'#6'Bevel4'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Con'
-  +'trol'#7#15'MouseGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'Anchor'
-  +'SideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#3#180#0#6'Height'#2#3#3'Top'#3#222#0#5'Width'#3#23#1#11'HelpContext'#2#0
-  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#3#180#0
-  +#0#0#242#2#11#6'TLabel'#16'CursorGroupLabel'#22'AnchorSideLeft.Control'#7#5
-  +'Owner'#21'AnchorSideTop.Control'#7#18'MouseLinksCheckBox'#18'AnchorSideTop.'
-  +'Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#14#3'Top'#3#24#1#5'Width'#2'W'
-  +#11'HelpContext'#2#0#17'BorderSpacing.Top'#2#6#7'Caption'#6#16'CursorGroupLa'
-  +'bel'#11'ParentColor'#8#0#0#242#2#12#6'TBevel'#6'Bevel5'#22'AnchorSideLeft.C'
-  +'ontrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'CursorGroupLabel'#18'Anch'
+  +'Visible'#8#10'DesignLeft'#2'B'#9'DesignTop'#2'W'#0#242#2#0#6'TLabel'#16'Blo'
+  +'ckIndentLabel'#22'AnchorSideLeft.Control'#7#19'BlockIndentComboBox'#19'Anch'
+  +'orSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#19'BlockInde'
+  +'ntComboBox'#21'AnchorSideBottom.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Height'
+  +#2#14#3'Top'#3#192#0#5'Width'#2'R'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20
+  +'BorderSpacing.Around'#2#6#7'Caption'#6#16'BlockIndentLabel'#11'ParentColor'
+  +#8#0#0#242#2#1#6'TLabel'#14'TabWidthsLabel'#22'AnchorSideLeft.Control'#7#17
+  +'TabWidthsComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBott'
+  +'om.Control'#7#17'TabWidthsComboBox'#21'AnchorSideBottom.Side'#7#9'asrCenter'
+  +#4'Left'#3'V'#1#6'Height'#2#14#3'Top'#3#192#0#5'Width'#2'M'#7'Anchors'#11#6
+  +'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'TabWidth'
+  +'sLabel'#11'ParentColor'#8#0#0#242#2#2#6'TBevel'#6'Bevel1'#22'AnchorSideLeft'
+  +'.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#14'UndoGroupLabel'#18'Anch'
   +'orSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'An'
-  +'chorSideRight.Side'#7#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#3#3'Top'#3#30
-  ,#1#5'Width'#3#23#1#11'HelpContext'#2#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
-  +'Right'#0#18'BorderSpacing.Left'#3#180#0#0#0#242#2#13#9'TComboBox'#19'BlockI'
-  +'ndentComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Contr'
-  +'ol'#7#23'TabIndentBlocksCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#24
-  +'AnchorSideBottom.Control'#7#17'TabWidthsComboBox'#4'Left'#2#6#6'Height'#2#21
-  +#3'Top'#3#189#0#5'Width'#2'd'#11'HelpContext'#2#0#12'AutoComplete'#8#18'Bord'
-  +'erSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#5'Ctl3D'#8#10'ItemHeight'#2#13
-  +#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'ItemWidth'#2#0#8'OnChan'
-  +'ge'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17
-  +'ComboboxOnKeyDown'#8'TabOrder'#2#0#0#0#242#2#14#9'TComboBox'#17'TabWidthsCo'
-  +'mboBox'#22'AnchorSideLeft.Control'#7#17'SmartTabsCheckBox'#21'AnchorSideTop'
-  +'.Control'#7#19'BlockIndentComboBox'#24'AnchorSideBottom.Control'#7#5'Owner'
-  +#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#21#3'T'
-  +'op'#3#189#0#5'Width'#2'd'#11'HelpContext'#2#0#12'AutoComplete'#8#5'Ctl3D'#8
-  +#10'ItemHeight'#2#13#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'Ite'
-  +'mWidth'#2#0#8'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExi'
-  +'t'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#1#0#0#242#2#15#9'TCom'
-  +'boBox'#17'UndoLimitComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Ancho'
-  +'rSideTop.Control'#7#14'UndoGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'
-  +#4'Left'#3#236#0#6'Height'#2#21#3'Top'#2#20#5'Width'#2'd'#11'HelpContext'#2#0
-  +#12'AutoComplete'#8#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2
-  +#6#5'Ctl3D'#8#10'ItemHeight'#2#13#13'Items.Strings'#1#6#5'32767'#6#4'4096'#6
-  +#3'512'#0#9'ItemWidth'#2#0#8'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14
-  +'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#2#0#0#242
-  +#2#16#9'TCheckBox'#17'GroupUndoCheckBox'#22'AnchorSideLeft.Control'#7#5'Owne'
-  +'r'#21'AnchorSideTop.Control'#7#21'UndoAfterSaveCheckBox'#18'AnchorSideTop.S'
-  +'ide'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2''''#5'Width'#2''#11
-  +'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#17'GroupUndoCheckB'
-  +'ox'#8'OnChange'#7#23'GroupUndoCheckBoxChange'#8'TabOrder'#2#3#11'UseOnChang'
-  +'e'#8#0#0#242#2#17#9'TCheckBox'#21'UndoAfterSaveCheckBox'#22'AnchorSideLeft.'
-  +'Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#14'UndoGroupLabel'#18'Ancho'
-  +'rSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#20#5'Widt'
-  +'h'#3#147#0#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.'
-  +'Top'#2#6#7'Caption'#6#21'UndoAfterSaveCheckBox'#8'TabOrder'#2#4#11'UseOnCha'
-  +'nge'#8#0#0#242#2#18#9'TCheckBox'#25'ScrollPastEndFileCheckBox'#22'AnchorSid'
-  +'eLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'ScrollGroupLabel'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'T'
-  +#5'Width'#3#153#0#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#17'BorderSp'
-  +'acing.Top'#2#6#7'Caption'#6#25'ScrollPastEndFileCheckBox'#8'OnChange'#7#31
-  +'ScrollPastEndFileCheckBoxChange'#8'TabOrder'#2#5#11'UseOnChange'#8#0#0#242#2
-  +#19#9'TCheckBox'#25'ScrollPastEndLineCheckBox'#22'AnchorSideLeft.Control'#7#5
-  +'Owner'#21'AnchorSideTop.Control'#7#25'ScrollPastEndFileCheckBox'#18'AnchorS'
-  +'ideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'g'#5'Width'
-  +#3#156#0#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#25'Scro'
-  +'llPastEndLineCheckBox'#8'OnChange'#7#31'ScrollPastEndLineCheckBoxChange'#8
-  +'TabOrder'#2#6#11'UseOnChange'#8#0#0#242#2#20#9'TCheckBox'#23'ScrollByOneLes'
-  +'sCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
-  +#16'ScrollGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6
-  +'Height'#2#19#3'Top'#2'T'#5'Width'#3#151#0#11'HelpContext'#2#0#18'BorderSpac'
-  +'ing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'ScrollByOneL'
-  +'essCheckBox'#8'OnChange'#7#29'ScrollByOneLessCheckBoxChange'#8'TabOrder'#2#7
-  +#11'UseOnChange'#8#0#0#242#2#21#9'TCheckBox'#22'HalfPageScrollCheckBox'#22'A'
-  +'nchorSideLeft.Control'#7#23'ScrollByOneLessCheckBox'#21'AnchorSideTop.Contr'
-  +'ol'#7#25'ScrollPastEndLineCheckBox'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#2
-  +'g'#5'Width'#3#141#0#11'HelpContext'#2#0#7'Caption'#6#22'HalfPageScrollCheck'
-  +'Box'#8'OnChange'#7#28'HalfPageScrollCheckBoxChange'#8'TabOrder'#2#8#11'UseO'
-  +'nChange'#8#0#0#242#2#22#9'TCheckBox'#18'AutoIndentCheckBox'#22'AnchorSideLe'
-  +'ft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#21'IndentsTabsGroupLabel'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3
-  +#148#0#5'Width'#3#128#0#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#17'Bo'
-  +'rderSpacing.Top'#2#6#7'Caption'#6#18'AutoIndentCheckBox'#8'OnChange'#7#24'A'
-  +'utoIndentCheckBoxChange'#8'TabOrder'#2#9#11'UseOnChange'#8#0#0#242#2#23#9'T'
-  +'CheckBox'#23'TabIndentBlocksCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'
-  +#21'AnchorSideTop.Control'#7#18'AutoIndentCheckBox'#18'AnchorSideTop.Side'#7
-  ,#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#167#0#5'Width'#3#152#0#11
-  +'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#23'TabIndentBlocks'
-  +'CheckBox'#8'OnChange'#7#29'TabIndentBlocksCheckBoxChange'#8'TabOrder'#2#10
-  +#11'UseOnChange'#8#0#0#242#2#24#9'TCheckBox'#17'SmartTabsCheckBox'#22'Anchor'
-  +'SideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#21'IndentsTabsGrou'
-  +'pLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#19
-  +#3'Top'#3#148#0#5'Width'#2'|'#11'HelpContext'#2#0#18'BorderSpacing.Left'#3
-  +#230#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'SmartTabsCheckBox'#8'OnC'
-  +'hange'#7#23'SmartTabsCheckBoxChange'#8'TabOrder'#2#11#11'UseOnChange'#8#0#0
-  +#242#2#25#9'TCheckBox'#20'TabsToSpacesCheckBox'#22'AnchorSideLeft.Control'#7
-  +#17'SmartTabsCheckBox'#21'AnchorSideTop.Control'#7#23'TabIndentBlocksCheckBo'
-  +'x'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3#167#0#5'Width'#3#142#0#11'HelpCo'
-  +'ntext'#2#0#7'Caption'#6#20'TabsToSpacesCheckBox'#8'OnChange'#7#26'TabsToSpa'
-  +'cesCheckBoxChange'#8'TabOrder'#2#12#11'UseOnChange'#8#0#0#242#2#26#9'TCheck'
-  +'Box'#23'DoubleClickLineCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'A'
-  +'nchorSideTop.Control'#7#15'MouseGroupLabel'#18'AnchorSideTop.Side'#7#9'asrB'
-  +'ottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#236#0#5'Width'#3#146#0#11'HelpCo'
-  +'ntext'#2#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6
-  +#23'DoubleClickLineCheckBox'#8'OnChange'#7#29'DoubleClickLineCheckBoxChange'
-  +#8'TabOrder'#2#13#11'UseOnChange'#8#0#0#242#2#27#9'TCheckBox'#18'MouseLinksC'
+  +'chorSideRight.Side'#7#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#3#3'Top'#2#6
+  +#5'Width'#3#23#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpac'
+  +'ing.Left'#3#180#0#0#0#242#2#3#6'TLabel'#14'UndoGroupLabel'#22'AnchorSideLef'
+  +'t.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#4'Left'#2#0#6'He'
+  +'ight'#2#14#3'Top'#2#0#5'Width'#2'P'#7'Caption'#6#14'UndoGroupLabel'#11'Pare'
+  +'ntColor'#8#0#0#242#2#4#6'TLabel'#14'UndoLimitLabel'#22'AnchorSideLeft.Contr'
+  +'ol'#7#17'UndoLimitComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'Ancho'
+  +'rSideTop.Control'#7#17'UndoLimitComboBox'#18'AnchorSideTop.Side'#7#9'asrCen'
+  +'ter'#4'Left'#3'V'#1#6'Height'#2#14#3'Top'#2#23#5'Width'#2'H'#20'BorderSpaci'
+  +'ng.Around'#2#6#7'Caption'#6#14'UndoLimitLabel'#11'ParentColor'#8#0#0#242#2#5
+  +#6'TLabel'#16'ScrollGroupLabel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anc'
+  +'horSideTop.Control'#7#17'GroupUndoCheckBox'#18'AnchorSideTop.Side'#7#9'asrB'
+  +'ottom'#4'Left'#2#0#6'Height'#2#14#3'Top'#2'@'#5'Width'#2'P'#17'BorderSpacin'
+  +'g.Top'#2#6#7'Caption'#6#16'ScrollGroupLabel'#11'ParentColor'#8#0#0#242#2#6#6
+  +'TBevel'#6'Bevel2'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Co'
+  +'ntrol'#7#16'ScrollGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'Anch'
+  +'orSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'L'
+  +'eft'#3#180#0#6'Height'#2#3#3'Top'#2'F'#5'Width'#3#23#1#7'Anchors'#11#5'akTo'
+  +'p'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#3#180#0#0#0#242#2#7#6'TLab'
+  +'el'#21'IndentsTabsGroupLabel'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anch'
+  +'orSideTop.Control'#7#25'ScrollPastEndLineCheckBox'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#4'Left'#2#0#6'Height'#2#14#3'Top'#3#128#0#5'Width'#2's'#17'Bor'
+  +'derSpacing.Top'#2#6#7'Caption'#6#21'IndentsTabsGroupLabel'#11'ParentColor'#8
+  +#0#0#242#2#8#6'TBevel'#6'Bevel3'#22'AnchorSideLeft.Control'#7#5'Owner'#21'An'
+  +'chorSideTop.Control'#7#21'IndentsTabsGroupLabel'#18'AnchorSideTop.Side'#7#9
+  +'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7
+  +#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#3#3'Top'#3#134#0#5'Width'#3#23#1#7
+  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#3#180#0#0
+  +#0#242#2#9#6'TLabel'#15'MouseGroupLabel'#22'AnchorSideLeft.Control'#7#5'Owne'
+  +'r'#21'AnchorSideTop.Control'#7#19'BlockIndentComboBox'#18'AnchorSideTop.Sid'
+  +'e'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#14#3'Top'#3#216#0#5'Width'#2'V'#17
+  +'BorderSpacing.Top'#2#6#7'Caption'#6#15'MouseGroupLabel'#11'ParentColor'#8#0
+  +#0#242#2#10#6'TBevel'#6'Bevel4'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anc'
+  +'horSideTop.Control'#7#15'MouseGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCen'
+  +'ter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'as'
+  +'rBottom'#4'Left'#3#180#0#6'Height'#2#3#3'Top'#3#222#0#5'Width'#3#23#1#7'Anc'
+  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#3#180#0#0#0
+  +#242#2#11#6'TLabel'#16'CursorGroupLabel'#22'AnchorSideLeft.Control'#7#5'Owne'
+  +'r'#21'AnchorSideTop.Control'#7#18'MouseLinksCheckBox'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#14#3'Top'#3#24#1#5'Width'#2'W'#17'Bo'
+  +'rderSpacing.Top'#2#6#7'Caption'#6#16'CursorGroupLabel'#11'ParentColor'#8#0#0
+  +#242#2#12#6'TBevel'#6'Bevel5'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Ancho'
+  +'rSideTop.Control'#7#16'CursorGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCent'
+  +'er'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asr'
+  +'Bottom'#4'Left'#3#180#0#6'Height'#2#3#3'Top'#3#30#1#5'Width'#3#23#1#7'Ancho'
+  +'rs'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#3#180#0#0#0
+  +#242#2#13#9'TComboBox'#19'BlockIndentComboBox'#22'AnchorSideLeft.Control'#7#5
+  +'Owner'#21'AnchorSideTop.Control'#7#23'TabIndentBlocksCheckBox'#18'AnchorSid'
+  ,'eTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'TabWidthsComboB'
+  +'ox'#4'Left'#2#6#6'Height'#2#21#3'Top'#3#189#0#5'Width'#2'd'#12'AutoComplete'
+  +#8#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#5'Ctl3D'#8#10'ItemHe'
+  +'ight'#2#13#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'ItemWidth'#2
+  +#0#8'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKey'
+  +'Down'#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#0#0#0#242#2#14#9'TComboBox'#17
+  +'TabWidthsComboBox'#22'AnchorSideLeft.Control'#7#17'SmartTabsCheckBox'#21'An'
+  +'chorSideTop.Control'#7#19'BlockIndentComboBox'#24'AnchorSideBottom.Control'
+  +#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Heigh'
+  +'t'#2#21#3'Top'#3#189#0#5'Width'#2'd'#12'AutoComplete'#8#5'Ctl3D'#8#10'ItemH'
+  +'eight'#2#13#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'ItemWidth'#2
+  +#0#8'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKey'
+  +'Down'#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#1#0#0#242#2#15#9'TComboBox'#17
+  +'UndoLimitComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.C'
+  +'ontrol'#7#14'UndoGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3
+  +#236#0#6'Height'#2#21#3'Top'#2#20#5'Width'#2'd'#12'AutoComplete'#8#18'Border'
+  +'Spacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#5'Ctl3D'#8#10'ItemHeight'
+  +#2#13#13'Items.Strings'#1#6#5'32767'#6#4'4096'#6#3'512'#0#9'ItemWidth'#2#0#8
+  +'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'
+  +#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#2#0#0#242#2#16#9'TCheckBox'#17'GroupU'
+  +'ndoCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
+  +#7#21'UndoAfterSaveCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+  +#6#6'Height'#2#19#3'Top'#2''''#5'Width'#2''#18'BorderSpacing.Left'#2#6#7'Ca'
+  +'ption'#6#17'GroupUndoCheckBox'#8'OnChange'#7#23'GroupUndoCheckBoxChange'#8
+  +'TabOrder'#2#3#11'UseOnChange'#8#0#0#242#2#17#9'TCheckBox'#21'UndoAfterSaveC'
   +'heckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7
-  +#23'DoubleClickLineCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
-  +#6#6'Height'#2#19#3'Top'#3#255#0#5'Width'#2''#11'HelpContext'#2#0#18'Border'
-  +'Spacing.Left'#2#6#7'Caption'#6#18'MouseLinksCheckBox'#8'OnChange'#7#24'Mous'
-  +'eLinksCheckBoxChange'#8'TabOrder'#2#14#11'UseOnChange'#8#0#0#242#2#28#9'TCh'
-  +'eckBox'#18'DragDropEdCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anc'
-  +'horSideTop.Control'#7#15'MouseGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBot'
-  +'tom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3#236#0#5'Width'#3#131#0#11'Help'
-  +'Context'#2#0#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#18'DragDropEdCheckBox'#8'OnChange'#7#24'DragDropEdCheckBoxChange'
-  +#8'TabOrder'#2#15#11'UseOnChange'#8#0#0#242#2#29#9'TCheckBox'#17'DropFilesCh'
-  +'eckBox'#22'AnchorSideLeft.Control'#7#18'DragDropEdCheckBox'#21'AnchorSideTo'
-  +'p.Control'#7#18'MouseLinksCheckBox'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3
-  +#255#0#5'Width'#2'u'#11'HelpContext'#2#0#7'Caption'#6#17'DropFilesCheckBox'#8
+  +#14'UndoGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heig'
+  +'ht'#2#19#3'Top'#2#20#5'Width'#3#147#0#18'BorderSpacing.Left'#2#6#17'BorderS'
+  +'pacing.Top'#2#6#7'Caption'#6#21'UndoAfterSaveCheckBox'#8'TabOrder'#2#4#11'U'
+  +'seOnChange'#8#0#0#242#2#18#9'TCheckBox'#25'ScrollPastEndFileCheckBox'#22'An'
+  +'chorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'ScrollGroup'
+  +'Label'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'T'
+  +'op'#2'T'#5'Width'#3#153#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2
+  +#6#7'Caption'#6#25'ScrollPastEndFileCheckBox'#8'OnChange'#7#31'ScrollPastEnd'
+  +'FileCheckBoxChange'#8'TabOrder'#2#5#11'UseOnChange'#8#0#0#242#2#19#9'TCheck'
+  +'Box'#25'ScrollPastEndLineCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+  +'AnchorSideTop.Control'#7#25'ScrollPastEndFileCheckBox'#18'AnchorSideTop.Sid'
+  +'e'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'g'#5'Width'#3#156#0#18
+  +'BorderSpacing.Left'#2#6#7'Caption'#6#25'ScrollPastEndLineCheckBox'#8'OnChan'
+  +'ge'#7#31'ScrollPastEndLineCheckBoxChange'#8'TabOrder'#2#6#11'UseOnChange'#8
+  +#0#0#242#2#20#9'TCheckBox'#23'ScrollByOneLessCheckBox'#22'AnchorSideLeft.Con'
+  +'trol'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'ScrollGroupLabel'#18'Anchor'
+  +'SideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#2'T'#5'W'
+  +'idth'#3#151#0#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#23'ScrollByOneLessCheckBox'#8'OnChange'#7#29'ScrollByOneLessChec'
+  +'kBoxChange'#8'TabOrder'#2#7#11'UseOnChange'#8#0#0#242#2#21#9'TCheckBox'#22
+  +'HalfPageScrollCheckBox'#22'AnchorSideLeft.Control'#7#23'ScrollByOneLessChec'
+  +'kBox'#21'AnchorSideTop.Control'#7#25'ScrollPastEndLineCheckBox'#4'Left'#3
+  +#236#0#6'Height'#2#19#3'Top'#2'g'#5'Width'#3#141#0#7'Caption'#6#22'HalfPageS'
+  +'crollCheckBox'#8'OnChange'#7#28'HalfPageScrollCheckBoxChange'#8'TabOrder'#2
+  +#8#11'UseOnChange'#8#0#0#242#2#22#9'TCheckBox'#18'AutoIndentCheckBox'#22'Anc'
+  +'horSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#21'IndentsTabsG'
+  +'roupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19
+  +#3'Top'#3#148#0#5'Width'#3#128#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing'
+  +'.Top'#2#6#7'Caption'#6#18'AutoIndentCheckBox'#8'OnChange'#7#24'AutoIndentCh'
+  +'eckBoxChange'#8'TabOrder'#2#9#11'UseOnChange'#8#0#0#242#2#23#9'TCheckBox'#23
+  +'TabIndentBlocksCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSid'
+  +'eTop.Control'#7#18'AutoIndentCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#4'Left'#2#6#6'Height'#2#19#3'Top'#3#167#0#5'Width'#3#152#0#18'BorderSpacing'
+  +'.Left'#2#6#7'Caption'#6#23'TabIndentBlocksCheckBox'#8'OnChange'#7#29'TabInd'
+  +'entBlocksCheckBoxChange'#8'TabOrder'#2#10#11'UseOnChange'#8#0#0#242#2#24#9
+  +'TCheckBox'#17'SmartTabsCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'A'
+  +'nchorSideTop.Control'#7#21'IndentsTabsGroupLabel'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3#148#0#5'Width'#2'|'#18'B'
+  ,'orderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'Sma'
+  +'rtTabsCheckBox'#8'OnChange'#7#23'SmartTabsCheckBoxChange'#8'TabOrder'#2#11
+  +#11'UseOnChange'#8#0#0#242#2#25#9'TCheckBox'#20'TabsToSpacesCheckBox'#22'Anc'
+  +'horSideLeft.Control'#7#17'SmartTabsCheckBox'#21'AnchorSideTop.Control'#7#23
+  +'TabIndentBlocksCheckBox'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3#167#0#5'Wi'
+  +'dth'#3#142#0#7'Caption'#6#20'TabsToSpacesCheckBox'#8'OnChange'#7#26'TabsToS'
+  +'pacesCheckBoxChange'#8'TabOrder'#2#12#11'UseOnChange'#8#0#0#242#2#26#9'TChe'
+  +'ckBox'#23'DoubleClickLineCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+  +'AnchorSideTop.Control'#7#15'MouseGroupLabel'#18'AnchorSideTop.Side'#7#9'asr'
+  +'Bottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#236#0#5'Width'#3#146#0#18'Borde'
+  +'rSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#23'DoubleClickLin'
+  +'eCheckBox'#8'OnChange'#7#29'DoubleClickLineCheckBoxChange'#8'TabOrder'#2#13
+  +#11'UseOnChange'#8#0#0#242#2#27#9'TCheckBox'#18'MouseLinksCheckBox'#22'Ancho'
+  +'rSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#23'DoubleClickLin'
+  +'eCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19
+  +#3'Top'#3#255#0#5'Width'#2''#18'BorderSpacing.Left'#2#6#7'Caption'#6#18'Mou'
+  +'seLinksCheckBox'#8'OnChange'#7#24'MouseLinksCheckBoxChange'#8'TabOrder'#2#14
+  +#11'UseOnChange'#8#0#0#242#2#28#9'TCheckBox'#18'DragDropEdCheckBox'#22'Ancho'
+  +'rSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#15'MouseGroupLabe'
+  +'l'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#19#3'T'
+  +'op'#3#236#0#5'Width'#3#131#0#18'BorderSpacing.Left'#3#230#0#20'BorderSpacin'
+  +'g.Around'#2#6#7'Caption'#6#18'DragDropEdCheckBox'#8'OnChange'#7#24'DragDrop'
+  +'EdCheckBoxChange'#8'TabOrder'#2#15#11'UseOnChange'#8#0#0#242#2#29#9'TCheckB'
+  +'ox'#17'DropFilesCheckBox'#22'AnchorSideLeft.Control'#7#18'DragDropEdCheckBo'
+  +'x'#21'AnchorSideTop.Control'#7#18'MouseLinksCheckBox'#4'Left'#3#236#0#6'Hei'
+  +'ght'#2#19#3'Top'#3#255#0#5'Width'#2'u'#7'Caption'#6#17'DropFilesCheckBox'#8
   +'OnChange'#7#23'DropFilesCheckBoxChange'#8'TabOrder'#2#16#11'UseOnChange'#8#0
   +#0#242#2#30#9'TCheckBox'#19'KeepCursorXCheckBox'#22'AnchorSideLeft.Control'#7
   +#5'Owner'#21'AnchorSideTop.Control'#7#16'CursorGroupLabel'#18'AnchorSideTop.'
   +'Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3','#1#5'Width'#3#135
-  +#0#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7
-  +'Caption'#6#19'KeepCursorXCheckBox'#8'OnChange'#7#25'KeepCursorXCheckBoxChan'
-  +'ge'#8'TabOrder'#2#17#11'UseOnChange'#8#0#0#242#2#31#9'TCheckBox'#24'Persist'
-  +'entCursorCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.C'
-  +'ontrol'#7#19'KeepCursorXCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'L'
-  +'eft'#2#6#6'Height'#2#19#3'Top'#3'?'#1#5'Width'#3#153#0#11'HelpContext'#2#0
-  +#18'BorderSpacing.Left'#2#6#7'Caption'#6#24'PersistentCursorCheckBox'#8'OnCh'
-  +'ange'#7#30'PersistentCursorCheckBoxChange'#8'TabOrder'#2#18#11'UseOnChange'
-  +#8#0#0#242#2' '#9'TCheckBox'#27'AlwaysVisibleCursorCheckBox'#22'AnchorSideLe'
-  +'ft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#24'PersistentCursorCheck'
-  +'Box'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'
-  +#3'R'#1#5'Width'#3#168#0#11'HelpContext'#2#0#18'BorderSpacing.Left'#2#6#7'Ca'
-  +'ption'#6#27'AlwaysVisibleCursorCheckBox'#8'OnChange'#7'!AlwaysVisibleCursor'
-  +'CheckBoxChange'#8'TabOrder'#2#19#11'UseOnChange'#8#0#0#242#2'!'#9'TCheckBox'
-  +#28'CursorSkipsSelectionCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'A'
-  +'nchorSideTop.Control'#7#16'CursorGroupLabel'#18'AnchorSideTop.Side'#7#9'asr'
-  +'Bottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3','#1#5'Width'#3#172#0#11'He'
-  +'lpContext'#2#0#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#28'CursorSkipsSelectionCheckBox'#8'OnChange'#7'"CursorSkipsSelec'
-  +'tionCheckBoxChange'#8'TabOrder'#2#20#11'UseOnChange'#8#0#0#242#2'"'#9'TChec'
-  +'kBox'#29'RightMouseMovesCursorCheckBox'#22'AnchorSideLeft.Control'#7#28'Cur'
-  +'sorSkipsSelectionCheckBox'#21'AnchorSideTop.Control'#7#24'PersistentCursorC'
-  +'heckBox'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3'?'#1#5'Width'#3#192#0#11'H'
-  +'elpContext'#2#0#7'Caption'#6#29'RightMouseMovesCursorCheckBox'#8'OnChange'#7
-  +'#RightMouseMovesCursorCheckBoxChange'#8'TabOrder'#2#21#11'UseOnChange'#8#0#0
-  +#242#2'#'#9'TCheckBox"HomeKeyJumpsToNearestStartCheckBox'#22'AnchorSideLeft.'
-  ,'Control'#7#28'CursorSkipsSelectionCheckBox'#21'AnchorSideTop.Control'#7#27
-  +'AlwaysVisibleCursorCheckBox'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3'R'#1#5
-  +'Width'#3#222#0#11'HelpContext'#2#0#7'Caption'#6'"HomeKeyJumpsToNearestStart'
-  +'CheckBox'#8'OnChange'#7'(HomeKeyJumpsToNearestStartCheckBoxChange'#8'TabOrd'
-  +'er'#2#22#11'UseOnChange'#8#0#0#0
+  +#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#19'Keep'
+  +'CursorXCheckBox'#8'OnChange'#7#25'KeepCursorXCheckBoxChange'#8'TabOrder'#2
+  +#17#11'UseOnChange'#8#0#0#242#2#31#9'TCheckBox'#24'PersistentCursorCheckBox'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#19'KeepCu'
+  +'rsorXCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2
+  +#19#3'Top'#3'?'#1#5'Width'#3#153#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#24
+  +'PersistentCursorCheckBox'#8'OnChange'#7#30'PersistentCursorCheckBoxChange'#8
+  +'TabOrder'#2#18#11'UseOnChange'#8#0#0#242#2' '#9'TCheckBox'#27'AlwaysVisible'
+  +'CursorCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Cont'
+  +'rol'#7#24'PersistentCursorCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  +'Left'#2#6#6'Height'#2#19#3'Top'#3'R'#1#5'Width'#3#168#0#18'BorderSpacing.Le'
+  +'ft'#2#6#7'Caption'#6#27'AlwaysVisibleCursorCheckBox'#8'OnChange'#7'!AlwaysV'
+  +'isibleCursorCheckBoxChange'#8'TabOrder'#2#19#11'UseOnChange'#8#0#0#242#2'!'
+  +#9'TCheckBox'#28'CursorSkipsSelectionCheckBox'#22'AnchorSideLeft.Control'#7#5
+  +'Owner'#21'AnchorSideTop.Control'#7#16'CursorGroupLabel'#18'AnchorSideTop.Si'
+  +'de'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3','#1#5'Width'#3
+  +#172#0#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7'Caption'
+  +#6#28'CursorSkipsSelectionCheckBox'#8'OnChange'#7'"CursorSkipsSelectionCheck'
+  +'BoxChange'#8'TabOrder'#2#20#11'UseOnChange'#8#0#0#242#2'"'#9'TCheckBox'#29
+  +'RightMouseMovesCursorCheckBox'#22'AnchorSideLeft.Control'#7#28'CursorSkipsS'
+  +'electionCheckBox'#21'AnchorSideTop.Control'#7#24'PersistentCursorCheckBox'#4
+  +'Left'#3#236#0#6'Height'#2#19#3'Top'#3'?'#1#5'Width'#3#192#0#7'Caption'#6#29
+  +'RightMouseMovesCursorCheckBox'#8'OnChange'#7'#RightMouseMovesCursorCheckBox'
+  +'Change'#8'TabOrder'#2#21#11'UseOnChange'#8#0#0#242#2'#'#9'TCheckBox"HomeKey'
+  +'JumpsToNearestStartCheckBox'#22'AnchorSideLeft.Control'#7#28'CursorSkipsSel'
+  +'ectionCheckBox'#21'AnchorSideTop.Control'#7#27'AlwaysVisibleCursorCheckBox'
+  +#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3'R'#1#5'Width'#3#222#0#7'Caption'#6
+  +'"HomeKeyJumpsToNearestStartCheckBox'#8'OnChange'#7'(HomeKeyJumpsToNearestSt'
+  +'artCheckBoxChange'#8'TabOrder'#2#22#11'UseOnChange'#8#0#0#0
 ]);
diff --git a/ide/frames/options_editor_general.pas b/ide/frames/options_editor_general.pas
index 246f55b8f4..fb06f3e53f 100644
--- a/ide/frames/options_editor_general.pas
+++ b/ide/frames/options_editor_general.pas
@@ -93,8 +93,12 @@ type
     procedure SmartTabsCheckBoxChange(Sender: TObject);
     procedure TabIndentBlocksCheckBoxChange(Sender: TObject);
     procedure TabsToSpacesCheckBoxChange(Sender: TObject);
+  private
+    FDefaultBookmarkImages: TImageList;
+    function DefaultBookmarkImages: TImageList;
   public
     PreviewEdits: array of TPreviewEditor;
+    procedure AddPreviewEdit(AEditor: TPreviewEditor);
     procedure SetPreviewOption(AValue: Boolean; AnOption: TSynEditorOption); overload;
     procedure SetPreviewOption(AValue: Boolean; AnOption: TSynEditorOption2); overload;
 
@@ -456,6 +460,29 @@ begin
   SetPreviewOption(TabsToSpacesCheckBox.Checked, eoTabsToSpaces);
 end;
 
+function TEditorGeneralOptionsFrame.DefaultBookmarkImages: TImageList;
+var
+  i: integer;
+begin
+  if FDefaultBookmarkImages = nil then
+  begin
+    FDefaultBookmarkImages := TImageList.Create(Self);
+    FDefaultBookmarkImages.Width := 11;
+    FDefaultBookmarkImages.Height := 11;
+    for i := 0 to 9 do
+      FDefaultBookmarkImages.AddLazarusResource('bookmark' + IntToStr(i));
+  end;
+  Result := FDefaultBookmarkImages;
+end;
+
+procedure TEditorGeneralOptionsFrame.AddPreviewEdit(AEditor: TPreviewEditor);
+begin
+  SetLength(PreviewEdits, Length(PreviewEdits) + 1);
+  PreviewEdits[Length(PreviewEdits)-1] := AEditor;
+  if AEditor.BookMarkOptions.BookmarkImages = nil then
+    AEditor.BookMarkOptions.BookmarkImages := DefaultBookmarkImages;
+end;
+
 constructor TEditorGeneralOptionsFrame.Create(AOwner: TComponent);
 begin
   inherited Create(AOwner);