Added typekit
Fixed some other styles
manually merge tims changes