ide: merge colors/highlighting page into ide options

git-svn-id: trunk@17197 -
2025-12-16 00:40:43 +01:00 · 2008-11-03 14:47:35 +00:00 · 2008-11-03 14:47:35 +00:00 · 8ef24288f3
commit 8ef24288f3
parent 5fcf051437
17 changed files with 2673 additions and 838 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -2435,6 +2435,9 @@ ide/frames/options_backup.pas svneol=native#text/pascal
 ide/frames/options_desktop.lfm svneol=native#text/plain
 ide/frames/options_desktop.lrs svneol=native#text/pascal
 ide/frames/options_desktop.pas svneol=native#text/pascal
+ide/frames/options_editor_color.lfm svneol=native#text/plain
+ide/frames/options_editor_color.lrs svneol=native#text/pascal
+ide/frames/options_editor_color.pas svneol=native#text/pascal
 ide/frames/options_editor_display.lfm svneol=native#text/plain
 ide/frames/options_editor_display.lrs svneol=native#text/plain
 ide/frames/options_editor_display.pas svneol=native#text/pascal
--- a/ide/editoroptionsdlg.lfm
+++ b/ide/editoroptionsdlg.lfm
@ -17,7 +17,7 @@ object EditorOptionsForm: TEditorOptionsForm
    Width = 554
    Align = alClient
    BorderSpacing.Bottom = 6
-    PageIndex = 1
+    PageIndex = 3
    TabOrder = 0
    object GeneralPage: TPage
      Caption = 'GeneralPage'
@ -106,6 +106,7 @@ object EditorOptionsForm: TEditorOptionsForm
          '4'
          '8'
        )
+        MaxLength = -1
        OnChange = ComboBoxOnChange
        OnExit = ComboBoxOnExit
        OnKeyDown = ComboBoxOnKeyDown
@ -125,6 +126,7 @@ object EditorOptionsForm: TEditorOptionsForm
          '4096'
          '512'
        )
+        MaxLength = -1
        OnChange = ComboBoxOnChange
        OnExit = ComboBoxOnExit
        OnKeyDown = ComboBoxOnKeyDown
@ -146,6 +148,7 @@ object EditorOptionsForm: TEditorOptionsForm
          '4'
          '8'
        )
+        MaxLength = -1
        OnChange = ComboBoxOnChange
        OnExit = ComboBoxOnExit
        OnKeyDown = ComboBoxOnKeyDown
@ -164,8 +167,8 @@ object EditorOptionsForm: TEditorOptionsForm
        Align = alTop
        BorderSpacing.Around = 6
        Caption = 'MarginAndGutterGroupBox'
-        ClientHeight = 110
-        ClientWidth = 530
+        ClientHeight = 128
+        ClientWidth = 534
        TabOrder = 1
        object RightMarginLabel: TLabel
          Left = 358
@ -261,6 +264,7 @@ object EditorOptionsForm: TEditorOptionsForm
            '78'
            '76'
          )
+          MaxLength = -1
          OnChange = ComboBoxOnChange
          OnExit = ComboBoxOnExit
          OnKeyDown = ComboBoxOnKeyDown
@ -291,8 +295,8 @@ object EditorOptionsForm: TEditorOptionsForm
        AutoSize = True
        BorderSpacing.Around = 6
        Caption = 'EditorFontGroupBox'
-        ClientHeight = 127
-        ClientWidth = 530
+        ClientHeight = 145
+        ClientWidth = 534
        TabOrder = 0
        object EditorFontHeightLabel: TLabel
          AnchorSideTop.Control = EditorFontHeightComboBox
@ -339,6 +343,7 @@ object EditorOptionsForm: TEditorOptionsForm
          Anchors = [akTop, akLeft, akRight]
          BorderSpacing.Around = 6
          ItemHeight = 13
+          MaxLength = -1
          OnEditingDone = EditorFontComboBoxEditingDone
          TabOrder = 0
          Text = 'EditorFontComboBox'
@ -372,6 +377,7 @@ object EditorOptionsForm: TEditorOptionsForm
            '17'
            '18'
          )
+          MaxLength = -1
          OnChange = ComboBoxOnChange
          OnExit = ComboBoxOnExit
          OnKeyDown = ComboBoxOnKeyDown
@ -390,6 +396,7 @@ object EditorOptionsForm: TEditorOptionsForm
            '1'
            '2'
          )
+          MaxLength = -1
          OnChange = ComboBoxOnChange
          OnExit = ComboBoxOnExit
          OnKeyDown = ComboBoxOnKeyDown
@ -408,6 +415,7 @@ object EditorOptionsForm: TEditorOptionsForm
            '1'
            '2'
          )
+          MaxLength = -1
          OnChange = ComboBoxOnChange
          OnExit = ComboBoxOnExit
          OnKeyDown = ComboBoxOnKeyDown
@ -442,7 +450,6 @@ object EditorOptionsForm: TEditorOptionsForm
        ParentColor = False
        ParentFont = False
        TabOrder = 2
-        BookMarkOptions.OnChange = nil
        Keystrokes = <        
          item
            Command = 3
@ -768,13 +775,14 @@ object EditorOptionsForm: TEditorOptionsForm
          'DisplayPreview'
        )
        ReadOnly = True
+        SelectedColor.OnChange = nil
        OnSpecialLineMarkup = OnSpecialLineColors
        OnStatusChange = DisplayPreviewStatusChange
      end
    end
    object KeymappingPage: TPage
      Caption = 'KeymappingPage'
-      ClientWidth = 550
+      ClientWidth = 546
      ClientHeight = 505
      object KeyMappingHelpLabel: TLabel
        AnchorSideTop.Control = KeymappingPage
@ -810,7 +818,7 @@ object EditorOptionsForm: TEditorOptionsForm
        AnchorSideRight.Side = asrBottom
        AnchorSideBottom.Control = KeymappingPage
        AnchorSideBottom.Side = asrBottom
-        Left = 341
+        Left = 337
        Height = 23
        Top = 476
        Width = 203
@ -831,7 +839,7 @@ object EditorOptionsForm: TEditorOptionsForm
        Left = 6
        Height = 382
        Top = 59
-        Width = 538
+        Width = 534
        Anchors = [akTop, akLeft, akRight, akBottom]
        BorderSpacing.Around = 6
        DefaultItemHeight = 15
@ -850,7 +858,7 @@ object EditorOptionsForm: TEditorOptionsForm
        Left = 6
        Height = 27
        Top = 26
-        Width = 538
+        Width = 534
        Anchors = [akTop, akLeft, akRight]
        AutoSize = True
        BorderSpacing.Around = 6
@ -878,7 +886,7 @@ object EditorOptionsForm: TEditorOptionsForm
    end
    object ColorPage: TPage
      Caption = 'ColorPage'
-      ClientWidth = 550
+      ClientWidth = 546
      ClientHeight = 505
      object LanguageLabel: TLabel
        Left = 214
@ -917,6 +925,8 @@ object EditorOptionsForm: TEditorOptionsForm
        Height = 21
        Top = 10
        Width = 200
+        ItemHeight = 13
+        MaxLength = -1
        OnChange = ComboBoxOnChange
        OnExit = ComboBoxOnExit
        OnKeyDown = ComboBoxOnKeyDown
@ -928,6 +938,8 @@ object EditorOptionsForm: TEditorOptionsForm
        Height = 21
        Top = 34
        Width = 200
+        ItemHeight = 13
+        MaxLength = -1
        OnChange = ComboBoxOnChange
        OnExit = ComboBoxOnExit
        OnKeyDown = ComboBoxOnKeyDown
@ -939,11 +951,13 @@ object EditorOptionsForm: TEditorOptionsForm
        Height = 21
        Top = 58
        Width = 200
+        ItemHeight = 13
        Items.Strings = (
          'pp;pas;inc;lpr;lrs;dpr;dpk'
          'pp;pas;inc;lpr;lrs'
          'pp;pas;inc'
        )
+        MaxLength = -1
        OnChange = ComboBoxOnChange
        OnExit = ComboBoxOnExit
        OnKeyDown = ComboBoxOnKeyDown
@ -953,7 +967,7 @@ object EditorOptionsForm: TEditorOptionsForm
        Left = 4
        Height = 123
        Top = 378
-        Width = 542
+        Width = 538
        Align = alBottom
        BorderSpacing.Around = 4
        Anchors = [akTop, akLeft, akRight, akBottom]
@ -965,7 +979,6 @@ object EditorOptionsForm: TEditorOptionsForm
        ParentFont = False
        TabOrder = 3
        OnMouseDown = ColorPreviewMouseUp
-        BookMarkOptions.OnChange = nil
        Keystrokes = <        
          item
            Command = 3
@ -1291,6 +1304,7 @@ object EditorOptionsForm: TEditorOptionsForm
          'ColorPreview'
        )
        ReadOnly = True
+        SelectedColor.OnChange = nil
        OnSpecialLineMarkup = OnSpecialLineColors
        OnStatusChange = DisplayPreviewStatusChange
      end
@ -1303,7 +1317,6 @@ object EditorOptionsForm: TEditorOptionsForm
        OnClick = ColorElementListBoxClick
        OnSelectionChange = ColorElementListBoxSelectionChange
        TabOrder = 4
-        TopIndex = -1
      end
      object SetAttributeToDefaultButton: TButton
        AnchorSideRight.Control = ColorPage
@ -1311,7 +1324,7 @@ object EditorOptionsForm: TEditorOptionsForm
        Left = 212
        Height = 25
        Top = 90
-        Width = 332
+        Width = 328
        Anchors = [akTop, akLeft, akRight]
        BorderSpacing.Around = 6
        Caption = 'SetAttributeToDefaultButton'
@ -1324,7 +1337,7 @@ object EditorOptionsForm: TEditorOptionsForm
        Left = 212
        Height = 25
        Top = 122
-        Width = 332
+        Width = 328
        Anchors = [akTop, akLeft, akRight]
        BorderSpacing.Around = 6
        Caption = 'SetAllAttributesToDefaultButton'
@ -1338,12 +1351,12 @@ object EditorOptionsForm: TEditorOptionsForm
        Left = 212
        Height = 218
        Top = 154
-        Width = 332
+        Width = 328
        Anchors = [akTop, akLeft, akRight, akBottom]
        BorderSpacing.Around = 6
        Caption = 'Attributes'
-        ClientHeight = 218
-        ClientWidth = 332
+        ClientHeight = 200
+        ClientWidth = 324
        TabOrder = 7
        object ForeGroundLabel: TLabel
          Left = 8
@ -1395,7 +1408,7 @@ object EditorOptionsForm: TEditorOptionsForm
          Left = 94
          Height = 19
          Top = 16
-          Width = 189
+          Width = 181
          Anchors = [akTop, akLeft, akRight]
          BorderSpacing.Top = 2
          Caption = 'ForeGroundUseDefaultCheckBox'
@ -1408,7 +1421,7 @@ object EditorOptionsForm: TEditorOptionsForm
          Left = 94
          Height = 19
          Top = 56
-          Width = 189
+          Width = 181
          Anchors = [akTop, akLeft, akRight]
          BorderSpacing.Right = 2
          Caption = 'BackGroundUseDefaultCheckBox'
@ -1418,25 +1431,25 @@ object EditorOptionsForm: TEditorOptionsForm
        object TextUnderlinePanel: TPanel
          Left = 6
          Height = 19
-          Top = 139
-          Width = 316
+          Top = 125
+          Width = 312
          Align = alBottom
          AutoSize = True
          BorderSpacing.Around = 6
          BevelOuter = bvNone
          ClientHeight = 19
-          ClientWidth = 316
+          ClientWidth = 312
          TabOrder = 2
          object TextUnderlineCheckBox: TCheckBox
            Height = 19
-            Width = 172
+            Width = 168
            Align = alClient
            Caption = 'TextUnderlineCheckBox'
            OnChange = GeneralCheckBoxOnChange
            TabOrder = 0
          end
          object TextUnderlineRadioPanel: TPanel
-            Left = 172
+            Left = 168
            Height = 19
            Width = 144
            Align = alRight
@ -1453,7 +1466,7 @@ object EditorOptionsForm: TEditorOptionsForm
            Visible = False
            object TextUnderlineRadioOn: TRadioButton
              Tag = 3
-              Height = 21
+              Height = 19
              Width = 40
              Caption = 'On'
              Checked = True
@ -1464,17 +1477,17 @@ object EditorOptionsForm: TEditorOptionsForm
            object TextUnderlineRadioOff: TRadioButton
              Tag = 3
              Left = 43
-              Height = 21
-              Width = 40
+              Height = 19
+              Width = 42
              Caption = 'Off'
              OnChange = TextStyleRadioOnChange
              TabOrder = 1
            end
            object TextUnderlineRadioInvert: TRadioButton
              Tag = 3
-              Left = 86
-              Height = 21
-              Width = 58
+              Left = 88
+              Height = 19
+              Width = 56
              Caption = 'Invert'
              OnChange = TextStyleRadioOnChange
              TabOrder = 2
@ -1484,25 +1497,25 @@ object EditorOptionsForm: TEditorOptionsForm
        object TextBoldPanel: TPanel
          Left = 6
          Height = 19
-          Top = 164
-          Width = 316
+          Top = 150
+          Width = 312
          Align = alBottom
          AutoSize = True
          BorderSpacing.Around = 6
          BevelOuter = bvNone
          ClientHeight = 19
-          ClientWidth = 316
+          ClientWidth = 312
          TabOrder = 3
          object TextBoldCheckBox: TCheckBox
            Height = 19
-            Width = 172
+            Width = 168
            Align = alClient
            Caption = 'TextBoldCheckBox'
            OnChange = GeneralCheckBoxOnChange
            TabOrder = 0
          end
          object TextBoldRadioPanel: TPanel
-            Left = 172
+            Left = 168
            Height = 19
            Width = 144
            Align = alRight
@ -1519,7 +1532,7 @@ object EditorOptionsForm: TEditorOptionsForm
            Visible = False
            object TextBoldRadioOn: TRadioButton
              Tag = 1
-              Height = 21
+              Height = 19
              Width = 40
              Caption = 'On'
              Checked = True
@ -1530,17 +1543,17 @@ object EditorOptionsForm: TEditorOptionsForm
            object TextBoldRadioOff: TRadioButton
              Tag = 1
              Left = 43
-              Height = 21
-              Width = 40
+              Height = 19
+              Width = 42
              Caption = 'Off'
              OnChange = TextStyleRadioOnChange
              TabOrder = 1
            end
            object TextBoldRadioInvert: TRadioButton
              Tag = 1
-              Left = 86
-              Height = 21
-              Width = 58
+              Left = 88
+              Height = 19
+              Width = 56
              Caption = 'Invert'
              OnChange = TextStyleRadioOnChange
              TabOrder = 2
@ -1550,25 +1563,25 @@ object EditorOptionsForm: TEditorOptionsForm
        object TextItalicPanel: TPanel
          Left = 6
          Height = 19
-          Top = 189
-          Width = 316
+          Top = 175
+          Width = 312
          Align = alBottom
          AutoSize = True
          BorderSpacing.Around = 6
          BevelOuter = bvNone
          ClientHeight = 19
-          ClientWidth = 316
+          ClientWidth = 312
          TabOrder = 4
          object TextItalicCheckBox: TCheckBox
            Height = 19
-            Width = 172
+            Width = 168
            Align = alClient
            Caption = 'TextItalicCheckBox'
            OnChange = GeneralCheckBoxOnChange
            TabOrder = 0
          end
          object TextItalicRadioPanel: TPanel
-            Left = 172
+            Left = 168
            Height = 19
            Width = 144
            Align = alRight
@ -1585,7 +1598,7 @@ object EditorOptionsForm: TEditorOptionsForm
            Visible = False
            object TextItalicRadioOn: TRadioButton
              Tag = 2
-              Height = 21
+              Height = 19
              Width = 40
              Caption = 'On'
              Checked = True
@ -1596,17 +1609,17 @@ object EditorOptionsForm: TEditorOptionsForm
            object TextItalicRadioOff: TRadioButton
              Tag = 2
              Left = 43
-              Height = 21
-              Width = 40
+              Height = 19
+              Width = 42
              Caption = 'Off'
              OnChange = TextStyleRadioOnChange
              TabOrder = 1
            end
            object TextItalicRadioInvert: TRadioButton
              Tag = 2
-              Left = 86
-              Height = 21
-              Width = 58
+              Left = 88
+              Height = 19
+              Width = 56
              Caption = 'Invert'
              OnChange = TextStyleRadioOnChange
              TabOrder = 2
