Updated font and fixed NormalFont