Improves the Plugins & Themes passive detection, fixes #674