Update styles with new fonts, refactor