adding themes.xml configuration and refactoring app config to include moduleName