update templates
use the new content loader provider to render the template
align keys