Major refactoring; fix #2: Add suport for fonts