diff --git a/components/fpspreadsheet/docs/api/builddoc.bat b/components/fpspreadsheet/docs/api/builddoc.bat
index e3e3b5193..bfcbedb78 100644
--- a/components/fpspreadsheet/docs/api/builddoc.bat
+++ b/components/fpspreadsheet/docs/api/builddoc.bat
@@ -1,25 +1,47 @@
 @echo off
 
-set DOX_CMD="D:\Programme\Doc-O-Matic 7 Express\domexpress.exe"
+set DOX_CMD="C:\Program Files (x86)\Doc-O-Matic 7 Express\domexpress.exe"
+if not exist %DOX_CMD% goto :dox_error
 
+rem *** Prepare files ***
 if not exist output mkdir output
-
-rem Prepare files...
-path=%PROGRAMFILES%;%PATH%
 pushd .
 cd ..\..
+
+if not exist fps.inc goto :next1
 ren fps.inc ---fps.inc
+
+:next1
+if not exist fpspreadsheetctrls.lrs goto :next2
 ren fpspreadsheetctrls.lrs ---fpspreadsheetctrls.lrs
+
+:next2
 popd
 
 rem Extract help topics and create chm files...
+echo Running %DOX_CMD% -config "HTML Help" fpspreadsheet.dox-express 
 %DOX_CMD% -config "HTML Help" fpspreadsheet.dox-express > doc-o-matic.txt
 
-rem Clean up
+rem *** Clean up ***
 pushd .
+
 cd ..\..
 chdir
+if not exist ---fps.inc goto :next3
 ren ---fps.inc fps.inc
+
+:next3
+if not exist ---fpspreadsheetctrls.lrs goto :next4
 ren ---fpspreadsheetctrls.lrs fpspreadsheetctrls.lrs
+
+:next4
 popd
+
 if exist output\fpspreadsheet.chm copy output\fpspreadsheet.chm ..\fpspreadsheet-api.chm /y
+
+goto :end
+
+:dox_error
+echo Doc-O-Matic program not found. Check the script.
+
+:end
diff --git a/components/fpspreadsheet/docs/fpspreadsheet-api.chm b/components/fpspreadsheet/docs/fpspreadsheet-api.chm
index 3ec1ba1f6..11a1d70cc 100644
Binary files a/components/fpspreadsheet/docs/fpspreadsheet-api.chm and b/components/fpspreadsheet/docs/fpspreadsheet-api.chm differ
diff --git a/components/fpspreadsheet/docs/fpspreadsheet-wiki.chm b/components/fpspreadsheet/docs/fpspreadsheet-wiki.chm
index 088a9b212..02c2001b8 100644
Binary files a/components/fpspreadsheet/docs/fpspreadsheet-wiki.chm and b/components/fpspreadsheet/docs/fpspreadsheet-wiki.chm differ
diff --git a/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm b/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
index 899142db9..94a48b4a5 100644
--- a/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
+++ b/components/fpspreadsheet/examples/visual/fpsctrls/main.lfm
@@ -42,13 +42,14 @@ object MainForm: TMainForm
       Font.Height = -13
       Font.Name = 'Arial'
       MouseWheelOption = mwGrid
-      Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goRowSizing, goColSizing, goEditing, goThumbTracking, goDblClickAutoSize, goHeaderHotTracking, goCellHints]
+      Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goRangeSelect, goRowSizing, goColSizing, goEditing, goThumbTracking, goDblClickAutoSize, goCellHints]
       ParentFont = False
       RowCount = 101
       TabOrder = 1
       TitleFont.Color = clBlack
       TitleFont.Height = -13
       TitleFont.Name = 'Arial'
+      TitleStyle = tsNative
       OnClickHyperlink = WorksheetGridClickHyperlink
       OnMouseWheel = WorksheetGridMouseWheel
     end
diff --git a/components/fpspreadsheet/examples/visual/fpsctrls/main.pas b/components/fpspreadsheet/examples/visual/fpsctrls/main.pas
index 644cef4bc..aaf1ab0af 100644
--- a/components/fpspreadsheet/examples/visual/fpsctrls/main.pas
+++ b/components/fpspreadsheet/examples/visual/fpsctrls/main.pas
@@ -775,8 +775,10 @@ begin
   FSaveFormats := GetSpreadFormats(faWrite, priorityFormats);
 
  {$IFDEF WINDOWS}
-  if Win32MajorVersion >= 10 then
+  if Win32MajorVersion >= 10 then begin
     WorksheetGrid.TitleStyle := tsLazarus;
+    Inspector.TitleStyle := tsLazarus;
+  end;
  {$ENDIF}
 end;