Modify styles and markup to reflect new typography