diff --git a/.gitattributes b/.gitattributes
index 0b7d28215b..aaa98a75d9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -980,7 +980,6 @@ components/jcf2/Parse/TokenUtils.pas svneol=native#text/pascal
 components/jcf2/Parse/Tokens.pas svneol=native#text/pascal
 components/jcf2/Parse/UI/fShowParseTree.dfm svneol=native#text/plain
 components/jcf2/Parse/UI/fShowParseTree.lfm svneol=native#text/plain
-components/jcf2/Parse/UI/fShowParseTree.lrs svneol=native#text/pascal
 components/jcf2/Parse/UI/fShowParseTree.pas svneol=native#text/pascal
 components/jcf2/Process/Align/AlignAssign.pas svneol=native#text/pascal
 components/jcf2/Process/Align/AlignBase.pas svneol=native#text/pascal
@@ -1092,84 +1091,58 @@ components/jcf2/Settings/SettingsTypes.pas svneol=native#text/pascal
 components/jcf2/Settings/Streams/RegistrySettings.pas svneol=native#text/pascal
 components/jcf2/Settings/Streams/SettingsStream.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frAnyCapsSettings.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frAnyCapsSettings.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frAnyCapsSettings.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frAsm.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frAsm.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frAsm.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frBlankLines.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frBlankLines.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frBlankLines.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarify.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frClarify.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarify.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifyAlign.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frClarifyAlign.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifyAlign.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifyBlocks.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frClarifyBlocks.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifyBlocks.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifyCaseBlocks.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frClarifyCaseBlocks.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifyIndent.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frClarifyIndent.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifyIndent.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifyLongLineBreaker.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frClarifyLongLineBreaker.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifyReturns.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frClarifyReturns.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifyReturns.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifySpaces.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frClarifySpaces.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frClarifySpaces.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frComments.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frComments.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frComments.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frCompilerDirectReturns.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frCompilerDirectReturns.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frCompilerDirectReturns.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frFiles.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frFiles.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frFiles.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frIdentifierCapsSettings.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frIdentifierCapsSettings.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frObfuscateSettings.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frObfuscateSettings.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frObfuscateSettings.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frPreProcessor.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frPreProcessor.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frPreProcessor.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frReplace.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frReplace.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frReplace.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frReservedCapsSettings.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frReservedCapsSettings.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frReservedCapsSettings.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frTransform.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frTransform.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frTransform.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frUnitCaps.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frUnitCaps.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frUnitCaps.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frUses.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frUses.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frUses.pas svneol=native#text/pascal
 components/jcf2/Ui/Settings/frWarnings.lfm svneol=native#text/plain
-components/jcf2/Ui/Settings/frWarnings.lrs svneol=native#text/pascal
 components/jcf2/Ui/Settings/frWarnings.pas svneol=native#text/pascal
 components/jcf2/Ui/fAbout.dfm svneol=native#text/plain
 components/jcf2/Ui/fAbout.lfm svneol=native#text/plain
-components/jcf2/Ui/fAbout.lrs svneol=native#text/pascal
 components/jcf2/Ui/fAbout.pas svneol=native#text/pascal
 components/jcf2/Ui/fJcfErrorDisplay.dfm svneol=native#text/plain
 components/jcf2/Ui/fJcfErrorDisplay.lfm svneol=native#text/plain
-components/jcf2/Ui/fJcfErrorDisplay.lrs svneol=native#text/pascal
 components/jcf2/Ui/fJcfErrorDisplay.pas svneol=native#text/pascal
 components/jcf2/Ui/fRegistrySettings.dfm svneol=native#text/plain
 components/jcf2/Ui/fRegistrySettings.pas svneol=native#text/pascal
diff --git a/components/jcf2/Parse/UI/fShowParseTree.lrs b/components/jcf2/Parse/UI/fShowParseTree.lrs
deleted file mode 100644
index 3b924a590d..0000000000
--- a/components/jcf2/Parse/UI/fShowParseTree.lrs
+++ /dev/null
@@ -1,49 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfrmShowParseTree','FORMDATA',[
-  'TPF0'#17'TfrmShowParseTree'#16'frmShowParseTree'#4'Left'#3'?'#1#6'Height'#3
-  +'+'#2#3'Top'#2't'#5'Width'#3'E'#2#13'ActiveControl'#7#7'pcPages'#11'BorderIc'
-  +'ons'#11#12'biSystemMenu'#10'biMaximize'#0#7'Caption'#6#14'JCF Parse Tree'#12
-  +'ClientHeight'#3'+'#2#11'ClientWidth'#3'E'#2#12'Font.CharSet'#7#12'ANSI_CHAR'
-  +'SET'#11'Font.Height'#2#241#9'Font.Name'#6#8'Segoe UI'#10'KeyPreview'#9#8'On'
-  +'Create'#7#10'FormCreate'#7'OnKeyUp'#7#9'FormKeyUp'#6'OnShow'#7#8'FormShow'#8
-  +'Position'#7#17'poOwnerFormCenter'#10'LCLVersion'#6#6'0.9.27'#0#10'TStatusBa'
-  +'r'#10'StatusBar1'#4'Left'#2#0#6'Height'#2#23#3'Top'#3#20#2#5'Width'#3'E'#2#6
-  +'Panels'#14#0#0#0#6'TPanel'#6'pnlTop'#4'Left'#2#0#6'Height'#2'U'#3'Top'#2#0#5
-  +'Width'#3'E'#2#5'Align'#7#5'alTop'#10'BevelOuter'#7#6'bvNone'#12'ClientHeigh'
-  +'t'#2'U'#11'ClientWidth'#3'E'#2#21'Constraints.MinHeight'#2'C'#20'Constraint'
-  +'s.MinWidth'#2'C'#8'TabOrder'#2#1#0#6'TLabel'#12'lblTreeCount'#4'Left'#2#11#6
-  +'Height'#2#18#3'Top'#2#31#5'Width'#2's'#7'Caption'#6#16'Tree has ? nodes'#11
-  +'ParentColor'#8#0#0#6'TLabel'#12'lblTreeDepth'#4'Left'#2#11#6'Height'#2#18#3
-  +'Top'#2'7'#5'Width'#3#167#0#7'Caption'#6#24'Tree has max depth of ??'#11'Par'
-  +'entColor'#8#0#0#9'TCheckBox'#16'cbShowWhiteSpace'#4'Left'#2#11#6'Height'#2
-  +#23#3'Top'#2#5#5'Width'#3#141#0#7'Caption'#6#15'Show whitespace'#7'OnClick'#7
-  +#21'cbShowWhiteSpaceClick'#8'TabOrder'#2#0#0#0#0#6'TPanel'#9'pnlBottom'#4'Le'
-  +'ft'#2#0#6'Height'#2'2'#3'Top'#3#226#1#5'Width'#3'E'#2#5'Align'#7#8'alBottom'
-  +#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'2'#11'ClientWidth'#3'E'#2#8'T'
-  +'abOrder'#2#2#0#6'TLabel'#10'lblCurrent'#4'Left'#2#11#6'Height'#2#20#3'Top'#2
-  +#2#5'Width'#2'3'#7'Caption'#6#8'Current:'#11'ParentColor'#8#0#0#6'TLabel'#8
-  +'lblDepth'#4'Left'#2#11#6'Height'#2#20#3'Top'#2#26#5'Width'#2','#7'Caption'#6
-  +#6'Depth:'#11'ParentColor'#8#0#0#6'TLabel'#17'lblTotalNodeCount'#4'Left'#3#15
-  +#1#6'Height'#2#20#3'Top'#2#26#5'Width'#2't'#7'Caption'#6#17'Total node count'
-  +':'#11'ParentColor'#8#0#0#6'TLabel'#22'lblImmediateChildCount'#4'Left'#3#15#1
-  +#6'Height'#2#20#3'Top'#2#2#5'Width'#3#152#0#7'Caption'#6#22'Immediate child '
-  +'count:'#11'ParentColor'#8#0#0#0#12'TPageControl'#7'pcPages'#4'Left'#2#0#6'H'
-  +'eight'#3#141#1#3'Top'#2'U'#5'Width'#3'E'#2#10'ActivePage'#7#8'tsTokens'#5'A'
-  +'lign'#7#8'alClient'#8'TabIndex'#2#0#8'TabOrder'#2#3#0#9'TTabSheet'#8'tsToke'
-  +'ns'#7'Caption'#6#6'Tokens'#12'ClientHeight'#3'o'#1#11'ClientWidth'#3'='#2#0
-  +#9'TListView'#8'lvTokens'#4'Left'#2#0#6'Height'#3'o'#1#3'Top'#2#0#5'Width'#3
-  +'='#2#5'Align'#7#8'alClient'#7'Columns'#14#1#8'AutoSize'#8#7'Caption'#6#5'In'
-  +'dex'#5'Width'#2'?'#0#1#8'AutoSize'#8#7'Caption'#6#4'Type'#5'Width'#3#185#0#0
-  +#1#8'AutoSize'#8#7'Caption'#6#4'Text'#5'Width'#3#15#1#0#0#8'ReadOnly'#9#9'Ro'
-  +'wSelect'#9#10'SortColumn'#2#0#8'SortType'#7#6'stNone'#8'TabOrder'#2#0#9'Vie'
-  +'wStyle'#7#8'vsReport'#10'OnDblClick'#7#16'lvTokensDblClick'#12'OnSelectItem'
-  +#7#18'lvTokensSelectItem'#0#0#0#9'TTabSheet'#6'tsTree'#7'Caption'#6#4'Tree'
-  +#12'ClientHeight'#3's'#1#11'ClientWidth'#3'='#2#10'ImageIndex'#2#1#0#9'TTree'
-  +'View'#11'tvParseTree'#4'Left'#2#0#6'Height'#3's'#1#3'Top'#2#0#5'Width'#3'='
-  +#2#5'Align'#7#8'alClient'#5'Ctl3D'#8#17'DefaultItemHeight'#2#15#13'HideSelec'
-  +'tion'#8#6'Indent'#2#22#16'RightClickSelect'#9#8'TabOrder'#2#0#8'OnChange'#7
-  +#17'tvParseTreeChange'#10'OnDblClick'#7#19'tvParseTreeDblClick'#7'Options'#11
-  +#17'tvoAutoItemHeight'#21'tvoKeepCollapsedNodes'#19'tvoRightClickSelect'#14
-  +'tvoShowButtons'#12'tvoShowLines'#11'tvoShowRoot'#11'tvoToolTips'#0#0#0#0#0#0
-]);
diff --git a/components/jcf2/Parse/UI/fShowParseTree.pas b/components/jcf2/Parse/UI/fShowParseTree.pas
index d5bc98a52c..48bf9e8346 100644
--- a/components/jcf2/Parse/UI/fShowParseTree.pas
+++ b/components/jcf2/Parse/UI/fShowParseTree.pas
@@ -90,11 +90,12 @@ implementation
 
 {$ifndef FPC}
   {$R *.dfm}
+{$else}
+  {$R *.lfm}
 {$endif}
 
 uses
-  SourceToken, Tokens, JcfHelp, JcfFontSetFunctions
-  {$ifdef fpc}, LResources{$endif};
+  SourceToken, Tokens, JcfHelp, JcfFontSetFunctions;
 
 procedure ShowParseTree(const pcRoot: TParseTreeNode);
 var
@@ -329,9 +330,4 @@ begin
 {$endif}
 end;
 
-initialization
-{$ifdef fpc}
-  {$I fShowParseTree.lrs}
-{$endif}
-
 end.
diff --git a/components/jcf2/Ui/Settings/frAnyCapsSettings.lrs b/components/jcf2/Ui/Settings/frAnyCapsSettings.lrs
deleted file mode 100644
index c726080ef3..0000000000
--- a/components/jcf2/Ui/Settings/frAnyCapsSettings.lrs
+++ /dev/null
@@ -1,14 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfrAnyCapsSettings','FORMDATA',[
-  'TPF0'#241#18'TfrAnyCapsSettings'#17'frAnyCapsSettings'#6'Height'#3#230#0#5'W'
-  +'idth'#3'n'#1#12'ClientHeight'#3#230#0#11'ClientWidth'#3'n'#1#8'OnResize'#7
-  +#11'FrameResize'#10'DesignLeft'#3#137#2#9'DesignTop'#3'`'#1#0#242#2#0#6'TLab'
-  +'el'#6'Label1'#4'Left'#2'l'#6'Height'#2#14#3'Top'#2#3#5'Width'#3#162#0#7'Cap'
-  +'tion'#6'"Set capitalisation on these words '#11'ParentColor'#8#0#0#242#2#1#9
-  +'TCheckBox'#16'cbEnableAnyWords'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#5#5'Wid'
-  +'th'#2'2'#7'Caption'#6#6'Enable'#7'Checked'#9#7'OnClick'#7#21'cbEnableAnyWor'
-  +'dsClick'#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#242#2#2#5'TMemo'#6'mWo'
-  +'rds'#4'Left'#2#0#6'Height'#3#190#0#3'Top'#2'('#5'Width'#3'n'#1#5'Align'#7#8
-  +'alBottom'#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#1#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frAnyCapsSettings.pas b/components/jcf2/Ui/Settings/frAnyCapsSettings.pas
index 35b0167c8c..7e41108829 100644
--- a/components/jcf2/Ui/Settings/frAnyCapsSettings.pas
+++ b/components/jcf2/Ui/Settings/frAnyCapsSettings.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls,
+  Classes, Controls, Forms, StdCtrls,
   { local }
   IDEOptionsIntf;
 
@@ -57,6 +57,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses 
   JcfHelp, JcfSettings;
 
@@ -112,6 +114,5 @@ begin
 end;
 
 initialization
-  {$I frAnyCapsSettings.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfrAnyCapsSettings, JCFOptionAnyWord, JCFOptionObjectPascal);
 end.
