Merge branch themes with branch gh-pages