diff --git a/.gitattributes b/.gitattributes
index 40241d8224..a58cd413f5 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2070,7 +2070,6 @@ components/tachart/demo/axis/main.pas svneol=native#text/pascal
 components/tachart/demo/basic/demo.lpi svneol=native#text/plain
 components/tachart/demo/basic/demo.lpr svneol=native#text/plain
 components/tachart/demo/basic/unit1.lfm svneol=native#text/plain
-components/tachart/demo/basic/unit1.lrs svneol=native#text/pascal
 components/tachart/demo/basic/unit1.pas svneol=native#text/plain
 components/tachart/demo/chartsource/chartsourcedemo.lpi svneol=native#text/plain
 components/tachart/demo/chartsource/chartsourcedemo.lpr svneol=native#text/plain
diff --git a/components/tachart/demo/basic/demo.lpi b/components/tachart/demo/basic/demo.lpi
index 32ba6bf4fa..354ed5f6c0 100644
--- a/components/tachart/demo/basic/demo.lpi
+++ b/components/tachart/demo/basic/demo.lpi
@@ -4,13 +4,19 @@
     <PathDelim Value="\"/>
     <Version Value="7"/>
     <General>
+      <Flags>
+        <LRSInOutputDirectory Value="False"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
       <TargetFileExt Value=""/>
       <Title Value="TChart basic demo"/>
+      <ResourceType Value="res"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
+      <Language Value="0403"/>
+      <CharSet Value="04E2"/>
     </VersionInfo>
     <PublishOptions>
       <Version Value="2"/>
diff --git a/components/tachart/demo/basic/unit1.lfm b/components/tachart/demo/basic/unit1.lfm
index a5b17e8f76..afad4170d2 100644
--- a/components/tachart/demo/basic/unit1.lfm
+++ b/components/tachart/demo/basic/unit1.lfm
@@ -17,18 +17,18 @@ object Form1: TForm1
       item
         Alignment = calLeft
         Grid.Color = clGray
-        Offset = 0
-        Scale = 1
         Title.Font.Height = -11
         Title.Font.Name = 'MS Sans Serif'
+        Transformation.Offset = 0
+        Transformation.Scale = 1
       end    
       item
         Alignment = calBottom
         Grid.Color = clGray
-        Offset = 0
-        Scale = 1
         Title.Font.Height = -11
         Title.Font.Name = 'MS Sans Serif'
+        Transformation.Offset = 0
+        Transformation.Scale = 1
       end>
     Foot.Brush.Color = clBtnFace
     Foot.Font.Color = clRed
