diff --git a/components/nicechart/demo/Delphi/Project1.dproj b/components/nicechart/demo/Delphi/Project1.dproj
index e19d169ec..5eef4c6aa 100644
--- a/components/nicechart/demo/Delphi/Project1.dproj
+++ b/components/nicechart/demo/Delphi/Project1.dproj
@@ -3,7 +3,7 @@
         <ProjectGuid>{534D51BE-D1B2-47D2-AD6E-AF9159060EBD}</ProjectGuid>
         <MainSource>Project1.dpr</MainSource>
         <Base>True</Base>
-        <Config Condition="'$(Config)'==''">Release</Config>
+        <Config Condition="'$(Config)'==''">Debug</Config>
         <TargetedPlatforms>1</TargetedPlatforms>
         <AppType>Application</AppType>
         <FrameworkType>VCL</FrameworkType>
diff --git a/components/nicechart/demo/Delphi/Project1.res b/components/nicechart/demo/Delphi/Project1.res
index 1e4099ba3..4f16aba1d 100644
Binary files a/components/nicechart/demo/Delphi/Project1.res and b/components/nicechart/demo/Delphi/Project1.res differ
diff --git a/components/nicechart/demo/common/Unit1.dfm b/components/nicechart/demo/common/Unit1.dfm
index f141c8040..66cbb8bef 100644
--- a/components/nicechart/demo/common/Unit1.dfm
+++ b/components/nicechart/demo/common/Unit1.dfm
@@ -1,26 +1,24 @@
 object Form1: TForm1
   Left = 169
   Top = 68
-  Width = 778
-  Height = 596
   Caption = 'NiceChart Demo - priyatna.org'
+  ClientHeight = 558
+  ClientWidth = 766
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
+  Font.Height = -12
+  Font.Name = 'Segoe UI'
   Font.Style = []
-  OldCreateOrder = False
   Position = poDesktopCenter
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  PixelsPerInch = 96
-  TextHeight = 13
+  TextHeight = 15
   object Label1: TLabel
     Left = 376
     Top = 15
-    Width = 32
-    Height = 13
+    Width = 34
+    Height = 15
     Caption = 'Label1'
   end
   object Button1: TButton
diff --git a/components/nicechart/demo/common/Unit1.pas b/components/nicechart/demo/common/Unit1.pas
index 95823210c..ecef493d0 100644
--- a/components/nicechart/demo/common/Unit1.pas
+++ b/components/nicechart/demo/common/Unit1.pas
@@ -73,6 +73,7 @@ begin
     Title := 'Look at me!'#13'I''m a NiceChart!';
     AxisXOnePerValue := True;
     ShowXGrid := False;
+    ShowYGrid := False;
     AxisYScale := 1000;
     //Monochrome := True;
     OnMouseMove := ChartMouseMove;
diff --git a/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.dproj b/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.dproj
index fd316713e..330d56e79 100644
--- a/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.dproj	
+++ b/components/nicechart/packages/Delphi XE11 Alexandria/NiceChartDXE11.dproj	
@@ -18,6 +18,11 @@
         <CfgParent>Base</CfgParent>
         <Base>true</Base>
     </PropertyGroup>
+    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
+        <Base_Win64>true</Base_Win64>
+        <CfgParent>Base</CfgParent>
+        <Base>true</Base>
+    </PropertyGroup>
     <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
         <Cfg_1>true</Cfg_1>
         <CfgParent>Base</CfgParent>
@@ -58,6 +63,10 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName)</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
+        <DCC_UsePackage>vcl;rtl;$(DCC_UsePackage)</DCC_UsePackage>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Base_Win64)'!=''">
+        <DCC_UsePackage>vcl;rtl;$(DCC_UsePackage)</DCC_UsePackage>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
         <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
diff --git a/components/nicechart/source/NiceChart.pas b/components/nicechart/source/NiceChart.pas
index 0eba8fefc..a8287113f 100644
--- a/components/nicechart/source/NiceChart.pas
+++ b/components/nicechart/source/NiceChart.pas
@@ -35,7 +35,12 @@ unit NiceChart;
 interface
 
 uses
-  Windows, Messages, Classes, Graphics, Forms, Controls, ExtCtrls, SysUtils,
+  {$IFDEF FPC}
+  LclIntf, LCLType, LMessages,
+  {$ELSE}
+  Windows, Messages,
+  {$ENDIF}
+  Classes, Graphics, Forms, Controls, ExtCtrls, SysUtils,
   BSplines, Math;
 
 const
@@ -122,8 +127,13 @@ type
     procedure SetTitle(const Value: string);
     procedure SetTitleFont(const Value: TFont);
     procedure TitleFontChanged(Sender: TObject);
+    {$IFDEF FPC}
+    procedure WMSize(var Msg: TLMSize); message LM_SIZE;
+    procedure WMEraseBkgnd(var Msg: TLMEraseBkgnd); message LM_ERASEBKGND;
+    {$ELSE}
     procedure WMSize(var Msg: TWMSize); message WM_SIZE;
     procedure WMEraseBkgnd(var Msg: TWMEraseBkgnd); message WM_ERASEBKGND;
+    {$ENDIF}
     function GetSeries(Index: Integer): TNiceSeries;
     function GetSeriesCount: Integer;
     procedure DrawLegend(ACanvas: TCanvas);
@@ -213,6 +223,7 @@ type
 implementation
 
 {$R NiceChart.res}
+
 {$IFDEF FPC}
  {$R nicechart_images.res}
 {$ENDIF}
@@ -666,13 +677,13 @@ begin
   end;
 end;
 
-procedure TNiceChart.WMSize(var Msg: TWMSize);
+procedure TNiceChart.WMSize(var Msg: {$IFDEF FPC}TLMSize{$ELSE}TWMSize{$ENDIF});
 begin
   inherited;
   Changed;
 end;
 
-procedure TNiceChart.WMEraseBkgnd(var Msg: TWMEraseBkgnd);
+procedure TNiceChart.WMEraseBkgnd(var Msg: {$IFDEF FPC}TLMEraseBkgnd{$ELSE}TWMEraseBkgnd{$ENDIF});
 begin
   Msg.Result := 1;
 end;
@@ -1137,7 +1148,7 @@ begin
         Last := l + w;
       end;
       MoveTo(P^.Px, P^.Py);
-      LineTo(P^.Px, P^.Py + SMALL_MARGIN);
+      LineTo(P^.Px, P^.Py + SMALL_MARGIN + 1);
     end;
     if FShowXGrid then
     begin