diff --git a/components/jcf2/Ui/Settings/frAsm.lrs b/components/jcf2/Ui/Settings/frAsm.lrs
deleted file mode 100644
index 5221831afa..0000000000
--- a/components/jcf2/Ui/Settings/frAsm.lrs
+++ /dev/null
@@ -1,40 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfAsm','FORMDATA',[
-  'TPF0'#241#5'TfAsm'#4'fAsm'#6'Height'#3#216#0#5'Width'#3'w'#1#12'ClientHeight'
-  +#3#216#0#11'ClientWidth'#3'w'#1#10'DesignLeft'#3'V'#2#9'DesignTop'#3'Q'#1#0
-  +#242#2#0#11'TRadioGroup'#6'rgCaps'#4'Left'#3#165#0#6'Height'#2'm'#3'Top'#2#3
-  +#5'Width'#3#196#0#8'AutoFill'#9#7'Caption'#6#15'&Capitalization'#28'ChildSiz'
-  +'ing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizi'
-  +'ng.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.Enlarge'
-  +'Vertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7
-  +#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'C'
-  +'hildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Contr'
-  +'olsPerLine'#2#1#12'ClientHeight'#2'['#11'ClientWidth'#3#192#0#9'ItemIndex'#2
-  +#1#13'Items.Strings'#1#6#12'ALL CAPITALS'#6#13'all lowercase'#6#10'Mixed Cas'
-  +'e'#6#11'Leave alone'#0#8'TabOrder'#2#1#0#0#242#2#1#9'TGroupBox'#17'gbStatem'
-  +'entIndent'#4'Left'#2#9#6'Height'#2'V'#3'Top'#2#3#5'Width'#3#150#0#7'Caption'
-  +#6#18'&Statement Indents'#12'ClientHeight'#2'D'#11'ClientWidth'#3#146#0#8'Ta'
-  +'bOrder'#2#0#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'"'#5
-  +'Width'#2'!'#7'Caption'#6#6'Indent'#11'ParentColor'#8#0#0#9'TSpinEdit'#18'ed'
-  +'tStatementIndent'#4'Left'#2'H'#6'Height'#2#21#3'Top'#2' '#5'Width'#2'1'#8'M'
-  +'axValue'#2'c'#8'TabOrder'#2#1#0#0#9'TCheckBox'#17'cbStatementIndent'#4'Left'
-  +#2#8#6'Height'#2#17#3'Top'#2#9#5'Width'#2'8'#7'Caption'#6#8'&Enabled'#8'TabO'
-  +'rder'#2#0#0#0#0#242#2#2#9'TGroupBox'#18'gbBreaksAfterLabel'#4'Left'#3#165#0
-  +#6'Height'#2'['#3'Top'#2'v'#5'Width'#3#196#0#7'Caption'#6#19'&Breaks after l'
-  +'abel'#12'ClientHeight'#2'I'#11'ClientWidth'#3#192#0#8'TabOrder'#2#2#0#6'TLa'
-  +'bel'#6'Label7'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'$'#5'Width'#2'V'#7'Capti'
-  +'on'#6#17'&Number of breaks'#12'FocusControl'#7#19'edtBreaksAfterLabel'#11'P'
-  +'arentColor'#8#0#0#9'TCheckBox'#25'cbBreaksAfterLabelEnabled'#4'Left'#2#8#6
-  +'Height'#2#17#3'Top'#2#13#5'Width'#2'8'#7'Caption'#6#8'En&abled'#8'TabOrder'
-  +#2#0#0#0#9'TSpinEdit'#19'edtBreaksAfterLabel'#4'Left'#3#131#0#6'Height'#2#21
-  +#3'Top'#2'!'#5'Width'#2'1'#8'MaxValue'#2#9#8'TabOrder'#2#1#0#0#0#242#2#3#9'T'
-  +'GroupBox'#14'gbParamsIndent'#4'Left'#2#9#6'Height'#2'V'#3'Top'#2'_'#5'Width'
-  +#3#150#0#7'Caption'#6#15'&Params Indents'#12'ClientHeight'#2'D'#11'ClientWid'
-  +'th'#3#146#0#8'TabOrder'#2#3#0#6'TLabel'#6'Label2'#4'Left'#2#8#6'Height'#2#14
-  +#3'Top'#2'$'#5'Width'#2'!'#7'Caption'#6#6'Indent'#11'ParentColor'#8#0#0#9'TS'
-  +'pinEdit'#15'edtParamsIndent'#4'Left'#2'H'#6'Height'#2#21#3'Top'#2'!'#5'Widt'
-  +'h'#2'1'#8'MaxValue'#2'c'#8'TabOrder'#2#1#0#0#9'TCheckBox'#14'cbParamsIndent'
-  +#4'Left'#2#8#6'Height'#2#17#3'Top'#2#11#5'Width'#2'8'#7'Caption'#6#8'&Enable'
-  +'d'#8'TabOrder'#2#0#0#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frAsm.pas b/components/jcf2/Ui/Settings/frAsm.pas
index 88de3512b3..bc02f12b2c 100644
--- a/components/jcf2/Ui/Settings/frAsm.pas
+++ b/components/jcf2/Ui/Settings/frAsm.pas
@@ -30,7 +30,7 @@ See http://www.gnu.org/licenses/gpl.html
 interface
 
 uses
-  Messages, SysUtils, Variants, Classes, Graphics, Controls, LResources, Forms,
+  Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, ExtCtrls, Spin,
   { local}
   IDEOptionsIntf;
@@ -63,6 +63,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   { jcf }
   JcfHelp, JcfSettings,
@@ -123,6 +125,5 @@ begin
 end;
 
 initialization
-  {$I frAsm.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfAsm, JCFOptionAsm, JCFOptionClarify);
 end.
diff --git a/components/jcf2/Ui/Settings/frBlankLines.lrs b/components/jcf2/Ui/Settings/frBlankLines.lrs
deleted file mode 100644
index 4f081b4bb4..0000000000
--- a/components/jcf2/Ui/Settings/frBlankLines.lrs
+++ /dev/null
@@ -1,34 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfBlankLines','FORMDATA',[
-  'TPF0'#241#12'TfBlankLines'#11'fBlankLines'#6'Height'#3#24#1#5'Width'#3'|'#1
-  +#12'ClientHeight'#3#24#1#11'ClientWidth'#3'|'#1#10'DesignLeft'#3#196#1#9'Des'
-  +'ignTop'#3#192#0#0#242#2#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'Height'#2#14#3
-  +'Top'#3#144#0#5'Width'#3#211#0#7'Caption'#6'-Number of returns after the uni'
-  +'t''s final end.'#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#6'Label2'#4'Left'#2
-  +#8#6'Height'#2#14#3'Top'#3#200#0#5'Width'#3#178#0#7'Caption'#6'#Max consecut'
-  +'ive blank lines anwhere'#11'ParentColor'#8#0#0#242#2#2#6'TLabel'#6'Label3'#4
-  +'Left'#2#8#6'Height'#2#14#3'Top'#3#226#0#5'Width'#2'p'#7'Caption'#6#22'Lines'
-  +' before procedure'#11'ParentColor'#8#0#0#242#2#3#9'TSpinEdit'#24'eNumReturn'
-  +'sAfterFinalEnd'#4'Left'#3':'#1#6'Height'#2#21#3'Top'#3#140#0#5'Width'#2'1'#8
-  +'MaxValue'#3#255#0#8'TabOrder'#2#1#0#0#242#2#4#9'TCheckBox'#29'cbRemoveConse'
-  +'cutiveBlankLines'#4'Left'#2#8#6'Height'#2#17#3'Top'#3#176#0#5'Width'#3#169#0
-  +#7'Caption'#6#30'Remove consecutive blank lines'#8'TabOrder'#2#2#0#0#242#2#5
-  +#9'TSpinEdit'#27'edtMaxConsecutiveBlankLines'#4'Left'#3':'#1#6'Height'#2#21#3
-  +'Top'#3#192#0#5'Width'#2'1'#8'MaxValue'#2'c'#8'TabOrder'#2#3#0#0#242#2#6#9'T'
-  +'GroupBox'#18'gbRemoveBlankLines'#4'Left'#2#8#6'Height'#2'~'#3'Top'#2#3#5'Wi'
-  +'dth'#3'n'#1#7'Caption'#6#18'Remove blank lines'#12'ClientHeight'#2'l'#11'Cl'
-  +'ientWidth'#3'j'#1#8'TabOrder'#2#0#0#6'TLabel'#6'Label4'#4'Left'#2#8#6'Heigh'
-  +'t'#2#14#3'Top'#2'Q'#5'Width'#3#209#0#7'Caption'#6'*Max consecutive blank li'
-  +'nes before removal'#11'ParentColor'#8#0#0#9'TCheckBox'#23'cbRemoveBlockBlan'
-  +'kLines'#4'Left'#2#8#6'Height'#2#17#3'Top'#2'6'#5'Width'#3#192#0#7'Caption'#6
-  +'$At start and end of begin..end block'#8'TabOrder'#2#2#0#0#9'TCheckBox!cbRe'
-  +'moveBlankLinesAfterProcHeader'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#31#5'Wid'
-  +'th'#3#132#0#7'Caption'#6#22'After procedure header'#8'TabOrder'#2#1#0#0#9'T'
-  +'CheckBox'#21'cbRemoveVarBlankLines'#4'Left'#2#6#6'Height'#2#17#3'Top'#2#8#5
-  +'Width'#3#136#0#7'Caption'#6#24'In procedure var section'#8'TabOrder'#2#0#0#0
-  +#9'TSpinEdit'#25'edtMaxBlankLinesInSection'#4'Left'#3'2'#1#6'Height'#2#21#3
-  +'Top'#2'N'#5'Width'#2'1'#8'MaxValue'#2'c'#8'TabOrder'#2#3#0#0#0#242#2#7#9'TS'
-  +'pinEdit'#23'edtLinesBeforeProcedure'#4'Left'#3':'#1#6'Height'#2#21#3'Top'#3
-  +#226#0#5'Width'#2'1'#8'MaxValue'#2#9#8'TabOrder'#2#4#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frBlankLines.pas b/components/jcf2/Ui/Settings/frBlankLines.pas
index 943423b91c..c012a29707 100644
--- a/components/jcf2/Ui/Settings/frBlankLines.pas
+++ b/components/jcf2/Ui/Settings/frBlankLines.pas
@@ -30,7 +30,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls, Spin,
+  Classes, Controls, Forms, StdCtrls, Spin,
   { local}
   IDEOptionsIntf;
 
@@ -65,6 +65,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   { delphi }
   Math,
@@ -131,6 +133,5 @@ begin
 end;
 
 initialization
-  {$I frBlankLines.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfBlankLines, JCFOptionBlankLines, JCFOptionClarify);
 end.
diff --git a/components/jcf2/Ui/Settings/frClarify.lrs b/components/jcf2/Ui/Settings/frClarify.lrs
deleted file mode 100644
index f8da23bbe3..0000000000
--- a/components/jcf2/Ui/Settings/frClarify.lrs
+++ /dev/null
@@ -1,19 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-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#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/frClarify.pas b/components/jcf2/Ui/Settings/frClarify.pas
index 0253c98d40..c99406b130 100644
--- a/components/jcf2/Ui/Settings/frClarify.pas
+++ b/components/jcf2/Ui/Settings/frClarify.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls, ExtCtrls,
+  Classes, Controls, Forms, StdCtrls, ExtCtrls,
   { local}
   IDEOptionsIntf;
 
@@ -55,6 +55,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   JcfSettings, JcfHelp, SetClarify;
 
@@ -107,6 +109,5 @@ end;
 {-------------------------------------------------------------------------------
   event handlers }
 initialization
-  {$I frClarify.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfClarify, JCFOptionClarify);
 end.
diff --git a/components/jcf2/Ui/Settings/frClarifyAlign.lrs b/components/jcf2/Ui/Settings/frClarifyAlign.lrs
deleted file mode 100644
index 88d2b19b2f..0000000000
--- a/components/jcf2/Ui/Settings/frClarifyAlign.lrs
+++ /dev/null
@@ -1,42 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfClarifyAlign','FORMDATA',[
-  'TPF0'#241#14'TfClarifyAlign'#13'fClarifyAlign'#6'Height'#3'o'#1#5'Width'#3'J'
-  +#1#12'ClientHeight'#3'o'#1#11'ClientWidth'#3'J'#1#10'DesignLeft'#3#207#2#9'D'
-  +'esignTop'#3'K'#1#0#242#2#0#6'TLabel'#6'Label6'#4'Left'#2#8#6'Height'#2#14#3
-  +'Top'#3#12#1#5'Width'#2'A'#7'Caption'#6#12'Max Variance'#11'ParentColor'#8#0
-  +#0#242#2#1#6'TLabel'#6'Label4'#4'Left'#2#8#6'Height'#2#14#3'Top'#3#240#0#5'W'
-  +'idth'#2';'#7'Caption'#6#10'Max Column'#11'ParentColor'#8#0#0#242#2#2#6'TLab'
-  +'el'#6'Label5'#4'Left'#2#8#6'Height'#2#14#3'Top'#3#212#0#5'Width'#2'7'#7'Cap'
-  +'tion'#6#10'Min Column'#11'ParentColor'#8#0#0#242#2#3#6'TLabel'#6'Label1'#4
-  +'Left'#2#8#6'Height'#2#14#3'Top'#3'H'#1#5'Width'#2'F'#7'Caption'#6#13'Max un'
-  +'aligned'#11'ParentColor'#8#0#0#242#2#4#6'TLabel'#6'Label2'#4'Left'#2#8#6'He'
-  +'ight'#2#14#3'Top'#3'('#1#5'Width'#2'q'#7'Caption'#6#22'Max Variance Interfa'
-  +'ce'#11'ParentColor'#8#0#0#242#2#5#9'TCheckBox'#15'cbInterfaceOnly'#4'Left'#2
-  +#8#6'Height'#2#17#3'Top'#2#6#5'Width'#2'X'#7'Caption'#6#14'Interface Only'#8
-  +'TabOrder'#2#0#0#0#242#2#6#9'TSpinEdit'#14'edtMaxVariance'#4'Left'#3#176#0#6
-  +'Height'#2#21#3'Top'#3#8#1#5'Width'#2'9'#8'MaxValue'#3#231#3#8'MinValue'#2#1
-  +#6'OnExit'#7#16'edtMaxColumnExit'#8'TabOrder'#2#4#5'Value'#2#1#0#0#242#2#7#9
-  +'TSpinEdit'#12'edtMaxColumn'#4'Left'#3#176#0#6'Height'#2#21#3'Top'#3#236#0#5
-  +'Width'#2'9'#8'MaxValue'#3#150#0#6'OnExit'#7#16'edtMaxColumnExit'#8'TabOrder'
-  +#2#3#0#0#242#2#8#9'TSpinEdit'#12'edtMinColumn'#4'Left'#3#176#0#6'Height'#2#21
-  +#3'Top'#3#207#0#5'Width'#2'9'#8'MaxValue'#3#150#0#6'OnExit'#7#16'edtMinColum'
-  +'nExit'#8'TabOrder'#2#2#0#0#242#2#9#9'TGroupBox'#6'gbWhat'#4'Left'#2#8#6'Hei'
-  +'ght'#3#164#0#3'Top'#2#29#5'Width'#3#231#0#7'Caption'#6#13'What to Align'#12
-  +'ClientHeight'#3#146#0#11'ClientWidth'#3#227#0#8'TabOrder'#2#1#0#9'TCheckBox'
-  +#12'cbAlignAsign'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#4#5'Width'#2'1'#7'Capt'
-  +'ion'#6#6'Assign'#8'TabOrder'#2#0#0#0#9'TCheckBox'#12'cbAlignConst'#4'Left'#2
-  +#8#6'Height'#2#17#3'Top'#2#27#5'Width'#2'.'#7'Caption'#6#5'Const'#8'TabOrder'
-  +#2#1#0#0#9'TCheckBox'#10'cbAlignVar'#4'Left'#2#8#6'Height'#2#17#3'Top'#2'2'#5
-  +'Width'#2'_'#7'Caption'#6#16'Var declarations'#8'TabOrder'#2#2#0#0#9'TCheckB'
-  +'ox'#14'cbAlignTypedef'#4'Left'#2#8#6'Height'#2#17#3'Top'#2'`'#5'Width'#2'B'
-  +#7'Caption'#6#9'Type defs'#8'TabOrder'#2#3#0#0#9'TCheckBox'#14'cbAlignCommen'
-  +'t'#4'Left'#2#8#6'Height'#2#17#3'Top'#2'w'#5'Width'#2'?'#7'Caption'#6#7'Comm'
-  +'ent'#8'TabOrder'#2#4#0#0#9'TCheckBox'#12'cbAlignField'#4'Left'#2#8#6'Height'
-  +#2#17#3'Top'#2'I'#5'Width'#2'y'#7'Caption'#6#22'Class and record field'#8'Ta'
-  +'bOrder'#2#5#0#0#0#242#2#10#9'TSpinEdit'#13'eMaxUnaligned'#4'Left'#3#176#0#6
-  +'Height'#2#21#3'Top'#3'B'#1#5'Width'#2'9'#8'MaxValue'#3#231#3#8'TabOrder'#2#5
-  +#0#0#242#2#11#9'TSpinEdit'#23'edtMaxVarianceInterface'#4'Left'#3#176#0#6'Hei'
-  +'ght'#2#21#3'Top'#3'%'#1#5'Width'#2'9'#8'MaxValue'#3#231#3#8'MinValue'#2#1#6
-  +'OnExit'#7#16'edtMaxColumnExit'#8'TabOrder'#2#6#5'Value'#2#1#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frClarifyAlign.pas b/components/jcf2/Ui/Settings/frClarifyAlign.pas
index 9d9706c48f..e1394e7ae7 100644
--- a/components/jcf2/Ui/Settings/frClarifyAlign.pas
+++ b/components/jcf2/Ui/Settings/frClarifyAlign.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls, Spin,
+  Classes, Controls, Forms, StdCtrls, Spin,
   { local}
   IDEOptionsIntf;
 
