Added ThemeManager to handle theme changing