Change colors and clean up

See title