diff --git a/ccm-docrepo/web/themes/heirloom/packages/docrepo/xsl/docrepo.xsl b/ccm-docrepo/web/themes/heirloom/packages/docrepo/xsl/docrepo.xsl
index 28908a4c4..ed6d140ee 100644
--- a/ccm-docrepo/web/themes/heirloom/packages/docrepo/xsl/docrepo.xsl
+++ b/ccm-docrepo/web/themes/heirloom/packages/docrepo/xsl/docrepo.xsl
@@ -7,7 +7,7 @@
                    version="1.0">
 
 <xsl:import href="../../cms/xsl/cms.xsl"/> 
-<xsl:import href="../../acs-admin/xsl/admin_en.xsl"/>
+<xsl:import href="../../admin/xsl/admin_en.xsl"/>
 <xsl:import href="../../categorization/xsl/categorization.xsl"/>
 <xsl:import href="../../bebop/xsl/DimensionalNavbar.xsl"/>
 <xsl:import href="../../toolbox/xsl/ControlBar.xsl"/>
diff --git a/ccm-sci-bundle/bundles/demo/cfg/integration.properties b/ccm-sci-bundle/bundles/demo/cfg/integration.properties
index a13d86a8f..627b51e60 100644
--- a/ccm-sci-bundle/bundles/demo/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/demo/cfg/integration.properties
@@ -28,7 +28,6 @@ waf.templating.stylesheet_paths=/WEB-INF/resources/scientificCMS-stylesheet-path
 
 core.ui.pagemap.root_page_url=navigation/
 core.ui.pagemap.workspace_url=navigation/
-# core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
 core.ui.pagemap.user_redirect_url=content-center/redirect.jsp
 
 ; workflow configuration
@@ -40,6 +39,9 @@ waf.xml.xsl_transformer=xalan
 waf.xml.activate_full_date_formatter=true
 
 # ccm-cms parameters
+# In order to create several content-section uncomment the line below and
+# list the desired content section names
+com.arsdigita.cms.loader.section_names=institute,homepages,publications,research
 
 com.arsdigita.cms.category_authoring_add_form=com.arsdigita.bundle.ui.ItemCategoryPicker
 
@@ -58,6 +60,7 @@ com.arsdigita.cms.default_template_resolver_class=com.arsdigita.subsite.dispatch
 ; com.arsdigita.cms.dhtml_editor_hidden_buttons=
 ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
 
+com.arsdigita.cms.allow_content_create_in_section_listing=false
 com.arsdigita.cms.disable_item_pfs=true
 
 com.arsdigita.cms.hide_admin_tabs=true
@@ -109,11 +112,12 @@ com.arsdigita.navigation.templates_file=bundle/navigation/sci-templates.txt
 
 # ccm-search application
 com.arsdigita.london.search.show_sponsored_links=true
+; Comment this out or increase the num_of_threads iv you really use remote search
+com.arsdigita.london.search.num_threads=0
 
 
 # ccm-subsite application
 com.arsdigita.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
-com.arsdigita.london.search.num_threads=0
 
 
 # ccm-themedirector application
@@ -125,14 +129,14 @@ themedirector.default_theme_path=themes/static/aplaws-generic
 # ccm-sci-bundle (Loader only)
 #com.arsdigita.bundle.loader.category_files=bundle/categories/sci-nav-domain-1.00.xml,bundle/categories/sci-nav-hierarchy-1.00.xml
 #com.arsdigita.bundle.loader.custom_app_instances=com.arsdigita.navigation.Navigation:scimenu:ScientificCMS Navigation Menu,com.arsdigita.navigation.Navigation:libmenu:LibreCMS Navigation Menu 
-#com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/generic/,STD-NAV:/portal/
+com.arsdigita.bundle.loader.domain_mappings=STD-NAV:/navigation/,STD-NAV:/portal/,STD-NAV:/institute/,STD-NAV:/homepages/,STD-NAV:/research/,STD-NAV:/publications/
 # =============================================================================================
 # runtime specific configurations
 
 waf.admin.email=webmaster@scientificCMS.org
 waf.admin.name.given=SCI
 waf.admin.name.family=Administrator
