Move the theme files to templates
Add a post
Merge branch 'develop'