Updated colors, removed unnecessary code.
changed colors
Merge remote-tracking branch 'origin/master'