Themes now won't appear in trees multiple times