Themes infrastructure was added.
Refactoring