diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties b/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
index f54bfeab8..a4ae7d896 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/integration.properties
@@ -8,7 +8,6 @@ waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 ; waf.bebop.dhtml_editor=FCKeditor
 
 waf.categorization.show_internal_name=true
-waf.categorization.supported_languages=de,en
 
 waf.dispatcher.default_expiry=3600
 ;
@@ -16,7 +15,7 @@ waf.kernel.data_permission_check_enabled=false
 waf.kernel.primary_user_identifier=email
 ; if you activate screen_name, forum loader doesn't work.
 ; waf.kernel.primary_user_identifier=screen_name
-waf.kernel.supported_languages=de,en
+waf.kernel.supported_languages=en,de
 
 ; security.properties:
 waf.auto_registration_on=false
@@ -99,12 +98,6 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
-# ?? Where are these used?
-com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
-
-com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
-
-
 # Forum application
 com.arsdigita.forum.show_new_tabs=true
 com.arsdigita.forum.use_wysiwyg_editor=true
@@ -141,14 +134,14 @@ com.arsdigita.london.cms.dublin.audience_domain=LGAL
 ; =============================================================================================
 ; runtime specific configurations
 
-waf.admin.email=webmaster@aplaws.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.admin.email=webmaster@aplaws.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.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
+#waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
 waf.runtime.jdbc_pool_size=60
 
 waf.web.server=localhost\:8080
diff --git a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
index 348e17bce..ebe86e179 100755
--- a/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/custom/cfg/project.xml
@@ -9,8 +9,8 @@
                ccmVersion="6.1" 
                name="aplaws" 
                prettyName="APLAWS plus Custom Spin" 
-               version="1-1-5" 
-               release="custom"
+               version="2-0-0" 
+               release="custom-beta-1-r2234"
                webxml="web.xml-aplaws" 
                webapp="ROOT" 
    xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties b/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
index 17bdb1e24..007180310 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/integration.properties
@@ -8,7 +8,6 @@ waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 ; waf.bebop.dhtml_editor=FCKeditor
 
 waf.categorization.show_internal_name=true
-waf.categorization.supported_languages=de,en
 
 waf.dispatcher.default_expiry=3600
 ;
@@ -16,7 +15,7 @@ waf.kernel.data_permission_check_enabled=false
 waf.kernel.primary_user_identifier=email
 ; if you activate screen_name, forum loader doesn't work.
 ; waf.kernel.primary_user_identifier=screen_name
-waf.kernel.supported_languages=de,en
+waf.kernel.supported_languages=en,de
 
 ; security.properties:
 waf.auto_registration_on=false
@@ -99,11 +98,6 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
-# ?? Where are these used?
-com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
-
-com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
-
 
 # Forum application
 com.arsdigita.forum.show_new_tabs=true
@@ -141,7 +135,7 @@ com.arsdigita.london.cms.dublin.audience_domain=LGAL
 ; =============================================================================================
 ; runtime specific configurations
 
-waf.admin.email=webmaster@example.com
+waf.admin.email=webmasterexample.org
 waf.admin.name.given=Aplaws 
 waf.admin.name.family=Administrator
 waf.admin.password=123456
diff --git a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
index e6594d33e..383dc83d5 100755
--- a/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/demo/cfg/project.xml
@@ -9,8 +9,8 @@
               ccmVersion="6.1" 
                     name="aplaws" 
               prettyName="APLAWS plus Demo Spin"
-                 version="1-1-5" 
-                 release="demo" 
+                 version="2-0-0" 
+                 release="demo-beta-1-r2234" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT"
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties b/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
index 1995e1e2b..4c4b15ab9 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/integration.properties
@@ -8,7 +8,6 @@ waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 ; waf.bebop.dhtml_editor=FCKeditor
 
 waf.categorization.show_internal_name=true
-waf.categorization.supported_languages=de,en
 
 waf.dispatcher.default_expiry=3600
 ;
@@ -16,7 +15,7 @@ waf.kernel.data_permission_check_enabled=false
 waf.kernel.primary_user_identifier=email
 ; if you activate screen_name, forum loader doesn't work.
 ; waf.kernel.primary_user_identifier=screen_name
-waf.kernel.supported_languages=de,en
+waf.kernel.supported_languages=en,de
 
 ; security.properties:
 waf.auto_registration_on=false
@@ -99,11 +98,6 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
-# ?? Where are these used?
-com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
-
-com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
-
 
 # Forum application
 com.arsdigita.forum.show_new_tabs=true