--- a/ide/editoroptionsdlg.lrs
+++ b/ide/editoroptionsdlg.lrs
@ -7,7 +7,7 @@ LazarusResources.Add('TEditorOptionsForm','FORMDATA',[
  +'*'#2#21'Constraints.MinHeight'#3#244#1#20'Constraints.MinWidth'#3#164#1#10
  +'ParentFont'#8#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.27'#0
  +#9'TNotebook'#12'MainNotebook'#6'Height'#3#19#2#5'Width'#3'*'#2#5'Align'#7#8
-  +'alClient'#20'BorderSpacing.Bottom'#2#6#9'PageIndex'#2#1#8'TabOrder'#2#0#0#5
+  +'alClient'#20'BorderSpacing.Bottom'#2#6#9'PageIndex'#2#3#8'TabOrder'#2#0#0#5
  +'TPage'#11'GeneralPage'#7'Caption'#6#11'GeneralPage'#11'ClientWidth'#3'"'#2
  +#12'ClientHeight'#3#249#1#0#6'TLabel'#16'BlockIndentLabel'#22'AnchorSideLeft'
  +'.Control'#7#19'BlockIndentComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'
@ -40,51 +40,52 @@ LazarusResources.Add('TEditorOptionsForm','FORMDATA',[
  +#2#3#0#0#9'TComboBox'#19'BlockIndentComboBox'#24'AnchorSideBottom.Control'#7
  +#17'UndoLimitComboBox'#4'Left'#2#6#6'Height'#2#21#3'Top'#3#168#1#5'Width'#2
  +'d'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#10'It'
-  +'emHeight'#2#13#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#8'OnChange'
-  +#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'Com'
-  +'boBoxOnKeyDown'#8'TabOrder'#2#0#0#0#9'TComboBox'#17'UndoLimitComboBox'#24'A'
-  +'nchorSideBottom.Control'#7#17'TabWidthsComboBox'#4'Left'#2#6#6'Height'#2#21
-  +#3'Top'#3#195#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'Borde'
-  +'rSpacing.Around'#2#6#10'ItemHeight'#2#13#13'Items.Strings'#1#6#5'32767'#6#4
-  +'4096'#6#3'512'#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBox'
-  +'OnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#1#0#0#9'TComboBo'
-  +'x'#17'TabWidthsComboBox'#24'AnchorSideBottom.Control'#7#11'GeneralPage'#21
-  +'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#3
-  +#222#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.'
-  +'Around'#2#6#10'ItemHeight'#2#13#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1
-  +'8'#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'On'
-  +'KeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0#0#5'TPage'#11'DisplayP'
-  +'age'#7'Caption'#6#11'DisplayPage'#11'ClientWidth'#3'"'#2#12'ClientHeight'#3
-  +#249#1#0#9'TGroupBox'#23'MarginAndGutterGroupBox'#4'Left'#2#6#6'Height'#3#128
-  +#0#3'Top'#2#6#5'Width'#3#22#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2
-  +#6#7'Caption'#6#23'MarginAndGutterGroupBox'#12'ClientHeight'#2'n'#11'ClientW'
-  +'idth'#3#18#2#8'TabOrder'#2#1#0#6'TLabel'#16'RightMarginLabel'#4'Left'#3'f'#1
-  +#6'Height'#2#14#3'Top'#2#8#5'Width'#2'S'#7'Caption'#6#16'RightMarginLabel'#11
-  +'ParentColor'#8#0#0#12'TColorButton'#22'RightMarginColorButton'#4'Left'#3#246
-  +#0#6'Height'#2#21#3'Top'#2'"'#5'Width'#2'd'#11'BorderWidth'#2#2#15'ButtonCol'
-  +'orSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7'"RightMarginColor'
-  +'ButtonColorChanged'#0#0#12'TColorButton'#17'GutterColorButton'#4'Left'#3#246
-  +#0#6'Height'#2#21#3'Top'#2'<'#5'Width'#2'd'#11'BorderWidth'#2#2#15'ButtonCol'
-  ,'orSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7#23'ColorButtonCol'
-  +'orChanged'#0#0#6'TLabel'#21'RightMarginColorLabel'#4'Left'#3'f'#1#6'Height'
-  +#2#14#3'Top'#2' '#5'Width'#2'l'#7'Caption'#6#21'RightMarginColorLabel'#11'Pa'
-  +'rentColor'#8#0#0#6'TLabel'#16'GutterColorLabel'#4'Left'#3'f'#1#6'Height'#2
-  +#14#3'Top'#2'='#5'Width'#2'R'#7'Caption'#6#16'GutterColorLabel'#11'ParentCol'
-  +'or'#8#0#0#6'TLabel#ShowOnlyLineNumbersMultiplesOfLabel'#21'AnchorSideTop.Co'
-  +'ntrol'#7#23'ShowLineNumbersCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
-  +'Left'#2#6#6'Height'#2#14#3'Top'#2'Q'#5'Width'#2'n'#17'BorderSpacing.Top'#2#6
-  +#7'Caption'#6#22'Every n-th line number'#11'ParentColor'#8#0#0#9'TCheckBox'
-  +#26'VisibleRightMarginCheckBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#8#5'Widt'
-  +'h'#3#159#0#7'Caption'#6#26'VisibleRightMarginCheckBox'#8'OnChange'#7#23'Gen'
-  +'eralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#9'TCheckBox'#21'VisibleGutterChec'
-  +'kBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2' '#5'Width'#3#133#0#7'Caption'#6
-  +#21'VisibleGutterCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOr'
-  +'der'#2#1#0#0#9'TCheckBox'#23'ShowLineNumbersCheckBox'#4'Left'#2#6#6'Height'
-  +#2#19#3'Top'#2'8'#5'Width'#3#160#0#7'Caption'#6#23'ShowLineNumbersCheckBox'#8
-  +'OnChange'#7#23'GeneralCheckBoxOnChange'#7'OnClick'#7#28'ShowLineNumbersChec'
-  +'kBoxClick'#8'TabOrder'#2#2#0#0#9'TComboBox'#19'RightMarginComboBox'#4'Left'
-  +#3#246#0#6'Height'#2#21#3'Top'#2#4#5'Width'#2'd'#10'ItemHeight'#2#13#13'Item'
-  +'s.Strings'#1#6#2'80'#6#2'78'#6#2'76'#0#8'OnChange'#7#16'ComboBoxOnChange'#6
+  +'emHeight'#2#13#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'MaxLengt'
+  +'h'#2#255#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9
+  +'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#0#0#0#9'TComboBox'#17'Undo'
+  +'LimitComboBox'#24'AnchorSideBottom.Control'#7#17'TabWidthsComboBox'#4'Left'
+  +#2#6#6'Height'#2#21#3'Top'#3#195#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'a'
+  +'kBottom'#0#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#13#13'Items.String'
+  +'s'#1#6#5'32767'#6#4'4096'#6#3'512'#0#9'MaxLength'#2#255#8'OnChange'#7#16'Co'
+  +'mboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOn'
+  +'KeyDown'#8'TabOrder'#2#1#0#0#9'TComboBox'#17'TabWidthsComboBox'#24'AnchorSi'
+  +'deBottom.Control'#7#11'GeneralPage'#21'AnchorSideBottom.Side'#7#9'asrBottom'
+  +#4'Left'#2#6#6'Height'#2#21#3'Top'#3#222#1#5'Width'#2'd'#7'Anchors'#11#6'akL'
+  +'eft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#13#13'Item'
+  +'s.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'MaxLength'#2#255#8'OnChange'#7
+  +#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'Combo'
+  +'BoxOnKeyDown'#8'TabOrder'#2#2#0#0#0#5'TPage'#11'DisplayPage'#7'Caption'#6#11
+  +'DisplayPage'#11'ClientWidth'#3'"'#2#12'ClientHeight'#3#249#1#0#9'TGroupBox'
+  +#23'MarginAndGutterGroupBox'#4'Left'#2#6#6'Height'#3#128#0#3'Top'#2#6#5'Widt'
+  +'h'#3#22#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#23
+  +'MarginAndGutterGroupBox'#12'ClientHeight'#3#128#0#11'ClientWidth'#3#22#2#8
+  +'TabOrder'#2#1#0#6'TLabel'#16'RightMarginLabel'#4'Left'#3'f'#1#6'Height'#2#14
+  +#3'Top'#2#8#5'Width'#2'S'#7'Caption'#6#16'RightMarginLabel'#11'ParentColor'#8
+  +#0#0#12'TColorButton'#22'RightMarginColorButton'#4'Left'#3#246#0#6'Height'#2
+  +#21#3'Top'#2'"'#5'Width'#2'd'#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5
+  +'Color'#7#9'clBtnFace'#14'OnColorChanged'#7'"RightMarginColorButtonColorChan'
+  +'ged'#0#0#12'TColorButton'#17'GutterColorButton'#4'Left'#3#246#0#6'Height'#2
+  ,#21#3'Top'#2'<'#5'Width'#2'd'#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5
+  +'Color'#7#9'clBtnFace'#14'OnColorChanged'#7#23'ColorButtonColorChanged'#0#0#6
+  +'TLabel'#21'RightMarginColorLabel'#4'Left'#3'f'#1#6'Height'#2#14#3'Top'#2' '
+  +#5'Width'#2'l'#7'Caption'#6#21'RightMarginColorLabel'#11'ParentColor'#8#0#0#6
+  +'TLabel'#16'GutterColorLabel'#4'Left'#3'f'#1#6'Height'#2#14#3'Top'#2'='#5'Wi'
+  +'dth'#2'R'#7'Caption'#6#16'GutterColorLabel'#11'ParentColor'#8#0#0#6'TLabel#'
+  +'ShowOnlyLineNumbersMultiplesOfLabel'#21'AnchorSideTop.Control'#7#23'ShowLin'
+  +'eNumbersCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heigh'
+  +'t'#2#14#3'Top'#2'Q'#5'Width'#2'n'#17'BorderSpacing.Top'#2#6#7'Caption'#6#22
+  +'Every n-th line number'#11'ParentColor'#8#0#0#9'TCheckBox'#26'VisibleRightM'
+  +'arginCheckBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#8#5'Width'#3#159#0#7'Cap'
+  +'tion'#6#26'VisibleRightMarginCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnCh'
+  +'ange'#8'TabOrder'#2#0#0#0#9'TCheckBox'#21'VisibleGutterCheckBox'#4'Left'#2#6
+  +#6'Height'#2#19#3'Top'#2' '#5'Width'#3#133#0#7'Caption'#6#21'VisibleGutterCh'
+  +'eckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#1#0#0#9'TCh'
+  +'eckBox'#23'ShowLineNumbersCheckBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'8'#5
+  +'Width'#3#160#0#7'Caption'#6#23'ShowLineNumbersCheckBox'#8'OnChange'#7#23'Ge'
+  +'neralCheckBoxOnChange'#7'OnClick'#7#28'ShowLineNumbersCheckBoxClick'#8'TabO'
+  +'rder'#2#2#0#0#9'TComboBox'#19'RightMarginComboBox'#4'Left'#3#246#0#6'Height'
+  +#2#21#3'Top'#2#4#5'Width'#2'd'#10'ItemHeight'#2#13#13'Items.Strings'#1#6#2'8'
+  +'0'#6#2'78'#6#2'76'#0#9'MaxLength'#2#255#8'OnChange'#7#16'ComboBoxOnChange'#6
  +'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrde'
  +'r'#2#3#0#0#9'TSpinEdit&ShowOnlyLineNumbersMultiplesOfSpinEdit'#22'AnchorSid'
  +'eLeft.Control'#7'#ShowOnlyLineNumbersMultiplesOfLabel'#19'AnchorSideLeft.Si'
@ -94,352 +95,354 @@ LazarusResources.Add('TEditorOptionsForm','FORMDATA',[
  +'ange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#4#5'Value'#2#1#0#0#0#9'TG'
  +'roupBox'#18'EditorFontGroupBox'#4'Left'#2#6#6'Height'#3#145#0#3'Top'#3#140#0
  +#5'Width'#3#22#2#5'Align'#7#5'alTop'#8'AutoSize'#9#20'BorderSpacing.Around'#2
-  +#6#7'Caption'#6#18'EditorFontGroupBox'#12'ClientHeight'#2''#11'ClientWidth'
-  +#3#18#2#8'TabOrder'#2#0#0#6'TLabel'#21'EditorFontHeightLabel'#21'AnchorSideT'
-  +'op.Control'#7#24'EditorFontHeightComboBox'#18'AnchorSideTop.Side'#7#9'asrCe'
-  +'nter'#4'Left'#2't'#6'Height'#2#14#3'Top'#2'$'#5'Width'#3'{'#1#7'Anchors'#11
-  +#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#21
-  +'EditorFontHeightLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'ExtraLineSpacingL'
-  +'abel'#21'AnchorSideTop.Control'#7#24'ExtraLineSpacingComboBox'#18'AnchorSid'
-  +'eTop.Side'#7#9'asrCenter'#4'Left'#2't'#6'Height'#2#14#3'Top'#2'9'#5'Width'#3
-  +'{'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'
-  +#2#6#7'Caption'#6#21'ExtraLineSpacingLabel'#11'ParentColor'#8#0#0#6'TLabel'
-  +#21'ExtraCharSpacingLabel'#21'AnchorSideTop.Control'#7#24'ExtraCharSpacingCo'
-  +'mboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2't'#6'Height'#2#14#3
-  +'Top'#2'N'#5'Width'#3'{'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#21'ExtraCharSpacingLabel'#11'ParentC'
-  +'olor'#8#0#0#9'TComboBox'#18'EditorFontComboBox'#23'AnchorSideRight.Control'
-  +#7#16'EditorFontButton'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#6#5'Width'#3#205
-  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6
-  +#10'ItemHeight'#2#13#13'OnEditingDone'#7#29'EditorFontComboBoxEditingDone'#8
-  +'TabOrder'#2#0#4'Text'#6#18'EditorFontComboBox'#0#0#7'TButton'#16'EditorFont'
-  +'Button'#4'Left'#3#217#1#6'Height'#2#25#3'Top'#2#6#5'Width'#2#25#7'Anchors'
-  +#11#5'akTop'#7'akRight'#0#7'Caption'#6#3'...'#7'OnClick'#7#21'EditorFontButt'
-  +'onClick'#8'TabOrder'#2#1#0#0#9'TComboBox'#24'EditorFontHeightComboBox'#21'A'
-  +'nchorSideTop.Control'#7#18'EditorFontComboBox'#18'AnchorSideTop.Side'#7#9'a'
-  +'srBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'!'#5'Width'#2'd'#10'ItemHeigh'
-  +'t'#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#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14
-  +'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0#9
-  +'TComboBox'#24'ExtraLineSpacingComboBox'#21'AnchorSideTop.Control'#7#24'Edit'
-  +'orFontHeightComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
-  +'eight'#2#21#3'Top'#2'6'#5'Width'#2'd'#10'ItemHeight'#2#13#13'Items.Strings'
-  +#1#6#1'0'#6#1'1'#6#1'2'#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14
-  +'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#4#0#0#9
-  +'TComboBox'#24'ExtraCharSpacingComboBox'#21'AnchorSideTop.Control'#7#24'Extr'
-  +'aLineSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
-  +'eight'#2#21#3'Top'#2'K'#5'Width'#2'd'#10'ItemHeight'#2#13#13'Items.Strings'
-  ,#1#6#1'0'#6#1'1'#6#1'2'#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14
-  +'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#3#0#0#9
-  +'TCheckBox'#27'DisableAntialiasingCheckBox'#21'AnchorSideTop.Control'#7#24'E'
-  +'xtraCharSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6
-  +'Height'#2#19#3'Top'#2'f'#5'Width'#3#6#2#5'Align'#7#8'alBottom'#7'Anchors'#11
-  +#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#27'DisableAntialiasingCheckBox'#8'OnChange'#7#23'GeneralCheckBox'
-  +'OnChange'#8'TabOrder'#2#5#0#0#0#8'TSynEdit'#14'DisplayPreview'#4'Left'#2#6#6
-  +'Height'#3#208#0#3'Top'#3'#'#1#5'Width'#3#22#2#5'Align'#7#8'alClient'#20'Bor'
-  +'derSpacing.Around'#2#6#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#10'F'
-  +'ont.Pitch'#7#7'fpFixed'#12'Font.Quality'#7#16'fqNonAntialiased'#11'ParentCo'
-  +'lor'#8#10'ParentFont'#8#8'TabOrder'#2#2#24'BookMarkOptions.OnChange'#13#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#19'OnSpecialLi'
-  +'neMarkup'#7#19'OnSpecialLineColors'#14'OnStatusChange'#7#26'DisplayPreviewS'
-  +'tatusChange'#0#0#0#5'TPage'#14'KeymappingPage'#7'Caption'#6#14'KeymappingPa'
-  +'ge'#11'ClientWidth'#3'&'#2#12'ClientHeight'#3#249#1#0#6'TLabel'#19'KeyMappi'
-  +'ngHelpLabel'#21'AnchorSideTop.Control'#7#14'KeymappingPage'#4'Left'#2#8#6'H'
-  +'eight'#2#14#3'Top'#2#6#5'Width'#2'i'#18'BorderSpacing.Left'#2#6#17'BorderSp'
-  +'acing.Top'#2#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#19'KeyMappingHelpLa'
-  +'bel'#11'ParentColor'#8#0#0#7'TButton'#28'KeyMappingChooseSchemeButton'#22'A'
-  +'nchorSideLeft.Control'#7#14'KeymappingPage'#21'AnchorSideTop.Control'#7#14
-  +'KeymappingPage'#24'AnchorSideBottom.Control'#7#14'KeymappingPage'#21'Anchor'
-  ,'SideBottom.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#220#1#5
-  +'Width'#3#189#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'Borde'
-  +'rSpacing.Around'#2#6#7'Caption'#6#28'KeyMappingChooseSchemeButton'#7'OnClic'
-  +'k'#7'!KeyMappingChooseSchemeButtonClick'#8'TabOrder'#2#0#0#0#7'TButton KeyM'
-  +'appingConsistencyCheckButton'#21'AnchorSideTop.Control'#7#14'KeymappingPage'
-  +#23'AnchorSideRight.Control'#7#14'KeymappingPage'#20'AnchorSideRight.Side'#7
-  +#9'asrBottom'#24'AnchorSideBottom.Control'#7#14'KeymappingPage'#21'AnchorSid'
-  +'eBottom.Side'#7#9'asrBottom'#4'Left'#3'U'#1#6'Height'#2#23#3'Top'#3#220#1#5
-  +'Width'#3#203#0#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'Bord'
-  +'erSpacing.Around'#2#6#7'Caption'#6' KeyMappingConsistencyCheckButton'#7'OnC'
-  +'lick'#7'%KeyMappingConsistencyCheckButtonClick'#8'TabOrder'#2#1#0#0#9'TTree'
-  +'View'#18'KeyMappingTreeView'#22'AnchorSideLeft.Control'#7#14'KeymappingPage'
-  +#21'AnchorSideTop.Control'#7#20'KeyMappingFilterEdit'#18'AnchorSideTop.Side'
-  +#7#9'asrBottom'#23'AnchorSideRight.Control'#7#14'KeymappingPage'#20'AnchorSi'
-  +'deRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#23'KeyMappingFi'
-  +'ndKeyButton'#4'Left'#2#6#6'Height'#3'~'#1#3'Top'#2';'#5'Width'#3#26#2#7'Anc'
-  +'hors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Aroun'
-  +'d'#2#6#17'DefaultItemHeight'#2#15#8'ReadOnly'#9#9'RowSelect'#9#8'TabOrder'#2
-  +#2#9'OnMouseUp'#7#25'KeyMappingTreeViewMouseUp'#7'Options'#11#17'tvoAutoItem'
-  +'Height'#16'tvoHideSelection'#21'tvoKeepCollapsedNodes'#11'tvoReadOnly'#12't'
-  +'voRowSelect'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#17'tvoShow'
-  +'Separators'#11'tvoToolTips'#0#0#0#5'TEdit'#20'KeyMappingFilterEdit'#22'Anch'
-  +'orSideLeft.Control'#7#14'KeymappingPage'#21'AnchorSideTop.Control'#7#19'Key'
-  +'MappingHelpLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.'
-  +'Control'#7#14'KeymappingPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Lef'
-  +'t'#2#6#6'Height'#2#27#3'Top'#2#26#5'Width'#3#26#2#7'Anchors'#11#5'akTop'#6
-  +'akLeft'#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#8'OnChange'
-  +#7#26'KeyMappingFilterEditChange'#7'OnEnter'#7#25'KeyMappingFilterEditEnter'
-  +#6'OnExit'#7#24'KeyMappingFilterEditExit'#8'TabOrder'#2#3#4'Text'#6#20'KeyMa'
-  +'ppingFilterEdit'#0#0#7'TButton'#23'KeyMappingFindKeyButton'#22'AnchorSideLe'
-  +'ft.Control'#7#14'KeymappingPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24
-  +'AnchorSideBottom.Control'#7#28'KeyMappingChooseSchemeButton'#4'Left'#2#6#6
-  +'Height'#2#23#3'Top'#3#191#1#5'Width'#3#154#0#7'Anchors'#11#6'akLeft'#8'akBo'
-  +'ttom'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'KeyMappi'
-  +'ngFindKeyButton'#7'OnClick'#7#28'KeyMappingFindKeyButtonClick'#8'TabOrder'#2
-  +#4#0#0#0#5'TPage'#9'ColorPage'#7'Caption'#6#9'ColorPage'#11'ClientWidth'#3'&'
-  +#2#12'ClientHeight'#3#249#1#0#6'TLabel'#13'LanguageLabel'#4'Left'#3#214#0#6
-  +'Height'#2#14#3'Top'#2#12#5'Width'#2'I'#7'Caption'#6#13'LanguageLabel'#11'Pa'
-  +'rentColor'#8#0#0#6'TLabel'#16'ColorSchemeLabel'#4'Left'#3#214#0#6'Height'#2
-  +#14#3'Top'#2'$'#5'Width'#2'X'#7'Caption'#6#16'ColorSchemeLabel'#11'ParentCol'
-  +'or'#8#0#0#6'TLabel'#19'FileExtensionsLabel'#4'Left'#3#214#0#6'Height'#2#14#3
-  +'Top'#2'<'#5'Width'#2'^'#7'Caption'#6#19'FileExtensionsLabel'#11'ParentColor'
-  +#8#0#0#6'TLabel'#17'ColorElementLabel'#4'Left'#2#4#6'Height'#2#14#3'Top'#2'Z'
-  +#5'Width'#2'Y'#7'Caption'#6#17'ColorElementLabel'#11'ParentColor'#8#0#0#9'TC'
-  +'omboBox'#16'LanguageComboBox'#4'Left'#2#3#6'Height'#2#21#3'Top'#2#10#5'Widt'
-  +'h'#3#200#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'
-  +#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#0#4'Text'#6#16'LanguageC'
-  +'omboBox'#0#0#9'TComboBox'#19'ColorSchemeComboBox'#4'Left'#2#3#6'Height'#2#21
-  +#3'Top'#2'"'#5'Width'#3#200#0#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7
-  +#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#1#4'T'
-  +'ext'#6#19'ColorSchemeComboBox'#0#0#9'TComboBox'#22'FileExtensionsComboBox'#4
-  +'Left'#2#3#6'Height'#2#21#3'Top'#2':'#5'Width'#3#200#0#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#8
-  +'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'
-  +#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0#8'TSynEdit'#12'ColorPreview'#4
-  +'Left'#2#4#6'Height'#2'{'#3'Top'#3'z'#1#5'Width'#3#30#2#5'Align'#7#8'alBotto'
-  +'m'#20'BorderSpacing.Around'#2#4#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
-  +#8'akBottom'#0#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#3#11'OnMouseDown'#7#19'ColorPreviewMouseUp'#24'B'
-  +'ookMarkOptions.OnChange'#13#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'Command'#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'Command'#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'Command'#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'Short'
-  +'Cut'#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'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Comman'
-  +'d'#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'ShortC'
-  +'ut'#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'ShortCut'#3'T@'#0#1#7'Comm'
-  +'and'#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'Command'#3'-'#1#8'ShortCu'
-  +'t'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'Sh'
-  +'ortCut'#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'Comman'
-  +'d'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'C'
-  +'ommand'#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'Command'#3'f'#1#8'ShortCu'
-  +'t'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'Sh'
-  +'ortCut'#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'Comma'
-  +'nd'#3#250#0#8'ShortCut'#3'B`'#0#0#13'Lines.Strings'#1#6#12'ColorPreview'#0#8
-  +'ReadOnly'#9#19'OnSpecialLineMarkup'#7#19'OnSpecialLineColors'#14'OnStatusCh'
-  +'ange'#7#26'DisplayPreviewStatusChange'#0#0#8'TListBox'#19'ColorElementListB'
-  +'ox'#4'Left'#2#3#6'Height'#3#8#1#3'Top'#2'l'#5'Width'#3#200#0#16'ClickOnSelC'
-  +'hange'#8#7'OnClick'#7#24'ColorElementListBoxClick'#17'OnSelectionChange'#7
-  +'"ColorElementListBoxSelectionChange'#8'TabOrder'#2#4#8'TopIndex'#2#255#0#0#7
-  +'TButton'#27'SetAttributeToDefaultButton'#23'AnchorSideRight.Control'#7#9'Co'
-  +'lorPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2
-  +#25#3'Top'#2'Z'#5'Width'#3'L'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
-  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#27'SetAttributeToDefaultButton'#7
-  +'OnClick'#7' SetAttributeToDefaultButtonClick'#8'TabOrder'#2#5#0#0#7'TButton'
-  +#31'SetAllAttributesToDefaultButton'#23'AnchorSideRight.Control'#7#9'ColorPa'
-  +'ge'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#212#0#6'Height'#2#25#3
-  +'Top'#2'z'#5'Width'#3'L'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6#31'SetAllAttributesToDefaultButton'#7
-  +'OnClick'#7'$SetAllAttributesToDefaultButtonClick'#8'TabOrder'#2#6#0#0#9'TGr'
-  +'oupBox'#22'TextAttributesGroupBox'#23'AnchorSideRight.Control'#7#9'ColorPag'
-  +'e'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#12
-  +'ColorPreview'#4'Left'#3#212#0#6'Height'#3#218#0#3'Top'#3#154#0#5'Width'#3'L'
-  +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacin'
-  +'g.Around'#2#6#7'Caption'#6#10'Attributes'#12'ClientHeight'#3#218#0#11'Clien'
-  +'tWidth'#3'L'#1#8'TabOrder'#2#7#0#6'TLabel'#15'ForeGroundLabel'#4'Left'#2#8#6
-  +'Height'#2#14#5'Width'#2'S'#7'Caption'#6#15'ForeGroundLabel'#11'ParentColor'
-  +#8#0#0#12'TColorButton'#21'ForegroundColorButton'#21'AnchorSideTop.Control'#7
+  +#6#7'Caption'#6#18'EditorFontGroupBox'#12'ClientHeight'#3#145#0#11'ClientWid'
+  +'th'#3#22#2#8'TabOrder'#2#0#0#6'TLabel'#21'EditorFontHeightLabel'#21'AnchorS'
+  +'ideTop.Control'#7#24'EditorFontHeightComboBox'#18'AnchorSideTop.Side'#7#9'a'
+  +'srCenter'#4'Left'#2't'#6'Height'#2#14#3'Top'#2'$'#5'Width'#3'{'#1#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
+  +#21'EditorFontHeightLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'ExtraLineSpaci'
+  +'ngLabel'#21'AnchorSideTop.Control'#7#24'ExtraLineSpacingComboBox'#18'Anchor'
+  +'SideTop.Side'#7#9'asrCenter'#4'Left'#2't'#6'Height'#2#14#3'Top'#2'9'#5'Widt'
+  +'h'#3'{'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Ar'
+  +'ound'#2#6#7'Caption'#6#21'ExtraLineSpacingLabel'#11'ParentColor'#8#0#0#6'TL'
+  +'abel'#21'ExtraCharSpacingLabel'#21'AnchorSideTop.Control'#7#24'ExtraCharSpa'
+  +'cingComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2't'#6'Height'#2
+  +#14#3'Top'#2'N'#5'Width'#3'{'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#21'ExtraCharSpacingLabel'#11'Pare'
+  +'ntColor'#8#0#0#9'TComboBox'#18'EditorFontComboBox'#23'AnchorSideRight.Contr'
+  +'ol'#7#16'EditorFontButton'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#6#5'Width'#3
+  +#205#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#20'BorderSpacing.Around'
+  +#2#6#10'ItemHeight'#2#13#9'MaxLength'#2#255#13'OnEditingDone'#7#29'EditorFon'
+  +'tComboBoxEditingDone'#8'TabOrder'#2#0#4'Text'#6#18'EditorFontComboBox'#0#0#7
+  +'TButton'#16'EditorFontButton'#4'Left'#3#217#1#6'Height'#2#25#3'Top'#2#6#5'W'
+  +'idth'#2#25#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#3'...'#7'OnClic'
+  +'k'#7#21'EditorFontButtonClick'#8'TabOrder'#2#1#0#0#9'TComboBox'#24'EditorFo'
+  +'ntHeightComboBox'#21'AnchorSideTop.Control'#7#18'EditorFontComboBox'#18'Anc'
+  +'horSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'!'#5'Wi'
+  +'dth'#2'd'#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'MaxLength'#2#255#8'OnChan'
+  +'ge'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17
+  +'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0#9'TComboBox'#24'ExtraLineSpacingComb'
+  +'oBox'#21'AnchorSideTop.Control'#7#24'EditorFontHeightComboBox'#18'AnchorSid'
+  +'eTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'6'#5'Width'#2
+  +'d'#10'ItemHeight'#2#13#13'Items.Strings'#1#6#1'0'#6#1'1'#6#1'2'#0#9'MaxLeng'
+  +'th'#2#255#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'
+  +#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#4#0#0#9'TComboBox'#24'Ex'
+  +'traCharSpacingComboBox'#21'AnchorSideTop.Control'#7#24'ExtraLineSpacingComb'
+  ,'oBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'To'
+  +'p'#2'K'#5'Width'#2'd'#10'ItemHeight'#2#13#13'Items.Strings'#1#6#1'0'#6#1'1'
+  +#6#1'2'#0#9'MaxLength'#2#255#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'#7
+  +#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#3#0#0
+  +#9'TCheckBox'#27'DisableAntialiasingCheckBox'#21'AnchorSideTop.Control'#7#24
+  +'ExtraCharSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6
+  +#6'Height'#2#19#3'Top'#2'f'#5'Width'#3#6#2#5'Align'#7#8'alBottom'#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6
+  +#7'Caption'#6#27'DisableAntialiasingCheckBox'#8'OnChange'#7#23'GeneralCheckB'
+  +'oxOnChange'#8'TabOrder'#2#5#0#0#0#8'TSynEdit'#14'DisplayPreview'#4'Left'#2#6
+  +#6'Height'#3#208#0#3'Top'#3'#'#1#5'Width'#3#22#2#5'Align'#7#8'alClient'#20'B'
+  +'orderSpacing.Around'#2#6#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#10
+  +'Font.Pitch'#7#7'fpFixed'#12'Font.Quality'#7#16'fqNonAntialiased'#11'ParentC'
+  +'olor'#8#10'ParentFont'#8#8'TabOrder'#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'Command'#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'Command'#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'Command'#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'Comman'
+  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
+  +'mmand'#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'Short'
+  +'Cut'#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'Comm'
+  +'and'#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'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'ShortC'
+  +'ut'#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'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'Comman'
+  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
+  +'ommand'#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'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'ShortCu'
+  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
+  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#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'Comma'
+  +'nd'#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#14'DisplayPr'
+  +'eview'#0#8'ReadOnly'#9#22'SelectedColor.OnChange'#13#19'OnSpecialLineMarkup'
+  +#7#19'OnSpecialLineColors'#14'OnStatusChange'#7#26'DisplayPreviewStatusChang'
+  +'e'#0#0#0#5'TPage'#14'KeymappingPage'#7'Caption'#6#14'KeymappingPage'#11'Cli'
+  +'entWidth'#3'"'#2#12'ClientHeight'#3#249#1#0#6'TLabel'#19'KeyMappingHelpLabe'
+  +'l'#21'AnchorSideTop.Control'#7#14'KeymappingPage'#4'Left'#2#8#6'Height'#2#14
+  +#3'Top'#2#6#5'Width'#2'i'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2
+  +#6#19'BorderSpacing.Right'#2#6#7'Caption'#6#19'KeyMappingHelpLabel'#11'Paren'
+  +'tColor'#8#0#0#7'TButton'#28'KeyMappingChooseSchemeButton'#22'AnchorSideLeft'
+  ,'.Control'#7#14'KeymappingPage'#21'AnchorSideTop.Control'#7#14'KeymappingPag'
+  +'e'#24'AnchorSideBottom.Control'#7#14'KeymappingPage'#21'AnchorSideBottom.Si'
+  +'de'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#23#3'Top'#3#220#1#5'Width'#3#189
+  +#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing.Arou'
+  +'nd'#2#6#7'Caption'#6#28'KeyMappingChooseSchemeButton'#7'OnClick'#7'!KeyMapp'
+  +'ingChooseSchemeButtonClick'#8'TabOrder'#2#0#0#0#7'TButton KeyMappingConsist'
+  +'encyCheckButton'#21'AnchorSideTop.Control'#7#14'KeymappingPage'#23'AnchorSi'
+  +'deRight.Control'#7#14'KeymappingPage'#20'AnchorSideRight.Side'#7#9'asrBotto'
+  +'m'#24'AnchorSideBottom.Control'#7#14'KeymappingPage'#21'AnchorSideBottom.Si'
+  +'de'#7#9'asrBottom'#4'Left'#3'Q'#1#6'Height'#2#23#3'Top'#3#220#1#5'Width'#3
+  +#203#0#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#20'BorderSpacing'
+  +'.Around'#2#6#7'Caption'#6' KeyMappingConsistencyCheckButton'#7'OnClick'#7'%'
+  +'KeyMappingConsistencyCheckButtonClick'#8'TabOrder'#2#1#0#0#9'TTreeView'#18
+  +'KeyMappingTreeView'#22'AnchorSideLeft.Control'#7#14'KeymappingPage'#21'Anch'
+  +'orSideTop.Control'#7#20'KeyMappingFilterEdit'#18'AnchorSideTop.Side'#7#9'as'
+  +'rBottom'#23'AnchorSideRight.Control'#7#14'KeymappingPage'#20'AnchorSideRigh'
+  +'t.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#23'KeyMappingFindKeyB'
+  +'utton'#4'Left'#2#6#6'Height'#3'~'#1#3'Top'#2';'#5'Width'#3#22#2#7'Anchors'
+  +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6
+  +#17'DefaultItemHeight'#2#15#8'ReadOnly'#9#9'RowSelect'#9#8'TabOrder'#2#2#9'O'
+  +'nMouseUp'#7#25'KeyMappingTreeViewMouseUp'#7'Options'#11#17'tvoAutoItemHeigh'
+  +'t'#16'tvoHideSelection'#21'tvoKeepCollapsedNodes'#11'tvoReadOnly'#12'tvoRow'
+  +'Select'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#17'tvoShowSepar'
+  +'ators'#11'tvoToolTips'#0#0#0#5'TEdit'#20'KeyMappingFilterEdit'#22'AnchorSid'
+  +'eLeft.Control'#7#14'KeymappingPage'#21'AnchorSideTop.Control'#7#19'KeyMappi'
+  +'ngHelpLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Contr'
+  +'ol'#7#14'KeymappingPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#6
+  +#6'Height'#2#27#3'Top'#2#26#5'Width'#3#22#2#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#8'OnChange'#7#26'Ke'
+  +'yMappingFilterEditChange'#7'OnEnter'#7#25'KeyMappingFilterEditEnter'#6'OnEx'
+  +'it'#7#24'KeyMappingFilterEditExit'#8'TabOrder'#2#3#4'Text'#6#20'KeyMappingF'
+  +'ilterEdit'#0#0#7'TButton'#23'KeyMappingFindKeyButton'#22'AnchorSideLeft.Con'
+  +'trol'#7#14'KeymappingPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'Ancho'
+  +'rSideBottom.Control'#7#28'KeyMappingChooseSchemeButton'#4'Left'#2#6#6'Heigh'
+  +'t'#2#23#3'Top'#3#191#1#5'Width'#3#154#0#7'Anchors'#11#6'akLeft'#8'akBottom'
+  +#0#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'KeyMappingFind'
+  +'KeyButton'#7'OnClick'#7#28'KeyMappingFindKeyButtonClick'#8'TabOrder'#2#4#0#0
+  +#0#5'TPage'#9'ColorPage'#7'Caption'#6#9'ColorPage'#11'ClientWidth'#3'"'#2#12
+  +'ClientHeight'#3#249#1#0#6'TLabel'#13'LanguageLabel'#4'Left'#3#214#0#6'Heigh'
+  +'t'#2#14#3'Top'#2#12#5'Width'#2'I'#7'Caption'#6#13'LanguageLabel'#11'ParentC'
+  +'olor'#8#0#0#6'TLabel'#16'ColorSchemeLabel'#4'Left'#3#214#0#6'Height'#2#14#3
+  +'Top'#2'$'#5'Width'#2'X'#7'Caption'#6#16'ColorSchemeLabel'#11'ParentColor'#8
+  +#0#0#6'TLabel'#19'FileExtensionsLabel'#4'Left'#3#214#0#6'Height'#2#14#3'Top'
+  +#2'<'#5'Width'#2'^'#7'Caption'#6#19'FileExtensionsLabel'#11'ParentColor'#8#0
+  +#0#6'TLabel'#17'ColorElementLabel'#4'Left'#2#4#6'Height'#2#14#3'Top'#2'Z'#5
+  +'Width'#2'Y'#7'Caption'#6#17'ColorElementLabel'#11'ParentColor'#8#0#0#9'TCom'
+  +'boBox'#16'LanguageComboBox'#4'Left'#2#3#6'Height'#2#21#3'Top'#2#10#5'Width'
+  +#3#200#0#10'ItemHeight'#2#13#9'MaxLength'#2#255#8'OnChange'#7#16'ComboBoxOnC'
+  +'hange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8
+  +'TabOrder'#2#0#4'Text'#6#16'LanguageComboBox'#0#0#9'TComboBox'#19'ColorSchem'
+  +'eComboBox'#4'Left'#2#3#6'Height'#2#21#3'Top'#2'"'#5'Width'#3#200#0#10'ItemH'
+  +'eight'#2#13#9'MaxLength'#2#255#8'OnChange'#7#16'ComboBoxOnChange'#6'OnExit'
+  +#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#1#4
+  +'Text'#6#19'ColorSchemeComboBox'#0#0#9'TComboBox'#22'FileExtensionsComboBox'
+  +#4'Left'#2#3#6'Height'#2#21#3'Top'#2':'#5'Width'#3#200#0#10'ItemHeight'#2#13
+  +#13'Items.Strings'#1#6#26'pp;pas;inc;lpr;lrs;dpr;dpk'#6#18'pp;pas;inc;lpr;lr'
+  +'s'#6#10'pp;pas;inc'#0#9'MaxLength'#2#255#8'OnChange'#7#16'ComboBoxOnChange'
+  +#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOr'
+  +'der'#2#2#0#0#8'TSynEdit'#12'ColorPreview'#4'Left'#2#4#6'Height'#2'{'#3'Top'
+  +#3'z'#1#5'Width'#3#26#2#5'Align'#7#8'alBottom'#20'BorderSpacing.Around'#2#4#7
+  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#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'ParentFont'#8#8'TabOrder'#2#3#11
+  +'OnMouseDown'#7#19'ColorPreviewMouseUp'#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'Command'#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'Command'#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'Command'#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'Comman'
+  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
+  +'mmand'#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'Short'
+  +'Cut'#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'Comm'
+  +'and'#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'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'ShortC'
+  +'ut'#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'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'Comman'
+  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
+  +'ommand'#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'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'ShortCu'
+  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
+  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#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'Comma'
+  +'nd'#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'ColorPrev'
+  +'iew'#0#8'ReadOnly'#9#22'SelectedColor.OnChange'#13#19'OnSpecialLineMarkup'#7
+  +#19'OnSpecialLineColors'#14'OnStatusChange'#7#26'DisplayPreviewStatusChange'
+  +#0#0#8'TListBox'#19'ColorElementListBox'#4'Left'#2#3#6'Height'#3#8#1#3'Top'#2
+  +'l'#5'Width'#3#200#0#16'ClickOnSelChange'#8#7'OnClick'#7#24'ColorElementList'
+  +'BoxClick'#17'OnSelectionChange'#7'"ColorElementListBoxSelectionChange'#8'Ta'
+  +'bOrder'#2#4#0#0#7'TButton'#27'SetAttributeToDefaultButton'#23'AnchorSideRig'
+  +'ht.Control'#7#9'ColorPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3
+  +#212#0#6'Height'#2#25#3'Top'#2'Z'#5'Width'#3'H'#1#7'Anchors'#11#5'akTop'#6'a'
+  +'kLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#27'SetAttribu'
+  +'teToDefaultButton'#7'OnClick'#7' SetAttributeToDefaultButtonClick'#8'TabOrd'
+  +'er'#2#5#0#0#7'TButton'#31'SetAllAttributesToDefaultButton'#23'AnchorSideRig'
+  +'ht.Control'#7#9'ColorPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3
+  +#212#0#6'Height'#2#25#3'Top'#2'z'#5'Width'#3'H'#1#7'Anchors'#11#5'akTop'#6'a'
+  +'kLeft'#7'akRight'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#31'SetAllAttr'
+  +'ibutesToDefaultButton'#7'OnClick'#7'$SetAllAttributesToDefaultButtonClick'#8
+  +'TabOrder'#2#6#0#0#9'TGroupBox'#22'TextAttributesGroupBox'#23'AnchorSideRigh'
+  +'t.Control'#7#9'ColorPage'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'Anchor'
+  +'SideBottom.Control'#7#12'ColorPreview'#4'Left'#3#212#0#6'Height'#3#218#0#3
+  +'Top'#3#154#0#5'Width'#3'H'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8
+  +'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#10'Attributes'#12'Cli'
+  +'entHeight'#3#200#0#11'ClientWidth'#3'D'#1#8'TabOrder'#2#7#0#6'TLabel'#15'Fo'
+  +'reGroundLabel'#4'Left'#2#8#6'Height'#2#14#5'Width'#2'S'#7'Caption'#6#15'For'
+  ,'eGroundLabel'#11'ParentColor'#8#0#0#12'TColorButton'#21'ForegroundColorButt'
+  +'on'#21'AnchorSideTop.Control'#7#15'ForeGroundLabel'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#4'Left'#2#8#6'Height'#2#21#3'Top'#2#16#5'Width'#2'K'#17'Border'
+  +'Spacing.Top'#2#2#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9
+  +'clBtnFace'#14'OnColorChanged'#7#23'ColorButtonColorChanged'#0#0#12'TColorBu'
+  +'tton'#21'BackGroundColorButton'#21'AnchorSideTop.Control'#7#15'BackGroundLa'
+  +'bel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#8#6'Height'#2#21#3'Top'
+  +#2':'#5'Width'#2'K'#17'BorderSpacing.Top'#2#2#11'BorderWidth'#2#2#15'ButtonC'
+  +'olorSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7#23'ColorButtonC'
+  +'olorChanged'#0#0#6'TLabel'#15'BackGroundLabel'#21'AnchorSideTop.Control'#7
  +#15'ForeGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#8#6'Hei'
-  +'ght'#2#21#3'Top'#2#16#5'Width'#2'K'#17'BorderSpacing.Top'#2#2#11'BorderWidt'
-  ,'h'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7
-  +#23'ColorButtonColorChanged'#0#0#12'TColorButton'#21'BackGroundColorButton'
-  +#21'AnchorSideTop.Control'#7#15'BackGroundLabel'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#4'Left'#2#8#6'Height'#2#21#3'Top'#2':'#5'Width'#2'K'#17'BorderSp'
-  +'acing.Top'#2#2#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'cl'
-  +'BtnFace'#14'OnColorChanged'#7#23'ColorButtonColorChanged'#0#0#6'TLabel'#15
-  +'BackGroundLabel'#21'AnchorSideTop.Control'#7#15'ForeGroundLabel'#18'AnchorS'
-  +'ideTop.Side'#7#9'asrBottom'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'*'#5'Width'
-  +#2'S'#17'BorderSpacing.Top'#2#28#7'Caption'#6#15'BackGroundLabel'#11'ParentC'
-  +'olor'#8#0#0#9'TCheckBox'#28'ForeGroundUseDefaultCheckBox'#21'AnchorSideTop.'
-  +'Control'#7#15'ForeGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
-  +#2'^'#6'Height'#2#19#3'Top'#2#16#5'Width'#3#189#0#7'Anchors'#11#5'akTop'#6'a'
-  +'kLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#2#7'Caption'#6#28'ForeGroundUse'
-  +'DefaultCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0
-  +#0#9'TCheckBox'#28'BackGroundUseDefaultCheckBox'#21'AnchorSideTop.Control'#7
-  +#15'BackGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'^'#6'He'
-  +'ight'#2#19#3'Top'#2'8'#5'Width'#3#189#0#7'Anchors'#11#5'akTop'#6'akLeft'#7
-  +'akRight'#0#19'BorderSpacing.Right'#2#2#7'Caption'#6#28'BackGroundUseDefault'
-  +'CheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#1#0#0#6'T'
-  +'Panel'#18'TextUnderlinePanel'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#139#0#5'W'
-  +'idth'#3'<'#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#20'BorderSpacing.Around'#2
-  +#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2#19#11'ClientWidth'#3'<'#1#8
-  +'TabOrder'#2#2#0#9'TCheckBox'#21'TextUnderlineCheckBox'#6'Height'#2#19#5'Wid'
-  +'th'#3#172#0#5'Align'#7#8'alClient'#7'Caption'#6#21'TextUnderlineCheckBox'#8
-  +'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#6'TPanel'#23'Te'
-  +'xtUnderlineRadioPanel'#4'Left'#3#172#0#6'Height'#2#19#5'Width'#3#144#0#5'Al'
-  +'ign'#7#7'alRight'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#29'ChildSizing.H'
-  +'orizontalSpacing'#2#3#29'ChildSizing.EnlargeHorizontal'#7#14'crsScaleChilds'
-  +#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#18'ChildSizing.Layout'
-  +#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#3#12
-  +'ClientHeight'#2#19#11'ClientWidth'#3#144#0#8'TabOrder'#2#1#7'Visible'#8#0#12
-  +'TRadioButton'#20'TextUnderlineRadioOn'#3'Tag'#2#3#6'Height'#2#21#5'Width'#2
-  +'('#7'Caption'#6#2'On'#7'Checked'#9#8'OnChange'#7#22'TextStyleRadioOnChange'
-  +#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#12'TRadioButton'#21'TextUnderli'
-  +'neRadioOff'#3'Tag'#2#3#4'Left'#2'+'#6'Height'#2#21#5'Width'#2'('#7'Caption'
-  +#6#3'Off'#8'OnChange'#7#22'TextStyleRadioOnChange'#8'TabOrder'#2#1#0#0#12'TR'
-  +'adioButton'#24'TextUnderlineRadioInvert'#3'Tag'#2#3#4'Left'#2'V'#6'Height'#2
-  +#21#5'Width'#2':'#7'Caption'#6#6'Invert'#8'OnChange'#7#22'TextStyleRadioOnCh'
-  +'ange'#8'TabOrder'#2#2#0#0#0#0#6'TPanel'#13'TextBoldPanel'#4'Left'#2#6#6'Hei'
-  +'ght'#2#19#3'Top'#3#164#0#5'Width'#3'<'#1#5'Align'#7#8'alBottom'#8'AutoSize'
+  +'ght'#2#14#3'Top'#2'*'#5'Width'#2'S'#17'BorderSpacing.Top'#2#28#7'Caption'#6
+  +#15'BackGroundLabel'#11'ParentColor'#8#0#0#9'TCheckBox'#28'ForeGroundUseDefa'
+  +'ultCheckBox'#21'AnchorSideTop.Control'#7#15'ForeGroundLabel'#18'AnchorSideT'
+  +'op.Side'#7#9'asrBottom'#4'Left'#2'^'#6'Height'#2#19#3'Top'#2#16#5'Width'#3
+  +#181#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2
+  +#2#7'Caption'#6#28'ForeGroundUseDefaultCheckBox'#8'OnChange'#7#23'GeneralChe'
+  +'ckBoxOnChange'#8'TabOrder'#2#0#0#0#9'TCheckBox'#28'BackGroundUseDefaultChec'
+  +'kBox'#21'AnchorSideTop.Control'#7#15'BackGroundLabel'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#4'Left'#2'^'#6'Height'#2#19#3'Top'#2'8'#5'Width'#3#181#0#7'A'
+  +'nchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.Right'#2#2#7'Ca'
+  +'ption'#6#28'BackGroundUseDefaultCheckBox'#8'OnChange'#7#23'GeneralCheckBoxO'
+  +'nChange'#8'TabOrder'#2#1#0#0#6'TPanel'#18'TextUnderlinePanel'#4'Left'#2#6#6
+  +'Height'#2#19#3'Top'#2'}'#5'Width'#3'8'#1#5'Align'#7#8'alBottom'#8'AutoSize'
  +#9#20'BorderSpacing.Around'#2#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2
-  +#19#11'ClientWidth'#3'<'#1#8'TabOrder'#2#3#0#9'TCheckBox'#16'TextBoldCheckBo'
-  +'x'#6'Height'#2#19#5'Width'#3#172#0#5'Align'#7#8'alClient'#7'Caption'#6#16'T'
-  +'extBoldCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0
-  +#0#6'TPanel'#18'TextBoldRadioPanel'#4'Left'#3#172#0#6'Height'#2#19#5'Width'#3
-  +#144#0#5'Align'#7#7'alRight'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#29'Chi'
-  +'ldSizing.HorizontalSpacing'#2#3#29'ChildSizing.EnlargeHorizontal'#7#14'crsS'
-  +'caleChilds'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#18'ChildS'
-  +'izing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPe'
-  +'rLine'#2#3#12'ClientHeight'#2#19#11'ClientWidth'#3#144#0#8'TabOrder'#2#1#7
-  +'Visible'#8#0#12'TRadioButton'#15'TextBoldRadioOn'#3'Tag'#2#1#6'Height'#2#21
-  +#5'Width'#2'('#7'Caption'#6#2'On'#7'Checked'#9#8'OnChange'#7#22'TextStyleRad'
-  +'ioOnChange'#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#12'TRadioButton'#16
-  +'TextBoldRadioOff'#3'Tag'#2#1#4'Left'#2'+'#6'Height'#2#21#5'Width'#2'('#7'Ca'
-  +'ption'#6#3'Off'#8'OnChange'#7#22'TextStyleRadioOnChange'#8'TabOrder'#2#1#0#0
-  +#12'TRadioButton'#19'TextBoldRadioInvert'#3'Tag'#2#1#4'Left'#2'V'#6'Height'#2
-  +#21#5'Width'#2':'#7'Caption'#6#6'Invert'#8'OnChange'#7#22'TextStyleRadioOnCh'
-  +'ange'#8'TabOrder'#2#2#0#0#0#0#6'TPanel'#15'TextItalicPanel'#4'Left'#2#6#6'H'
-  +'eight'#2#19#3'Top'#3#189#0#5'Width'#3'<'#1#5'Align'#7#8'alBottom'#8'AutoSiz'
-  +'e'#9#20'BorderSpacing.Around'#2#6#10'BevelOuter'#7#6'bvNone'#12'ClientHeigh'
-  +'t'#2#19#11'ClientWidth'#3'<'#1#8'TabOrder'#2#4#0#9'TCheckBox'#18'TextItalic'
-  +'CheckBox'#6'Height'#2#19#5'Width'#3#172#0#5'Align'#7#8'alClient'#7'Caption'
-  +#6#18'TextItalicCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrd'
-  +'er'#2#0#0#0#6'TPanel'#20'TextItalicRadioPanel'#4'Left'#3#172#0#6'Height'#2
-  ,#19#5'Width'#3#144#0#5'Align'#7#7'alRight'#8'AutoSize'#9#10'BevelOuter'#7#6
+  +#19#11'ClientWidth'#3'8'#1#8'TabOrder'#2#2#0#9'TCheckBox'#21'TextUnderlineCh'
+  +'eckBox'#6'Height'#2#19#5'Width'#3#168#0#5'Align'#7#8'alClient'#7'Caption'#6
+  +#21'TextUnderlineCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOr'
+  +'der'#2#0#0#0#6'TPanel'#23'TextUnderlineRadioPanel'#4'Left'#3#168#0#6'Height'
+  +#2#19#5'Width'#3#144#0#5'Align'#7#7'alRight'#8'AutoSize'#9#10'BevelOuter'#7#6
  +'bvNone'#29'ChildSizing.HorizontalSpacing'#2#3#29'ChildSizing.EnlargeHorizon'
  +'tal'#7#14'crsScaleChilds'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChi'
  +'lds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSiz'
  +'ing.ControlsPerLine'#2#3#12'ClientHeight'#2#19#11'ClientWidth'#3#144#0#8'Ta'
-  +'bOrder'#2#1#7'Visible'#8#0#12'TRadioButton'#17'TextItalicRadioOn'#3'Tag'#2#2
-  +#6'Height'#2#21#5'Width'#2'('#7'Caption'#6#2'On'#7'Checked'#9#8'OnChange'#7
-  +#22'TextStyleRadioOnChange'#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#12'T'
-  +'RadioButton'#18'TextItalicRadioOff'#3'Tag'#2#2#4'Left'#2'+'#6'Height'#2#21#5
-  +'Width'#2'('#7'Caption'#6#3'Off'#8'OnChange'#7#22'TextStyleRadioOnChange'#8
-  +'TabOrder'#2#1#0#0#12'TRadioButton'#21'TextItalicRadioInvert'#3'Tag'#2#2#4'L'
-  +'eft'#2'V'#6'Height'#2#21#5'Width'#2':'#7'Caption'#6#6'Invert'#8'OnChange'#7
-  +#22'TextStyleRadioOnChange'#8'TabOrder'#2#2#0#0#0#0#0#0#5'TPage'#13'Codetool'
-  +'sPage'#7'Caption'#6#13'CodetoolsPage'#11'ClientWidth'#3'&'#2#12'ClientHeigh'
-  +'t'#3#249#1#0#9'TGroupBox'#25'AutomaticFeaturesGroupBox'#4'Left'#2#6#6'Heigh'
-  +'t'#3#237#1#3'Top'#2#6#5'Width'#3#26#2#5'Align'#7#8'alClient'#20'BorderSpaci'
-  +'ng.Around'#2#6#7'Caption'#6#25'AutomaticFeaturesGroupBox'#12'ClientHeight'#3
-  +#237#1#11'ClientWidth'#3#26#2#8'TabOrder'#2#0#0#6'TLabel'#14'AutoDelayLabel'
-  +#4'Left'#2#6#6'Height'#2#14#3'Top'#3#176#0#5'Width'#3#10#2#5'Align'#7#5'alTo'
-  +'p'#17'BorderSpacing.Top'#2#24#20'BorderSpacing.Around'#2#6#7'Caption'#6#14
-  +'AutoDelayLabel'#11'ParentColor'#8#0#0#6'TLabel'#17'AutoDelayMinLabel'#21'An'
-  +'chorSideTop.Control'#7#17'AutoDelayTrackBar'#18'AnchorSideTop.Side'#7#9'asr'
-  +'Bottom'#4'Left'#2#6#6'Height'#2#14#3'Top'#3#148#0#5'Width'#2'\'#17'BorderSp'
-  +'acing.Top'#2#2#7'Caption'#6#17'AutoDelayMinLabel'#11'ParentColor'#8#0#0#6'T'
-  +'Label'#17'AutoDelayMaxLabel'#21'AnchorSideTop.Control'#7#17'AutoDelayTrackB'
-  +'ar'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#148#1#6'Height'#2#14#3
-  +'Top'#3#148#0#5'Width'#2'`'#9'Alignment'#7#14'taRightJustify'#7'Anchors'#11#5
-  +'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#2#7'Caption'#6#17'AutoDelayMaxL'
-  +'abel'#11'ParentColor'#8#0#0#9'TCheckBox AutoIdentifierCompletionCheckBox'#4
-  +'Left'#2#6#6'Height'#2#19#3'Top'#2#6#5'Width'#3#10#2#5'Align'#7#5'alTop'#20
-  +'BorderSpacing.Around'#2#6#7'Caption'#6' AutoIdentifierCompletionCheckBox'#8
-  +'TabOrder'#2#0#0#0#9'TCheckBox'#26'AutoCodeParametersCheckBox'#4'Left'#2#6#6
-  +'Height'#2#19#3'Top'#2'8'#5'Width'#3#10#2#5'Align'#7#5'alTop'#20'BorderSpaci'
-  +'ng.Around'#2#6#7'Caption'#6#26'AutoCodeParametersCheckBox'#7'Enabled'#8#8'T'
-  +'abOrder'#2#1#0#0#9'TCheckBox'#27'AutoToolTipExprEvalCheckBox'#4'Left'#2#6#6
-  +'Height'#2#19#3'Top'#2'Q'#5'Width'#3#10#2#5'Align'#7#5'alTop'#20'BorderSpaci'
-  +'ng.Around'#2#6#7'Caption'#6#27'AutoToolTipExprEvalCheckBox'#8'TabOrder'#2#2
-  +#0#0#9'TCheckBox'#28'AutoToolTipSymbToolsCheckBox'#4'Left'#2#6#6'Height'#2#19
-  +#3'Top'#2#31#5'Width'#3#10#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6
-  +#7'Caption'#6#28'AutoToolTipSymbToolsCheckBox'#8'TabOrder'#2#3#0#0#9'TTrackB'
-  +'ar'#17'AutoDelayTrackBar'#4'Left'#2#6#6'Height'#2'('#3'Top'#2'j'#5'Width'#3
-  +#10#2#9'Frequency'#3#250#0#3'Max'#3#160#15#3'Min'#3#244#1#8'Position'#3#244#1
-  +#8'ScalePos'#7#5'trTop'#5'Align'#7#5'alTop'#18'BorderSpacing.Left'#2#6#17'Bo'
-  +'rderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#8'TabOrder'#2#4#0#0#0#0#5
-  +'TPage'#11'CodeFolding'#7'Caption'#6#11'CodeFolding'#11'ClientWidth'#3'&'#2
-  +#12'ClientHeight'#3#249#1#0#6'TLabel'#19'lblDividerDrawLevel'#4'Left'#2#6#6
-  +'Height'#2#14#3'Top'#2'G'#5'Width'#2'^'#7'Caption'#6#19'lblDividerDrawLevel'
-  +#11'ParentColor'#8#0#0#6'TBevel'#6'Bevel1'#4'Left'#2#6#6'Height'#2#2#3'Top'#2
-  +'1'#5'Width'#3#25#2#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#0#0#9'TChe'
-  +'ckBox'#21'chkCodeFoldingEnabled'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#23#5'W'
-  +'idth'#3#139#0#7'Caption'#6#21'chkCodeFoldingEnabled'#8'OnChange'#7#27'chkCo'
-  +'deFoldingEnabledChange'#8'TabOrder'#2#0#0#0#9'TSpinEdit'#18'edDividerDrawLe'
-  +'vel'#4'Left'#3#211#0#6'Height'#2#23#3'Top'#2'B'#5'Width'#2'2'#8'MaxValue'#2
-  +#10#8'MinValue'#2#1#8'TabOrder'#2#1#5'Value'#2#1#0#0#0#0#12'TButtonPanel'#11
-  +'ButtonPanel'#4'Left'#2#6#6'Height'#2'('#3'Top'#3#25#2#5'Width'#3#30#2#5'Ali'
-  +'gn'#7#8'alBottom'#8'AutoSize'#9#8'TabOrder'#2#1#11'ShowButtons'#11#4'pbOK'#8
-  +'pbCancel'#6'pbHelp'#0#0#0#0
+  +'bOrder'#2#1#7'Visible'#8#0#12'TRadioButton'#20'TextUnderlineRadioOn'#3'Tag'
+  +#2#3#6'Height'#2#19#5'Width'#2'('#7'Caption'#6#2'On'#7'Checked'#9#8'OnChange'
+  +#7#22'TextStyleRadioOnChange'#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#12
+  +'TRadioButton'#21'TextUnderlineRadioOff'#3'Tag'#2#3#4'Left'#2'+'#6'Height'#2
+  +#19#5'Width'#2'*'#7'Caption'#6#3'Off'#8'OnChange'#7#22'TextStyleRadioOnChang'
+  +'e'#8'TabOrder'#2#1#0#0#12'TRadioButton'#24'TextUnderlineRadioInvert'#3'Tag'
+  +#2#3#4'Left'#2'X'#6'Height'#2#19#5'Width'#2'8'#7'Caption'#6#6'Invert'#8'OnCh'
+  +'ange'#7#22'TextStyleRadioOnChange'#8'TabOrder'#2#2#0#0#0#0#6'TPanel'#13'Tex'
+  +'tBoldPanel'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#150#0#5'Width'#3'8'#1#5'Ali'
+  +'gn'#7#8'alBottom'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#10'BevelOuter'
+  +#7#6'bvNone'#12'ClientHeight'#2#19#11'ClientWidth'#3'8'#1#8'TabOrder'#2#3#0#9
+  +'TCheckBox'#16'TextBoldCheckBox'#6'Height'#2#19#5'Width'#3#168#0#5'Align'#7#8
+  +'alClient'#7'Caption'#6#16'TextBoldCheckBox'#8'OnChange'#7#23'GeneralCheckBo'
+  +'xOnChange'#8'TabOrder'#2#0#0#0#6'TPanel'#18'TextBoldRadioPanel'#4'Left'#3
+  +#168#0#6'Height'#2#19#5'Width'#3#144#0#5'Align'#7#7'alRight'#8'AutoSize'#9#10
+  +'BevelOuter'#7#6'bvNone'#29'ChildSizing.HorizontalSpacing'#2#3#29'ChildSizin'
+  +'g.EnlargeHorizontal'#7#14'crsScaleChilds'#28'ChildSizing.ShrinkHorizontal'#7
+  +#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBotto'
+  +'m'#27'ChildSizing.ControlsPerLine'#2#3#12'ClientHeight'#2#19#11'ClientWidth'
+  +#3#144#0#8'TabOrder'#2#1#7'Visible'#8#0#12'TRadioButton'#15'TextBoldRadioOn'
+  +#3'Tag'#2#1#6'Height'#2#19#5'Width'#2'('#7'Caption'#6#2'On'#7'Checked'#9#8'O'
+  +'nChange'#7#22'TextStyleRadioOnChange'#5'State'#7#9'cbChecked'#8'TabOrder'#2
+  +#0#0#0#12'TRadioButton'#16'TextBoldRadioOff'#3'Tag'#2#1#4'Left'#2'+'#6'Heigh'
+  +'t'#2#19#5'Width'#2'*'#7'Caption'#6#3'Off'#8'OnChange'#7#22'TextStyleRadioOn'
+  +'Change'#8'TabOrder'#2#1#0#0#12'TRadioButton'#19'TextBoldRadioInvert'#3'Tag'
+  +#2#1#4'Left'#2'X'#6'Height'#2#19#5'Width'#2'8'#7'Caption'#6#6'Invert'#8'OnCh'
+  +'ange'#7#22'TextStyleRadioOnChange'#8'TabOrder'#2#2#0#0#0#0#6'TPanel'#15'Tex'
+  +'tItalicPanel'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#175#0#5'Width'#3'8'#1#5'A'
+  +'lign'#7#8'alBottom'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#10'BevelOute'
+  +'r'#7#6'bvNone'#12'ClientHeight'#2#19#11'ClientWidth'#3'8'#1#8'TabOrder'#2#4
+  ,#0#9'TCheckBox'#18'TextItalicCheckBox'#6'Height'#2#19#5'Width'#3#168#0#5'Ali'
+  +'gn'#7#8'alClient'#7'Caption'#6#18'TextItalicCheckBox'#8'OnChange'#7#23'Gene'
+  +'ralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#6'TPanel'#20'TextItalicRadioPanel'
+  +#4'Left'#3#168#0#6'Height'#2#19#5'Width'#3#144#0#5'Align'#7#7'alRight'#8'Aut'
+  +'oSize'#9#10'BevelOuter'#7#6'bvNone'#29'ChildSizing.HorizontalSpacing'#2#3#29
+  +'ChildSizing.EnlargeHorizontal'#7#14'crsScaleChilds'#28'ChildSizing.ShrinkHo'
+  +'rizontal'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightTh'
+  +'enTopToBottom'#27'ChildSizing.ControlsPerLine'#2#3#12'ClientHeight'#2#19#11
+  +'ClientWidth'#3#144#0#8'TabOrder'#2#1#7'Visible'#8#0#12'TRadioButton'#17'Tex'
+  +'tItalicRadioOn'#3'Tag'#2#2#6'Height'#2#19#5'Width'#2'('#7'Caption'#6#2'On'#7
+  +'Checked'#9#8'OnChange'#7#22'TextStyleRadioOnChange'#5'State'#7#9'cbChecked'
+  +#8'TabOrder'#2#0#0#0#12'TRadioButton'#18'TextItalicRadioOff'#3'Tag'#2#2#4'Le'
+  +'ft'#2'+'#6'Height'#2#19#5'Width'#2'*'#7'Caption'#6#3'Off'#8'OnChange'#7#22
+  +'TextStyleRadioOnChange'#8'TabOrder'#2#1#0#0#12'TRadioButton'#21'TextItalicR'
+  +'adioInvert'#3'Tag'#2#2#4'Left'#2'X'#6'Height'#2#19#5'Width'#2'8'#7'Caption'
+  +#6#6'Invert'#8'OnChange'#7#22'TextStyleRadioOnChange'#8'TabOrder'#2#2#0#0#0#0
+  +#0#0#5'TPage'#13'CodetoolsPage'#7'Caption'#6#13'CodetoolsPage'#11'ClientWidt'
+  +'h'#3'&'#2#12'ClientHeight'#3#249#1#0#9'TGroupBox'#25'AutomaticFeaturesGroup'
+  +'Box'#4'Left'#2#6#6'Height'#3#237#1#3'Top'#2#6#5'Width'#3#26#2#5'Align'#7#8
+  +'alClient'#20'BorderSpacing.Around'#2#6#7'Caption'#6#25'AutomaticFeaturesGro'
+  +'upBox'#12'ClientHeight'#3#237#1#11'ClientWidth'#3#26#2#8'TabOrder'#2#0#0#6
+  +'TLabel'#14'AutoDelayLabel'#4'Left'#2#6#6'Height'#2#14#3'Top'#3#176#0#5'Widt'
+  +'h'#3#10#2#5'Align'#7#5'alTop'#17'BorderSpacing.Top'#2#24#20'BorderSpacing.A'
+  +'round'#2#6#7'Caption'#6#14'AutoDelayLabel'#11'ParentColor'#8#0#0#6'TLabel'
+  +#17'AutoDelayMinLabel'#21'AnchorSideTop.Control'#7#17'AutoDelayTrackBar'#18
+  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#14#3'Top'#3#148#0
+  +#5'Width'#2'\'#17'BorderSpacing.Top'#2#2#7'Caption'#6#17'AutoDelayMinLabel'
+  +#11'ParentColor'#8#0#0#6'TLabel'#17'AutoDelayMaxLabel'#21'AnchorSideTop.Cont'
+  +'rol'#7#17'AutoDelayTrackBar'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3
+  +#148#1#6'Height'#2#14#3'Top'#3#148#0#5'Width'#2'`'#9'Alignment'#7#14'taRight'
+  +'Justify'#7'Anchors'#11#5'akTop'#7'akRight'#0#17'BorderSpacing.Top'#2#2#7'Ca'
+  +'ption'#6#17'AutoDelayMaxLabel'#11'ParentColor'#8#0#0#9'TCheckBox AutoIdenti'
+  +'fierCompletionCheckBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#6#5'Width'#3#10
+  +#2#5'Align'#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6' AutoIdenti'
+  +'fierCompletionCheckBox'#8'TabOrder'#2#0#0#0#9'TCheckBox'#26'AutoCodeParamet'
+  +'ersCheckBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'8'#5'Width'#3#10#2#5'Align'
+  +#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#26'AutoCodeParametersC'
+  +'heckBox'#7'Enabled'#8#8'TabOrder'#2#1#0#0#9'TCheckBox'#27'AutoToolTipExprEv'
+  +'alCheckBox'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'Q'#5'Width'#3#10#2#5'Align'
+  +#7#5'alTop'#20'BorderSpacing.Around'#2#6#7'Caption'#6#27'AutoToolTipExprEval'
+  +'CheckBox'#8'TabOrder'#2#2#0#0#9'TCheckBox'#28'AutoToolTipSymbToolsCheckBox'
+  +#4'Left'#2#6#6'Height'#2#19#3'Top'#2#31#5'Width'#3#10#2#5'Align'#7#5'alTop'
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#28'AutoToolTipSymbToolsCheckBox'#8
+  +'TabOrder'#2#3#0#0#9'TTrackBar'#17'AutoDelayTrackBar'#4'Left'#2#6#6'Height'#2
+  +'('#3'Top'#2'j'#5'Width'#3#10#2#9'Frequency'#3#250#0#3'Max'#3#160#15#3'Min'#3
+  +#244#1#8'Position'#3#244#1#8'ScalePos'#7#5'trTop'#5'Align'#7#5'alTop'#18'Bor'
+  +'derSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#6#8
+  +'TabOrder'#2#4#0#0#0#0#5'TPage'#11'CodeFolding'#7'Caption'#6#11'CodeFolding'
+  +#11'ClientWidth'#3'&'#2#12'ClientHeight'#3#249#1#0#6'TLabel'#19'lblDividerDr'
+  +'awLevel'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'G'#5'Width'#2'^'#7'Caption'#6
+  +#19'lblDividerDrawLevel'#11'ParentColor'#8#0#0#6'TBevel'#6'Bevel1'#4'Left'#2
+  +#6#6'Height'#2#2#3'Top'#2'1'#5'Width'#3#25#2#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#0#0#9'TCheckBox'#21'chkCodeFoldingEnabled'#4'Left'#2#6#6'Heigh'
+  +'t'#2#19#3'Top'#2#23#5'Width'#3#139#0#7'Caption'#6#21'chkCodeFoldingEnabled'
+  +#8'OnChange'#7#27'chkCodeFoldingEnabledChange'#8'TabOrder'#2#0#0#0#9'TSpinEd'
+  +'it'#18'edDividerDrawLevel'#4'Left'#3#211#0#6'Height'#2#23#3'Top'#2'B'#5'Wid'
+  +'th'#2'2'#8'MaxValue'#2#10#8'MinValue'#2#1#8'TabOrder'#2#1#5'Value'#2#1#0#0#0
+  +#0#12'TButtonPanel'#11'ButtonPanel'#4'Left'#2#6#6'Height'#2'('#3'Top'#3#25#2
+  +#5'Width'#3#30#2#5'Align'#7#8'alBottom'#8'AutoSize'#9#8'TabOrder'#2#1#11'Sho'
+  +'wButtons'#11#4'pbOK'#8'pbCancel'#6'pbHelp'#0#0#0#0
 ]);
--- a/ide/frames/options_editor_color.lfm
+++ b/ide/frames/options_editor_color.lfm
@ -0,0 +1,801 @@
+inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
+  Height = 577
+  Width = 531
+  ClientHeight = 577
+  ClientWidth = 531
+  TabOrder = 0
+  Visible = False
+  DesignLeft = 110
+  DesignTop = 145
+  object FileExtensionsLabel: TLabel[0]
+    AnchorSideLeft.Control = FileExtensionsComboBox
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = FileExtensionsComboBox
+    AnchorSideTop.Side = asrCenter
+    Left = 206
+    Height = 14
+    Top = 82
+    Width = 94
+    BorderSpacing.Left = 6
+    Caption = 'FileExtensionsLabel'
+    ParentColor = False
+  end
+  object ColorSchemeLabel: TLabel[1]
+    AnchorSideLeft.Control = ColorSchemeComboBox
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = ColorSchemeComboBox
+    AnchorSideTop.Side = asrCenter
+    Left = 206
+    Height = 14
+    Top = 55
+    Width = 88
+    BorderSpacing.Left = 6
+    Caption = 'ColorSchemeLabel'
+    ParentColor = False
+  end
+  object LanguageLabel: TLabel[2]
+    AnchorSideLeft.Control = LanguageComboBox
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = LanguageComboBox
+    AnchorSideTop.Side = asrCenter
+    Left = 206
+    Height = 14
+    Top = 28
+    Width = 73
+    BorderSpacing.Left = 6
+    Caption = 'LanguageLabel'
+    ParentColor = False
+  end
+  object ColorElementLabel: TLabel[3]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = FileExtensionsComboBox
+    AnchorSideTop.Side = asrBottom
+    Height = 14
+    Top = 106
+    Width = 89
+    BorderSpacing.Top = 6
+    Caption = 'ColorElementLabel'
+    ParentColor = False
+  end
+  object LanguageComboBox: TComboBox[4]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = UseSyntaxHighlightCheckBox
+    AnchorSideTop.Side = asrBottom
+    Height = 21
+    Top = 25
+    Width = 200
+    BorderSpacing.Top = 6
+    ItemHeight = 13
+    MaxLength = -1
+    OnChange = ComboBoxOnChange
+    OnExit = ComboBoxOnExit
+    OnKeyDown = ComboBoxOnKeyDown
+    TabOrder = 0
+    Text = 'LanguageComboBox'
+  end
+  object ColorSchemeComboBox: TComboBox[5]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = LanguageComboBox
+    AnchorSideTop.Side = asrBottom
+    Height = 21
+    Top = 52
+    Width = 200
+    BorderSpacing.Top = 6
+    ItemHeight = 13
+    MaxLength = -1
+    OnChange = ComboBoxOnChange
+    OnExit = ComboBoxOnExit
+    OnKeyDown = ComboBoxOnKeyDown
+    TabOrder = 1
+    Text = 'ColorSchemeComboBox'
+  end
+  object FileExtensionsComboBox: TComboBox[6]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = ColorSchemeComboBox
+    AnchorSideTop.Side = asrBottom
+    Height = 21
+    Top = 79
+    Width = 200
+    BorderSpacing.Top = 6
+    ItemHeight = 13
+    Items.Strings = (
+      'pp;pas;inc;lpr;lrs;dpr;dpk'
+      'pp;pas;inc;lpr;lrs'
+      'pp;pas;inc'
+    )
+    MaxLength = -1
+    OnChange = ComboBoxOnChange
+    OnExit = ComboBoxOnExit
+    OnKeyDown = ComboBoxOnKeyDown
+    TabOrder = 2
+  end
+  object ColorElementListBox: TListBox[7]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = ColorElementLabel
+    AnchorSideTop.Side = asrBottom
+    Height = 264
+    Top = 126
+    Width = 200
+    BorderSpacing.Top = 6
+    ClickOnSelChange = False
+    OnClick = ColorElementListBoxClick
+    OnSelectionChange = ColorElementListBoxSelectionChange
+    TabOrder = 3
+  end
+  object SetAttributeToDefaultButton: TButton[8]
+    AnchorSideLeft.Control = ColorElementListBox
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = ColorElementListBox
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 206
+    Height = 25
+    Top = 126
+    Width = 325
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 6
+    Caption = 'SetAttributeToDefaultButton'
+    OnClick = SetAttributeToDefaultButtonClick
+    TabOrder = 4
+  end
+  object SetAllAttributesToDefaultButton: TButton[9]
+    AnchorSideLeft.Control = ColorElementListBox
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = SetAttributeToDefaultButton
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Side = asrBottom
+    Left = 206
+    Height = 25
+    Top = 157
+    Width = 325
+    Anchors = [akTop, akLeft, akRight]
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    Caption = 'SetAllAttributesToDefaultButton'
+    OnClick = SetAllAttributesToDefaultButtonClick
+    TabOrder = 5
+  end
+  object TextAttributesGroupBox: TGroupBox[10]
+    AnchorSideLeft.Control = ColorElementListBox
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = SetAllAttributesToDefaultButton
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = ColorElementListBox
+    AnchorSideBottom.Side = asrBottom
+    Left = 206
+    Height = 202
+    Top = 188
+    Width = 325
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    BorderSpacing.Left = 6
+    BorderSpacing.Top = 6
+    Caption = 'Attributes'
+    ClientHeight = 184
+    ClientWidth = 321
+    TabOrder = 6
+    object ForeGroundLabel: TLabel
+      Left = 8
+      Height = 14
+      Width = 83
+      Caption = 'ForeGroundLabel'
+      ParentColor = False
+    end
+    object ForegroundColorButton: TColorButton
+      AnchorSideTop.Control = ForeGroundLabel
+      AnchorSideTop.Side = asrBottom
+      Left = 8
+      Height = 21
+      Top = 16
+      Width = 75
+      BorderSpacing.Top = 2
+      BorderWidth = 2
+      ButtonColorSize = 16
+      Color = clBtnFace
+      OnColorChanged = ForegroundColorButtonColorChanged
+    end
+    object BackGroundColorButton: TColorButton
+      AnchorSideTop.Control = BackGroundLabel
+      AnchorSideTop.Side = asrBottom
+      Left = 8
+      Height = 21
+      Top = 58
+      Width = 75
+      BorderSpacing.Top = 2
+      BorderWidth = 2
+      ButtonColorSize = 16
+      Color = clBtnFace
+    end
+    object BackGroundLabel: TLabel
+      AnchorSideTop.Control = ForeGroundLabel
+      AnchorSideTop.Side = asrBottom
+      Left = 8
+      Height = 14
+      Top = 42
+      Width = 83
+      BorderSpacing.Top = 28
+      Caption = 'BackGroundLabel'
+      ParentColor = False
+    end
+    object ForeGroundUseDefaultCheckBox: TCheckBox
+      AnchorSideTop.Control = ForeGroundLabel
+      AnchorSideTop.Side = asrBottom
+      Left = 94
+      Height = 19
+      Top = 16
+      Width = 178
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Top = 2
+      Caption = 'ForeGroundUseDefaultCheckBox'
+      OnChange = GeneralCheckBoxOnChange
+      TabOrder = 0
+    end
+    object BackGroundUseDefaultCheckBox: TCheckBox
+      AnchorSideTop.Control = BackGroundLabel
+      AnchorSideTop.Side = asrBottom
+      Left = 94
+      Height = 19
+      Top = 56
+      Width = 178
+      Anchors = [akTop, akLeft, akRight]
+      BorderSpacing.Right = 2
+      Caption = 'BackGroundUseDefaultCheckBox'
+      OnChange = GeneralCheckBoxOnChange
+      TabOrder = 1
+    end
+    object TextUnderlinePanel: TPanel
+      Left = 6
+      Height = 19
+      Top = 109
+      Width = 309
+      Align = alBottom
+      AutoSize = True
+      BorderSpacing.Around = 6
+      BevelOuter = bvNone
+      ClientHeight = 19
+      ClientWidth = 309
+      TabOrder = 2
+      object TextUnderlineCheckBox: TCheckBox
+        Height = 19
+        Width = 165
+        Align = alClient
+        Caption = 'TextUnderlineCheckBox'
+        OnChange = GeneralCheckBoxOnChange
+        TabOrder = 0
+      end
+      object TextUnderlineRadioPanel: TPanel
+        Left = 165
+        Height = 19
+        Width = 144
+        Align = alRight
+        AutoSize = True
+        BevelOuter = bvNone
+        ChildSizing.HorizontalSpacing = 3
+        ChildSizing.EnlargeHorizontal = crsScaleChilds
+        ChildSizing.ShrinkHorizontal = crsScaleChilds
+        ChildSizing.Layout = cclLeftToRightThenTopToBottom
+        ChildSizing.ControlsPerLine = 3
+        ClientHeight = 19
+        ClientWidth = 144
+        TabOrder = 1
+        Visible = False
+        object TextUnderlineRadioOn: TRadioButton
+          Tag = 3
+          Height = 19
+          Width = 40
+          Caption = 'On'
+          Checked = True
+          OnChange = TextStyleRadioOnChange
+          State = cbChecked
+          TabOrder = 0
+        end
+        object TextUnderlineRadioOff: TRadioButton
+          Tag = 3
+          Left = 43
+          Height = 19
+          Width = 42
+          Caption = 'Off'
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 1
+        end
+        object TextUnderlineRadioInvert: TRadioButton
+          Tag = 3
+          Left = 88
+          Height = 19
+          Width = 56
+          Caption = 'Invert'
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 2
+        end
+      end
+    end
+    object TextBoldPanel: TPanel
+      Left = 6
+      Height = 19
+      Top = 134
+      Width = 309
+      Align = alBottom
+      AutoSize = True
+      BorderSpacing.Around = 6
+      BevelOuter = bvNone
+      ClientHeight = 19
+      ClientWidth = 309
+      TabOrder = 3
+      object TextBoldCheckBox: TCheckBox
+        Height = 19
+        Width = 165
+        Align = alClient
+        Caption = 'TextBoldCheckBox'
+        OnChange = GeneralCheckBoxOnChange
+        TabOrder = 0
+      end
+      object TextBoldRadioPanel: TPanel
+        Left = 165
+        Height = 19
+        Width = 144
+        Align = alRight
+        AutoSize = True
+        BevelOuter = bvNone
+        ChildSizing.HorizontalSpacing = 3
+        ChildSizing.EnlargeHorizontal = crsScaleChilds
+        ChildSizing.ShrinkHorizontal = crsScaleChilds
+        ChildSizing.Layout = cclLeftToRightThenTopToBottom
+        ChildSizing.ControlsPerLine = 3
+        ClientHeight = 19
+        ClientWidth = 144
+        TabOrder = 1
+        Visible = False
+        object TextBoldRadioOn: TRadioButton
+          Tag = 1
+          Height = 19
+          Width = 40
+          Caption = 'On'
+          Checked = True
+          OnChange = TextStyleRadioOnChange
+          State = cbChecked
+          TabOrder = 0
+        end
+        object TextBoldRadioOff: TRadioButton
+          Tag = 1
+          Left = 43
+          Height = 19
+          Width = 42
+          Caption = 'Off'
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 1
+        end
+        object TextBoldRadioInvert: TRadioButton
+          Tag = 1
+          Left = 88
+          Height = 19
+          Width = 56
+          Caption = 'Invert'
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 2
+        end
+      end
+    end
+    object TextItalicPanel: TPanel
+      Left = 6
+      Height = 19
+      Top = 159
+      Width = 309
+      Align = alBottom
+      AutoSize = True
+      BorderSpacing.Around = 6
+      BevelOuter = bvNone
+      ClientHeight = 19
+      ClientWidth = 309
+      TabOrder = 4
+      object TextItalicCheckBox: TCheckBox
+        Height = 19
+        Width = 165
+        Align = alClient
+        Caption = 'TextItalicCheckBox'
+        OnChange = GeneralCheckBoxOnChange
+        TabOrder = 0
+      end
+      object TextItalicRadioPanel: TPanel
+        Left = 165
+        Height = 19
+        Width = 144
+        Align = alRight
+        AutoSize = True
+        BevelOuter = bvNone
+        ChildSizing.HorizontalSpacing = 3
+        ChildSizing.EnlargeHorizontal = crsScaleChilds
+        ChildSizing.ShrinkHorizontal = crsScaleChilds
+        ChildSizing.Layout = cclLeftToRightThenTopToBottom
+        ChildSizing.ControlsPerLine = 3
+        ClientHeight = 19
+        ClientWidth = 144
+        TabOrder = 1
+        Visible = False
+        object TextItalicRadioOn: TRadioButton
+          Tag = 2
+          Height = 19
+          Width = 40
+          Caption = 'On'
+          Checked = True
+          OnChange = TextStyleRadioOnChange
+          State = cbChecked
+          TabOrder = 0
+        end
+        object TextItalicRadioOff: TRadioButton
+          Tag = 2
+          Left = 43
+          Height = 19
+          Width = 42
+          Caption = 'Off'
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 1
+        end
+        object TextItalicRadioInvert: TRadioButton
+          Tag = 2
+          Left = 88
+          Height = 19
+          Width = 56
+          Caption = 'Invert'
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 2
+        end
+      end
+    end
+  end
+  object ColorPreview: TSynEdit[11]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = ColorElementListBox
+    AnchorSideTop.Side = asrBottom
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
+    Height = 181
+    Top = 396
+    Width = 531
+    BorderSpacing.Top = 6
+    Anchors = [akTop, akLeft, akRight, akBottom]
+    Font.Height = -16
+    Font.Name = 'courier'
+    Font.Pitch = fpFixed
+    Font.Quality = fqNonAntialiased
+    ParentColor = False
+    ParentFont = False
+    TabOrder = 7
+    Keystrokes = <    
+      item
+        Command = 3
+        ShortCut = 38
+      end    
+      item
+        Command = 103
+        ShortCut = 8230
+      end    
+      item
+        Command = 211
+        ShortCut = 16422
+      end    
+      item
+        Command = 4
+        ShortCut = 40
+      end    
+      item
+        Command = 104
+        ShortCut = 8232
+      end    
+      item
+        Command = 212
+        ShortCut = 16424
+      end    
+      item
+        Command = 1
+        ShortCut = 37
+      end    
+      item
+        Command = 101
+        ShortCut = 8229
+      end    
+      item
+        Command = 5
+        ShortCut = 16421
+      end    
+      item
+        Command = 105
+        ShortCut = 24613
+      end    
+      item
+        Command = 2
+        ShortCut = 39
+      end    
+      item
+        Command = 102
+        ShortCut = 8231
+      end    
+      item
+        Command = 6
+        ShortCut = 16423
+      end    
+      item
+        Command = 106
+        ShortCut = 24615
+      end    
+      item
+        Command = 10
+        ShortCut = 34
+      end    
+      item
+        Command = 110
+        ShortCut = 8226
+      end    
+      item
+        Command = 14
+        ShortCut = 16418
+      end    
+      item
+        Command = 114
+        ShortCut = 24610
+      end    
+      item
+        Command = 9
+        ShortCut = 33
+      end    
+      item
+        Command = 109
+        ShortCut = 8225
+      end    
+      item
+        Command = 13
+        ShortCut = 16417
+      end    
+      item
+        Command = 113
+        ShortCut = 24609
+      end    
+      item
+        Command = 7
+        ShortCut = 36
+      end    
+      item
+        Command = 107
+        ShortCut = 8228
+      end    
+      item
+        Command = 15
+        ShortCut = 16420
+      end    
+      item
+        Command = 115
+        ShortCut = 24612
+      end    
+      item
+        Command = 8
+        ShortCut = 35
+      end    
+      item
+        Command = 108
+        ShortCut = 8227
+      end    
+      item
+        Command = 16
+        ShortCut = 16419
+      end    
+      item
+        Command = 116
+        ShortCut = 24611
+      end    
+      item
+        Command = 223
+        ShortCut = 45
+      end    
+      item
+        Command = 201
+        ShortCut = 16429
+      end    
+      item
+        Command = 604
+        ShortCut = 8237
+      end    
+      item
+        Command = 502
+        ShortCut = 46
+      end    
+      item
+        Command = 603
+        ShortCut = 8238
+      end    
+      item
+        Command = 501
+        ShortCut = 8
+      end    
+      item
+        Command = 501
+        ShortCut = 8200
+      end    
+      item
+        Command = 504
+        ShortCut = 16392
+      end    
+      item
+        Command = 601
+        ShortCut = 32776
+      end    
+      item
+        Command = 602
+        ShortCut = 40968
+      end    
+      item
+        Command = 509
+        ShortCut = 13
+      end    
+      item
+        Command = 199
+        ShortCut = 16449
+      end    
+      item
+        Command = 201
+        ShortCut = 16451
+      end    
+      item
+        Command = 610
+        ShortCut = 24649
+      end    
+      item
+        Command = 509
+        ShortCut = 16461
+      end    
+      item
+        Command = 510
+        ShortCut = 16462
+      end    
+      item
+        Command = 503
+        ShortCut = 16468
+      end    
+      item
+        Command = 611
+        ShortCut = 24661
+      end    
+      item
+        Command = 604
+        ShortCut = 16470
+      end    
+      item
+        Command = 603
+        ShortCut = 16472
+      end    
+      item
+        Command = 507
+        ShortCut = 16473
+      end    
+      item
+        Command = 506
+        ShortCut = 24665
+      end    
+      item
+        Command = 601
+        ShortCut = 16474
+      end    
+      item
+        Command = 602
+        ShortCut = 24666
+      end    
+      item
+        Command = 301
+        ShortCut = 16432
+      end    
+      item
+        Command = 302
+        ShortCut = 16433
+      end    
+      item
+        Command = 303
+        ShortCut = 16434
+      end    
+      item
+        Command = 304
+        ShortCut = 16435
+      end    
+      item
+        Command = 305
+        ShortCut = 16436
+      end    
+      item
+        Command = 306
+        ShortCut = 16437
+      end    
+      item
+        Command = 307
+        ShortCut = 16438
+      end    
+      item
+        Command = 308
+        ShortCut = 16439
+      end    
+      item
+        Command = 309
+        ShortCut = 16440
+      end    
+      item
+        Command = 310
+        ShortCut = 16441
+      end    
+      item
+        Command = 351
+        ShortCut = 24624
+      end    
+      item
+        Command = 352
+        ShortCut = 24625
+      end    
+      item
+        Command = 353
+        ShortCut = 24626
+      end    
+      item
+        Command = 354
+        ShortCut = 24627
+      end    
+      item
+        Command = 355
+        ShortCut = 24628
+      end    
+      item
+        Command = 356
+        ShortCut = 24629
+      end    
+      item
+        Command = 357
+        ShortCut = 24630
+      end    
+      item
+        Command = 358
+        ShortCut = 24631
+      end    
+      item
+        Command = 359
+        ShortCut = 24632
+      end    
+      item
+        Command = 360
+        ShortCut = 24633
+      end    
+      item
+        Command = 231
+        ShortCut = 24654
+      end    
+      item
+        Command = 232
+        ShortCut = 24643
+      end    
+      item
+        Command = 233
+        ShortCut = 24652
+      end    
+      item
+        Command = 612
+        ShortCut = 9
+      end    
+      item
+        Command = 613
+        ShortCut = 8201
+      end    
+      item
+        Command = 250
+        ShortCut = 24642
+      end>
+    Lines.Strings = (
+      'ColorPreview'
+    )
+    ReadOnly = True
+    SelectedColor.OnChange = nil
+  end
+  object UseSyntaxHighlightCheckBox: TCheckBox[12]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = Owner
+    Height = 19
+    Width = 166
+    Caption = 'UseSyntaxHighlightCheckBox'
+    OnChange = GeneralCheckBoxOnChange
+    TabOrder = 8
+  end
+end
--- a/ide/frames/options_editor_color.lrs
+++ b/ide/frames/options_editor_color.lrs
@ -0,0 +1,208 @@
+{ This is an automatically generated lazarus resource file }
+
+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'#2'n'#9'DesignTop'#3#145#0#0#242#2#0#6
+  +'TLabel'#19'FileExtensionsLabel'#22'AnchorSideLeft.Control'#7#22'FileExtensi'
+  +'onsComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contro'
+  +'l'#7#22'FileExtensionsComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Lef'
+  +'t'#3#206#0#6'Height'#2#14#3'Top'#2'R'#5'Width'#2'^'#18'BorderSpacing.Left'#2
+  +#6#7'Caption'#6#19'FileExtensionsLabel'#11'ParentColor'#8#0#0#242#2#1#6'TLab'
+  +'el'#16'ColorSchemeLabel'#22'AnchorSideLeft.Control'#7#19'ColorSchemeComboBo'
+  +'x'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'Co'
+  +'lorSchemeComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3#206#0#6
+  +'Height'#2#14#3'Top'#2'7'#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#28#5
+  +'Width'#2'I'#18'BorderSpacing.Left'#2#6#7'Caption'#6#13'LanguageLabel'#11'Pa'
+  +'rentColor'#8#0#0#242#2#3#6'TLabel'#17'ColorElementLabel'#22'AnchorSideLeft.'
+  +'Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#22'FileExtensionsComboBox'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#2#14#3'Top'#2'j'#5'Width'#2
+  +'Y'#17'BorderSpacing.Top'#2#6#7'Caption'#6#17'ColorElementLabel'#11'ParentCo'
+  +'lor'#8#0#0#242#2#4#9'TComboBox'#16'LanguageComboBox'#22'AnchorSideLeft.Cont'
+  +'rol'#7#5'Owner'#21'AnchorSideTop.Control'#7#26'UseSyntaxHighlightCheckBox'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#2#21#3'Top'#2#25#5'Width'#3
+  +#200#0#17'BorderSpacing.Top'#2#6#10'ItemHeight'#2#13#9'MaxLength'#2#255#8'On'
+  +'Change'#7#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#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'Own'
+  +'er'#21'AnchorSideTop.Control'#7#16'LanguageComboBox'#18'AnchorSideTop.Side'
+  +#7#9'asrBottom'#6'Height'#2#21#3'Top'#2'4'#5'Width'#3#200#0#17'BorderSpacing'
+  +'.Top'#2#6#10'ItemHeight'#2#13#9'MaxLength'#2#255#8'OnChange'#7#16'ComboBoxO'
+  +'nChange'#6'OnExit'#7#14'ComboBoxOnExit'#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'AnchorS'
+  +'ideTop.Control'#7#19'ColorSchemeComboBox'#18'AnchorSideTop.Side'#7#9'asrBot'
+  +'tom'#6'Height'#2#21#3'Top'#2'O'#5'Width'#3#200#0#17'BorderSpacing.Top'#2#6
+  +#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'MaxLength'#2#255#8'OnChange'#7
+  +#16'ComboBoxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'Combo'
+  +'BoxOnKeyDown'#8'TabOrder'#2#2#0#0#242#2#7#8'TListBox'#19'ColorElementListBo'
+  +'x'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#17'Col'
+  +'orElementLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#6'Height'#3#8#1#3'Top'
+  +#2'~'#5'Width'#3#200#0#17'BorderSpacing.Top'#2#6#16'ClickOnSelChange'#8#7'On'
+  +'Click'#7#24'ColorElementListBoxClick'#17'OnSelectionChange'#7'"ColorElement'
+  +'ListBoxSelectionChange'#8'TabOrder'#2#3#0#0#242#2#8#7'TButton'#27'SetAttrib'
+  +'uteToDefaultButton'#22'AnchorSideLeft.Control'#7#19'ColorElementListBox'#19
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'ColorEle'
+  +'mentListBox'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#4'Left'#3#206#0#6'Height'#2#25#3'Top'#2'~'#5'Width'#3'E'#1#7
+  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#7'Ca'
+  +'ption'#6#27'SetAttributeToDefaultButton'#7'OnClick'#7' SetAttributeToDefaul'
+  +'tButtonClick'#8'TabOrder'#2#4#0#0#242#2#9#7'TButton'#31'SetAllAttributesToD'
+  +'efaultButton'#22'AnchorSideLeft.Control'#7#19'ColorElementListBox'#19'Ancho'
+  +'rSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#27'SetAttributeT'
+  +'oDefaultButton'#18'AnchorSideTop.Side'#7#9'asrBottom'#20'AnchorSideRight.Si'
+  +'de'#7#9'asrBottom'#4'Left'#3#206#0#6'Height'#2#25#3'Top'#3#157#0#5'Width'#3
+  +'E'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2
+  +#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#31'SetAllAttributesToDefaultButton'
+  +#7'OnClick'#7'$SetAllAttributesToDefaultButtonClick'#8'TabOrder'#2#5#0#0#242
+  +#2#10#9'TGroupBox'#22'TextAttributesGroupBox'#22'AnchorSideLeft.Control'#7#19
+  +'ColorElementListBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTo'
+  +'p.Control'#7#31'SetAllAttributesToDefaultButton'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Cont'
+  +'rol'#7#19'ColorElementListBox'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'L'
+  ,'eft'#3#206#0#6'Height'#3#202#0#3'Top'#3#188#0#5'Width'#3'E'#1#7'Anchors'#11
+  +#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#18'BorderSpacing.Left'#2#6#17'B'
+  +'orderSpacing.Top'#2#6#7'Caption'#6#10'Attributes'#12'ClientHeight'#3#184#0
+  +#11'ClientWidth'#3'A'#1#8'TabOrder'#2#6#0#6'TLabel'#15'ForeGroundLabel'#4'Le'
+  +'ft'#2#8#6'Height'#2#14#5'Width'#2'S'#7'Caption'#6#15'ForeGroundLabel'#11'Pa'
+  +'rentColor'#8#0#0#12'TColorButton'#21'ForegroundColorButton'#21'AnchorSideTo'
+  +'p.Control'#7#15'ForeGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Le'
+  +'ft'#2#8#6'Height'#2#21#3'Top'#2#16#5'Width'#2'K'#17'BorderSpacing.Top'#2#2
+  +#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnC'
+  +'olorChanged'#7'!ForegroundColorButtonColorChanged'#0#0#12'TColorButton'#21
+  +'BackGroundColorButton'#21'AnchorSideTop.Control'#7#15'BackGroundLabel'#18'A'
+  +'nchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#8#6'Height'#2#21#3'Top'#2':'#5
+  +'Width'#2'K'#17'BorderSpacing.Top'#2#2#11'BorderWidth'#2#2#15'ButtonColorSiz'
+  +'e'#2#16#5'Color'#7#9'clBtnFace'#0#0#6'TLabel'#15'BackGroundLabel'#21'Anchor'
+  +'SideTop.Control'#7#15'ForeGroundLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#4'Left'#2#8#6'Height'#2#14#3'Top'#2'*'#5'Width'#2'S'#17'BorderSpacing.Top'#2
+  +#28#7'Caption'#6#15'BackGroundLabel'#11'ParentColor'#8#0#0#9'TCheckBox'#28'F'
+  +'oreGroundUseDefaultCheckBox'#21'AnchorSideTop.Control'#7#15'ForeGroundLabel'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'^'#6'Height'#2#19#3'Top'#2
+  +#16#5'Width'#3#178#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'Border'
+  +'Spacing.Top'#2#2#7'Caption'#6#28'ForeGroundUseDefaultCheckBox'#8'OnChange'#7
+  +#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#9'TCheckBox'#28'BackGroundU'
+  +'seDefaultCheckBox'#21'AnchorSideTop.Control'#7#15'BackGroundLabel'#18'Ancho'
+  +'rSideTop.Side'#7#9'asrBottom'#4'Left'#2'^'#6'Height'#2#19#3'Top'#2'8'#5'Wid'
+  +'th'#3#178#0#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#19'BorderSpacing.'
+  +'Right'#2#2#7'Caption'#6#28'BackGroundUseDefaultCheckBox'#8'OnChange'#7#23'G'
+  +'eneralCheckBoxOnChange'#8'TabOrder'#2#1#0#0#6'TPanel'#18'TextUnderlinePanel'
+  +#4'Left'#2#6#6'Height'#2#19#3'Top'#2'm'#5'Width'#3'5'#1#5'Align'#7#8'alBotto'
+  +'m'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#10'BevelOuter'#7#6'bvNone'#12
+  +'ClientHeight'#2#19#11'ClientWidth'#3'5'#1#8'TabOrder'#2#2#0#9'TCheckBox'#21
+  +'TextUnderlineCheckBox'#6'Height'#2#19#5'Width'#3#165#0#5'Align'#7#8'alClien'
+  +'t'#7'Caption'#6#21'TextUnderlineCheckBox'#8'OnChange'#7#23'GeneralCheckBoxO'
+  +'nChange'#8'TabOrder'#2#0#0#0#6'TPanel'#23'TextUnderlineRadioPanel'#4'Left'#3
+  +#165#0#6'Height'#2#19#5'Width'#3#144#0#5'Align'#7#7'alRight'#8'AutoSize'#9#10
+  +'BevelOuter'#7#6'bvNone'#29'ChildSizing.HorizontalSpacing'#2#3#29'ChildSizin'
+  +'g.EnlargeHorizontal'#7#14'crsScaleChilds'#28'ChildSizing.ShrinkHorizontal'#7
+  +#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBotto'
+  +'m'#27'ChildSizing.ControlsPerLine'#2#3#12'ClientHeight'#2#19#11'ClientWidth'
+  +#3#144#0#8'TabOrder'#2#1#7'Visible'#8#0#12'TRadioButton'#20'TextUnderlineRad'
+  +'ioOn'#3'Tag'#2#3#6'Height'#2#19#5'Width'#2'('#7'Caption'#6#2'On'#7'Checked'
+  +#9#8'OnChange'#7#22'TextStyleRadioOnChange'#5'State'#7#9'cbChecked'#8'TabOrd'
+  +'er'#2#0#0#0#12'TRadioButton'#21'TextUnderlineRadioOff'#3'Tag'#2#3#4'Left'#2
+  +'+'#6'Height'#2#19#5'Width'#2'*'#7'Caption'#6#3'Off'#8'OnChange'#7#22'TextSt'
+  +'yleRadioOnChange'#8'TabOrder'#2#1#0#0#12'TRadioButton'#24'TextUnderlineRadi'
+  +'oInvert'#3'Tag'#2#3#4'Left'#2'X'#6'Height'#2#19#5'Width'#2'8'#7'Caption'#6#6
+  +'Invert'#8'OnChange'#7#22'TextStyleRadioOnChange'#8'TabOrder'#2#2#0#0#0#0#6
+  +'TPanel'#13'TextBoldPanel'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#134#0#5'Width'
+  +#3'5'#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6#10
+  +'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2#19#11'ClientWidth'#3'5'#1#8'TabO'
+  +'rder'#2#3#0#9'TCheckBox'#16'TextBoldCheckBox'#6'Height'#2#19#5'Width'#3#165
+  +#0#5'Align'#7#8'alClient'#7'Caption'#6#16'TextBoldCheckBox'#8'OnChange'#7#23
+  +'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#6'TPanel'#18'TextBoldRadioPane'
+  +'l'#4'Left'#3#165#0#6'Height'#2#19#5'Width'#3#144#0#5'Align'#7#7'alRight'#8
+  +'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#29'ChildSizing.HorizontalSpacing'#2#3
+  +#29'ChildSizing.EnlargeHorizontal'#7#14'crsScaleChilds'#28'ChildSizing.Shrin'
+  +'kHorizontal'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRigh'
+  +'tThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#3#12'ClientHeight'#2#19
+  +#11'ClientWidth'#3#144#0#8'TabOrder'#2#1#7'Visible'#8#0#12'TRadioButton'#15
+  +'TextBoldRadioOn'#3'Tag'#2#1#6'Height'#2#19#5'Width'#2'('#7'Caption'#6#2'On'
+  +#7'Checked'#9#8'OnChange'#7#22'TextStyleRadioOnChange'#5'State'#7#9'cbChecke'
+  +'d'#8'TabOrder'#2#0#0#0#12'TRadioButton'#16'TextBoldRadioOff'#3'Tag'#2#1#4'L'
+  +'eft'#2'+'#6'Height'#2#19#5'Width'#2'*'#7'Caption'#6#3'Off'#8'OnChange'#7#22
+  +'TextStyleRadioOnChange'#8'TabOrder'#2#1#0#0#12'TRadioButton'#19'TextBoldRad'
+  +'ioInvert'#3'Tag'#2#1#4'Left'#2'X'#6'Height'#2#19#5'Width'#2'8'#7'Caption'#6
+  ,#6'Invert'#8'OnChange'#7#22'TextStyleRadioOnChange'#8'TabOrder'#2#2#0#0#0#0#6
+  +'TPanel'#15'TextItalicPanel'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#159#0#5'Wid'
+  +'th'#3'5'#1#5'Align'#7#8'alBottom'#8'AutoSize'#9#20'BorderSpacing.Around'#2#6
+  +#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2#19#11'ClientWidth'#3'5'#1#8'T'
+  +'abOrder'#2#4#0#9'TCheckBox'#18'TextItalicCheckBox'#6'Height'#2#19#5'Width'#3
+  +#165#0#5'Align'#7#8'alClient'#7'Caption'#6#18'TextItalicCheckBox'#8'OnChange'
+  +#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#6'TPanel'#20'TextItalicRa'
+  +'dioPanel'#4'Left'#3#165#0#6'Height'#2#19#5'Width'#3#144#0#5'Align'#7#7'alRi'
+  +'ght'#8'AutoSize'#9#10'BevelOuter'#7#6'bvNone'#29'ChildSizing.HorizontalSpac'
+  +'ing'#2#3#29'ChildSizing.EnlargeHorizontal'#7#14'crsScaleChilds'#28'ChildSiz'
+  +'ing.ShrinkHorizontal'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclL'
+  +'eftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#3#12'ClientHei'
+  +'ght'#2#19#11'ClientWidth'#3#144#0#8'TabOrder'#2#1#7'Visible'#8#0#12'TRadioB'
+  +'utton'#17'TextItalicRadioOn'#3'Tag'#2#2#6'Height'#2#19#5'Width'#2'('#7'Capt'
+  +'ion'#6#2'On'#7'Checked'#9#8'OnChange'#7#22'TextStyleRadioOnChange'#5'State'
+  +#7#9'cbChecked'#8'TabOrder'#2#0#0#0#12'TRadioButton'#18'TextItalicRadioOff'#3
+  +'Tag'#2#2#4'Left'#2'+'#6'Height'#2#19#5'Width'#2'*'#7'Caption'#6#3'Off'#8'On'
+  +'Change'#7#22'TextStyleRadioOnChange'#8'TabOrder'#2#1#0#0#12'TRadioButton'#21
+  +'TextItalicRadioInvert'#3'Tag'#2#2#4'Left'#2'X'#6'Height'#2#19#5'Width'#2'8'
+  +#7'Caption'#6#6'Invert'#8'OnChange'#7#22'TextStyleRadioOnChange'#8'TabOrder'
+  +#2#2#0#0#0#0#0#242#2#11#8'TSynEdit'#12'ColorPreview'#22'AnchorSideLeft.Contr'
+  +'ol'#7#5'Owner'#21'AnchorSideTop.Control'#7#19'ColorElementListBox'#18'Ancho'
+  +'rSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anc'
+  +'horSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#5'Owner'#21
+  +'AnchorSideBottom.Side'#7#9'asrBottom'#6'Height'#3#181#0#3'Top'#3#140#1#5'Wi'
+  +'dth'#3#19#2#17'BorderSpacing.Top'#2#6#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
+  +'Right'#8'akBottom'#0#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#10'Fon'
+  +'t.Pitch'#7#7'fpFixed'#12'Font.Quality'#7#16'fqNonAntialiased'#11'ParentColo'
+  +'r'#8#10'ParentFont'#8#8'TabOrder'#2#7#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'Command'#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'Command'#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'Command'#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'Comman'
+  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
+  +'mmand'#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'Short'
+  +'Cut'#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'Comm'
+  +'and'#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'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'ShortC'
+  +'ut'#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'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'Comman'
+  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
+  +'ommand'#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'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'ShortCu'
+  ,'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
+  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#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'Comma'
+  +'nd'#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'ColorPrev'
+  +'iew'#0#8'ReadOnly'#9#22'SelectedColor.OnChange'#13#0#0#242#2#12#9'TCheckBox'
+  +#26'UseSyntaxHighlightCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anc'
+  +'horSideTop.Control'#7#5'Owner'#6'Height'#2#19#5'Width'#3#166#0#7'Caption'#6
+  +#26'UseSyntaxHighlightCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8
+  +'TabOrder'#2#8#0#0#0
+]);
--- a/ide/frames/options_editor_color.pas
+++ b/ide/frames/options_editor_color.pas
@ -0,0 +1,935 @@
+{
+ ***************************************************************************
+ *                                                                         *
+ *   This source is free software; you can redistribute it and/or modify   *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This code is distributed in the hope that it will be useful, but      *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   General Public License for more details.                              *
+ *                                                                         *
+ *   A copy of the GNU General Public License is available on the World    *
+ *   Wide Web at <http://www.gnu.org/copyleft/gpl.html>. You can also      *
+ *   obtain it by writing to the Free Software Foundation,                 *
+ *   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.        *
+ *                                                                         *
+ ***************************************************************************
+}
+unit options_editor_color;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, FileUtil, LResources, Forms, StdCtrls, SynEdit, ExtCtrls,
+  Dialogs, Graphics, LCLProc, SynEditMiscClasses, LCLType,
+  EditorOptions, LazarusIDEStrConsts, IDEOptionsIntf, options_editor_general,
+  IDEProcs, Controls;
+
+type
+
+  { TEditorColorOptionsFrame }
+
+  TEditorColorOptionsFrame = class(TAbstractIDEOptionsEditor)
+    BackGroundColorButton: TColorButton;
+    BackGroundLabel: TLabel;
+    BackGroundUseDefaultCheckBox: TCheckBox;
+    UseSyntaxHighlightCheckBox: TCheckBox;
+    ColorElementLabel: TLabel;
+    ColorElementListBox: TListBox;
+    ColorPreview: TSynEdit;
+    ColorSchemeComboBox: TComboBox;
+    ColorSchemeLabel: TLabel;
+    FileExtensionsComboBox: TComboBox;
+    FileExtensionsLabel: TLabel;
+    ForegroundColorButton: TColorButton;
+    ForeGroundLabel: TLabel;
+    ForeGroundUseDefaultCheckBox: TCheckBox;
+    LanguageComboBox: TComboBox;
+    LanguageLabel: TLabel;
+    SetAllAttributesToDefaultButton: TButton;
+    SetAttributeToDefaultButton: TButton;
+    TextAttributesGroupBox: TGroupBox;
+    TextBoldCheckBox: TCheckBox;
+    TextBoldPanel: TPanel;
+    TextBoldRadioInvert: TRadioButton;
+    TextBoldRadioOff: TRadioButton;
+    TextBoldRadioOn: TRadioButton;
+    TextBoldRadioPanel: TPanel;
+    TextItalicCheckBox: TCheckBox;
+    TextItalicPanel: TPanel;
+    TextItalicRadioInvert: TRadioButton;
+    TextItalicRadioOff: TRadioButton;
+    TextItalicRadioOn: TRadioButton;
+    TextItalicRadioPanel: TPanel;
+    TextUnderlineCheckBox: TCheckBox;
+    TextUnderlinePanel: TPanel;
+    TextUnderlineRadioInvert: TRadioButton;
+    TextUnderlineRadioOff: TRadioButton;
+    TextUnderlineRadioOn: TRadioButton;
+    TextUnderlineRadioPanel: TPanel;
+    procedure ColorElementListBoxClick(Sender: TObject);
+    procedure ColorElementListBoxSelectionChange(Sender: TObject; User: boolean);
+    procedure ForegroundColorButtonColorChanged(Sender: TObject);
+    procedure GeneralCheckBoxOnChange(Sender: TObject);
+    procedure ComboBoxOnExit(Sender: TObject);
+    procedure SetAllAttributesToDefaultButtonClick(Sender: TObject);
+    procedure SetAttributeToDefaultButtonClick(Sender: TObject);
+    procedure TextStyleRadioOnChange(Sender: TObject);
+    procedure ComboBoxOnChange(Sender: TObject);
+    procedure ComboBoxOnKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
+  private
+    FDialog: TAbstractOptionsEditorDialog;
+    // current index in EditorOpts.EditOptHighlighterList
+    CurHighlightElement: TSynHighlightElement;
+    CurHighlightElementIsExtra: Boolean;
+    UpdatingColor: Boolean;
+    FFileExtensions: TStringList;  // list of LanguageName=FileExtensions
+    FHighlighterList: TStringList; // list of "ColorScheme" Data=TSrcIDEHighlighter
+    FColorSchemes: TStringList;    // list of LanguageName=ColorScheme
+
+    PreviewSyn: TSrcIDEHighlighter;
+    CurLanguageID: Integer;
+
+    function GetCurFileExtensions(const LanguageName: String): String;
+    procedure SetCurFileExtensions(const LanguageName, FileExtensions: String);
+    procedure ShowCurAttribute;
+    procedure FindCurHighlightElement;
+    procedure FillColorElementListBox;
+    procedure SetColorElementsToDefaults(OnlySelected: Boolean);
+    function GetCurColorScheme(const LanguageName: String): String;
+    procedure SetCurColorScheme(const LanguageName, ColorScheme: String);
+    function GetHighlighter(SynClass: TCustomSynClass;
+      const ColorScheme: String; CreateIfNotExists: Boolean): TSrcIDEHighlighter;
+    procedure ClearHighlighters;
+    procedure InvalidatePreviews;
+    procedure SetPreviewSynInAllPreviews;
+
+    procedure OnStatusChange(Sender: TObject; Changes: TSynStatusChanges);
+    procedure OnSpecialLineMarkup(Sender: TObject; Line: Integer;
+      var Special: boolean; aMarkup: TSynSelectedColor);
+
+
+    function GeneralPage: TEditorGeneralOptionsFrame; inline;
+  public
+    destructor Destroy; override;
+
+    function GetTitle: String; override;
+    procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
+    procedure ReadSettings(AOptions: TAbstractIDEOptions); override;
+    procedure WriteSettings(AOptions: TAbstractIDEOptions); override;
+    class function SupportedOptionsClass: TAbstractIDEOptionsClass; override;
+  end;
+
+implementation
+
+{ TEditorColorOptionsFrame }
+
+procedure TEditorColorOptionsFrame.ColorElementListBoxClick(Sender: TObject);
+begin
+  FindCurHighlightElement;
+end;
+
+procedure TEditorColorOptionsFrame.ColorElementListBoxSelectionChange(
+  Sender: TObject; User: boolean);
+begin
+  FindCurHighlightElement;
+end;
+
+procedure TEditorColorOptionsFrame.ForegroundColorButtonColorChanged(
+  Sender: TObject);
+begin
+  if Sender = ForeGroundColorButton then
+  begin
+    if (CurHighlightElement = nil) or UpdatingColor then
+      exit;
+    if not ForeGroundUseDefaultCheckBox.Checked then
+    begin
+      CurHighlightElement.Foreground := ForeGroundColorButton.ButtonColor;
+      InvalidatePreviews;
+    end;
+  end;
+  if Sender = BackGroundColorButton then
+  begin
+    if (CurHighlightElement = nil) or UpdatingColor then
+      exit;
+    if not BackGroundUseDefaultCheckBox.Checked then
+    begin
+      CurHighlightElement.Background := BackGroundColorButton.ButtonColor;
+      InvalidatePreviews;
+    end;
+  end;
+end;
+
+procedure TEditorColorOptionsFrame.GeneralCheckBoxOnChange(Sender: TObject);
+var
+  NewColor: TColor;
+begin
+  if Sender = UseSyntaxHighlightCheckBox then
+  begin
+    SetPreviewSynInAllPreviews;
+    Exit;
+  end;
+
+  if CurHighlightElement <> nil then
+  begin
+    if Sender = ForeGroundUseDefaultCheckBox then
+      if UpdatingColor = False then
+      begin
+        UpdatingColor := True;
+        if not ForeGroundUseDefaultCheckBox.Checked then
+          NewColor := ForeGroundColorButton.ButtonColor
+        else
+          NewColor := clNone;
+        ForeGroundColorButton.Visible := not
+          ForeGroundUseDefaultCheckBox.Checked;
+        if NewColor <> CurHighlightElement.Foreground then
+        begin
+          CurHighlightElement.Foreground := NewColor;
+          InvalidatePreviews;
+        end;
+        UpdatingColor := False;
+      end;
+    if Sender = BackGroundUseDefaultCheckBox then
+      if UpdatingColor = False then
+      begin
+        if not BackGroundUseDefaultCheckBox.Checked then
+          NewColor := BackGroundColorButton.ButtonColor
+        else
+          NewColor := clNone;
+        BackGroundColorButton.Visible := not
+          BackGroundUseDefaultCheckBox.Checked;
+        if NewColor <> CurHighlightElement.Background then
+        begin
+          CurHighlightElement.Background := NewColor;
+          InvalidatePreviews;
+        end;
+      end;
+    if Sender = TextBoldCheckBox then
+      if CurHighlightElementIsExtra
+      then TextStyleRadioOnChange(Sender)
+      else if TextBoldCheckBox.Checked xor (fsBold in CurHighlightElement.Style) then
+      begin
+        if TextBoldCheckBox.Checked then
+          CurHighlightElement.Style := CurHighlightElement.Style + [fsBold]
+        else
+          CurHighlightElement.Style := CurHighlightElement.Style - [fsBold];
+        InvalidatePreviews;
+      end;
+    if Sender = TextItalicCheckBox then
+      if CurHighlightElementIsExtra
+      then TextStyleRadioOnChange(Sender)
+      else if TextItalicCheckBox.Checked then
+      begin
+        if not (fsItalic in CurHighlightElement.Style) then
+        begin
+          CurHighlightElement.Style := CurHighlightElement.Style + [fsItalic];
+          InvalidatePreviews;
+        end;
+      end
+      else
+      if (fsItalic in CurHighlightElement.Style) then
+      begin
+        CurHighlightElement.Style := CurHighlightElement.Style - [fsItalic];
+        InvalidatePreviews;
+      end;
+    if Sender = TextUnderlineCheckBox then
+      if CurHighlightElementIsExtra
+      then TextStyleRadioOnChange(Sender)
+      else if TextUnderlineCheckBox.Checked then
+      begin
+        if not (fsUnderline in CurHighlightElement.Style) then
+        begin
+          CurHighlightElement.Style := CurHighlightElement.Style + [fsUnderline];
+          InvalidatePreviews;
+        end;
+      end
+      else
+      if (fsUnderline in CurHighlightElement.Style) then
+      begin
+        CurHighlightElement.Style := CurHighlightElement.Style - [fsUnderline];
+        InvalidatePreviews;
+      end;
+  end;
+end;
+
+procedure TEditorColorOptionsFrame.ComboBoxOnExit(Sender: TObject);
+var
+  Box: TComboBox absolute Sender;
+  NewVal, a: integer;
+begin
+  if Sender = ColorSchemeComboBox then
+    with GeneralPage do
+    begin
+      if Box.Items.IndexOf(Box.Text) < 0 then
+        SetComboBoxText(Box, GetCurColorScheme(PreviewSyn.LanguageName))
+        // unknown color scheme -> switch back
+      else
+      if Box.Text <> GetCurColorScheme(PreviewSyn.LanguageName) then
+      begin
+        // change the colorscheme
+        SetCurColorScheme(PreviewSyn.LanguageName, Box.Text);
+        SetComboBoxText(Box, Box.Text);
+        PreviewSyn := GetHighlighter(TCustomSynClass(PreviewSyn.ClassType),
+          Box.Text, True);
+        SetPreviewSynInAllPreviews;
+        FillColorElementListBox;
+        FindCurHighlightElement;
+        InvalidatePreviews;
+      end;
+    end
+  else
+  if Sender = FileExtensionsComboBox then
+  begin
+    //DebugLn(['TEditorOptionsForm.ComboBoxOnExit Box.Text="',Box.Text,'" Old="',GetCurFileExtensions(PreviewSyn.LanguageName),'" PreviewSyn.LanguageName=',PreviewSyn.LanguageName]);
+    if Box.Text <> GetCurFileExtensions(PreviewSyn.LanguageName) then
+    begin
+      SetCurFileExtensions(PreviewSyn.LanguageName, Box.Text);
+      SetComboBoxText(Box, Box.Text);
+    end;
+    //DebugLn(['TEditorOptionsForm.ComboBoxOnExit Box.Text="',Box.Text,'" Now="',GetCurFileExtensions(PreviewSyn.LanguageName),'" PreviewSyn.LanguageName=',PreviewSyn.LanguageName]);
+  end
+  else
+  if Sender = LanguageComboBox then
+    if Box.Items.IndexOf(Box.Text) < 0 then
+      SetComboBoxText(Box, PreviewSyn.LanguageName)// unknown language -> switch back
+    else
+    if Box.Text <> PreviewSyn.LanguageName then
+    begin
+      NewVal := EditorOpts.HighlighterList.FindByName(Box.Text);
+      if NewVal >= 0 then
+      begin
+        SetComboBoxText(Box, Box.Text);
+        CurLanguageID := NewVal;
+        PreviewSyn    := GetHighlighter(
+          EditorOpts.HighlighterList[CurLanguageID].SynClass,
+          GetCurColorScheme(
+          EditorOpts.HighlighterList[
+          CurLanguageID].SynClass.GetLanguageName)
+          , True);
+        SetComboBoxText(ColorSchemeComboBox,
+          GetCurColorScheme(PreviewSyn.LanguageName));
+        SetComboBoxText(FileExtensionsComboBox,
+          GetCurFileExtensions(PreviewSyn.LanguageName));
+        with GeneralPage do
+          for a := Low(PreviewEdits) to High(PreviewEdits) do
+          begin
+            PreviewEdits[a].Lines.Text := EditorOpts.HighlighterList[CurLanguageID].SampleSource;
+            PreviewEdits[a].CaretXY := EditorOpts.HighlighterList[CurLanguageID].CaretXY;
+            PreviewEdits[a].TopLine := 1;
+            PreviewEdits[a].LeftChar := 1;
+          end;
+        SetPreviewSynInAllPreviews;
+        FillColorElementListBox;
+        FindCurHighlightElement;
+        InvalidatePreviews;
+      end;
+    end;
+end;
+
+procedure TEditorColorOptionsFrame.SetAllAttributesToDefaultButtonClick(
+  Sender: TObject);
+begin
+  SetColorElementsToDefaults(False);
+end;
+
+procedure TEditorColorOptionsFrame.SetAttributeToDefaultButtonClick(
+  Sender: TObject);
+begin
+  SetColorElementsToDefaults(True);
+end;
+
+procedure TEditorColorOptionsFrame.TextStyleRadioOnChange(Sender: TObject);
+
+  procedure CalcNewStyle(CheckBox: TCheckBox; RadioOn, RadioOff,
+                         RadioInvert: TRadioButton; fs : TFontStyle;
+                         Panel: TPanel);
+  begin
+    if CheckBox.Checked then
+    begin
+      Panel.Enabled := True;
+      if RadioInvert.Checked then
+      begin
+        CurHighlightElement.Style     := CurHighlightElement.Style + [fs];
+        CurHighlightElement.StyleMask := CurHighlightElement.StyleMask - [fs];
+      end
+      else
+      if RadioOn.Checked then
+      begin
+        CurHighlightElement.Style     := CurHighlightElement.Style + [fs];
+        CurHighlightElement.StyleMask := CurHighlightElement.StyleMask + [fs];
+      end
+      else
+      if RadioOff.Checked then
+      begin
+        CurHighlightElement.Style     := CurHighlightElement.Style - [fs];
+        CurHighlightElement.StyleMask := CurHighlightElement.StyleMask + [fs];
+      end
+    end
+    else
+    begin
+      Panel.Enabled := False;
+      CurHighlightElement.Style     := CurHighlightElement.Style - [fs];
+      CurHighlightElement.StyleMask := CurHighlightElement.StyleMask - [fs];
+    end;
+  end;
+begin
+  if UpdatingColor or not CurHighlightElementIsExtra then
+    Exit;
+
+  if (Sender = TextBoldCheckBox) or
+     (Sender = TextBoldRadioOn) or
+     (Sender = TextBoldRadioOff) or
+     (Sender = TextBoldRadioInvert) then
+    CalcNewStyle(TextBoldCheckBox, TextBoldRadioOn, TextBoldRadioOff,
+                    TextBoldRadioInvert, fsBold, TextBoldRadioPanel);
+
+  if (Sender = TextItalicCheckBox) or
+     (Sender = TextItalicRadioOn) or
+     (Sender = TextItalicRadioOff) or
+     (Sender = TextItalicRadioInvert) then
+    CalcNewStyle(TextItalicCheckBox, TextItalicRadioOn, TextItalicRadioOff,
+                    TextItalicRadioInvert, fsItalic, TextItalicRadioPanel);
+
+  if (Sender = TextUnderlineCheckBox) or
+     (Sender = TextUnderlineRadioOn) or
+     (Sender = TextUnderlineRadioOff) or
+     (Sender = TextUnderlineRadioInvert) then
+    CalcNewStyle(TextUnderlineCheckBox, TextUnderlineRadioOn, TextUnderlineRadioOff,
+                    TextUnderlineRadioInvert, fsUnderline, TextUnderlineRadioPanel);
+
+
+  InvalidatePreviews;
+end;
+
+procedure TEditorColorOptionsFrame.ShowCurAttribute;
+begin
+  if (CurHighlightElement = nil) or UpdatingColor then
+    exit;
+  UpdatingColor := True;
+
+  TextBoldRadioPanel.Visible := CurHighlightElementIsExtra;
+  TextItalicRadioPanel.Visible := CurHighlightElementIsExtra;
+  TextUnderlineRadioPanel.Visible := CurHighlightElementIsExtra;
+  if CurHighlightElementIsExtra then
+  begin
+    TextBoldCheckBox.Checked :=
+      (fsBold in CurHighlightElement.Style) or
+      (fsBold in CurHighlightElement.StyleMask);
+    TextBoldRadioPanel.Enabled := TextBoldCheckBox.Checked;
+
+    if not(fsBold in CurHighlightElement.StyleMask) then
+      TextBoldRadioInvert.Checked := True
+    else
+    if fsBold in CurHighlightElement.Style then
+      TextBoldRadioOn.Checked := True
+    else
+      TextBoldRadioOff.Checked := True;
+
+    TextItalicCheckBox.Checked :=
+      (fsItalic in CurHighlightElement.Style) or
+      (fsItalic in CurHighlightElement.StyleMask);
+    TextItalicRadioPanel.Enabled := TextItalicCheckBox.Checked;
+
+    if not(fsItalic in CurHighlightElement.StyleMask) then
+      TextItalicRadioInvert.Checked := True
+    else
+    if fsItalic in CurHighlightElement.Style then
+      TextItalicRadioOn.Checked := True
+    else
+      TextItalicRadioOff.Checked := True;
+
+    TextUnderlineCheckBox.Checked :=
+      (fsUnderline in CurHighlightElement.Style) or
+      (fsUnderline in CurHighlightElement.StyleMask);
+    TextUnderlineRadioPanel.Enabled := TextUnderlineCheckBox.Checked;
+
+    if not(fsUnderline in CurHighlightElement.StyleMask) then
+      TextUnderlineRadioInvert.Checked := True
+    else
+    if fsUnderline in CurHighlightElement.Style then
+      TextUnderlineRadioOn.Checked := True
+    else
+      TextUnderlineRadioOff.Checked := True;
+  end
+  else
+  begin
+    TextBoldCheckBox.Checked := fsBold in CurHighlightElement.Style;
+    TextItalicCheckBox.Checked := fsItalic in CurHighlightElement.Style;
+    TextUnderlineCheckBox.Checked := fsUnderline in CurHighlightElement.Style;
+  end;
+
+
+  if CurHighlightElement.Foreground = clNone then
+    ForeGroundUseDefaultCheckBox.Checked := True
+  else
+  begin
+    ForeGroundUseDefaultCheckBox.Checked := False;
+    ForeGroundColorButton.ButtonColor    := CurHighlightElement.Foreground;
+  end;
+  ForeGroundColorButton.Visible := not ForeGroundUseDefaultCheckBox.Checked;
+  if CurHighlightElement.Background = clNone then
+    BackGroundUseDefaultCheckBox.Checked := True
+  else
+  begin
+    BackGroundUseDefaultCheckBox.Checked := False;
+    BackGroundColorButton.ButtonColor    := CurHighlightElement.Background;
+  end;
+  BackGroundColorButton.Visible := not BackGroundUseDefaultCheckBox.Checked;
+  UpdatingColor := False;
+end;
+
+procedure TEditorColorOptionsFrame.FindCurHighlightElement;
+var
+  a, i: Integer;
+  h: TAdditionalHilightAttribute;
+  Old: TSynHighlightElement;
+begin
+  Old := CurHighlightElement;
+  CurHighlightElement := nil;
+  a := ColorElementListBox.ItemIndex;
+  if (a >= 0) then
+  begin
+    i := PreviewSyn.AttrCount - 1;
+    while (i >= 0) do
+    begin
+      if ColorElementListBox.Items[a] = PreviewSyn.Attribute[i].Name then
+      begin
+        CurHighlightElement := PreviewSyn.Attribute[i];
+        break;
+      end;
+      dec(i);
+    end;
+  end;
+
+  if Old <> CurHighlightElement then
+  begin
+    CurHighlightElementIsExtra := False;
+    for h := Low(TAdditionalHilightAttribute) to high(TAdditionalHilightAttribute) do
+      if ColorElementListBox.Items[a] = AdditionalHighlightAttributes[h] then
+        CurHighlightElementIsExtra := true;
+    ShowCurAttribute;
+  end;
+end;
+
+procedure TEditorColorOptionsFrame.FillColorElementListBox;
+var
+  i: Integer;
+begin
+  with ColorElementListBox.Items do
+  begin
+    BeginUpdate;
+    Clear;
+
+    for i := 0 to PreviewSyn.AttrCount - 1 do
+      if PreviewSyn.Attribute[i].Name <> '' then
+        Add(PreviewSyn.Attribute[i].Name);
+    EndUpdate;
+  end;
+
+  CurHighlightElement := nil;
+  CurHighlightElementIsExtra := False;
+  if ColorElementListBox.Items.Count > 0 then
+    ColorElementListBox.Selected[0] := True;
+  FindCurHighlightElement;
+end;
+
+procedure TEditorColorOptionsFrame.SetColorElementsToDefaults(
+  OnlySelected: Boolean);
+var
+  DefaultSyn: TSrcIDEHighlighter;
+  PascalSyn: TPreviewPasSyn;
+  i, j: Integer;
+  CurSynClass: TCustomSynClass;
+begin
+  PascalSyn := TPreviewPasSyn(GetHighlighter(TPreviewPasSyn,
+    ColorSchemeComboBox.Text, True));
+  CurSynClass := TCustomSynClass(PreviewSyn.ClassType);
+  DefaultSyn := CurSynClass.Create(nil);
+  try
+    EditorOpts.AddSpecialHilightAttribsToHighlighter(DefaultSyn);
+    EditorOpts.ReadDefaultsForHighlighterSettings(DefaultSyn,
+      ColorSchemeComboBox.Text, PascalSyn);
+    for i := 0 to DefaultSyn.AttrCount - 1 do
+    begin
+      if DefaultSyn.Attribute[i].Name = '' then
+        continue;
+      if OnlySelected then
+      begin
+        if (DefaultSyn.Attribute[i].Name = CurHighlightElement.Name) then
+          CopyHiLightAttributeValues(DefaultSyn.Attribute[i],
+            CurHighlightElement);
+      end
+      else
+        for j := 0 to PreviewSyn.AttrCount - 1 do
+          if PreviewSyn.Attribute[j].Name = DefaultSyn.Attribute[i].Name then
+            CopyHiLightAttributeValues(DefaultSyn.Attribute[i],
+              PreviewSyn.Attribute[j]);
+    end;
+  finally
+    DefaultSyn.Free;
+  end;
+  ShowCurAttribute;
+end;
+
+function TEditorColorOptionsFrame.GetCurColorScheme(const LanguageName: String): String;
+begin
+  if FColorSchemes = nil then
+    Result := ''
+  else
+    Result := FColorSchemes.Values[LanguageName];
+  if Result = '' then
+    Result := EditorOpts.ReadColorScheme(LanguageName);
+end;
+
+procedure TEditorColorOptionsFrame.SetCurColorScheme(const LanguageName,
+  ColorScheme: String);
+begin
+  if FColorSchemes = nil then
+    FColorSchemes := TStringList.Create;
+  FColorSchemes.Values[LanguageName] := ColorScheme;
+end;
+
+function TEditorColorOptionsFrame.GetHighlighter(SynClass: TCustomSynClass;
+  const ColorScheme: String; CreateIfNotExists: Boolean): TSrcIDEHighlighter;
+var
+  i: Integer;
+begin
+  if FHighlighterList = nil then
+    FHighlighterList := TStringList.Create;
+  for i := 0 to FHighlighterList.Count - 1 do
+    if (FHighlighterList[i] = ColorScheme) and
+      (TCustomSynClass(TSrcIDEHighlighter(fHighlighterList.Objects[i]).ClassType) =
+      SynClass) then
+    begin
+      Result := TSrcIDEHighlighter(FHighlighterList.Objects[i]);
+      exit;
+    end;
+  if CreateIfNotExists then
+  begin
+    Result := SynClass.Create(nil);
+    EditorOpts.AddSpecialHilightAttribsToHighlighter(Result);
+    FHighlighterList.AddObject(ColorScheme, Result);
+    EditorOpts.ReadHighlighterSettings(Result, ColorScheme);
+  end;
+end;
+
+procedure TEditorColorOptionsFrame.ClearHighlighters;
+var
+  i: Integer;
+begin
+  if FHighlighterList = nil then
+    Exit;
+  for i := 0 to FHighlighterList.Count - 1 do
+    TSrcIDEHighlighter(FHighlighterList.Objects[i]).Free;
+  FHighlighterList.Free;
+end;
+
+procedure TEditorColorOptionsFrame.InvalidatePreviews;
+var
+  a: Integer;
+begin
+  with GeneralPage do
+    for a := Low(PreviewEdits) to High(PreviewEdits) do
+      if PreviewEdits[a] <> nil then
+      begin
+        EditorOpts.SetMarkupColors(PreviewEdits[a].Highlighter, PreviewEdits[a]);
+        PreviewEdits[a].Invalidate;
+      end;
+end;
+
+procedure TEditorColorOptionsFrame.SetPreviewSynInAllPreviews;
+var
+  a: Integer;
+begin
+  with GeneralPage do
+    for a := Low(PreviewEdits) to High(PreviewEdits) do
+      if PreviewEdits[a] <> nil then
+        if UseSyntaxHighlightCheckBox.Checked then
+          PreviewEdits[a].Highlighter := PreviewSyn
+        else
+          PreviewEdits[a].Highlighter := nil;
+end;
+
+function TEditorColorOptionsFrame.GeneralPage: TEditorGeneralOptionsFrame; inline;
+begin
+  Result := TEditorGeneralOptionsFrame(FDialog.FindEditor(TEditorGeneralOptionsFrame));
+end;
+
+destructor TEditorColorOptionsFrame.Destroy;
+begin
+  FFileExtensions.Free;
+  ClearHighlighters;
+  FColorSchemes.Free;
+  inherited Destroy;
+end;
+
+function TEditorColorOptionsFrame.GetTitle: String;
+begin
+  Result := dlgEdColor;
+end;
+
+procedure TEditorColorOptionsFrame.Setup(ADialog: TAbstractOptionsEditorDialog);
+begin
+  FDialog := ADialog;
+  UpdatingColor := False;
+  CurHighlightElement := nil;
+  CurHighlightElementIsExtra := False;
+
+  UseSyntaxHighlightCheckBox.Caption := dlgUseSyntaxHighlight;
+  LanguageLabel.Caption := dlgLang;
+  ColorSchemeLabel.Caption := dlgClrScheme;
+
+  with ColorSchemeComboBox do
+  begin
+    with Items do
+    begin
+      BeginUpdate;
+      // ToDo: fill also with custom color schemes
+      Add(DEFAULT_COLOR_SCHEME.Name);
+      Add(DELPHI_COLOR_SCHEME.Name);
+      Add(CLASSIC_COLOR_SCHEME.Name);
+      Add(TWILIGHT_COLOR_SCHEME.Name);
+      Add(OCEAN_COLOR_SCHEME.Name);
+      EndUpdate;
+    end;
+    Text := DEFAULT_COLOR_SCHEME.Name;
+  end;
+
+  FileExtensionsLabel.Caption := dlgFileExts;
+  ColorElementLabel.Caption := dlgEdElement;
+  SetAttributeToDefaultButton.Caption := dlgSetElementDefault;
+  SetAllAttributesToDefaultButton.Caption := dlgSetAllElementDefault;
+  ForeGroundLabel.Caption := dlgForecolor;
+  ForeGroundUseDefaultCheckBox.Caption := dlgEdUseDefColor;
+  BackGroundLabel.Caption := dlgBackColor;
+  BackgroundColorButton.Color := clBlue;
+  BackGroundUseDefaultCheckBox.Caption := dlgEdUseDefColor;
+  TextAttributesGroupBox.Caption := dlgTextAttributes;
+
+  TextBoldCheckBox.Caption := dlgEdBold;
+  TextBoldRadioOn.Caption := dlgEdOn;
+  TextBoldRadioOff.Caption := dlgEdOff;
+  TextBoldRadioInvert.Caption := dlgEdInvert;
+
+  TextItalicCheckBox.Caption := dlgEdItal;
+  TextItalicRadioOn.Caption := dlgEdOn;
+  TextItalicRadioOff.Caption := dlgEdOff;
+  TextItalicRadioInvert.Caption := dlgEdInvert;
+
+  TextUnderlineCheckBox.Caption := dlgEdUnder;
+  TextUnderlineRadioOn.Caption := dlgEdOn;
+  TextUnderlineRadioOff.Caption := dlgEdOff;
+  TextUnderlineRadioInvert.Caption := dlgEdInvert;
+
+  with GeneralPage do
+  begin
+    SetLength(PreviewEdits, Length(PreviewEdits) + 1);
+    PreviewEdits[Length(PreviewEdits)-1] := ColorPreview;
+  end;
+end;
+
+procedure TEditorColorOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions);
+var
+  i: integer;
+begin
+  // here we are sure that Setup has been called for every frame =>
+  // we can assign events to every registered preview control
+
+  with GeneralPage do
+    for i := Low(PreviewEdits) to High(PreviewEdits) do
+    begin
+      PreviewEdits[i].OnStatusChange := @OnStatusChange;
+      PreviewEdits[i].OnSpecialLineMarkup := @OnSpecialLineMarkup;
+    end;
+
+  with AOptions as TEditorOptions do
+  begin
+    UseSyntaxHighlightCheckBox.Checked := UseSyntaxHighlight;
+
+    with LanguageComboBox do
+      with Items do
+      begin
+        BeginUpdate;
+        for i := 0 to EditorOpts.HighlighterList.Count - 1 do
+          Add(HighlighterList[i].SynClass.GetLanguageName);
+        EndUpdate;
+      end;
+
+    with FileExtensionsComboBox, GeneralPage do
+      if CurLanguageID >= 0 then
+        SetComboBoxText(FileExtensionsComboBox,
+          HighlighterList[CurLanguageID].FileExtensions);
+
+    PreviewSyn := GetHighlighter(TPreviewPasSyn, GetCurColorScheme(TPreviewPasSyn.GetLanguageName), True);
+    CurLanguageID := HighlighterList.FindByClass(TCustomSynClass(PreviewSyn.ClassType));
+
+    with GeneralPage do
+      for i := Low(PreviewEdits) to High(PreviewEdits) do
+        if PreviewEdits[i] <> nil then
+          with PreviewEdits[i] do
+          begin
+            if UseSyntaxHighlight then
+              Highlighter := PreviewSyn
+            else
+              Highlighter := nil;
+            Lines.Text := HighlighterList[CurLanguageID].SampleSource;
+            CaretXY := HighlighterList[CurLanguageID].CaretXY;
+            TopLine := 1;
+            LeftChar := 1;
+          end;
+
+    LanguageComboBox.Text := PreviewSyn.LanguageName;
+    SetComboBoxText(LanguageComboBox, LanguageComboBox.Text);
+    ColorSchemeComboBox.Text := GetCurColorScheme(PreviewSyn.LanguageName);
+    SetComboBoxText(ColorSchemeComboBox, ColorSchemeComboBox.Text);
+    FillColorElementListBox;
+    FindCurHighlightElement;
+    ShowCurAttribute;
+    InvalidatePreviews;
+  end;
+end;
+
+procedure TEditorColorOptionsFrame.WriteSettings(AOptions: TAbstractIDEOptions);
+var
+  i, j: Integer;
+  Syn: TSrcIDEHighlighter;
+begin
+  with AOptions as TEditorOptions do
+  begin
+    UseSyntaxHighlight := UseSyntaxHighlightCheckBox.Checked;
+    if FFileExtensions <> nil then
+    begin
+      for i := 0 to FFileExtensions.Count - 1 do
+      begin
+        j := HighlighterList.FindByName(FFileExtensions.Names[i]);
+        if j >= 0 then
+          HighlighterList[j].FileExtensions := FFileExtensions.ValueFromIndex[i];
+      end;
+    end;
+
+    if FColorSchemes <> nil then
+    begin
+      for i := 0 to FColorSchemes.Count - 1 do
+         WriteColorScheme(FColorSchemes.Names[i],
+           FColorSchemes.Values[FColorSchemes.Names[i]]);
+    end;
+
+    if FHighlighterList <> nil then
+    begin
+      for i := 0 to FHighlighterList.Count - 1 do
+      begin
+        Syn := TSrcIDEHighlighter(FHighlighterList.Objects[i]);
+        WriteHighlighterSettings(Syn, FHighlighterList[i]);
+      end;
+    end;
+  end;
+end;
+
+class function TEditorColorOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass;
+begin
+  Result := TEditorOptions;
+end;
+
+procedure TEditorColorOptionsFrame.ComboBoxOnChange(Sender: TObject);
+var
+  ComboBox: TComboBox absolute Sender;
+begin
+  if ComboBox.Items.IndexOf(ComboBox.Text) >= 0 then
+    ComboBoxOnExit(Sender);
+end;
+
+procedure TEditorColorOptionsFrame.ComboBoxOnKeyDown(Sender: TObject; var Key: Word;
+  Shift: TShiftState);
+begin
+  if (ssCtrl in Shift) and (Key = VK_S) then
+    ComboBoxOnExit(Sender);
+end;
+
+function TEditorColorOptionsFrame.GetCurFileExtensions(const LanguageName: String): String;
+var
+  i: Integer;
+begin
+  if FFileExtensions = nil then
+    Result := ''
+  else
+    Result := FFileExtensions.Values[LanguageName];
+  if Result = '' then
+  begin
+    i := EditorOpts.HighlighterList.FindByName(LanguageName);
+    if i >= 0 then
+      Result := EditorOpts.HighlighterList[i].FileExtensions;
+  end;
+end;
+
+procedure TEditorColorOptionsFrame.SetCurFileExtensions(const LanguageName, FileExtensions: String);
+begin
+  if FFileExtensions = nil then
+    FFileExtensions := TStringList.Create;
+  FFileExtensions.Values[LanguageName] := FileExtensions;
+end;
+
+procedure TEditorColorOptionsFrame.OnSpecialLineMarkup(Sender: TObject;
+  Line: Integer; var Special: boolean; aMarkup: TSynSelectedColor);
+var
+  e: TSynHighlightElement;
+  AddAttr: TAdditionalHilightAttribute;
+  i: Integer;
+begin
+  if CurLanguageID >= 0 then
+  begin
+    AddAttr := EditorOpts.HighlighterList[CurLanguageID].SampleLineToAddAttr(Line);
+    if AddAttr <> ahaNone then
+    begin
+      i := PreviewSyn.AttrCount - 1;
+      while (i >= 0) do
+      begin
+        e := PreviewSyn.Attribute[i];
+        if e.Name = '' then
+          continue;
+        if e.Name = AdditionalHighlightAttributes[AddAttr] then
+        begin
+          Special := True;
+          EditorOpts.SetMarkupColor(PreviewSyn, AddAttr, aMarkup);
+          exit;
+        end;
+        dec(i);
+      end;
+    end;
+  end;
+end;
+
+type
+  // This is only needed until SynEdit does the ScrollWindowEx in Paint, instead of SetTopline
+  TSynEditAccess = class(TSynEdit);
+procedure TEditorColorOptionsFrame.OnStatusChange(Sender : TObject; Changes : TSynStatusChanges);
+var
+  Syn: TSynEditAccess;
+  p: TPoint;
+  tl, lc: Integer;
+begin
+  p := EditorOpts.HighlighterList[CurLanguageID].CaretXY;
+  Syn := TSynEditAccess(Pointer(Sender as TSynEdit));
+  if p.y > Syn.Lines.Count then exit;
+  if (Syn.CaretX = p.x) and (Syn.Carety = p.y) then exit;
+  try
+    Syn.IncPaintLock;
+    tl := Syn.TopLine;
+    lc := Syn.LeftChar;
+    Syn.CaretXY:= p;
+    Syn.TopLine := tl;
+    Syn.LeftChar := lc;
+  finally
+    Syn.DecPaintLock;
+  end;
+end;
+
+initialization
+  {$I options_editor_color.lrs}
+  RegisterIDEOptionsEditor(GroupEditor, TEditorColorOptionsFrame, EdtOptionsColors);
+end.
+
--- a/ide/frames/options_editor_display.lfm
+++ b/ide/frames/options_editor_display.lfm
@ -3,9 +3,10 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
  Width = 501
  ClientHeight = 441
  ClientWidth = 501
+  TabOrder = 0
  Visible = False
-  DesignLeft = 545
-  DesignTop = 226
+  DesignLeft = 176
+  DesignTop = 232
  object MarginAndGutterGroupBox: TGroupBox[0]
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = Owner
@ -688,7 +689,5 @@ inherited EditorDisplayOptionsFrame: TEditorDisplayOptionsFrame
      'DisplayPreview'
    )
    ReadOnly = True
