Fix some color discrepancies