Have you considered switching to Drupal?