Add theme token
Refactor