Template revamp