updated styles to what's live
Bullshit!
Merge branch 'master' into gh-pages