Changed color ordering (temporary) and format