font fixes
Merge branch 'Major-Refactoring-2' of https://github.com/DigohD/CR into Major-Refactoring-2