Improve color definitions