Remove the token when is no longer valid
Add theme template support