diff --git a/components/fpspreadsheet/examples/fpsvisual/fpsvisual.ico b/components/fpspreadsheet/examples/fpsgrid/fpsgrid.ico
similarity index 100%
rename from components/fpspreadsheet/examples/fpsvisual/fpsvisual.ico
rename to components/fpspreadsheet/examples/fpsgrid/fpsgrid.ico
diff --git a/components/fpspreadsheet/examples/fpsvisual/fpsvisual.lpi b/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi
similarity index 81%
rename from components/fpspreadsheet/examples/fpsvisual/fpsvisual.lpi
rename to components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi
index 913da8eff..2bd92d8ac 100644
--- a/components/fpspreadsheet/examples/fpsvisual/fpsvisual.lpi
+++ b/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpi
@@ -6,14 +6,15 @@
     <General>
       <MainUnit Value="0"/>
       <TargetFileExt Value=".exe"/>
-      <Icon Value="0"/>
+      <Title Value="fpsgrid"/>
       <UseXPManifest Value="True"/>
-      <ActiveEditorIndexAtStart Value="3"/>
+      <Icon Value="0"/>
+      <ActiveWindowIndexAtStart Value="0"/>
     </General>
     <VersionInfo>
-      <ProjectVersion Value=""/>
       <Language Value=""/>
       <CharSet Value=""/>
+      <StringTable Comments="" CompanyName="" FileDescription="" FileVersion="0.0.0.0" InternalName="" LegalCopyright="" LegalTrademarks="" OriginalFilename="" ProductName="" ProductVersion=""/>
     </VersionInfo>
     <PublishOptions>
       <Version Value="2"/>
@@ -24,7 +25,7 @@
     <RunParams>
       <local>
         <FormatVersion Value="1"/>
-        <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+        <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
     <RequiredPackages Count="2">
@@ -35,12 +36,17 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="8">
+    <Units Count="9">
       <Unit0>
-        <Filename Value="fpsvisual.lpr"/>
+        <Filename Value="fpsgrid.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="fpsvisual"/>
+        <UnitName Value="fpsgrid"/>
+        <EditorIndex Value="1"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1"/>
+        <CursorPos X="16" Y="9"/>
         <UsageCount Value="21"/>
+        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
         <Filename Value="mainform.pas"/>
@@ -48,187 +54,202 @@
         <ComponentName Value="Form1"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="mainform"/>
-        <CursorPos X="20" Y="38"/>
-        <TopLine Value="12"/>
         <EditorIndex Value="0"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="25"/>
+        <CursorPos X="20" Y="38"/>
         <UsageCount Value="21"/>
         <Loaded Value="True"/>
       </Unit1>
       <Unit2>
         <Filename Value="..\..\fpspreadsheet.pas"/>
         <UnitName Value="fpspreadsheet"/>
-        <CursorPos X="15" Y="92"/>
-        <TopLine Value="73"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="2"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="108"/>
+        <CursorPos X="15" Y="120"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="..\..\fpspreadsheetgrid.pas"/>
         <UnitName Value="fpspreadsheetgrid"/>
-        <CursorPos X="14" Y="142"/>
+        <EditorIndex Value="4"/>
+        <WindowIndex Value="0"/>
         <TopLine Value="129"/>
-        <EditorIndex Value="3"/>
+        <CursorPos X="14" Y="142"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit3>
       <Unit4>
         <Filename Value="..\..\fpolestorage.pas"/>
         <UnitName Value="fpolestorage"/>
-        <CursorPos X="4" Y="44"/>
+        <EditorIndex Value="6"/>
+        <WindowIndex Value="0"/>
         <TopLine Value="25"/>
-        <EditorIndex Value="5"/>
+        <CursorPos X="4" Y="44"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit4>
       <Unit5>
         <Filename Value="..\..\..\..\..\lazarus27\fpc\2.2.4\source\packages\winunits-base\src\activex.pp"/>
         <UnitName Value="ActiveX"/>
-        <CursorPos X="10" Y="24"/>
+        <WindowIndex Value="0"/>
         <TopLine Value="49"/>
