Fixes #4366 Make message more generic so it works for both plugins and themes