Added command-t and corrected drupal plugin