Font #2 plus some refactoring.

Quick and dirty PR to add a second font along with a hopefully easy to extend setup.