-        <EditorIndex Value="6"/>
+        <CursorPos X="10" Y="24"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit5>
       <Unit6>
         <Filename Value="..\..\..\..\..\lazarus27\fpc\2.2.4\source\packages\fcl-base\src\avl_tree.pp"/>
         <UnitName Value="AVL_Tree"/>
-        <CursorPos X="14" Y="83"/>
+        <WindowIndex Value="0"/>
         <TopLine Value="37"/>
-        <EditorIndex Value="2"/>
+        <CursorPos X="14" Y="83"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit6>
       <Unit7>
         <Filename Value="..\..\..\..\..\lazarus\lcl\grids.pas"/>
         <UnitName Value="Grids"/>
-        <CursorPos X="28" Y="1534"/>
+        <EditorIndex Value="5"/>
+        <WindowIndex Value="0"/>
         <TopLine Value="1517"/>
-        <EditorIndex Value="4"/>
+        <CursorPos X="28" Y="1534"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit7>
+      <Unit8>
+        <Filename Value="..\..\..\..\..\lazarus\lcl\include\customform.inc"/>
+        <IsVisibleTab Value="True"/>
+        <EditorIndex Value="3"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="2021"/>
+        <CursorPos X="1" Y="2041"/>
+        <SyntaxHighlighter Value="FreePascal"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+        <DefaultSyntaxHighlighter Value="Text"/>
+      </Unit8>
     </Units>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="..\..\fpspreadsheet.pas"/>
-        <Caret Line="486" Column="15" TopLine="461"/>
+        <Caret Line="880" Column="21" TopLine="861"/>
       </Position1>
       <Position2>
         <Filename Value="..\..\fpspreadsheet.pas"/>
-        <Caret Line="490" Column="17" TopLine="461"/>
+        <Caret Line="883" Column="32" TopLine="861"/>
       </Position2>
       <Position3>
         <Filename Value="..\..\fpspreadsheet.pas"/>
-        <Caret Line="492" Column="9" TopLine="461"/>
+        <Caret Line="885" Column="75" TopLine="861"/>
       </Position3>
       <Position4>
         <Filename Value="..\..\fpspreadsheet.pas"/>
-        <Caret Line="859" Column="42" TopLine="840"/>
+        <Caret Line="889" Column="20" TopLine="861"/>
       </Position4>
       <Position5>
         <Filename Value="..\..\fpspreadsheet.pas"/>
-        <Caret Line="880" Column="21" TopLine="861"/>
+        <Caret Line="352" Column="14" TopLine="338"/>
       </Position5>
       <Position6>
         <Filename Value="..\..\fpspreadsheet.pas"/>
-        <Caret Line="883" Column="32" TopLine="861"/>
+        <Caret Line="101" Column="15" TopLine="82"/>
       </Position6>
       <Position7>
-        <Filename Value="..\..\fpspreadsheet.pas"/>
-        <Caret Line="885" Column="75" TopLine="861"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="34" Column="21" TopLine="12"/>
       </Position7>
       <Position8>
         <Filename Value="..\..\fpspreadsheet.pas"/>
-        <Caret Line="889" Column="20" TopLine="861"/>
+        <Caret Line="99" Column="3" TopLine="83"/>
       </Position8>
       <Position9>
         <Filename Value="..\..\fpspreadsheet.pas"/>
-        <Caret Line="352" Column="14" TopLine="338"/>
+        <Caret Line="352" Column="23" TopLine="333"/>
       </Position9>
       <Position10>
-        <Filename Value="..\..\fpspreadsheet.pas"/>
-        <Caret Line="101" Column="15" TopLine="82"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="37" Column="27" TopLine="12"/>
       </Position10>
       <Position11>
-        <Filename Value="..\..\..\..\..\lazarus27\fpc\2.2.4\source\packages\fcl-base\src\avl_tree.pp"/>
-        <Caret Line="83" Column="16" TopLine="59"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="36" Column="1" TopLine="12"/>
       </Position11>
       <Position12>
         <Filename Value="mainform.pas"/>
