--- /dev/null
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/header.html.in
+   ${CMAKE_CURRENT_BINARY_DIR}/header.html
+   )
+
+
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKCreatePackageBBdoc.cmake)
+BBTK_CREATE_PACKAGE_BBDOC(${BBTK_PACKAGE_NAME})
 
--- /dev/null
+
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/DoxyMainPage.txt
+  ${CMAKE_CURRENT_BINARY_DIR}/DoxyMainPage.txt
+  IMMEDIATE
+  )
+
+SET(INPUT 
+  ${CMAKE_CURRENT_BINARY_DIR}/DoxyMainPage.txt
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../src
+  )
+
+
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKBuildDoxygenDoc.cmake)
+
+BBTK_BUILD_DOXYGEN_DOC(
+  "${BBTK_PACKAGE_NAME}" 
+  "${INPUT}" 
+  "${BBTK_PACKAGE_DOXYGEN_REL_PATH}"
+  "${DOXYGEN_DOC_PREDEFINED}"
+  )
+
 
     "include ${PACKAGE_NAME}\n"
     "include ${PACKAGE_NAME}-appli\n"
     "#-----------------------------------------\n"
-    "graph ${PACKAGE_NAME} 0 0 ${DOC_OUTPUT} \"none\" \"Package ${PACKAGE_NAME} documentation\"\n"
+    "graph ${PACKAGE_NAME} 0 0 ${DOC_OUTPUT} \"${CMAKE_CURRENT_BINARY_DIR}/header.html\" \"Package ${PACKAGE_NAME} documentation\"\n"
 #${BBTK_DOCUMENT_SCRIPTS_OUTPUT_PATH}/header.html 
     )
 #  CONFIGURE_FILE(
 
-INCLUDE(${BBTK_CMAKE_DIR}/BBTKCreatePackageBBdoc.cmake)
-BBTK_CREATE_PACKAGE_BBDOC(${BBTK_PACKAGE_NAME})
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_doc_bbdoc.cmake)
+
 
--- /dev/null
+
+<h1>bbtk package <b>@BBTK_PACKAGE_NAME@</b></h1>
+
+<p>
+Version <b>@BBTK_PACKAGE_MAJOR_VERSION@.@BBTK_PACKAGE_MINOR_VERSION@.@BBTK_PACKAGE_BUILD_VERSION@</b> - 
+by <b>@BBTK_PACKAGE_AUTHOR@</b>
+<p>
+@BBTK_PACKAGE_DESCRIPTION@
 
-
-CONFIGURE_FILE(
-  ${CMAKE_CURRENT_SOURCE_DIR}/DoxyMainPage.txt
-  ${CMAKE_CURRENT_BINARY_DIR}/DoxyMainPage.txt
-  IMMEDIATE
-  )
-
-SET(INPUT 
-  ${CMAKE_CURRENT_BINARY_DIR}/DoxyMainPage.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../src
-  )
-
-
-INCLUDE(${BBTK_CMAKE_DIR}/BBTKBuildDoxygenDoc.cmake)
-
-BBTK_BUILD_DOXYGEN_DOC(
-  "${BBTK_PACKAGE_NAME}" 
-  "${INPUT}" 
-  "${BBTK_PACKAGE_DOXYGEN_REL_PATH}"
-  "${DOXYGEN_DOC_PREDEFINED}"
-  )
-
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_doc_doxygen.cmake)
 
-INCLUDE(${BBTK_CMAKE_DIR}/BBTKCreatePackageBBdoc.cmake)
-BBTK_CREATE_PACKAGE_BBDOC(${BBTK_PACKAGE_NAME})
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_doc_bbdoc.cmake)
+
 
--- /dev/null
+
+<h1>bbtk package <b>@BBTK_PACKAGE_NAME@</b></h1>
+
+<p>
+Version <b>@BBTK_PACKAGE_MAJOR_VERSION@.@BBTK_PACKAGE_MINOR_VERSION@.@BBTK_PACKAGE_BUILD_VERSION@</b> - 
+by <b>@BBTK_PACKAGE_AUTHOR@</b>
+<p>
+@BBTK_PACKAGE_DESCRIPTION@
 
-
-CONFIGURE_FILE(
-  ${CMAKE_CURRENT_SOURCE_DIR}/DoxyMainPage.txt
-  ${CMAKE_CURRENT_BINARY_DIR}/DoxyMainPage.txt
-  IMMEDIATE
-  )
-
-SET(INPUT 
-  ${CMAKE_CURRENT_BINARY_DIR}/DoxyMainPage.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../src
-  )
-
-
-INCLUDE(${BBTK_CMAKE_DIR}/BBTKBuildDoxygenDoc.cmake)
-
-BBTK_BUILD_DOXYGEN_DOC(
-  "${BBTK_PACKAGE_NAME}" 
-  "${INPUT}" 
-  "${BBTK_PACKAGE_DOXYGEN_REL_PATH}"
-  "${DOXYGEN_DOC_PREDEFINED}"
-  )
-
+INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_doc_doxygen.cmake)