-    OnSpecialLineMarkup = OnSpecialLineColors
-    OnStatusChange = DisplayPreviewStatusChange
  end
 end
--- a/ide/frames/options_editor_display.lrs
+++ b/ide/frames/options_editor_display.lrs
@ -3,178 +3,177 @@
 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#7'Visible'#8#10'DesignLeft'#3'!'#2#9'DesignTop'#3#226#0#0#242#2#0#9'TGrou'
-  +'pBox'#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'#6'Height'#3#128#0#5'Width'#3#245#1#5'A'
-  +'lign'#7#5'alTop'#7'Caption'#6#23'MarginAndGutterGroupBox'#12'ClientHeight'#2
-  +'n'#11'ClientWidth'#3#241#1#8'TabOrder'#2#0#0#6'TLabel'#16'RightMarginLabel'
-  +#22'AnchorSideLeft.Control'#7#19'RightMarginComboBox'#19'AnchorSideLeft.Side'
-  +#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'RightMarginComboBox'#18'Ancho'
-  +'rSideTop.Side'#7#9'asrCenter'#4'Left'#3'R'#1#6'Height'#2#14#3'Top'#2#9#5'Wi'
-  +'dth'#2'S'#18'BorderSpacing.Left'#2#6#7'Caption'#6#16'RightMarginLabel'#11'P'
-  +'arentColor'#8#0#0#12'TColorButton'#22'RightMarginColorButton'#22'AnchorSide'
-  +'Left.Control'#7'&ShowOnlyLineNumbersMultiplesOfSpinEdit'#19'AnchorSideLeft.'
-  +'Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'RightMarginComboBox'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#232#0#6'Height'#2#21#3'Top'#2
-  +'!'#5'Width'#2'd'#18'BorderSpacing.Left'#2'2'#20'BorderSpacing.Around'#2#6#11
-  +'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnColo'
-  +'rChanged'#7'"RightMarginColorButtonColorChanged'#0#0#12'TColorButton'#17'Gu'
-  +'tterColorButton'#22'AnchorSideLeft.Control'#7'&ShowOnlyLineNumbersMultiples'
-  +'OfSpinEdit'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'
-  +#7#22'RightMarginColorButton'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3
-  +#232#0#6'Height'#2#21#3'Top'#2'<'#5'Width'#2'd'#18'BorderSpacing.Left'#2'2'
-  +#20'BorderSpacing.Around'#2#6#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5
-  +'Color'#7#9'clBtnFace'#14'OnColorChanged'#7#29'GutterColorButtonColorChanged'
-  +#0#0#6'TLabel'#21'RightMarginColorLabel'#22'AnchorSideLeft.Control'#7#22'Rig'
-  +'htMarginColorButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTo'
-  +'p.Control'#7#22'RightMarginColorButton'#18'AnchorSideTop.Side'#7#9'asrCente'
-  +'r'#4'Left'#3'R'#1#6'Height'#2#14#3'Top'#2'$'#5'Width'#2'l'#18'BorderSpacing'
-  +'.Left'#2#6#7'Caption'#6#21'RightMarginColorLabel'#11'ParentColor'#8#0#0#6'T'
-  +'Label'#16'GutterColorLabel'#22'AnchorSideLeft.Control'#7#17'GutterColorButt'
-  +'on'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'G'
-  +'utterColorButton'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3'R'#1#6'He'
-  +'ight'#2#14#3'Top'#2'?'#5'Width'#2'R'#7'Caption'#6#16'GutterColorLabel'#11'P'
-  +'arentColor'#8#0#0#6'TLabel#ShowOnlyLineNumbersMultiplesOfLabel'#22'AnchorSi'
-  +'deLeft.Control'#7#23'MarginAndGutterGroupBox'#21'AnchorSideTop.Control'#7'&'
-  +'ShowOnlyLineNumbersMultiplesOfSpinEdit'#18'AnchorSideTop.Side'#7#9'asrCente'
-  +'r'#4'Left'#2#6#6'Height'#2#14#3'Top'#2'U'#5'Width'#2'n'#18'BorderSpacing.Le'
-  +'ft'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#22'Every n-th line number'#11
-  +'ParentColor'#8#0#0#9'TCheckBox'#26'VisibleRightMarginCheckBox'#22'AnchorSid'
-  +'eLeft.Control'#7#23'MarginAndGutterGroupBox'#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.Around'#2#6#7'Caption'#6#26'VisibleRightMarginCheckB'
-  +'ox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#0#0#0#9'TCheckB'
-  +'ox'#21'VisibleGutterCheckBox'#22'AnchorSideLeft.Control'#7#23'MarginAndGutt'
-  +'erGroupBox'#21'AnchorSideTop.Control'#7#26'VisibleRightMarginCheckBox'#18'A'
-  +'nchorSideTop.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'VisibleGutterCh'
-  +'eckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#1#0#0#9'TCh'
-  +'eckBox'#23'ShowLineNumbersCheckBox'#22'AnchorSideLeft.Control'#7#23'MarginA'
-  +'ndGutterGroupBox'#21'AnchorSideTop.Control'#7#21'VisibleGutterCheckBox'#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'ShowLineNumbers'
-  +'CheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#7'OnClick'#7#28'ShowLin'
-  +'eNumbersCheckBoxClick'#8'TabOrder'#2#2#0#0#9'TComboBox'#19'RightMarginCombo'
-  +'Box'#22'AnchorSideLeft.Control'#7'&ShowOnlyLineNumbersMultiplesOfSpinEdit'
-  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'Margi'
-  +'nAndGutterGroupBox'#4'Left'#3#232#0#6'Height'#2#21#3'Top'#2#6#5'Width'#2'd'
-  +#18'BorderSpacing.Left'#2'2'#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#13
-  +#13'Items.Strings'#1#6#2'80'#6#2'78'#6#2'76'#0#8'OnChange'#7#16'ComboboxOnCh'
-  +'ange'#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8
-  +'TabOrder'#2#3#0#0#9'TSpinEdit&ShowOnlyLineNumbersMultiplesOfSpinEdit'#22'An'
-  +'chorSideLeft.Control'#7'#ShowOnlyLineNumbersMultiplesOfLabel'#19'AnchorSide'
-  +'Left.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'ShowLineNumbersChe'
-  ,'ckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'z'#6'Height'#2#23#3
-  +'Top'#2'Q'#5'Width'#2'6'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#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'AnchorSideL'
-  +'eft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#23'MarginAndGutterGroup'
-  +'Box'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'as'
-  +'rBottom'#6'Height'#3#157#0#3'Top'#3#134#0#5'Width'#3#245#1#5'Align'#7#5'alT'
-  +'op'#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#7'Caption'#6#18'EditorFontGroup'
-  +'Box'#12'ClientHeight'#3#139#0#11'ClientWidth'#3#241#1#8'TabOrder'#2#1#0#6'T'
-  +'Label'#21'EditorFontHeightLabel'#22'AnchorSideLeft.Control'#7#24'EditorFont'
-  +'HeightComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Con'
-  +'trol'#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'Caption'#6#21'EditorFontHeightLabel'#11'ParentColor'#8#0#0#6'TLabel'
-  +#21'ExtraLineSpacingLabel'#22'AnchorSideLeft.Control'#7#24'ExtraCharSpacingC'
-  +'omboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7
-  +#24'ExtraLineSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2
-  +'p'#6'Height'#2#14#3'Top'#2'?'#5'Width'#2'l'#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#21'ExtraLineSpacingLabel'#11'ParentColor'#8#0#0#6'TLabel'#21'Ext'
-  +'raCharSpacingLabel'#22'AnchorSideLeft.Control'#7#24'ExtraCharSpacingComboBo'
-  +'x'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#24'Ex'
-  +'traCharSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#2'p'#6
-  +'Height'#2#14#3'Top'#2'Z'#5'Width'#2'p'#20'BorderSpacing.Around'#2#6#7'Capti'
-  +'on'#6#21'ExtraCharSpacingLabel'#11'ParentColor'#8#0#0#9'TComboBox'#18'Edito'
-  +'rFontComboBox'#22'AnchorSideLeft.Control'#7#18'EditorFontGroupBox'#21'Ancho'
-  +'rSideTop.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#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#6#17'B'
-  +'orderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#2#10'ItemHeight'#2#13#13'On'
-  +'EditingDone'#7#29'EditorFontComboBoxEditingDone'#8'TabOrder'#2#0#4'Text'#6
-  +#18'EditorFontComboBox'#0#0#7'TButton'#16'EditorFontButton'#21'AnchorSideTop'
-  +'.Control'#7#18'EditorFontComboBox'#23'AnchorSideRight.Control'#7#18'EditorF'
-  +'ontGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Co'
-  +'ntrol'#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'BorderSpacing.Right'#2#6#7'Caption'#6#3'...'#7
-  +'OnClick'#7#21'EditorFontButtonClick'#8'TabOrder'#2#1#0#0#9'TComboBox'#24'Ed'
-  +'itorFontHeightComboBox'#22'AnchorSideLeft.Control'#7#18'EditorFontGroupBox'
-  +#21'AnchorSideTop.Control'#7#18'EditorFontComboBox'#18'AnchorSideTop.Side'#7
-  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'!'#5'Width'#2'd'#20'Border'
-  +'Spacing.Around'#2#6#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#6'OnExit'#7#14'Co'
-  +'mboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#2#0#0#9'TC'
-  +'omboBox'#24'ExtraLineSpacingComboBox'#22'AnchorSideLeft.Control'#7#18'Edito'
-  +'rFontGroupBox'#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'#2'd'#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#13#13'Items.Strin'
-  +'gs'#1#6#1'0'#6#1'1'#6#1'2'#0#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7
-  +#17'ComboBoxOnKeyDown'#8'TabOrder'#2#4#0#0#9'TComboBox'#24'ExtraCharSpacingC'
-  +'omboBox'#22'AnchorSideLeft.Control'#7#18'EditorFontGroupBox'#21'AnchorSideT'
-  +'op.Control'#7#24'ExtraLineSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrBo'
-  +'ttom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'W'#5'Width'#2'd'#20'BorderSpacing'
-  +'.Around'#2#6#10'ItemHeight'#2#13#13'Items.Strings'#1#6#1'0'#6#1'1'#6#1'2'#0
-  +#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOr'
-  +'der'#2#3#0#0#9'TCheckBox'#27'DisableAntialiasingCheckBox'#22'AnchorSideLeft'
-  +'.Control'#7#18'EditorFontGroupBox'#21'AnchorSideTop.Control'#7#24'ExtraChar'
-  +'SpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
-  +#2#19#3'Top'#2'r'#5'Width'#3#161#0#7'Anchors'#11#5'akTop'#6'akLeft'#8'akBott'
-  +'om'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#27'DisableAntialiasingCheck'
-  +'Box'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#5#0#0#0#242#2#2
-  +#8'TSynEdit'#14'DisplayPreview'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anc'
-  +'horSideTop.Control'#7#18'EditorFontGroupBox'#23'AnchorSideRight.Control'#7#5
-  +'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'
-  +#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#6'Height'#3#144#0#3'Top'
-  ,#3')'#1#5'Width'#3#245#1#5'Align'#7#8'alClient'#17'BorderSpacing.Top'#2#6#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'ParentFont'#8#8'T'
-  +'abOrder'#2#2#24'BookMarkOptions.OnChange'#13#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'Command'#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'Command'#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'Command'#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'Comman'
-  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
-  +'mmand'#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'Short'
-  +'Cut'#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'Comm'
-  +'and'#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'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'ShortC'
-  +'ut'#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'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'Comman'
-  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
-  +'ommand'#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'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'ShortCu'
-  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
-  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#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'Comma'
-  +'nd'#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#14'DisplayPr'
-  +'eview'#0#8'ReadOnly'#9#19'OnSpecialLineMarkup'#7#19'OnSpecialLineColors'#14
-  +'OnStatusChange'#7#26'DisplayPreviewStatusChange'#0#0#0
+  +#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'#6'Height'#3#128#0#5'Widt'
+  +'h'#3#245#1#5'Align'#7#5'alTop'#7'Caption'#6#23'MarginAndGutterGroupBox'#12
+  +'ClientHeight'#2'n'#11'ClientWidth'#3#241#1#8'TabOrder'#2#0#0#6'TLabel'#16'R'
+  +'ightMarginLabel'#22'AnchorSideLeft.Control'#7#19'RightMarginComboBox'#19'An'
+  +'chorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'RightMargi'
+  +'nComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#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'Righ'
+  +'tMarginLabel'#11'ParentColor'#8#0#0#12'TColorButton'#22'RightMarginColorBut'
+  +'ton'#22'AnchorSideLeft.Control'#7'&ShowOnlyLineNumbersMultiplesOfSpinEdit'
+  +#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#19'Right'
+  +'MarginComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#232#0#6'Hei'
+  +'ght'#2#21#3'Top'#2'!'#5'Width'#2'd'#18'BorderSpacing.Left'#2'2'#20'BorderSp'
+  +'acing.Around'#2#6#11'BorderWidth'#2#2#15'ButtonColorSize'#2#16#5'Color'#7#9
+  +'clBtnFace'#14'OnColorChanged'#7'"RightMarginColorButtonColorChanged'#0#0#12
+  +'TColorButton'#17'GutterColorButton'#22'AnchorSideLeft.Control'#7'&ShowOnlyL'
+  +'ineNumbersMultiplesOfSpinEdit'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'An'
+  +'chorSideTop.Control'#7#22'RightMarginColorButton'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#3#232#0#6'Height'#2#21#3'Top'#2'<'#5'Width'#2'd'#18'Bord'
+  +'erSpacing.Left'#2'2'#20'BorderSpacing.Around'#2#6#11'BorderWidth'#2#2#15'Bu'
+  +'ttonColorSize'#2#16#5'Color'#7#9'clBtnFace'#14'OnColorChanged'#7#29'GutterC'
+  +'olorButtonColorChanged'#0#0#6'TLabel'#21'RightMarginColorLabel'#22'AnchorSi'
+  +'deLeft.Control'#7#22'RightMarginColorButton'#19'AnchorSideLeft.Side'#7#9'as'
+  +'rBottom'#21'AnchorSideTop.Control'#7#22'RightMarginColorButton'#18'AnchorSi'
+  +'deTop.Side'#7#9'asrCenter'#4'Left'#3'R'#1#6'Height'#2#14#3'Top'#2'$'#5'Widt'
+  +'h'#2'l'#18'BorderSpacing.Left'#2#6#7'Caption'#6#21'RightMarginColorLabel'#11
+  +'ParentColor'#8#0#0#6'TLabel'#16'GutterColorLabel'#22'AnchorSideLeft.Control'
+  +#7#17'GutterColorButton'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSid'
+  +'eTop.Control'#7#17'GutterColorButton'#18'AnchorSideTop.Side'#7#9'asrCenter'
+  +#4'Left'#3'R'#1#6'Height'#2#14#3'Top'#2'?'#5'Width'#2'R'#7'Caption'#6#16'Gut'
+  +'terColorLabel'#11'ParentColor'#8#0#0#6'TLabel#ShowOnlyLineNumbersMultiplesO'
+  +'fLabel'#22'AnchorSideLeft.Control'#7#23'MarginAndGutterGroupBox'#21'AnchorS'
+  +'ideTop.Control'#7'&ShowOnlyLineNumbersMultiplesOfSpinEdit'#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.Top'#2#6#7'Caption'#6#22'Every '
+  +'n-th line number'#11'ParentColor'#8#0#0#9'TCheckBox'#26'VisibleRightMarginC'
+  +'heckBox'#22'AnchorSideLeft.Control'#7#23'MarginAndGutterGroupBox'#21'Anchor'
+  +'SideTop.Control'#7#23'MarginAndGutterGroupBox'#4'Left'#2#6#6'Height'#2#19#3
+  +'Top'#2#6#5'Width'#3#159#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#26'Visi'
+  +'bleRightMarginCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrde'
+  +'r'#2#0#0#0#9'TCheckBox'#21'VisibleGutterCheckBox'#22'AnchorSideLeft.Control'
+  +#7#23'MarginAndGutterGroupBox'#21'AnchorSideTop.Control'#7#26'VisibleRightMa'
+  +'rginCheckBox'#18'AnchorSideTop.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#0#0#9'TCheckBox'#23'ShowLineNumbersCheckBox'#22'AnchorSideLeft.Control'
+  +#7#23'MarginAndGutterGroupBox'#21'AnchorSideTop.Control'#7#21'VisibleGutterC'
+  +'heckBox'#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'Sho'
+  +'wLineNumbersCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#7'OnClick'#7
+  +#28'ShowLineNumbersCheckBoxClick'#8'TabOrder'#2#2#0#0#9'TComboBox'#19'RightM'
+  +'arginComboBox'#22'AnchorSideLeft.Control'#7'&ShowOnlyLineNumbersMultiplesOf'
+  +'SpinEdit'#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'Wid'
+  +'th'#2'd'#18'BorderSpacing.Left'#2'2'#20'BorderSpacing.Around'#2#6#10'ItemHe'
+  +'ight'#2#13#13'Items.Strings'#1#6#2'80'#6#2'78'#6#2'76'#0#8'OnChange'#7#16'C'
+  +'omboboxOnChange'#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxO'
+  +'nKeyDown'#8'TabOrder'#2#3#0#0#9'TSpinEdit&ShowOnlyLineNumbersMultiplesOfSpi'
+  +'nEdit'#22'AnchorSideLeft.Control'#7'#ShowOnlyLineNumbersMultiplesOfLabel'#19
+  +'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23'ShowLine'
+  ,'NumbersCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'z'#6'Heigh'
+  +'t'#2#23#3'Top'#2'Q'#5'Width'#2'6'#18'BorderSpacing.Left'#2#6#17'BorderSpaci'
+  +'ng.Top'#2#6#8'MinValue'#2#1#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'Tab'
+  +'Order'#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'MarginAnd'
+  +'GutterGroupBox'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.S'
+  +'ide'#7#9'asrBottom'#6'Height'#3#157#0#3'Top'#3#134#0#5'Width'#3#245#1#5'Ali'
+  +'gn'#7#5'alTop'#8'AutoSize'#9#17'BorderSpacing.Top'#2#6#7'Caption'#6#18'Edit'
+  +'orFontGroupBox'#12'ClientHeight'#3#139#0#11'ClientWidth'#3#241#1#8'TabOrder'
+  +#2#1#0#6'TLabel'#21'EditorFontHeightLabel'#22'AnchorSideLeft.Control'#7#24'E'
+  +'ditorFontHeightComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSi'
+  +'deTop.Control'#7#24'EditorFontHeightComboBox'#18'AnchorSideTop.Side'#7#9'as'
+  +'rCenter'#4'Left'#2'p'#6'Height'#2#14#3'Top'#2'$'#5'Width'#2'k'#20'BorderSpa'
+  +'cing.Around'#2#6#7'Caption'#6#21'EditorFontHeightLabel'#11'ParentColor'#8#0
+  +#0#6'TLabel'#21'ExtraLineSpacingLabel'#22'AnchorSideLeft.Control'#7#24'Extra'
+  +'CharSpacingComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTo'
+  +'p.Control'#7#24'ExtraLineSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrCen'
+  +'ter'#4'Left'#2'p'#6'Height'#2#14#3'Top'#2'?'#5'Width'#2'l'#20'BorderSpacing'
+  +'.Around'#2#6#7'Caption'#6#21'ExtraLineSpacingLabel'#11'ParentColor'#8#0#0#6
+  +'TLabel'#21'ExtraCharSpacingLabel'#22'AnchorSideLeft.Control'#7#24'ExtraChar'
+  +'SpacingComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Co'
+  +'ntrol'#7#24'ExtraCharSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'
+  +#4'Left'#2'p'#6'Height'#2#14#3'Top'#2'Z'#5'Width'#2'p'#20'BorderSpacing.Arou'
+  +'nd'#2#6#7'Caption'#6#21'ExtraCharSpacingLabel'#11'ParentColor'#8#0#0#9'TCom'
+  +'boBox'#18'EditorFontComboBox'#22'AnchorSideLeft.Control'#7#18'EditorFontGro'
+  +'upBox'#21'AnchorSideTop.Control'#7#18'EditorFontGroupBox'#23'AnchorSideRigh'
+  +'t.Control'#7#16'EditorFontButton'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#6#5'W'
+  +'idth'#3#202#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacin'
+  +'g.Left'#2#6#17'BorderSpacing.Top'#2#6#19'BorderSpacing.Right'#2#2#10'ItemHe'
+  +'ight'#2#13#13'OnEditingDone'#7#29'EditorFontComboBoxEditingDone'#8'TabOrder'
+  +#2#0#4'Text'#6#18'EditorFontComboBox'#0#0#7'TButton'#16'EditorFontButton'#21
+  +'AnchorSideTop.Control'#7#18'EditorFontComboBox'#23'AnchorSideRight.Control'
+  +#7#18'EditorFontGroupBox'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorS'
+  +'ideBottom.Control'#7#18'EditorFontComboBox'#21'AnchorSideBottom.Side'#7#9'a'
+  +'srBottom'#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'BorderSpacing.Right'#2#6#7'Caption'
+  +#6#3'...'#7'OnClick'#7#21'EditorFontButtonClick'#8'TabOrder'#2#1#0#0#9'TComb'
+  +'oBox'#24'EditorFontHeightComboBox'#22'AnchorSideLeft.Control'#7#18'EditorFo'
+  +'ntGroupBox'#21'AnchorSideTop.Control'#7#18'EditorFontComboBox'#18'AnchorSid'
+  +'eTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'!'#5'Width'#2
+  +'d'#20'BorderSpacing.Around'#2#6#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#6'OnE'
+  +'xit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2
+  +#2#0#0#9'TComboBox'#24'ExtraLineSpacingComboBox'#22'AnchorSideLeft.Control'#7
+  +#18'EditorFontGroupBox'#21'AnchorSideTop.Control'#7#24'EditorFontHeightCombo'
+  +'Box'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'
+  +#2'<'#5'Width'#2'd'#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#13#13'Item'
+  +'s.Strings'#1#6#1'0'#6#1'1'#6#1'2'#0#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyD'
+  +'own'#7#17'ComboBoxOnKeyDown'#8'TabOrder'#2#4#0#0#9'TComboBox'#24'ExtraCharS'
+  +'pacingComboBox'#22'AnchorSideLeft.Control'#7#18'EditorFontGroupBox'#21'Anch'
+  +'orSideTop.Control'#7#24'ExtraLineSpacingComboBox'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#2#6#6'Height'#2#21#3'Top'#2'W'#5'Width'#2'd'#20'BorderSp'
+  +'acing.Around'#2#6#10'ItemHeight'#2#13#13'Items.Strings'#1#6#1'0'#6#1'1'#6#1
+  +'2'#0#6'OnExit'#7#14'ComboboxOnExit'#9'OnKeyDown'#7#17'ComboBoxOnKeyDown'#8
+  +'TabOrder'#2#3#0#0#9'TCheckBox'#27'DisableAntialiasingCheckBox'#22'AnchorSid'
+  +'eLeft.Control'#7#18'EditorFontGroupBox'#21'AnchorSideTop.Control'#7#24'Extr'
+  +'aCharSpacingComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'H'
+  +'eight'#2#19#3'Top'#2'r'#5'Width'#3#161#0#7'Anchors'#11#5'akTop'#6'akLeft'#8
+  +'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#27'DisableAntialiasin'
+  +'gCheckBox'#8'OnChange'#7#23'GeneralCheckBoxOnChange'#8'TabOrder'#2#5#0#0#0
+  +#242#2#2#8'TSynEdit'#14'DisplayPreview'#22'AnchorSideLeft.Control'#7#5'Owner'
+  +#21'AnchorSideTop.Control'#7#18'EditorFontGroupBox'#23'AnchorSideRight.Contr'
+  +'ol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.'
+  +'Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#6'Height'#3#144
+  ,#0#3'Top'#3')'#1#5'Width'#3#245#1#5'Align'#7#8'alClient'#17'BorderSpacing.To'
+  +'p'#2#6#11'Font.Height'#2#240#9'Font.Name'#6#7'courier'#10'Font.Pitch'#7#7'f'
+  +'pFixed'#12'Font.Quality'#7#16'fqNonAntialiased'#11'ParentColor'#8#10'Parent'
+  +'Font'#8#8'TabOrder'#2#2#24'BookMarkOptions.OnChange'#13#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'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#14
+  +'DisplayPreview'#0#8'ReadOnly'#9#0#0#0
 ]);
