Move theme managing in ThemeManager class