Refactoring of font system