Track ThemesProvider and ThemeChooser from cm again