Design finished, templates renamed