diff --git a/ide/frames/editor_general_options.lfm b/ide/frames/editor_general_options.lfm
index 31fde9b42b..98e29c3b8c 100644
--- a/ide/frames/editor_general_options.lfm
+++ b/ide/frames/editor_general_options.lfm
@@ -5,8 +5,8 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
   ClientWidth = 459
   TabOrder = 0
   Visible = False
-  DesignLeft = 230
-  DesignTop = 230
+  DesignLeft = 138
+  DesignTop = 138
   object BlockIndentLabel: TLabel[0]
     AnchorSideLeft.Control = BlockIndentComboBox
     AnchorSideLeft.Side = asrBottom
@@ -36,25 +36,28 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     ParentColor = False
   end
   object Bevel1: TBevel[2]
-    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Control = UndoGroupLabel
+    AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = UndoGroupLabel
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 180
+    Left = 171
     Height = 3
     Top = 7
-    Width = 279
+    Width = 288
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 180
+    BorderSpacing.Left = 10
   end
   object UndoGroupLabel: TLabel[3]
-    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Control = Bevel1a
+    AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = Owner
-    Left = 0
+    Left = 70
     Height = 16
     Top = 0
     Width = 91
+    BorderSpacing.Left = 10
     Caption = 'UndoGroupLabel'
     ParentColor = False
   end
@@ -72,104 +75,116 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     ParentColor = False
   end
   object ScrollGroupLabel: TLabel[5]
-    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Control = Bevel2a
+    AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = GroupUndoCheckBox
     AnchorSideTop.Side = asrBottom
-    Left = 0
+    Left = 70
     Height = 16
     Top = 66
     Width = 91
+    BorderSpacing.Left = 10
     BorderSpacing.Top = 6
     Caption = 'ScrollGroupLabel'
     ParentColor = False
   end
   object Bevel2: TBevel[6]
-    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Control = ScrollGroupLabel
+    AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = ScrollGroupLabel
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 180
+    Left = 171
     Height = 3
     Top = 73
-    Width = 279
+    Width = 288
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 180
+    BorderSpacing.Left = 10
   end
   object IndentsTabsGroupLabel: TLabel[7]
-    AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = ScrollPastEndLineCheckBox
+    AnchorSideLeft.Control = Bevel3a
+    AnchorSideLeft.Side = asrBottom
+    AnchorSideTop.Control = HalfPageScrollCheckBox
     AnchorSideTop.Side = asrBottom
-    Left = 0
+    Left = 70
     Height = 16
     Top = 132
     Width = 126
+    BorderSpacing.Left = 10
     BorderSpacing.Top = 6
     Caption = 'IndentsTabsGroupLabel'
     ParentColor = False
   end
   object Bevel3: TBevel[8]
-    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Control = IndentsTabsGroupLabel
+    AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = IndentsTabsGroupLabel
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 180
+    Left = 206
     Height = 3
     Top = 139
-    Width = 279
+    Width = 253
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 180
+    BorderSpacing.Left = 10
   end
   object MouseGroupLabel: TLabel[9]
-    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Control = Bevel4a
+    AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = BlockIndentTypeComboBox
     AnchorSideTop.Side = asrBottom
-    Left = 0
+    Left = 70
     Height = 16
     Top = 246
     Width = 98
+    BorderSpacing.Left = 10
     BorderSpacing.Top = 6
     Caption = 'MouseGroupLabel'
     ParentColor = False
   end
   object Bevel4: TBevel[10]
-    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Control = MouseGroupLabel
+    AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = MouseGroupLabel
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 180
+    Left = 178
     Height = 3
     Top = 253
-    Width = 279
+    Width = 281
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 180
+    BorderSpacing.Left = 10
   end
   object CursorGroupLabel: TLabel[11]
-    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Control = Bevel5a
+    AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = MouseLinksCheckBox
     AnchorSideTop.Side = asrBottom
-    Left = 0
+    Left = 70
     Height = 16
     Top = 312
     Width = 97
+    BorderSpacing.Left = 10
     BorderSpacing.Top = 6
     Caption = 'CursorGroupLabel'
     ParentColor = False
   end
   object Bevel5: TBevel[12]
-    AnchorSideLeft.Control = Owner
+    AnchorSideLeft.Control = CursorGroupLabel
+    AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = CursorGroupLabel
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    Left = 180
+    Left = 177
     Height = 3
     Top = 319
-    Width = 279
+    Width = 282
     Anchors = [akTop, akLeft, akRight]
-    BorderSpacing.Left = 180
+    BorderSpacing.Left = 10
   end
   object BlockIndentTypeLabel: TLabel[13]
     AnchorSideLeft.Control = BlockIndentTypeComboBox
@@ -185,7 +200,70 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Caption = 'BlockIndentTypeLabel'
     ParentColor = False
   end
-  object BlockIndentComboBox: TComboBox[14]
+  object Bevel1a: TBevel[14]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = UndoGroupLabel
+    AnchorSideTop.Side = asrCenter
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    Left = 0
+    Height = 3
+    Top = 7
+    Width = 60
+  end
+  object Bevel2a: TBevel[15]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = ScrollGroupLabel
+    AnchorSideTop.Side = asrCenter
+    AnchorSideRight.Control = Bevel1a
+    AnchorSideRight.Side = asrBottom
+    Left = 0
+    Height = 3
+    Top = 73
+    Width = 60
+    Anchors = [akTop, akLeft, akRight]
+    OnChangeBounds = Bevel2aChangeBounds
+  end
+  object Bevel3a: TBevel[16]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = IndentsTabsGroupLabel
+    AnchorSideTop.Side = asrCenter
+    AnchorSideRight.Control = Bevel1a
+    AnchorSideRight.Side = asrBottom
+    Left = 0
+    Height = 3
+    Top = 139
+    Width = 60
+    Anchors = [akTop, akLeft, akRight]
+    OnChangeBounds = Bevel2aChangeBounds
+  end
+  object Bevel4a: TBevel[17]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = MouseGroupLabel
+    AnchorSideTop.Side = asrCenter
+    AnchorSideRight.Control = Bevel1a
+    AnchorSideRight.Side = asrBottom
+    Left = 0
+    Height = 3
+    Top = 253
+    Width = 60
+    Anchors = [akTop, akLeft, akRight]
+    OnChangeBounds = Bevel2aChangeBounds
+  end
+  object Bevel5a: TBevel[18]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = CursorGroupLabel
+    AnchorSideTop.Side = asrCenter
+    AnchorSideRight.Control = Bevel1a
+    AnchorSideRight.Side = asrBottom
+    Left = 0
+    Height = 3
+    Top = 319
+    Width = 60
+    Anchors = [akTop, akLeft, akRight]
+    OnChangeBounds = Bevel2aChangeBounds
+  end
+  object BlockIndentComboBox: TComboBox[19]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = TabIndentBlocksCheckBox
     AnchorSideTop.Side = asrBottom
@@ -197,7 +275,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AutoComplete = False
     BorderSpacing.Left = 6
     BorderSpacing.Top = 3