-waf.admin.password=sci2000
+waf.admin.password=sCi2000V2
 waf.admin.password.question=12345
 waf.admin.password.answer=6
 
diff --git a/ccm-sci-bundle/bundles/demo/cfg/project.xml b/ccm-sci-bundle/bundles/demo/cfg/project.xml
index 747ea0d8b..d15d8e207 100644
--- a/ccm-sci-bundle/bundles/demo/cfg/project.xml
+++ b/ccm-sci-bundle/bundles/demo/cfg/project.xml
@@ -8,15 +8,15 @@
               ccmVersion="6.1" 
                     name="ScientificCMS" 
               prettyName="Scientific CMS" 
-                 version="1-1-6" 
-                 release="demo" 
+                 version="2-0-0" 
+                 release="devel" 
                   webxml="web-sci.xml" 
                   webapp="ROOT" 
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
 
-<ccm:databases>
-	<ccm:database name="postgres"/>
-</ccm:databases>
+  <ccm:databases>
+        <ccm:database name="postgres"/>
+  </ccm:databases>
 
 
   <ccm:build>
@@ -31,23 +31,16 @@
         <ccm:application name="ccm-cms"/>
 
 <!--   Content Assets   -->
-        <ccm:application name="ccm-cms-assets-imagestep"/>
-        <ccm:application name="ccm-cms-assets-relatedlink"/>
 
 <!--   Content Types   -->
         <ccm:application name="ccm-cms-types-article"/>
-        <ccm:application name="ccm-cms-types-filestorageitem"/>
-        <ccm:application name="ccm-cms-types-formitem"/>
-        <ccm:application name="ccm-cms-types-formsectionitem"/>
 
 <!--   Applications   -->
         <ccm:application name="ccm-navigation"/>
         <!-- ccm-portalworkspace depends on ccm-subsite  -->
         <ccm:application name="ccm-portalworkspace"/>
-        <ccm:application name="ccm-portalworkspace-homepage"/>
         <ccm:application name="ccm-shortcuts"/>
-        <ccm:application name="ccm-subsite"/>                    
-
+        <ccm:application name="ccm-subsite"/>
         <ccm:application name="ccm-themedirector"/>
 
 <!--   LDN extension  -->
@@ -62,43 +55,59 @@
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 <!--    Scientific CMS  OPTIONAL packages                                    -->
-<!--    Various combinations of these packages make up specific editions     -->
+<!--    Various combinations of these packages make up specific bundles      -->
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 
-<!--   Content Assets   -->
-        <ccm:application name="ccm-cms-assets-fileattachment"/>
-        <ccm:application name="ccm-cms-assets-notes"/>
 
-<!--   Content Types   -->
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--   Standard Bundle                                                       -->
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+
+<!--   Standard Bundle's Content Assets                                      -->
+        <ccm:application name="ccm-cms-assets-fileattachment"/>
+        <ccm:application name="ccm-cms-assets-imagestep"/>
+        <ccm:application name="ccm-cms-assets-notes"/>
+        <ccm:application name="ccm-cms-assets-relatedlink"/>
+
+<!--   Standard Bundle's Content Types                                       -->
         <ccm:application name="ccm-cms-types-address"/>
         <ccm:application name="ccm-cms-types-bookmark"/>
         <ccm:application name="ccm-cms-types-contact"/>
         <ccm:application name="ccm-cms-types-event"/>
+        <ccm:application name="ccm-cms-types-filestorageitem"/>
+        <ccm:application name="ccm-cms-types-formitem"/>
+        <ccm:application name="ccm-cms-types-formsectionitem"/>
         <ccm:application name="ccm-cms-types-image"/>
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
         <ccm:application name="ccm-cms-types-person"/>
 
-<!--   Applications   -->
+<!--   Standard Bundle's Applications   -->
+        <ccm:application name="ccm-portalworkspace-homepage"/>
         <ccm:application name="ccm-cms-publicpersonalprofile"/>
-        <ccm:application name="ccm-portalserver"/>
 
