Handle new dynamic font setup better...