More font re-arrangement hopefully final