-<!--   LDN extension  -->
-<!--    temporarily excluded because configuration issues have to be resolved
-        <ccm:application name="ccm-rssfeed"/>                        
--->
-
-<!--   SCI extension  -->
-<!--
+<!--   Standard Bundle's SCI extension  -->
+        <!--
         <ccm:application name="ccm-sci-personalprojects"/>
--->
+        -->
         <ccm:application name="ccm-sci-personalpublications"/>
         <ccm:application name="ccm-sci-publications"/>
 
+        <ccm:application name="ccm-sci-types-department"/>
+        <ccm:application name="ccm-sci-types-institute"/>
         <ccm:application name="ccm-sci-types-member"/>
         <ccm:application name="ccm-sci-types-project"/>
 
 
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+<!--   DEMO Bundle (additional packages)                                     -->
+<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
+
+
+<!--   DEMO Bundle's addigtional Applications   -->
+        <ccm:application name="ccm-docrepo"/>
+        <ccm:application name="ccm-forum"/>  
+
 
 <!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
 <!--    Scientific CMS   potential ADD-ONS packages                          -->
@@ -118,6 +127,8 @@
         <ccm:application name="ccm-cms-types-pressrelease"/>
         <ccm:application name="ccm-cms-types-service"/>
         <ccm:application name="ccm-cms-types-siteproxy"/>
+        <!- - package survey is currently broken  - ->
+        <ccm:application name="ccm-cms-types-survey"/>
         <ccm:application name="ccm-cms-types-xmlfeed"/>
 -->
 
@@ -126,53 +137,16 @@
         <ccm:application name="ccm-auth-http"/>
         <ccm:application name="ccm-bookmarks"/>
         <ccm:application name="ccm-docmgr"/>
--->
-        <ccm:application name="ccm-docrepo"/>
-        <ccm:application name="ccm-forum"/>  
         <ccm:application name="ccm-forum-categorised"/>
+-->
 <!--
         <ccm:application name="ccm-weblog"/>
         <ccm:application name="ccm-webpage"/>
 -->
 
-<!--   LDN extension  -->
-<!--
-        <ccm:application name="ccm-ldn-exporter"/>
-        <ccm:application name="ccm-ldn-freeform"/>
-        <ccm:application name="ccm-ldn-importer"/>
--->
 
 
   </ccm:build>
 
 
-<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-<!--    Scientific CMS   list of OBSOLETE modules                            -->
-<!--    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -    -->
-
-<!--   Content Types   -->
-<!--    <ccm:application name="ccm-cms-types-motditem"/> 
-        Current code does not include any xsl templates, conent type does not
-        appear in the list of types in content center. 
-        For the moment no longer supported (2012-02-06)                      -->
-
-<!--   Applications   -->
-<!--    currently doesn't work for unknown reason
-        <ccm:application name="ccm-simplesurvey"/>                   -->
-<!--    Without known funcionality
-        <ccm:application name="ccm-formbuilder-pdf"/>
-        <ccm:application name="ccm-user-preferences"/>               -->
-
-<!--   LDN extension  -->
-<!--    Conflicts with ccm-sci-bundle (this package)                 -->
-<!--    <ccm:application name="ccm-ldn-aplaws"/>                     -->
-<!--    In it's current implementation very ldn / aplaws specific
-        <ccm:application name="ccm-ldn-atoz"/>  
-        <ccm:application name="ccm-ldn-dublin"/>                     -->
-
-
-<!-- tools will be downloaded from trunk, but does not
-     contain java code to be compiled!
-        <ccm:application name="tools"/>           -->
-
 </ccm:project>
diff --git a/ccm-sci-bundle/bundles/demo/res/bundle/categories/sci-nav-domain-1.00.xml b/ccm-sci-bundle/bundles/demo/res/bundle/categories/sci-nav-domain-1.00.xml
index 31486e212..a76a5e526 100644
--- a/ccm-sci-bundle/bundles/demo/res/bundle/categories/sci-nav-domain-1.00.xml
+++ b/ccm-sci-bundle/bundles/demo/res/bundle/categories/sci-nav-domain-1.00.xml
@@ -13,33 +13,33 @@
               key="STD-NAV" 
               title="Sci Navigation List" 
               version="1.00" released="2007-08-10">
