changes made to structure tool
Merge branch 'themes_tool_dev'