Move indicator collection functions in getFatThemes to Indicator