diff --git a/components/jcf2/Ui/Settings/frClarify.lfm b/components/jcf2/Ui/Settings/frClarify.lfm
index 20ff16ba19..ee42f2e80b 100644
--- a/components/jcf2/Ui/Settings/frClarify.lfm
+++ b/components/jcf2/Ui/Settings/frClarify.lfm
@@ -3,15 +3,13 @@ inherited fClarify: TfClarify
   Width = 426
   ClientHeight = 292
   ClientWidth = 426
-  Font.CharSet = ANSI_CHARSET
-  Font.Height = -15
-  Font.Name = 'Segoe UI'
-  ParentFont = False
+  DesignLeft = 130
+  DesignTop = 131
   object Label1: TLabel[0]
     Left = 8
-    Height = 18
+    Height = 14
     Top = 8
-    Width = 164
+    Width = 124
     Caption = 'File extensions to format:'
     ParentColor = False
   end
diff --git a/components/jcf2/Ui/Settings/frClarify.lrs b/components/jcf2/Ui/Settings/frClarify.lrs
index 3cbdd1d3b2..f8da23bbe3 100644
--- a/components/jcf2/Ui/Settings/frClarify.lrs
+++ b/components/jcf2/Ui/Settings/frClarify.lrs
@@ -2,19 +2,18 @@
 
 LazarusResources.Add('TfClarify','FORMDATA',[
   'TPF0'#241#9'TfClarify'#8'fClarify'#6'Height'#3'$'#1#5'Width'#3#170#1#12'Clie'
-  +'ntHeight'#3'$'#1#11'ClientWidth'#3#170#1#12'Font.CharSet'#7#12'ANSI_CHARSET'
-  +#11'Font.Height'#2#241#9'Font.Name'#6#8'Segoe UI'#10'ParentFont'#8#0#242#2#0
-  +#6'TLabel'#6'Label1'#4'Left'#2#8#6'Height'#2#18#3'Top'#2#8#5'Width'#3#164#0#7
-  +'Caption'#6#26'File extensions to format:'#11'ParentColor'#8#0#0#242#2#1#11
-  +'TRadioGroup'#13'rgRunOnceOffs'#4'Left'#3#136#0#6'Height'#2'W'#3'Top'#2'"'#5
-  +'Width'#3#141#0#8'AutoFill'#9#7'Caption'#6#13'Run once-offs'#28'ChildSizing.'
-  +'LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.E'
-  +'nlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVert'
-  +'ical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14
-  +'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'Chil'
-  +'dSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Controls'
-  +'PerLine'#2#1#12'ClientHeight'#2'E'#11'ClientWidth'#3#137#0#13'Items.Strings'
-  +#1#6#11'Do &not run'#6#7'Do &run'#6#15'Run &only these'#0#8'TabOrder'#2#0#0#0
-  +#242#2#2#5'TMemo'#15'mFileExtensions'#4'Left'#2#8#6'Height'#2#127#3'Top'#2'"'
-  +#5'Width'#2'm'#8'TabOrder'#2#1#0#0#0
+  +'ntHeight'#3'$'#1#11'ClientWidth'#3#170#1#10'DesignLeft'#3#130#0#9'DesignTop'
+  +#3#131#0#0#242#2#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#8
+  +#5'Width'#2'|'#7'Caption'#6#26'File extensions to format:'#11'ParentColor'#8
+  +#0#0#242#2#1#11'TRadioGroup'#13'rgRunOnceOffs'#4'Left'#3#136#0#6'Height'#2'W'
+  +#3'Top'#2'"'#5'Width'#3#141#0#8'AutoFill'#9#7'Caption'#6#13'Run once-offs'#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'cclLeftToRightThenTopToBottom'#27'ChildSiz'
+  +'ing.ControlsPerLine'#2#1#12'ClientHeight'#2'E'#11'ClientWidth'#3#137#0#13'I'
+  +'tems.Strings'#1#6#11'Do &not run'#6#7'Do &run'#6#15'Run &only these'#0#8'Ta'
+  +'bOrder'#2#0#0#0#242#2#2#5'TMemo'#15'mFileExtensions'#4'Left'#2#8#6'Height'#2
+  +#127#3'Top'#2'"'#5'Width'#2'm'#8'TabOrder'#2#1#0#0#0
 ]);
diff --git a/components/jcf2/Ui/Settings/frClarifySpaces.lfm b/components/jcf2/Ui/Settings/frClarifySpaces.lfm
index 5760788de2..4bb306c216 100644
--- a/components/jcf2/Ui/Settings/frClarifySpaces.lfm
+++ b/components/jcf2/Ui/Settings/frClarifySpaces.lfm
@@ -3,25 +3,21 @@ inherited fClarifySpaces: TfClarifySpaces
   Width = 472
   ClientHeight = 463
   ClientWidth = 472
-  Font.CharSet = ANSI_CHARSET
-  Font.Height = -15
-  Font.Name = 'Segoe UI'
-  ParentFont = False
-  DesignLeft = 493
+  DesignLeft = 479
   DesignTop = 188
   object cbFixSpacing: TCheckBox[0]
     Left = 8
-    Height = 21
+    Height = 17
     Top = 6
-    Width = 92
+    Width = 71
     Caption = 'Fix &spacing'
     TabOrder = 0
   end
   object cbSpaceClassHeritage: TCheckBox[1]
     Left = 8
-    Height = 21
+    Height = 17
     Top = 29
-    Width = 200
+    Width = 151
     Caption = 'Space before class &heritage'
     TabOrder = 1
   end
@@ -36,144 +32,144 @@ inherited fClarifySpaces: TfClarifySpaces
     TabOrder = 2
     object lblSpaceBeforeColonVar: TLabel
       Left = 8
-      Height = 18
+      Height = 14
       Top = 3
-      Width = 106
+      Width = 78
       Caption = '&Var declarations'
       FocusControl = eSpaceBeforeColonVar
       ParentColor = False
     end
     object lblSpacesBeforeColonClassVar: TLabel
       Left = 8
-      Height = 18
+      Height = 14
       Top = 123
-      Width = 101
+      Width = 72
       Caption = '&Class variables'
       FocusControl = eSpacesBeforeColonClassVar
       ParentColor = False
     end
     object lblSpaceBeforeColonFn: TLabel
       Left = 8
-      Height = 18
+      Height = 14
       Top = 93
-      Width = 138
+      Width = 105
       Caption = '&Function return types'
       FocusControl = eSpaceBeforeColonFn
       ParentColor = False
     end
     object lblSpaceBeforeColonParam: TLabel
       Left = 8
-      Height = 18
+      Height = 14
       Top = 63
-      Width = 148
+      Width = 108
       Caption = '&Procedure parameters'
       FocusControl = eSpaceBeforeColonParam
       ParentColor = False
     end
     object lblSpacesBeforeCaseLabel: TLabel
       Left = 5
