Adjust terminal and popover colors to better match original styling (#3816)

This may have made something else worse, but overall brings us more into
harmony.

Release Notes:

- N/A