@@ -75,6 +75,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   JcfSettings, JcfHelp, SetAlign;
 
@@ -178,6 +180,5 @@ begin
 end;
 
 initialization
-  {$I frClarifyAlign.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfClarifyAlign, JCFOptionAlign, JCFOptionClarify);
 end.
diff --git a/components/jcf2/Ui/Settings/frClarifyBlocks.lrs b/components/jcf2/Ui/Settings/frClarifyBlocks.lrs
deleted file mode 100644
index 1987674584..0000000000
--- a/components/jcf2/Ui/Settings/frClarifyBlocks.lrs
+++ /dev/null
@@ -1,54 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfClarifyBlocks','FORMDATA',[
-  'TPF0'#241#15'TfClarifyBlocks'#14'fClarifyBlocks'#6'Height'#3'P'#1#5'Width'#3
-  +'N'#1#12'ClientHeight'#3'P'#1#11'ClientWidth'#3'N'#1#10'DesignLeft'#3#187#2#9
-  +'DesignTop'#3#227#0#0#242#2#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'Height'#2#14
-  +#3'Top'#2#4#5'Width'#3#148#0#7'Caption'#6' Block styles: use a new line at:'
-  +#11'ParentColor'#8#0#0#242#2#1#11'TRadioGroup'#12'rgBlockBegin'#4'Left'#2#8#6
-  +'Height'#2'Y'#3'Top'#2#30#5'Width'#3#149#0#8'AutoFill'#9#7'Caption'#6#16'Blo'
-  +'ck with begin'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBotto'
-  +'mSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResi'
-  +'ze'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'Child'
-  +'Sizing.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'G'#11'ClientWid'
-  +'th'#3#145#0#13'Items.Strings'#1#6#6'Always'#6#11'Leave as is'#6#5'Never'#0#8
-  +'TabOrder'#2#0#0#0#242#2#2#11'TRadioGroup'#7'rgBlock'#4'Left'#3#163#0#6'Heig'
-  +'ht'#2'Y'#3'Top'#2#30#5'Width'#3#162#0#8'AutoFill'#9#7'Caption'#6#19'Block w'
-  +'ithout begin'#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'G'#11'ClientWid'
-  +'th'#3#158#0#13'Items.Strings'#1#6#6'Always'#6#11'Leave as is'#6#5'Never'#0#8
-  +'TabOrder'#2#1#0#0#242#2#3#11'TRadioGroup'#9'rgEndElse'#4'Left'#3#163#0#6'He'
-  +'ight'#2'Y'#3'Top'#2#127#5'Width'#3#162#0#8'AutoFill'#9#7'Caption'#6#20'Betw'
-  +'een end and else'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBo'
-  +'ttomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildR'
-  +'esize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'Ch'
-  +'ildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVerti'
-  +'cal'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTop'
-  +'ToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'G'#11'Clie'
-  +'ntWidth'#3#158#0#13'Items.Strings'#1#6#6'Always'#6#11'Leave as is'#6#5'Neve'
-  +'r'#0#8'TabOrder'#2#3#0#0#242#2#4#11'TRadioGroup'#8'rgElseIf'#4'Left'#2#8#6
-  +'Height'#2'Y'#3'Top'#2#127#5'Width'#3#149#0#8'AutoFill'#9#7'Caption'#6#19'Be'
-  +'tween else and if'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopB'
-  +'ottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChild'
-  +'Resize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'C'
-  +'hildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVert'
-  +'ical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTo'
-  +'pToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'G'#11'Cli'
-  +'entWidth'#3#145#0#13'Items.Strings'#1#6#6'Always'#6#11'Leave as is'#6#5'Nev'
-  +'er'#0#8'TabOrder'#2#2#0#0#242#2#5#11'TRadioGroup'#11'rgElseBegin'#4'Left'#2
-  +#8#6'Height'#2'Y'#3'Top'#3#222#0#5'Width'#3#149#0#8'AutoFill'#9#7'Caption'#6
-  +#10'Else begin'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBotto'
-  +'mSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResi'
-  +'ze'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'Child'
-  +'Sizing.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'G'#11'ClientWid'
-  +'th'#3#145#0#13'Items.Strings'#1#6#6'Always'#6#11'Leave as is'#6#5'Never'#0#8
-  +'TabOrder'#2#4#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frClarifyBlocks.pas b/components/jcf2/Ui/Settings/frClarifyBlocks.pas
index 7db41cd3f8..dc10349352 100644
--- a/components/jcf2/Ui/Settings/frClarifyBlocks.pas
+++ b/components/jcf2/Ui/Settings/frClarifyBlocks.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls, ExtCtrls,
+  Classes, Controls, Forms, StdCtrls, ExtCtrls,
   IDEOptionsIntf;
 
 type
@@ -57,6 +57,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   JcfSettings, SettingsTypes, JcfHelp;
 
@@ -116,6 +118,5 @@ end;
   event handlers }
 
 initialization
-  {$I frClarifyBlocks.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfClarifyBlocks, JCFOptionBlocks, JCFOptionLongLines);
 end.
diff --git a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.lrs b/components/jcf2/Ui/Settings/frClarifyCaseBlocks.lrs
deleted file mode 100644
index 58b08a65af..0000000000
--- a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.lrs
+++ /dev/null
@@ -1,63 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfClarifyCaseBlocks','FORMDATA',[
-  'TPF0'#241#19'TfClarifyCaseBlocks'#18'fClarifyCaseBlocks'#6'Height'#3'Q'#1#5
-  +'Width'#3'Y'#1#12'ClientHeight'#3'Q'#1#11'ClientWidth'#3'Y'#1#10'DesignLeft'
-  +#3#236#1#9'DesignTop'#3'I'#1#0#242#2#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'Hei'
-  +'ght'#2#14#3'Top'#2#4#5'Width'#3#148#0#7'Caption'#6' Block styles: use a new'
-  +' line at:'#11'ParentColor'#8#0#0#242#2#1#11'TRadioGroup'#12'rgLabelBegin'#4
-  +'Left'#2#8#6'Height'#2'Y'#3'Top'#2#30#5'Width'#3#149#0#8'AutoFill'#9#7'Capti'
-  +'on'#6#16'Label with begin'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSiz'
-  +'ing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogen'
-  +'ousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResi'
-  +'ze'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.Sh'
-  +'rinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRig'
-  +'htThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'G'
-  +#11'ClientWidth'#3#145#0#13'Items.Strings'#1#6#6'Always'#6#11'Leave as is'#6
-  +#5'Never'#0#8'TabOrder'#2#0#0#0#242#2#2#11'TRadioGroup'#7'rgLabel'#4'Left'#3
-  +#163#0#6'Height'#2'Y'#3'Top'#2#30#5'Width'#3#170#0#8'AutoFill'#9#7'Caption'#6
-  +#19'Label without begin'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing'
-  +'.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenous'
-  +'ChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'
-  +#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.Shrink'
-  +'Vertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightTh'
-  +'enTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'G'#11
-  +'ClientWidth'#3#166#0#13'Items.Strings'#1#6#6'Always'#6#11'Leave as is'#6#5
-  +'Never'#0#8'TabOrder'#2#1#0#0#242#2#3#11'TRadioGroup'#11'rgCaseLabel'#4'Left'
-  +#3#163#0#6'Height'#2'Y'#3'Top'#2'}'#5'Width'#3#170#0#8'AutoFill'#9#7'Caption'
-  +#6#18'Case without begin'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizin'
-  +'g.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenou'
-  +'sChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'
-  +#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.Shrink'
-  +'Vertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightTh'
-  +'enTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'G'#11
-  +'ClientWidth'#3#166#0#13'Items.Strings'#1#6#6'Always'#6#11'Leave as is'#6#5
-  +'Never'#0#8'TabOrder'#2#3#0#0#242#2#4#11'TRadioGroup'#10'rgElseCase'#4'Left'
-  +#3#163#0#6'Height'#2'Y'#3'Top'#3#220#0#5'Width'#3#170#0#8'AutoFill'#9#7'Capt'
-  +'ion'#6#23'Else case without begin'#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'G'#11'ClientWidth'#3#166#0#13'Items.Strings'#1#6#6'Always'#6#11'Leav'
-  +'e as is'#6#5'Never'#0#8'TabOrder'#2#5#0#0#242#2#5#11'TRadioGroup'#11'rgCase'
-  +'Begin'#4'Left'#2#8#6'Height'#2'Y'#3'Top'#2'}'#5'Width'#3#149#0#8'AutoFill'#9
-  +#7'Caption'#6#15'Case with begin'#28'ChildSizing.LeftRightSpacing'#2#6#28'Ch'
-  +'ildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsH'
-  +'omogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChi'
-  +'ldResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSiz'
-  +'ing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLef'
-  +'tToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeigh'
-  +'t'#2'G'#11'ClientWidth'#3#145#0#13'Items.Strings'#1#6#6'Always'#6#11'Leave '
-  +'as is'#6#5'Never'#0#8'TabOrder'#2#2#0#0#242#2#6#11'TRadioGroup'#15'rgCaseEl'
-  +'seBegin'#4'Left'#2#8#6'Height'#2'Y'#3'Top'#3#220#0#5'Width'#3#149#0#8'AutoF'
-  +'ill'#9#7'Caption'#6#20'Else case with begin'#28'ChildSizing.LeftRightSpacin'
-  +'g'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizonta'
-  +'l'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsH'
-  +'omogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'
-  +#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7
-  +#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'Cl'
-  +'ientHeight'#2'G'#11'ClientWidth'#3#145#0#13'Items.Strings'#1#6#6'Always'#6
-  +#11'Leave as is'#6#5'Never'#0#8'TabOrder'#2#4#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas b/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas
index d3e5ea4ce3..dd16fda8a2 100644
--- a/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas
+++ b/components/jcf2/Ui/Settings/frClarifyCaseBlocks.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls, ExtCtrls,
+  Classes, Controls, Forms, StdCtrls, ExtCtrls,
   { local}
   IDEOptionsIntf;
 
@@ -59,6 +59,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   JcfSettings, SettingsTypes, JcfHelp;
 
@@ -121,6 +123,5 @@ end;
   event handlers }
 
 initialization
-  {$I frClarifyCaseBlocks.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfClarifyCaseBlocks, JCFOptionCaseBlocks, JCFOptionLongLines);
 end.
diff --git a/components/jcf2/Ui/Settings/frClarifyIndent.lrs b/components/jcf2/Ui/Settings/frClarifyIndent.lrs
deleted file mode 100644
index b06e27128c..0000000000
--- a/components/jcf2/Ui/Settings/frClarifyIndent.lrs
+++ /dev/null
@@ -1,44 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfClarifyIndent','FORMDATA',[
-  'TPF0'#241#15'TfClarifyIndent'#14'fClarifyIndent'#6'Height'#3'V'#1#5'Width'#3
-  +#174#1#12'ClientHeight'#3'V'#1#11'ClientWidth'#3#174#1#10'DesignLeft'#3#225#2
-  +#9'DesignTop'#3'+'#1#0#242#2#0#6'TLabel'#6'Label2'#4'Left'#2#4#6'Height'#2#14
-  +#3'Top'#2#6#5'Width'#2'v'#7'Caption'#6#24'Block indentation spaces'#11'Paren'
-  +'tColor'#8#0#0#242#2#1#9'TSpinEdit'#15'edtIndentSpaces'#4'Left'#3#180#0#6'He'
-  +'ight'#2#21#3'Top'#2#4#5'Width'#2'2'#8'MaxValue'#2#12#8'TabOrder'#2#0#0#0#242
-  +#2#2#9'TGroupBox'#9'gbOptions'#4'Left'#2#4#6'Height'#3'6'#1#3'Top'#2' '#5'Wi'
-  +'dth'#3#161#1#7'Caption'#6#7'Options'#12'ClientHeight'#3'$'#1#11'ClientWidth'
-  +#3#157#1#8'TabOrder'#2#1#0#9'TCheckBox'#16'cbIndentBeginEnd'#4'Left'#2#8#6'H'
-  +'eight'#2#17#3'Top'#2#19#5'Width'#3#232#0#7'Caption'#6',Extra indent for beg'
-  +'in/end inside procedures'#7'OnClick'#7#21'cbIndentBeginEndClick'#8'TabOrder'
-  +#2#0#0#0#9'TSpinEdit'#21'eIndentBeginEndSpaces'#4'Left'#3'd'#1#6'Height'#2#21
-  +#3'Top'#2#7#5'Width'#2'2'#8'MaxValue'#2#10#8'MinValue'#2#246#8'TabOrder'#2#1
-  +#0#0#9'TCheckBox'#21'cbHasFirstLevelIndent'#4'Left'#2#8#6'Height'#2#17#3'Top'
-  +#2')'#5'Width'#3#158#0#7'Caption'#6' Different indent for first level'#7'OnC'
-  +'lick'#7#26'cbHasFirstLevelIndentClick'#8'TabOrder'#2#2#0#0#9'TSpinEdit'#17
-  +'eFirstLevelIndent'#4'Left'#3'd'#1#6'Height'#2#21#3'Top'#2'#'#5'Width'#2'2'#8
-  +'TabOrder'#2#3#0#0#9'TCheckBox'#16'cbKeepWithInProc'#4'Left'#2#8#6'Height'#2
-  +#17#3'Top'#2'?'#5'Width'#3#4#1#7'Caption'#6'1Keep single-line comments with '
-  +'code in procedures'#8'TabOrder'#2#4#0#0#9'TCheckBox'#19'cbKeepWithInGlobals'
-  +#4'Left'#2#8#6'Height'#2#17#3'Top'#2'U'#5'Width'#3#239#0#7'Caption'#6'.Keep '
-  +'single-line comments with code in globals'#8'TabOrder'#2#5#0#0#9'TCheckBox'
-  +#20'cbKeepWithInClassDef'#4'Left'#2#8#6'Height'#2#17#3'Top'#2'k'#5'Width'#3
-  +#25#1#7'Caption'#6'8Keep single-line comments with code in class definitions'
-  +#8'TabOrder'#2#6#0#0#9'TCheckBox'#19'cbKeepWithElsewhere'#4'Left'#2#8#6'Heig'
-  +'ht'#2#17#3'Top'#3#129#0#5'Width'#3#244#0#7'Caption'#6'-Keep single-line com'
-  +'ments with code elsewhere'#8'TabOrder'#2#7#0#0#9'TCheckBox'#14'cbIndentIfEl'
-  +'se'#4'Left'#2#8#6'Height'#2#17#3'Top'#3#151#0#5'Width'#3#170#0#7'Caption'#6
-  +'!Extra Indent for If...Else blocks'#8'TabOrder'#2#8#0#0#9'TCheckBox'#16'cbI'
-  +'ndentCaseElse'#4'Left'#2#8#6'Height'#2#17#3'Top'#3#173#0#5'Width'#3#186#0#7
-  +'Caption'#6'#Extra Indent for Case...Else blocks'#8'TabOrder'#2#9#0#0#9'TChe'
-  +'ckBox'#20'cbIndentLibraryProcs'#4'Left'#2#8#6'Height'#2#17#3'Top'#3#195#0#5
-  +'Width'#3#168#0#7'Caption'#6' Indent for procedures in library'#8'TabOrder'#2
-  +#10#0#0#9'TCheckBox'#21'cbIndentProcedureBody'#4'Left'#2#8#6'Height'#2#17#3
-  +'Top'#3#217#0#5'Width'#3#146#0#7'Caption'#6#25'Indent for procedure body'#8
-  +'TabOrder'#2#11#0#0#9'TCheckBox'#19'cbIndentNestedTypes'#4'Left'#2#8#6'Heigh'
-  +'t'#2#17#3'Top'#3#239#0#5'Width'#2't'#7'Caption'#6#19'Indent nested types'#8
-  +'TabOrder'#2#12#0#0#9'TCheckBox'#26'cbIndentVarAndConstInClass'#4'Left'#2#8#6
-  +'Height'#2#17#3'Top'#3#5#1#5'Width'#3#156#0#7'Caption'#6#29'Indent var and c'
-  +'onst in class'#8'TabOrder'#2#13#0#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frClarifyIndent.pas b/components/jcf2/Ui/Settings/frClarifyIndent.pas
index b1f3676b7a..2a20939bc4 100644
--- a/components/jcf2/Ui/Settings/frClarifyIndent.pas
+++ b/components/jcf2/Ui/Settings/frClarifyIndent.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, Forms, LResources, StdCtrls, Spin,
+  Classes, Controls, Forms, StdCtrls, Spin,
   IDEOptionsIntf;
 
 type
