Refactor CEThemeManager a bit