Re-did some color changes that were lost due to a merge collision.