+  
+  <terms:term id="1000" name="Forschung" inAtoZ="false"/>
+    <terms:term id="1200" name="Projekte" inAtoZ="false"/>
+    <terms:term id="1400" name="Veröffentlichungen" inAtoZ="false"/>
+      <terms:term id="1420" name="Publikationen" inAtoZ="false"/>
+      <terms:term id="1440" name="Arbeitspapiere" inAtoZ="false"/>
+      <terms:term id="1460" name="Schriftenreihe" inAtoZ="false"/>
+      <terms:term id="1480" name="Sci Report" inAtoZ="false"/>
+      <terms:term id="1500" name="Jahresberichte" inAtoZ="false"/>
+    <terms:term id="1600" name="Kolloquium" inAtoZ="false"/>
+    <terms:term id="1800" name="Jour Fix" inAtoZ="false"/>
+    <terms:term id="2000" name="Tagungen" inAtoZ="false"/>
+  
+  <terms:term id="3000" name="Lehre und Studium" inAtoZ="false"/>
+    <terms:term id="3200" name="Masterstudiengang Sci" inAtoZ="false"/>
+    <terms:term id="3400" name="Weitere Lehre" inAtoZ="false"/>
 
-  <terms:term id="1000" name="Institut" inAtoZ="false"/>
-    <terms:term id="1200" name="Abteilungen" inAtoZ="false"/>
-      <terms:term id="1220" name="Abteilung 1" inAtoZ="false"/>
-      <terms:term id="1240" name="Abteilung 2" inAtoZ="false"/>
-      <terms:term id="1260" name="Abteilung 3" inAtoZ="false"/>
-      <terms:term id="1280" name="Abteilung 4" inAtoZ="false"/>
-      <terms:term id="1300" name="Abteilung 5" inAtoZ="false"/>
-    <terms:term id="1400" name="Mitglieder" inAtoZ="false"/>
-    <terms:term id="1600" name="Bibliothek" inAtoZ="false"/>
-    <terms:term id="1800" name="Ankündigungen" inAtoZ="false"/>
-  
-  <terms:term id="3000" name="Forschung" inAtoZ="false"/>
-    <terms:term id="3200" name="Projekte" inAtoZ="false"/>
-    <terms:term id="3400" name="Veröffentlichungen" inAtoZ="false"/>
-      <terms:term id="3420" name="Publikationen" inAtoZ="false"/>
-      <terms:term id="3440" name="Arbeitspapiere" inAtoZ="false"/>
-      <terms:term id="3460" name="Schriftenreihe" inAtoZ="false"/>
-      <terms:term id="3480" name="Sci Report" inAtoZ="false"/>
-      <terms:term id="3500" name="Jahresberichte" inAtoZ="false"/>
-    <terms:term id="3600" name="Kolloquium" inAtoZ="false"/>
-    <terms:term id="3800" name="Jour Fix" inAtoZ="false"/>
-    <terms:term id="4000" name="Tagungen" inAtoZ="false"/>
-  
-  <terms:term id="5000" name="Lehre und Studium" inAtoZ="false"/>
-    <terms:term id="5200" name="Masterstudiengang Sci" inAtoZ="false"/>
-    <terms:term id="5400" name="Weitere Lehre" inAtoZ="false"/>
+  <terms:term id="5000" name="Institut" inAtoZ="false"/>
+    <terms:term id="5200" name="Abteilungen" inAtoZ="false"/>
+      <terms:term id="5220" name="Abteilung 1" inAtoZ="false"/>
+      <terms:term id="5240" name="Abteilung 2" inAtoZ="false"/>
+      <terms:term id="5260" name="Abteilung 3" inAtoZ="false"/>
+      <terms:term id="5280" name="Abteilung 4" inAtoZ="false"/>
+      <terms:term id="5300" name="Abteilung 5" inAtoZ="false"/>
+    <terms:term id="5400" name="Mitglieder" inAtoZ="false"/>
+    <terms:term id="5600" name="Bibliothek" inAtoZ="false"/>
+    <terms:term id="5800" name="Ankündigungen" inAtoZ="false"/>
     
   <terms:term id="9002" name="Archiv" inAtoZ="false"/>
   <terms:term id="9200" name="Informative Links" inAtoZ="false"/>
