added font style
fixed merge conflicts
added typography styles
fixed merge conflicts