Commit for refactoring - dynamic theme and language change.