=== modified file 'sites/all/modules/drupalorg_crosssite/drupalorg_crosssite.module'
--- sites/all/modules/drupalorg_crosssite/drupalorg_crosssite.module	2012-08-14 02:04:40 +0000
+++ sites/all/modules/drupalorg_crosssite/drupalorg_crosssite.module	2012-08-17 13:58:34 +0000
@@ -81,7 +81,7 @@
     array('href' => 'http://drupal.org/community', 'title' => t('Community')),
     array('href' => 'http://drupal.org/getting-involved', 'title' => t('Getting Involved'), 'attributes' => array('title' => t('Learn how to contribute to the Drupal project'))),
     array('title' => l(t('Services'), 'http://drupal.org/drupal-services', array('attributes' => array('title' => t('People and organizations offering Drupal services')))) . ', '
-      . l(t('Training'), 'http://drupal.org/training-services', array('attributes' => array('title' => t('People and organizations offering Drupal training')))) . ' & '
+      . l(t('Training'), 'http://drupal.org/training', array('attributes' => array('title' => t('People and organizations offering Drupal training')))) . ' & '
       . l(t('Hosting'), 'http://drupal.org/hosting', array('attributes' => array('title' => t('Organizations offering Drupal hosting')))), 'html' => TRUE),
     array('href' => 'http://groups.drupal.org/groups', 'title' => t('Groups & Meetups'), 'attributes' => array('title' => t('groups.drupal.org'))),
     array('href' => 'http://drupal.org/drupalcon', 'title' => t('DrupalCon'), 'attributes' => array('title' => t('Upcoming and past DrupalCons'))),
@@ -187,10 +187,10 @@
     case 'marketplace':
       $vars['section_name'] = 'Marketplace';
       $nav_content_links = array(
-        'services' => array('title' => t('Services'), 'href' => 'node/21791', '#active' => drupalorg_crosssite_child_of('drupal-services')),
+        'services' => array('title' => t('Services'), 'href' => 'drupal-services', '#active' => drupalorg_crosssite_is_type(array('organization')) || drupalorg_crosssite_child_of('node/add/organization') || drupalorg_crosssite_match_path('^drupal-services/')),
         'hosting' => array('title' => t('Hosting'), 'href' => 'hosting', '#active' => drupalorg_crosssite_child_of('hosting')),
-        'training' => array('title' => t('Training'), 'href' => 'node/313581', '#active' => drupalorg_crosssite_child_of('training-services')),
-        'marketplace-preview' => array('title' => t('Marketplace preview'), 'href' => 'marketplace-preview', '#active' => drupalorg_crosssite_is_type(array('organization')) || drupalorg_crosssite_child_of('node/add/organization') || drupalorg_crosssite_match_path('^marketplace-preview')),
+        'training' => array('title' => t('Training'), 'href' => 'training', '#active' => drupalorg_crosssite_child_of('training')),       
+		'services-old' => array('title' => t('Services old'), 'href' => 'node/21791', '#active' => drupalorg_crosssite_child_of('drupal-services-old')),
       );
       break;
 
@@ -317,7 +317,7 @@
         elseif (drupalorg_crosssite_match_path('^(irc|mailing-lists|profile|community|getting-involved|community-spotlight)(/|$)') || drupalorg_crosssite_child_of('forum') || drupalorg_crosssite_is_type(array('forum')) || drupalorg_crosssite_child_of('node/281873')) {
           $section = 'community';
         }
-        elseif (drupalorg_crosssite_child_of('node/366') || drupalorg_crosssite_is_type(array('organization')) || drupalorg_crosssite_child_of('node/add/organization') || drupalorg_crosssite_match_path('^(marketplace-preview|hosting)')) {
+        elseif (drupalorg_crosssite_child_of('node/366') || drupalorg_crosssite_is_type(array('organization')) || drupalorg_crosssite_child_of('node/add/organization') || drupalorg_crosssite_match_path('^(drupal-services|hosting|training)')) {
           $section = 'marketplace';
         }
         elseif (drupalorg_crosssite_child_of('case-studies') || drupalorg_crosssite_is_type(array('casestudy'))) {