Final commit for now, just font stuff