--- a/ide/frames/options_editor_display.pas
+++ b/ide/frames/options_editor_display.pas
@ -26,9 +26,9 @@ interface

 uses
  Classes, SysUtils, FileUtil, LResources, Forms, Graphics, Dialogs, StdCtrls,
-  Spin, LCLType, SynEdit,
+  Spin, LCLType, SynEdit, Controls,
  EditorOptions, LazarusIDEStrConsts, IDEOptionsIntf, SynEditMiscClasses,
-  options_editor_general, IDEProcs, Controls;
+  options_editor_general, IDEProcs;

 type
  { TEditorDisplayOptionsFrame }
@ -57,14 +57,10 @@ type
    ShowOnlyLineNumbersMultiplesOfSpinEdit: TSpinEdit;
    VisibleGutterCheckBox: TCheckBox;
    VisibleRightMarginCheckBox: TCheckBox;
-    procedure DisplayPreviewStatusChange(Sender: TObject;
-      Changes: TSynStatusChanges);
    procedure EditorFontButtonClick(Sender: TObject);
    procedure EditorFontComboBoxEditingDone(Sender: TObject);
    procedure ComboboxOnExit(Sender: TObject);
    procedure GutterColorButtonColorChanged(Sender: TObject);
-    procedure OnSpecialLineColors(Sender: TObject; Line: Integer;
-      var Special: boolean; aMarkup: TSynSelectedColor);
    procedure ComboBoxOnKeyDown(Sender: TObject; var Key: Word;
      Shift: TShiftState);
    procedure RightMarginColorButtonColorChanged(Sender: TObject);