@@ -70,6 +70,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   JcfHelp, JcfSettings, SetIndent;
 
@@ -167,6 +169,5 @@ begin
 end;
 
 initialization
-  {$I frClarifyIndent.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfClarifyIndent, JCFOptionIndentation, JCFOptionClarify);
 end.
diff --git a/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.lrs b/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.lrs
deleted file mode 100644
index 309241cfae..0000000000
--- a/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.lrs
+++ /dev/null
@@ -1,21 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfClarifyLongLineBreaker','FORMDATA',[
-  'TPF0'#241#24'TfClarifyLongLineBreaker'#23'fClarifyLongLineBreaker'#6'Height'
-  +#3#194#0#5'Width'#3#181#1#12'ClientHeight'#3#194#0#11'ClientWidth'#3#181#1#0
-  +#242#2#0#6'TLabel'#6'Label3'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#8#5'Width'#2
-  +'I'#7'Caption'#6#15'Max line length'#11'ParentColor'#8#0#0#242#2#1#9'TSpinEd'
-  +'it'#16'edtMaxLineLength'#4'Left'#2't'#6'Height'#2#21#3'Top'#2#3#5'Width'#2
-  +'1'#8'MaxValue'#3#231#3#8'TabOrder'#2#0#0#0#242#2#2#11'TRadioGroup'#18'rgReb'
-  +'reakLongLines'#4'Left'#2#8#6'Height'#2'Y'#3'Top'#2','#5'Width'#3#137#1#8'Au'
-  +'toFill'#9#7'Caption'#6'1&Break lines that are longer than max line length'
-  +#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29
-  +'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizin'
-  +'g.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHori'
-  +'zontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleCh'
-  +'ilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSi'
-  +'zing.ControlsPerLine'#2#1#12'ClientHeight'#2'G'#11'ClientWidth'#3#133#1#9'I'
-  +'temIndex'#2#1#13'Items.Strings'#1#6#6'&Never'#6'-&Sometimes, if a good plac'
-  +'e to break is found'#6'6&Usually, unless there is no acceptable place to br'
-  +'eak'#0#8'TabOrder'#2#1#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas b/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas
index 1fded67a3a..2d6279faaa 100644
--- a/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas
+++ b/components/jcf2/Ui/Settings/frClarifyLongLineBreaker.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls, ExtCtrls, Spin,
+  Classes, Controls, Forms, StdCtrls, ExtCtrls, Spin,
   IDEOptionsIntf;
 
 type
@@ -55,6 +55,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses 
   JcfSettings, SetReturns, JcfHelp;
 
@@ -112,6 +114,5 @@ begin
 end;
 
 initialization
-  {$I frClarifyLongLineBreaker.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfClarifyLongLineBreaker, JCFOptionLongLines, JCFOptionClarify);
 end.
diff --git a/components/jcf2/Ui/Settings/frClarifyReturns.lrs b/components/jcf2/Ui/Settings/frClarifyReturns.lrs
deleted file mode 100644
index 3f4dfa0d01..0000000000
--- a/components/jcf2/Ui/Settings/frClarifyReturns.lrs
+++ /dev/null
@@ -1,38 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfClarifyReturns','FORMDATA',[
-  'TPF0'#241#16'TfClarifyReturns'#15'fClarifyReturns'#6'Height'#3#28#1#5'Width'
-  +#3#197#1#12'ClientHeight'#3#28#1#11'ClientWidth'#3#197#1#10'DesignLeft'#3'3'
-  +#3#9'DesignTop'#3#139#1#0#242#2#0#11'TRadioGroup'#13'rgReturnChars'#4'Left'#2
-  +#8#6'Height'#2'c'#3'Top'#3#174#0#5'Width'#3#182#1#8'AutoFill'#9#7'Caption'#6
-  +#12'Return chars'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBot'
-  +'tomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildRe'
-  +'size'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'Chi'
-  +'ldSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertic'
-  +'al'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopT'
-  +'oBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'Q'#11'Clien'
-  +'tWidth'#3#178#1#13'Items.Strings'#1#6#11'Leave as is'#6'!Convert to Carriag'
-  +'e Return (UNIX)'#6'3Convert to Carriage Return + Linefeed (DOS/Windows)'#0#8
-  +'TabOrder'#2#2#0#0#242#2#1#9'TGroupBox'#15'gbRemoveReturns'#4'Left'#2#8#6'He'
-  +'ight'#3#160#0#4'Hint'#6#8'bgRemove'#3'Top'#2#8#5'Width'#3#202#0#7'Caption'#6
-  +#14'Remove returns'#12'ClientHeight'#3#142#0#11'ClientWidth'#3#198#0#8'TabOr'
-  +'der'#2#0#0#9'TCheckBox'#22'cbRemoveProcDefReturns'#4'Left'#2#8#6'Height'#2
-  +#17#3'Top'#2'='#5'Width'#3#132#0#7'Caption'#6#24'In procedure definitions'#8
-  +'TabOrder'#2#2#0#0#9'TCheckBox'#18'cbRemoveVarReturns'#4'Left'#2#8#6'Height'
-  +#2#17#3'Top'#2'V'#5'Width'#3#130#0#7'Caption'#6#24'In variable declarations'
-  +#8'TabOrder'#2#3#0#0#9'TCheckBox'#19'cbRemoveExprReturns'#4'Left'#2#8#6'Heig'
-  +'ht'#2#17#3'Top'#2'o'#5'Width'#2'X'#7'Caption'#6#14'In expressions'#8'TabOrd'
-  +'er'#2#4#0#0#9'TCheckBox'#23'cbRemovePropertyReturns'#4'Left'#2#8#6'Height'#2
-  +#17#3'Top'#2'$'#5'Width'#2'P'#7'Caption'#6#13'In properties'#8'TabOrder'#2#1
-  +#0#0#9'TCheckBox'#15'cbRemoveReturns'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#12
-  +#5'Width'#2'm'#7'Caption'#6#19'In misc. bad places'#8'TabOrder'#2#0#0#0#0#242
-  +#2#2#9'TGroupBox'#8'gbInsert'#4'Left'#3#216#0#6'Height'#3#161#0#3'Top'#2#7#5
-  +'Width'#3#230#0#7'Caption'#6#14'Insert returns'#12'ClientHeight'#3#143#0#11
-  +'ClientWidth'#3#226#0#8'TabOrder'#2#1#0#9'TCheckBox'#22'cbUsesClauseOnePerLi'
-  +'ne'#4'Left'#2#8#6'Height'#2#17#3'Top'#2''''#5'Width'#3#157#0#7'Caption'#6#29
-  +'One uses clause item per line'#8'TabOrder'#2#1#0#0#9'TCheckBox'#15'cbInsert'
-  +'Returns'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#15#5'Width'#2's'#7'Caption'#6
-  +#20'In misc. good places'#8'TabOrder'#2#0#0#0#9'TCheckBox'#16'cbBreakAfterUs'
-  +'es'#4'Left'#2#8#6'Height'#2#17#3'Top'#2'>'#5'Width'#2'D'#7'Caption'#6#10'Af'
-  +'ter uses'#8'TabOrder'#2#2#0#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frClarifyReturns.pas b/components/jcf2/Ui/Settings/frClarifyReturns.pas
index 300a5a72db..c3dbda47f2 100644
--- a/components/jcf2/Ui/Settings/frClarifyReturns.pas
+++ b/components/jcf2/Ui/Settings/frClarifyReturns.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls, ExtCtrls,
+  Classes, Controls, Forms, StdCtrls, ExtCtrls,
   { local}
   IDEOptionsIntf;
 
@@ -63,6 +63,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   SettingsTypes, JcfSettings, SetReturns, JcfHelp;
 
@@ -128,6 +130,5 @@ begin
 end;
 
 initialization
-  {$I frClarifyReturns.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfClarifyReturns, JCFOptionReturns, JCFOptionLongLines);
 end.
diff --git a/components/jcf2/Ui/Settings/frClarifySpaces.lrs b/components/jcf2/Ui/Settings/frClarifySpaces.lrs
deleted file mode 100644
index 4ccb5b9adb..0000000000
--- a/components/jcf2/Ui/Settings/frClarifySpaces.lrs
+++ /dev/null
@@ -1,97 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-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#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/frClarifySpaces.pas b/components/jcf2/Ui/Settings/frClarifySpaces.pas
index 9a7775eb2d..2e54de5d4b 100644
--- a/components/jcf2/Ui/Settings/frClarifySpaces.pas
+++ b/components/jcf2/Ui/Settings/frClarifySpaces.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls, ExtCtrls, Spin,
+  Classes, Controls, Forms, StdCtrls, ExtCtrls, Spin,
   { local}
   IDEOptionsIntf;
 
@@ -94,6 +94,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   JcfHelp, JcfSettings, SetSpaces, SettingsTypes;
 
@@ -227,6 +229,5 @@ begin
 end;
 
 initialization
-  {$I frClarifySpaces.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfClarifySpaces, JCFOptionSpaces, JCFOptionClarify);
 end.
