Improve color indicators