Remove old theme folder
Merge branch 'develop'