Breaking font handling into sections.
Recode all the things!
Merge remote-tracking branch 'origin/master'