Better Font Support

Signed-off-by: James <james.a.forbes@gmail.com>