Updated most files. Added some missing templates.