diff --git a/components/tachart/demo/basic/unit1.lrs b/components/tachart/demo/basic/unit1.lrs
deleted file mode 100644
index 042104b570..0000000000
--- a/components/tachart/demo/basic/unit1.lrs
+++ /dev/null
@@ -1,90 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TForm1','FORMDATA',[
-  'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'U'#1#6'Height'#3#238#1#3'Top'#3#225#0#5'W'
-  +'idth'#3'I'#2#7'Caption'#6#5'Form1'#12'ClientHeight'#3#238#1#11'ClientWidth'
-  +#3'I'#2#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.29'#0#6'TCha'
-  +'rt'#6'Chart1'#4'Left'#2#0#6'Height'#3#136#1#3'Top'#2#0#5'Width'#3'I'#2#8'Ax'
-  +'isList'#14#1#9'Alignment'#7#7'calLeft'#10'Grid.Color'#7#6'clGray'#6'Offset'
-  +#5#0#0#0#0#0#0#0#0#0#0#5'Scale'#5#0#0#0#0#0#0#0#128#255'?'#17'Title.Font.Hei'
-  +'ght'#2#245#15'Title.Font.Name'#6#13'MS Sans Serif'#0#1#9'Alignment'#7#9'cal'
-  +'Bottom'#10'Grid.Color'#7#6'clGray'#6'Offset'#5#0#0#0#0#0#0#0#0#0#0#5'Scale'
-  +#5#0#0#0#0#0#0#0#128#255'?'#17'Title.Font.Height'#2#245#15'Title.Font.Name'#6
-  +#13'MS Sans Serif'#0#0#16'Foot.Brush.Color'#7#9'clBtnFace'#15'Foot.Font.Colo'
-  +'r'#7#5'clRed'#16'Foot.Font.Height'#2#243#14'Foot.Font.Name'#6#13'MS Sans Se'
-  +'rif'#15'Foot.Font.Style'#11#6'fsBold'#0#17'Foot.Text.Strings'#1#6#25'This a'
-  +' LeftAligned Footer'#0#18'Legend.Font.Height'#2#245#16'Legend.Font.Name'#6
-  +#13'MS Sans Serif'#17'Title.Brush.Color'#7#9'clBtnFace'#16'Title.Font.Color'
-  +#7#6'clBlue'#17'Title.Font.Height'#2#245#15'Title.Font.Name'#6#13'MS Sans Se'
-  +'rif'#18'Title.Text.Strings'#1#6#20'Centered Chart Title'#0#13'Title.Visible'
-  +#9#5'Align'#7#8'alClient'#11'ParentColor'#8#0#5'TLine'#13'Chart1LineHor'#9'P'
-  +'en.Style'#7#6'psDash'#8'Position'#5#0#0#0#0#0#0#0#0#0#0#11'SeriesColor'#7#7
-  +'clBlack'#12'ShowInLegend'#8#0#0#5'TLine'#14'Chart1LineVert'#9'LineStyle'#7
-  +#10'lsVertical'#9'Pen.Style'#7#6'psDash'#8'Position'#5#0#0#0#0#0#0#0#0#0#0#11
-  +'SeriesColor'#7#7'clBlack'#12'ShowInLegend'#8#0#0#0#6'TPanel'#6'Panel1'#4'Le'
-  +'ft'#2#0#6'Height'#2'f'#3'Top'#3#136#1#5'Width'#3'I'#2#5'Align'#7#8'alBottom'
-  +#12'ClientHeight'#2'f'#11'ClientWidth'#3'I'#2#8'TabOrder'#2#0#0#6'TLabel'#6
-  +'lblAdd'#4'Left'#2#13#6'Height'#2#14#3'Top'#2#10#5'Width'#2#24#7'Caption'#6#4
-  +'Add:'#11'ParentColor'#8#0#0#6'TLabel'#8'lblClear'#4'Left'#2#13#6'Height'#2
-  +#14#3'Top'#2'('#5'Width'#2#30#7'Caption'#6#6'Clear:'#11'ParentColor'#8#0#0#6
-  +'TLabel'#11'lblAddCount'#4'Left'#3' '#1#6'Height'#2#14#3'Top'#2#8#5'Width'#2
-  +':'#7'Caption'#6#12'Multiple add'#11'ParentColor'#8#0#0#6'TLabel'#12'lblMark'
-  +'Style'#4'Left'#2'0'#6'Height'#2#14#3'Top'#2'P'#5'Width'#2'N'#7'Caption'#6#15
-  +'Add with marks:'#11'ParentColor'#8#0#0#6'TLabel'#11'lblReticule'#4'Left'#3
-  +'h'#1#6'Height'#2#14#3'Top'#2'P'#5'Width'#2'+'#7'Caption'#6#9'Reticule:'#11
-  +'ParentColor'#8#0#0#7'TButton'#9'btnAddPie'#4'Left'#2'0'#6'Height'#2#24#3'To'
-  +'p'#2#8#5'Width'#2'('#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'Pie'#7
-  +'OnClick'#7#14'btnAddPieClick'#8'TabOrder'#2#0#0#0#7'TButton'#10'btnAddLine'
-  +#4'Left'#3#192#0#6'Height'#2#24#3'Top'#2#8#5'Width'#2'('#25'BorderSpacing.In'
-  +'nerBorder'#2#4#7'Caption'#6#4'Line'#7'OnClick'#7#15'btnAddLineClick'#8'TabO'
-  +'rder'#2#1#0#0#7'TButton'#10'btnAddArea'#4'Left'#2'`'#6'Height'#2#24#3'Top'#2
-  +#8#5'Width'#2'('#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#4'Area'#7'On'
-  +'Click'#7#15'btnAddAreaClick'#8'TabOrder'#2#2#0#0#7'TButton'#9'btnAddBar'#4
-  +'Left'#3#144#0#6'Height'#2#24#3'Top'#2#8#5'Width'#2'('#25'BorderSpacing.Inne'
-  +'rBorder'#2#4#7'Caption'#6#3'Bar'#7'OnClick'#7#14'btnAddBarClick'#8'TabOrder'
-  +#2#3#0#0#9'TCheckBox'#8'cbLegend'#4'Left'#3#128#1#6'Height'#2#17#3'Top'#2#8#5
-  +'Width'#2'7'#7'Caption'#6#6'Legend'#8'OnChange'#7#14'cbLegendChange'#8'TabOr'
-  +'der'#2#4#0#0#9'TCheckBox'#12'cbBottomAxis'#4'Left'#3#128#1#6'Height'#2#17#3
-  +'Top'#2#24#5'Width'#2'M'#7'Caption'#6#11'Bottom Axis'#7'Checked'#9#8'OnChang'
-  +'e'#7#18'cbBottomAxisChange'#5'State'#7#9'cbChecked'#8'TabOrder'#2#5#0#0#9'T'
-  +'CheckBox'#10'cbLeftAxis'#4'Left'#3#128#1#6'Height'#2#17#3'Top'#2'('#5'Width'
-  +#2'>'#7'Caption'#6#9'Left Axis'#7'Checked'#9#8'OnChange'#7#16'cbLeftAxisChan'
-  +'ge'#5'State'#7#9'cbChecked'#8'TabOrder'#2#6#0#0#9'TCheckBox'#7'cbTitle'#4'L'
-  +'eft'#3#240#1#6'Height'#2#17#3'Top'#2#8#5'Width'#2'('#7'Caption'#6#5'Title'#7
-  +'Checked'#9#8'OnChange'#7#13'cbTitleChange'#5'State'#7#9'cbChecked'#8'TabOrd'
-  +'er'#2#7#0#0#9'TCheckBox'#8'cbFooter'#4'Left'#3#240#1#6'Height'#2#17#3'Top'#2
-  +#24#5'Width'#2'4'#7'Caption'#6#6'Footer'#8'OnChange'#7#14'cbFooterChange'#8
-  +'TabOrder'#2#8#0#0#9'TCheckBox'#10'cbInverted'#4'Left'#3#240#1#6'Height'#2#17
-  +#3'Top'#2'('#5'Width'#2'>'#7'Caption'#6#8'Inverted'#8'OnChange'#7#16'cbInver'
-  +'tedChange'#8'TabOrder'#2#9#0#0#7'TButton'#11'btnClearBar'#4'Left'#3#144#0#6
-  +'Height'#2#24#3'Top'#2'&'#5'Width'#2'('#25'BorderSpacing.InnerBorder'#2#4#7
-  +'Caption'#6#3'Bar'#7'OnClick'#7#16'btnClearBarClick'#8'TabOrder'#2#10#0#0#7
-  +'TButton'#12'btnClearArea'#4'Left'#2'`'#6'Height'#2#24#3'Top'#2'&'#5'Width'#2
-  +'('#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#4'Area'#7'OnClick'#7#17'b'
-  +'tnClearAreaClick'#8'TabOrder'#2#11#0#0#7'TButton'#12'btnClearLine'#4'Left'#3
-  +#192#0#6'Height'#2#24#3'Top'#2'&'#5'Width'#2'('#25'BorderSpacing.InnerBorder'
-  +#2#4#7'Caption'#6#4'Line'#7'OnClick'#7#17'btnClearLineClick'#8'TabOrder'#2#12
-  +#0#0#7'TButton'#11'btnClearPie'#4'Left'#2'0'#6'Height'#2#24#3'Top'#2'&'#5'Wi'
-  ,'dth'#2'('#25'BorderSpacing.InnerBorder'#2#4#7'Caption'#6#3'Pie'#7'OnClick'#7
-  +#16'btnClearPieClick'#8'TabOrder'#2#13#0#0#9'TSpinEdit'#10'edAddCount'#4'Lef'
-  +'t'#3' '#1#6'Height'#2#21#3'Top'#2#24#5'Width'#2'Z'#8'MaxValue'#4'@B'#15#0#8
-  +'MinValue'#2#1#8'TabOrder'#2#14#5'Value'#2#1#0#0#9'TCheckBox'#18'cbShowGridC'
-  +'heckBox'#4'Left'#3#128#1#6'Height'#2#17#3'Top'#2'8'#5'Width'#2'F'#7'Caption'
-  +#6#10'Show grid '#7'Checked'#9#8'OnChange'#7#24'cbShowGridCheckBoxChange'#5
-  +'State'#7#9'cbChecked'#8'TabOrder'#2#15#0#0#9'TCheckBox'#16'cbShowAxisTitles'
-  +#4'Left'#3#240#1#6'Height'#2#17#3'Top'#2'8'#5'Width'#2'B'#7'Caption'#6#11'Ax'
-  +'is titles'#8'OnChange'#7#22'cbShowAxisTitlesChange'#8'TabOrder'#2#16#0#0#9
-  +'TComboBox'#11'cbMarkStyle'#4'Left'#3#132#0#6'Height'#2#21#3'Top'#2'L'#5'Wid'
-  +'th'#3#136#0#10'ItemHeight'#2#13#9'ItemIndex'#2#5#13'Items.Strings'#1#6#9'sm'
-  +'sCustom'#6#7'smsNone'#6#8'smsValue'#6#10'smsPercent'#6#8'smsLabel'#6#15'sms'
-  +'LabelPercent'#6#13'smsLabelValue'#6#9'smsLegend'#6#15'smsPercentTotal'#6#20
-  +'smsLabelPercentTotal'#6#9'smsXValue'#0#5'Style'#7#14'csDropDownList'#8'TabO'
-  +'rder'#2#17#4'Text'#6#15'smsLabelPercent'#0#0#9'TComboBox'#10'cbReticule'#4
-  +'Left'#3#160#1#6'Height'#2#21#3'Top'#2'L'#5'Width'#3#136#0#10'ItemHeight'#2
-  +#13#9'ItemIndex'#2#0#13'Items.Strings'#1#6#6'rmNone'#6#10'rmVertical'#6#12'r'
-  +'mHorizontal'#6#7'rmCross'#0#8'OnChange'#7#16'cbReticuleChange'#5'Style'#7#14
-  +'csDropDownList'#8'TabOrder'#2#18#4'Text'#6#6'rmNone'#0#0#7'TButton'#11'btnC'
-  +'learAll'#4'Left'#3#240#0#6'Height'#2#24#3'Top'#2'&'#5'Width'#2'('#25'Border'
-  +'Spacing.InnerBorder'#2#4#7'Caption'#6#3'All'#7'OnClick'#7#16'btnClearAllCli'
-  +'ck'#8'TabOrder'#2#19#0#0#0#0
-]);
diff --git a/components/tachart/demo/basic/unit1.pas b/components/tachart/demo/basic/unit1.pas
index c54e274656..b89f2d7ee8 100644
--- a/components/tachart/demo/basic/unit1.pas
+++ b/components/tachart/demo/basic/unit1.pas
@@ -5,7 +5,7 @@ unit unit1;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ExtCtrls,
+  SysUtils, Forms, Graphics, ExtCtrls,
   TAGraph, TASeries, Buttons, StdCtrls, Spin;
 
 type
@@ -77,6 +77,8 @@ var
 
 implementation
 
+{$R *.lfm}
+
 uses
   TAChartUtils;
 
@@ -271,8 +273,5 @@ begin
   Chart1.AddSeries(FPie);
 end;
 
-initialization
-  {$I unit1.lrs}
-
 end.