Added another font + cleaned up construction of fonts