-        <Caret Line="34" Column="21" TopLine="12"/>
+        <Caret Line="37" Column="1" TopLine="12"/>
       </Position12>
       <Position13>
-        <Filename Value="..\..\fpspreadsheet.pas"/>
-        <Caret Line="99" Column="3" TopLine="83"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="38" Column="1" TopLine="12"/>
       </Position13>
       <Position14>
-        <Filename Value="..\..\fpspreadsheet.pas"/>
-        <Caret Line="352" Column="23" TopLine="333"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="39" Column="1" TopLine="12"/>
       </Position14>
       <Position15>
-        <Filename Value="mainform.pas"/>
-        <Caret Line="37" Column="27" TopLine="12"/>
+        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
+        <Caret Line="46" Column="1" TopLine="27"/>
       </Position15>
       <Position16>
-        <Filename Value="mainform.pas"/>
-        <Caret Line="36" Column="1" TopLine="12"/>
+        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
+        <Caret Line="48" Column="1" TopLine="29"/>
       </Position16>
       <Position17>
         <Filename Value="mainform.pas"/>
-        <Caret Line="37" Column="1" TopLine="12"/>
+        <Caret Line="38" Column="3" TopLine="12"/>
       </Position17>
       <Position18>
-        <Filename Value="mainform.pas"/>
-        <Caret Line="38" Column="1" TopLine="12"/>
+        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
+        <Caret Line="48" Column="19" TopLine="35"/>
       </Position18>
       <Position19>
-        <Filename Value="mainform.pas"/>
-        <Caret Line="39" Column="1" TopLine="12"/>
+        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
+        <Caret Line="15" Column="41" TopLine="4"/>
       </Position19>
       <Position20>
-        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="46" Column="1" TopLine="27"/>
+        <Filename Value="..\..\..\..\..\lazarus\lcl\grids.pas"/>
+        <Caret Line="1444" Column="33" TopLine="1425"/>
       </Position20>
       <Position21>
         <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="48" Column="1" TopLine="29"/>
+        <Caret Line="25" Column="19" TopLine="4"/>
       </Position21>
       <Position22>
-        <Filename Value="mainform.pas"/>
-        <Caret Line="38" Column="3" TopLine="12"/>
+        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
+        <Caret Line="17" Column="41" TopLine="7"/>
       </Position22>
       <Position23>
-        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="48" Column="19" TopLine="35"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="38" Column="20" TopLine="12"/>
       </Position23>
       <Position24>
         <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="15" Column="41" TopLine="4"/>
+        <Caret Line="29" Column="17" TopLine="7"/>
       </Position24>
       <Position25>
-        <Filename Value="..\..\..\..\..\lazarus\lcl\grids.pas"/>
-        <Caret Line="1444" Column="33" TopLine="1425"/>
+        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
+        <Caret Line="199" Column="18" TopLine="173"/>
       </Position25>
       <Position26>
-        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="25" Column="19" TopLine="4"/>
+        <Filename Value="fpsgrid.lpr"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position26>
       <Position27>
-        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="17" Column="41" TopLine="7"/>
+        <Filename Value="fpsgrid.lpr"/>
+        <Caret Line="16" Column="4" TopLine="1"/>
       </Position27>
       <Position28>
         <Filename Value="mainform.pas"/>
-        <Caret Line="38" Column="20" TopLine="12"/>
+        <Caret Line="34" Column="22" TopLine="25"/>
       </Position28>
       <Position29>
-        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="29" Column="17" TopLine="7"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="38" Column="20" TopLine="25"/>
       </Position29>
       <Position30>
