Added token module and removed custom theme dependency.