Merge changes made in the Drupal theme