Refactored @font-face support