SFV-1391
Renamed drawThemeSwitcher property to be more appropriate of the class it's in.