Rebuilding ThemeShaper for Best practice
Merge branch 'master' of https://github.com/spraveenitpro/ThemeShaper