Merge "Use classes to apply the 'editfont' preference"