diff --git a/components/fpspreadsheet/examples/db_import_export/db_export_import.lpi b/components/fpspreadsheet/examples/db_import_export/db_export_import.lpi
index 693d5e1f4..e0482d46d 100644
--- a/components/fpspreadsheet/examples/db_import_export/db_export_import.lpi
+++ b/components/fpspreadsheet/examples/db_import_export/db_export_import.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
@@ -20,9 +20,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -53,7 +54,7 @@
       <Filename Value="db_export_import"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="..\..\source;$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\..\source\common;..\..\source\export"/>
       <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/other/demo_expression_parser.lpi b/components/fpspreadsheet/examples/other/demo_expression_parser.lpi
index 24d6d9037..8ddc3d104 100644
--- a/components/fpspreadsheet/examples/other/demo_expression_parser.lpi
+++ b/components/fpspreadsheet/examples/other/demo_expression_parser.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -24,9 +24,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -51,7 +52,7 @@
       <Filename Value="demo_expression_parser"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="..\..\source;$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\..\source\common"/>
       <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/other/demo_formula_func.lpi b/components/fpspreadsheet/examples/other/demo_formula_func.lpi
index fbe7d3cc3..016c92587 100644
--- a/components/fpspreadsheet/examples/other/demo_formula_func.lpi
+++ b/components/fpspreadsheet/examples/other/demo_formula_func.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -25,9 +25,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -52,7 +59,7 @@
       <Filename Value="demo_formula_func"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="..\..\source;$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\..\source\common"/>
       <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/other/demo_recursive_calc.lpi b/components/fpspreadsheet/examples/other/demo_recursive_calc.lpi
index 072159087..2fa480ee8 100644
--- a/components/fpspreadsheet/examples/other/demo_recursive_calc.lpi
+++ b/components/fpspreadsheet/examples/other/demo_recursive_calc.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -24,9 +24,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -47,7 +48,7 @@
       <Filename Value="demo_recursive_calc"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="..\..\source;$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\..\source\common"/>
       <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/other/demo_search.lpi b/components/fpspreadsheet/examples/other/demo_search.lpi
index a1335b3be..6bcfaf077 100644
--- a/components/fpspreadsheet/examples/other/demo_search.lpi
+++ b/components/fpspreadsheet/examples/other/demo_search.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -24,17 +24,15 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="2">
+    <RequiredPackages Count="1">
       <Item1>
         <PackageName Value="laz_fpspreadsheet"/>
       </Item1>
-      <Item2>
-        <PackageName Value="LazUtils"/>
-      </Item2>
     </RequiredPackages>
     <Units Count="2">
       <Unit0>
diff --git a/components/fpspreadsheet/examples/other/demo_sorting.lpi b/components/fpspreadsheet/examples/other/demo_sorting.lpi
index 10b3ea03c..7aae88787 100644
--- a/components/fpspreadsheet/examples/other/demo_sorting.lpi
+++ b/components/fpspreadsheet/examples/other/demo_sorting.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -24,9 +24,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -47,7 +48,7 @@
       <Filename Value="demo_sorting"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="..\..\source;$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\..\source\common"/>
       <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/other/demo_virtualmode_read.lpi b/components/fpspreadsheet/examples/other/demo_virtualmode_read.lpi
index 87732ea49..9b261c458 100644
--- a/components/fpspreadsheet/examples/other/demo_virtualmode_read.lpi
+++ b/components/fpspreadsheet/examples/other/demo_virtualmode_read.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -24,9 +24,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -47,7 +48,7 @@
       <Filename Value="demo_virtualmode_read"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="..\..\source;$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\..\source\common"/>
       <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/other/demo_virtualmode_write.lpi b/components/fpspreadsheet/examples/other/demo_virtualmode_write.lpi
index 031ce82c5..d9a956219 100644
--- a/components/fpspreadsheet/examples/other/demo_virtualmode_write.lpi
+++ b/components/fpspreadsheet/examples/other/demo_virtualmode_write.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -24,9 +24,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -47,7 +48,7 @@
       <Filename Value="demo_virtualmode_write"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="..\..\source;$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\..\source\common"/>
       <UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/other/demo_write_colors.lpi b/components/fpspreadsheet/examples/other/demo_write_colors.lpi