@@ -141,17 +135,17 @@ com.arsdigita.london.cms.dublin.audience_domain=LGAL
 ; =============================================================================================
 ; runtime specific configurations
 
-waf.admin.email=webmaster@aplaws.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.admin.email=webmaster@aplaws.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.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-ldnext?user\=ccm&password\=ccm
-waf.runtime.jdbc_pool_size=60
+#waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-ldnext?user\=ccm&password\=ccm
+#waf.runtime.jdbc_pool_size=60
 
-waf.web.server=localhost\:8080
+#waf.web.server=localhost\:8080
 
 
 # =============================================================================================
diff --git a/ccm-ldn-aplaws/bundles/extended/cfg/project.xml b/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
index 3eb041b26..52f11d94d 100755
--- a/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/extended/cfg/project.xml
@@ -6,9 +6,9 @@
                xmlns:ccm="http://ccm.redhat.com/ccm-project" 
                ccmVersion="6.1" 
                name="aplaws" 
-               prettyName="APLAWS plus" 
-               version="1-1-5" 
-               release="extended"
+               prettyName="APLAWS plus Extended Spin" 
+               version="2-0-0" 
+               release="ext-beta-1-r2240"
                webxml="web.xml-aplaws" 
                webapp="ROOT" 
    xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
@@ -21,7 +21,6 @@
         <!--  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"/>
 
         <!--  Content types   -->
@@ -37,13 +36,10 @@
         <ccm:application name="ccm-cms-types-formsectionitem"/>
         <ccm:application name="ccm-cms-types-glossaryitem"/>
         <ccm:application name="ccm-cms-types-htmlform"/>
-        <ccm:application name="ccm-cms-types-image"/>
         <ccm:application name="ccm-cms-types-inlinesite"/>
         <ccm:application name="ccm-cms-types-job"/>
         <ccm:application name="ccm-cms-types-legalnotice"/>
         <ccm:application name="ccm-cms-types-minutes"/>
-        <!-- Without any useful known function                 -->
-<!--    <ccm:application name="ccm-cms-types-motditem"/>       -->
         <ccm:application name="ccm-cms-types-mparticle"/>
         <ccm:application name="ccm-cms-types-newsitem"/>
         <ccm:application name="ccm-cms-types-organization"/>
@@ -54,6 +50,12 @@
         <ccm:application name="ccm-cms-types-xmlfeed"/>
 
         <!--  Applications   -->
+        <ccm:application name="ccm-forum"/>     
+        <ccm:application name="ccm-navigation"/>
+        <ccm:application name="ccm-portalworkspace"/>
+        <ccm:application name="ccm-themedirector"/>
+
+        <!--  ldn extensions (LAW functionality)   -->
         <ccm:application name="ccm-ldn-aplaws"/>
         <ccm:application name="ccm-ldn-atoz"/>
         <ccm:application name="ccm-ldn-dublin"/>
@@ -67,28 +69,31 @@
         <ccm:application name="ccm-ldn-terms"/>
         <ccm:application name="ccm-ldn-util"/>
 
-        <!--  Extra apps   -->
+  </ccm:build>
+
+        <!--  Addon Packages    -->
+
         <!-- Authentification against a Windows domain         -->
 <!--    <ccm:application name="ccm-auth-http"/>                -->
         <!-- Completely untested                               -->
 <!--    <ccm:application name="ccm-bookmarks"/>                -->
        <!-- Currently doesn't work                             -->
 <!--    <ccm:application name="ccm-docmngr"/>                  -->
-        <ccm:application name="ccm-docrepo"/>
-        <ccm:application name="ccm-faq"/>
+<!--    <ccm:application name="ccm-docrepo"/>                  -->
+<!--    <ccm:application name="ccm-faq"/>                      -->
         <!-- Without any useful known function                 -->
 <!--    <ccm:application name="ccm-formbuilder-pdf"/>          -->
-        <ccm:application name="ccm-forum"/>     
-        <ccm:application name="ccm-forum-categorised"/>     
-        <ccm:application name="ccm-navigation"/>
-        <ccm:application name="ccm-portalserver"/>
-        <ccm:application name="ccm-portalworkspace"/>
+<!--    <ccm:application name="ccm-forum-categorised"/>        -->
+<!--    <ccm:application name="ccm-cms-types-image"/>          -->
+<!--    <ccm:application name="ccm-cms-assets-notes"/>         -->
+        <!-- Without any useful known function                 -->
+<!--    <ccm:application name="ccm-cms-types-motditem"/>       -->
+<!--    <ccm:application name="ccm-portalserver"/>             -->
         <!-- Completely untested                               -->
 <!--    <ccm:application name="ccm-portlet"/>                  -->
 <!--    <ccm:application name="ccm-portlet-helloworld"/>       -->
        <!-- Currently doesn't work                             -->
 <!--    <ccm:application name="ccm-simplesurvey"/>             -->