-        <Filename Value="..\..\fpspreadsheetgrid.pas"/>
-        <Caret Line="199" Column="18" TopLine="173"/>
+        <Filename Value="..\..\fpspreadsheet.pas"/>
+        <Caret Line="120" Column="15" TopLine="108"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
diff --git a/components/fpspreadsheet/examples/fpsvisual/fpsvisual.lpr b/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpr
similarity index 68%
rename from components/fpspreadsheet/examples/fpsvisual/fpsvisual.lpr
rename to components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpr
index 2f5bd0480..3a92ca33d 100644
--- a/components/fpspreadsheet/examples/fpsvisual/fpsvisual.lpr
+++ b/components/fpspreadsheet/examples/fpsgrid/fpsgrid.lpr
@@ -3,17 +3,13 @@ program fpsvisual;
 {$mode objfpc}{$H+}
 
 uses
-  {$IFDEF UNIX}{$IFDEF UseCThreads}
-  cthreads,
-  {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
   Forms, mainform, LResources, laz_fpspreadsheet_visual
   { you can add units after this };
 
-{$IFDEF WINDOWS}{$R fpsvisual.rc}{$ENDIF}
+//{$IFDEF WINDOWS}{$R fpsvisual.rc}{$ENDIF}
 
 begin
-  {$I fpsvisual.lrs}
   Application.Initialize;
   Application.CreateForm(TForm1, Form1);
   Application.Run;
diff --git a/components/fpspreadsheet/examples/fpsvisual/mainform.lfm b/components/fpspreadsheet/examples/fpsgrid/mainform.lfm
similarity index 100%
rename from components/fpspreadsheet/examples/fpsvisual/mainform.lfm
rename to components/fpspreadsheet/examples/fpsgrid/mainform.lfm
diff --git a/components/fpspreadsheet/examples/fpsvisual/mainform.lrs b/components/fpspreadsheet/examples/fpsgrid/mainform.lrs
similarity index 100%
rename from components/fpspreadsheet/examples/fpsvisual/mainform.lrs
rename to components/fpspreadsheet/examples/fpsgrid/mainform.lrs
diff --git a/components/fpspreadsheet/examples/fpsvisual/mainform.pas b/components/fpspreadsheet/examples/fpsgrid/mainform.pas
similarity index 93%
rename from components/fpspreadsheet/examples/fpsvisual/mainform.pas
rename to components/fpspreadsheet/examples/fpsgrid/mainform.pas
index 5c76f68ed..a0c16b877 100644
--- a/components/fpspreadsheet/examples/fpsvisual/mainform.pas
+++ b/components/fpspreadsheet/examples/fpsgrid/mainform.pas
@@ -35,7 +35,7 @@ var
 begin
   lWorksheet := TsWorksheet.Create;
   try
-    lWorksheet.GetCell(2, 2)^.UTF8StringValue := 'Algo';
+    lWorksheet.WriteUTF8Text(2, 2, 'Algo');
     sWorksheetGrid1.LoadFromWorksheet(lWorksheet);
   finally
     lWorksheet.Free;
diff --git a/components/fpspreadsheet/examples/fpsvisual/fpsvisual.manifest b/components/fpspreadsheet/examples/fpsvisual/fpsvisual.manifest
deleted file mode 100644
index 515fedeef..000000000
--- a/components/fpspreadsheet/examples/fpsvisual/fpsvisual.manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="CompanyName.ProductName.YourApp" type="win32"/>
- <description>Your application description here.</description>
- <dependency>
-  <dependentAssembly>
-   <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
-  </dependentAssembly>
- </dependency>
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-  <security>
-   <requestedPrivileges>
-    <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-   </requestedPrivileges>
-  </security>
- </trustInfo>
-</assembly>
\ No newline at end of file
diff --git a/components/fpspreadsheet/examples/fpsvisual/fpsvisual.rc b/components/fpspreadsheet/examples/fpsvisual/fpsvisual.rc
deleted file mode 100644
index 38c4c6053..000000000
--- a/components/fpspreadsheet/examples/fpsvisual/fpsvisual.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-#define RT_MANIFEST  24
-#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
-#define ISOLATIONAWARE_MANIFEST_RESOURCE_ID 2
-#define ISOLATIONAWARE_NOSTATICIMPORT_MANIFEST_RESOURCE_ID 3
-
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "fpsvisual.manifest"
-MAINICON ICON "fpsvisual.ico"