Moved Theme to ThemeManager