diff --git a/components/jcf2/Ui/Settings/frComments.lrs b/components/jcf2/Ui/Settings/frComments.lrs
deleted file mode 100644
index 3a777d07c3..0000000000
--- a/components/jcf2/Ui/Settings/frComments.lrs
+++ /dev/null
@@ -1,10 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfComments','FORMDATA',[
-  'TPF0'#241#10'TfComments'#9'fComments'#10'DesignLeft'#3#148#0#9'DesignTop'#3
-  +#150#0#0#242#2#0#9'TCheckBox cbRemoveEmptyDoubleSlashComments'#4'Left'#2#8#6
-  +'Height'#2#17#3'Top'#2#8#5'Width'#3#156#0#7'Caption'#6#26'Remove empty ''//'
-  +''' comments'#8'TabOrder'#2#0#0#0#242#2#1#9'TCheckBox'#31'cbRemoveEmptyCurly'
-  +'BraceComments'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#31#5'Width'#3#161#0#7'Ca'
-  +'ption'#6#27'Remove empty ''{ }'' comments'#8'TabOrder'#2#1#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frComments.pas b/components/jcf2/Ui/Settings/frComments.pas
index 014b5e7d5f..f347169f5f 100644
--- a/components/jcf2/Ui/Settings/frComments.pas
+++ b/components/jcf2/Ui/Settings/frComments.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  StdCtrls, Classes, Controls, LResources, Forms,
+  StdCtrls, Classes, Controls, Forms,
   { local }
   IDEOptionsIntf;
 
@@ -54,6 +54,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   JcfHelp, JcfSettings, SetComments;
 
@@ -97,6 +99,5 @@ begin
 end;
 
 initialization
-  {$I frComments.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfComments, JCFOptionComments, JCFOptionClarify);
 end.
diff --git a/components/jcf2/Ui/Settings/frCompilerDirectReturns.lrs b/components/jcf2/Ui/Settings/frCompilerDirectReturns.lrs
deleted file mode 100644
index 12f53c2a43..0000000000
--- a/components/jcf2/Ui/Settings/frCompilerDirectReturns.lrs
+++ /dev/null
@@ -1,65 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfCompilerDirectReturns','FORMDATA',[
-  'TPF0'#241#23'TfCompilerDirectReturns'#22'fCompilerDirectReturns'#6'Height'#3
-  +#5#1#5'Width'#3#143#1#12'ClientHeight'#3#5#1#11'ClientWidth'#3#143#1#10'Desi'
-  +'gnLeft'#3#139#1#9'DesignTop'#3'%'#1#0#242#2#0#6'TLabel'#6'Label1'#4'Left'#2
-  +#8#6'Height'#2#14#3'Top'#2#4#5'Width'#3#200#0#7'Caption'#6'*Use a new line b'
-  +'efore compiler directives:'#11'ParentColor'#8#0#0#242#2#1#6'TLabel'#6'Label'
-  +'2'#4'Left'#2#8#6'Height'#2#14#3'Top'#3#128#0#5'Width'#3#192#0#7'Caption'#6
-  +')Use a new line after compiler directives:'#11'ParentColor'#8#0#0#242#2#2#11
-  +'TRadioGroup'#12'rgBeforeUses'#4'Left'#2#8#6'Height'#2'Y'#3'Top'#2#30#5'Widt'
-  +'h'#2'u'#8'AutoFill'#9#7'Caption'#6#11'Uses clause'#28'ChildSizing.LeftRight'
-  +'Spacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHor'
-  +'izontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24
-  +'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChi'
-  +'lds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Lay'
-  +'out'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1
-  +#12'ClientHeight'#2'G'#11'ClientWidth'#2'q'#13'Items.Strings'#1#6#6'Always'#6
-  +#11'Leave as is'#6#5'Never'#0#8'TabOrder'#2#0#0#0#242#2#3#11'TRadioGroup'#18
-  +'rgBeforeStatements'#4'Left'#3#131#0#6'Height'#2'Y'#3'Top'#2#30#5'Width'#2'u'
-  +#8'AutoFill'#9#7'Caption'#6#10'Statements'#28'ChildSizing.LeftRightSpacing'#2
-  +#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7
-  +#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomoge'
-  +'nousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'C'
-  +'hildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29
-  +'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'Clien'
-  +'tHeight'#2'G'#11'ClientWidth'#2'q'#13'Items.Strings'#1#6#6'Always'#6#11'Lea'
-  +'ve as is'#6#5'Never'#0#8'TabOrder'#2#1#0#0#242#2#4#11'TRadioGroup'#15'rgBef'
-  +'oreGeneral'#4'Left'#3#254#0#6'Height'#2'Y'#3'Top'#2#30#5'Width'#2'u'#8'Auto'
-  +'Fill'#9#7'Caption'#6#12'Other places'#28'ChildSizing.LeftRightSpacing'#2#6
-  +#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24
-  +'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenou'
-  +'sChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'Chil'
-  +'dSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cc'
-  +'lLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientH'
-  +'eight'#2'G'#11'ClientWidth'#2'q'#13'Items.Strings'#1#6#6'Always'#6#11'Leave'
-  +' as is'#6#5'Never'#0#8'TabOrder'#2#2#0#0#242#2#5#11'TRadioGroup'#14'rgAfter'
-  +'General'#4'Left'#3#254#0#6'Height'#2'Y'#3'Top'#3#154#0#5'Width'#2'u'#8'Auto'
-  +'Fill'#9#7'Caption'#6#12'Other places'#28'ChildSizing.LeftRightSpacing'#2#6
-  +#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24
-  +'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenou'
-  +'sChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'Chil'
-  +'dSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cc'
-  +'lLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientH'
-  +'eight'#2'G'#11'ClientWidth'#2'q'#13'Items.Strings'#1#6#6'Always'#6#11'Leave'
-  +' as is'#6#5'Never'#0#8'TabOrder'#2#3#0#0#242#2#6#11'TRadioGroup'#17'rgAfter'
-  +'Statements'#4'Left'#3#131#0#6'Height'#2'Y'#3'Top'#3#154#0#5'Width'#2'u'#8'A'
-  +'utoFill'#9#7'Caption'#6#10'Statements'#28'ChildSizing.LeftRightSpacing'#2#6
-  +#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24
-  +'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenou'
-  +'sChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'Chil'
-  +'dSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cc'
-  +'lLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientH'
-  +'eight'#2'G'#11'ClientWidth'#2'q'#13'Items.Strings'#1#6#6'Always'#6#11'Leave'
-  +' as is'#6#5'Never'#0#8'TabOrder'#2#4#0#0#242#2#7#11'TRadioGroup'#11'rgAfter'
-  +'Uses'#4'Left'#2#8#6'Height'#2'Y'#3'Top'#3#154#0#5'Width'#2'u'#8'AutoFill'#9
-  +#7'Caption'#6#11'Uses clause'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildS'
-  +'izing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomog'
-  +'enousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildRe'
-  +'size'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.'
-  +'ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToR'
-  +'ightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2
-  +'G'#11'ClientWidth'#2'q'#13'Items.Strings'#1#6#6'Always'#6#11'Leave as is'#6
-  +#5'Never'#0#8'TabOrder'#2#5#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frCompilerDirectReturns.pas b/components/jcf2/Ui/Settings/frCompilerDirectReturns.pas
index 7191f0dabe..f7143d8c1a 100644
--- a/components/jcf2/Ui/Settings/frCompilerDirectReturns.pas
+++ b/components/jcf2/Ui/Settings/frCompilerDirectReturns.pas
@@ -30,7 +30,7 @@ See http://www.gnu.org/licenses/gpl.html
 interface
 
 uses
-  Classes, Graphics, Controls, LResources, Forms, StdCtrls, ExtCtrls,
+  Classes, Graphics, Controls, Forms, StdCtrls, ExtCtrls,
   IDEOptionsIntf;
 
 type
@@ -58,6 +58,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   JcfSettings, SettingsTypes;
 
@@ -112,6 +114,5 @@ begin
 end;
 
 initialization
-  {$I frCompilerDirectReturns.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfCompilerDirectReturns, JCFOptionCompilerDirectives, JCFOptionLongLines);
 end.
diff --git a/components/jcf2/Ui/Settings/frFiles.lrs b/components/jcf2/Ui/Settings/frFiles.lrs
deleted file mode 100644
index 6e208547e0..0000000000
--- a/components/jcf2/Ui/Settings/frFiles.lrs
+++ /dev/null
@@ -1,18 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-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#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/frFiles.pas b/components/jcf2/Ui/Settings/frFiles.pas
index bdf10fe7d7..def4ff9c87 100644
--- a/components/jcf2/Ui/Settings/frFiles.pas
+++ b/components/jcf2/Ui/Settings/frFiles.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  SysUtils, Classes, Controls, LResources, Forms, StdCtrls, Graphics,
+  SysUtils, Classes, Controls, Forms, StdCtrls, Graphics,
   { lazarus }
   IDEOptionsIntf;
 
@@ -57,6 +57,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   { local }
   JcfFileUtils, JcfRegistrySettings, JcfSettings;
@@ -149,6 +151,5 @@ begin
 end;
 
 initialization
-  {$I frFiles.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfFiles, JCFOptionFormatFile);
 end.
diff --git a/components/jcf2/Ui/Settings/frIdentifierCapsSettings.lrs b/components/jcf2/Ui/Settings/frIdentifierCapsSettings.lrs
deleted file mode 100644
index 7b7264bd44..0000000000
--- a/components/jcf2/Ui/Settings/frIdentifierCapsSettings.lrs
+++ /dev/null
@@ -1,15 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfIdentifierCapsSettings','FORMDATA',[
-  'TPF0'#241#24'TfIdentifierCapsSettings'#23'fIdentifierCapsSettings'#6'Height'
-  +#3#230#0#5'Width'#3'n'#1#12'ClientHeight'#3#230#0#11'ClientWidth'#3'n'#1#8'O'
-  +'nResize'#7#11'FrameResize'#10'DesignLeft'#3#144#2#9'DesignTop'#3'F'#1#0#242
-  +#2#0#6'TLabel'#6'Label1'#4'Left'#2'l'#6'Height'#2#14#3'Top'#2#3#5'Width'#3
-  +#177#0#7'Caption'#6'''Set capitalisation on these identifiers'#11'ParentColo'
-  +'r'#8#0#0#242#2#1#9'TCheckBox'#16'cbEnableAnyWords'#4'Left'#2#8#6'Height'#2
-  +#17#3'Top'#2#5#5'Width'#2'2'#7'Caption'#6#6'Enable'#7'Checked'#9#7'OnClick'#7
-  +#21'cbEnableAnyWordsClick'#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#242#2
-  +#2#5'TMemo'#6'mWords'#4'Left'#2#0#6'Height'#3#198#0#3'Top'#2' '#5'Width'#3'n'
-  +#1#5'Align'#7#8'alBottom'#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#1#0#0
-  +#0
-]);
diff --git a/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas b/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas
index f72f804e5e..e1fec724db 100644
--- a/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas
+++ b/components/jcf2/Ui/Settings/frIdentifierCapsSettings.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls,
+  Classes, Controls, Forms, StdCtrls,
   IDEOptionsIntf;
 
 type
@@ -56,6 +56,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses 
   JcfHelp, JcfSettings;
 
@@ -111,6 +113,5 @@ begin
 end;
 
 initialization
-  {$I frIdentifierCapsSettings.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfIdentifierCapsSettings, JCFOptionIdentifiers, JCFOptionObjectPascal);
 end.
diff --git a/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.lrs b/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.lrs
deleted file mode 100644
index 3ccc318ea9..0000000000
--- a/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.lrs
+++ /dev/null
@@ -1,15 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfNotIdentifierCapsSettings','FORMDATA',[
-  'TPF0'#241#27'TfNotIdentifierCapsSettings'#26'fNotIdentifierCapsSettings'#6'H'
-  +'eight'#3#232#0#5'Width'#3#140#1#12'ClientHeight'#3#232#0#11'ClientWidth'#3
-  +#140#1#8'OnResize'#7#11'FrameResize'#10'DesignLeft'#3#177#2#9'DesignTop'#3':'
-  +#2#0#242#2#0#6'TLabel'#6'Label1'#4'Left'#2'l'#6'Height'#2#14#3'Top'#2#3#5'Wi'
-  +'dth'#3#199#0#7'Caption'#6'+Set capitalisation on these non-identifiers'#11
-  +'ParentColor'#8#0#0#242#2#1#9'TCheckBox'#16'cbEnableAnyWords'#4'Left'#2#8#6
-  +'Height'#2#17#3'Top'#2#5#5'Width'#2'2'#7'Caption'#6#6'Enable'#7'Checked'#9#7
-  +'OnClick'#7#21'cbEnableAnyWordsClick'#5'State'#7#9'cbChecked'#8'TabOrder'#2#0
-  +#0#0#242#2#2#5'TMemo'#6'mWords'#4'Left'#2#0#6'Height'#3#198#0#3'Top'#2'"'#5
-  +'Width'#3#140#1#5'Align'#7#8'alBottom'#10'ScrollBars'#7#10'ssVertical'#8'Tab'
-  +'Order'#2#1#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas b/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas
index a500d5ae6f..93c45bc38b 100644
--- a/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas
+++ b/components/jcf2/Ui/Settings/frNotIdentifierCapsSettings.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls,
+  Classes, Controls, Forms, StdCtrls,
   IDEOptionsIntf;
 
 type
@@ -56,6 +56,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses 
   JcfHelp, JcfSettings;
 
@@ -111,6 +113,5 @@ begin
 end;
 
 initialization
-  {$I frNotIdentifierCapsSettings.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfNotIdentifierCapsSettings, JCFOptionNotIdentifiers, JCFOptionObjectPascal);
 end.
diff --git a/components/jcf2/Ui/Settings/frObfuscateSettings.lrs b/components/jcf2/Ui/Settings/frObfuscateSettings.lrs
deleted file mode 100644
index ef7db27fc5..0000000000
--- a/components/jcf2/Ui/Settings/frObfuscateSettings.lrs
+++ /dev/null
@@ -1,28 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-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#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#17#3'Top'#2#8#5'W'
-  +'idth'#2'a'#7'Caption'#6#15'&Obfuscate mode'#8'TabOrder'#2#0#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frObfuscateSettings.pas b/components/jcf2/Ui/Settings/frObfuscateSettings.pas
index cf3c868aa9..e2b092a7dd 100644
--- a/components/jcf2/Ui/Settings/frObfuscateSettings.pas
+++ b/components/jcf2/Ui/Settings/frObfuscateSettings.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls, ExtCtrls,
+  Classes, Controls, Forms, StdCtrls, ExtCtrls,
   { local }
   IDEOptionsIntf;
 
@@ -57,6 +57,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   JcfSettings, SettingsTypes, JcfHelp, SetObfuscate;
 
@@ -110,6 +112,5 @@ begin
 end;
 
 initialization
-  {$I frObfuscateSettings.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfObfuscateSettings, JCFOptionObfuscate);
 end.
diff --git a/components/jcf2/Ui/Settings/frPreProcessor.lrs b/components/jcf2/Ui/Settings/frPreProcessor.lrs
deleted file mode 100644
index e6506f81f4..0000000000
--- a/components/jcf2/Ui/Settings/frPreProcessor.lrs
+++ /dev/null
@@ -1,18 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfPreProcessor','FORMDATA',[
-  'TPF0'#241#14'TfPreProcessor'#13'fPreProcessor'#6'Height'#3#26#1#5'Width'#3
-  +#153#1#12'ClientHeight'#3#26#1#11'ClientWidth'#3#153#1#8'OnResize'#7#11'Fram'
-  +'eResize'#10'DesignLeft'#3's'#2#9'DesignTop'#3'$'#1#0#242#2#0#6'TLabel'#10'l'
-  +'blSymbols'#4'Left'#2#8#6'Height'#2#14#3'Top'#2#30#5'Width'#3#210#0#7'Captio'
-  +'n'#6',Symbols defined for conditional compilation:'#11'ParentColor'#8#0#0
-  +#242#2#1#6'TLabel'#18'lblCompilerOptions'#4'Left'#2#8#6'Height'#2#14#3'Top'#3
-  +#138#0#5'Width'#3#250#0#7'Caption'#6'5Compiler options defined for condition'
-  +'al compilation:'#11'ParentColor'#8#0#0#242#2#2#5'TMemo'#8'mSymbols'#4'Left'
-  +#2#8#6'Height'#2'O'#3'Top'#2'2'#5'Width'#3'l'#1#10'ScrollBars'#7#10'ssVertic'
-  +'al'#8'TabOrder'#2#1#0#0#242#2#3#9'TCheckBox'#8'cbEnable'#4'Left'#2#8#6'Heig'
-  +'ht'#2#17#3'Top'#2#6#5'Width'#3#154#0#7'Caption'#6#27'Enable preprocessor pa'
-  +'rsing'#7'Checked'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#242#2#4#5'T'
-  +'Memo'#8'mOptions'#4'Left'#2#8#6'Height'#2'O'#3'Top'#3#158#0#5'Width'#3'l'#1
-  +#10'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#2#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frPreProcessor.pas b/components/jcf2/Ui/Settings/frPreProcessor.pas
index f06deaddb4..ea37f64b81 100644
--- a/components/jcf2/Ui/Settings/frPreProcessor.pas
+++ b/components/jcf2/Ui/Settings/frPreProcessor.pas
@@ -31,7 +31,7 @@ interface
 { preprocessor symbols }
 
 uses
-  Classes, Controls, LResources, Forms, StdCtrls,
+  Classes, Controls, Forms, StdCtrls,
   IDEOptionsIntf;
 
 type
@@ -57,6 +57,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses 
   JcfHelp, JcfSettings;
 
@@ -124,6 +126,5 @@ begin
 end;
 
 initialization
-  {$I frPreProcessor.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfPreProcessor, JCFOptionPreProcessor);
 end.
