some cleanup
changed colors