style(Template) Generic style fixes