Major update of template files

This update includes some fix templates of design and many integration
too