Added / changed all template files