-      Height = 18
+      Height = 14
       Top = 183
-      Width = 70
+      Width = 50
       Caption = 'Case l&abel'
       FocusControl = eSpacesBeforeCaseLabel
       ParentColor = False
     end
     object lbSpacesBeforeLabel: TLabel
       Left = 5
-      Height = 18
+      Height = 14
       Top = 213
-      Width = 36
+      Width = 26
       Caption = '&Label'
       FocusControl = eSpacesBeforeLabel
       ParentColor = False
     end
     object lblSpacesBeforeColonGeneric: TLabel
       Left = 5
-      Height = 18
+      Height = 14
       Top = 243
-      Width = 64
+      Width = 49
       Caption = 'In &generic'
       FocusControl = eSpacesBeforeColonGeneric
       ParentColor = False
     end
     object lblSpaceBeforeColonConst: TLabel
       Left = 7
-      Height = 18
+      Height = 14
       Top = 33
-      Width = 123
+      Width = 90
       Caption = 'C&onst declarations'
       FocusControl = eSpaceBeforeColonConst
       ParentColor = False
     end
     object lblSpacesBeforeColonRecordField: TLabel
       Left = 8
-      Height = 18
+      Height = 14
       Top = 153
-      Width = 87
+      Width = 63
       Caption = '&Record fields'
       FocusControl = eSpacesBeforeColonRecordField
       ParentColor = False
     end
     object eSpaceBeforeColonVar: TSpinEdit
       Left = 180
-      Height = 25
+      Height = 21
       Top = 1
       Width = 50
       TabOrder = 0
     end
     object eSpaceBeforeColonParam: TSpinEdit
       Left = 180
-      Height = 25
+      Height = 21
       Top = 61
       Width = 50
       TabOrder = 1
     end
     object eSpaceBeforeColonFn: TSpinEdit
       Left = 180
-      Height = 25
+      Height = 21
       Top = 91
       Width = 50
       TabOrder = 2
     end
     object eSpacesBeforeColonClassVar: TSpinEdit
       Left = 180
-      Height = 25
+      Height = 21
       Top = 121
       Width = 50
       TabOrder = 3
     end
     object eSpacesBeforeCaseLabel: TSpinEdit
       Left = 180
-      Height = 25
+      Height = 21
       Top = 181
       Width = 50
       TabOrder = 4
     end
     object eSpacesBeforeLabel: TSpinEdit
       Left = 180
-      Height = 25
+      Height = 21
       Top = 211
       Width = 50
       TabOrder = 5
     end
     object eSpacesBeforeColonGeneric: TSpinEdit
       Left = 180
-      Height = 25
+      Height = 21
       Top = 241
       Width = 50
       TabOrder = 6
     end
     object eSpaceBeforeColonConst: TSpinEdit
       Left = 180
-      Height = 25
+      Height = 21
       Top = 31
       Width = 50
       TabOrder = 7
     end
     object eSpacesBeforeColonRecordField: TSpinEdit
       Left = 180
-      Height = 25
+      Height = 21
       Top = 151
       Width = 50
       TabOrder = 8
@@ -190,41 +186,41 @@ inherited fClarifySpaces: TfClarifySpaces
     TabOrder = 3
     object Label1: TLabel
       Left = 240
-      Height = 18
+      Height = 14
       Top = 7
-      Width = 100
+      Width = 73
       Caption = 'Spaces per tab'
       ParentColor = False
     end
     object Label3: TLabel
       Left = 240
-      Height = 18
+      Height = 14
       Top = 29
-      Width = 96
+      Width = 71
       Caption = 'Spaces for tab'
       ParentColor = False
     end
     object cbTabsToSpaces: TCheckBox
       Left = 6
-      Height = 21
+      Height = 17
       Top = 9
-      Width = 148
+      Width = 113
       Caption = 'Turn tabs to spaces'
       OnClick = cbTabsToSpacesClick
       TabOrder = 0
     end
     object cbSpacesToTabs: TCheckBox
       Left = 6
-      Height = 21
+      Height = 17
       Top = 31
-      Width = 148
+      Width = 113
       Caption = 'Turn spaces to tabs'
       OnClick = cbSpacesToTabsClick
       TabOrder = 2
     end
     object edtSpacesPerTab: TSpinEdit
       Left = 356
-      Height = 25
+      Height = 21
       Top = 5
       Width = 49
       MaxValue = 12
@@ -232,7 +228,7 @@ inherited fClarifySpaces: TfClarifySpaces
     end
     object edtSpacesForTab: TSpinEdit
       Left = 356
-      Height = 25
+      Height = 21
       Top = 29
       Width = 49
       MaxValue = 12
@@ -241,16 +237,16 @@ inherited fClarifySpaces: TfClarifySpaces
   end
   object cbMaxSpaces: TCheckBox[4]
     Left = 8
-    Height = 21
+    Height = 17
     Top = 426
-    Width = 147
+    Width = 111
     Caption = '&Max spaces in code'
     OnClick = cbMaxSpacesClick
     TabOrder = 4
   end
   object edtMaxSpacesInCode: TSpinEdit[5]
     Left = 193
-    Height = 25
+    Height = 21
     Top = 424
     Width = 50
     MaxValue = 99
@@ -291,25 +287,25 @@ inherited fClarifySpaces: TfClarifySpaces
     TabOrder = 7
     object cbInsertSpaceBeforeBracketinFunctionDeclaration: TCheckBox
       Left = 8
-      Height = 21
+      Height = 17
       Top = 10
-      Width = 159
+      Width = 126
       Caption = 'In function &declaration'
       TabOrder = 0
     end
     object cbInsertSpaceBeforeBracketinFunctionCall: TCheckBox
       Left = 8
-      Height = 21
+      Height = 17
       Top = 32
-      Width = 110
+      Width = 88
       Caption = 'In function &call'
       TabOrder = 1
     end
     object cbBeforeOpenSquareBracketInExpression: TCheckBox
       Left = 8
-      Height = 21
+      Height = 17
       Top = 52
-      Width = 159
+      Width = 123
       Caption = 'Before [ in expression'
       TabOrder = 2
     end
@@ -325,26 +321,26 @@ inherited fClarifySpaces: TfClarifySpaces
     TabOrder = 8
     object CheckBoxInsertSpaceBeforeEnd: TCheckBox
       Left = 8
-      Height = 21
+      Height = 17
       Top = 27
-      Width = 89
+      Width = 71
       Caption = 'Before end'
       TabOrder = 0
     end
     object cbInsertSpaceAfterOpen: TCheckBox
       Left = 8
-      Height = 21
+      Height = 17
       Top = 4