index a77936cbb..daef1710f 100644
--- a/components/fpspreadsheet/examples/other/demo_write_colors.lpi
+++ b/components/fpspreadsheet/examples/other/demo_write_colors.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -24,9 +24,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -47,7 +48,7 @@
       <Filename Value="demo_write_colors"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="..\..\source;$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\..\source\common"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/other/demo_write_formatting.lpi b/components/fpspreadsheet/examples/other/demo_write_formatting.lpi
index e29c37cff..2d1fb10e6 100644
--- a/components/fpspreadsheet/examples/other/demo_write_formatting.lpi
+++ b/components/fpspreadsheet/examples/other/demo_write_formatting.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -26,17 +26,15 @@
       <ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
-    <RequiredPackages Count="2">
+    <RequiredPackages Count="1">
       <Item1>
         <PackageName Value="laz_fpspreadsheet"/>
       </Item1>
-      <Item2>
-        <PackageName Value="LazUtils"/>
-      </Item2>
     </RequiredPackages>
     <Units Count="1">
       <Unit0>
diff --git a/components/fpspreadsheet/examples/other/demo_write_formatting.pas b/components/fpspreadsheet/examples/other/demo_write_formatting.pas
index a3e909fdf..9c98473e7 100644
--- a/components/fpspreadsheet/examples/other/demo_write_formatting.pas
+++ b/components/fpspreadsheet/examples/other/demo_write_formatting.pas
@@ -138,7 +138,8 @@ begin
 end;
 
 const
-  TestFile='test3.odt';
+  TestFileODS='test3.ods';
+  TestFileXLS='test.xls';
 
 {$R *.res}
 
@@ -153,9 +154,11 @@ begin
   WriteSecondWorksheet();
 
   // Save the spreadsheet to a file
-//  MyWorkbook.WriteToFile(MyDir + 'test3.xls', sfExcel8, False);
-  MyWorkbook.WriteToFile(MyDir + TestFile, sfOpenDocument, False);
+  MyWorkbook.WriteToFile(MyDir + TestFileXLS, sfExcel8, true);
+  MyWorkbook.WriteToFile(MyDir + TestFileODS, sfOpenDocument, true);
   MyWorkbook.Free;
-  writeln('Finished. Please open "'+TestFile+'" in your spreadsheet program.');
+
+  WriteLn('Finished. Please open "'+TestFileXLS+'" and "' + TestFileODS + '" in your spreadsheet program.');
+  ReadLn;
 end.
 
diff --git a/components/fpspreadsheet/examples/other/demo_write_formula.lpi b/components/fpspreadsheet/examples/other/demo_write_formula.lpi
index b598c7212..46fe9a92d 100644
--- a/components/fpspreadsheet/examples/other/demo_write_formula.lpi
+++ b/components/fpspreadsheet/examples/other/demo_write_formula.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <General>
       <Flags>
         <MainUnitHasCreateFormStatements Value="False"/>
@@ -49,9 +49,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="/usr/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="/usr/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -71,7 +78,7 @@
       <Filename Value="demo_write_formula"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="../../source;$(ProjOutDir)"/>
       <OtherUnitFiles Value="../../source/common"/>
       <UnitOutputDirectory Value="../lib/$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/other/demo_write_headerfooter_images.lpi b/components/fpspreadsheet/examples/other/demo_write_headerfooter_images.lpi
index e739dd098..ac29775f3 100644
--- a/components/fpspreadsheet/examples/other/demo_write_headerfooter_images.lpi
+++ b/components/fpspreadsheet/examples/other/demo_write_headerfooter_images.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="demo_write_headerfooter_images"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\source"/>
       <OtherUnitFiles Value="..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/other/demo_write_images.lpi b/components/fpspreadsheet/examples/other/demo_write_images.lpi
index 07a8d5088..1a758f758 100644
--- a/components/fpspreadsheet/examples/other/demo_write_images.lpi
+++ b/components/fpspreadsheet/examples/other/demo_write_images.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="demo_write_images"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\source"/>
       <OtherUnitFiles Value="..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi b/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi
index f6fb36808..02306a3df 100644
--- a/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi
+++ b/components/fpspreadsheet/examples/read_write/csvdemo/csvread.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="csvread"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi b/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi
index 71f748cea..180d6826c 100644
--- a/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/csvdemo/csvwrite.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -50,6 +57,7 @@
       <Filename Value="csvwrite"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi b/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi
