Changed colours, added text.
Fixed merge conflict.