Revorked most of templates