Merge style from gh-pages branch