Fonts included and refactored