Code cleanup + new feature : lights up on token change.