Restructure font declarations