diff --git a/ide/frames/editor_color_options.lfm b/ide/frames/editor_color_options.lfm
index f14d070361..4b162191dd 100644
--- a/ide/frames/editor_color_options.lfm
+++ b/ide/frames/editor_color_options.lfm
@@ -15,14 +15,14 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 230
-    Top = 227
+    Height = 200
+    Top = 257
     Width = 640
     Anchors = [akLeft, akRight, akBottom]
     BevelOuter = bvNone
-    ClientHeight = 230
+    ClientHeight = 200
     ClientWidth = 640
-    Constraints.MinHeight = 230
+    Constraints.MinHeight = 200
     TabOrder = 1
     OnResize = pnlElementAttributesResize
     object ForeGroundLabel: TLabel
@@ -152,232 +152,12 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       OnChange = GeneralCheckBoxOnChange
       TabOrder = 4
     end
-    object TextUnderlineRadioPanel: TPanel
-      AnchorSideLeft.Control = ColumnPosBevel
-      AnchorSideTop.Control = TextUnderlineCheckBox
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Side = asrBottom
-      Left = 204
-      Height = 19
-      Top = 114
-      Width = 129
-      AutoSize = True
-      BevelOuter = bvNone
-      ClientHeight = 19
-      ClientWidth = 129
-      TabOrder = 7
-      object TextUnderlineRadioOn: TRadioButton
-        Tag = 3
-        AnchorSideTop.Control = TextUnderlineRadioPanel
-        AnchorSideRight.Control = TextUnderlineRadioOff
-        Left = 0
-        Height = 19
-        Top = 0
-        Width = 36
-        Anchors = [akTop, akRight]
-        BorderSpacing.Right = 3
-        Caption = 'On'
-        Checked = True
-        OnChange = TextStyleRadioOnChange
-        TabOrder = 0
-        TabStop = True
-      end
-      object TextUnderlineRadioOff: TRadioButton
-        Tag = 3
-        AnchorSideTop.Control = TextUnderlineRadioOn
-        AnchorSideRight.Control = TextUnderlineRadioInvert
-        Left = 39
-        Height = 19
-        Top = 0
-        Width = 37
-        Anchors = [akTop, akRight]
-        BorderSpacing.Right = 3
-        Caption = 'Off'
-        OnChange = TextStyleRadioOnChange
-        TabOrder = 1
-      end
-      object TextUnderlineRadioInvert: TRadioButton
-        Tag = 3
-        AnchorSideTop.Control = TextUnderlineRadioPanel
-        AnchorSideRight.Control = TextUnderlineRadioPanel
-        AnchorSideRight.Side = asrBottom
-        Left = 79
-        Height = 19
-        Top = 0
-        Width = 50
-        Anchors = [akTop, akRight]
-        Caption = 'Invert'
-        OnChange = TextStyleRadioOnChange
-        TabOrder = 2
-      end
-    end
-    object TextUnderlineCheckBox: TCheckBox
-      AnchorSideLeft.Control = pnlElementAttributes
-      AnchorSideTop.Control = FrameColorBox
-      AnchorSideTop.Side = asrBottom
-      Left = 6
-      Height = 19
-      Top = 114
-      Width = 145
-      BorderSpacing.Left = 6
-      BorderSpacing.Top = 3
-      Caption = 'TextUnderlineCheckBox'
-      OnChange = GeneralCheckBoxOnChange
-      TabOrder = 6
-    end
-    object TextBoldRadioPanel: TPanel
-      AnchorSideLeft.Control = ColumnPosBevel
-      AnchorSideTop.Control = TextBoldCheckBox
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Side = asrBottom
-      Left = 204
-      Height = 19
-      Top = 136
-      Width = 129
-      AutoSize = True
-      BevelOuter = bvNone
-      ClientHeight = 19
-      ClientWidth = 129
-      TabOrder = 9
-      object TextBoldRadioInvert: TRadioButton
-        Tag = 2
-        AnchorSideTop.Control = TextBoldRadioPanel
-        AnchorSideRight.Control = TextBoldRadioPanel
-        AnchorSideRight.Side = asrBottom
-        Left = 79
-        Height = 19
-        Top = 0
-        Width = 50
-        Anchors = [akTop, akRight]
-        Caption = 'Invert'
-        OnChange = TextStyleRadioOnChange
-        TabOrder = 2
-      end
-      object TextBoldRadioOn: TRadioButton
-        Tag = 2
-        AnchorSideTop.Control = TextBoldRadioPanel
-        AnchorSideRight.Control = TextBoldRadioOff
-        Left = 0
-        Height = 19
-        Top = 0
-        Width = 36
-        Anchors = [akTop, akRight]
-        BorderSpacing.Right = 3
-        Caption = 'On'
-        Checked = True
-        OnChange = TextStyleRadioOnChange
-        TabOrder = 0
-        TabStop = True
-      end
-      object TextBoldRadioOff: TRadioButton
-        Tag = 2
-        AnchorSideTop.Control = TextBoldRadioPanel
-        AnchorSideRight.Control = TextBoldRadioInvert
-        Left = 39
-        Height = 19
-        Top = 0
-        Width = 37
-        Anchors = [akTop, akRight]
-        BorderSpacing.Right = 3
-        Caption = 'Off'
-        OnChange = TextStyleRadioOnChange
-        TabOrder = 1
-      end
-    end
-    object TextBoldCheckBox: TCheckBox
-      AnchorSideLeft.Control = pnlElementAttributes
-      AnchorSideTop.Control = TextUnderlineCheckBox
-      AnchorSideTop.Side = asrBottom
-      Left = 6
-      Height = 19
-      Top = 136
-      Width = 118
-      BorderSpacing.Left = 6
-      BorderSpacing.Top = 3
-      Caption = 'TextBoldCheckBox'
-      OnChange = GeneralCheckBoxOnChange
-      TabOrder = 8
-    end
-    object TextItalicRadioPanel: TPanel
-      AnchorSideLeft.Control = ColumnPosBevel
-      AnchorSideTop.Control = TextItalicCheckBox
-      AnchorSideTop.Side = asrCenter
-      AnchorSideRight.Side = asrBottom
-      Left = 204
-      Height = 19
-      Top = 158
-      Width = 129
-      AutoSize = True
-      BevelOuter = bvNone
-      ClientHeight = 19
-      ClientWidth = 129
-      TabOrder = 11
-      object TextItalicRadioInvert: TRadioButton
-        Tag = 2
-        AnchorSideTop.Control = TextItalicRadioPanel
-        AnchorSideRight.Control = TextItalicRadioPanel
-        AnchorSideRight.Side = asrBottom
-        Left = 79
-        Height = 19
-        Top = 0
-        Width = 50
-        Anchors = [akTop, akRight]
-        Caption = 'Invert'
-        OnChange = TextStyleRadioOnChange
-        TabOrder = 2
-      end
-      object TextItalicRadioOn: TRadioButton
-        Tag = 2
-        AnchorSideTop.Control = TextItalicRadioPanel
-        AnchorSideRight.Control = TextItalicRadioOff
-        Left = 0
-        Height = 19
-        Top = 0
-        Width = 36
-        Anchors = [akTop, akRight]
-        BorderSpacing.Right = 3
-        Caption = 'On'
-        Checked = True
-        OnChange = TextStyleRadioOnChange
-        TabOrder = 0
-        TabStop = True
-      end
-      object TextItalicRadioOff: TRadioButton
-        Tag = 2
-        AnchorSideTop.Control = TextItalicRadioPanel
-        AnchorSideRight.Control = TextItalicRadioInvert
-        Left = 39
-        Height = 19
-        Top = 0
-        Width = 37
-        Anchors = [akTop, akRight]
-        BorderSpacing.Right = 3
-        Caption = 'Off'
-        OnChange = TextStyleRadioOnChange
-        TabOrder = 1
-      end
-    end
-    object TextItalicCheckBox: TCheckBox
-      AnchorSideLeft.Control = pnlElementAttributes
-      AnchorSideTop.Control = TextBoldCheckBox
-      AnchorSideTop.Side = asrBottom
-      Left = 6
-      Height = 19
-      Top = 158
-      Width = 119
-      BorderSpacing.Left = 6
-      BorderSpacing.Top = 3
-      Caption = 'TextItalicCheckBox'
-      OnChange = GeneralCheckBoxOnChange
-      TabOrder = 10
-    end
     object ColumnPosBevel: TBevel
       AnchorSideLeft.Control = ForeGroundUseDefaultCheckBox
       AnchorSideLeft.Side = asrBottom
