refactor, move color logic to Client