cleanup
picked 1a59f0c2b06d3 from glowing-bear to fix font/color issues