Issue #6: Fixed Drupal Twig changes, reformatted templates