Fix templates
Update source
Build