-      Width = 84
+      Width = 70
       Caption = 'After open'
       TabOrder = 1
     end
   end
   object cbMoveSpacesToBeforeColon: TCheckBox[9]
     Left = 260
-    Height = 21
+    Height = 17
     Top = 270
-    Width = 204
+    Width = 156
     Caption = 'Move spaces to before colon'
     TabOrder = 9
   end
diff --git a/components/jcf2/Ui/Settings/frClarifySpaces.lrs b/components/jcf2/Ui/Settings/frClarifySpaces.lrs
index ed282cbe92..4ccb5b9adb 100644
--- a/components/jcf2/Ui/Settings/frClarifySpaces.lrs
+++ b/components/jcf2/Ui/Settings/frClarifySpaces.lrs
@@ -2,98 +2,96 @@
 
 LazarusResources.Add('TfClarifySpaces','FORMDATA',[
   'TPF0'#241#15'TfClarifySpaces'#14'fClarifySpaces'#6'Height'#3#207#1#5'Width'#3
-  +#216#1#12'ClientHeight'#3#207#1#11'ClientWidth'#3#216#1#12'Font.CharSet'#7#12
-  +'ANSI_CHARSET'#11'Font.Height'#2#241#9'Font.Name'#6#8'Segoe UI'#10'ParentFon'
-  +'t'#8#10'DesignLeft'#3#237#1#9'DesignTop'#3#188#0#0#242#2#0#9'TCheckBox'#12
-  +'cbFixSpacing'#4'Left'#2#8#6'Height'#2#21#3'Top'#2#6#5'Width'#2'\'#7'Caption'
-  +#6#12'Fix &spacing'#8'TabOrder'#2#0#0#0#242#2#1#9'TCheckBox'#20'cbSpaceClass'
-  +'Heritage'#4'Left'#2#8#6'Height'#2#21#3'Top'#2#29#5'Width'#3#200#0#7'Caption'
-  +#6#28'Space before class &heritage'#8'TabOrder'#2#1#0#0#242#2#2#9'TGroupBox'
-  +#7'gbColon'#4'Left'#2#8#6'Height'#3'$'#1#3'Top'#2'2'#5'Width'#3#246#0#7'Capt'
-  +'ion'#6#23'Spaces &before colon in'#12'ClientHeight'#3#18#1#11'ClientWidth'#3
-  +#242#0#8'TabOrder'#2#2#0#6'TLabel'#22'lblSpaceBeforeColonVar'#4'Left'#2#8#6
-  +'Height'#2#18#3'Top'#2#3#5'Width'#2'j'#7'Caption'#6#17'&Var declarations'#12
-  +'FocusControl'#7#20'eSpaceBeforeColonVar'#11'ParentColor'#8#0#0#6'TLabel'#28
-  +'lblSpacesBeforeColonClassVar'#4'Left'#2#8#6'Height'#2#18#3'Top'#2'{'#5'Widt'
-  +'h'#2'e'#7'Caption'#6#16'&Class variables'#12'FocusControl'#7#26'eSpacesBefo'
-  +'reColonClassVar'#11'ParentColor'#8#0#0#6'TLabel'#21'lblSpaceBeforeColonFn'#4
-  +'Left'#2#8#6'Height'#2#18#3'Top'#2']'#5'Width'#3#138#0#7'Caption'#6#22'&Func'
-  +'tion return types'#12'FocusControl'#7#19'eSpaceBeforeColonFn'#11'ParentColo'
-  +'r'#8#0#0#6'TLabel'#24'lblSpaceBeforeColonParam'#4'Left'#2#8#6'Height'#2#18#3
-  +'Top'#2'?'#5'Width'#3#148#0#7'Caption'#6#21'&Procedure parameters'#12'FocusC'
-  +'ontrol'#7#22'eSpaceBeforeColonParam'#11'ParentColor'#8#0#0#6'TLabel'#24'lbl'
-  +'SpacesBeforeCaseLabel'#4'Left'#2#5#6'Height'#2#18#3'Top'#3#183#0#5'Width'#2
-  +'F'#7'Caption'#6#11'Case l&abel'#12'FocusControl'#7#22'eSpacesBeforeCaseLabe'
-  +'l'#11'ParentColor'#8#0#0#6'TLabel'#19'lbSpacesBeforeLabel'#4'Left'#2#5#6'He'
-  +'ight'#2#18#3'Top'#3#213#0#5'Width'#2'$'#7'Caption'#6#6'&Label'#12'FocusCont'
-  +'rol'#7#18'eSpacesBeforeLabel'#11'ParentColor'#8#0#0#6'TLabel'#27'lblSpacesB'
-  +'eforeColonGeneric'#4'Left'#2#5#6'Height'#2#18#3'Top'#3#243#0#5'Width'#2'@'#7
-  +'Caption'#6#11'In &generic'#12'FocusControl'#7#25'eSpacesBeforeColonGeneric'
-  +#11'ParentColor'#8#0#0#6'TLabel'#24'lblSpaceBeforeColonConst'#4'Left'#2#7#6
-  +'Height'#2#18#3'Top'#2'!'#5'Width'#2'{'#7'Caption'#6#19'C&onst declarations'
-  +#12'FocusControl'#7#22'eSpaceBeforeColonConst'#11'ParentColor'#8#0#0#6'TLabe'
-  +'l'#31'lblSpacesBeforeColonRecordField'#4'Left'#2#8#6'Height'#2#18#3'Top'#3
-  +#153#0#5'Width'#2'W'#7'Caption'#6#14'&Record fields'#12'FocusControl'#7#29'e'
-  +'SpacesBeforeColonRecordField'#11'ParentColor'#8#0#0#9'TSpinEdit'#20'eSpaceB'
-  +'eforeColonVar'#4'Left'#3#180#0#6'Height'#2#25#3'Top'#2#1#5'Width'#2'2'#8'Ta'
-  +'bOrder'#2#0#0#0#9'TSpinEdit'#22'eSpaceBeforeColonParam'#4'Left'#3#180#0#6'H'
-  +'eight'#2#25#3'Top'#2'='#5'Width'#2'2'#8'TabOrder'#2#1#0#0#9'TSpinEdit'#19'e'
-  +'SpaceBeforeColonFn'#4'Left'#3#180#0#6'Height'#2#25#3'Top'#2'['#5'Width'#2'2'
-  +#8'TabOrder'#2#2#0#0#9'TSpinEdit'#26'eSpacesBeforeColonClassVar'#4'Left'#3
-  +#180#0#6'Height'#2#25#3'Top'#2'y'#5'Width'#2'2'#8'TabOrder'#2#3#0#0#9'TSpinE'
-  +'dit'#22'eSpacesBeforeCaseLabel'#4'Left'#3#180#0#6'Height'#2#25#3'Top'#3#181
-  +#0#5'Width'#2'2'#8'TabOrder'#2#4#0#0#9'TSpinEdit'#18'eSpacesBeforeLabel'#4'L'
-  +'eft'#3#180#0#6'Height'#2#25#3'Top'#3#211#0#5'Width'#2'2'#8'TabOrder'#2#5#0#0
-  +#9'TSpinEdit'#25'eSpacesBeforeColonGeneric'#4'Left'#3#180#0#6'Height'#2#25#3
-  +'Top'#3#241#0#5'Width'#2'2'#8'TabOrder'#2#6#0#0#9'TSpinEdit'#22'eSpaceBefore'
-  +'ColonConst'#4'Left'#3#180#0#6'Height'#2#25#3'Top'#2#31#5'Width'#2'2'#8'TabO'
-  +'rder'#2#7#0#0#9'TSpinEdit'#29'eSpacesBeforeColonRecordField'#4'Left'#3#180#0
-  +#6'Height'#2#25#3'Top'#3#151#0#5'Width'#2'2'#8'TabOrder'#2#8#0#0#0#242#2#3#9
-  +'TGroupBox'#6'gbTabs'#4'Left'#2#8#6'Height'#2'N'#3'Top'#3'X'#1#5'Width'#3#201
-  +#1#7'Caption'#6#15'&Tab characters'#12'ClientHeight'#2'<'#11'ClientWidth'#3
-  +#197#1#8'TabOrder'#2#3#0#6'TLabel'#6'Label1'#4'Left'#3#240#0#6'Height'#2#18#3
-  +'Top'#2#7#5'Width'#2'd'#7'Caption'#6#14'Spaces per tab'#11'ParentColor'#8#0#0
-  +#6'TLabel'#6'Label3'#4'Left'#3#240#0#6'Height'#2#18#3'Top'#2#29#5'Width'#2'`'
-  +#7'Caption'#6#14'Spaces for tab'#11'ParentColor'#8#0#0#9'TCheckBox'#14'cbTab'
-  +'sToSpaces'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#9#5'Width'#3#148#0#7'Caption'
-  +#6#19'Turn tabs to spaces'#7'OnClick'#7#19'cbTabsToSpacesClick'#8'TabOrder'#2
-  +#0#0#0#9'TCheckBox'#14'cbSpacesToTabs'#4'Left'#2#6#6'Height'#2#21#3'Top'#2#31
-  +#5'Width'#3#148#0#7'Caption'#6#19'Turn spaces to tabs'#7'OnClick'#7#19'cbSpa'
-  +'cesToTabsClick'#8'TabOrder'#2#2#0#0#9'TSpinEdit'#15'edtSpacesPerTab'#4'Left'
-  +#3'd'#1#6'Height'#2#25#3'Top'#2#5#5'Width'#2'1'#8'MaxValue'#2#12#8'TabOrder'
-  +#2#1#0#0#9'TSpinEdit'#15'edtSpacesForTab'#4'Left'#3'd'#1#6'Height'#2#25#3'To'
-  +'p'#2#29#5'Width'#2'1'#8'MaxValue'#2#12#8'TabOrder'#2#3#0#0#0#242#2#4#9'TChe'
-  +'ckBox'#11'cbMaxSpaces'#4'Left'#2#8#6'Height'#2#21#3'Top'#3#170#1#5'Width'#3
-  +#147#0#7'Caption'#6#19'&Max spaces in code'#7'OnClick'#7#16'cbMaxSpacesClick'
-  ,#8'TabOrder'#2#4#0#0#242#2#5#9'TSpinEdit'#18'edtMaxSpacesInCode'#4'Left'#3
-  +#193#0#6'Height'#2#25#3'Top'#3#168#1#5'Width'#2'2'#8'MaxValue'#2'c'#8'TabOrd'
-  +'er'#2#5#0#0#242#2#6#11'TRadioGroup'#11'rgOperators'#4'Left'#3#4#1#6'Height'
-  +#2'\'#3'Top'#2#6#5'Width'#3#202#0#8'AutoFill'#9#7'Caption'#6#24'Spaces aroun'
-  +'d &operators'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottom'
-  +'Spacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResiz'
-  +'e'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildS'
-  +'izing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'
-  +#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBot'
-  +'tom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'J'#11'ClientWid'
-  +'th'#3#198#0#13'Items.Strings'#1#6#6'Always'#6#11'Leave as is'#6#5'Never'#0#8
-  +'TabOrder'#2#6#0#0#242#2#7#9'TGroupBox GroupBoxInsertSpaceBeforeBracket'#4'L'
-  +'eft'#3#4#1#6'Height'#2'_'#3'Top'#2'b'#5'Width'#3#202#0#7'Caption'#6#28'&Ins'
-  +'ert space before bracket'#12'ClientHeight'#2'M'#11'ClientWidth'#3#198#0#8'T'
-  +'abOrder'#2#7#0#9'TCheckBox/cbInsertSpaceBeforeBracketinFunctionDeclaration'
-  +#4'Left'#2#8#6'Height'#2#21#3'Top'#2#10#5'Width'#3#159#0#7'Caption'#6#24'In '
-  +'function &declaration'#8'TabOrder'#2#0#0#0#9'TCheckBox(cbInsertSpaceBeforeB'
-  +'racketinFunctionCall'#4'Left'#2#8#6'Height'#2#21#3'Top'#2' '#5'Width'#2'n'#7
-  +'Caption'#6#17'In function &call'#8'TabOrder'#2#1#0#0#9'TCheckBox%cbBeforeOp'
-  +'enSquareBracketInExpression'#4'Left'#2#8#6'Height'#2#21#3'Top'#2'4'#5'Width'
-  +#3#159#0#7'Caption'#6#22'Before [ in expression'#8'TabOrder'#2#2#0#0#0#242#2
-  +#8#9'TGroupBox'#28'GroupBoxSpacesInsideBrackets'#4'Left'#3#4#1#6'Height'#2'F'
-  +#3'Top'#3#194#0#5'Width'#3#202#0#7'Caption'#6#28'Insert space inside bracket'
-  +'s'#12'ClientHeight'#2'4'#11'ClientWidth'#3#198#0#8'TabOrder'#2#8#0#9'TCheck'
-  +'Box'#28'CheckBoxInsertSpaceBeforeEnd'#4'Left'#2#8#6'Height'#2#21#3'Top'#2#27
-  +#5'Width'#2'Y'#7'Caption'#6#10'Before end'#8'TabOrder'#2#0#0#0#9'TCheckBox'
-  +#22'cbInsertSpaceAfterOpen'#4'Left'#2#8#6'Height'#2#21#3'Top'#2#4#5'Width'#2
-  +'T'#7'Caption'#6#10'After open'#8'TabOrder'#2#1#0#0#0#242#2#9#9'TCheckBox'#25
-  +'cbMoveSpacesToBeforeColon'#4'Left'#3#4#1#6'Height'#2#21#3'Top'#3#14#1#5'Wid'
-  +'th'#3#204#0#7'Caption'#6#27'Move spaces to before colon'#8'TabOrder'#2#9#0#0
-  +#0
+  +#216#1#12'ClientHeight'#3#207#1#11'ClientWidth'#3#216#1#10'DesignLeft'#3#223
+  +#1#9'DesignTop'#3#188#0#0#242#2#0#9'TCheckBox'#12'cbFixSpacing'#4'Left'#2#8#6
+  +'Height'#2#17#3'Top'#2#6#5'Width'#2'G'#7'Caption'#6#12'Fix &spacing'#8'TabOr'
+  +'der'#2#0#0#0#242#2#1#9'TCheckBox'#20'cbSpaceClassHeritage'#4'Left'#2#8#6'He'
+  +'ight'#2#17#3'Top'#2#29#5'Width'#3#151#0#7'Caption'#6#28'Space before class '
+  +'&heritage'#8'TabOrder'#2#1#0#0#242#2#2#9'TGroupBox'#7'gbColon'#4'Left'#2#8#6
+  +'Height'#3'$'#1#3'Top'#2'2'#5'Width'#3#246#0#7'Caption'#6#23'Spaces &before '
+  +'colon in'#12'ClientHeight'#3#18#1#11'ClientWidth'#3#242#0#8'TabOrder'#2#2#0
+  +#6'TLabel'#22'lblSpaceBeforeColonVar'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#3#5
+  +'Width'#2'N'#7'Caption'#6#17'&Var declarations'#12'FocusControl'#7#20'eSpace'
+  +'BeforeColonVar'#11'ParentColor'#8#0#0#6'TLabel'#28'lblSpacesBeforeColonClas'
+  +'sVar'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'{'#5'Width'#2'H'#7'Caption'#6#16
+  +'&Class variables'#12'FocusControl'#7#26'eSpacesBeforeColonClassVar'#11'Pare'
+  +'ntColor'#8#0#0#6'TLabel'#21'lblSpaceBeforeColonFn'#4'Left'#2#8#6'Height'#2
+  +#14#3'Top'#2']'#5'Width'#2'i'#7'Caption'#6#22'&Function return types'#12'Foc'
+  +'usControl'#7#19'eSpaceBeforeColonFn'#11'ParentColor'#8#0#0#6'TLabel'#24'lbl'
+  +'SpaceBeforeColonParam'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'?'#5'Width'#2'l'
+  +#7'Caption'#6#21'&Procedure parameters'#12'FocusControl'#7#22'eSpaceBeforeCo'
+  +'lonParam'#11'ParentColor'#8#0#0#6'TLabel'#24'lblSpacesBeforeCaseLabel'#4'Le'
+  +'ft'#2#5#6'Height'#2#14#3'Top'#3#183#0#5'Width'#2'2'#7'Caption'#6#11'Case l&'
+  +'abel'#12'FocusControl'#7#22'eSpacesBeforeCaseLabel'#11'ParentColor'#8#0#0#6
+  +'TLabel'#19'lbSpacesBeforeLabel'#4'Left'#2#5#6'Height'#2#14#3'Top'#3#213#0#5
+  +'Width'#2#26#7'Caption'#6#6'&Label'#12'FocusControl'#7#18'eSpacesBeforeLabel'
+  +#11'ParentColor'#8#0#0#6'TLabel'#27'lblSpacesBeforeColonGeneric'#4'Left'#2#5
+  +#6'Height'#2#14#3'Top'#3#243#0#5'Width'#2'1'#7'Caption'#6#11'In &generic'#12
+  +'FocusControl'#7#25'eSpacesBeforeColonGeneric'#11'ParentColor'#8#0#0#6'TLabe'
+  +'l'#24'lblSpaceBeforeColonConst'#4'Left'#2#7#6'Height'#2#14#3'Top'#2'!'#5'Wi'
+  +'dth'#2'Z'#7'Caption'#6#19'C&onst declarations'#12'FocusControl'#7#22'eSpace'
+  +'BeforeColonConst'#11'ParentColor'#8#0#0#6'TLabel'#31'lblSpacesBeforeColonRe'
+  +'cordField'#4'Left'#2#8#6'Height'#2#14#3'Top'#3#153#0#5'Width'#2'?'#7'Captio'
+  +'n'#6#14'&Record fields'#12'FocusControl'#7#29'eSpacesBeforeColonRecordField'
+  +#11'ParentColor'#8#0#0#9'TSpinEdit'#20'eSpaceBeforeColonVar'#4'Left'#3#180#0
+  +#6'Height'#2#21#3'Top'#2#1#5'Width'#2'2'#8'TabOrder'#2#0#0#0#9'TSpinEdit'#22
+  +'eSpaceBeforeColonParam'#4'Left'#3#180#0#6'Height'#2#21#3'Top'#2'='#5'Width'
+  +#2'2'#8'TabOrder'#2#1#0#0#9'TSpinEdit'#19'eSpaceBeforeColonFn'#4'Left'#3#180
+  +#0#6'Height'#2#21#3'Top'#2'['#5'Width'#2'2'#8'TabOrder'#2#2#0#0#9'TSpinEdit'
+  +#26'eSpacesBeforeColonClassVar'#4'Left'#3#180#0#6'Height'#2#21#3'Top'#2'y'#5
+  +'Width'#2'2'#8'TabOrder'#2#3#0#0#9'TSpinEdit'#22'eSpacesBeforeCaseLabel'#4'L'
+  +'eft'#3#180#0#6'Height'#2#21#3'Top'#3#181#0#5'Width'#2'2'#8'TabOrder'#2#4#0#0
+  +#9'TSpinEdit'#18'eSpacesBeforeLabel'#4'Left'#3#180#0#6'Height'#2#21#3'Top'#3
+  +#211#0#5'Width'#2'2'#8'TabOrder'#2#5#0#0#9'TSpinEdit'#25'eSpacesBeforeColonG'
+  +'eneric'#4'Left'#3#180#0#6'Height'#2#21#3'Top'#3#241#0#5'Width'#2'2'#8'TabOr'
+  +'der'#2#6#0#0#9'TSpinEdit'#22'eSpaceBeforeColonConst'#4'Left'#3#180#0#6'Heig'
+  +'ht'#2#21#3'Top'#2#31#5'Width'#2'2'#8'TabOrder'#2#7#0#0#9'TSpinEdit'#29'eSpa'
+  +'cesBeforeColonRecordField'#4'Left'#3#180#0#6'Height'#2#21#3'Top'#3#151#0#5
+  +'Width'#2'2'#8'TabOrder'#2#8#0#0#0#242#2#3#9'TGroupBox'#6'gbTabs'#4'Left'#2#8
+  +#6'Height'#2'N'#3'Top'#3'X'#1#5'Width'#3#201#1#7'Caption'#6#15'&Tab characte'
+  +'rs'#12'ClientHeight'#2'<'#11'ClientWidth'#3#197#1#8'TabOrder'#2#3#0#6'TLabe'
+  +'l'#6'Label1'#4'Left'#3#240#0#6'Height'#2#14#3'Top'#2#7#5'Width'#2'I'#7'Capt'
+  +'ion'#6#14'Spaces per tab'#11'ParentColor'#8#0#0#6'TLabel'#6'Label3'#4'Left'
+  +#3#240#0#6'Height'#2#14#3'Top'#2#29#5'Width'#2'G'#7'Caption'#6#14'Spaces for'
+  +' tab'#11'ParentColor'#8#0#0#9'TCheckBox'#14'cbTabsToSpaces'#4'Left'#2#6#6'H'
+  +'eight'#2#17#3'Top'#2#9#5'Width'#2'q'#7'Caption'#6#19'Turn tabs to spaces'#7
+  +'OnClick'#7#19'cbTabsToSpacesClick'#8'TabOrder'#2#0#0#0#9'TCheckBox'#14'cbSp'
+  +'acesToTabs'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#31#5'Width'#2'q'#7'Caption'
+  +#6#19'Turn spaces to tabs'#7'OnClick'#7#19'cbSpacesToTabsClick'#8'TabOrder'#2
+  +#2#0#0#9'TSpinEdit'#15'edtSpacesPerTab'#4'Left'#3'd'#1#6'Height'#2#21#3'Top'
+  +#2#5#5'Width'#2'1'#8'MaxValue'#2#12#8'TabOrder'#2#1#0#0#9'TSpinEdit'#15'edtS'
+  +'pacesForTab'#4'Left'#3'd'#1#6'Height'#2#21#3'Top'#2#29#5'Width'#2'1'#8'MaxV'
+  +'alue'#2#12#8'TabOrder'#2#3#0#0#0#242#2#4#9'TCheckBox'#11'cbMaxSpaces'#4'Lef'
+  +'t'#2#8#6'Height'#2#17#3'Top'#3#170#1#5'Width'#2'o'#7'Caption'#6#19'&Max spa'
+  +'ces in code'#7'OnClick'#7#16'cbMaxSpacesClick'#8'TabOrder'#2#4#0#0#242#2#5#9
+  +'TSpinEdit'#18'edtMaxSpacesInCode'#4'Left'#3#193#0#6'Height'#2#21#3'Top'#3
+  ,#168#1#5'Width'#2'2'#8'MaxValue'#2'c'#8'TabOrder'#2#5#0#0#242#2#6#11'TRadioG'
+  +'roup'#11'rgOperators'#4'Left'#3#4#1#6'Height'#2'\'#3'Top'#2#6#5'Width'#3#202
+  +#0#8'AutoFill'#9#7'Caption'#6#24'Spaces around &operators'#28'ChildSizing.Le'
+  +'ftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.Enl'
+  +'argeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertic'
+  +'al'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'cr'
+  +'sScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildS'
+  +'izing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPe'
+  +'rLine'#2#1#12'ClientHeight'#2'J'#11'ClientWidth'#3#198#0#13'Items.Strings'#1
+  +#6#6'Always'#6#11'Leave as is'#6#5'Never'#0#8'TabOrder'#2#6#0#0#242#2#7#9'TG'
+  +'roupBox GroupBoxInsertSpaceBeforeBracket'#4'Left'#3#4#1#6'Height'#2'_'#3'To'
+  +'p'#2'b'#5'Width'#3#202#0#7'Caption'#6#28'&Insert space before bracket'#12'C'
+  +'lientHeight'#2'M'#11'ClientWidth'#3#198#0#8'TabOrder'#2#7#0#9'TCheckBox/cbI'
+  +'nsertSpaceBeforeBracketinFunctionDeclaration'#4'Left'#2#8#6'Height'#2#17#3
+  +'Top'#2#10#5'Width'#2'~'#7'Caption'#6#24'In function &declaration'#8'TabOrde'
+  +'r'#2#0#0#0#9'TCheckBox(cbInsertSpaceBeforeBracketinFunctionCall'#4'Left'#2#8
+  +#6'Height'#2#17#3'Top'#2' '#5'Width'#2'X'#7'Caption'#6#17'In function &call'
+  +#8'TabOrder'#2#1#0#0#9'TCheckBox%cbBeforeOpenSquareBracketInExpression'#4'Le'
+  +'ft'#2#8#6'Height'#2#17#3'Top'#2'4'#5'Width'#2'{'#7'Caption'#6#22'Before [ i'
+  +'n expression'#8'TabOrder'#2#2#0#0#0#242#2#8#9'TGroupBox'#28'GroupBoxSpacesI'
+  +'nsideBrackets'#4'Left'#3#4#1#6'Height'#2'F'#3'Top'#3#194#0#5'Width'#3#202#0
+  +#7'Caption'#6#28'Insert space inside brackets'#12'ClientHeight'#2'4'#11'Clie'
+  +'ntWidth'#3#198#0#8'TabOrder'#2#8#0#9'TCheckBox'#28'CheckBoxInsertSpaceBefor'
+  +'eEnd'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#27#5'Width'#2'G'#7'Caption'#6#10
+  +'Before end'#8'TabOrder'#2#0#0#0#9'TCheckBox'#22'cbInsertSpaceAfterOpen'#4'L'
+  +'eft'#2#8#6'Height'#2#17#3'Top'#2#4#5'Width'#2'F'#7'Caption'#6#10'After open'
+  +#8'TabOrder'#2#1#0#0#0#242#2#9#9'TCheckBox'#25'cbMoveSpacesToBeforeColon'#4
+  +'Left'#3#4#1#6'Height'#2#17#3'Top'#3#14#1#5'Width'#3#156#0#7'Caption'#6#27'M'
+  +'ove spaces to before colon'#8'TabOrder'#2#9#0#0#0
 ]);