diff --git a/ccm-sci-bundle/bundles/demo/res/bundle/categories/sci-nav-hierarchy-1.00.xml b/ccm-sci-bundle/bundles/demo/res/bundle/categories/sci-nav-hierarchy-1.00.xml
index cfce50400..6515ed93e 100644
--- a/ccm-sci-bundle/bundles/demo/res/bundle/categories/sci-nav-hierarchy-1.00.xml
+++ b/ccm-sci-bundle/bundles/demo/res/bundle/categories/sci-nav-hierarchy-1.00.xml
@@ -13,9 +13,8 @@
   <terms:term id="1000"/>
   <terms:term id="3000"/>
   <terms:term id="5000"/>
-  
+
   <terms:orderedPair>
-    <!-- narrower terms, first level  -->  
     <terms:source>
       <terms:term id="1000"/>
     </terms:source>
@@ -24,53 +23,6 @@
     </terms:destination>
   </terms:orderedPair>
 
-  <!--  narrower terms, second level  -->
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1200"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1220"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1200"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1240"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1200"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1260"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1200"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1280"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1200"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="1300"/>
-    </terms:destination>
-  </terms:orderedPair>
-<!--  narrower terms, second level END  -->
-  
   <terms:orderedPair>
     <terms:source>
       <terms:term id="1000"/>
@@ -80,6 +32,53 @@
     </terms:destination>
   </terms:orderedPair>
 
+  <!--  narrower terms, second level  -->
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1420"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1440"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1460"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1480"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="1400"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="1500"/>
+    </terms:destination>
+  </terms:orderedPair>
+<!--  narrower terms, second level END  -->
+  
   <terms:orderedPair>
     <terms:source>
       <terms:term id="1000"/>
@@ -103,18 +102,10 @@
       <terms:term id="1000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="9002"/>
+      <terms:term id="2000"/>
     </terms:destination>
   </terms:orderedPair>
 
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="1000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="9200"/>
-    </terms:destination>
-  </terms:orderedPair>
 
   <terms:orderedPair>
     <terms:source>
@@ -124,7 +115,6 @@
       <terms:term id="3200"/>
     </terms:destination>
   </terms:orderedPair>
-
   <terms:orderedPair>
     <terms:source>
       <terms:term id="3000"/>
@@ -133,97 +123,108 @@
       <terms:term id="3400"/>
     </terms:destination>
   </terms:orderedPair>
+ 
+  
+  <terms:orderedPair>
+    <!-- narrower terms, first level  -->  
+    <terms:source>
+      <terms:term id="5000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="5200"/>
+    </terms:destination>
+  </terms:orderedPair>
 
   <!--  narrower terms, second level  -->
   <terms:orderedPair>
     <terms:source>
-      <terms:term id="3400"/>
+      <terms:term id="5200"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3420"/>
+      <terms:term id="5220"/>
     </terms:destination>
   </terms:orderedPair>
 
   <terms:orderedPair>
     <terms:source>
-      <terms:term id="3400"/>
+      <terms:term id="5200"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3440"/>
+      <terms:term id="5240"/>
     </terms:destination>
   </terms:orderedPair>
 
   <terms:orderedPair>
     <terms:source>
-      <terms:term id="3400"/>
+      <terms:term id="5200"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3460"/>
+      <terms:term id="5260"/>
     </terms:destination>
   </terms:orderedPair>
 
   <terms:orderedPair>
     <terms:source>
-      <terms:term id="3400"/>
+      <terms:term id="5200"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3480"/>
+      <terms:term id="5280"/>
     </terms:destination>
   </terms:orderedPair>
 
   <terms:orderedPair>
     <terms:source>
-      <terms:term id="3400"/>
+      <terms:term id="5200"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3500"/>
+      <terms:term id="5300"/>
     </terms:destination>
   </terms:orderedPair>
 <!--  narrower terms, second level END  -->
   
   <terms:orderedPair>
     <terms:source>
