Fixes multiple font keys + added font filename