Added new templates and chunks, fixed build script