Add theme_package directory
Merge branch 'master' into gh-pages