Better colors, and keep highlighting through refresh