diff --git a/components/jcf2/Ui/Settings/frFiles.lfm b/components/jcf2/Ui/Settings/frFiles.lfm
index 4190ab3fbf..85a51f2262 100644
--- a/components/jcf2/Ui/Settings/frFiles.lfm
+++ b/components/jcf2/Ui/Settings/frFiles.lfm
@@ -3,50 +3,46 @@ inherited fFiles: TfFiles
   Width = 338
   ClientHeight = 281
   ClientWidth = 338
-  Font.CharSet = ANSI_CHARSET
-  Font.Height = -15
-  Font.Name = 'Segoe UI'
   OnResize = FrameResize
-  ParentFont = False
-  DesignLeft = 745
-  DesignTop = 432
+  DesignLeft = 597
+  DesignTop = 402
   object lblStatus: TLabel[0]
     Left = 8
-    Height = 18
+    Height = 14
     Top = 42
-    Width = 57
+    Width = 42
     Caption = 'lblStatus'
     ParentColor = False
   end
   object lblDate: TLabel[1]
     Left = 8
-    Height = 18
+    Height = 14
     Top = 64
-    Width = 46
+    Width = 34
     Caption = 'lblDate'
     ParentColor = False
   end
   object lblVersion: TLabel[2]
     Left = 8
-    Height = 18
+    Height = 14
     Top = 88
