More colour shuffling

Change-Id: I9daa5c976fd5a8ecf0c86ca79a766acdbd095ac4