diff --git a/CMakeLists.txt b/CMakeLists.txt
index a61407009..ca83ea668 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,6 +96,7 @@ OPTION(FREECAD_MAINTAINERS_BUILD "Build FreeCAD for Maintainers, with Docu and 3
 OPTION(FREECAD_BUILD_CAM "Build the FreeCAD CAM module and the needed libs, be aware, unfinished code!" OFF)
 OPTION(FREECAD_BUILD_FEM "Build the FreeCAD FEM module, be aware, unfinished code!" ON)
 OPTION(FREECAD_BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
+OPTION(FREECAD_BUILD_TEMPLATE "Build the FreeCAD template module which is only for testing purposes" OFF)
 OPTION(FREECAD_BUILD_DEBIAN "Prepare for a build of a Debian package" OFF)
 
 # ==============================================================================
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 88a57d35b..6d440389f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,6 +12,10 @@ if(FREECAD_BUILD_GUI)
 	configure_file(Doc/freecad.qch ${CMAKE_BINARY_DIR}/doc/freecad.qch COPYONLY)
 endif(FREECAD_BUILD_GUI)
 
+if(FREECAD_BUILD_TEMPLATE)
+	add_subdirectory(Tools/_TEMPLATE_)
+endif(FREECAD_BUILD_TEMPLATE)
+
 if(FREECAD_MAINTAINERS_BUILD)
 	add_subdirectory(Doc)
 endif(FREECAD_MAINTAINERS_BUILD)
diff --git a/src/Tools/_TEMPLATE_/App/CMakeLists.txt b/src/Tools/_TEMPLATE_/App/CMakeLists.txt
index adec71c68..a06ef307c 100644
--- a/src/Tools/_TEMPLATE_/App/CMakeLists.txt
+++ b/src/Tools/_TEMPLATE_/App/CMakeLists.txt
@@ -20,7 +20,12 @@ SET(_TEMPLATE__SRCS
 
 add_library(_TEMPLATE_ SHARED ${_TEMPLATE__SRCS})
 target_link_libraries(_TEMPLATE_ ${_TEMPLATE__LIBS})
-fc_copy_script("Mod/_TEMPLATE_" "_TEMPLATE_" Init.py)
+
+
+fc_target_copy_resource(_TEMPLATE_ 
+    ${CMAKE_SOURCE_DIR}/src/Tools/_TEMPLATE_
+    ${CMAKE_BINARY_DIR}/Mod/_TEMPLATE_
+    Init.py)
 
 if(MSVC)
     set_target_properties(_TEMPLATE_ PROPERTIES SUFFIX ".pyd")
@@ -35,6 +40,7 @@ elseif(MINGW)
 else(MSVC)
     set_target_properties(_TEMPLATE_ PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/_TEMPLATE_)
     set_target_properties(_TEMPLATE_ PROPERTIES PREFIX "")
+    set_target_properties(Fem PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
 endif(MSVC)
 
 install(TARGETS _TEMPLATE_ DESTINATION lib)
diff --git a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
index f995219db..1924dd310 100644
--- a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
+++ b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 include_directories(
     ${CMAKE_SOURCE_DIR}/src
     ${CMAKE_CURRENT_BINARY_DIR}
@@ -30,7 +31,11 @@ SET(_TEMPLATE_Gui_SRCS
 
 add_library(_TEMPLATE_Gui SHARED ${_TEMPLATE_Gui_SRCS})
 target_link_libraries(_TEMPLATE_Gui ${_TEMPLATE_Gui_LIBS})
-fc_copy_script("Mod/_TEMPLATE_" "_TEMPLATE_Gui" InitGui.py)
+
+fc_target_copy_resource(_TEMPLATE_Gui 
+    ${CMAKE_SOURCE_DIR}/src/Tools/_TEMPLATE_
+    ${CMAKE_BINARY_DIR}/Mod/_TEMPLATE_
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(_TEMPLATE_Gui PROPERTIES SUFFIX ".pyd")
@@ -45,6 +50,7 @@ elseif(MINGW)
 else(MSVC)
     set_target_properties(_TEMPLATE_Gui PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Mod/_TEMPLATE_)
     set_target_properties(_TEMPLATE_Gui PROPERTIES PREFIX "")
+    set_target_properties(Fem PROPERTIES INSTALL_RPATH ${INSTALL_RPATH})
 endif(MSVC)
 
 install(TARGETS _TEMPLATE_Gui DESTINATION lib)
diff --git a/src/Tools/_TEMPLATE_/Gui/Command.cpp b/src/Tools/_TEMPLATE_/Gui/Command.cpp
index c2c66f6e8..feb5cd7fe 100644
--- a/src/Tools/_TEMPLATE_/Gui/Command.cpp
+++ b/src/Tools/_TEMPLATE_/Gui/Command.cpp
@@ -48,7 +48,7 @@ Cmd_TEMPLATE_Test::Cmd_TEMPLATE_Test()
     sWhatsThis    = QT_TR_NOOP("_TEMPLATE_ Test function");
     sStatusTip    = QT_TR_NOOP("_TEMPLATE_ Test function");
     sPixmap       = "Test1";
-    iAccel        = Qt::CTRL+Qt::Key_H;
+    sAccel        = "CTRL+H";
 }
 
 void Cmd_TEMPLATE_Test::activated(int iMsg)