Theme Namespace change to ThemeManager