Templates revamp