-      AnchorSideTop.Control = TextItalicCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 204
-      Height = 28
+      Height = 1
       Top = 177
       Width = 50
       Anchors = [akTop, akLeft, akBottom]
@@ -423,7 +203,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       ClientHeight = 19
       ClientWidth = 628
       ParentColor = False
-      TabOrder = 12
+      TabOrder = 6
       object tglGlobal: TToggleBox
         Left = 0
         Height = 19
@@ -443,6 +223,280 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
         TabOrder = 1
       end
     end
+    object pnlUnderline: TPanel
+      AnchorSideLeft.Control = pnlElementAttributes
+      AnchorSideTop.Control = FrameColorBox
+      AnchorSideTop.Side = asrBottom
+      Left = 6
+      Height = 40
+      Top = 114
+      Width = 145
+      AutoSize = True
+      BorderSpacing.Left = 6
+      BorderSpacing.Top = 3
+      BevelOuter = bvNone
+      ClientHeight = 40
+      ClientWidth = 145
+      TabOrder = 7
+      object TextUnderlineRadioPanel: TPanel
+        AnchorSideLeft.Control = TextUnderlineCheckBox
+        AnchorSideTop.Control = TextUnderlineCheckBox
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Side = asrBottom
+        Left = 0
+        Height = 21
+        Top = 19
+        Width = 134
+        AutoSize = True
+        BevelInner = bvLowered
+        BevelOuter = bvNone
+        ClientHeight = 21
+        ClientWidth = 134
+        TabOrder = 0
+        object TextUnderlineRadioOn: TRadioButton
+          Tag = 3
+          AnchorSideLeft.Control = TextUnderlineRadioPanel
+          AnchorSideTop.Control = TextUnderlineRadioPanel
+          AnchorSideRight.Control = TextUnderlineRadioOff
+          Left = 4
+          Height = 19
+          Top = 1
+          Width = 36
+          BorderSpacing.Left = 3
+          BorderSpacing.Right = 3
+          Caption = 'On'
+          Checked = True
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 0
+          TabStop = True
+        end
+        object TextUnderlineRadioOff: TRadioButton
+          Tag = 3
+          AnchorSideLeft.Control = TextUnderlineRadioOn
+          AnchorSideLeft.Side = asrBottom
+          AnchorSideTop.Control = TextUnderlineRadioOn
+          AnchorSideRight.Control = TextUnderlineRadioInvert
+          Left = 43
+          Height = 19
+          Top = 1
+          Width = 37
+          BorderSpacing.Left = 3
+          BorderSpacing.Right = 3
+          Caption = 'Off'
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 1
+        end
+        object TextUnderlineRadioInvert: TRadioButton
+          Tag = 3
+          AnchorSideLeft.Control = TextUnderlineRadioOff
+          AnchorSideLeft.Side = asrBottom
+          AnchorSideTop.Control = TextUnderlineRadioPanel
+          AnchorSideRight.Control = TextUnderlineRadioPanel
+          AnchorSideRight.Side = asrBottom
+          Left = 83
+          Height = 19
+          Top = 1
+          Width = 50
+          BorderSpacing.Left = 3
+          Caption = 'Invert'
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 2
+        end
+      end
+      object TextUnderlineCheckBox: TCheckBox
+        AnchorSideLeft.Control = pnlUnderline
+        AnchorSideTop.Control = pnlUnderline
+        Left = 0
+        Height = 19
+        Top = 0
+        Width = 145
+        Caption = 'TextUnderlineCheckBox'
+        OnChange = GeneralCheckBoxOnChange
+        TabOrder = 1
+      end
+    end
+    object pnlBold: TPanel
+      AnchorSideLeft.Control = pnlUnderline
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = pnlUnderline
+      Left = 157
+      Height = 40
+      Top = 114
+      Width = 134
+      AutoSize = True
+      BorderSpacing.Left = 6
+      BevelOuter = bvNone
+      ClientHeight = 40
+      ClientWidth = 134
+      TabOrder = 8
+      object TextBoldRadioPanel: TPanel
+        AnchorSideLeft.Control = TextBoldCheckBox
+        AnchorSideTop.Control = TextBoldCheckBox
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Side = asrBottom
+        Left = 0
+        Height = 21
+        Top = 19
+        Width = 134
+        AutoSize = True
+        BevelInner = bvLowered
+        BevelOuter = bvNone
+        ClientHeight = 21
+        ClientWidth = 134
+        TabOrder = 0
+        object TextBoldRadioInvert: TRadioButton
+          Tag = 2
+          AnchorSideLeft.Control = TextBoldRadioOff
+          AnchorSideLeft.Side = asrBottom
+          AnchorSideTop.Control = TextBoldRadioPanel
+          AnchorSideRight.Control = TextBoldRadioPanel
+          AnchorSideRight.Side = asrBottom
+          Left = 83
+          Height = 19
+          Top = 1
+          Width = 50
+          BorderSpacing.Left = 3
+          Caption = 'Invert'
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 2
+        end
+        object TextBoldRadioOn: TRadioButton
+          Tag = 2
+          AnchorSideLeft.Control = TextBoldRadioPanel
+          AnchorSideTop.Control = TextBoldRadioPanel
+          AnchorSideRight.Control = TextBoldRadioOff
+          Left = 4
+          Height = 19
+          Top = 1
+          Width = 36
+          BorderSpacing.Left = 3
+          BorderSpacing.Right = 3
+          Caption = 'On'
+          Checked = True
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 0
+          TabStop = True
+        end
+        object TextBoldRadioOff: TRadioButton
+          Tag = 2
+          AnchorSideLeft.Control = TextBoldRadioOn
+          AnchorSideLeft.Side = asrBottom
+          AnchorSideTop.Control = TextBoldRadioPanel
+          AnchorSideRight.Control = TextBoldRadioInvert
+          Left = 43
+          Height = 19
+          Top = 1
+          Width = 37
+          BorderSpacing.Left = 3
+          BorderSpacing.Right = 3
+          Caption = 'Off'
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 1
+        end
+      end
+      object TextBoldCheckBox: TCheckBox
+        AnchorSideLeft.Control = pnlBold
+        AnchorSideTop.Control = pnlBold
+        Left = 0
+        Height = 19
+        Top = 0
+        Width = 118
+        Caption = 'TextBoldCheckBox'
+        OnChange = GeneralCheckBoxOnChange
+        TabOrder = 1
+      end
+    end
+    object pnlItalic: TPanel
+      AnchorSideLeft.Control = pnlBold
+      AnchorSideLeft.Side = asrBottom
+      AnchorSideTop.Control = pnlUnderline
+      Left = 297
+      Height = 40
+      Top = 114
+      Width = 134
+      AutoSize = True
+      BorderSpacing.Left = 6
+      BevelOuter = bvNone
+      ClientHeight = 40
+      ClientWidth = 134
+      TabOrder = 9
+      object TextItalicRadioPanel: TPanel
+        AnchorSideLeft.Control = TextItalicCheckBox
+        AnchorSideTop.Control = TextItalicCheckBox
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Side = asrBottom
+        Left = 0
+        Height = 21
+        Top = 19
+        Width = 134
+        AutoSize = True
+        BevelInner = bvLowered
+        BevelOuter = bvNone
+        ClientHeight = 21
+        ClientWidth = 134
+        TabOrder = 0
+        object TextItalicRadioInvert: TRadioButton
+          Tag = 2
+          AnchorSideLeft.Control = TextItalicRadioOff
+          AnchorSideLeft.Side = asrBottom
+          AnchorSideTop.Control = TextItalicRadioPanel
+          AnchorSideRight.Control = TextItalicRadioPanel
+          AnchorSideRight.Side = asrBottom
+          Left = 83
+          Height = 19
+          Top = 1
+          Width = 50
+          BorderSpacing.Left = 3
+          Caption = 'Invert'
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 2
+        end
+        object TextItalicRadioOn: TRadioButton
+          Tag = 2
+          AnchorSideLeft.Control = TextItalicRadioPanel
+          AnchorSideTop.Control = TextItalicRadioPanel
+          AnchorSideRight.Control = TextItalicRadioOff
+          Left = 4
+          Height = 19
+          Top = 1
+          Width = 36
+          BorderSpacing.Left = 3
+          BorderSpacing.Right = 3
+          Caption = 'On'
+          Checked = True
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 0
+          TabStop = True
+        end
+        object TextItalicRadioOff: TRadioButton
+          Tag = 2
+          AnchorSideLeft.Control = TextItalicRadioOn
+          AnchorSideLeft.Side = asrBottom
+          AnchorSideTop.Control = TextItalicRadioPanel
+          AnchorSideRight.Control = TextItalicRadioInvert
+          Left = 43
+          Height = 19
+          Top = 1
+          Width = 37
+          BorderSpacing.Left = 3
+          BorderSpacing.Right = 3
+          Caption = 'Off'
+          OnChange = TextStyleRadioOnChange
+          TabOrder = 1
+        end
+      end
+      object TextItalicCheckBox: TCheckBox
+        AnchorSideLeft.Control = pnlItalic
+        AnchorSideTop.Control = pnlItalic
+        Left = 0
+        Height = 19
+        Top = 0
+        Width = 119
+        Caption = 'TextItalicCheckBox'
+        OnChange = GeneralCheckBoxOnChange
+        TabOrder = 1
+      end
+    end
   end
   object pnlTop: TPanel[1]
     Left = 0
