Fil multiple minor issues related to fg and underlay colors