Moving font support to branch