Fixed bug with variable name and also added folder rename based on theme name.