-    Width = 64
+    Width = 46
     Caption = 'lblVersion'
     ParentColor = False
   end
   object lblDescription: TLabel[3]
     Left = 8
-    Height = 18
+    Height = 14
     Top = 114
-    Width = 79
+    Width = 58
     Caption = 'Description:'
     ParentColor = False
   end
   object lblFormatFileName: TLabel[4]
     Left = 8
-    Height = 18
+    Height = 14
     Top = 8
-    Width = 124
+    Width = 88
     Caption = 'lblFormatFileName'
     ParentColor = False
   end
diff --git a/components/jcf2/Ui/Settings/frFiles.lrs b/components/jcf2/Ui/Settings/frFiles.lrs
index c9d436b506..6e208547e0 100644
--- a/components/jcf2/Ui/Settings/frFiles.lrs
+++ b/components/jcf2/Ui/Settings/frFiles.lrs
@@ -2,18 +2,17 @@
 
 LazarusResources.Add('TfFiles','FORMDATA',[
   'TPF0'#241#7'TfFiles'#6'fFiles'#6'Height'#3#25#1#5'Width'#3'R'#1#12'ClientHei'
-  +'ght'#3#25#1#11'ClientWidth'#3'R'#1#12'Font.CharSet'#7#12'ANSI_CHARSET'#11'F'
-  +'ont.Height'#2#241#9'Font.Name'#6#8'Segoe UI'#8'OnResize'#7#11'FrameResize'
-  +#10'ParentFont'#8#10'DesignLeft'#3#233#2#9'DesignTop'#3#176#1#0#242#2#0#6'TL'
-  +'abel'#9'lblStatus'#4'Left'#2#8#6'Height'#2#18#3'Top'#2'*'#5'Width'#2'9'#7'C'
-  +'aption'#6#9'lblStatus'#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#7'lblDate'#4
-  +'Left'#2#8#6'Height'#2#18#3'Top'#2'@'#5'Width'#2'.'#7'Caption'#6#7'lblDate'
-  +#11'ParentColor'#8#0#0#242#2#2#6'TLabel'#10'lblVersion'#4'Left'#2#8#6'Height'
-  +#2#18#3'Top'#2'X'#5'Width'#2'@'#7'Caption'#6#10'lblVersion'#11'ParentColor'#8
-  +#0#0#242#2#3#6'TLabel'#14'lblDescription'#4'Left'#2#8#6'Height'#2#18#3'Top'#2
-  +'r'#5'Width'#2'O'#7'Caption'#6#12'Description:'#11'ParentColor'#8#0#0#242#2#4
-  +#6'TLabel'#17'lblFormatFileName'#4'Left'#2#8#6'Height'#2#18#3'Top'#2#8#5'Wid'
-  +'th'#2'|'#7'Caption'#6#17'lblFormatFileName'#11'ParentColor'#8#0#0#242#2#5#5
-  +'TMemo'#12'mDescription'#4'Left'#2#8#6'Height'#2'Y'#3'Top'#3#134#0#5'Width'#3
-  +'-'#1#8'TabOrder'#2#0#0#0#0
+  +'ght'#3#25#1#11'ClientWidth'#3'R'#1#8'OnResize'#7#11'FrameResize'#10'DesignL'
+  +'eft'#3'U'#2#9'DesignTop'#3#146#1#0#242#2#0#6'TLabel'#9'lblStatus'#4'Left'#2
+  +#8#6'Height'#2#14#3'Top'#2'*'#5'Width'#2'*'#7'Caption'#6#9'lblStatus'#11'Par'
+  +'entColor'#8#0#0#242#2#1#6'TLabel'#7'lblDate'#4'Left'#2#8#6'Height'#2#14#3'T'
+  +'op'#2'@'#5'Width'#2'"'#7'Caption'#6#7'lblDate'#11'ParentColor'#8#0#0#242#2#2
+  +#6'TLabel'#10'lblVersion'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'X'#5'Width'#2
+  +'.'#7'Caption'#6#10'lblVersion'#11'ParentColor'#8#0#0#242#2#3#6'TLabel'#14'l'
+  +'blDescription'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'r'#5'Width'#2':'#7'Capti'
+  +'on'#6#12'Description:'#11'ParentColor'#8#0#0#242#2#4#6'TLabel'#17'lblFormat'
+  +'FileName'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#8#5'Width'#2'X'#7'Caption'#6
+  +#17'lblFormatFileName'#11'ParentColor'#8#0#0#242#2#5#5'TMemo'#12'mDescriptio'
+  +'n'#4'Left'#2#8#6'Height'#2'Y'#3'Top'#3#134#0#5'Width'#3'-'#1#8'TabOrder'#2#0
+  +#0#0#0
 ]);
