Refactoring for the Theme module.
Implemented merging configs.