Track ThemesProvider and ThemeChooser locally now