Restructure internal font support