Updated font settings
Merged conflicts