More color fixup