diff --git a/components/jcf2/Ui/Settings/frObfuscateSettings.lfm b/components/jcf2/Ui/Settings/frObfuscateSettings.lfm
index bb67a936a7..72651ac580 100644
--- a/components/jcf2/Ui/Settings/frObfuscateSettings.lfm
+++ b/components/jcf2/Ui/Settings/frObfuscateSettings.lfm
@@ -3,15 +3,13 @@ inherited fObfuscateSettings: TfObfuscateSettings
   Width = 275
   ClientHeight = 271
   ClientWidth = 275
-  Font.CharSet = ANSI_CHARSET
-  Font.Height = -15
-  Font.Name = 'Segoe UI'
-  ParentFont = False
+  DesignLeft = 426
+  DesignTop = 292
   object cbRemoveWhiteSpace: TCheckBox[0]
     Left = 8
-    Height = 21
+    Height = 17
     Top = 160
-    Width = 155
+    Width = 117
     Caption = 'Remove &white space'
     Checked = True
     State = cbChecked
@@ -19,9 +17,9 @@ inherited fObfuscateSettings: TfObfuscateSettings
   end
   object cbRemoveComments: TCheckBox[1]
     Left = 8
-    Height = 21
+    Height = 17
     Top = 180
-    Width = 147
+    Width = 108
     Caption = 'Remove c&omments'
     Checked = True
     State = cbChecked
