Refactor fonts and some resources