Changed to a more consisten colour scheme