changed colors and some names