This was also in @jonasschnelli's pull, which I just rebased. We can keep font improvements for a future pull.