#5 #17 fixed fonts