diff --git a/components/datadict/fpcodegenerator.pp b/components/datadict/fpcodegenerator.pp
index 3a7cefa28e..5894145c80 100644
--- a/components/datadict/fpcodegenerator.pp
+++ b/components/datadict/fpcodegenerator.pp
@@ -5,7 +5,7 @@ unit fpcodegenerator;
 interface
 
 uses
-  Classes, SysUtils, db, fpddCodegen, fpDataDict, controls, dialogs;
+  Classes, SysUtils, FileUtil, db, fpddCodegen, fpDataDict, controls, dialogs;
   
 Type
   { TFPCodeGenerator }
diff --git a/components/datadict/frmconfdatadict.pp b/components/datadict/frmconfdatadict.pp
index fba5f42af3..6e1c881e06 100644
--- a/components/datadict/frmconfdatadict.pp
+++ b/components/datadict/frmconfdatadict.pp
@@ -5,8 +5,8 @@ unit frmconfdatadict;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, EditBtn,
-  StdCtrls, idedatadict, ButtonPanel;
+  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
+  EditBtn, StdCtrls, idedatadict, ButtonPanel;
 
 type
 
diff --git a/components/datadict/frmconfprojdatadict.pp b/components/datadict/frmconfprojdatadict.pp
index 79513eee2a..fada9f42e8 100644
--- a/components/datadict/frmconfprojdatadict.pp
+++ b/components/datadict/frmconfprojdatadict.pp
@@ -5,8 +5,8 @@ unit frmconfprojdatadict;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, EditBtn,
-  StdCtrls, idedatadict;
+  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
+  EditBtn, StdCtrls, idedatadict;
 
 type
 
diff --git a/components/datadict/frmgeneratedcode.pp b/components/datadict/frmgeneratedcode.pp
index 69a0ecc024..24062044ab 100644
--- a/components/datadict/frmgeneratedcode.pp
+++ b/components/datadict/frmgeneratedcode.pp
@@ -5,7 +5,7 @@ unit frmgeneratedcode;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs,
+  Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
   SynHighlighterPas, SynMemo, ExtCtrls, StdCtrls;
 
 type
diff --git a/components/datadict/idedatadict.pp b/components/datadict/idedatadict.pp
index 2f2c71f4e4..935e7a717a 100644
--- a/components/datadict/idedatadict.pp
+++ b/components/datadict/idedatadict.pp
@@ -5,7 +5,7 @@ unit idedatadict;
 interface
 
 uses
-  Classes, SysUtils, fpdatadict, projectintf, lazideintf ;
+  Classes, SysUtils, FileUtil, fpdatadict, ProjectIntf, LazIDEIntf;
 
 Type
 
diff --git a/components/datadict/reglazdatadict.pp b/components/datadict/reglazdatadict.pp
index 71b996c2f4..a32c123a43 100644
--- a/components/datadict/reglazdatadict.pp
+++ b/components/datadict/reglazdatadict.pp
@@ -20,7 +20,8 @@ uses
   frmconfprojdatadict,
   // Code generator units
   fpddCodegen,
-  fpCodeGenerator
+  fpCodeGenerator,
+  FileUtil
 {$IFNDEF NOSTDCODEGENS}
   ,fpcgSQLConst
   ,fpcgdbcoll
