Font stack adjustments
Merge