@ -86,37 +82,6 @@ type

 implementation

-type
-  // This is only needed until SynEdit does the ScrollWindowEx in Paint, instead of SetTopline
-  TSynEditAccess = class(TSynEdit);
-procedure TEditorDisplayOptionsFrame.DisplayPreviewStatusChange(Sender : TObject; Changes : TSynStatusChanges);
-var
-  Syn: TSynEditAccess;
-  p: TPoint;
-  tl, lc: Integer;
-  AGeneralPage: TEditorGeneralOptionsFrame;
-begin
-  AGeneralPage := GeneralPage;
-
-  if AGeneralPage = nil then
-    Exit;
-
-  p := EditorOpts.HighlighterList[AGeneralPage.CurLanguageID].CaretXY;
-  Syn := TSynEditAccess(Pointer(Sender as TSynEdit));
-  if p.y > Syn.Lines.Count then exit;
-  if (Syn.CaretX = p.x) and (Syn.Carety = p.y) then exit;
-  try
-    Syn.IncPaintLock;
-    tl := Syn.TopLine;
-    lc := Syn.LeftChar;
-    Syn.CaretXY:= p;
-    Syn.TopLine := tl;
-    Syn.LeftChar := lc;
-  finally
-    Syn.DecPaintLock;
-  end;
-end;
-
 procedure TEditorDisplayOptionsFrame.FontDialogApplyClicked(Sender: TObject);
 var
  a: Integer;