diff --git a/components/projecttemplates/Makefile b/components/projecttemplates/Makefile
index c292696b15..e732e28b5a 100644
--- a/components/projecttemplates/Makefile
+++ b/components/projecttemplates/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/06/18]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/08/24]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded
@@ -624,178 +624,178 @@ ifeq ($(FULL_TARGET),armeb-embedded)
 override CLEAN_FILES+=$(wildcard $(COMPILER_UNITTARGETDIR)/*$(OEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(PPUEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*$(RSTEXT)) $(wildcard $(COMPILER_UNITTARGETDIR)/*.compiled) $(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT))
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+override COMPILER_OPTIONS+=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 endif
 ifeq ($(FULL_TARGET),i386-linux)
 override COMPILER_INCLUDEDIR+=./
diff --git a/components/projecttemplates/Makefile.fpc b/components/projecttemplates/Makefile.fpc
index 308819584b..feb3b716c0 100644
--- a/components/projecttemplates/Makefile.fpc
+++ b/components/projecttemplates/Makefile.fpc
@@ -2,7 +2,7 @@
 #
 #   Makefile.fpc for ProjTemplates 1.0
 #
-#   This file was generated on 23/08/08
+#   This file was generated on 26-8-08
 
 [package]
 name=projtemplates
@@ -12,7 +12,7 @@ version=1.0
 unittargetdir=lib/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)
 unitdir=../../ideintf/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/ ../../lcl/units/$(CPU_TARGET)-$(OS_TARGET)/$(LCL_PLATFORM)/ ../../packager/units/$(CPU_TARGET)-$(OS_TARGET)/ ./
 includedir=./
-options=-dLCL -dLCL$(LCL_PLATFORM) -S2 -gl
+options=-dLCL -dLCL$(LCL_PLATFORM) -Scgi -MObjFPC
 
 [target]
 units=projtemplates.pas
diff --git a/components/projecttemplates/languages/frmtemplatevariables.de.po b/components/projecttemplates/languages/frmtemplatevariables.de.po
index 24adf0b39b..59497dd080 100644
--- a/components/projecttemplates/languages/frmtemplatevariables.de.po
+++ b/components/projecttemplates/languages/frmtemplatevariables.de.po
@@ -13,6 +13,10 @@ msgstr ""
 msgid "Description"
 msgstr "Beschreibung"
 
+#: frmtemplatevariables.snoadditionalvars
+msgid "This project has no additional variables."
+msgstr ""
+
 #: frmtemplatevariables.svalue
 msgid "Value"
 msgstr "Wert"
diff --git a/components/projecttemplates/languages/frmtemplatevariables.es.po b/components/projecttemplates/languages/frmtemplatevariables.es.po
index b6d736db94..61f7e426ce 100644
--- a/components/projecttemplates/languages/frmtemplatevariables.es.po
+++ b/components/projecttemplates/languages/frmtemplatevariables.es.po
@@ -13,6 +13,10 @@ msgstr ""
 msgid "Description"
 msgstr "Descripcion"
 
+#: frmtemplatevariables.snoadditionalvars
+msgid "This project has no additional variables."
+msgstr ""
+
 #: frmtemplatevariables.svalue
 msgid "Value"
 msgstr "Valor"
diff --git a/components/projecttemplates/languages/frmtemplatevariables.fr.po b/components/projecttemplates/languages/frmtemplatevariables.fr.po
index 02fc4d290f..de84ed92d9 100644
--- a/components/projecttemplates/languages/frmtemplatevariables.fr.po
+++ b/components/projecttemplates/languages/frmtemplatevariables.fr.po
@@ -13,6 +13,10 @@ msgstr ""
 msgid "Description"
 msgstr "Description"
 
+#: frmtemplatevariables.snoadditionalvars
+msgid "This project has no additional variables."
+msgstr ""
+
 #: frmtemplatevariables.svalue
 msgid "Value"
 msgstr "Valeur"
diff --git a/components/projecttemplates/languages/frmtemplatevariables.id.po b/components/projecttemplates/languages/frmtemplatevariables.id.po
index 88941b92c7..8a4d1a9ca7 100644
--- a/components/projecttemplates/languages/frmtemplatevariables.id.po
+++ b/components/projecttemplates/languages/frmtemplatevariables.id.po
@@ -13,6 +13,10 @@ msgstr ""
 msgid "Description"
 msgstr "Deskripsi"
 
+#: frmtemplatevariables.snoadditionalvars
+msgid "This project has no additional variables."
+msgstr ""
+
 #: frmtemplatevariables.svalue
 msgid "Value"
 msgstr "Nilai"
diff --git a/components/projecttemplates/languages/frmtemplatevariables.it.po b/components/projecttemplates/languages/frmtemplatevariables.it.po
index 043320a6ee..408883881d 100644
--- a/components/projecttemplates/languages/frmtemplatevariables.it.po
+++ b/components/projecttemplates/languages/frmtemplatevariables.it.po
@@ -13,6 +13,10 @@ msgstr ""
 msgid "Description"
 msgstr "Descrizione"
 
+#: frmtemplatevariables.snoadditionalvars
+msgid "This project has no additional variables."
+msgstr ""
+
 #: frmtemplatevariables.svalue
 msgid "Value"
 msgstr "Valore"
diff --git a/components/projecttemplates/languages/frmtemplatevariables.lt.po b/components/projecttemplates/languages/frmtemplatevariables.lt.po
index e6d4123739..e662dff28a 100644
--- a/components/projecttemplates/languages/frmtemplatevariables.lt.po
+++ b/components/projecttemplates/languages/frmtemplatevariables.lt.po
@@ -10,15 +10,19 @@ msgstr ""
 "Last-Translator: Valdas Jankūnas <skroblas@erdves.lt>\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: frmtemplatevariables:sdescription
+#: frmtemplatevariables.sdescription
 msgid "Description"
 msgstr "Aprašas"
 
-#: frmtemplatevariables:svalue
+#: frmtemplatevariables.snoadditionalvars
+msgid "This project has no additional variables."
+msgstr ""
+
+#: frmtemplatevariables.svalue
 msgid "Value"
 msgstr "Vertė"
 
-#: frmtemplatevariables:svariable
+#: frmtemplatevariables.svariable
 msgid "Variable"
 msgstr "Kintamasis"
 
diff --git a/components/projecttemplates/languages/frmtemplatevariables.pb.po b/components/projecttemplates/languages/frmtemplatevariables.pb.po
index 1e0519a09a..d0da0b3052 100644
--- a/components/projecttemplates/languages/frmtemplatevariables.pb.po
+++ b/components/projecttemplates/languages/frmtemplatevariables.pb.po
@@ -8,6 +8,10 @@ msgstr ""
 msgid "Description"
 msgstr "Descricao"
 
+#: frmtemplatevariables.snoadditionalvars
+msgid "This project has no additional variables."
+msgstr ""
+
 #: frmtemplatevariables.svalue
 msgid "Value"
 msgstr "Valor"
diff --git a/components/projecttemplates/languages/frmtemplatevariables.pl.po b/components/projecttemplates/languages/frmtemplatevariables.pl.po
index 081baf2b17..521e22edb3 100644
--- a/components/projecttemplates/languages/frmtemplatevariables.pl.po
+++ b/components/projecttemplates/languages/frmtemplatevariables.pl.po
@@ -15,6 +15,10 @@ msgstr ""
 msgid "Description"
 msgstr "Opis"
 
+#: frmtemplatevariables.snoadditionalvars
+msgid "This project has no additional variables."
+msgstr ""
+
 #: frmtemplatevariables.svalue
 msgid "Value"
 msgstr "Wartość"
diff --git a/components/projecttemplates/languages/frmtemplatevariables.ru.po b/components/projecttemplates/languages/frmtemplatevariables.ru.po
index 2e02ba1358..82e8629eee 100644
--- a/components/projecttemplates/languages/frmtemplatevariables.ru.po
+++ b/components/projecttemplates/languages/frmtemplatevariables.ru.po
@@ -13,6 +13,10 @@ msgstr ""
 msgid "Description"
 msgstr "Описание"
 
+#: frmtemplatevariables.snoadditionalvars
+msgid "This project has no additional variables."
+msgstr ""
+
 #: frmtemplatevariables.svalue
 msgid "Value"
 msgstr "Значение"
diff --git a/components/projecttemplates/languages/idetemplateproject.lt.po b/components/projecttemplates/languages/idetemplateproject.lt.po
index c03617397f..1df8de6e65 100644
--- a/components/projecttemplates/languages/idetemplateproject.lt.po
+++ b/components/projecttemplates/languages/idetemplateproject.lt.po
@@ -10,11 +10,11 @@ msgstr ""
 "Last-Translator: Valdas Jankūnas <skroblas@erdves.lt>\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: idetemplateproject:snewfromtemplate
+#: idetemplateproject.snewfromtemplate
 msgid "New project from template"
 msgstr "Naujas projektas pagal šabloną"
 
-#: idetemplateproject:sprojecttemplatesettings
+#: idetemplateproject.sprojecttemplatesettings
 msgid "Project templates options"
 msgstr "Projekto šablono parinktys"
 
diff --git a/components/projecttemplates/projecttemplates.pp b/components/projecttemplates/projecttemplates.pp
index 486b4f2b06..8e9af12062 100644
--- a/components/projecttemplates/projecttemplates.pp
+++ b/components/projecttemplates/projecttemplates.pp
@@ -5,7 +5,7 @@ unit ProjectTemplates;
 interface
 
 uses
-  Classes, SysUtils, IniFiles;
+  Classes, SysUtils, FileUtil, IniFiles;
 
 type
 
diff --git a/components/synunihighlighter/languages/synunidesigner.de.po b/components/synunihighlighter/languages/synunidesigner.de.po
index 260b0226d5..53edd433cd 100644
--- a/components/synunihighlighter/languages/synunidesigner.de.po
+++ b/components/synunihighlighter/languages/synunidesigner.de.po
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: synunidesigner:sunifiledescription
+#: synunidesigner.sunifiledescription
 msgid "UniHighlighter Syntax"
 msgstr "UniHighlighter-Syntax"
 
diff --git a/components/synunihighlighter/languages/synunidesigner.id.po b/components/synunihighlighter/languages/synunidesigner.id.po
index 63c90f84d6..810f016d60 100644
--- a/components/synunihighlighter/languages/synunidesigner.id.po
+++ b/components/synunihighlighter/languages/synunidesigner.id.po
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: synunidesigner:sunifiledescription
+#: synunidesigner.sunifiledescription
 msgid "UniHighlighter Syntax"
 msgstr "Sintaks UniHighlighter"
 
diff --git a/components/synunihighlighter/languages/synunidesigner.lt.po b/components/synunihighlighter/languages/synunidesigner.lt.po
index 82070ab732..131e09c4c3 100644
--- a/components/synunihighlighter/languages/synunidesigner.lt.po
+++ b/components/synunihighlighter/languages/synunidesigner.lt.po
@@ -10,7 +10,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "PO-Revision-Date: 2008-06-12 21:47+0300\n"
 
-#: synunidesigner:sunifiledescription
+#: synunidesigner.sunifiledescription
 msgid "UniHighlighter Syntax"
 msgstr "UniHighlighter sintaksė"
 
diff --git a/components/synunihighlighter/languages/synunidesigner.pl.po b/components/synunihighlighter/languages/synunidesigner.pl.po
index 6c40da2125..5f343f8d02 100644
--- a/components/synunihighlighter/languages/synunidesigner.pl.po
+++ b/components/synunihighlighter/languages/synunidesigner.pl.po
@@ -11,7 +11,7 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: POLAND\n"
 
-#: synunidesigner:sunifiledescription
+#: synunidesigner.sunifiledescription
 msgid "UniHighlighter Syntax"
 msgstr ""
 
diff --git a/components/synunihighlighter/languages/synunidesigner.po b/components/synunihighlighter/languages/synunidesigner.po
index afa18a56b2..4e653ed31b 100644
--- a/components/synunihighlighter/languages/synunidesigner.po
+++ b/components/synunihighlighter/languages/synunidesigner.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: synunidesigner:sunifiledescription
+#: synunidesigner.sunifiledescription
 msgid "UniHighlighter Syntax"
 msgstr ""
 
diff --git a/components/synunihighlighter/languages/synunidesigner.ru.po b/components/synunihighlighter/languages/synunidesigner.ru.po
index ef9e33227d..2bb137ba2a 100644
--- a/components/synunihighlighter/languages/synunidesigner.ru.po
+++ b/components/synunihighlighter/languages/synunidesigner.ru.po
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: synunidesigner:sunifiledescription
+#: synunidesigner.sunifiledescription
 msgid "UniHighlighter Syntax"
 msgstr "Подсветка синтаксиса UniHighlighter"
 
diff --git a/components/synunihighlighter/languages/synunireg.de.po b/components/synunihighlighter/languages/synunireg.de.po
index d2cdb93fea..b75e26c787 100644
--- a/components/synunihighlighter/languages/synunireg.de.po
+++ b/components/synunihighlighter/languages/synunireg.de.po
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: synunireg:sedituni
+#: synunireg.sedituni
 msgid "Edit..."
 msgstr "Bearbeiten ..."
 
diff --git a/components/synunihighlighter/languages/synunireg.id.po b/components/synunihighlighter/languages/synunireg.id.po
index c68387030a..00552d999b 100644
--- a/components/synunihighlighter/languages/synunireg.id.po
+++ b/components/synunihighlighter/languages/synunireg.id.po
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: synunireg:sedituni
+#: synunireg.sedituni
 msgid "Edit..."
 msgstr "Edit..."
 
diff --git a/components/synunihighlighter/languages/synunireg.lt.po b/components/synunihighlighter/languages/synunireg.lt.po
index 159df68191..c01ff222ce 100644
--- a/components/synunihighlighter/languages/synunireg.lt.po
+++ b/components/synunihighlighter/languages/synunireg.lt.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: Valdas Jankūnas <skroblas@erdves.lt>\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: synunireg:sedituni
+#: synunireg.sedituni
 msgid "Edit..."
 msgstr "Keisti..."
 
diff --git a/components/synunihighlighter/languages/synunireg.pl.po b/components/synunihighlighter/languages/synunireg.pl.po
index 15e2a4a46b..00935e7166 100644
--- a/components/synunihighlighter/languages/synunireg.pl.po
+++ b/components/synunihighlighter/languages/synunireg.pl.po
@@ -11,7 +11,7 @@ msgstr ""
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: POLAND\n"
 
-#: synunireg:sedituni
+#: synunireg.sedituni
 msgid "Edit..."
 msgstr ""
 
diff --git a/components/synunihighlighter/languages/synunireg.po b/components/synunihighlighter/languages/synunireg.po
index f751792fcc..3b418cfda2 100644
--- a/components/synunihighlighter/languages/synunireg.po
+++ b/components/synunihighlighter/languages/synunireg.po
@@ -4,7 +4,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: synunireg:sedituni
+#: synunireg.sedituni
 msgid "Edit..."
 msgstr ""
 
diff --git a/components/synunihighlighter/languages/synunireg.ru.po b/components/synunihighlighter/languages/synunireg.ru.po
index 5742370927..e02e224a43 100644
--- a/components/synunihighlighter/languages/synunireg.ru.po
+++ b/components/synunihighlighter/languages/synunireg.ru.po
@@ -9,7 +9,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: synunireg:sedituni
+#: synunireg.sedituni
 msgid "Edit..."
 msgstr "Правка..."
 
diff --git a/components/synunihighlighter/synunidesigner.pas b/components/synunihighlighter/synunidesigner.pas
index 93af5c35ab..acbd2319a9 100644
--- a/components/synunihighlighter/synunidesigner.pas
+++ b/components/synunihighlighter/synunidesigner.pas
@@ -78,7 +78,7 @@ uses
   GraphType, ////TL Added for TFontStyles
   LCLType,   ////TL Added for vk_* key declarations
 {$ENDIF}
-  Classes,
+  Classes, FileUtil,
   SysUtils,
   SynEdit,
   SynEditHighlighter,
diff --git a/components/synunihighlighter/synunihighlighter.pas b/components/synunihighlighter/synunihighlighter.pas
index cec5309c3f..c9095b7d3a 100644
--- a/components/synunihighlighter/synunihighlighter.pas
+++ b/components/synunihighlighter/synunihighlighter.pas
@@ -57,7 +57,7 @@ uses
   ////TL Windows,
   Graphics, Registry,
 {$ENDIF}
-  Classes,
+  Classes, FileUtil,
   SynEditTypes,
   GraphType, ////TL 2003-06-11: Added for TFontStyles
   SynEditHighlighter;