Font refactoring + additional samples