refactor tokens as classes in themes