@ -228,41 +193,6 @@ begin
      end;
 end;

-procedure TEditorDisplayOptionsFrame.OnSpecialLineColors(Sender: TObject;
-  Line: Integer; var Special: boolean; aMarkup: TSynSelectedColor);
-var
-  e: TSynHighlightElement;
-  AddAttr: TAdditionalHilightAttribute;
-  i: Integer;
-  AGeneralPage: TEditorGeneralOptionsFrame;
-begin
-  AGeneralPage := GeneralPage;
-  if AGeneralPage = nil then
-    Exit;
-
-  if AGeneralPage.CurLanguageID >= 0 then
-  begin
-    AddAttr := EditorOpts.HighlighterList[AGeneralPage.CurLanguageID].SampleLineToAddAttr(Line);
-    if AddAttr <> ahaNone then
-    begin
-      i := AGeneralPage.PreviewSyn.AttrCount - 1;
-      while (i >= 0) do
-      begin
-        e := AGeneralPage.PreviewSyn.Attribute[i];
-        if e.Name = '' then
-          continue;
-        if e.Name = AdditionalHighlightAttributes[AddAttr] then
-        begin
-          Special := True;
-          EditorOpts.SetMarkupColor(AGeneralPage.PreviewSyn, AddAttr, aMarkup);
-          exit;
-        end;
-        dec(i);
-      end;
-    end;
-  end;
-end;
-
 procedure TEditorDisplayOptionsFrame.ComboBoxOnKeyDown(Sender: TObject; var Key: Word;
  Shift: TShiftState);
 begin
