Rejigger CFP so it looks good w/ proper color