update typography and index.ejs
pull upstream and address conflicts