Rearranged colours a little for more flexibility

Change-Id: I49b854f05a82f8a4b8cd5d545e3501f436ba89b5