Change theme to use proper drupal constructs