Updated for external fonts