Change colors and fix minor bug