Add border to images
Cleanup font imports and use semantic names