Updated all templates, styles