diff --git a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
index 09e88aeca..98c6f1d78 100755
--- a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
+++ b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
@@ -10,22 +10,23 @@ ccm-cms-assets-relatedlink
 ## -- ccm-ldn-dublin  ist das eigentlich ein asset?
 
 # Content types
-ccm-cms-types-address
+# -- ccm-cms-types-address
 # -- ccm-cms-types-agenda
 ccm-cms-types-article
 ccm-cms-types-bookmark
-ccm-cms-types-contact
+# -- ccm-cms-types-contact
 # -- ccm-cms-types-esdservice
 ccm-cms-types-event
-# -- ccm-cms-types-faqitem
+ccm-cms-types-faqitem
 ccm-cms-types-filestorageitem
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
-# -- ccm-cms-types-glossaryitem
+ccm-cms-types-glossaryitem
 # -- ccm-cms-types-htmlform
 # -- ccm-cms-types-inlinesite
 # -- ccm-cms-types-job
 # -- ccm-cms-types-legalnotice
+ccm-cms-types-member
 # -- ccm-cms-types-minutes
 # -- ccm-cms-types-motditem
 ccm-cms-types-mparticle
@@ -33,8 +34,8 @@ ccm-cms-types-newsitem
 # -- ccm-cms-types-organization
 # -- ccm-cms-types-pressrelease
 # -- ccm-cms-types-service
-ccm-cms-types-siteproxy
-#  --  xmlfeed wird moeglicherweise ebenfalls nicht gebraucht
+# ## Fuer OpenCCM aktivieren:
+# -- ccm-cms-types-siteproxy
 # -- ccm-cms-types-xmlfeed
 
 
@@ -45,7 +46,8 @@ ccm-cms-types-siteproxy
 # -- ccm-docmngr    ## temp., produces errors in build
 # -- ccm-formbuilder-pdf
 ccm-forum
-ccm-simplesurvey
+ccm-forum-categorised
+# -- ccm-simplesurvey
 ccm-user-preferences
 # -- ccm-weblog
 # -- ccm-webpage
diff --git a/ccm-gen-aplaws/bundles/devel/cfg/integration.properties b/ccm-gen-aplaws/bundles/devel/cfg/integration.properties
index d0be6db27..382919756 100755
--- a/ccm-gen-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/devel/cfg/integration.properties
@@ -1,6 +1,8 @@
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 ; dhtml editor to use (system wide)
-waf.bebop.dhtml_editor=FCKeditor
+; Xinha is default
+; waf.bebop.dhtml_editor=Xinha
+; waf.bebop.dhtml_editor=FCKeditor
 
 waf.categorization.show_internal_name=true
 waf.categorization.supported_languages=de,en
@@ -33,10 +35,22 @@ com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.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=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
-com.arsdigita.cms.dhtml_editor_hidden_buttons=
+; Xinha is default and should work out of the box
+;com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+; as a temporary measure a different configuration file which includes a link selection box for CCM items
+; and CCM images should be specified:
+com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfig.js
+
+; to use FCKeditor:
+; 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=
+
+; to use deprecated HTMLarea (NOT recommended!):
+; currently configuration is hardcoded, so the fest alternative works
+; com.arsdigita.cms.dhtml_editor_config=HTMLArea
+; com.arsdigita.cms.dhtml_editor_config=HTMLArea,/assets/htmlarea/config/Styled.js
 ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
-com.arsdigita.cms.dhtml_editor_plugins=
 
 com.arsdigita.cms.disable_item_pfs=true
 
@@ -100,13 +114,13 @@ waf.runtime.jdbc_pool_size=80
 
 waf.web.server=localhost\:8080
 
-waf.admin.email=webmaster@aplaws.org
+waf.admin.email=webmaster@openccm.org
 waf.admin.name.given=aplaws 
 waf.admin.name.family=Administrator
 waf.admin.password=123456
 waf.admin.password.question=12345 
 waf.admin.password.answer=6
 
-;  waf.debug=true
-;  waf.bebop.fancy_xsl_errors=true
+waf.debug=true
+waf.bebop.fancy_xsl_errors=true
 
diff --git a/ccm-gen-aplaws/bundles/devel/cfg/web.xml b/ccm-gen-aplaws/bundles/devel/cfg/web.xml
index 2e0b80c57..fba76fbd2 100755
--- a/ccm-gen-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-gen-aplaws/bundles/devel/cfg/web.xml
@@ -4,8 +4,8 @@
 
 <web-app>
 
-  <display-name>CCM ZeS</display-name> 
-  <description>Content and Collaboration Management</description>
+  <display-name>OpenCCM</display-name> 
+  <description>Community and Content Management</description>
 
   <!-- path and filename of the log4j user accessible config file
        WEB-INF/conf/log4j.properties is the built-in default value -->
@@ -17,14 +17,13 @@
 
   <!-- Require secure connection by redirect to host-port part
        of parameter waf.web.secure_server               
-       NOT USED with ZeS                                        
   <filter>
     <filter-name>secured</filter-name>
     <filter-class>com.arsdigita.web.SecureFilter</filter-class>
   </filter>
   -->
   <!-- Initialize Profiler timers
-       NOT USED with ZeS standard / production                                  
+       NOT USED with standard / production                                  
   <filter>
     <filter-name>profiler</filter-name>
     <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties
index 9858dde19..29dea7b72 100755
--- a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties
@@ -1,6 +1,8 @@
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 ; dhtml editor to use (system wide)
-waf.bebop.dhtml_editor=FCKeditor
+; waf.bebop.dhtml_editor=FCKeditor
+waf.bebop.dhtml_editor=Xinha
+waf.bebop.dhtml_editor_src=/assets/xinha/XinhaLoader.js
 
 waf.categorization.show_internal_name=true
 waf.categorization.supported_languages=de
@@ -33,9 +35,10 @@ com.arsdigita.cms.default_folder_template_path=/default/aplaws-folder.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=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
-com.arsdigita.cms.dhtml_editor_hidden_buttons=
+; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
 ; com.arsdigita.cms.dhtml_editor_plugins=TableOperations,CSS
+com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
+com.arsdigita.cms.dhtml_editor_hidden_buttons=
 com.arsdigita.cms.dhtml_editor_plugins=
 
 com.arsdigita.cms.disable_item_pfs=true