Basic refactoring to make adding more fonts a bit easier; adding one to boot