change path define, template to theme
Merge branch 'develop'