Updated for new fonts