@@ -470,17 +524,17 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = pnlElementAttributes
     Left = 0
-    Height = 202
+    Height = 232
     Top = 25
     Width = 640
     Anchors = [akTop, akLeft, akRight, akBottom]
     BevelOuter = bvNone
-    ClientHeight = 202
+    ClientHeight = 232
     ClientWidth = 640
     TabOrder = 2
     object ColorElementTree: TTreeView
       Left = 0
-      Height = 196
+      Height = 226
       Top = 6
       Width = 200
       Align = alLeft
@@ -509,7 +563,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
       AnchorSideBottom.Control = ColorElementTree
       AnchorSideBottom.Side = asrBottom
       Left = 207
-      Height = 196
+      Height = 226
       Top = 6
       Width = 433
       BorderSpacing.Left = 1
@@ -1131,7 +1185,7 @@ inherited EditorColorOptionsFrame: TEditorColorOptionsFrame
     end
     object Splitter1: TSplitter
       Left = 201
-      Height = 202
+      Height = 232
       Top = 0
       Width = 5
     end
diff --git a/ide/frames/editor_color_options.pas b/ide/frames/editor_color_options.pas
index 4053250931..dedef8748f 100644
--- a/ide/frames/editor_color_options.pas
+++ b/ide/frames/editor_color_options.pas
@@ -47,6 +47,9 @@ type
     FrameColorUseDefaultCheckBox: TCheckBox;
     ForegroundColorBox: TColorBox;
     ExportSaveDialog: TSaveDialog;
+    pnlUnderline: TPanel;
+    pnlBold: TPanel;
+    pnlItalic: TPanel;
     pnlUseGlobal: TPanel;
     PnlTop2: TPanel;
     pnlTop: TPanel;