index 488465008..3848509eb 100644
--- a/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel2demo/excel2read.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="excel2read"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi b/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi
index 1379ce2b2..b56a30055 100644
--- a/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel5demo/excel5read.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="excel5read"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi b/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi
index 2fe0b95c1..a98dbc52c 100644
--- a/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel5demo/excel5write.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="excel5write"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi b/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi
index 2e95e1e51..77b40c03b 100644
--- a/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel8demo/excel8read.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -22,9 +22,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -45,7 +52,7 @@
       <Filename Value="excel8read"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="$(ProjOutDir);..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi
index d6f8aafa3..e7624f939 100644
--- a/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi
+++ b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,24 +23,27 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
         <PackageName Value="LazUtils"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="2">
+    <Units Count="1">
       <Unit0>
         <Filename Value="excel8write.lpr"/>
         <IsPartOfProject Value="True"/>
       </Unit0>
-      <Unit1>
-        <Filename Value="..\..\fpstypes.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit1>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -50,6 +53,7 @@
       <Filename Value="excel8write"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpr b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpr
index 6ff79e30a..c8ab69160 100644
--- a/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpr
+++ b/components/fpspreadsheet/examples/read_write/excel8demo/excel8write.lpr
@@ -10,7 +10,7 @@ program excel8write;
 {$mode delphi}{$H+}
 
 uses
-  Classes, SysUtils, fpspreadsheet, fpsRPN, xlsbiff8, fpsTypes, fpsCell;
+  Classes, SysUtils, fpstypes, fpspreadsheet, fpsRPN, xlsbiff8, fpsCell;
 
 const
   Str_First = 'First';
diff --git a/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpi b/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpi
index 99df1e788..adcec4500 100644
--- a/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/excelxmldemo/excelxmlwrite.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="excelxmlwrite"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/htmldemo/htmlread.lpi b/components/fpspreadsheet/examples/read_write/htmldemo/htmlread.lpi
index b2a5cbc8f..996843954 100644
--- a/components/fpspreadsheet/examples/read_write/htmldemo/htmlread.lpi
+++ b/components/fpspreadsheet/examples/read_write/htmldemo/htmlread.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="htmlread"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpi b/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpi
index ea0bcc908..492acd881 100644
--- a/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="htmlwrite"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpr b/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpr
index c25b4463e..9118936cf 100644
--- a/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpr
+++ b/components/fpspreadsheet/examples/read_write/htmldemo/htmlwrite.lpr
@@ -165,7 +165,7 @@ begin
     inc(row);
 
     // Save the spreadsheet to a file
-    MyWorkbook.WriteToFile(MyDir + 'test.html', sfHTML);
+    MyWorkbook.WriteToFile(MyDir + 'test.html', sfHTML, true);
 
   finally
     MyWorkbook.Free;
diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi
index c088c44ad..0b3839f5b 100644
--- a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlread.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="ooxmlread"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi
index 11824f89a..cfc43f33b 100644
--- a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="ooxmlwrite"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr
index ddf872f2f..a0618e5b9 100644
--- a/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo/ooxmlwrite.lpr
@@ -108,7 +108,7 @@ begin
   MyWorksheet.WriteNumber(8, 6, 1.66666667, nfFraction, '# ?/?');
 
   // Save the spreadsheet to a file
-  MyWorkbook.WriteToFile(MyDir + 'test.xlsx', sfOOXML);
+  MyWorkbook.WriteToFile(MyDir + 'test.xlsx', sfOOXML, true);
   MyWorkbook.Free;
 end.
 
diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.lpi b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.lpi
index 500d24220..9969b2d3a 100644
--- a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.lpi
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="3">
       <Item1>
@@ -52,6 +59,7 @@
       <Filename Value="ooxml_decrypt_and_read"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.pas b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.pas
index d932d0937..5b82c0b47 100644
--- a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.pas
+++ b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/ooxml_decrypt_and_read.pas
@@ -16,7 +16,7 @@ program ooxml_decrypt_and_read;
 {$mode delphi}{$H+}
 
 uses
-  Classes, SysUtils, LazUTF8, fpstypes, fpspreadsheet, laz_fpspreadsheet,
+  Classes, SysUtils, LazUTF8, fpstypes, fpspreadsheet, //laz_fpspreadsheet,
   xlsxooxml_crypto;
 
 var
@@ -27,7 +27,7 @@ var
   cell: PCell;
   i: Integer;
   password: String;