--- a/ide/frames/options_editor_general.lfm
+++ b/ide/frames/options_editor_general.lfm
@ -5,8 +5,8 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
  ClientWidth = 454
  TabOrder = 0
  Visible = False
-  DesignLeft = 66
-  DesignTop = 87
+  DesignLeft = 132
+  DesignTop = 174
  object BlockIndentLabel: TLabel[0]
    AnchorSideLeft.Control = BlockIndentComboBox
    AnchorSideLeft.Side = asrBottom
--- a/ide/frames/options_editor_general.lrs
+++ b/ide/frames/options_editor_general.lrs
@ -3,53 +3,53 @@
 LazarusResources.Add('TEditorGeneralOptionsFrame','FORMDATA',[
  'TPF0'#241#26'TEditorGeneralOptionsFrame'#25'EditorGeneralOptionsFrame'#6'Hei'
  +'ght'#3#248#1#5'Width'#3#198#1#12'ClientHeight'#3#248#1#11'ClientWidth'#3#198
-  +#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#2'B'#9'DesignTop'#2'W'#0#242#2
-  +#0#6'TLabel'#16'BlockIndentLabel'#22'AnchorSideLeft.Control'#7#19'BlockInden'
-  +'tComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Contr'
-  +'ol'#7#19'BlockIndentComboBox'#21'AnchorSideBottom.Side'#7#9'asrCenter'#4'Le'
-  +'ft'#2'j'#6'Height'#2#14#3'Top'#3#179#1#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'UndoLimitLabel'#22'AnchorSideLef'
-  +'t.Control'#7#17'UndoLimitComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24
-  +'AnchorSideBottom.Control'#7#17'UndoLimitComboBox'#21'AnchorSideBottom.Side'
-  +#7#9'asrCenter'#4'Left'#2'j'#6'Height'#2#14#3'Top'#3#206#1#5'Width'#2'H'#7'A'
-  +'nchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6
-  +#14'UndoLimitLabel'#11'ParentColor'#8#0#0#242#2#2#6'TLabel'#14'TabWidthsLabe'
-  +'l'#22'AnchorSideLeft.Control'#7#17'TabWidthsComboBox'#19'AnchorSideLeft.Sid'
-  +'e'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'TabWidthsComboBox'#21'A'
-  +'nchorSideBottom.Side'#7#9'asrCenter'#4'Left'#2'j'#6'Height'#2#14#3'Top'#3
-  +#230#1#5'Width'#2'M'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.'
-  +'Around'#2#6#7'Caption'#6#14'TabWidthsLabel'#11'ParentColor'#8#0#0#242#2#3#11
-  +'TCheckGroup'#21'EditorOptionsGroupBox'#22'AnchorSideLeft.Control'#7#5'Owner'
-  +#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'#7#5'Owner'
-  +#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#19'B'
-  +'lockIndentComboBox'#6'Height'#3#170#1#5'Width'#3#198#1#5'Align'#7#5'alTop'#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFill'#9#20'Bo'
-  +'rderSpacing.Bottom'#2#6#7'Caption'#6#21'EditorOptionsGroupBox'#28'ChildSizi'
-  +'ng.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizin'
-  +'g.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeV'
-  +'ertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7
-  +#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'C'
-  +'hildSizing.Layout'#7#29'cclTopToBottomThenLeftToRight'#27'ChildSizing.Contr'
-  +'olsPerLine'#2#1#12'ColumnLayout'#7#24'clVerticalThenHorizontal'#7'Columns'#2
-  +#2#11'OnItemClick'#7#30'EditorOptionsGroupBoxItemClick'#8'TabOrder'#2#0#0#0
-  +#242#2#4#9'TComboBox'#19'BlockIndentComboBox'#22'AnchorSideLeft.Control'#7#5
-  +'Owner'#24'AnchorSideBottom.Control'#7#17'UndoLimitComboBox'#6'Height'#2#21#3
-  +'Top'#3#176#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderS'
-  +'pacing.Bottom'#2#6#10'ItemHeight'#2#13#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1
-  +'4'#6#1'8'#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#5#9'TComb'
-  +'oBox'#17'UndoLimitComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#24'Anchor'
-  +'SideBottom.Control'#7#14'TabWidthsLabel'#6'Height'#2#21#3'Top'#3#203#1#5'Wi'
-  +'dth'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#17'BorderSpacing.Top'#2#6#20
-  +'BorderSpacing.Bottom'#2#6#10'ItemHeight'#2#13#13'Items.Strings'#1#6#5'32767'
-  +#6#4'4096'#6#3'512'#0#8'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'Comb'
-  +'oBoxOnExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#2#0#0#242#2#6
-  +#9'TComboBox'#17'TabWidthsComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#24
-  +'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBotto'
-  +'m'#6'Height'#2#21#3'Top'#3#227#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'ak'
-  +'Bottom'#0#17'BorderSpacing.Top'#2#6#10'ItemHeight'#2#13#13'Items.Strings'#1
-  +#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#8'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7
-  +#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#3#0#0
-  +#0
+  +#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3#132#0#9'DesignTop'#3#174#0#0
+  +#242#2#0#6'TLabel'#16'BlockIndentLabel'#22'AnchorSideLeft.Control'#7#19'Bloc'
+  +'kIndentComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom'
+  +'.Control'#7#19'BlockIndentComboBox'#21'AnchorSideBottom.Side'#7#9'asrCenter'
+  +#4'Left'#2'j'#6'Height'#2#14#3'Top'#3#179#1#5'Width'#2'R'#7'Anchors'#11#6'ak'
+  +'Left'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#16'BlockInden'
+  +'tLabel'#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#14'UndoLimitLabel'#22'Ancho'
+  +'rSideLeft.Control'#7#17'UndoLimitComboBox'#19'AnchorSideLeft.Side'#7#9'asrB'
+  +'ottom'#24'AnchorSideBottom.Control'#7#17'UndoLimitComboBox'#21'AnchorSideBo'
+  +'ttom.Side'#7#9'asrCenter'#4'Left'#2'j'#6'Height'#2#14#3'Top'#3#206#1#5'Widt'
+  +'h'#2'H'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#14'UndoLimitLabel'#11'ParentColor'#8#0#0#242#2#2#6'TLabel'#14'Ta'
+  +'bWidthsLabel'#22'AnchorSideLeft.Control'#7#17'TabWidthsComboBox'#19'AnchorS'
+  +'ideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'TabWidthsCom'
+  +'boBox'#21'AnchorSideBottom.Side'#7#9'asrCenter'#4'Left'#2'j'#6'Height'#2#14
+  +#3'Top'#3#230#1#5'Width'#2'M'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'Borde'
+  +'rSpacing.Around'#2#6#7'Caption'#6#14'TabWidthsLabel'#11'ParentColor'#8#0#0
+  +#242#2#3#11'TCheckGroup'#21'EditorOptionsGroupBox'#22'AnchorSideLeft.Control'
+  +#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#23'AnchorSideRight.Control'
+  +#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Cont'
+  +'rol'#7#19'BlockIndentComboBox'#6'Height'#3#170#1#5'Width'#3#198#1#5'Align'#7
+  +#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoFi'
+  +'ll'#9#20'BorderSpacing.Bottom'#2#6#7'Caption'#6#21'EditorOptionsGroupBox'#28
+  +'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'C'
+  +'hildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing'
+  +'.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHoriz'
+  +'ontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChi'
+  +'lds'#18'ChildSizing.Layout'#7#29'cclTopToBottomThenLeftToRight'#27'ChildSiz'
+  +'ing.ControlsPerLine'#2#1#12'ColumnLayout'#7#24'clVerticalThenHorizontal'#7
+  +'Columns'#2#2#11'OnItemClick'#7#30'EditorOptionsGroupBoxItemClick'#8'TabOrde'
+  +'r'#2#0#0#0#242#2#4#9'TComboBox'#19'BlockIndentComboBox'#22'AnchorSideLeft.C'
+  +'ontrol'#7#5'Owner'#24'AnchorSideBottom.Control'#7#17'UndoLimitComboBox'#6'H'
+  +'eight'#2#21#3'Top'#3#176#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'
+  +#0#20'BorderSpacing.Bottom'#2#6#10'ItemHeight'#2#13#13'Items.Strings'#1#6#1
+  +'1'#6#1'2'#6#1'4'#6#1'8'#0#8'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14
+  +'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#1#0#0#242
+  +#2#5#9'TComboBox'#17'UndoLimitComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'
+  +#24'AnchorSideBottom.Control'#7#14'TabWidthsLabel'#6'Height'#2#21#3'Top'#3
+  +#203#1#5'Width'#2'd'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#17'BorderSpacing.'
+  +'Top'#2#6#20'BorderSpacing.Bottom'#2#6#10'ItemHeight'#2#13#13'Items.Strings'
+  +#1#6#5'32767'#6#4'4096'#6#3'512'#0#8'OnChange'#7#16'ComboboxOnChange'#6'OnEx'
+  +'it'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#8'TabOrder'#2
+  +#2#0#0#242#2#6#9'TComboBox'#17'TabWidthsComboBox'#22'AnchorSideLeft.Control'
+  +#7#5'Owner'#24'AnchorSideBottom.Control'#7#5'Owner'#21'AnchorSideBottom.Side'
+  +#7#9'asrBottom'#6'Height'#2#21#3'Top'#3#227#1#5'Width'#2'd'#7'Anchors'#11#6
+  +'akLeft'#8'akBottom'#0#17'BorderSpacing.Top'#2#6#10'ItemHeight'#2#13#13'Item'
+  +'s.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#8'OnChange'#7#16'ComboboxOnChang'
+  +'e'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#8'Ta'
+  +'bOrder'#2#3#0#0#0
 ]);
