Add a toggle in the settings under auto theme contacts that restricts the auto theme to just group messages leaving the individual conversations with the selected theme.