refactored theme/themeChildViews and fixed tests