--- a/ide/frames/options_editor_general.pas
+++ b/ide/frames/options_editor_general.pas
@ -49,24 +49,14 @@ type
  private
    { private declarations }
  public
-    FHighlighterList: TStringList; // list of "ColorScheme" Data=TSrcIDEHighlighter
-    FColorSchemes: TStringList;    // list of LanguageName=ColorScheme
    PreviewEdits: array of TPreviewEditor;
-    PreviewSyn: TSrcIDEHighlighter;
-    CurLanguageID: Integer;

    constructor Create(AOwner: TComponent); override;
-    destructor Destroy; override;
    function GetTitle: String; override;
    procedure Setup(ADialog: TAbstractOptionsEditorDialog); override;
    procedure ReadSettings(AOptions: TAbstractIDEOptions); override;
    procedure WriteSettings(AOptions: TAbstractIDEOptions); override;
    class function SupportedOptionsClass: TAbstractIDEOptionsClass; override;
-
-    function GetCurColorScheme(const LanguageName: String): String;
-    function GetHighlighter(SynClass: TCustomSynClass;
-      const ColorScheme: String; CreateIfNotExists: Boolean): TSrcIDEHighlighter;
-    procedure ClearHighlighters;
  end;

 implementation
@ -91,7 +81,7 @@ begin
    Items.Add(dlgShowGutterHints);
    //Items.Add(dlgShowScrollHint);
    Items.Add(lisShowSpecialCharacters);
-    Items.Add(dlgUseSyntaxHighlight);
+    //Items.Add(dlgUseSyntaxHighlight);
    // drag&drop
    Items.Add(dlgDragDropEd);
    Items.Add(dlgDropFiles);
@ -164,7 +154,7 @@ begin
      Checked[Items.IndexOf(dlgMouseLinks)]   := CtrlMouseLinks;
      Checked[Items.IndexOf(dlgShowGutterHints)] := ShowGutterHints;
      Checked[Items.IndexOf(dlgFindTextatCursor)] := FindTextAtCursor;
-      Checked[Items.IndexOf(dlgUseSyntaxHighlight)] := UseSyntaxHighlight;
+      //Checked[Items.IndexOf(dlgUseSyntaxHighlight)] := UseSyntaxHighlight;
      Checked[Items.IndexOf(dlgCopyWordAtCursorOnCopyNone)] := CopyWordAtCursorOnCopyNone;
    end;

@ -172,21 +162,9 @@ begin
    SetComboBoxText(UndoLimitComboBox, IntToStr(UndoLimit));
    SetComboBoxText(TabWidthsComboBox, IntToStr(TabWidth));

-    PreviewSyn := GetHighlighter(TPreviewPasSyn, GetCurColorScheme(TPreviewPasSyn.GetLanguageName), True);
-    CurLanguageID := HighlighterList.FindByClass(TCustomSynClass(PreviewSyn.ClassType));
-
    for i := Low(PreviewEdits) to High(PreviewEdits) do
      if PreviewEdits[i] <> nil then
-        with PreviewEdits[i] do
-        begin
-          if UseSyntaxHighlight then
-            Highlighter := PreviewSyn;
-          GetSynEditPreviewSettings(PreviewEdits[i]);
-          Lines.Text := HighlighterList[CurLanguageID].SampleSource;
-          CaretXY := HighlighterList[CurLanguageID].CaretXY;
-          TopLine := 1;
-          LeftChar := 1;
-        end;
+        GetSynEditPreviewSettings(PreviewEdits[i]);
  end;
 end;

@ -249,7 +227,7 @@ begin
    CopyWordAtCursorOnCopyNone := CheckGroupItemChecked(EditorOptionsGroupBox, dlgCopyWordAtCursorOnCopyNone);
    ShowGutterHints := CheckGroupItemChecked(EditorOptionsGroupBox, dlgShowGutterHints);
    FindTextAtCursor := CheckGroupItemChecked(EditorOptionsGroupBox, dlgFindTextatCursor);
-    UseSyntaxHighlight := CheckGroupItemChecked(EditorOptionsGroupBox, dlgUseSyntaxHighlight);
+    //UseSyntaxHighlight := CheckGroupItemChecked(EditorOptionsGroupBox, dlgUseSyntaxHighlight);
    CtrlMouseLinks := CheckGroupItemChecked(EditorOptionsGroupBox, dlgMouseLinks);

    i := StrToIntDef(UndoLimitComboBox.Text, 32767);
@ -280,51 +258,6 @@ begin
  Result := TEditorOptions;
 end;

-function TEditorGeneralOptionsFrame.GetCurColorScheme(const LanguageName: String): String;
-begin
-  if FColorSchemes = nil then
-    Result := ''
-  else
-    Result := FColorSchemes.Values[LanguageName];
-  if Result = '' then
-    Result := EditorOpts.ReadColorScheme(LanguageName);
-end;
-
-function TEditorGeneralOptionsFrame.GetHighlighter(SynClass: TCustomSynClass;
-  const ColorScheme: String; CreateIfNotExists: Boolean): TSrcIDEHighlighter;
-var
-  i: Integer;
-begin
-  if FHighlighterList = nil then
-    FHighlighterList := TStringList.Create;
-  for i := 0 to FHighlighterList.Count - 1 do
-    if (FHighlighterList[i] = ColorScheme) and
-      (TCustomSynClass(TSrcIDEHighlighter(fHighlighterList.Objects[i]).ClassType) =
-      SynClass) then
-    begin
-      Result := TSrcIDEHighlighter(FHighlighterList.Objects[i]);
-      exit;
-    end;
-  if CreateIfNotExists then
-  begin
-    Result := SynClass.Create(nil);
-    EditorOpts.AddSpecialHilightAttribsToHighlighter(Result);
-    FHighlighterList.AddObject(ColorScheme, Result);
-    EditorOpts.ReadHighlighterSettings(Result, ColorScheme);
-  end;
-end;
-
-procedure TEditorGeneralOptionsFrame.ClearHighlighters;
-var
-  i: Integer;
-begin
-  if FHighlighterList = nil then
-    Exit;
-  for i := 0 to FHighlighterList.Count - 1 do
-    TSrcIDEHighlighter(FHighlighterList.Objects[i]).Free;
-  FHighlighterList.Free;
-end;
-
 procedure TEditorGeneralOptionsFrame.EditorOptionsGroupBoxItemClick(
  Sender: TObject; Index: integer);

@ -365,9 +298,6 @@ procedure TEditorGeneralOptionsFrame.EditorOptionsGroupBoxItemClick(
    end;
  end;

-var
-  a: Integer;
-  i: LongInt;
 begin
  SetOption(dlgAltSetClMode, eoAltSetsColumnMode);
  SetOption(dlgAutoIdent, eoAutoIndent);
@ -394,14 +324,6 @@ begin

  SetOption2(dlgCursorSkipsSelection, eoCaretSkipsSelection);
  SetOption2(dlgAlwaysVisibleCursor, eoAlwaysVisibleCaret);
-
-  i := EditorOptionsGroupBox.Items.IndexOf(dlgUseSyntaxHighlight);
-  for a := Low(PreviewEdits) to High(PreviewEdits) do
-    if PreviewEdits[a] <> nil then
-      if EditorOptionsGroupBox.Checked[i] then
-        PreviewEdits[a].Highlighter := PreviewSyn
-      else
-        PreviewEdits[a].Highlighter := nil;
 end;

 procedure TEditorGeneralOptionsFrame.ComboboxOnChange(Sender: TObject);
@ -448,13 +370,6 @@ begin
  PreviewEdits := nil;
 end;

-destructor TEditorGeneralOptionsFrame.Destroy;
-begin
-  ClearHighlighters;
-  FColorSchemes.Free;
-  inherited Destroy;
-end;
-
 initialization
  {$I options_editor_general.lrs}
  RegisterIDEOptionsEditor(GroupEditor, TEditorGeneralOptionsFrame, EdtOptionsGeneral);
--- a/ide/frames/options_editor_keymapping.lfm
+++ b/ide/frames/options_editor_keymapping.lfm
@ -5,8 +5,8 @@ inherited EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame
  ClientWidth = 461
  TabOrder = 0
  Visible = False
-  DesignLeft = 154
-  DesignTop = 203
+  DesignLeft = 176
+  DesignTop = 232
  object KeyMappingHelpLabel: TLabel[0]
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = Owner
--- a/ide/frames/options_editor_keymapping.lrs
+++ b/ide/frames/options_editor_keymapping.lrs
@ -3,8 +3,8 @@
 LazarusResources.Add('TEditorKeymappingOptionsFrame','FORMDATA',[
  'TPF0'#241#29'TEditorKeymappingOptionsFrame'#28'EditorKeymappingOptionsFrame'
  +#6'Height'#3#254#1#5'Width'#3#205#1#12'ClientHeight'#3#254#1#11'ClientWidth'
-  +#3#205#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3#154#0#9'DesignTop'#3
-  +#203#0#0#242#2#0#6'TLabel'#19'KeyMappingHelpLabel'#22'AnchorSideLeft.Control'
+  +#3#205#1#8'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3#176#0#9'DesignTop'#3
+  +#232#0#0#242#2#0#6'TLabel'#19'KeyMappingHelpLabel'#22'AnchorSideLeft.Control'
  +#7#5'Owner'#21'AnchorSideTop.Control'#7#5'Owner'#6'Height'#2#14#5'Width'#2'i'
  +#7'Caption'#6#19'KeyMappingHelpLabel'#11'ParentColor'#8#0#0#242#2#1#5'TEdit'
  +#20'KeyMappingFilterEdit'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSid'
--- a/ide/frames/options_editor_keymapping.pas
+++ b/ide/frames/options_editor_keymapping.pas
@ -1,3 +1,23 @@
+{
+ ***************************************************************************
+ *                                                                         *
+ *   This source is free software; you can redistribute it and/or modify   *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This code is distributed in the hope that it will be useful, but      *
+ *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
+ *   General Public License for more details.                              *
+ *                                                                         *
+ *   A copy of the GNU General Public License is available on the World    *
+ *   Wide Web at <http://www.gnu.org/copyleft/gpl.html>. You can also      *
+ *   obtain it by writing to the Free Software Foundation,                 *
+ *   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.        *
+ *                                                                         *
+ ***************************************************************************
+}
 unit options_editor_keymapping;

 {$mode objfpc}{$H+}
--- a/ide/lazarus.lpi
+++ b/ide/lazarus.lpi
@ -41,7 +41,7 @@
        <PackageName Value="SynEdit"/>
      </Item4>
    </RequiredPackages>
-    <Units Count="14">
+    <Units Count="15">
      <Unit0>
        <Filename Value="lazarus.pp"/>
        <IsPartOfProject Value="True"/>
@ -151,6 +151,14 @@
        <ResourceFilename Value="frames\options_editor_keymapping.lrs"/>
        <UnitName Value="options_editor_keymapping"/>
      </Unit13>
+      <Unit14>
+        <Filename Value="frames\options_editor_color.pas"/>
+        <ComponentName Value="EditorColorOptionsFrame"/>
+        <IsPartOfProject Value="True"/>
+        <ResourceBaseClass Value="Frame"/>
+        <ResourceFilename Value="frames\options_editor_color.lrs"/>
+        <UnitName Value="options_editor_color"/>
+      </Unit14>
    </Units>
  </ProjectOptions>
  <CompilerOptions>
--- a/ide/main.pp
+++ b/ide/main.pp
@ -129,7 +129,8 @@ uses
  IDEOptionsIntf, IDEOptionsDlg, EditorOptionsDlg {temporary},
  options_files, options_desktop, options_window, options_formed, options_oi,
  options_backup, options_naming, options_fpdoc,
-  options_editor_general, options_editor_display, options_editor_keymapping;
+  options_editor_general, options_editor_display, options_editor_keymapping,
+  options_editor_color;

 type
  TIDEProjectItem =