-        <ccm:application name="ccm-themedirector"/>
         <!-- Without any useful known function                 -->
 <!--    <ccm:application name="ccm-user-preferences"/>         -->
         <!-- Completely untested                               -->
@@ -99,6 +104,4 @@
      contain java code to be compiled!
         <ccm:application name="tools"/>           -->
 
-
-  </ccm:build>
 </ccm:project>
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties b/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties
index ac1dedfcc..cddc46432 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/integration.properties
@@ -8,7 +8,6 @@ waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 ; waf.bebop.dhtml_editor=FCKeditor
 
 waf.categorization.show_internal_name=true
-waf.categorization.supported_languages=de,en
 
 waf.dispatcher.default_expiry=3600
 ;
@@ -16,7 +15,7 @@ waf.kernel.data_permission_check_enabled=false
 waf.kernel.primary_user_identifier=email
 ; if you activate screen_name, forum loader doesn't work.
 ; waf.kernel.primary_user_identifier=screen_name
-waf.kernel.supported_languages=de,en
+waf.kernel.supported_languages=en,de
 
 ; security.properties:
 waf.auto_registration_on=false
@@ -99,11 +98,6 @@ com.arsdigita.cms.contenttypes.newsitem.start_year=2000
 com.arsdigita.cms.contenttypes.newsitem.end_year_delta=5
 
 
-# ?? Where are these used?
-com.arsdigita.cms.contenttypes.mparticle.template=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-mparticle-item.jsp
-
-com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
-
 
 # Forum application
 com.arsdigita.forum.show_new_tabs=true
@@ -141,17 +135,17 @@ com.arsdigita.london.cms.dublin.audience_domain=LGAL
 ; =============================================================================================
 ; runtime specific configurations
 
-waf.admin.email=webmaster@aplaws.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.admin.email=webmaster@aplaws.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.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-ldnstd?user\=ccm&password\=ccm
-waf.runtime.jdbc_pool_size=60
+#waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm-ldnstd?user\=ccm&password\=ccm
+#waf.runtime.jdbc_pool_size=60
 
-waf.web.server=localhost\:8080
+#waf.web.server=localhost\:8080
 
 
 # =============================================================================================
diff --git a/ccm-ldn-aplaws/bundles/standard/cfg/project.xml b/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
index 332d3fa15..27e00c488 100755
--- a/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
+++ b/ccm-ldn-aplaws/bundles/standard/cfg/project.xml
@@ -8,14 +8,15 @@
               ccmVersion="6.1" 
                     name="aplaws" 
               prettyName="APLAWS plus Standard Spin"
-                 version="1-1-5" 
-                 release="standard" 
+                 version="2-0-0" 
+                 release="std-beta-1-r2240" 
                   webxml="web.xml-aplaws" 
                   webapp="ROOT"
       xsi:schemaLocation="http://ccm.redhat.com/ccm-project file:tools-ng/common/xsd/project.xsd">
 
 <ccm:databases>
         <ccm:database name="postgres"/>
+        <ccm:database name="oracle-se"/>
 </ccm:databases>
 
 
@@ -26,7 +27,6 @@
 
         <!--  Content assets   -->
         <ccm:application name="ccm-cms-assets-fileattachment"/>
-        <ccm:application name="ccm-cms-assets-imagestep"/>
         <ccm:application name="ccm-cms-assets-relatedlink"/>
 
         <!--  Content types   -->
diff --git a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-categories.xsl b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-categories.xsl
index 0aed8951b..1d6994b9b 100644
--- a/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-categories.xsl
+++ b/ccm-ldn-aplaws/web/themes/static/aplaws/forum-example/categorised-forum/forum-categories.xsl
@@ -8,6 +8,12 @@
 				exclude-result-prefixes="xsl bebop nav search portal forum cms" 
 				version="1.0">
 
+  <!-- IMPORT DEFINITIONS ccm-forum installed as separate web application
+	<xsl:import href="../../../../ROOT/__ccm__/themes/aplaws/category-step.xsl"/>
+  	<xsl:import href="../../../../ROOT/__ccm__/static/cms/admin/category-step/category-step.xsl"/>	
+  -->
+  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
+  -->
   <xsl:import href="../../../__ccm__/themes/aplaws/category-step.xsl"/>
   <xsl:import href="../../../__ccm__/static/cms/admin/category-step/category-step.xsl"/>