diff --git a/ccm-shp-aplaws/bundles/openccm-devel/cfg/integration.properties b/ccm-shp-aplaws/bundles/openccm-devel/cfg/integration.properties
index 05353c3a3..74bbc63e8 100755
--- a/ccm-shp-aplaws/bundles/openccm-devel/cfg/integration.properties
+++ b/ccm-shp-aplaws/bundles/openccm-devel/cfg/integration.properties
@@ -1,32 +1,41 @@
-; in core: Sucht PatternStyleSheet, u.a. um passende localization zu finden
-templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
-waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
-;
-waf.kernel.data_permission_check_enabled=false
-waf.kernel.primary_user_identifier=email
-; wenn man screen_name aktiviert, klappt loader des Forums nicht.
-; waf.kernel.primary_user_identifier=screen_name
 waf.auto_registration_on=false
-waf.dispatcher.default_expiry=3600
 
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
-
 ; dhtml editor to use (system wide)
 waf.bebop.dhtml_editor=FCKeditor
 
 waf.categorization.show_internal_name=true
-waf.categorization.supported_languages=de,en
+waf.categorization.supported_languages=en,de
 
+waf.dispatcher.default_expiry=3600
+;
+waf.kernel.data_permission_check_enabled=false
+; wenn man screen_name aktiviert, klappt loader des Forums nicht.
+; waf.kernel.primary_user_identifier=screen_name
+waf.kernel.primary_user_identifier=email
+
+waf.lucene.interval=480
+
+waf.pagemap.cookies_duration_minutes=720
+waf.pagemap.login_redirect=content/content-center-redirect.jsp
 waf.pagemap.root=navigation/
 waf.pagemap.workspace=navigation/
-waf.pagemap.login_redirect=content/content-center-redirect.jsp
 
-com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
+; in core: Sucht PatternStyleSheet, u.a. um passende localization zu finden
+waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
+waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
+
+
+com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
+
 com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.jsp
+com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
 com.arsdigita.cms.default_template_resolver_class=com.arsdigita.london.subsite.dispatcher.SubsiteItemTemplateResolver
 
 ; Configure dhtml editor for use in cms content-center
-com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js
+; com.arsdigita.cms.dhtml_editor_config=HTMLArea.Config.CMSStyled,/assets/htmlarea/config/Styled.js
+com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
+com.arsdigita.cms.dhtml_editor_hidden_buttons=
 ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
 com.arsdigita.cms.dhtml_editor_plugins=
 
@@ -42,10 +51,11 @@ com.arsdigita.cms.hide_udct_ui=true
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
 
-com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
 
 com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+
 com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
+
 ; shp nutzt kein siteproxy
 ; com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
 
@@ -59,10 +69,11 @@ com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
 ;  atoz currently not in use
 ;  com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-com.arsdigita.london.navigation.category_menu_show_grand_children_min=2
-com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
-com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
-com.arsdigita.london.navigation.category_menu_show_grand_children_max=4
+; com.arsdigita.london.navigation.category_menu_show_grand_children_min=2
+; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
+; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
+; com.arsdigita.london.navigation.category_menu_show_grand_children_max=4
+com.arsdigita.london.navigation.category_menu_show_grand_children=false
 com.arsdigita.london.navigation.category_menu_show_nephews=false
 com.arsdigita.london.navigation.default_cat_root_path=/navigation/
 com.arsdigita.london.navigation.default_template=/packages/navigation/templates/shp-default.jsp
@@ -71,10 +82,14 @@ com.arsdigita.london.search.show_sponsored_links=true
 
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
+<<<<<<< .mine
+=======
 com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
+>>>>>>> .r207
 com.arsdigita.london.theme.default_theme_context=
 com.arsdigita.london.theme.default_theme_manifest=ccm-ldn-theme.web.mf
-com.arsdigita.london.theme.file_extensions=jpeg jpg gif xsl css js png bmp xml
+com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
+com.arsdigita.london.theme.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 
 
@@ -94,5 +109,5 @@ waf.admin.password.question=12345
 waf.admin.password.answer=6
 
 ;  waf.debug=true
-;  waf.bebop.fancy_xsl_errors=true
+waf.bebop.fancy_xsl_errors=true
 
diff --git a/ccm-shp-aplaws/bundles/openccm-devel/cfg/web.xml b/ccm-shp-aplaws/bundles/openccm-devel/cfg/web.xml
index 17f2c00ca..513297c49 100755
--- a/ccm-shp-aplaws/bundles/openccm-devel/cfg/web.xml
+++ b/ccm-shp-aplaws/bundles/openccm-devel/cfg/web.xml
@@ -4,7 +4,7 @@
 
 <web-app>
 
-  <display-name>CCM SHP</display-name>
+  <display-name>OpenCCM</display-name>
   <description>Content and Collaboration Management</description>
 
   <!-- Require secure connection by redirect to host-port part
diff --git a/ccm-shp-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java b/ccm-shp-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java
index d46e3f4aa..845aafbfa 100755
--- a/ccm-shp-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java
+++ b/ccm-shp-aplaws/src/com/arsdigita/aplaws/ui/TermWidget.java
@@ -19,25 +19,6 @@
 
 package com.arsdigita.aplaws.ui;
 
