Finish updating core templates.

Closes gh-232