More color fixup
More prompt color tweaks