diff --git a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
index a364f3d77..4088e6a87 100755
--- a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
+++ b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
@@ -46,11 +46,12 @@ ccm-cms-types-newsitem
 # ------------
 # -- ccm-auth-http
 # -- ccm-bookmarks
-# -- ccm-docmngr    ## temp., produces errors in build
+ccm-docmgr
 # -- ccm-formbuilder-pdf
 ccm-forum
 #  ccm-forum-categorised
 # ccm-portalserver
+ccm-portalserver
 ccm-portalworkspace
 # -- ccm-simplesurvey
 ccm-themedirector
diff --git a/ccm-gen-aplaws/bundles/devel/cfg/integration.properties b/ccm-gen-aplaws/bundles/devel/cfg/integration.properties
index c89e3db1d..dc8648b56 100755
--- a/ccm-gen-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/devel/cfg/integration.properties
@@ -135,11 +135,8 @@ com.arsdigita.london.search.show_sponsored_links=true
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-ldn-themedirector application
-themedirector.default_theme_context=
-themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
+# ccm-themedirector application
 themedirector.default_theme_path=themes/static/aplaws-generic
-themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 # com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
diff --git a/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties b/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties
index 2f6a92040..ea14a439c 100755
--- a/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/handbook/cfg/integration.properties
@@ -93,10 +93,8 @@ com.arsdigita.london.search.show_sponsored_links=true
 
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-gen-aplaws.web.mf
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
-com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl xml
+# ccm-ldn-themedirector application
+themedirector.default_theme_path=themes/static/aplaws-generic
 
 # com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties
index bc2445e49..74e5e6650 100755
--- a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties
@@ -120,11 +120,8 @@ com.arsdigita.london.search.show_sponsored_links=true
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
 
-# ccm-ldn-themedirector application
-themedirector.default_theme_context=
-themedirector.default_theme_manifest=ccm-gen-aplaws.web.mf
+# ccm-themedirector application
 themedirector.default_theme_path=themes/static/aplaws-generic
-themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
 # com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
diff --git a/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties b/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties
index 388e90f5d..5e676d224 100755
--- a/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/staatsschiff/cfg/integration.properties
@@ -96,10 +96,8 @@ com.arsdigita.london.search.show_sponsored_links=true
 
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-gen-aplaws.web.mf
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
-com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl xml
+# ccm-themedirector application
+themedirector.default_theme_path=themes/static/aplaws-generic
 
 # com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
diff --git a/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties b/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties
index 0bc0b5b96..363a75154 100644
--- a/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/zsr/cfg/integration.properties
@@ -96,10 +96,8 @@ com.arsdigita.london.search.show_sponsored_links=true
 
 com.arsdigita.london.subsite.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
-com.arsdigita.london.theme.default_theme_context=
-com.arsdigita.london.theme.default_theme_manifest=ccm-gen-aplaws.web.mf
-com.arsdigita.london.theme.default_theme_path=__ccm__/themes/aplaws-generic
-com.arsdigita.london.theme.file_extensions=bmp gif jpeg jpg png css js png xsl xml
+# ccm-themedirector application
+themedirector.default_theme_path=themes/static/aplaws-generic
 
 # com.arsdigita.london.cms.dublin.audience_domain=LGAL