diff --git a/components/jcf2/Ui/Settings/frReplace.lrs b/components/jcf2/Ui/Settings/frReplace.lrs
deleted file mode 100644
index 34c080e516..0000000000
--- a/components/jcf2/Ui/Settings/frReplace.lrs
+++ /dev/null
@@ -1,13 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfReplace','FORMDATA',[
-  'TPF0'#241#9'TfReplace'#8'fReplace'#6'Height'#3'f'#1#5'Width'#3#144#1#12'Clie'
-  +'ntHeight'#3'f'#1#11'ClientWidth'#3#144#1#8'OnResize'#7#11'FrameResize'#10'D'
-  +'esignLeft'#3'1'#1#9'DesignTop'#3#198#0#0#242#2#0#6'TLabel'#11'lblWordList'#4
-  +'Left'#2#8#6'Height'#2#14#3'Top'#2'#'#5'Width'#2'/'#7'Caption'#6#10'Word lis'
-  +'t:'#11'ParentColor'#8#0#0#242#2#1#9'TCheckBox'#8'cbEnable'#4'Left'#2#8#6'He'
-  +'ight'#2#17#3'Top'#2#6#5'Width'#3#130#0#7'Caption'#6#23'Enable find and repl'
-  +'ace'#7'OnClick'#7#13'cbEnableClick'#8'TabOrder'#2#0#0#0#242#2#2#5'TMemo'#6
-  +'mWords'#4'Left'#2#0#6'Height'#3'-'#1#3'Top'#2'6'#5'Width'#3#143#1#7'Anchors'
-  +#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'TabOrder'#2#1#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frReplace.pas b/components/jcf2/Ui/Settings/frReplace.pas
index 6e56767798..e7f0497c07 100644
--- a/components/jcf2/Ui/Settings/frReplace.pas
+++ b/components/jcf2/Ui/Settings/frReplace.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls,
+  Classes, Controls, Forms, StdCtrls,
   { local }
   IDEOptionsIntf;
 
@@ -57,6 +57,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses 
   JcfHelp, JcfSettings;
 
@@ -119,6 +121,5 @@ begin
 end;
 
 initialization
-  {$I frReplace.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfReplace, JCFOptionFindAndReplace, JCFOptionClarify);
 end.
diff --git a/components/jcf2/Ui/Settings/frReservedCapsSettings.lrs b/components/jcf2/Ui/Settings/frReservedCapsSettings.lrs
deleted file mode 100644
index 38f5faef48..0000000000
--- a/components/jcf2/Ui/Settings/frReservedCapsSettings.lrs
+++ /dev/null
@@ -1,58 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfrReservedCapsSettings','FORMDATA',[
-  'TPF0'#241#23'TfrReservedCapsSettings'#22'frReservedCapsSettings'#6'Height'#3
-  +'g'#1#5'Width'#3'E'#1#12'ClientHeight'#3'g'#1#11'ClientWidth'#3'E'#1#10'Desi'
-  +'gnLeft'#3#222#0#9'DesignTop'#3#200#0#0#242#2#0#9'TCheckBox'#8'cbEnable'#4'L'
-  +'eft'#2#8#6'Height'#2#17#3'Top'#2#6#5'Width'#3#130#0#7'Caption'#6#25'Enable '
-  +'fix capitalisation'#7'Checked'#9#7'OnClick'#7#13'cbEnableClick'#5'State'#7#9
-  +'cbChecked'#8'TabOrder'#2#0#0#0#242#2#1#11'TRadioGroup'#15'rgReservedWords'#4
-  +'Left'#2#8#6'Height'#2'j'#3'Top'#2#26#5'Width'#3#150#0#8'AutoFill'#9#7'Capti'
-  +'on'#6#14'Reserved words'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizin'
-  +'g.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenou'
-  +'sChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'
-  +#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.Shrink'
-  +'Vertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightTh'
-  +'enTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'X'#11
-  +'ClientWidth'#3#146#0#9'ItemIndex'#2#1#13'Items.Strings'#1#6#12'ALL CAPITALS'
-  +#6#13'all lowercase'#6#10'Mixed Case'#6#11'Leave alone'#0#8'TabOrder'#2#1#0#0
-  +#242#2#2#11'TRadioGroup'#11'rgOperators'#4'Left'#3#164#0#6'Height'#2'j'#3'To'
-  +'p'#2#26#5'Width'#3#150#0#8'AutoFill'#9#7'Caption'#6#9'Operators'#28'ChildSi'
-  +'zing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSiz'
-  +'ing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.Enlarg'
-  +'eVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7
-  +#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'C'
-  +'hildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Contr'
-  +'olsPerLine'#2#1#12'ClientHeight'#2'X'#11'ClientWidth'#3#146#0#9'ItemIndex'#2
-  +#1#13'Items.Strings'#1#6#12'ALL CAPITALS'#6#13'all lowercase'#6#10'Mixed Cas'
-  +'e'#6#11'Leave alone'#0#8'TabOrder'#2#2#0#0#242#2#3#11'TRadioGroup'#7'rgType'
-  +'s'#4'Left'#2#8#6'Height'#2'j'#3'Top'#3#248#0#5'Width'#3#150#0#8'AutoFill'#9
-  +#7'Caption'#6#5'Types'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.T'
-  +'opBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousCh'
-  +'ildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28
-  +'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVer'
-  +'tical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenT'
-  +'opToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'X'#11'Cl'
-  +'ientWidth'#3#146#0#9'ItemIndex'#2#1#13'Items.Strings'#1#6#12'ALL CAPITALS'#6
-  +#13'all lowercase'#6#10'Mixed Case'#6#11'Leave alone'#0#8'TabOrder'#2#5#0#0
-  +#242#2#4#11'TRadioGroup'#11'rgConstants'#4'Left'#3#164#0#6'Height'#2'j'#3'To'
-  +'p'#3#138#0#5'Width'#3#150#0#8'AutoFill'#9#7'Caption'#6#9'Constants'#28'Chil'
-  +'dSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'Child'
-  +'Sizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.Enl'
-  +'argeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizonta'
-  +'l'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'
-  +#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.C'
-  +'ontrolsPerLine'#2#1#12'ClientHeight'#2'X'#11'ClientWidth'#3#146#0#9'ItemInd'
-  +'ex'#2#1#13'Items.Strings'#1#6#12'ALL CAPITALS'#6#13'all lowercase'#6#10'Mix'
-  +'ed Case'#6#11'Leave alone'#0#8'TabOrder'#2#4#0#0#242#2#5#11'TRadioGroup'#12
-  +'rgDirectives'#4'Left'#2#8#6'Height'#2'j'#3'Top'#3#138#0#5'Width'#3#150#0#8
-  +'AutoFill'#9#7'Caption'#6#10'Directives'#28'ChildSizing.LeftRightSpacing'#2#6
-  +#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24
-  +'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenou'
-  +'sChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'Chil'
-  +'dSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cc'
-  +'lLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientH'
-  +'eight'#2'X'#11'ClientWidth'#3#146#0#9'ItemIndex'#2#1#13'Items.Strings'#1#6
-  +#12'ALL CAPITALS'#6#13'all lowercase'#6#10'Mixed Case'#6#11'Leave alone'#0#8
-  +'TabOrder'#2#3#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frReservedCapsSettings.pas b/components/jcf2/Ui/Settings/frReservedCapsSettings.pas
index 34da594bcc..d37d091f5b 100644
--- a/components/jcf2/Ui/Settings/frReservedCapsSettings.pas
+++ b/components/jcf2/Ui/Settings/frReservedCapsSettings.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls, ExtCtrls,
+  Classes, Controls, Forms, StdCtrls, ExtCtrls,
   { local }
   IDEOptionsIntf;
 
@@ -59,6 +59,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses 
   SettingsTypes, JcfHelp, JcfSettings;
 
@@ -121,6 +123,5 @@ begin
 end;
 
 initialization
-  {$I frReservedCapsSettings.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfrReservedCapsSettings, JCFOptionObjectPascal, JCFOptionClarify);
 end.
diff --git a/components/jcf2/Ui/Settings/frTransform.lrs b/components/jcf2/Ui/Settings/frTransform.lrs
deleted file mode 100644
index 39ec3240ae..0000000000
--- a/components/jcf2/Ui/Settings/frTransform.lrs
+++ /dev/null
@@ -1,44 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfTransform','FORMDATA',[
-  'TPF0'#241#11'TfTransform'#10'fTransform'#6'Height'#3';'#1#5'Width'#3#156#1#12
-  +'ClientHeight'#3';'#1#11'ClientWidth'#3#156#1#10'DesignLeft'#3#132#1#9'Desig'
-  +'nTop'#3#201#0#0#242#2#0#9'TCheckBox'#20'cbBlockEndSemicolons'#4'Left'#2#8#6
-  +'Height'#2#17#3'Top'#2'p'#5'Width'#3#234#0#7'Caption'#6'/Put &semicolons aft'
-  +'er last statement in a block'#8'TabOrder'#2#0#0#0#242#2#1#11'TRadioGroup'#10
-  +'rbBeginEnd'#4'Left'#2#8#6'Height'#2']'#3'Top'#2#4#5'Width'#3#139#1#8'AutoFi'
-  +'ll'#9#7'Caption'#6'3Add or Remove &begin and end from single statements'#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'K'#11'ClientWidth'#3#135#1#13'I'
-  +'tems.Strings'#1#6'&Add begin and end to single statements'#6#25'Leave begin'
-  +' and end as is'#6'2Remove begin and end from around single statements'#0#8
-  +'TabOrder'#2#1#0#0#242#2#2#9'TGroupBox'#10'bgSortUses'#4'Left'#2#8#6'Height'
-  +#3#171#0#3'Top'#3#139#0#5'Width'#3#218#0#7'Caption'#6#18'Sort &uses clauses'
-  +#12'ClientHeight'#3#153#0#11'ClientWidth'#3#214#0#8'TabOrder'#2#2#0#9'TCheck'
-  +'Box'#19'cbSortInterfaceUses'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#7#5'Width'
-  +#2'm'#7'Caption'#6#20'Sort i&nterface uses'#8'TabOrder'#2#0#0#0#9'TCheckBox'
-  +#24'cbSortImplementationUses'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#30#5'Width'
-  +#3#138#0#7'Caption'#6#25'Sort i&mplementation uses'#8'TabOrder'#2#1#0#0#9'TC'
-  +'heckBox'#24'cbBreakUsesSortOnComment'#4'Left'#2#8#6'Height'#2#17#3'Top'#2'c'
-  +#5'Width'#2'j'#7'Caption'#6#17'Break on &comment'#8'TabOrder'#2#2#0#0#9'TChe'
-  +'ckBox'#23'cbBreakUsesSortOnReturn'#4'Left'#2#8#6'Height'#2#17#3'Top'#2'L'#5
-  +'Width'#2']'#7'Caption'#6#16'Break on &return'#8'TabOrder'#2#3#0#0#9'TCheckB'
-  +'ox'#12'cbNoComments'#4'Left'#2#8#6'Height'#2#17#3'Top'#2'z'#5'Width'#3#129#0
-  +#7'Caption'#6#21'Only with no comments'#8'TabOrder'#2#4#0#0#9'TCheckBox'#17
-  +'cbSortProgramUses'#4'Left'#2#8#6'Height'#2#17#3'Top'#2'5'#5'Width'#2'j'#7'C'
-  +'aption'#6#18'Sort &program uses'#8'TabOrder'#2#5#0#0#0#242#2#3#11'TRadioGro'
-  +'up'#15'rgUsesSortOrder'#4'Left'#3#231#0#6'Height'#2'r'#3'Top'#3#139#0#5'Wid'
-  +'th'#3#172#0#8'AutoFill'#9#7'Caption'#6#16'Uses sort &order'#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'`'#11'ClientWidth'#3#168#0#13'Items.Strings'
-  +#1#6#10'Alphabetic'#6#18'Reverse Alphabetic'#6#19'Shortest to longest'#6#19
-  +'Longest to shortest'#0#8'TabOrder'#2#3#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frTransform.pas b/components/jcf2/Ui/Settings/frTransform.pas
index 869b2fb615..46f2e9776f 100644
--- a/components/jcf2/Ui/Settings/frTransform.pas
+++ b/components/jcf2/Ui/Settings/frTransform.pas
@@ -30,7 +30,7 @@ See http://www.gnu.org/licenses/gpl.html
 interface
 
 uses
-  Classes, Graphics, Controls, LResources, Forms, StdCtrls, ExtCtrls,
+  Classes, Graphics, Controls, Forms, StdCtrls, ExtCtrls,
   { local }
   IDEOptionsIntf;
 
@@ -61,6 +61,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses 
   SettingsTypes, JcfSettings, JcfHelp, SetTransform;
 
@@ -127,6 +129,5 @@ begin
 end;
 
 initialization
-  {$I frTransform.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfTransform, JCFOptionTransform, JCFOptionClarify);
 end.
diff --git a/components/jcf2/Ui/Settings/frUnitCaps.lrs b/components/jcf2/Ui/Settings/frUnitCaps.lrs
deleted file mode 100644
index 654ad59b61..0000000000
--- a/components/jcf2/Ui/Settings/frUnitCaps.lrs
+++ /dev/null
@@ -1,13 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfrUnitNameCaps','FORMDATA',[
-  'TPF0'#241#15'TfrUnitNameCaps'#14'frUnitNameCaps'#5'Width'#3'j'#1#11'ClientWi'
-  +'dth'#3'j'#1#8'OnResize'#7#11'FrameResize'#10'DesignLeft'#3#238#1#9'DesignTo'
-  +'p'#3#229#0#0#242#2#0#6'TLabel'#6'Label1'#4'Left'#2'l'#6'Height'#2#14#3'Top'
-  +#2#3#5'Width'#3#182#0#7'Caption'#6'&Set capitalisation on these unit names'
-  +#11'ParentColor'#8#0#0#242#2#1#5'TMemo'#6'mWords'#4'Left'#2#0#6'Height'#3#211
-  +#0#3'Top'#2#29#5'Width'#3'j'#1#5'Align'#7#8'alBottom'#10'ScrollBars'#7#10'ss'
-  +'Vertical'#8'TabOrder'#2#1#0#0#242#2#2#9'TCheckBox'#16'cbEnableAnyWords'#4'L'
-  +'eft'#2#8#6'Height'#2#17#3'Top'#2#5#5'Width'#2'2'#7'Caption'#6#6'Enable'#7'C'
-  +'hecked'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#0#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frUnitCaps.pas b/components/jcf2/Ui/Settings/frUnitCaps.pas
index 4b618c101c..9045a45faf 100644
--- a/components/jcf2/Ui/Settings/frUnitCaps.pas
+++ b/components/jcf2/Ui/Settings/frUnitCaps.pas
@@ -29,7 +29,7 @@ See http://www.gnu.org/licenses/gpl.html
 interface
 
 uses
-  Classes, Controls, LResources, Forms, StdCtrls,
+  Classes, Controls, Forms, StdCtrls,
   IDEOptionsIntf;
 
 type
@@ -53,6 +53,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   JcfSettings;
 
@@ -106,6 +108,5 @@ begin
 end;
 
 initialization
-  {$I frUnitCaps.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfrUnitNameCaps, JCFOptionUnitName, JCFOptionObjectPascal);
 end.
