Updated /theme usage
Merge branch 'master' into plugins