updated and changed colors