diff --git a/components/jcf2/Ui/Settings/frUses.lrs b/components/jcf2/Ui/Settings/frUses.lrs
deleted file mode 100644
index 57eb54b75a..0000000000
--- a/components/jcf2/Ui/Settings/frUses.lrs
+++ /dev/null
@@ -1,24 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfUses','FORMDATA',[
-  'TPF0'#241#6'TfUses'#5'fUses'#6'Height'#3'='#1#5'Width'#3#163#1#12'ClientHeig'
-  +'ht'#3'='#1#11'ClientWidth'#3#163#1#10'DesignLeft'#3#133#1#9'DesignTop'#3#253
-  +#0#0#242#2#0#9'TCheckBox'#15'cbRemoveEnabled'#4'Left'#2#8#6'Height'#2#17#3'T'
-  +'op'#2#4#5'Width'#2'9'#7'Caption'#6#6'Remove'#7'OnClick'#7#20'cbRemoveEnable'
-  +'dClick'#8'TabOrder'#2#0#0#0#242#2#1#9'TCheckBox'#17'cbInsertInterface'#4'Le'
-  +'ft'#2#8#6'Height'#2#17#3'Top'#2'l'#5'Width'#2't'#7'Caption'#6#21'Insert int'
-  +'o Interface'#7'OnClick'#7#22'cbInsertInterfaceClick'#8'TabOrder'#2#2#0#0#242
-  +#2#2#9'TCheckBox'#22'cbInsertImplementation'#4'Left'#3#180#0#6'Height'#2#17#3
-  +'Top'#2'l'#5'Width'#3#145#0#7'Caption'#6#26'Insert into Implementation'#7'On'
-  +'Click'#7#27'cbInsertImplementationClick'#8'TabOrder'#2#4#0#0#242#2#3#9'TChe'
-  +'ckBox'#13'cbFindReplace'#4'Left'#2#8#6'Height'#2#17#3'Top'#3#212#0#5'Width'
-  +#2'8'#7'Caption'#6#7'Replace'#7'OnClick'#7#18'cbFindReplaceClick'#8'TabOrder'
-  +#2#6#0#0#242#2#4#5'TMemo'#7'mRemove'#4'Left'#2#8#6'Height'#2'F'#3'Top'#2#24#5
-  +'Width'#3#160#0#8'TabOrder'#2#1#0#0#242#2#5#5'TMemo'#16'mInsertInterface'#4
-  +'Left'#2#8#6'Height'#2'F'#3'Top'#3#128#0#5'Width'#3#160#0#8'TabOrder'#2#3#0#0
-  +#242#2#6#5'TMemo'#5'mFind'#4'Left'#2#8#6'Height'#2'F'#3'Top'#3#232#0#5'Width'
-  +#3#160#0#8'TabOrder'#2#7#0#0#242#2#7#5'TMemo'#21'mInsertImplementation'#4'Le'
-  +'ft'#3#180#0#6'Height'#2'F'#3'Top'#3#128#0#5'Width'#3#160#0#13'Lines.Strings'
-  +#1#6#0#0#8'TabOrder'#2#5#0#0#242#2#8#5'TMemo'#8'mReplace'#4'Left'#3#180#0#6
-  +'Height'#2'F'#3'Top'#3#232#0#5'Width'#3#160#0#8'TabOrder'#2#8#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frUses.pas b/components/jcf2/Ui/Settings/frUses.pas
index 489dd04d16..04f8269eaa 100644
--- a/components/jcf2/Ui/Settings/frUses.pas
+++ b/components/jcf2/Ui/Settings/frUses.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  Classes, Controls, LResources, Forms, StdCtrls,
+  Classes, Controls, Forms, StdCtrls,
   { local }
   IDEOptionsIntf;
 
@@ -65,6 +65,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   JcfHelp, JcfSettings;
 
@@ -152,6 +154,5 @@ begin
 end;
 
 initialization
-  {$I frUses.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfUses, JCFOptionUses, JCFOptionFindAndReplace);
 end.
diff --git a/components/jcf2/Ui/Settings/frWarnings.lrs b/components/jcf2/Ui/Settings/frWarnings.lrs
deleted file mode 100644
index 52307cc8a0..0000000000
--- a/components/jcf2/Ui/Settings/frWarnings.lrs
+++ /dev/null
@@ -1,15 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfWarnings','FORMDATA',[
-  'TPF0'#241#10'TfWarnings'#9'fWarnings'#6'Height'#3#255#0#12'ClientHeight'#3
-  +#255#0#8'OnResize'#7#11'FrameResize'#10'DesignLeft'#3#254#0#9'DesignTop'#3
-  +#175#0#0#242#2#0#6'TLabel'#6'Label1'#4'Left'#2#8#6'Height'#2#14#3'Top'#2'<'#5
-  +'Width'#3#168#0#7'Caption'#6' &Ignore unused parameters named:'#12'FocusCont'
-  +'rol'#7#19'mIgnoreUnusedParams'#11'ParentColor'#8#0#0#242#2#1#9'TCheckBox'#12
-  +'cbWarningsOn'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#8#5'Width'#2'P'#7'Caption'
-  +#6#12'&Warnings On'#8'TabOrder'#2#0#0#0#242#2#2#9'TCheckBox'#18'cbWarnUnused'
-  +'Params'#4'Left'#2#8#6'Height'#2#17#3'Top'#2#31#5'Width'#3#140#0#7'Caption'#6
-  +#23'Warn &unused parameters'#8'TabOrder'#2#1#0#0#242#2#3#5'TMemo'#19'mIgnore'
-  +'UnusedParams'#4'Left'#2#8#6'Height'#3#153#0#3'Top'#2'S'#5'Width'#3#227#0#10
-  +'ScrollBars'#7#10'ssVertical'#8'TabOrder'#2#2#0#0#0
-]);
diff --git a/components/jcf2/Ui/Settings/frWarnings.pas b/components/jcf2/Ui/Settings/frWarnings.pas
index cd52af6de5..7de40b576f 100644
--- a/components/jcf2/Ui/Settings/frWarnings.pas
+++ b/components/jcf2/Ui/Settings/frWarnings.pas
@@ -31,7 +31,7 @@ interface
 
 uses
   { delphi }
-  StdCtrls, Classes, Controls, LResources, Forms,
+  StdCtrls, Classes, Controls, Forms,
   { local }
   IDEOptionsIntf;
 
@@ -57,6 +57,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   JcfHelp, JcfSettings;
 
@@ -113,6 +115,5 @@ begin
 end;
 
 initialization
-  {$I frWarnings.lrs}
   RegisterIDEOptionsEditor(JCFOptionsGroup, TfWarnings, JCFOptionWarnings, JCFOptionClarify);
 end.