-    Ctl3D = False
     ItemHeight = 13
     Items.Strings = (
       '1'
@@ -211,7 +288,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnKeyDown = ComboboxOnKeyDown
     TabOrder = 0
   end
-  object TabWidthsComboBox: TComboBox[15]
+  object TabWidthsComboBox: TComboBox[20]
     AnchorSideLeft.Control = SmartTabsCheckBox
     AnchorSideTop.Control = BlockIndentComboBox
     AnchorSideBottom.Control = Owner
@@ -221,7 +298,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Top = 195
     Width = 100
     AutoComplete = False
-    Ctl3D = False
     ItemHeight = 13
     Items.Strings = (
       '1'
@@ -235,7 +311,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnKeyDown = ComboboxOnKeyDown
     TabOrder = 1
   end
-  object UndoLimitComboBox: TComboBox[16]
+  object UndoLimitComboBox: TComboBox[21]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = UndoGroupLabel
     AnchorSideTop.Side = asrBottom
@@ -246,7 +322,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AutoComplete = False
     BorderSpacing.Left = 230
     BorderSpacing.Around = 6
-    Ctl3D = False
     ItemHeight = 13
     Items.Strings = (
       '32767'
@@ -259,7 +334,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnKeyDown = ComboboxOnKeyDown
     TabOrder = 2
   end
-  object GroupUndoCheckBox: TCheckBox[17]
+  object GroupUndoCheckBox: TCheckBox[22]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = UndoAfterSaveCheckBox
     AnchorSideTop.Side = asrBottom
@@ -272,7 +347,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = GroupUndoCheckBoxChange
     TabOrder = 3
   end
-  object UndoAfterSaveCheckBox: TCheckBox[18]
+  object UndoAfterSaveCheckBox: TCheckBox[23]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = UndoGroupLabel
     AnchorSideTop.Side = asrBottom
@@ -285,7 +360,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     Caption = 'UndoAfterSaveCheckBox'
     TabOrder = 4
   end
-  object ScrollPastEndFileCheckBox: TCheckBox[19]
+  object ScrollPastEndFileCheckBox: TCheckBox[24]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = ScrollGroupLabel
     AnchorSideTop.Side = asrBottom
@@ -299,20 +374,20 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = ScrollPastEndFileCheckBoxChange
     TabOrder = 5
   end
-  object ScrollPastEndLineCheckBox: TCheckBox[20]
+  object ScrollPastEndLineCheckBox: TCheckBox[25]
     AnchorSideLeft.Control = Owner
-    AnchorSideTop.Control = ScrollPastEndFileCheckBox
+    AnchorSideTop.Control = AlwaysVisibleCursorCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 6
     Height = 19
-    Top = 107
+    Top = 391
     Width = 155
     BorderSpacing.Left = 6
     Caption = 'ScrollPastEndLineCheckBox'
     OnChange = ScrollPastEndLineCheckBoxChange
     TabOrder = 6
   end
-  object ScrollByOneLessCheckBox: TCheckBox[21]
+  object ScrollByOneLessCheckBox: TCheckBox[26]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = ScrollGroupLabel
     AnchorSideTop.Side = asrBottom
@@ -326,18 +401,20 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = ScrollByOneLessCheckBoxChange
     TabOrder = 7
   end
-  object HalfPageScrollCheckBox: TCheckBox[22]
-    AnchorSideLeft.Control = ScrollByOneLessCheckBox
-    AnchorSideTop.Control = ScrollPastEndLineCheckBox
-    Left = 236
+  object HalfPageScrollCheckBox: TCheckBox[27]
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = ScrollPastEndFileCheckBox
+    AnchorSideTop.Side = asrBottom
+    Left = 6
     Height = 19
     Top = 107
     Width = 139
+    BorderSpacing.Left = 6
     Caption = 'HalfPageScrollCheckBox'
     OnChange = HalfPageScrollCheckBoxChange
     TabOrder = 8
   end
-  object AutoIndentCheckBox: TCheckBox[23]
+  object AutoIndentCheckBox: TCheckBox[28]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = IndentsTabsGroupLabel
     AnchorSideTop.Side = asrBottom
@@ -351,7 +428,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = AutoIndentCheckBoxChange
     TabOrder = 9
   end
-  object TabIndentBlocksCheckBox: TCheckBox[24]
+  object TabIndentBlocksCheckBox: TCheckBox[29]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = AutoIndentCheckBox
     AnchorSideTop.Side = asrBottom
@@ -364,7 +441,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = TabIndentBlocksCheckBoxChange
     TabOrder = 10
   end
-  object SmartTabsCheckBox: TCheckBox[25]
+  object SmartTabsCheckBox: TCheckBox[30]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = IndentsTabsGroupLabel
     AnchorSideTop.Side = asrBottom
@@ -378,7 +455,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = SmartTabsCheckBoxChange
     TabOrder = 11
   end
-  object TabsToSpacesCheckBox: TCheckBox[26]
+  object TabsToSpacesCheckBox: TCheckBox[31]
     AnchorSideLeft.Control = SmartTabsCheckBox
     AnchorSideTop.Control = TabIndentBlocksCheckBox
     Left = 236
@@ -389,7 +466,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = TabsToSpacesCheckBoxChange
     TabOrder = 12
   end
-  object DoubleClickLineCheckBox: TCheckBox[27]
+  object DoubleClickLineCheckBox: TCheckBox[32]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MouseGroupLabel
     AnchorSideTop.Side = asrBottom
@@ -403,7 +480,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = DoubleClickLineCheckBoxChange
     TabOrder = 13
   end
-  object MouseLinksCheckBox: TCheckBox[28]
+  object MouseLinksCheckBox: TCheckBox[33]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = DoubleClickLineCheckBox
     AnchorSideTop.Side = asrBottom
@@ -416,7 +493,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = MouseLinksCheckBoxChange
     TabOrder = 14
   end
-  object DragDropEdCheckBox: TCheckBox[29]
+  object DragDropEdCheckBox: TCheckBox[34]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = MouseGroupLabel
     AnchorSideTop.Side = asrBottom
@@ -430,7 +507,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = DragDropEdCheckBoxChange
     TabOrder = 15
   end
-  object DropFilesCheckBox: TCheckBox[30]
+  object DropFilesCheckBox: TCheckBox[35]
     AnchorSideLeft.Control = DragDropEdCheckBox
     AnchorSideTop.Control = MouseLinksCheckBox
     Left = 236
@@ -441,7 +518,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = DropFilesCheckBoxChange
     TabOrder = 16
   end
-  object KeepCursorXCheckBox: TCheckBox[31]
+  object KeepCursorXCheckBox: TCheckBox[36]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = CursorGroupLabel
     AnchorSideTop.Side = asrBottom
@@ -455,7 +532,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = KeepCursorXCheckBoxChange
     TabOrder = 17
   end
-  object PersistentCursorCheckBox: TCheckBox[32]
+  object PersistentCursorCheckBox: TCheckBox[37]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = KeepCursorXCheckBox
     AnchorSideTop.Side = asrBottom
@@ -468,7 +545,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = PersistentCursorCheckBoxChange
     TabOrder = 18
   end
-  object AlwaysVisibleCursorCheckBox: TCheckBox[33]
+  object AlwaysVisibleCursorCheckBox: TCheckBox[38]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = PersistentCursorCheckBox
     AnchorSideTop.Side = asrBottom
@@ -481,7 +558,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = AlwaysVisibleCursorCheckBoxChange
     TabOrder = 19
   end
-  object CursorSkipsSelectionCheckBox: TCheckBox[34]
+  object CursorSkipsSelectionCheckBox: TCheckBox[39]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = CursorGroupLabel
     AnchorSideTop.Side = asrBottom
@@ -495,7 +572,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = CursorSkipsSelectionCheckBoxChange
     TabOrder = 20
   end
-  object RightMouseMovesCursorCheckBox: TCheckBox[35]
+  object RightMouseMovesCursorCheckBox: TCheckBox[40]
     AnchorSideLeft.Control = CursorSkipsSelectionCheckBox
     AnchorSideTop.Control = PersistentCursorCheckBox
     Left = 236
@@ -506,7 +583,7 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = RightMouseMovesCursorCheckBoxChange
     TabOrder = 21
   end
-  object HomeKeyJumpsToNearestStartCheckBox: TCheckBox[36]
+  object HomeKeyJumpsToNearestStartCheckBox: TCheckBox[41]
     AnchorSideLeft.Control = CursorSkipsSelectionCheckBox
     AnchorSideTop.Control = AlwaysVisibleCursorCheckBox
     Left = 236
@@ -517,20 +594,19 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     OnChange = HomeKeyJumpsToNearestStartCheckBoxChange
     TabOrder = 22
   end
-  object EndKeyJumpsToNearestStartCheckBox: TCheckBox[37]
-    AnchorSideLeft.Control = Owner
+  object EndKeyJumpsToNearestStartCheckBox: TCheckBox[42]
+    AnchorSideLeft.Control = HomeKeyJumpsToNearestStartCheckBox
     AnchorSideTop.Control = AlwaysVisibleCursorCheckBox
     AnchorSideTop.Side = asrBottom
-    Left = 6
+    Left = 236
     Height = 19
     Top = 391
     Width = 208
-    BorderSpacing.Left = 6
     Caption = 'EndKeyJumpsToNearestStartCheckBox'
     OnChange = EndKeyJumpsToNearestStartCheckBoxChange
     TabOrder = 23
   end
-  object BlockIndentTypeComboBox: TComboBox[38]
+  object BlockIndentTypeComboBox: TComboBox[43]
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = BlockIndentComboBox
     AnchorSideTop.Side = asrBottom
@@ -542,7 +618,6 @@ inherited EditorGeneralOptionsFrame: TEditorGeneralOptionsFrame
     AutoComplete = False
     BorderSpacing.Left = 6
     BorderSpacing.Top = 3
-    Ctl3D = False
     ItemHeight = 13
     ItemWidth = 200
     OnChange = ComboboxOnChange
diff --git a/ide/frames/editor_general_options.lrs b/ide/frames/editor_general_options.lrs
index 437e35349e..888ebec2e0 100644
--- a/ide/frames/editor_general_options.lrs
+++ b/ide/frames/editor_general_options.lrs
@@ -3,7 +3,7 @@
 LazarusResources.Add('TEditorGeneralOptionsFrame','FORMDATA',[
   'TPF0'#241#26'TEditorGeneralOptionsFrame'#25'EditorGeneralOptionsFrame'#6'Hei'
   +'ght'#3#4#2#5'Width'#3#203#1#12'ClientHeight'#3#4#2#11'ClientWidth'#3#203#1#8
-  +'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3#230#0#9'DesignTop'#3#230#0#0#242
+  +'TabOrder'#2#0#7'Visible'#8#10'DesignLeft'#3#138#0#9'DesignTop'#3#138#0#0#242
   +#2#0#6'TLabel'#16'BlockIndentLabel'#22'AnchorSideLeft.Control'#7#19'BlockInd'
   +'entComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#24'AnchorSideBottom.Con'
   +'trol'#7#19'BlockIndentComboBox'#21'AnchorSideBottom.Side'#7#9'asrCenter'#4
@@ -15,191 +15,223 @@ LazarusResources.Add('TEditorGeneralOptionsFrame','FORMDATA',[
   +'om.Side'#7#9'asrCenter'#4'Left'#3'V'#1#6'Height'#2#16#3'Top'#3#197#0#5'Widt'
   +'h'#2'V'#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#2#6'TBevel'#6'Bev'
-  +'el1'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#14'U'
-  +'ndoGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Con'
-  +'trol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#180#0#6
-  +'Height'#2#3#3'Top'#2#7#5'Width'#3#23#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'a'
-  +'kRight'#0#18'BorderSpacing.Left'#3#180#0#0#0#242#2#3#6'TLabel'#14'UndoGroup'
-  +'Label'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#5
-  +'Owner'#4'Left'#2#0#6'Height'#2#16#3'Top'#2#0#5'Width'#2'['#7'Caption'#6#14
-  +'UndoGroupLabel'#11'ParentColor'#8#0#0#242#2#4#6'TLabel'#14'UndoLimitLabel'
-  +#22'AnchorSideLeft.Control'#7#17'UndoLimitComboBox'#19'AnchorSideLeft.Side'#7
-  +#9'asrBottom'#21'AnchorSideTop.Control'#7#17'UndoLimitComboBox'#18'AnchorSid'
-  +'eTop.Side'#7#9'asrCenter'#4'Left'#3'V'#1#6'Height'#2#16#3'Top'#2#24#5'Width'
-  +#2'U'#20'BorderSpacing.Around'#2#6#7'Caption'#6#14'UndoLimitLabel'#11'Parent'
-  +'Color'#8#0#0#242#2#5#6'TLabel'#16'ScrollGroupLabel'#22'AnchorSideLeft.Contr'
-  +'ol'#7#5'Owner'#21'AnchorSideTop.Control'#7#17'GroupUndoCheckBox'#18'AnchorS'
-  +'ideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#16#3'Top'#2'B'#5'Width'
-  +#2'['#17'BorderSpacing.Top'#2#6#7'Caption'#6#16'ScrollGroupLabel'#11'ParentC'
-  +'olor'#8#0#0#242#2#6#6'TBevel'#6'Bevel2'#22'AnchorSideLeft.Control'#7#5'Owne'
-  +'r'#21'AnchorSideTop.Control'#7#16'ScrollGroupLabel'#18'AnchorSideTop.Side'#7
-  +#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'
-  +#7#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#3#3'Top'#2'I'#5'Width'#3#23#1#7
-  +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#3#180#0#0
-  +#0#242#2#7#6'TLabel'#21'IndentsTabsGroupLabel'#22'AnchorSideLeft.Control'#7#5
-  +'Owner'#21'AnchorSideTop.Control'#7#25'ScrollPastEndLineCheckBox'#18'AnchorS'
-  +'ideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#16#3'Top'#3#132#0#5'Wid'
-  +'th'#2'~'#17'BorderSpacing.Top'#2#6#7'Caption'#6#21'IndentsTabsGroupLabel'#11
-  +'ParentColor'#8#0#0#242#2#8#6'TBevel'#6'Bevel3'#22'AnchorSideLeft.Control'#7
-  +#5'Owner'#21'AnchorSideTop.Control'#7#21'IndentsTabsGroupLabel'#18'AnchorSid'
-  +'eTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorS'
-  +'ideRight.Side'#7#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#3#3'Top'#3#139#0#5
-  +'Width'#3#23#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacin'
-  +'g.Left'#3#180#0#0#0#242#2#9#6'TLabel'#15'MouseGroupLabel'#22'AnchorSideLeft'
-  +'.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#23'BlockIndentTypeComboBox'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#16#3'Top'#3
-  +#246#0#5'Width'#2'b'#17'BorderSpacing.Top'#2#6#7'Caption'#6#15'MouseGroupLab'
-  +'el'#11'ParentColor'#8#0#0#242#2#10#6'TBevel'#6'Bevel4'#22'AnchorSideLeft.Co'
-  +'ntrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#15'MouseGroupLabel'#18'Anchor'
-  +'SideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anch'
-  +'orSideRight.Side'#7#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#3#3'Top'#3#253
-  +#0#5'Width'#3#23#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSp'
-  +'acing.Left'#3#180#0#0#0#242#2#11#6'TLabel'#16'CursorGroupLabel'#22'AnchorSi'
-  +'deLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#18'MouseLinksCheckBo'
-  +'x'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#0#6'Height'#2#16#3'Top'#3
-  +'8'#1#5'Width'#2'a'#17'BorderSpacing.Top'#2#6#7'Caption'#6#16'CursorGroupLab'
-  +'el'#11'ParentColor'#8#0#0#242#2#12#6'TBevel'#6'Bevel5'#22'AnchorSideLeft.Co'
-  +'ntrol'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'CursorGroupLabel'#18'Ancho'
-  +'rSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'Anc'
-  +'horSideRight.Side'#7#9'asrBottom'#4'Left'#3#180#0#6'Height'#2#3#3'Top'#3'?'
-  +#1#5'Width'#3#23#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSp'
-  +'acing.Left'#3#180#0#0#0#242#2#13#6'TLabel'#20'BlockIndentTypeLabel'#22'Anch'
-  +'orSideLeft.Control'#7#23'BlockIndentTypeComboBox'#19'AnchorSideLeft.Side'#7
-  ,#9'asrBottom'#24'AnchorSideBottom.Control'#7#23'BlockIndentTypeComboBox'#21
-  +'AnchorSideBottom.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Height'#2#16#3'Top'#3
-  +#221#0#5'Width'#2'v'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.'
-  +'Around'#2#6#7'Caption'#6#20'BlockIndentTypeLabel'#11'ParentColor'#8#0#0#242
-  +#2#14#9'TComboBox'#19'BlockIndentComboBox'#22'AnchorSideLeft.Control'#7#5'Ow'
-  +'ner'#21'AnchorSideTop.Control'#7#23'TabIndentBlocksCheckBox'#18'AnchorSideT'
-  +'op.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'TabWidthsComboBox'
-  +#4'Left'#2#6#6'Height'#2#21#3'Top'#3#195#0#5'Width'#2'd'#12'AutoComplete'#8
-  +#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#5'Ctl3D'#8#10'ItemHeig'
-  +'ht'#2#13#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'ItemWidth'#2#0
-  +#8'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDo'
-  +'wn'#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#0#0#0#242#2#15#9'TComboBox'#17'Ta'
-  +'bWidthsComboBox'#22'AnchorSideLeft.Control'#7#17'SmartTabsCheckBox'#21'Anch'
-  +'orSideTop.Control'#7#19'BlockIndentComboBox'#24'AnchorSideBottom.Control'#7
-  +#5'Owner'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'
-  +#2#21#3'Top'#3#195#0#5'Width'#2'd'#12'AutoComplete'#8#5'Ctl3D'#8#10'ItemHeig'
-  +'ht'#2#13#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'ItemWidth'#2#0
-  +#8'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDo'
-  +'wn'#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#1#0#0#242#2#16#9'TComboBox'#17'Un'
-  +'doLimitComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Con'
-  +'trol'#7#14'UndoGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3
-  +#236#0#6'Height'#2#21#3'Top'#2#22#5'Width'#2'd'#12'AutoComplete'#8#18'Border'
-  +'Spacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#5'Ctl3D'#8#10'ItemHeight'
-  +#2#13#13'Items.Strings'#1#6#5'32767'#6#4'4096'#6#3'512'#0#9'ItemWidth'#2#0#8
-  +'OnChange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'
-  +#7#17'ComboboxOnKeyDown'#8'TabOrder'#2#2#0#0#242#2#17#9'TCheckBox'#17'GroupU'
-  +'ndoCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
-  +#7#21'UndoAfterSaveCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
-  +#6#6'Height'#2#19#3'Top'#2')'#5'Width'#2'|'#18'BorderSpacing.Left'#2#6#7'Cap'
-  +'tion'#6#17'GroupUndoCheckBox'#8'OnChange'#7#23'GroupUndoCheckBoxChange'#8'T'
-  +'abOrder'#2#3#0#0#242#2#18#9'TCheckBox'#21'UndoAfterSaveCheckBox'#22'AnchorS'
-  +'ideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#14'UndoGroupLabel'
-  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#22
-  +#5'Width'#3#142#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Cap'
-  +'tion'#6#21'UndoAfterSaveCheckBox'#8'TabOrder'#2#4#0#0#242#2#19#9'TCheckBox'
-  +#25'ScrollPastEndFileCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anch'
-  +'orSideTop.Control'#7#16'ScrollGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBot'
-  +'tom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'X'#5'Width'#3#151#0#18'BorderSpaci'
-  +'ng.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#25'ScrollPastEndFileChe'
-  +'ckBox'#8'OnChange'#7#31'ScrollPastEndFileCheckBoxChange'#8'TabOrder'#2#5#0#0
-  +#242#2#20#9'TCheckBox'#25'ScrollPastEndLineCheckBox'#22'AnchorSideLeft.Contr'
-  +'ol'#7#5'Owner'#21'AnchorSideTop.Control'#7#25'ScrollPastEndFileCheckBox'#18
-  +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'k'#5
-  +'Width'#3#155#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#25'ScrollPastEndLine'
-  +'CheckBox'#8'OnChange'#7#31'ScrollPastEndLineCheckBoxChange'#8'TabOrder'#2#6
-  +#0#0#242#2#21#9'TCheckBox'#23'ScrollByOneLessCheckBox'#22'AnchorSideLeft.Con'
-  +'trol'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'ScrollGroupLabel'#18'Anchor'
-  +'SideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#2'X'#5'W'
-  +'idth'#3#149#0#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7
-  +'Caption'#6#23'ScrollByOneLessCheckBox'#8'OnChange'#7#29'ScrollByOneLessChec'
-  +'kBoxChange'#8'TabOrder'#2#7#0#0#242#2#22#9'TCheckBox'#22'HalfPageScrollChec'
-  +'kBox'#22'AnchorSideLeft.Control'#7#23'ScrollByOneLessCheckBox'#21'AnchorSid'
-  +'eTop.Control'#7#25'ScrollPastEndLineCheckBox'#4'Left'#3#236#0#6'Height'#2#19
-  +#3'Top'#2'k'#5'Width'#3#139#0#7'Caption'#6#22'HalfPageScrollCheckBox'#8'OnCh'
-  +'ange'#7#28'HalfPageScrollCheckBoxChange'#8'TabOrder'#2#8#0#0#242#2#23#9'TCh'
-  +'eckBox'#18'AutoIndentCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anc'
-  +'horSideTop.Control'#7#21'IndentsTabsGroupLabel'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#154#0#5'Width'#2'y'#18'Borde'
-  +'rSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#18'AutoIndentChec'
-  +'kBox'#8'OnChange'#7#24'AutoIndentCheckBoxChange'#8'TabOrder'#2#9#0#0#242#2
-  +#24#9'TCheckBox'#23'TabIndentBlocksCheckBox'#22'AnchorSideLeft.Control'#7#5
-  +'Owner'#21'AnchorSideTop.Control'#7#18'AutoIndentCheckBox'#18'AnchorSideTop.'
-  +'Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#173#0#5'Width'#3
-  +#150#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#23'TabIndentBlocksCheckBox'#8
-  ,'OnChange'#7#29'TabIndentBlocksCheckBoxChange'#8'TabOrder'#2#10#0#0#242#2#25
-  +#9'TCheckBox'#17'SmartTabsCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21
+  +'el1'#22'AnchorSideLeft.Control'#7#14'UndoGroupLabel'#19'AnchorSideLeft.Side'
+  +#7#9'asrBottom'#21'AnchorSideTop.Control'#7#14'UndoGroupLabel'#18'AnchorSide'
+  +'Top.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSi'
+  +'deRight.Side'#7#9'asrBottom'#4'Left'#3#171#0#6'Height'#2#3#3'Top'#2#7#5'Wid'
+  +'th'#3' '#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.L'
+  +'eft'#2#10#0#0#242#2#3#6'TLabel'#14'UndoGroupLabel'#22'AnchorSideLeft.Contro'
+  +'l'#7#7'Bevel1a'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Con'
+  +'trol'#7#5'Owner'#4'Left'#2'F'#6'Height'#2#16#3'Top'#2#0#5'Width'#2'['#18'Bo'
+  +'rderSpacing.Left'#2#10#7'Caption'#6#14'UndoGroupLabel'#11'ParentColor'#8#0#0
+  +#242#2#4#6'TLabel'#14'UndoLimitLabel'#22'AnchorSideLeft.Control'#7#17'UndoLi'
+  +'mitComboBox'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Contro'
+  +'l'#7#17'UndoLimitComboBox'#18'AnchorSideTop.Side'#7#9'asrCenter'#4'Left'#3
+  +'V'#1#6'Height'#2#16#3'Top'#2#24#5'Width'#2'U'#20'BorderSpacing.Around'#2#6#7
+  +'Caption'#6#14'UndoLimitLabel'#11'ParentColor'#8#0#0#242#2#5#6'TLabel'#16'Sc'
+  +'rollGroupLabel'#22'AnchorSideLeft.Control'#7#7'Bevel2a'#19'AnchorSideLeft.S'
+  +'ide'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#17'GroupUndoCheckBox'#18'An'
+  +'chorSideTop.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2#16#3'Top'#2'B'#5
+  +'Width'#2'['#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'#2#6#7'Caption'
+  +#6#16'ScrollGroupLabel'#11'ParentColor'#8#0#0#242#2#6#6'TBevel'#6'Bevel2'#22
+  +'AnchorSideLeft.Control'#7#16'ScrollGroupLabel'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#21'AnchorSideTop.Control'#7#16'ScrollGroupLabel'#18'AnchorSideTo'
+  +'p.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSide'
+  +'Right.Side'#7#9'asrBottom'#4'Left'#3#171#0#6'Height'#2#3#3'Top'#2'I'#5'Widt'
+  +'h'#3' '#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Le'
+  +'ft'#2#10#0#0#242#2#7#6'TLabel'#21'IndentsTabsGroupLabel'#22'AnchorSideLeft.'
+  +'Control'#7#7'Bevel3a'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideT'
+  +'op.Control'#7#22'HalfPageScrollCheckBox'#18'AnchorSideTop.Side'#7#9'asrBott'
+  +'om'#4'Left'#2'F'#6'Height'#2#16#3'Top'#3#132#0#5'Width'#2'~'#18'BorderSpaci'
+  +'ng.Left'#2#10#17'BorderSpacing.Top'#2#6#7'Caption'#6#21'IndentsTabsGroupLab'
+  +'el'#11'ParentColor'#8#0#0#242#2#8#6'TBevel'#6'Bevel3'#22'AnchorSideLeft.Con'
+  +'trol'#7#21'IndentsTabsGroupLabel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21
   +'AnchorSideTop.Control'#7#21'IndentsTabsGroupLabel'#18'AnchorSideTop.Side'#7
-  +#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3#154#0#5'Width'#2'x'#18
-  +'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'Sm'
-  +'artTabsCheckBox'#8'OnChange'#7#23'SmartTabsCheckBoxChange'#8'TabOrder'#2#11
-  +#0#0#242#2#26#9'TCheckBox'#20'TabsToSpacesCheckBox'#22'AnchorSideLeft.Contro'
-  +'l'#7#17'SmartTabsCheckBox'#21'AnchorSideTop.Control'#7#23'TabIndentBlocksCh'
-  +'eckBox'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3#173#0#5'Width'#3#142#0#7'Ca'
-  +'ption'#6#20'TabsToSpacesCheckBox'#8'OnChange'#7#26'TabsToSpacesCheckBoxChan'
-  +'ge'#8'TabOrder'#2#12#0#0#242#2#27#9'TCheckBox'#23'DoubleClickLineCheckBox'
-  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#15'MouseG'
-  +'roupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19
-  +#3'Top'#3#12#1#5'Width'#3#146#0#18'BorderSpacing.Left'#2#6#17'BorderSpacing.'
-  +'Top'#2#6#7'Caption'#6#23'DoubleClickLineCheckBox'#8'OnChange'#7#29'DoubleCl'
-  +'ickLineCheckBoxChange'#8'TabOrder'#2#13#0#0#242#2#28#9'TCheckBox'#18'MouseL'
-  +'inksCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Contro'
-  +'l'#7#23'DoubleClickLineCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Le'
-  +'ft'#2#6#6'Height'#2#19#3'Top'#3#31#1#5'Width'#2'~'#18'BorderSpacing.Left'#2
-  +#6#7'Caption'#6#18'MouseLinksCheckBox'#8'OnChange'#7#24'MouseLinksCheckBoxCh'
-  +'ange'#8'TabOrder'#2#14#0#0#242#2#29#9'TCheckBox'#18'DragDropEdCheckBox'#22
-  +'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#15'MouseGrou'
-  +'pLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#19
-  +#3'Top'#3#12#1#5'Width'#3#128#0#18'BorderSpacing.Left'#3#230#0#20'BorderSpac'
-  +'ing.Around'#2#6#7'Caption'#6#18'DragDropEdCheckBox'#8'OnChange'#7#24'DragDr'
-  +'opEdCheckBoxChange'#8'TabOrder'#2#15#0#0#242#2#30#9'TCheckBox'#17'DropFiles'
-  +'CheckBox'#22'AnchorSideLeft.Control'#7#18'DragDropEdCheckBox'#21'AnchorSide'
-  +'Top.Control'#7#18'MouseLinksCheckBox'#4'Left'#3#236#0#6'Height'#2#19#3'Top'
-  +#3#31#1#5'Width'#2'q'#7'Caption'#6#17'DropFilesCheckBox'#8'OnChange'#7#23'Dr'
-  +'opFilesCheckBoxChange'#8'TabOrder'#2#16#0#0#242#2#31#9'TCheckBox'#19'KeepCu'
-  +'rsorXCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Contr'
-  +'ol'#7#16'CursorGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6
-  +#6'Height'#2#19#3'Top'#3'N'#1#5'Width'#3#131#0#18'BorderSpacing.Left'#2#6#17
-  +'BorderSpacing.Top'#2#6#7'Caption'#6#19'KeepCursorXCheckBox'#8'OnChange'#7#25
-  +'KeepCursorXCheckBoxChange'#8'TabOrder'#2#17#0#0#242#2' '#9'TCheckBox'#24'Pe'
-  +'rsistentCursorCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSide'
-  +'Top.Control'#7#19'KeepCursorXCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
-  +#4'Left'#2#6#6'Height'#2#19#3'Top'#3'a'#1#5'Width'#3#145#0#18'BorderSpacing.'
-  +'Left'#2#6#7'Caption'#6#24'PersistentCursorCheckBox'#8'OnChange'#7#30'Persis'
-  +'tentCursorCheckBoxChange'#8'TabOrder'#2#18#0#0#242#2'!'#9'TCheckBox'#27'Alw'
-  +'aysVisibleCursorCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSi'
-  +'deTop.Control'#7#24'PersistentCursorCheckBox'#18'AnchorSideTop.Side'#7#9'as'
-  +'rBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3't'#1#5'Width'#3#162#0#18'Borde'
-  +'rSpacing.Left'#2#6#7'Caption'#6#27'AlwaysVisibleCursorCheckBox'#8'OnChange'
-  +#7'!AlwaysVisibleCursorCheckBoxChange'#8'TabOrder'#2#19#0#0#242#2'"'#9'TChec'
-  +'kBox'#28'CursorSkipsSelectionCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'
-  +#21'AnchorSideTop.Control'#7#16'CursorGroupLabel'#18'AnchorSideTop.Side'#7#9
-  +'asrBottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3'N'#1#5'Width'#3#169#0#18
-  +'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#28'Cu'
-  +'rsorSkipsSelectionCheckBox'#8'OnChange'#7'"CursorSkipsSelectionCheckBoxChan'
-  +'ge'#8'TabOrder'#2#20#0#0#242#2'#'#9'TCheckBox'#29'RightMouseMovesCursorChec'
-  +'kBox'#22'AnchorSideLeft.Control'#7#28'CursorSkipsSelectionCheckBox'#21'Anch'
-  +'orSideTop.Control'#7#24'PersistentCursorCheckBox'#4'Left'#3#236#0#6'Height'
-  +#2#19#3'Top'#3'a'#1#5'Width'#3#188#0#7'Caption'#6#29'RightMouseMovesCursorCh'
-  +'eckBox'#8'OnChange'#7'#RightMouseMovesCursorCheckBoxChange'#8'TabOrder'#2#21
-  +#0#0#242#2'$'#9'TCheckBox"HomeKeyJumpsToNearestStartCheckBox'#22'AnchorSideL'
-  +'eft.Control'#7#28'CursorSkipsSelectionCheckBox'#21'AnchorSideTop.Control'#7
-  +#27'AlwaysVisibleCursorCheckBox'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3't'#1
-  +#5'Width'#3#217#0#7'Caption'#6'"HomeKeyJumpsToNearestStartCheckBox'#8'OnChan'
-  +'ge'#7'(HomeKeyJumpsToNearestStartCheckBoxChange'#8'TabOrder'#2#22#0#0#242#2
-  +'%'#9'TCheckBox!EndKeyJumpsToNearestStartCheckBox'#22'AnchorSideLeft.Control'
-  +#7#5'Owner'#21'AnchorSideTop.Control'#7#27'AlwaysVisibleCursorCheckBox'#18'A'
-  +'nchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#135#1
-  +#5'Width'#3#208#0#18'BorderSpacing.Left'#2#6#7'Caption'#6'!EndKeyJumpsToNear'
-  ,'estStartCheckBox'#8'OnChange'#7'''EndKeyJumpsToNearestStartCheckBoxChange'#8
-  +'TabOrder'#2#23#0#0#242#2'&'#9'TComboBox'#23'BlockIndentTypeComboBox'#22'Anc'
-  +'horSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#19'BlockIndentC'
-  +'omboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'
-  +#7#17'TabWidthsComboBox'#4'Left'#2#6#6'Height'#2#21#3'Top'#3#219#0#5'Width'#2
-  +'d'#12'AutoComplete'#8#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#5
-  +'Ctl3D'#8#10'ItemHeight'#2#13#9'ItemWidth'#3#200#0#8'OnChange'#7#16'Combobox'
-  +'OnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDow'
-  +'n'#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#24#0#0#0
+  +#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'
+  +#7#9'asrBottom'#4'Left'#3#206#0#6'Height'#2#3#3'Top'#3#139#0#5'Width'#3#253#0
+  +#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.Left'#2#10#0
+  +#0#242#2#9#6'TLabel'#15'MouseGroupLabel'#22'AnchorSideLeft.Control'#7#7'Beve'
+  +'l4a'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#23
+  +'BlockIndentTypeComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2'F'
+  +#6'Height'#2#16#3'Top'#3#246#0#5'Width'#2'b'#18'BorderSpacing.Left'#2#10#17
+  +'BorderSpacing.Top'#2#6#7'Caption'#6#15'MouseGroupLabel'#11'ParentColor'#8#0
+  +#0#242#2#10#6'TBevel'#6'Bevel4'#22'AnchorSideLeft.Control'#7#15'MouseGroupLa'
+  +'bel'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#15
+  +'MouseGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.C'
+  +'ontrol'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3#178#0#6
+  +'Height'#2#3#3'Top'#3#253#0#5'Width'#3#25#1#7'Anchors'#11#5'akTop'#6'akLeft'
+  +#7'akRight'#0#18'BorderSpacing.Left'#2#10#0#0#242#2#11#6'TLabel'#16'CursorGr'
+  +'oupLabel'#22'AnchorSideLeft.Control'#7#7'Bevel5a'#19'AnchorSideLeft.Side'#7
+  +#9'asrBottom'#21'AnchorSideTop.Control'#7#18'MouseLinksCheckBox'#18'AnchorSi'
+  +'deTop.Side'#7#9'asrBottom'#4'Left'#2'F'#6'Height'#2#16#3'Top'#3'8'#1#5'Widt'
+  +'h'#2'a'#18'BorderSpacing.Left'#2#10#17'BorderSpacing.Top'#2#6#7'Caption'#6
+  ,#16'CursorGroupLabel'#11'ParentColor'#8#0#0#242#2#12#6'TBevel'#6'Bevel5'#22
+  +'AnchorSideLeft.Control'#7#16'CursorGroupLabel'#19'AnchorSideLeft.Side'#7#9
+  +'asrBottom'#21'AnchorSideTop.Control'#7#16'CursorGroupLabel'#18'AnchorSideTo'
+  +'p.Side'#7#9'asrCenter'#23'AnchorSideRight.Control'#7#5'Owner'#20'AnchorSide'
+  +'Right.Side'#7#9'asrBottom'#4'Left'#3#177#0#6'Height'#2#3#3'Top'#3'?'#1#5'Wi'
+  +'dth'#3#26#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#18'BorderSpacing.'
+  +'Left'#2#10#0#0#242#2#13#6'TLabel'#20'BlockIndentTypeLabel'#22'AnchorSideLef'
+  +'t.Control'#7#23'BlockIndentTypeComboBox'#19'AnchorSideLeft.Side'#7#9'asrBot'
+  +'tom'#24'AnchorSideBottom.Control'#7#23'BlockIndentTypeComboBox'#21'AnchorSi'
+  +'deBottom.Side'#7#9'asrCenter'#4'Left'#2'p'#6'Height'#2#16#3'Top'#3#221#0#5
+  +'Width'#2'v'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2
+  +#6#7'Caption'#6#20'BlockIndentTypeLabel'#11'ParentColor'#8#0#0#242#2#14#6'TB'
+  +'evel'#7'Bevel1a'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Con'
+  +'trol'#7#14'UndoGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorS'
+  +'ideRight.Control'#7#5'Owner'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'
+  +#2#0#6'Height'#2#3#3'Top'#2#7#5'Width'#2'<'#0#0#242#2#15#6'TBevel'#7'Bevel2a'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'Scroll'
+  +'GroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideRight.Contro'
+  +'l'#7#7'Bevel1a'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2#0#6'Heigh'
+  +'t'#2#3#3'Top'#2'I'#5'Width'#2'<'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
+  +#0#14'OnChangeBounds'#7#19'Bevel2aChangeBounds'#0#0#242#2#16#6'TBevel'#7'Bev'
+  +'el3a'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#21
+  +'IndentsTabsGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'AnchorSideR'
+  +'ight.Control'#7#7'Bevel1a'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#2
+  +#0#6'Height'#2#3#3'Top'#3#139#0#5'Width'#2'<'#7'Anchors'#11#5'akTop'#6'akLef'
+  +'t'#7'akRight'#0#14'OnChangeBounds'#7#19'Bevel2aChangeBounds'#0#0#242#2#17#6
+  +'TBevel'#7'Bevel4a'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.C'
+  +'ontrol'#7#15'MouseGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'#23'Anch'
+  +'orSideRight.Control'#7#7'Bevel1a'#20'AnchorSideRight.Side'#7#9'asrBottom'#4
+  +'Left'#2#0#6'Height'#2#3#3'Top'#3#253#0#5'Width'#2'<'#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#0#14'OnChangeBounds'#7#19'Bevel2aChangeBounds'#0#0#242
+  +#2#18#6'TBevel'#7'Bevel5a'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSi'
+  +'deTop.Control'#7#16'CursorGroupLabel'#18'AnchorSideTop.Side'#7#9'asrCenter'
+  +#23'AnchorSideRight.Control'#7#7'Bevel1a'#20'AnchorSideRight.Side'#7#9'asrBo'
+  +'ttom'#4'Left'#2#0#6'Height'#2#3#3'Top'#3'?'#1#5'Width'#2'<'#7'Anchors'#11#5
+  +'akTop'#6'akLeft'#7'akRight'#0#14'OnChangeBounds'#7#19'Bevel2aChangeBounds'#0
+  +#0#242#2#19#9'TComboBox'#19'BlockIndentComboBox'#22'AnchorSideLeft.Control'#7
+  +#5'Owner'#21'AnchorSideTop.Control'#7#23'TabIndentBlocksCheckBox'#18'AnchorS'
+  +'ideTop.Side'#7#9'asrBottom'#24'AnchorSideBottom.Control'#7#17'TabWidthsComb'
+  +'oBox'#4'Left'#2#6#6'Height'#2#21#3'Top'#3#195#0#5'Width'#2'd'#12'AutoComple'
+  +'te'#8#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#3#10'ItemHeight'#2
+  +#13#13'Items.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'ItemWidth'#2#0#8'OnC'
+  +'hange'#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7
+  +#17'ComboboxOnKeyDown'#8'TabOrder'#2#0#0#0#242#2#20#9'TComboBox'#17'TabWidth'
+  +'sComboBox'#22'AnchorSideLeft.Control'#7#17'SmartTabsCheckBox'#21'AnchorSide'
+  +'Top.Control'#7#19'BlockIndentComboBox'#24'AnchorSideBottom.Control'#7#5'Own'
+  +'er'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#21
+  +#3'Top'#3#195#0#5'Width'#2'd'#12'AutoComplete'#8#10'ItemHeight'#2#13#13'Item'
+  +'s.Strings'#1#6#1'1'#6#1'2'#6#1'4'#6#1'8'#0#9'ItemWidth'#2#0#8'OnChange'#7#16
+  +'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'Combobox'
+  +'OnKeyDown'#8'TabOrder'#2#1#0#0#242#2#21#9'TComboBox'#17'UndoLimitComboBox'
+  +#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#14'UndoGr'
+  +'oupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2
+  +#21#3'Top'#2#22#5'Width'#2'd'#12'AutoComplete'#8#18'BorderSpacing.Left'#3#230
+  +#0#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#13#13'Items.Strings'#1#6#5
+  +'32767'#6#4'4096'#6#3'512'#0#9'ItemWidth'#2#0#8'OnChange'#7#16'ComboboxOnCha'
+  +'nge'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'ComboboxOnKeyDown'#8
+  +'TabOrder'#2#2#0#0#242#2#22#9'TCheckBox'#17'GroupUndoCheckBox'#22'AnchorSide'
+  +'Left.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#21'UndoAfterSaveCheckB'
+  +'ox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'
+  +#2')'#5'Width'#2'|'#18'BorderSpacing.Left'#2#6#7'Caption'#6#17'GroupUndoChec'
+  +'kBox'#8'OnChange'#7#23'GroupUndoCheckBoxChange'#8'TabOrder'#2#3#0#0#242#2#23
+  +#9'TCheckBox'#21'UndoAfterSaveCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'
+  +#21'AnchorSideTop.Control'#7#14'UndoGroupLabel'#18'AnchorSideTop.Side'#7#9'a'
+  ,'srBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2#22#5'Width'#3#142#0#18'Border'
+  +'Spacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#21'UndoAfterSaveCh'
+  +'eckBox'#8'TabOrder'#2#4#0#0#242#2#24#9'TCheckBox'#25'ScrollPastEndFileCheck'
+  +'Box'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#16'S'
+  +'crollGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'
+  +#2#19#3'Top'#2'X'#5'Width'#3#151#0#18'BorderSpacing.Left'#2#6#17'BorderSpaci'
+  +'ng.Top'#2#6#7'Caption'#6#25'ScrollPastEndFileCheckBox'#8'OnChange'#7#31'Scr'
+  +'ollPastEndFileCheckBoxChange'#8'TabOrder'#2#5#0#0#242#2#25#9'TCheckBox'#25
+  +'ScrollPastEndLineCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorS'
+  +'ideTop.Control'#7#27'AlwaysVisibleCursorCheckBox'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#135#1#5'Width'#3#155#0#18'Bo'
+  +'rderSpacing.Left'#2#6#7'Caption'#6#25'ScrollPastEndLineCheckBox'#8'OnChange'
+  +#7#31'ScrollPastEndLineCheckBoxChange'#8'TabOrder'#2#6#0#0#242#2#26#9'TCheck'
+  +'Box'#23'ScrollByOneLessCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'A'
+  +'nchorSideTop.Control'#7#16'ScrollGroupLabel'#18'AnchorSideTop.Side'#7#9'asr'
+  +'Bottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#2'X'#5'Width'#3#149#0#18'Bord'
+  +'erSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#23'Scroll'
+  +'ByOneLessCheckBox'#8'OnChange'#7#29'ScrollByOneLessCheckBoxChange'#8'TabOrd'
+  +'er'#2#7#0#0#242#2#27#9'TCheckBox'#22'HalfPageScrollCheckBox'#22'AnchorSideL'
+  +'eft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#25'ScrollPastEndFileChe'
+  +'ckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'T'
+  +'op'#2'k'#5'Width'#3#139#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#22'HalfPa'
+  +'geScrollCheckBox'#8'OnChange'#7#28'HalfPageScrollCheckBoxChange'#8'TabOrder'
+  +#2#8#0#0#242#2#28#9'TCheckBox'#18'AutoIndentCheckBox'#22'AnchorSideLeft.Cont'
+  +'rol'#7#5'Owner'#21'AnchorSideTop.Control'#7#21'IndentsTabsGroupLabel'#18'An'
+  +'chorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#154#0#5
+  +'Width'#2'y'#18'BorderSpacing.Left'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'
+  +#6#18'AutoIndentCheckBox'#8'OnChange'#7#24'AutoIndentCheckBoxChange'#8'TabOr'
+  +'der'#2#9#0#0#242#2#29#9'TCheckBox'#23'TabIndentBlocksCheckBox'#22'AnchorSid'
+  +'eLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'#7#18'AutoIndentCheckBox'
+  +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3
+  +#173#0#5'Width'#3#150#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#23'TabIndent'
+  +'BlocksCheckBox'#8'OnChange'#7#29'TabIndentBlocksCheckBoxChange'#8'TabOrder'
+  +#2#10#0#0#242#2#30#9'TCheckBox'#17'SmartTabsCheckBox'#22'AnchorSideLeft.Cont'
+  +'rol'#7#5'Owner'#21'AnchorSideTop.Control'#7#21'IndentsTabsGroupLabel'#18'An'
+  +'chorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3#154
+  +#0#5'Width'#2'x'#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6
+  +#7'Caption'#6#17'SmartTabsCheckBox'#8'OnChange'#7#23'SmartTabsCheckBoxChange'
+  +#8'TabOrder'#2#11#0#0#242#2#31#9'TCheckBox'#20'TabsToSpacesCheckBox'#22'Anch'
+  +'orSideLeft.Control'#7#17'SmartTabsCheckBox'#21'AnchorSideTop.Control'#7#23
+  +'TabIndentBlocksCheckBox'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3#173#0#5'Wi'
+  +'dth'#3#142#0#7'Caption'#6#20'TabsToSpacesCheckBox'#8'OnChange'#7#26'TabsToS'
+  +'pacesCheckBoxChange'#8'TabOrder'#2#12#0#0#242#2' '#9'TCheckBox'#23'DoubleCl'
+  +'ickLineCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Con'
+  +'trol'#7#15'MouseGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2
+  +#6#6'Height'#2#19#3'Top'#3#12#1#5'Width'#3#146#0#18'BorderSpacing.Left'#2#6
+  +#17'BorderSpacing.Top'#2#6#7'Caption'#6#23'DoubleClickLineCheckBox'#8'OnChan'
+  +'ge'#7#29'DoubleClickLineCheckBoxChange'#8'TabOrder'#2#13#0#0#242#2'!'#9'TCh'
+  +'eckBox'#18'MouseLinksCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'Anc'
+  +'horSideTop.Control'#7#23'DoubleClickLineCheckBox'#18'AnchorSideTop.Side'#7#9
+  +'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#31#1#5'Width'#2'~'#18'Border'
+  +'Spacing.Left'#2#6#7'Caption'#6#18'MouseLinksCheckBox'#8'OnChange'#7#24'Mous'
+  +'eLinksCheckBoxChange'#8'TabOrder'#2#14#0#0#242#2'"'#9'TCheckBox'#18'DragDro'
+  +'pEdCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Control'
+  +#7#15'MouseGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#3#236#0
+  +#6'Height'#2#19#3'Top'#3#12#1#5'Width'#3#128#0#18'BorderSpacing.Left'#3#230#0
+  +#20'BorderSpacing.Around'#2#6#7'Caption'#6#18'DragDropEdCheckBox'#8'OnChange'
+  +#7#24'DragDropEdCheckBoxChange'#8'TabOrder'#2#15#0#0#242#2'#'#9'TCheckBox'#17
+  +'DropFilesCheckBox'#22'AnchorSideLeft.Control'#7#18'DragDropEdCheckBox'#21'A'
+  +'nchorSideTop.Control'#7#18'MouseLinksCheckBox'#4'Left'#3#236#0#6'Height'#2
+  +#19#3'Top'#3#31#1#5'Width'#2'q'#7'Caption'#6#17'DropFilesCheckBox'#8'OnChang'
+  +'e'#7#23'DropFilesCheckBoxChange'#8'TabOrder'#2#16#0#0#242#2'$'#9'TCheckBox'
+  +#19'KeepCursorXCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSide'
+  +'Top.Control'#7#16'CursorGroupLabel'#18'AnchorSideTop.Side'#7#9'asrBottom'#4
+  ,'Left'#2#6#6'Height'#2#19#3'Top'#3'N'#1#5'Width'#3#131#0#18'BorderSpacing.Le'
+  +'ft'#2#6#17'BorderSpacing.Top'#2#6#7'Caption'#6#19'KeepCursorXCheckBox'#8'On'
+  +'Change'#7#25'KeepCursorXCheckBoxChange'#8'TabOrder'#2#17#0#0#242#2'%'#9'TCh'
+  +'eckBox'#24'PersistentCursorCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'
+  +#21'AnchorSideTop.Control'#7#19'KeepCursorXCheckBox'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3'a'#1#5'Width'#3#145#0#18'B'
+  +'orderSpacing.Left'#2#6#7'Caption'#6#24'PersistentCursorCheckBox'#8'OnChange'
+  +#7#30'PersistentCursorCheckBoxChange'#8'TabOrder'#2#18#0#0#242#2'&'#9'TCheck'
+  +'Box'#27'AlwaysVisibleCursorCheckBox'#22'AnchorSideLeft.Control'#7#5'Owner'
+  +#21'AnchorSideTop.Control'#7#24'PersistentCursorCheckBox'#18'AnchorSideTop.S'
+  +'ide'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3't'#1#5'Width'#3#162
+  +#0#18'BorderSpacing.Left'#2#6#7'Caption'#6#27'AlwaysVisibleCursorCheckBox'#8
+  +'OnChange'#7'!AlwaysVisibleCursorCheckBoxChange'#8'TabOrder'#2#19#0#0#242#2
+  +''''#9'TCheckBox'#28'CursorSkipsSelectionCheckBox'#22'AnchorSideLeft.Control'
+  +#7#5'Owner'#21'AnchorSideTop.Control'#7#16'CursorGroupLabel'#18'AnchorSideTo'
+  +'p.Side'#7#9'asrBottom'#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3'N'#1#5'Width'
+  +#3#169#0#18'BorderSpacing.Left'#3#230#0#20'BorderSpacing.Around'#2#6#7'Capti'
+  +'on'#6#28'CursorSkipsSelectionCheckBox'#8'OnChange'#7'"CursorSkipsSelectionC'
+  +'heckBoxChange'#8'TabOrder'#2#20#0#0#242#2'('#9'TCheckBox'#29'RightMouseMove'
+  +'sCursorCheckBox'#22'AnchorSideLeft.Control'#7#28'CursorSkipsSelectionCheckB'
+  +'ox'#21'AnchorSideTop.Control'#7#24'PersistentCursorCheckBox'#4'Left'#3#236#0
+  +#6'Height'#2#19#3'Top'#3'a'#1#5'Width'#3#188#0#7'Caption'#6#29'RightMouseMov'
+  +'esCursorCheckBox'#8'OnChange'#7'#RightMouseMovesCursorCheckBoxChange'#8'Tab'
+  +'Order'#2#21#0#0#242#2')'#9'TCheckBox"HomeKeyJumpsToNearestStartCheckBox'#22
+  +'AnchorSideLeft.Control'#7#28'CursorSkipsSelectionCheckBox'#21'AnchorSideTop'
+  +'.Control'#7#27'AlwaysVisibleCursorCheckBox'#4'Left'#3#236#0#6'Height'#2#19#3
+  +'Top'#3't'#1#5'Width'#3#217#0#7'Caption'#6'"HomeKeyJumpsToNearestStartCheckB'
+  +'ox'#8'OnChange'#7'(HomeKeyJumpsToNearestStartCheckBoxChange'#8'TabOrder'#2
+  +#22#0#0#242#2'*'#9'TCheckBox!EndKeyJumpsToNearestStartCheckBox'#22'AnchorSid'
+  +'eLeft.Control'#7'"HomeKeyJumpsToNearestStartCheckBox'#21'AnchorSideTop.Cont'
+  +'rol'#7#27'AlwaysVisibleCursorCheckBox'#18'AnchorSideTop.Side'#7#9'asrBottom'
+  +#4'Left'#3#236#0#6'Height'#2#19#3'Top'#3#135#1#5'Width'#3#208#0#7'Caption'#6
+  +'!EndKeyJumpsToNearestStartCheckBox'#8'OnChange'#7'''EndKeyJumpsToNearestSta'
+  +'rtCheckBoxChange'#8'TabOrder'#2#23#0#0#242#2'+'#9'TComboBox'#23'BlockIndent'
+  +'TypeComboBox'#22'AnchorSideLeft.Control'#7#5'Owner'#21'AnchorSideTop.Contro'
+  +'l'#7#19'BlockIndentComboBox'#18'AnchorSideTop.Side'#7#9'asrBottom'#24'Ancho'
+  +'rSideBottom.Control'#7#17'TabWidthsComboBox'#4'Left'#2#6#6'Height'#2#21#3'T'
+  +'op'#3#219#0#5'Width'#2'd'#12'AutoComplete'#8#18'BorderSpacing.Left'#2#6#17
+  +'BorderSpacing.Top'#2#3#10'ItemHeight'#2#13#9'ItemWidth'#3#200#0#8'OnChange'
+  +#7#16'ComboboxOnChange'#6'OnExit'#7#14'ComboBoxOnExit'#9'OnKeyDown'#7#17'Com'
+  +'boboxOnKeyDown'#5'Style'#7#14'csDropDownList'#8'TabOrder'#2#24#0#0#0
 ]);
diff --git a/ide/frames/editor_general_options.pas b/ide/frames/editor_general_options.pas
index bf702f1c83..3e58d40fd5 100644
--- a/ide/frames/editor_general_options.pas
+++ b/ide/frames/editor_general_options.pas
@@ -35,10 +35,15 @@ type
 
   TEditorGeneralOptionsFrame = class(TAbstractIDEOptionsEditor)
     Bevel1: TBevel;
+    Bevel2a: TBevel;
     Bevel2: TBevel;
+    Bevel3a: TBevel;
     Bevel3: TBevel;
+    Bevel4a: TBevel;
+    Bevel5a: TBevel;
     Bevel4: TBevel;
     Bevel5: TBevel;
+    Bevel1a: TBevel;
     BlockIndentComboBox: TComboBox;
     BlockIndentTypeComboBox: TComboBox;
     BlockIndentLabel: TLabel;
@@ -75,6 +80,7 @@ type
     UndoLimitLabel: TLabel;
     procedure AlwaysVisibleCursorCheckBoxChange(Sender: TObject);
     procedure AutoIndentCheckBoxChange(Sender: TObject);
+    procedure Bevel2aChangeBounds(Sender: TObject);
     procedure ComboboxOnChange(Sender: TObject);
     procedure ComboboxOnKeyDown(Sender: TObject; var Key: Word;
       Shift: TShiftState);
@@ -341,6 +347,11 @@ begin
   SetPreviewOption(AutoIndentCheckBox.Checked, eoAutoIndent);
 end;
 
+procedure TEditorGeneralOptionsFrame.Bevel2aChangeBounds(Sender: TObject);
+begin
+
+end;
+
 procedure TEditorGeneralOptionsFrame.AlwaysVisibleCursorCheckBoxChange(
   Sender: TObject);
 begin
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 6211a1984d..eb80c4081b 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -1105,11 +1105,11 @@ resourcestring
   lisLazarusProjectSource = 'Lazarus project source';
   dlgAltSetClMode = 'Alt-Key sets column mode';
 
-  dlgUndoGroupOptions = 'Undo options:';
-  dlgScrollGroupOptions = 'Scroll options:';
-  dlgIndentsTabsGroupOptions = 'Indents/Tabs options:';
-  dlgMouseGroupOptions = 'Mouse options:';
-  dlgCursorGroupOptions = 'Cursor options:';
+  dlgUndoGroupOptions = 'Undo / Redo:';
+  dlgScrollGroupOptions = 'Scrolling:';
+  dlgIndentsTabsGroupOptions = 'Indent and Tabs:';
+  dlgMouseGroupOptions = 'Mouse:';
+  dlgCursorGroupOptions = 'Cursor:';
   dlgAlwaysVisibleCursor = 'Always visible cursor';
   dlgAutoIndent = 'Auto indent';
   dlgDragDropEd = 'Drag Drop editing';
@@ -1122,7 +1122,7 @@ resourcestring
   dlgRightMouseMovesCursor = 'Right mouse moves cursor';
   dlgScrollByOneLess = 'Scroll by one less';
   dlgScrollPastEndFile = 'Scroll past end of file';
-  dlgScrollPastEndLine = 'Scroll past end of line';
+  dlgScrollPastEndLine = 'Caret past end of line';
   lisShowSpecialCharacters = 'Show special characters';
   dlgCloseButtonsNotebook = 'Show close buttons in notebook';
   dlgShowScrollHint = 'Show scroll hint';