Update template files and build