-      <terms:term id="3000"/>
+      <terms:term id="5000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3600"/>
+      <terms:term id="5400"/>
     </terms:destination>
   </terms:orderedPair>
 
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="3800"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-  <terms:orderedPair>
-    <terms:source>
-      <terms:term id="3000"/>
-    </terms:source>
-    <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="4000"/>
-    </terms:destination>
-  </terms:orderedPair>
-
-
   <terms:orderedPair>
     <terms:source>
       <terms:term id="5000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5200"/>
+      <terms:term id="5600"/>
     </terms:destination>
   </terms:orderedPair>
+
   <terms:orderedPair>
     <terms:source>
       <terms:term id="5000"/>
     </terms:source>
     <terms:destination isDefault="true" isPreferred="true">
-      <terms:term id="5200"/>
+      <terms:term id="5800"/>
     </terms:destination>
   </terms:orderedPair>
-  
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="5000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="9002"/>
+    </terms:destination>
+  </terms:orderedPair>
+
+  <terms:orderedPair>
+    <terms:source>
+      <terms:term id="5000"/>
+    </terms:source>
+    <terms:destination isDefault="true" isPreferred="true">
+      <terms:term id="9200"/>
+    </terms:destination>
+  </terms:orderedPair>
+ 
   </terms:hierarchy>
diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
index 8270e070f..9c3bcce1c 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
@@ -39,6 +39,9 @@ waf.xml.xsl_transformer=xalan
 waf.xml.activate_full_date_formatter=true
 
 # ccm-cms parameters
+# In order to create several content-section uncomment the line below and
+# list the desired content section names
+#com.arsdigita.cms.loader.section_names=generic,openccm,sci,libre,homepages
 
 com.arsdigita.cms.category_authoring_add_form=com.arsdigita.bundle.ui.ItemCategoryPicker
 
diff --git a/ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt b/ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt
index 80d8612e5..008184981 100755
--- a/ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt
+++ b/ccm-sci-bundle/bundles/devel/res/bundle/navigation/sci-templates.txt
@@ -1,9 +1,9 @@
-ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-ldn-navigation/navigation/sci-default.jsp
-ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-ldn-navigation/navigation/sci-recent.jsp
-ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-ldn-navigation/navigation/sci-atoz.jsp
-ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-ldn-navigation/navigation/sci-events.jsp
-ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-ldn-navigation/navigation/sci-portal.jsp
-ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-ldn-navigation/navigation/sci-portal-welcome.jsp
-ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-ldn-navigation/navigation/sci-welcome.jsp
-ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-ldn-navigation/navigation/SpecializingList.jsp
-ScientificCMS Publications List,Sci publications listing page,/templates/ccm-ldn-navigation/navigation/SciPublicationList.jsp
+ScientificCMS Default Items Page,Sci Default Navigation Index Page ordering items in ascending order,/templates/ccm-navigation/navigation/sci-default.jsp
+ScientificCMS Recent Items Page,Sci List of items ordered with most recent first,/templates/ccm-navigation/navigation/sci-recent.jsp
+ScientificCMS A-Z Items,Sci List of items paginated as A-Z,/templates/ccm-navigation/navigation/sci-atoz.jsp
+ScientificCMS Events Page,Sci Events Page ordering events in ??? order,/templates/ccm-navigation/navigation/sci-events.jsp
+ScientificCMS Portal Page,Sci Portal Page for embedding a portal page as navigation leaves page,/templates/ccm-navigation/navigation/sci-portal.jsp
+ScientificCMS Portal Welcome Page,Sci Portal page meant as site welcome page,/templates/ccm-navigation/navigation/sci-portal-welcome.jsp
+ScientificCMS Navigation Welcome Page,Sci site welcome page created by navigation root term,/templates/ccm-navigation/navigation/sci-welcome.jsp
+ScientificCMS Specializing Items List,Sci Specialising List item page,/templates/ccm-navigation/navigation/SpecializingList.jsp
+ScientificCMS Publications List,Sci publications listing page,/templates/ccm-navigation/navigation/SciPublicationList.jsp