Update themes index to use new findIndicatorsWithData function
Make Theme unit tests pass again