@@ -55,9 +53,9 @@ inherited fObfuscateSettings: TfObfuscateSettings
   end
   object cbRebreak: TCheckBox[3]
     Left = 8
-    Height = 21
+    Height = 17
     Top = 220
-    Width = 107
+    Width = 82
     Caption = 'Rebreak &lines'
     Checked = True
     State = cbChecked
@@ -65,9 +63,9 @@ inherited fObfuscateSettings: TfObfuscateSettings
   end
   object cbRemoveIndent: TCheckBox[4]
     Left = 8
-    Height = 21
+    Height = 17
     Top = 200
-    Width = 116
+    Width = 90
     Caption = 'Remove &indent'
     Checked = True
     State = cbChecked
@@ -75,9 +73,9 @@ inherited fObfuscateSettings: TfObfuscateSettings
   end
   object cbEnabled: TCheckBox[5]
     Left = 8
-    Height = 21
+    Height = 17
     Top = 8
-    Width = 127
+    Width = 97
     Caption = '&Obfuscate mode'
     TabOrder = 0
   end
diff --git a/components/jcf2/Ui/Settings/frObfuscateSettings.lrs b/components/jcf2/Ui/Settings/frObfuscateSettings.lrs
index 845307c637..ef7db27fc5 100644
--- a/components/jcf2/Ui/Settings/frObfuscateSettings.lrs
+++ b/components/jcf2/Ui/Settings/frObfuscateSettings.lrs
@@ -2,28 +2,27 @@
 
 LazarusResources.Add('TfObfuscateSettings','FORMDATA',[
   'TPF0'#241#19'TfObfuscateSettings'#18'fObfuscateSettings'#6'Height'#3#15#1#5
-  +'Width'#3#19#1#12'ClientHeight'#3#15#1#11'ClientWidth'#3#19#1#12'Font.CharSe'
-  +'t'#7#12'ANSI_CHARSET'#11'Font.Height'#2#241#9'Font.Name'#6#8'Segoe UI'#10'P'
-  +'arentFont'#8#0#242#2#0#9'TCheckBox'#18'cbRemoveWhiteSpace'#4'Left'#2#8#6'He'
-  +'ight'#2#21#3'Top'#3#160#0#5'Width'#3#155#0#7'Caption'#6#19'Remove &white sp'
-  +'ace'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#2#0#0#242#2#1#9'TCh'
-  +'eckBox'#16'cbRemoveComments'#4'Left'#2#8#6'Height'#2#21#3'Top'#3#180#0#5'Wi'
-  +'dth'#3#147#0#7'Caption'#6#16'Remove c&omments'#7'Checked'#9#5'State'#7#9'cb'
-  +'Checked'#8'TabOrder'#2#3#0#0#242#2#2#11'TRadioGroup'#15'rgObfuscateCaps'#4
-  +'Left'#2#8#6'Height'#2'l'#3'Top'#2'&'#5'Width'#3#169#0#8'AutoFill'#9#7'Capti'
-  +'on'#6#20'Obfuscate word &caps'#28'ChildSizing.LeftRightSpacing'#2#6#28'Chil'
-  +'dSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHom'
-  +'ogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChild'
-  +'Resize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizin'
-  +'g.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftT'
-  +'oRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'
-  +#2'Z'#11'ClientWidth'#3#165#0#9'ItemIndex'#2#0#13'Items.Strings'#1#6#12'ALL '
-  +'CAPITALS'#6#13'all lowercase'#6#10'Mixed Case'#6#11'Leave alone'#0#8'TabOrd'
-  +'er'#2#1#0#0#242#2#3#9'TCheckBox'#9'cbRebreak'#4'Left'#2#8#6'Height'#2#21#3
-  +'Top'#3#220#0#5'Width'#2'k'#7'Caption'#6#14'Rebreak &lines'#7'Checked'#9#5'S'
-  +'tate'#7#9'cbChecked'#8'TabOrder'#2#5#0#0#242#2#4#9'TCheckBox'#14'cbRemoveIn'
-  +'dent'#4'Left'#2#8#6'Height'#2#21#3'Top'#3#200#0#5'Width'#2't'#7'Caption'#6
+  +'Width'#3#19#1#12'ClientHeight'#3#15#1#11'ClientWidth'#3#19#1#10'DesignLeft'
+  +#3#170#1#9'DesignTop'#3'$'#1#0#242#2#0#9'TCheckBox'#18'cbRemoveWhiteSpace'#4
+  +'Left'#2#8#6'Height'#2#17#3'Top'#3#160#0#5'Width'#2'u'#7'Caption'#6#19'Remov'
+  +'e &white space'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#2#0#0#242
+  +#2#1#9'TCheckBox'#16'cbRemoveComments'#4'Left'#2#8#6'Height'#2#17#3'Top'#3
+  +#180#0#5'Width'#2'l'#7'Caption'#6#16'Remove c&omments'#7'Checked'#9#5'State'
+  +#7#9'cbChecked'#8'TabOrder'#2#3#0#0#242#2#2#11'TRadioGroup'#15'rgObfuscateCa'
+  +'ps'#4'Left'#2#8#6'Height'#2'l'#3'Top'#2'&'#5'Width'#3#169#0#8'AutoFill'#9#7
+  +'Caption'#6#20'Obfuscate word &caps'#28'ChildSizing.LeftRightSpacing'#2#6#28
+  +'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'cr'
+  +'sHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousC'
+  +'hildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildS'
+  +'izing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclL'
+  +'eftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHei'
+  +'ght'#2'Z'#11'ClientWidth'#3#165#0#9'ItemIndex'#2#0#13'Items.Strings'#1#6#12
+  +'ALL CAPITALS'#6#13'all lowercase'#6#10'Mixed Case'#6#11'Leave alone'#0#8'Ta'
+  +'bOrder'#2#1#0#0#242#2#3#9'TCheckBox'#9'cbRebreak'#4'Left'#2#8#6'Height'#2#17
+  +#3'Top'#3#220#0#5'Width'#2'R'#7'Caption'#6#14'Rebreak &lines'#7'Checked'#9#5
+  +'State'#7#9'cbChecked'#8'TabOrder'#2#5#0#0#242#2#4#9'TCheckBox'#14'cbRemoveI'
+  +'ndent'#4'Left'#2#8#6'Height'#2#17#3'Top'#3#200#0#5'Width'#2'Z'#7'Caption'#6
   +#14'Remove &indent'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#4#0#0
-  +#242#2#5#9'TCheckBox'#9'cbEnabled'#4'Left'#2#8#6'Height'#2#21#3'Top'#2#8#5'W'
-  +'idth'#2#127#7'Caption'#6#15'&Obfuscate mode'#8'TabOrder'#2#0#0#0#0
+  +#242#2#5#9'TCheckBox'#9'cbEnabled'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#8#5'W'
+  +'idth'#2'a'#7'Caption'#6#15'&Obfuscate mode'#8'TabOrder'#2#0#0#0#0
 ]);