Adjusts some font styles.
Merge branch 'develop'