changed colors and stuff