Issue #6: Fixed Drupal Twig changes, reformatted templates
Resolving a template conflict manually and updating other templates, thanks to changes from @andreasemer