Revise font-loading architecture