-  Prot_enc: Integer = 1;  // 0 - protected, 1 - encrypted workbook
+  Prot_enc: Integer = 0;  // 0 - protected, 1 - encrypted workbook
 
 begin
   MyDir := ExtractFilePath(ParamStr(0));
diff --git a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/protected_workbook.xlsx b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/protected_workbook.xlsx
index fa66a2fc1..6a5136e44 100644
Binary files a/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/protected_workbook.xlsx and b/components/fpspreadsheet/examples/read_write/ooxmldemo_crypto/protected_workbook.xlsx differ
diff --git a/components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpi b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpi
index e2e1c7f29..0fb31458d 100644
--- a/components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/opendocdemo/opendocwrite.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="opendocwrite"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi
index e8774d6d4..a0f52edd0 100644
--- a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi
+++ b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitableread.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -22,9 +22,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -45,7 +52,7 @@
       <Filename Value="wikitableread"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi
index ecc2d58e9..0be953f15 100644
--- a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi
+++ b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <Flags>
@@ -23,9 +23,16 @@
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
       </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
+          </local>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
@@ -46,6 +53,7 @@
       <Filename Value="wikitablewrite"/>
     </Target>
     <SearchPaths>
+      <IncludeFiles Value="..\..\..\source"/>
       <OtherUnitFiles Value="..\..\..\source\common"/>
       <UnitOutputDirectory Value="..\..\lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
diff --git a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpr b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpr
index 9f121f66a..e3e282a7b 100644
--- a/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpr
+++ b/components/fpspreadsheet/examples/read_write/wikitabledemo/wikitablewrite.lpr
@@ -164,7 +164,7 @@ begin
   inc(row);
 
   // Save the spreadsheet to a file
-  MyWorkbook.WriteToFile(MyDir + 'test.wikitable_wikimedia', sfWikitable_wikimedia);
+  MyWorkbook.WriteToFile(MyDir + 'test.wikitable_wikimedia', sfWikitable_wikimedia, true);
   MyWorkbook.Free;
 end.
 
diff --git a/components/fpspreadsheet/source/common/xlsxml.pas b/components/fpspreadsheet/source/common/xlsxml.pas
index ca578d50c..2c1aa8f89 100644
--- a/components/fpspreadsheet/source/common/xlsxml.pas
+++ b/components/fpspreadsheet/source/common/xlsxml.pas
@@ -874,8 +874,8 @@ begin
   // Protection
   protectStr := Format(INDENT3 + '<ProtectObjects>%s</ProtectObjects>' + LF +
                        INDENT3 + '<ProtectScenarios>%s</ProtectScenarios>' + LF, [
-    AWorksheet.IsProtected and (spObjects in AWorksheet.Protection),
-    AWorksheet.IsProtected {and [spScenarios in AWorksheet.Protection])}
+    StrUtils.IfThen(AWorksheet.IsProtected and (spObjects in AWorksheet.Protection), '1', '0'),
+    StrUtils.IfThen(AWorksheet.IsProtected {and [spScenarios in AWorksheet.Protection])}, '1', '0')
   ]);
 
   // Put it all together...
diff --git a/components/fpspreadsheet/source/laz_fpspreadsheet.lpk b/components/fpspreadsheet/source/laz_fpspreadsheet.lpk
index 2e038b85a..9630cf84c 100644
--- a/components/fpspreadsheet/source/laz_fpspreadsheet.lpk
+++ b/components/fpspreadsheet/source/laz_fpspreadsheet.lpk
@@ -8,6 +8,7 @@
       <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
+        <IncludeFiles Value="."/>
         <OtherUnitFiles Value="common"/>
         <UnitOutputDirectory Value="common\lib\$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
diff --git a/components/fpspreadsheet/tests/spreadtestgui.lpi b/components/fpspreadsheet/tests/spreadtestgui.lpi
index 6bf720977..1d3c3cc85 100644
--- a/components/fpspreadsheet/tests/spreadtestgui.lpi
+++ b/components/fpspreadsheet/tests/spreadtestgui.lpi
@@ -161,7 +161,7 @@
       <Filename Value="spreadtestgui"/>
     </Target>
     <SearchPaths>
-      <IncludeFiles Value="$(ProjOutDir)"/>
+      <IncludeFiles Value="..\source;$(ProjOutDir)"/>
       <OtherUnitFiles Value="..\source\common"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>