diff --git a/components/jcf2/Ui/fAbout.lrs b/components/jcf2/Ui/fAbout.lrs
deleted file mode 100644
index 3221187b17..0000000000
--- a/components/jcf2/Ui/fAbout.lrs
+++ /dev/null
@@ -1,361 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TfrmAboutBox','FORMDATA',[
-  'TPF0'#12'TfrmAboutBox'#11'frmAboutBox'#4'Left'#3'F'#1#6'Height'#3#189#1#3'To'
-  +'p'#3#235#0#5'Width'#3#227#1#11'BorderStyle'#7#8'bsDialog'#7'Caption'#6#22'A'
-  +'bout JEDI Code Format'#12'ClientHeight'#3#189#1#11'ClientWidth'#3#227#1#12
-  +'Font.CharSet'#7#12'ANSI_CHARSET'#11'Font.Height'#2#241#9'Font.Name'#6#8'Seg'
-  +'oe UI'#10'KeyPreview'#9#8'OnCreate'#7#10'FormCreate'#7'OnKeyUp'#7#9'FormKey'
-  +'Up'#8'OnResize'#7#10'FormResize'#8'Position'#7#14'poScreenCenter'#10'LCLVer'
-  +'sion'#6#6'0.9.27'#0#7'TBitBtn'#4'bbOK'#4'Left'#3#191#0#6'Height'#2'%'#3'Top'
-  +#3#143#1#5'Width'#2'd'#7'Caption'#6#3'&OK'#7'Default'#9#4'Kind'#7#4'bkOK'#11
-  +'ModalResult'#2#1#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#6'TPanel'#9'pnlClient'
-  +#4'Left'#2#0#6'Height'#3#137#1#3'Top'#2#0#5'Width'#3#227#1#5'Align'#7#5'alTo'
-  +'p'#10'BevelInner'#7#8'bvRaised'#10'BevelOuter'#7#9'bvLowered'#12'ClientHeig'
-  +'ht'#3#137#1#11'ClientWidth'#3#227#1#8'TabOrder'#2#0#0#6'TImage'#13'imgOpenS'
-  +'ource'#6'Cursor'#7#11'crHandPoint'#4'Left'#2#11#6'Height'#3#139#0#3'Top'#2
-  +#21#5'Width'#3#133#0#6'Center'#9#7'OnClick'#7#18'imgOpenSourceClick'#12'Pict'
-  +'ure.Data'#10#130'.'#0#0#7'TBitmapv.'#0#0'BMv.'#0#0#0#0#0#0'6'#4#0#0'('#0#0#0
-  +'g'#0#0#0'h'#0#0#0#1#0#8#0#0#0#0#0'@*'#0#0#0#0#0#0#0#0#0#0#0#1#0#0#0#1#0#0#0
-  +#0#0#0#0#128#128#0#128#0#128#0#128#128#0#0#192#192#192#0#128'@'#0#0#255#0'@'
-  +#0#0'@'#128#0#255#255#255#0#128#255#255#0#255#128#128#0'@'#128#255#0#128#128
-  +#128#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#8#8#8#8#8#8#0#0#0#0#0#0#0
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#0#0#0#0#0#0#0#0#0#0#0#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#0#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#0#8#8#8#0#0#0#0#0#0#0#0#0#0#0#0#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#0#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#0#0#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#8#8#8#8#0#0#0#0#0#0#8#8#8#0#0#8#8#8#0#0#0#0#0#8#8#8
-  +#8#0#0#0#0#0#8#8#8#0#0#8#0#0#8#8#8#8#8#8#8#8#8#0#0#0#0#0#0#0#8#8#0#0#0#0#8#8
-  +#8#8#0#0#0#0#0#8#8#8#0#0#0#0#0#0#0#8#0#0#8#8#0#8#8#0#0#0#0#0#8#8#8#8#8#0#0#0
-  +#0#0#8#8#8#8#0#0#0#8#8#0#0#8#8#0#0#8#8#0#0#8#8#8#0#0#8#8#0#0#8#8#8#0#0#8#0#0
-  +#8#8#0#0#8#8#8#8#8#8#8#8#0#0#8#8#8#0#0#8#8#0#0#8#8#0#0#8#8#0#0#8#8#8#0#0#8#0
-  +#0#8#8#8#0#0#8#8#0#0#8#8#0#8#0#0#0#0#0#8#8#8#8#8#8#8#0#0#0#0#0#8#8#8#0#0#8#8
-  +#8#0#0#8#8#0#0#8#8#0#0#8#8#8#8#8#8#8#0#0#8#8#8#8#8#8#0#0#8#8#0#0#8#8#8#8#8#8
-  +#8#8#0#0#8#8#8#0#0#8#8#8#8#8#8#0#0#8#8#0#0#8#8#8#8#8#8#0#0#8#8#8#0#0#8#8#0#0
-  +#8#8#0#8#0#0#0#0#8#8#8#8#8#8#8#8#8#0#0#0#0#8#8#8#0#0#8#8#8#0#0#8#8#0#0#8#8#0
-  +#0#0#0#0#0#0#8#8#0#0#8#8#8#8#8#8#0#0#8#8#0#0#8#8#8#8#8#8#8#8#0#0#8#8#8#0#0#8
-  +#8#8#0#0#0#0#8#8#8#0#0#8#8#8#8#8#8#0#0#8#8#8#0#0#8#8#0#0#8#8#0#0#0#0#0#0#8#8
-  +#8#8#8#8#8#8#8#0#0#0#0#8#8#8#0#0#8#8#8#0#0#8#8#0#0#8#8#0#0#8#8#8#0#0#8#8#0#0
-  ,#8#8#8#8#8#8#0#0#8#8#0#0#0#0#0#0#0#8#8#8#8#0#0#0#0#0#0#8#8#0#0#8#8#8#8#8#8#0
-  +#0#8#8#8#8#8#8#8#0#0#0#0#0#0#8#8#0#0#8#8#0#0#0#0#0#8#8#8#8#8#8#8#8#8#8#8#0#0
-  +#0#0#8#8#0#0#0#8#8#0#0#8#8#0#0#8#8#0#0#8#8#8#0#0#8#8#0#0#8#8#8#0#0#8#0#0#8#8
-  +#0#0#8#8#8#8#0#0#8#8#0#0#8#8#8#0#0#8#8#0#0#8#8#0#0#8#8#0#0#8#8#8#0#0#8#0#0#8
-  +#8#8#0#0#8#8#0#0#8#8#0#0#0#0#0#8#8#8#8#8#8#8#8#8#8#8#0#0#0#0#8#8#0#0#0#0#0#0
-  +#8#8#8#0#0#8#8#8#0#0#0#0#0#8#8#8#8#0#0#0#0#0#8#0#0#0#0#8#0#0#8#8#8#8#8#0#0#8
-  +#8#0#0#0#0#0#8#8#8#8#0#0#0#0#8#8#8#8#0#0#0#0#0#8#8#8#0#0#0#0#0#8#8#8#0#0#8#8
-  +#0#0#0#0#0#8#8#8#8#8#8#8#8#8#8#8#0#0#0#0#8#8#0#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#0#8#8#0#0#8#8#8#8#8#0#0#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#0#8#8#0#0#0#0#0#8#8#8#8#8
-  +#8#8#8#8#8#8#0#0#0#0#8#8#0#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#0#0#8#8#0#0#8#8#8#8#0#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#0#8#8#0#0#0#0#0#8#8#8#8#8#8#8#8#8#8#8#0#0#0#0
-  +#8#8#0#0#8#8#8#8#8#8#8#0#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#0
-  +#0#0#0#0#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#0#0#8#8#0#0#0#0#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#0
-  +#0#0#0#8#8#8#8#8#8#8#8#8#8#8#0#0#0#0#8#8#5#0#0#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#0#0#0#0#8#8#8#8#8#8#8
-  +#8#8#8#8#0#0#0#0#8#8#5#5#0#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#0#0#0#0#8#8#8#8#8#8#8#8#8#8#8#0#0#0#0#8#8
-  +#5#5#0#4#8#4#4#8#8#8#8#8#8#4#4#12#4#8#8#8#8#8#4#4#4#8#8#8#4#4#8#8#8#8#8#4#4
-  +#12#4#8#8#8#8#8#8#4#4#4#4#8#8#8#8#8#4#12#8#8#4#8#8#8#4#8#8#8#8#8#8#4#12#4#8#8
-  +#8#8#8#4#12#4#8#8#0#0#0#0#0#8#8#8#8#8#8#8#8#8#8#8#0#0#0#0#8#8#5#0#5#12#0#0#0
-  +#5#4#8#8#4#3#0#0#0#0#0#12#8#8#4#0#5#0#8#8#12#0#0#12#8#8#4#12#0#0#5#0#5#4#8#8
-  +#8#12#0#0#0#0#12#8#8#8#7#0#5#0#4#0#12#8#12#5#8#8#8#8#4#5#0#5#0#12#8#8#4#5#0#5
-  +#0#0#4#0#0#0#0#0#8#8#8#8#8#8#8#8#8#8#8#0#0#0#0#8#8#5#5#0#0#5#5#5#0#5#8#8#5#0
-  +#0#3#12#5#0#0#12#8#8#0#0#5#8#8#12#0#0#12#8#8#5#0#4#8#8#4#12#0#8#8#4#0#12#8#8
-  +#12#0#4#8#4#0#12#8#8#12#0#4#8#12#5#8#8#8#8#5#7#8#8#4#0#12#8#5#5#4#8#8#12#0#0
-  +#0#0#0#0#8#8#8#8#8#8#8#8#8#8#8#0#0#0#0#8#8#5#0#5#12#8#4#0#5#0#4#4#0#5#5#8#8#8
-  +#4#8#8#8#4#5#0#5#4#8#12#0#0#12#8#12#0#8#8#8#8#8#8#0#4#8#12#7#8#8#8#8#3#12#8#4
-  +#5#8#8#8#4#0#4#8#12#5#8#8#8#4#0#4#8#8#8#12#12#4#0#4#8#8#8#8#4#0#0#0#0#0#8#8#8
-  +#8#8#8#8#8#8#8#8#0#0#0#0#8#8#5#5#0#12#8#8#7#0#0#4#4#0#0#5#5#2#5#2#5#2#4#8#0#5
-  +#0#8#8#12#0#0#12#8#12#12#8#8#8#8#8#8#0#12#8#5#12#8#8#8#8#12#5#8#12#5#8#8#8#8
-  +#0#4#8#4#5#8#8#8#12#5#8#8#8#8#8#8#12#5#4#4#4#4#4#4#0#8#0#0#0#0#8#8#8#8#8#8#8
-  +#8#8#0#0#0#0#0#8#8#5#0#0#4#8#8#3#5#0#4#12#0#0#5#12#12#12#0#5#0#4#8#0#5#0#8#8
-  +#12#0#5#12#8#8#8#8#8#8#8#4#5#5#4#8#5#12#8#8#8#8#12#5#8#12#5#8#8#8#8#5#4#8#4#5
-  +#8#8#8#4#5#8#8#8#8#8#8#4#0#0#0#0#0#0#0#0#8#0#0#0#0#8#8#8#8#8#8#8#8#8#0#0#0#0
-  +#8#8#8#5#0#0#12#8#4#0#0#0#4#4#5#0#5#8#8#4#0#5#5#8#4#0#0#0#12#4#5#0#0#12#8#8#8
-  +#4#12#5#0#0#5#4#8#8#12#5#8#8#8#8#7#12#8#4#5#8#8#8#8#0#4#8#12#0#8#8#8#4#0#4#8
-  +#8#8#4#8#4#5#8#4#8#8#4#0#0#8#0#0#0#0#0#8#8#8#8#8#8#8#0#0#0#0#0#8#8#8#5#0#0#0
-  +#0#0#0#0#2#8#8#12#0#5#5#12#5#0#0#12#8#8#0#5#0#0#0#0#0#0#12#8#8#12#5#0#12#12#4
-  +#8#8#8#8#4#0#12#8#8#12#0#4#8#12#5#8#8#8#8#0#4#8#12#0#12#8#4#8#5#7#8#8#4#0#12
-  +#8#5#12#8#8#8#12#3#0#8#8#0#0#0#0#0#8#8#8#8#8#0#0#0#0#0#8#8#8#8#5#0#0#12#5#0#0
-  +#5#4#8#8#8#12#0#0#0#0#0#12#8#8#4#0#0#1#12#0#0#0#5#8#8#8#0#12#8#8#8#8#8#8#8#8
-  +#8#12#0#5#5#0#12#8#8#4#5#8#8#8#8#0#4#8#12#12#5#5#5#8#4#5#0#5#0#3#4#8#4#5#0#5
-  +#0#5#4#0#8#8#0#0#0#0#0#0#0#0#0#0#0#0#0#0#0#8#8#8#8#8#4#8#8#8#4#4#8#8#8#8#8#8
-  +#8#4#4#4#8#8#8#8#8#8#4#8#8#4#4#4#8#8#8#4#0#4#8#8#8#8#4#7#8#8#8#8#4#12#12#4#8
-  +#8#8#8#4#8#8#8#8#4#8#8#8#4#4#12#4#8#8#8#4#12#4#8#8#8#8#8#4#12#4#8#8#0#8#8#8#0
-  +#0#0#0#0#0#0#0#0#0#0#0#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#0#12#8#8#8#8#12#5#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#0#0#0#0#0#0#0#0#0
-  +#0#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#4#0#0#12#5#0#0#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#0#0#0#0#0#0#0#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#12#12#12#4
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4
-  ,#4#10#10#10#6#10#6#2#10#10#10#4#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#10#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#10#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#10#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#4#10#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#10#4#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#10#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#10#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#10#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#10#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#10#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#10#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#10#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#10#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#10#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#10#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#10#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#10#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#10
-  ,#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#4#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#8#8#8#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#10#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#8#8#8#8#8#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8
-  +#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#10#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#10#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#8#8#4#10#6#6#6#6#6#6#6#8#8#8#8#8#8#8#2#6#6#6#6#6#6
-  +#2#10#8#8#6#6#10#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#10#8#8#8#8#4#10#6#6#6#4#8#8#8#8#8#8#8#4#6#6#6#10#4#4#8#8#8#4#6#6#10
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#10#8#8#8
-  +#8#8#8#8#4#10#8#8#8#8#8#8#8#8#8#10#4#8#8#8#8#8#8#8#10#6#6#10#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#4#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#10#6#6#6#4
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#6#6#6#6#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#10#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#2#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#10#6#6#6#10#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#10#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#10#6#6#6#4#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#10#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#10#4#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#10#6#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#10#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#11#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#11#11#4#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#4#11#11#11#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#11#11#11#11#9#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8
-  ,#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#6#6#6#6#6#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#9#4#8#8#8#8#8#8#4#11#11#11
-  +#11#11#8#8#8#8#8#8#8#4#9#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#10#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6
-  +#6#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#11#11#11#4#8#8#8#8#11#11#11#11#11#11#9#8#8
-  +#8#4#11#11#11#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#11#11#11#11#11#11#4#9#11#11#11#11#11#11#11#4#11#11
-  +#11#11#11#11#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#10#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#4#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11
-  +#11#11#11#11#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11
-  +#11#11#11#11#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11
-  +#11#11#11#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#10#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#4#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11
-  +#11#11#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11
-  +#11#11#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#10#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#6#8#8#8#8#8#8#8
-  +#8#4#8#8#8#8#8#8#8#8#8#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11
-  +#11#11#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#2#6#6#6#6#6#6#6#6#6#6#6#6#6#6#10#8#8#8#8#8#4
-  +#10#6#6#4#8#8#8#8#8#8#4#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11
-  +#11#11#11#11#11#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#6#6#6#6#6#6#6#6#6#6#6#6#6#4#8#8#4#10#6
-  +#6#6#6#6#10#8#8#8#8#4#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11
-  +#11#11#11#11#11#11#11#11#11#4#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#2#6#6#6#6#6#6#6#6#6#6#4#10
-  +#6#6#6#6#6#6#6#6#6#4#8#9#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11
-  +#11#11#11#11#11#11#11#11#11#11#11#11#11#11#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#10#6#6#6#6
-  +#6#6#6#6#6#6#6#6#6#6#6#6#6#6#10#4#8#4#11#11#11#11#11#11#11#11#11#11#11#11#11
-  +#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#9#8#8#8#8#8#8#8#8#8#8#8#0
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#4#10#10#6#6#6#6#6#6#6#6#10#10#4#4#8#8#8#8#8#8#4#11#11#11#11#11#11#11
-  +#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#4#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#11#11#11#11
-  +#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#4#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#11#11
-  +#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#11#11#11
-  +#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#11#11#11
-  +#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#11#11#11#11
-  +#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#4#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#11#11#11#11
-  +#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#11#11#11#11
-  +#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#11#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  ,#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#11#11#11#11#11
-  +#11#4#4#11#11#11#11#11#11#11#8#9#11#11#11#11#11#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#11#11#11#4#8#8#8#8
-  +#11#11#11#11#11#11#4#8#8#8#8#4#11#11#11#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#4#8#8#8#8#8#8#8#4#11#11#11
-  +#11#11#8#8#8#8#8#8#8#8#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#11#11#11#11#4#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#11#11#11#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#0#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#8#8#8#8#8#8#8#8#8#11#11#4#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8#8
-  +#8#0#0#0#6'TLabel'#10'hlHomePage'#6'Cursor'#7#11'crHandPoint'#4'Left'#2#11#6
-  +'Height'#2#17#3'Top'#3'3'#1#5'Width'#2'T'#7'Caption'#6#10'hlHomePage'#12'Fon'
-  +'t.CharSet'#7#12'ANSI_CHARSET'#10'Font.Color'#7#7'clBlack'#11'Font.Height'#2
-  +#241#9'Font.Name'#6#8'Segoe UI'#11'ParentColor'#8#10'ParentFont'#8#8'WordWra'
-  +'p'#9#7'OnClick'#7#15'hlHomePageClick'#12'OnMouseEnter'#7#16'lblMPLMouseEnte'
-  +'r'#12'OnMouseLeave'#7#16'lblMPLMouseLeave'#0#0#6'TLabel'#6'lblMPL'#6'Cursor'
-  +#7#11'crHandPoint'#4'Left'#2#11#6'Height'#2'"'#3'Top'#3#3#1#5'Width'#3#198#1
-  +#7'Caption'#6'zThis program is open source software. It is released under th'
-  +'e Mozilla '#13#10'Public licence (MPL).  http://www.mozilla.org/MPL'#11'Par'
-  +'entColor'#8#7'OnClick'#7#11'lblMPLClick'#12'OnMouseEnter'#7#16'lblMPLMouseE'
-  +'nter'#12'OnMouseLeave'#7#16'lblMPLMouseLeave'#0#0#5'TMemo'#8'mWarning'#4'Le'
-  +'ft'#2#11#6'Height'#2'F'#3'Top'#3#183#0#5'Width'#3#206#1#5'Color'#7#9'clBtnF'
-  +'ace'#13'Lines.Strings'#1#6'?This program is still under development.  In sp'
-  +'ite of thorough '#6'>testing and removal of reported bugs, no guarantees ar'
-  +'e given.'#6'?Please make backups, or better yet use a source control system'
-  +'.'#0#8'ReadOnly'#9#8'TabOrder'#2#0#0#0#5'TMemo'#5'mWhat'#4'Left'#3#151#0#6
-  +'Height'#3#166#0#3'Top'#2#11#5'Width'#3'I'#1#13'Lines.Strings'#1#6#17'Versio'
-  +'n %VERSION%'#6#6'%DATE%'#6#0#6')This program attempts to standardise and '#6
-  +'''make readable the layout of any Delphi '#6#26'Object-Pascal source code.'
-  +#6#0#6'"Copyright Anthony Steele 1999-2008'#0#8'ReadOnly'#9#8'TabOrder'#2#1#0
-  +#0#0#0
-]);
diff --git a/components/jcf2/Ui/fAbout.pas b/components/jcf2/Ui/fAbout.pas
index ef23e96122..d90bdbe51c 100644
--- a/components/jcf2/Ui/fAbout.pas
+++ b/components/jcf2/Ui/fAbout.pas
@@ -60,6 +60,8 @@ implementation
 
 {$ifndef FPC}
   {$R *.dfm}
+{$else}
+  {$R *.lfm}
 {$endif}
 
 uses
@@ -67,7 +69,7 @@ uses
   {$ifndef fpc}
     Windows, ShellAPI, URLMon,
   {$else}
-    LResources, LCLIntf,
+    LCLIntf,
   {$endif}
   { local }
   JcfVersionConsts, JcfHelp, JcfFontSetFunctions, JcfStringUtils;
@@ -159,9 +161,4 @@ begin
   TLabel(Sender).Font.Style := [];
 end;
 
-{$ifdef fpc}
-initialization
-  {$I fAbout.lrs}
-{$endif}
-
 end.
diff --git a/components/jcf2/Ui/fJcfErrorDisplay.lrs b/components/jcf2/Ui/fJcfErrorDisplay.lrs
deleted file mode 100644
index 193a4f9f7c..0000000000
--- a/components/jcf2/Ui/fJcfErrorDisplay.lrs
+++ /dev/null
@@ -1,13 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TExceptionDialog','FORMDATA',[
-  'TPF0'#16'TExceptionDialog'#15'ExceptionDialog'#4'Left'#3'&'#1#6'Height'#3#180
-  +#0#3'Top'#3#195#0#5'Width'#3#164#1#11'BorderIcons'#11#12'biSystemMenu'#0#7'C'
-  +'aption'#6#13'JCF Exception'#12'ClientHeight'#3#180#0#11'ClientWidth'#3#164#1
-  +#12'Font.CharSet'#7#12'ANSI_CHARSET'#11'Font.Height'#2#241#9'Font.Name'#6#8
-  +'Segoe UI'#8'OnCreate'#7#10'FormCreate'#8'OnResize'#7#10'FormResize'#10'LCLV'
-  +'ersion'#6#6'0.9.27'#0#7'TButton'#5'btnOk'#4'Left'#3#155#0#6'Height'#2'"'#3
-  +'Top'#3#133#0#5'Width'#2'd'#7'Caption'#6#3'&OK'#7'Default'#9#7'OnClick'#7#10
-  +'btnOkClick'#8'TabOrder'#2#0#0#0#5'TMemo'#17'mExceptionMessage'#4'Left'#2#0#6
-  +'Height'#2'|'#3'Top'#2#0#5'Width'#3#153#1#8'ReadOnly'#9#8'TabOrder'#2#1#0#0#0
-]);
diff --git a/components/jcf2/Ui/fJcfErrorDisplay.pas b/components/jcf2/Ui/fJcfErrorDisplay.pas
index bd4e885285..d21f6fd621 100644
--- a/components/jcf2/Ui/fJcfErrorDisplay.pas
+++ b/components/jcf2/Ui/fJcfErrorDisplay.pas
@@ -58,11 +58,12 @@ implementation
 
 uses
   { local }
-  ParseError, JcfStringUtils, JcfFontSetFunctions
-  {$ifdef fpc}, LResources{$endif};
+  ParseError, JcfStringUtils, JcfFontSetFunctions;
 
 {$ifndef FPC}
   {$R *.dfm}
+{$else}
+  {$R *.lfm}
 {$endif}
 
 procedure ShowExceptionDialog(const pE: Exception);
@@ -166,9 +167,4 @@ begin
   mExceptionMessage.Height := ClientHeight - (btnOk.Height + (PAD * 3));
 end;
 
-initialization
-{$ifdef FPC}
-  {$I fJcfErrorDisplay.lrs}
-{$endif}
-
 end.