Updated font mapping