Improve colors again
Update a few other colors