Overhaul of CustomFont to work better

Other commits are because you did a manual merge last time I guess