Began making some color fixes