customize theme
Merge branch 'develop' into gh-pages
update gh-page with new theme