Improve color token operations