-import com.arsdigita.london.terms.Domain;
-import com.arsdigita.london.terms.Term;
-
-import com.arsdigita.aplaws.Aplaws;
-import com.arsdigita.bebop.form.Widget;
-import com.arsdigita.bebop.PageState;
-import com.arsdigita.bebop.parameters.ArrayParameter;
-import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.bebop.parameters.BigDecimalParameter;
-import com.arsdigita.categorization.Category;
-import com.arsdigita.domain.DomainCollection;
-import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.persistence.DataCollection;
-import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.xml.Element;
-import com.arsdigita.xml.XML;
-
-import com.arsdigita.cms.CMS;
-
 import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -47,6 +28,27 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import com.arsdigita.aplaws.Aplaws;
+import com.arsdigita.bebop.PageState;
+import com.arsdigita.bebop.form.Widget;
+import com.arsdigita.bebop.parameters.ArrayParameter;
+import com.arsdigita.bebop.parameters.BigDecimalParameter;
+import com.arsdigita.bebop.parameters.StringParameter;
+import com.arsdigita.categorization.Category;
+import com.arsdigita.cms.CMS;
+import com.arsdigita.cms.ContentItem;
+import com.arsdigita.cms.ContentSection;
+import com.arsdigita.domain.DomainCollection;
+import com.arsdigita.domain.DomainObjectFactory;
+import com.arsdigita.london.terms.Domain;
+import com.arsdigita.london.terms.Term;
+import com.arsdigita.london.terms.indexing.Indexer;
+import com.arsdigita.london.terms.indexing.RankedTerm;
+import com.arsdigita.persistence.DataCollection;
+import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.xml.Element;
+import com.arsdigita.xml.XML;
+
 /**
  * A Widget for selecting Terms. Based heavily on CategoryWidget.
  *
@@ -128,13 +130,45 @@ public class TermWidget extends Widget {
         }
 
         Element el = generateCategory(widget, domain.getModel(), ids, null);
+
+        /**
+         * Used by kea based keyphrase extraction facility.
+         * (Added r1885) 
+         * 
+         * @Author: terry_permeance
+         */
+        Indexer indexer = Indexer.retrieve(domain);
+        if (indexer != null) {
+            ContentItem item = CMS.getContext().getContentItem();
+            List<RankedTerm> autoTerms = indexer.index(item, 16);  
+            Element autoCategories = widget.newChildElement("cms:autoCategories", CMS.CMS_XML_NS);      
+            for (Iterator<RankedTerm> i = autoTerms.iterator(); i.hasNext(); ) {
+                RankedTerm nextRankedTerm = i.next();
+                Category cat = nextRankedTerm.getTerm().getModel();
+                if (!ids.contains(cat.getID())) {
+                    String fullname = cat.getQualifiedName(" > ", false);                    
+                    if (fullname != null) {
+                        Element catEl = autoCategories.newChildElement("cms:category", CMS.CMS_XML_NS);
+                        catEl.addAttribute("id", XML.format(cat.getID()));
+                        catEl.addAttribute("name", cat.getName());
+                        catEl.addAttribute("description", cat.getDescription());
+                        catEl.addAttribute("isAbstract", cat.isAbstract() ? "1" : "0");
+                        catEl.addAttribute("isEnabled", cat.isEnabled() ? "1" : "0");
+                        catEl.addAttribute("sortKey", nextRankedTerm.getRanking().toString());
+                        catEl.addAttribute("fullname", fullname);
+                    }
+                }
+            }
+        }
+        
 	if (Aplaws.getAplawsConfig().ajaxExpandAllBranches()) {
  	    // add attribute to the parent node, so that in stylesheet 
 	    // we can look for any ancestor with this attribute (can't 
 	    // add attribute to categoryWidget element as that is not 
 	    // visible when subbranches are transformed)
 	    el.addAttribute("expand",  "all" );
-	}	
+	}
+	
         for (Iterator i=roots.iterator(); i.hasNext(); ) {
             TermSortKeyPair pair = (TermSortKeyPair) i.next();
             Term term = pair.getTerm();
@@ -159,6 +193,9 @@ public class TermWidget extends Widget {
         if (sortKey != null) {
             el.addAttribute("sortKey", sortKey.toString());
         }
+        // sort order attribute added to every node so that we can 
+        // correctly transform xml fragments returned by ajax 
+        el.addAttribute("order", ContentSection.getConfig().getCategoryTreeOrder());
 
         StringBuffer path = new StringBuffer(parent.getAttribute("fullname"));
         if (path.length() > 0) path.append(" > ");
@@ -223,13 +260,14 @@ public class TermWidget extends Widget {
         
         Element el = generateCategory(parent, root, ids, null);
         el.addAttribute("fullname", root.getName());
-        el.addAttribute("node-id", root.getID().toString());
-		
+        el.addAttribute("node-id", root.getID().toString());	
+        el.addAttribute("order", ContentSection.getConfig().getCategoryTreeOrder());
 	if (Aplaws.getAplawsConfig().ajaxExpandAllBranches()) {
 	    //	recognisable attribute has to be in the XML for each snippet that is transformed,
 	    // hence add it to the parent
 	    el.addAttribute("expand",  "all" );
-	}	
+	}
+	
 	List roots = (List) children.get(root.getID());
         if (null != roots) {
             Iterator i = roots.iterator();