diff --git a/ccm-core/src/com/arsdigita/bebop/SimpleContainer.java b/ccm-core/src/com/arsdigita/bebop/SimpleContainer.java
index 679b9b030..c035defb5 100755
--- a/ccm-core/src/com/arsdigita/bebop/SimpleContainer.java
+++ b/ccm-core/src/com/arsdigita/bebop/SimpleContainer.java
@@ -256,6 +256,7 @@ public class SimpleContainer extends BlockStylable implements Container {
      * @see #setTag(String)
      * @see #setNamespace(String)
      */
+    @Override
     public void generateXML(PageState state, Element p) {
         if ( isVisible(state) ) {
             Element parent = generateParent(p);
diff --git a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
index 98c6f1d78..f38cb3385 100755
--- a/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
+++ b/ccm-gen-aplaws/bundles/devel/cfg/applications.cfg
@@ -1,3 +1,4 @@
+# Generic devel application.cfg
 # Main apps
 ccm-core
 ccm-cms
@@ -7,7 +8,8 @@ ccm-cms-assets-fileattachment
 ccm-cms-assets-imagestep
 ccm-cms-assets-notes
 ccm-cms-assets-relatedlink
-## -- ccm-ldn-dublin  ist das eigentlich ein asset?
+# is ccm-ldn-dublin really an asset?
+## -- ccm-ldn-dublin
 
 # Content types
 # -- ccm-cms-types-address
@@ -15,7 +17,6 @@ ccm-cms-assets-relatedlink
 ccm-cms-types-article
 ccm-cms-types-bookmark
 # -- ccm-cms-types-contact
-# -- ccm-cms-types-esdservice
 ccm-cms-types-event
 ccm-cms-types-faqitem
 ccm-cms-types-filestorageitem
@@ -32,13 +33,14 @@ ccm-cms-types-member
 ccm-cms-types-mparticle
 ccm-cms-types-newsitem
 # -- ccm-cms-types-organization
+ccm-cms-types-person
 # -- ccm-cms-types-pressrelease
+# -- ccm-cms-types-researchnetwork
 # -- ccm-cms-types-service
 # ## Fuer OpenCCM aktivieren:
 # -- ccm-cms-types-siteproxy
 # -- ccm-cms-types-xmlfeed
 
-
 # Applications
 # ------------
 # -- ccm-auth-http
@@ -48,6 +50,7 @@ ccm-cms-types-newsitem
 ccm-forum
 ccm-forum-categorised
 # -- ccm-simplesurvey
+ccm-themedirector
 ccm-user-preferences
 # -- ccm-weblog
 # -- ccm-webpage
@@ -67,7 +70,6 @@ ccm-ldn-search
 ccm-ldn-shortcuts
 ccm-ldn-subsite
 ccm-ldn-terms
-ccm-ldn-theme
 ccm-ldn-util
 
 # integration layer
diff --git a/ccm-gen-aplaws/bundles/devel/cfg/integration.properties b/ccm-gen-aplaws/bundles/devel/cfg/integration.properties
index 2ab71738f..c89e3db1d 100755
--- a/ccm-gen-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/devel/cfg/integration.properties
@@ -1,4 +1,7 @@
+# Generic devel bundle integration.properties
+#
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
+#
 ; dhtml editor to use (system wide)
 ; Xinha is default
 ; waf.bebop.dhtml_editor=Xinha
@@ -13,6 +16,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
 
 ; security.properties: 
 waf.auto_registration_on=false
@@ -21,22 +25,29 @@ waf.auto_registration_on=false
 #waf.pagemap.root=portal/
 #waf.pagemap.workspace=portal/
 #waf.pagemap.login_redirect=content/content-center-redirect.jsp
-core.ui.pagemap.root_page_url=navigation/
-core.ui.pagemap.workspace_url=navigation/
-core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
 
 ; Searches for localized style sheet (among others) 
 waf.templating.stylesheet_resolver=com.arsdigita.templating.PatternStylesheetResolver
 waf.templating.stylesheet_paths=/WEB-INF/resources/aplaws-stylesheet-paths.txt
 
+core.ui.pagemap.root_page_url=navigation/
+core.ui.pagemap.workspace_url=navigation/
+core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
+
+; workflow configuration
+waf.workflow.simple.alerts_enabled=true
+waf.workflow.simple.alerts_sender=root@localhost.localdomain
+
 ; Configures the xml processing
 waf.xml.xsl_transformer=xalan
 waf.xml.activate_full_date_formatter=true
 
+# ccm-cms parameters
+
 com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
 
-com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
 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
@@ -48,6 +59,7 @@ com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/CCMcmsXinhaConfi
 
 ; to use FCKeditor:
 ; com.arsdigita.cms.dhtml_editor_config=FCKEditor.Config.StyleDefault?,/assets/fckeditor/config/fckconfigOpenCCM.js
+; com.arsdigita.cms.dhtml_editor_config=XinhaConfig,/assets/xinha/XinhaConfig.js
 ; com.arsdigita.cms.dhtml_editor_hidden_buttons=
 ; com.arsdigita.cms.dhtml_editor_plugins=
 
@@ -70,21 +82,30 @@ com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
 
 
+# ccm-cms-types-event parameters
 com.arsdigita.cms.contenttypes.event.hide_cost=true
 com.arsdigita.cms.contenttypes.event.hide_date_description=false
 com.arsdigita.cms.contenttypes.event.hide_event_type=true
 com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
 com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
 com.arsdigita.cms.contenttypes.event.use_html_date_description=false
+com.arsdigita.cms.contenttypes.event.start_year=2000
+com.arsdigita.cms.contenttypes.event.end_year_delta=5
 
 
+# ccm-cms-types-newsitem parameters
 com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+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
+
+# Forum application
 com.arsdigita.forum.show_new_tabs=true
 com.arsdigita.forum.use_wysiwyg_editor=true
 com.arsdigita.forum.allow_quick_finish=true
@@ -93,6 +114,7 @@ com.arsdigita.forum.disable_page_caching=true
 ;  atoz currently not in use
 ;  com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
+# ccm-ldn-navigation application
 ; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
 ; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
 ; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
@@ -100,24 +122,29 @@ com.arsdigita.forum.disable_page_caching=true
 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/zes-default.jsp
+com.arsdigita.london.navigation.default_template=/packages/navigation/templates/gen-default.jsp
 
+
+
+# ccm-ldn-search application
 com.arsdigita.london.search.show_sponsored_links=true
 
+
+
+# ccm-ldn-subsite application
 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-ldn-theme.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_context=
+themedirector.default_theme_manifest=ccm-zes-aplaws.web.mf
+themedirector.default_theme_path=themes/static/aplaws-generic
+themedirector.file_extensions=bmp css gif jpeg jpg js png xml xsl
 
-; =============================================================================================
-; devel specific configurations
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/ccm?user\=ccm&password\=ccm
-waf.runtime.jdbc_pool_size=80
+# com.arsdigita.london.cms.dublin.audience_domain=LGAL
 
-waf.web.server=localhost\:8080
+# =============================================================================================
+# runtime specific configurations
 
 waf.admin.email=webmaster@openccm.org
 waf.admin.name.given=aplaws 
@@ -126,6 +153,14 @@ 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_pool_size=60
+
+waf.web.server=localhost\:8080
+
+
+# =============================================================================================
+# devel specific configurations
 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 fba76fbd2..cd35301a1 100755
--- a/ccm-gen-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-gen-aplaws/bundles/devel/cfg/web.xml
@@ -303,33 +303,33 @@
   </servlet>
   <!-- module ccm-ldn-terms  -  servlet declarations END   -->
 
-  <!-- module ccm-ldn-themes  -  servlet declarations BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
   <servlet>
     <servlet-name>theme-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-theme</param-value>
+      <param-value>/templates/ccm-themedirector</param-value>
     </init-param>
   </servlet>
 
   <servlet>
      <servlet-name>ThemeDownload</servlet-name>
-     <servlet-class>com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet</servlet-class>
+     <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>ThemePreviewServlet</servlet-name>
      <display-name>Servlet to allow admins to preview look/feel</display-name>
     <servlet-class>
-     com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet
+     com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
     </servlet-class>
     <init-param>
       <param-name>prefix</param-name>
       <param-value>/theme</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+  <!-- module ccm-themedirector  -  servlet declarations END   -->
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      MODULES SERVLET MAPPINGS SECTION
@@ -403,7 +403,7 @@
   </servlet-mapping>
   <!-- module ccm-ldn-terms  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-theme  -  servlet mappings BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
   <servlet-mapping>
     <servlet-name>theme-files</servlet-name>
     <url-pattern>/theme-files/*</url-pattern>
@@ -418,7 +418,7 @@
     <servlet-name>ThemePreviewServlet</servlet-name>
     <url-pattern>/theme/*</url-pattern>
   </servlet-mapping>
-  <!-- module ccm-ldn-themes  -  servlet mappings END   -->
+  <!-- module ccm-themedirector  -  servlet mappings END   -->
 
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg b/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg
index 9e28de10b..36882c068 100755
--- a/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg
+++ b/ccm-gen-aplaws/bundles/nsh/cfg/applications.cfg
@@ -1,3 +1,4 @@
+# NSH application.cfg
 # Main apps
 ccm-core
 ccm-cms
@@ -12,14 +13,17 @@ ccm-cms-assets-relatedlink
 
 # Content types
 # -- ccm-cms-types-address
+# -- ccm-cms-types-agenda
 ccm-cms-types-article
 ccm-cms-types-bookmark
+# -- ccm-cms-types-contact
 ccm-cms-types-event
 ccm-cms-types-faqitem
 ccm-cms-types-filestorageitem
 ccm-cms-types-formitem
 ccm-cms-types-formsectionitem
 ccm-cms-types-glossaryitem
+# -- ccm-cms-types-member
 ccm-cms-types-mparticle
 ccm-cms-types-newsitem
 ccm-cms-types-simpleaddress
diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties
index f6f3d8ccc..bc2445e49 100755
--- a/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties
+++ b/ccm-gen-aplaws/bundles/nsh/cfg/integration.properties
@@ -3,9 +3,9 @@
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 #
 ; dhtml editor to use (system wide)
+; Xinha is default
+; waf.bebop.dhtml_editor=Xinha
 ; 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
@@ -16,9 +16,11 @@ waf.dispatcher.default_expiry=3600
 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
 
 ; security.properties:
 waf.auto_registration_on=false
+
 # MOVED to ui.Config
 #waf.pagemap.root=portal/
 #waf.pagemap.workspace=portal/
@@ -32,22 +34,25 @@ core.ui.pagemap.root_page_url=navigation/
 core.ui.pagemap.workspace_url=navigation/
 core.ui.pagemap.user_redirect_url=content/content-center-redirect.jsp
 
+; workflow configuration
+waf.workflow.simple.alerts_enabled=true
+waf.workflow.simple.alerts_sender=root@NetzwerkSelbsthilfeHirnverletzung.de
+
 ; Configures the xml processing
 waf.xml.xsl_transformer=xalan
 waf.xml.activate_full_date_formatter=true
 
+# ccm-cms parameters
+
 com.arsdigita.cms.category_authoring_add_form=com.arsdigita.aplaws.ui.ItemCategoryPicker
 
-com.arsdigita.cms.default_item_template_path=/default/aplaws-item.jsp
 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=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
 
@@ -62,18 +67,26 @@ com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
 
 
+# ccm-cms-types-event parameters
 com.arsdigita.cms.contenttypes.event.hide_cost=true
 com.arsdigita.cms.contenttypes.event.hide_date_description=false
 com.arsdigita.cms.contenttypes.event.hide_event_type=true
 com.arsdigita.cms.contenttypes.event.hide_link_to_map=true
 com.arsdigita.cms.contenttypes.event.hide_main_contributor=true
 com.arsdigita.cms.contenttypes.event.use_html_date_description=false
+com.arsdigita.cms.contenttypes.event.start_year=2000
+com.arsdigita.cms.contenttypes.event.end_year_delta=5
 
 
+# ccm-cms-types-newsitem parameters
+com.arsdigita.cms.contenttypes.newsitem.hide_homepage=true
+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.newsitem.hide_homepage=true
-
 # ## com.arsdigita.cms.contenttypes.siteproxy.defaulttemplate=/WEB-INF/content-types/com/arsdigita/cms/contenttypes/aplaws-siteproxy-item.jsp
 
 
@@ -83,10 +96,10 @@ com.arsdigita.forum.use_wysiwyg_editor=true
 com.arsdigita.forum.allow_quick_finish=true
 com.arsdigita.forum.disable_page_caching=true
 
-
 ;  atoz currently not in use
-# ## com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
+;  com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
 
+# ccm-ldn-navigation application
 ; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1
 ; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive
 ; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1
@@ -96,25 +109,28 @@ com.arsdigita.london.navigation.category_menu_show_grand_children=false
 com.arsdigita.london.navigation.default_cat_root_path=/navigation/
 com.arsdigita.london.navigation.default_template=/packages/navigation/templates/gen-default.jsp
 
+
+
+# ccm-ldn-search application
 com.arsdigita.london.search.show_sponsored_links=true
 
+
+
+# ccm-ldn-subsite application
 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
-themedirector.default_theme_path=__ccm__/themes/aplaws-generic
+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
 
-; =============================================================================================
-; devel specific configurations
+# =============================================================================================
+# runtime specific configurations
 waf.mail.default_from=webmaster@nsh.de
-
-waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/nsh?user\=nsh&password\=nsh42web
-waf.runtime.jdbc_pool_size=80
-waf.web.server=localhost\:8080
-
 waf.admin.email=webmaster@NetzwerkSelbsthilfeHirnverletzung.de
 waf.admin.name.given=NSH 
 waf.admin.name.family=Administrator
@@ -122,6 +138,12 @@ waf.admin.password=nge3025
 waf.admin.password.question=12345 
 waf.admin.password.answer=6
 
-# com.arsdigita.aplaws.lite_load=true
-# waf.debug=true
-# waf.bebop.fancy_xsl_errors=true
+waf.runtime.jdbc_url=jdbc\:postgresql\://localhost/nsh?user\=nsh&password\=nsh42web
+waf.runtime.jdbc_pool_size=80
+waf.web.server=localhost\:8080
+
+# =============================================================================================
+# devel specific configurations
+; waf.debug=true
+; waf.bebop.fancy_xsl_errors=true
+
diff --git a/ccm-gen-aplaws/bundles/nsh/cfg/web.xml b/ccm-gen-aplaws/bundles/nsh/cfg/web.xml
index 8221cf6f2..53eb9b869 100755
--- a/ccm-gen-aplaws/bundles/nsh/cfg/web.xml
+++ b/ccm-gen-aplaws/bundles/nsh/cfg/web.xml
@@ -4,6 +4,32 @@
 
 <web-app>
 
+  <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 -->
+  <context-param>
+    <param-name>log4j-conf-file</param-name>
+    <param-value>WEB-INF/conf/log4j.properties</param-value>
+  </context-param>
+
+
+  <!-- Require secure connection by redirect to host-port part
+       of parameter waf.web.secure_server               
+  <filter>
+    <filter-name>secured</filter-name>
+    <filter-class>com.arsdigita.web.SecureFilter</filter-class>
+  </filter>
+  -->
+  <!-- Initialize Profiler timers
+       NOT USED with standard / production                                  
+  <filter>
+    <filter-name>profiler</filter-name>
+    <filter-class>com.arsdigita.profiler.ProfilerFilter</filter-class>
+  </filter>
+  -->
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -24,6 +50,20 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     Context Listener 
+     required and used to initialize the runtime environment before any other 
+     task is performed or any servlet initialized. 
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+  <listener>
+    <listener-class>com.arsdigita.web.CCMApplicationContextListener</listener-class>
+  </listener>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     BASE SERVLET DECLARATIONS SECTION
+     basically requirred by ccm-core
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
   <servlet>
     <servlet-name>reg</servlet-name>
     <servlet-class>com.arsdigita.web.ContextRegistrationServlet</servlet-class>
@@ -80,7 +120,10 @@
     <servlet-class>com.arsdigita.web.ResourceServlet</servlet-class>
   </servlet>
 
-  <!-- ADDITIONAL SERVLET DECLARATIONS -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     ADDITIONAL SERVLET DECLARATIONS SECTION 
+     basically requirred by ccm-cms
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
   <servlet>
     <servlet-name>content-section</servlet-name>
@@ -126,19 +169,28 @@
    </init-param>
  </servlet>
 
- <servlet>
-   <servlet-name>ThemePreviewServlet</servlet-name>
-   <display-name>Servlet to allow admins to preview look/feel</display-name>
-   <servlet-class>
-    com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet
-   </servlet-class>
-   <init-param>
-     <param-name>prefix</param-name>
-     <param-value>/theme</param-value>
-   </init-param>
- </servlet>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET DECLARATIONS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-<!-- XXX hack -->
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN
+       NOT USED with ZeS   
+  <servlet>
+    <servlet-name>atoz-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-atoz</param-value>
+    </init-param>
+  </servlet>
+       module ccm-ldn-atoz  -  servlet definitions END  -->
+
+  <!-- module ccm-forum  -  servlet declarations BEGIN  -->  
+  <servlet>
+    <servlet-name>forum-main</servlet-name>
+    <servlet-class>com.arsdigita.forum.ForumServlet</servlet-class>
+  </servlet>
+  <!-- module ccm-forum  -  servlet declarations END    -->  
 
   <servlet>
     <servlet-name>portal-files</servlet-name>
@@ -166,17 +218,131 @@
     <servlet-name>portlet-type-xsl</servlet-name>
     <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
   </servlet>
+ 
+  <!-- module ccm-ldn-rss  -  servlet declaration BEGIN   -->
+  <servlet>
+    <servlet-name>rss-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-rss</param-value>
+    </init-param>
+    <init-param>
+      <param-name>file-resolver</param-name>
+      <param-value>com.arsdigita.london.rss.RSSFileResolver</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-rss  -  servlet declaration END   -->
+
+  <!-- module ccm-ldn-search  -  servlet declarations BEGIN   -->
+  <servlet>
+    <servlet-name>worker</servlet-name>
+    <servlet-class>com.arsdigita.london.search.SearchWorkerServlet</servlet-class>
+    <load-on-startup>4</load-on-startup>
+  </servlet>
+  
+  <servlet>
+    <servlet-name>search-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-search</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+    <servlet-name>AxisServlet</servlet-name>
+    <display-name>Apache-Axis Servlet</display-name>
+    <servlet-class>
+     org.apache.axis.transport.http.AxisServlet
+    </servlet-class>
+  </servlet>
+  <!-- module ccm-ldn-search  -  servlet declarations END  -->
+
+  <!-- module ccm-ldn-shortcuts  -  servlet definitions   -->
+  <servlet>
+    <servlet-name>shortcuts-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-shortcuts</param-value>
+    </init-param>
+  </servlet>
+
+  <!-- module ccm-ldn-subsite  -  servlet declarations BEGIN  -->
+  <servlet>
+    <servlet-name>subsite-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-subsite</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-subsite  -  servlet declarations END  -->
+
+  <!-- module ccm-ldn-terms  -  servlet declarations BEGIN   -->
+  <servlet>
+    <servlet-name>terms-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-ldn-terms</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-terms  -  servlet declarations END   -->
+
+  <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
+  <servlet>
+    <servlet-name>theme-files</servlet-name>
+    <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
+    <init-param>
+      <param-name>template-path</param-name>
+      <param-value>/templates/ccm-themedirector</param-value>
+    </init-param>
+  </servlet>
+
+  <servlet>
+     <servlet-name>ThemeDownload</servlet-name>
+     <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>ThemePreviewServlet</servlet-name>
+     <display-name>Servlet to allow admins to preview look/feel</display-name>
+    <servlet-class>
+     com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
+    </servlet-class>
+    <init-param>
+      <param-name>prefix</param-name>
+      <param-value>/theme</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-themedirector  -  servlet declarations END   -->
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET MAPPINGS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  
+       NOT USED HERE
+  <servlet-mapping>
+    <servlet-name>atoz-files</servlet-name>
+    <url-pattern>/ccm-ldn-atoz/files/*</url-pattern>
+  </servlet-mapping>
+       module ccm-ldn-atoz  -  servlet mappings END  -->
+
+  <!-- module ccm-forum  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>forum-main</servlet-name>
+    <url-pattern>/forum-main/main/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-forum  -  servlet mappings END    -->
 
   <servlet-mapping>
     <servlet-name>portlet-type-xsl</servlet-name>
     <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
   </servlet-mapping>
 
-  <servlet-mapping>
-    <servlet-name>reg</servlet-name>
-    <url-pattern>/__ccm__/null/reg/*</url-pattern>
-  </servlet-mapping>
-
   <servlet-mapping>
     <servlet-name>portal-files</servlet-name>
     <url-pattern>/ccm-ldn-portal/files/*</url-pattern>
@@ -187,7 +353,71 @@
     <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
   </servlet-mapping>
 
-  <!-- /ADDITIONAL SERVLET DECLARATIONS -->
+  <!-- module ccm-ldn-rss  -  servlet mappings   -->
+  <servlet-mapping>
+    <servlet-name>rss-files</servlet-name>
+    <url-pattern>/ccm-ldn-rss/files/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- module ccm-ldn-search  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>search-files</servlet-name>
+    <url-pattern>/ccm-ldn-search/files/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>AxisServlet</servlet-name>
+    <url-pattern>/services/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-search  -  servlet mappings END  -->
+
+  <!-- module ccm-ldn-shortcuts  -  servlet mappings   -->
+  <servlet-mapping>
+    <servlet-name>shortcuts-files</servlet-name>
+    <url-pattern>/ccm-ldn-shortcuts/files/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- module ccm-ldn-subsite  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>subsite-files</servlet-name>
+    <url-pattern>/ccm-ldn-subsite/files/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-subsite  -  servlet mappings END  -->
+
+  <!-- module ccm-ldn-terms  -  servlet mappings BEGIN  -->
+  <servlet-mapping>
+    <servlet-name>terms-files</servlet-name>
+    <url-pattern>/ccm-ldn-terms/files/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-ldn-terms  -  servlet mappings END  -->
+
+  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
+  <servlet-mapping>
+    <servlet-name>theme-files</servlet-name>
+    <url-pattern>/theme-files/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>ThemeDownload</servlet-name>
+    <url-pattern>/theme-files/download/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>ThemePreviewServlet</servlet-name>
+    <url-pattern>/theme/*</url-pattern>
+  </servlet-mapping>
+  <!-- module ccm-themedirector  -  servlet mappings END   -->
+
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     BASE SERVLET MAPPINGS SECTION
+     basically requirred by ccm-core
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <servlet-mapping>
+    <servlet-name>reg</servlet-name>
+    <url-pattern>/__ccm__/null/reg/*</url-pattern>
+  </servlet-mapping>
 
   <servlet-mapping>
     <servlet-name>ccm-dispatcher</servlet-name>
@@ -224,7 +454,10 @@
     <url-pattern>/resource/*</url-pattern>
   </servlet-mapping>
 
-  <!-- ADDITIONAL SERVLET MAPPINGS -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     ADDITIONAL SERVLET MAPPINGS SECTION
+     basically requirred by ccm-cms
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
   <servlet-mapping>
     <servlet-name>content-section</servlet-name>
@@ -232,13 +465,13 @@
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>content-type-xsl</servlet-name>
-    <url-pattern>/__ccm__/servlet/content-type/*</url-pattern>
+    <servlet-name>content-item-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/content-item/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
-    <servlet-name>content-item-xsl</servlet-name>
-    <url-pattern>/__ccm__/servlet/content-item/*</url-pattern>
+    <servlet-name>content-type-xsl</servlet-name>
+    <url-pattern>/__ccm__/servlet/content-type/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>
@@ -256,13 +489,9 @@
      <url-pattern>/print/*</url-pattern>
  </servlet-mapping>
 
- <servlet-mapping>
-     <servlet-name>ThemePreviewServlet</servlet-name>
-     <url-pattern>/theme/*</url-pattern>
- </servlet-mapping>
-
-
-  <!-- /ADDITIONAL SERVLET MAPPINGS -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     ERROR PAGES
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
   <error-page>
     <exception-type>com.arsdigita.dispatcher.AccessDeniedException</exception-type>
@@ -289,10 +518,28 @@
     <location>/error/db-not-available.jsp</location>
   </error-page>
 
-
   <error-page>
     <exception-type>java.lang.Exception</exception-type>
     <location>/error/general.jsp</location>
   </error-page>
 
+  <error-page>
+    <exception-type>java.lang.Error</exception-type>
+    <location>/error/general.jsp</location>
+  </error-page>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     TAG LIBS
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-show.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-show.tld</taglib-location>
+  </taglib>
+
+  <taglib>
+    <taglib-uri>/WEB-INF/bebop-define.tld</taglib-uri>
+    <taglib-location>/WEB-INF/bebop-define.tld</taglib-location>
+  </taglib>
+
 </web-app>
diff --git a/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt b/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
index bf5a09a50..df964c308 100755
--- a/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
+++ b/ccm-gen-aplaws/src/WEB-INF/resources/aplaws-stylesheet-paths.txt
@@ -12,23 +12,27 @@ http://::host::/__ccm__/servlet/content-item/index.xsl?oid=::item_template_oid::
 
 # added by Quasimodo
 # Theme with single entry point (e.g Mandalay)
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/start.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/start.xsl
 
 # Theme, with optional locale & prefix
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::prefix::.xsl
 
 # Theme, with optional locale
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::-::locale::.xsl
-http://::host::/resource/::webapp::/__ccm__/::themedir::/::theme::/::application::-::url::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::-::locale::.xsl
+http://::host::/resource/::webapp::/themes/::themedir::/::theme::/::application::-::url::.xsl
 
 # APLAWS generic default, with locale and prefix
 # XXX change ROOT -> ccm-ldn-aplaws
+http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
+http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::prefix::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::-::locale::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::prefix::.xsl
 
 # APLAWS generic default, with locale
 # XXX change ROOT -> ccm-ldn-aplaws
+http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::-::locale::.xsl
+http://::host::/resource/ROOT/themes/static/aplaws-generic/::application::-::url::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::-::locale::.xsl
 http://::host::/resource/ROOT/__ccm__/themes/aplaws-generic/::application::-::url::.xsl
 
@@ -37,5 +41,7 @@ http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::-::l
 http://::host::/resource/::webapp::/__ccm__/apps/::application::/xsl/::url::.xsl
 
 # Global default, from application's own web app - relocated version >= 6.6.1
+http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
+http://::host::/resource/ROOT/themes/heirloom/apps/::application::/xsl/::url::.xsl
 http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::-::locale::.xsl
 http://::host::/resource/::webapp::/themes/heirloom/apps/::application::/xsl/::url::.xsl
diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java
index 4f8b7a247..827a88f7d 100755
--- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -102,7 +102,7 @@ public class Loader extends PackageLoader {
          * You may add more catagory domains by adding resources
          * according the following schema
          */
-       
+
         /* currently not used
         m_subjectDomain = new StringParameter(
             "com.arsdigita.aplaws.subject_domain",
@@ -110,7 +110,7 @@ public class Loader extends PackageLoader {
             "LGCL");
         register(m_subjectDomain);
          */
-        
+
         /* currently not used
         m_interactionDomain = new StringParameter(
             "com.arsdigita.aplaws.subject_domain",
@@ -126,7 +126,7 @@ public class Loader extends PackageLoader {
             "APLAWS-RSS");
         register(m_rssDomain);
          */
-        
+
 
     }
 
@@ -142,12 +142,11 @@ public class Loader extends PackageLoader {
             if (s_log.isInfoEnabled()) {
                 s_log.info("Process " + file);
             }
-            parser.parse(Thread.currentThread().getContextClassLoader
-                         ().getResourceAsStream
-                         (file));
+            parser.parse(Thread.currentThread().getContextClassLoader().
+                    getResourceAsStream(file));
         }
 
-        String navigationKey = (String)get(m_navigationDomain);
+        String navigationKey = (String) get(m_navigationDomain);
         registerDomain(navigationKey, "/navigation/", null);
         registerDomain(navigationKey, "/content/", null);
         registerDomain(navigationKey, "/portal/", null);
@@ -175,7 +174,7 @@ public class Loader extends PackageLoader {
         // registerDomain(interactionKey, "/content/", "interaction");
 
 
-        
+
         // register new / addidional JSP templates (index pages) in Navigation
         // registerServicesTemplate("/services/");  wird nicht gebraucht
         registerNavigationTemplates();
diff --git a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java
index 56da85a78..dfc8cd519 100755
--- a/ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java
+++ b/ccm-gen-aplaws/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java
@@ -15,6 +15,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
+
 package com.arsdigita.aplaws;
 
 import com.arsdigita.xml.Element;
diff --git a/ccm-gen-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp b/ccm-gen-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp
index e87172fb1..b3e5f5a01 100755
--- a/ccm-gen-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp
+++ b/ccm-gen-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp
@@ -23,7 +23,7 @@
     <define:component name="categoryMenu"
       classname="com.arsdigita.london.navigation.ui.category.Menu"/>
     <define:component name="categoryNav"
-      classname="com.arsdigita.london.navigation.ui.category.Hierarchy">
+                      classname="com.arsdigita.london.navigation.ui.category.Hierarchy">
       <jsp:scriptlet>
         ((com.arsdigita.london.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
       </jsp:scriptlet>
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/admin-index.css
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.css
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/admin-index.css
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/admin-index.xsl
similarity index 84%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/admin-index.xsl
index 2d9d2dcc5..fa0b5ad35 100644
--- a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/admin-index.xsl
+++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/admin-index.xsl
@@ -3,8 +3,10 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
-
+<!--
   <xsl:import href="../../../../ROOT/__ccm__/apps/admin/xsl/index.xsl"/>
+  -->
+  <xsl:import href="../../heirloom/apps/admin/xsl/index.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.css.NotUsedForNow b/ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.css.NotUsedForNow
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-admin.css.NotUsedForNow
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.xsl.NotUsedForNow b/ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-admin.xsl.NotUsedForNow
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-admin.xsl.NotUsedForNow
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.css.NotUsedForNow b/ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.css.NotUsedForNow
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-index.css.NotUsedForNow
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.xsl.NotUsedForNow b/ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/atoz-index.xsl.NotUsedForNow
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/atoz-index.xsl.NotUsedForNow
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/category-step.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/category-step.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/category-step.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/category-step.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/consultations-index.xsl
similarity index 98%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/consultations-index.xsl
index 75fe0ebdd..2d47ea5e1 100644
--- a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/consultations-index.xsl
+++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/consultations-index.xsl
@@ -8,7 +8,10 @@
   xmlns:nav="http://ccm.redhat.com/london/navigation"
   version="1.0">
 
+<!--
   <xsl:import href="../../themes/aplaws-generic/navigation-index.xsl"/>
+  -->
+  <xsl:import href="navigation-index.xsl"/>
   
   <xsl:template name="pageContent">
     <a class="intLink" name="top" />
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/content-center-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/content-center-index.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/content-center-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/content-center-index.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/content-section-admin.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/content-section-admin.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/content-section-admin.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/content-section-admin.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/content-section-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/content-section-index.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/content-section-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/content-section-index.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/css/main.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/css/main.css
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/css/main.css
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/css/main.css
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/css/wysiwyg.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/css/wysiwyg.css
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/css/wysiwyg.css
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/css/wysiwyg.css
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-categories.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/categorised-forum/forum-index.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.css
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.css
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.css
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/forum-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/forum-index.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/archived-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/archived-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/archived-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/back-to-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/back-to-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/back-to-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/delete-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/delete-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/delete-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/edit-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/edit-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/edit-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/info-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/info-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/info-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/post-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/post-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/post-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/read.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/read.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/read.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/reply-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/reply-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/reply-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/watch-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-example/images/forum/watch-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-example/images/forum/watch-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.css
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.css
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.css
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.xsl
similarity index 96%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.xsl
index 86e99e146..b68bf25b1 100644
--- a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/forum-index.xsl
+++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/forum-index.xsl
@@ -31,7 +31,6 @@
   
 
 
-
 	<xsl:param name="theme-prefix" />
 	<xsl:param name="context-prefix" />
 	<xsl:param name="dispatcher-prefix" />
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/aplaws-logo-small.png b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/aplaws-logo-small.png
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/aplaws-logo-small.png
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/aplaws-logo-small.png
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/aplaws-logo.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/aplaws-logo.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/aplaws-logo.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/aplaws-logo.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/aplawsplus.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/aplawsplus.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/aplawsplus.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/aplawsplus.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/arrowSitemap.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/arrowSitemap.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/arrowSitemap.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/arrowSitemap.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/archived-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/archived-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/back-to-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/back-to-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/delete-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/delete-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/edit-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/edit-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/info-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/info-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/info-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/info-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/post-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/post-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/post-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/post-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/read.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/read.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/read.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/read.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/reply-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/reply-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/watch-16x16.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/forum/watch-16x16.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/customize.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/customize.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/customize.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/customize.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/delete.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/delete.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/delete.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/delete.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/display.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/display.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/display.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/display.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveDown.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveDown.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveDown.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveDown.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveLeft.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveLeft.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveLeft.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveLeft.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveRight.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveRight.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveRight.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveRight.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveUp.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveUp.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/portal/moveUp.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/portal/moveUp.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/spacer.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/spacer.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/spacer.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/spacer.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/tlcArrow-s.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/tlcArrow-s.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/tlcArrow-s.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/tlcArrow-s.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/tlcArrow.gif b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/tlcArrow.gif
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/tlcArrow.gif
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/tlcArrow.gif
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-css.bmp b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-css.bmp
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-css.bmp
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-css.bmp
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-css.png b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-css.png
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-css.png
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-css.png
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-xhtml.bmp b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-xhtml.bmp
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-xhtml.bmp
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-xhtml.png b/ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-xhtml.png
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/images/w3c-xhtml.png
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/images/w3c-xhtml.png
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/body.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/body.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/body.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/body.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/head.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/head.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/head.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/head.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/header.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/header.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/header.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/header.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/leftNav.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/leftNav.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/leftNav.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/leftNav.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/lib.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/lib.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/lib.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/lib.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/page.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/page.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/page.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/page.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/user-banner.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/user-banner.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/lib/user-banner.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/lib/user-banner.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-admin.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.css
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-admin.css
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.css
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-admin.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-admin.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-admin.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-directory.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-directory.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-directory.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-index.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-services.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-services.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-services.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-sitemap.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-sitemap.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-sitemap.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-summary.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/navigation-summary.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/navigation-summary.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/application-directory-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/application-directory-portlet.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/application-directory-portlet.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-item-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-item-portlet.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/content-item-portlet.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-sections-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/content-sections-portlet.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/content-sections-portlet.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/directory-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/directory-portlet.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/directory-portlet.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/directory-portlet.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/freeform-html-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/freeform-html-portlet.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/freeform-html-portlet.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/lib.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/lib.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/lib.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/lib.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/login-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/login-portlet.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/login-portlet.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/login-portlet.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/portlets.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/portlets.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/portlets.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/portlets.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/rss-feed-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/rss-feed-portlet.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/rss-feed-portlet.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/tasklist-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/tasklist-portlet.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/tasklist-portlet.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/time-of-day-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/time-of-day-portlet.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/time-of-day-portlet.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/workspace-directory-portlet.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/portal/workspace-directory-portlet.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/portal/workspace-directory-portlet.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/search-admin.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/search-admin.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/search-admin.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/search-admin.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/search-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/search-index.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/search-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/search-index.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/shortcuts-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.css
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/shortcuts-index.css
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.css
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/shortcuts-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/shortcuts-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/shortcuts-index.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/subsite-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.css
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/subsite-index.css
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.css
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/subsite-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/subsite-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/subsite-index.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/terms-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.css
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/terms-index.css
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.css
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/terms-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/terms-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/terms-index.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.css b/ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.css
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.css
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.css
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.xsl
similarity index 87%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.xsl
index 44121cbda..3f85303aa 100644
--- a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/theme-index.xsl
+++ b/ccm-gen-aplaws/web/themes/static/aplaws-generic/theme-index.xsl
@@ -9,7 +9,7 @@
   -->
   <!-- path to xsl if installed in the main (common) web context   
   -->
-  <xsl:import href="../../../__ccm__/apps/theme/xsl/index.xsl"/>
+  <xsl:import href="../../heirloom/apps/themedirector/xsl/index.xsl"/>
 
   <xsl:import href="lib/page.xsl"/>
 
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Address.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Address.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Address.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Address.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Agenda.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Agenda.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Agenda.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Agenda.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Article.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Article.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Article.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Article.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/ContentTypes.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/ContentTypes.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/ContentTypes.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/ContentTypes.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Event.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Event.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Event.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Event.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/FileStorageItem.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/FileStorageItem.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/FileStorageItem.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/FileStorageItem.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/InlineSite.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/InlineSite.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/InlineSite.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/InlineSite.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Job.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Job.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Job.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Job.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/LegalNotice.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/LegalNotice.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/LegalNotice.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/LegalNotice.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Minutes.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Minutes.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Minutes.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Minutes.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/MultiPartArticle.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/MultiPartArticle.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/MultiPartArticle.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/NewsItem.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/NewsItem.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/NewsItem.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/NewsItem.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/PressRelease.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/PressRelease.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/PressRelease.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/PressRelease.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Service.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Service.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/Service.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/Service.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/SiteProxy.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/types/SiteProxy.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/types/SiteProxy.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/types/SiteProxy.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/workspace-admin.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/workspace-admin.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-admin.xsl
diff --git a/ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/workspace-index.xsl b/ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl
similarity index 100%
rename from ccm-gen-aplaws/web/__ccm__/themes/aplaws-generic/workspace-index.xsl
rename to ccm-gen-aplaws/web/themes/static/aplaws-generic/workspace-index.xsl
diff --git a/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml b/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml
index a1f6cabaa..7f604343b 100644
--- a/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml
+++ b/ccm-ldn-navigation/web/WEB-INF/web.ccm-ldn-navigation.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<web-app         xmlns="http://java.sun.com/xml/ns/j2ee"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
+                        http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+               version="2.4">
 
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
+    <!-- module ccm-ldn-navigation  -  servlet definitions BEGIN  -->
     <servlet>
         <servlet-name>navigation-files</servlet-name>
         <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
@@ -14,8 +18,13 @@
             <param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value>
         </init-param>
     </servlet>
+    <!-- module ccm-ldn-navigation  -  servlet definitions END  -->
+
+    <!-- module ccm-ldn-navigation  -  servlet mappings BEGIN  -->
     <servlet-mapping>
         <servlet-name>navigation-files</servlet-name>
         <url-pattern>/ccm-ldn-navigation/files/*</url-pattern>
     </servlet-mapping>
+    <!-- module ccm-ldn-navigation  -  servlet mappings END  -->
+
 </web-app>
diff --git a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
index 8dde7ea18..23de591bd 100644
--- a/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
+++ b/ccm-zes-aplaws/bundles/devel/cfg/applications.cfg
@@ -28,7 +28,6 @@ ccm-cms-types-formsectionitem
 # -- ccm-cms-types-member
 # -- ccm-cms-types-minutes
 # -- ccm-cms-types-motditem
-
 ccm-cms-types-mparticle
 ccm-cms-types-newsitem
 # -- ccm-cms-types-organization
@@ -47,6 +46,7 @@ ccm-cms-types-xmlfeed
 # -- ccm-docmngr    ## temp., produces errors in build
 # -- ccm-formbuilder-pdf
 ccm-forum
+# ccm-forum-categorised
 ccm-simplesurvey
 ccm-themedirector
 ccm-user-preferences
@@ -61,7 +61,6 @@ ccm-user-preferences
 # -- ccm-ldn-exporter
 # -- ccm-ldn-freeform
 # -- ccm-ldn-importer
-
 ccm-ldn-navigation
 ccm-ldn-portal
 ccm-ldn-rss
diff --git a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties
index 79ba3934d..08b90fc8c 100644
--- a/ccm-zes-aplaws/bundles/devel/cfg/integration.properties
+++ b/ccm-zes-aplaws/bundles/devel/cfg/integration.properties
@@ -3,6 +3,7 @@
 waf.bebop.base_page=com.arsdigita.aplaws.ui.SimplePage
 #
 ; dhtml editor to use (system wide)
+; Xinha is default
 ; default: Xinha editor & src=/assets/xinha/XinhaLoader.js
 #waf.bebop.dhtml_editor=FCKeditor
 
@@ -19,6 +20,7 @@ waf.kernel.supported_languages=de,en
 
 ; security.properties: 
 waf.auto_registration_on=false
+
 # MOVED to ui.Config
 #waf.pagemap.root=navigation/
 #waf.pagemap.workspace=navigation/
@@ -49,6 +51,13 @@ 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
+; 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_config=XinhaConfig,/assets/xinha/XinhaConfig.js
 ; com.arsdigita.cms.dhtml_editor_hidden_buttons=
diff --git a/ccm-zes-aplaws/bundles/devel/cfg/web.xml b/ccm-zes-aplaws/bundles/devel/cfg/web.xml
index 2e0b80c57..0b7af1767 100644
--- a/ccm-zes-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-zes-aplaws/bundles/devel/cfg/web.xml
@@ -304,33 +304,33 @@
   </servlet>
   <!-- module ccm-ldn-terms  -  servlet declarations END   -->
 
-  <!-- module ccm-ldn-themes  -  servlet declarations BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet declarations BEGIN   -->
   <servlet>
     <servlet-name>theme-files</servlet-name>
     <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
     <init-param>
       <param-name>template-path</param-name>
-      <param-value>/templates/ccm-ldn-theme</param-value>
+      <param-value>/templates/ccm-themedirector</param-value>
     </init-param>
   </servlet>
 
   <servlet>
      <servlet-name>ThemeDownload</servlet-name>
-     <servlet-class>com.arsdigita.london.theme.dispatcher.ThemeDownloadServlet</servlet-class>
+     <servlet-class>com.arsdigita.themedirector.dispatcher.ThemeDownloadServlet</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>ThemePreviewServlet</servlet-name>
      <display-name>Servlet to allow admins to preview look/feel</display-name>
     <servlet-class>
-     com.arsdigita.london.theme.dispatcher.InternalThemePrefixerServlet
+     com.arsdigita.themedirector.dispatcher.InternalThemePrefixerServlet
     </servlet-class>
     <init-param>
       <param-name>prefix</param-name>
       <param-value>/theme</param-value>
     </init-param>
   </servlet>
-  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+  <!-- module ccm-themedirector  -  servlet declarations END   -->
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      MODULES SERVLET MAPPINGS SECTION
@@ -404,7 +404,7 @@
   </servlet-mapping>
   <!-- module ccm-ldn-terms  -  servlet mappings END  -->
 
-  <!-- module ccm-ldn-theme  -  servlet mappings BEGIN   -->
+  <!-- module ccm-themedirector  -  servlet mappings BEGIN   -->
   <servlet-mapping>
     <servlet-name>theme-files</servlet-name>
     <url-pattern>/theme-files/*</url-pattern>
@@ -419,7 +419,7 @@
     <servlet-name>ThemePreviewServlet</servlet-name>
     <url-pattern>/theme/*</url-pattern>
   </servlet-mapping>
-  <!-- module ccm-ldn-themes  -  servlet mappings END   -->
+  <!-- module ccm-themedirector  -  servlet mappings END   -->
 
 
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Initializer.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Initializer.java
index dec7b485a..3196b2d8a 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Initializer.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Initializer.java
@@ -39,6 +39,12 @@ public class Initializer extends CompoundInitializer {
         (Initializer.class.getName());
 
 
+    /**
+     * Package Implementation of  {@link Initializer#init(DomainInitEvent)}. 
+     * 
+     * @param evt
+     */
+    @Override
     public void init(DomainInitEvent evt) {
         super.init(evt);
 
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
index cdba38446..ff4a63f3a 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/Loader.java
@@ -66,6 +66,10 @@ import java.util.Set;
 public class Loader extends PackageLoader {
 
     private static final Logger s_log = Logger.getLogger(Loader.class);
+
+    // Name of files containing an initial category tree(s).
+    // Files are stored as part of the jar, so classloader can find them.
+    // ToDo: relocate files user accessible outside the jar.
     private static final String[] categoryFiles = new String[]{
         "WEB-INF/aplaws/zes-nav-domain-1.00.xml",
         "WEB-INF/aplaws/zes-nav-hierarchy-1.00.xml"
@@ -77,8 +81,11 @@ public class Loader extends PackageLoader {
     // private StringParameter m_subjectDomain;
     // private StringParameter m_rssDomain;
 
+    /**
+     * Constructor 
+     */
     public Loader() {
-
+        
         // Es werden stumpf mehrere Kategorisierungsdomains fuer TERMS 
         // definiert und dann über xml Dateien gefüllt:
         // navigationDomain f. Navigation
@@ -90,40 +97,42 @@ public class Loader extends PackageLoader {
                 "com.arsdigita.aplaws.navigation_domain",
                 Parameter.REQUIRED,
                 "ZES-NAV");
+        // Registers to the context by adding the parameter to a map of parameters
         register(m_navigationDomain);
 
         /*
          * You may add more catagory domains by adding resources
-         * according the followin schema
+         * according the following schema
          */
 
         /* currently not used
         m_subjectDomain = new StringParameter(
-        "com.arsdigita.aplaws.subject_domain",
-        Parameter.REQUIRED,
-        "LGCL");
+            "com.arsdigita.aplaws.subject_domain",
+            Parameter.REQUIRED,
+            "LGCL");
         register(m_subjectDomain);
          */
 
         /* currently not used
         m_interactionDomain = new StringParameter(
-        "com.arsdigita.aplaws.subject_domain",
-        Parameter.REQUIRED,
-        "LGIL");
+            "com.arsdigita.aplaws.subject_domain",
+            Parameter.REQUIRED,
+            "LGIL");
         register(m_interactionDomain);
          */
-
+        
         /* currently not used
         m_rssDomain = new StringParameter(
-        "com.arsdigita.aplaws.rss_domain",
-        Parameter.REQUIRED,
-        "APLAWS-RSS");
+            "com.arsdigita.aplaws.rss_domain",
+            Parameter.REQUIRED,
+            "APLAWS-RSS");
         register(m_rssDomain);
          */
 
 
     }
 
+
     public void run(final ScriptContext ctx) {
 
         String[] files = categoryFiles;
@@ -172,11 +181,11 @@ public class Loader extends PackageLoader {
         registerNavigationTemplates();
 
         // Switch /portal/ to use 1 column layout for funky aplaws stuff.
-        Workspace portal = (Workspace) Application.retrieveApplicationForPath(
-                "/portal/");
-        portal.setDefaultLayout(PageLayout.findLayoutByFormat(
-                PageLayout.FORMAT_ONE_COLUMN));
-    }
+        Workspace portal = (Workspace)Application
+              .retrieveApplicationForPath("/portal/");
+        portal.setDefaultLayout(PageLayout
+              .findLayoutByFormat(PageLayout.FORMAT_ONE_COLUMN));
+    }   // end run method
 
 //  public void registerServicesTemplate(String appURL) {
 //      Application app = Application.retrieveApplicationForPath(appURL);
@@ -194,6 +203,7 @@ public class Loader extends PackageLoader {
 //                           Template.DEFAULT_DISPATCHER_CONTEXT, 
 //                           Template.DEFAULT_USE_CONTEXT );
 //  }
+    
     /**
      * Use Package com.arsdigita.london.navigation to add additional
      * templates (JSP page - index page) for use in navigation.
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java
index 5de5558c4..d154948d7 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepagePortalSelectionModel.java
@@ -22,9 +22,15 @@ import com.arsdigita.bebop.PageState;
 import com.arsdigita.bebop.parameters.ParameterModel;
 import com.arsdigita.domain.DomainObject;
 
+import org.apache.log4j.Logger;
+
 public class HomepagePortalSelectionModel extends AbstractSingleSelectionModel
     implements PortalSelectionModel {
 
+    /** Private logger instance for debugging  */
+    private static Logger s_log = Logger.getLogger(
+                                  HomepagePortalSelectionModel.class);
+
     private HomepageWorkspaceSelectionModel m_workspace;
     private int m_column;
 
@@ -32,6 +38,13 @@ public class HomepagePortalSelectionModel extends AbstractSingleSelectionModel
                                         int column) {
         m_workspace = workspace;
         m_column = column;
+
+        if (s_log.isDebugEnabled()) {
+            s_log.debug("Constructor HomepageWorkspaceSelectionModel " + " [" +
+                        "Workspace: " + m_workspace + "," +
+                        "Columns: " + column +  "]");
+        }
+
     }
 
     public void onCustomize(PageState state) {
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java
index e4c44173b..7d8997669 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspace.java
@@ -29,11 +29,20 @@ import com.arsdigita.kernel.permissions.PermissionService;
 import com.arsdigita.kernel.permissions.PermissionDescriptor;
 import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
 import com.arsdigita.kernel.Party;
-import com.arsdigita.kernel.Kernel;
+
+import com.arsdigita.kernel.Kernel;import org.apache.log4j.Logger;
 
 
+/** 
+ * 
+ * 
+ */
 public class HomepageWorkspace extends SimpleContainer {
     
+    /** Private logger instance for debugging  */
+    private static Logger s_log = Logger.getLogger(
+                                  HomepageWorkspace.class);
+
     private HomepagePortalSelectionModel m_model;
     private ActionLink m_reset;
     private ActionLink m_browse;
@@ -47,10 +56,19 @@ public class HomepageWorkspace extends SimpleContainer {
     public HomepageWorkspace() {
         super("portal:homepageWorkspace", PortalConstants.PORTAL_XML_NS);
         m_customizable = false;
+
+        if (s_log.isDebugEnabled()) {
+            s_log.debug("Constructor HomepageWorkspace finished. " );
+        }
+
     }
     
     public void setModel(HomepagePortalSelectionModel model) {
         m_model = model;
+
+        if (s_log.isDebugEnabled()) {
+            s_log.debug("setModel: " + m_model );
+        }
     }
     
     public void setCustomizable(boolean customizable) {
diff --git a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java
index aabacc935..d1a8bcdb7 100644
--- a/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java
+++ b/ccm-zes-aplaws/src/com/arsdigita/aplaws/ui/HomepageWorkspaceSelectionModel.java
@@ -51,7 +51,7 @@ public class HomepageWorkspaceSelectionModel {
     private RequestLocal m_custom = new RequestLocal();
 
     private static Logger s_log = Logger.getLogger
-        (HomepageWorkspaceSelectionModel.class.getName());
+                          (HomepageWorkspaceSelectionModel.class.getName());
 
     public WorkspacePage getPortal(PageState state,
                                    int column) {
diff --git a/ccm-zes-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp b/ccm-zes-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp
index c851752cc..b3e5f5a01 100644
--- a/ccm-zes-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp
+++ b/ccm-zes-aplaws/web/templates/ccm-ldn-navigation/navigation/sitemap.jsp
@@ -13,7 +13,7 @@
 
   <define:page name="sitemapPage" application="navigation"
     title="APLAWS" cache="true">
- 
+
     <jsp:scriptlet>
       sitemapPage.setClassAttr("sitemapPage");
     </jsp:scriptlet>
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.css b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.css
index 132b7d723..74c5d3a59 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.css
+++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.css
@@ -1,2 +1,403 @@
-@import url("/css/acs-master.css");
-@import url("/__ccm__/static/forum/forum.css");
+@import url("css/main.css");
+/* Chris presumably forgot the ! to comment the following 2 lines out
+/* <--@import url("/css/acs-master.css");-->   */
+/* <--@import url("/css/tabbed-pane/tabbed-pane.css");-->  */
+
+
+body {
+	margin: 0;
+	background-color: #FFF;
+	color: #000;
+	font-family: Verdana, Arial, Helvetica, sans-serif; 
+}
+
+.forum {
+	font-size: 0.8em;
+	margin: 8px 0 10px 2px;	
+}
+
+.content {
+	margin-left: 10px;
+}
+
+
+/*form submission*/
+
+.forumSelect {
+	margin-top: 0.2em;
+	float:left;
+}
+.forumButton input {
+	float:left;
+	margin-top: 0.2em;
+	margin-right: 5px;
+	padding-left: 2px;
+	padding-right: 2px;
+	color: #000;
+	background-color: #CCC;
+	vertical-align: middle;
+	border: 1px solid #000;
+	
+}
+
+.submit {
+	clear: both;
+	margin-left: 100px;	
+}
+
+/*
+view all threads
+
+*/
+
+#selectLabel {
+	float:left;
+	color: white;
+	padding-top: 0.2em;
+	padding-left: 0.2em;
+}
+#selectCategory {
+	background-color: #999;
+	height: 2.2em;
+	
+}
+
+#threadHead {
+	background-color: #E5F3FC;
+	font-weight: bold;
+	height: 1.5em;	
+	padding-left: 0.2em;
+	margin-bottom: 0.3em;
+	
+}
+#noMessages {
+	clear:both;
+	float:left;
+	width: 100%;
+	
+}
+.subject {
+	clear: both;
+	float:left;
+	width: 190px;
+	padding: 4px 0 4px 22px;
+	background-position: 4px 0.7em;
+	background-repeat: no-repeat;
+	background-image: url("images/forum/read.gif");
+}
+
+.topic {
+	clear:both;
+	float:left;
+	width: 212px;
+	padding: 4px 0 4px 0px;
+}
+
+.threadSubject {
+	clear:both;
+	float:left;
+	width: 140px;
+	padding: 4px 0 4px 0px;
+}
+
+.author {
+	float:left;
+	width: 100px;
+	padding: 4px 0 4px 0px;
+	text-align: center;
+}
+
+.replies {
+	float:left;
+	text-align: center;
+	width: 60px;
+	padding: 4px 0 4px 0px;
+}
+
+.threads {
+	float:left;
+	text-align: center;
+	width: 75px;
+	padding: 4px 0 4px 0px;
+}
+
+.status {
+	float:left;
+	width: 75px;
+	padding: 4px 0 4px 0px;
+}
+
+.delete {
+	float:left;
+	text-align: center;
+	width: 50px;
+	padding: 4px 0 4px 0px;
+}
+
+.lastPost {
+	float: left;
+	text-align: center;
+	width: 150px;
+	padding: 4px 0 4px 0px;
+}
+
+#newTopicLink a {	
+	padding: 4px 0 4px 22px;
+	background-position: 0px 0.3em;
+	background-repeat: no-repeat;
+	background-image: url("images/forum/post-16x16.gif");	
+}
+
+#viewAllTopicsLink a {
+	float: left;
+	padding: 4px 15px 4px 22px;
+	background-position: 0px 0.3em;
+	background-repeat: no-repeat;
+	background-image: url("images/forum/back-to-16x16.gif");
+	
+}
+
+#watchTopicLink a {
+	float: left;
+	padding: 4px 0 4px 22px;
+	background-position: 0px 0.3em;
+	background-repeat: no-repeat;
+	background-image: url("images/forum/watch-16x16.gif");
+	margin-left: 0.8em;
+	margin-bottom: 0.8em;
+}
+
+#info {
+	clear:both;
+	padding: 4px 0 4px 22px;
+	background-position: 0px 0.6em;
+	background-repeat: no-repeat;
+	background-image: url("images/forum/info-16x16.gif");
+	color: green;
+	margin-left: 0.8em;
+}
+
+.post {
+	clear: both;
+	margin-bottom: 0.8em;
+	font-size: 1em;
+}
+
+.postOdd {
+	background-color: #EFEFEF;
+
+}
+
+.postEven {
+	background-color: #FFFFFF;
+}
+
+#topic {
+	margin-bottom: 0.8em;
+	font-weight: bold;
+}
+
+.actions {
+	float: right;
+	margin-right: 0.3em;	
+}
+
+.header {	
+	float: left;	
+	margin-left: 0.3em;	
+	font-weight: bold;
+}
+
+.message {
+	clear: both;
+	float: left;
+	width:98%;
+    margin-left: 0.3em;
+	margin-bottom: 0.5em;
+}
+
+.postDetails {
+	clear: both;
+	float: left;
+	margin-bottom: 0.5em;
+	margin-left: 0.3em;
+}
+
+.bar {
+	clear:both;
+	float:left;
+	width: 98%;
+	padding-left: 0.3em;
+	padding-right: 0.3em;
+	padding-top: 0.5em;
+	padding-bottom: 0.5em;
+}
+
+.replyBar {
+	clear:both;	
+	padding-right: 0.3em;
+	padding-top: 0.5em;
+	padding-bottom: 0.5em;
+}
+
+
+.clearGroup {
+	clear:both;
+	margin-bottom: 0.5em;
+}
+
+.columnOne {
+	float: left;
+	width: 100px;
+	font-size: 1em;
+}
+
+.columnOneWide {
+	float: left;
+	width: 130px;
+	font-size: 1em;
+}
+
+.columnTwo {		
+	display: inline;
+	font-size: 1em;
+	margin: 0;		
+}
+
+
+.columnTwo input {
+	width: 300px;	
+}
+
+.columnTwo select {	
+	width: 300px;	
+}
+
+
+.columnTwo textArea {
+	width: 300px;	
+}
+
+.columnThree {
+	font-size: 1em;
+}
+
+#title {
+	float:left;
+	width: 100%;		
+		
+	font-size: 1.2em;
+}
+
+
+fieldset {
+	padding: 0.3em 0.3em 0.3em 0.3em;	
+}
+
+.fileLink {
+	margin-left: 0.5em;
+	clear: both;
+	float:left;
+}
+
+
+textarea {
+	width: 450px;
+}
+
+.validationError {
+	color: red;
+	margin-left: 100px;
+}
+
+#images {
+	clear: both;
+	float:left;
+	margin-left: 0.3em;	
+}
+
+#plainText {
+	clear: both;
+	font-size: 1em;
+	margin-bottom: 0.5em;
+}
+
+li {
+	list-style-position: inside;	
+}
+	
+.expiry input {
+	width: 50px;
+}
+
+.fileTable {
+	width: 100%;	
+}
+
+
+pre {
+
+	font-size: 1em;
+}
+
+
+/* Contents of tabbed-pane.css - forum tabs */
+
+div.tabbed-pane div, div.tabbed-pane table.tab-set, div.tabbed-pane table.tab-set td {
+  margin: 0;
+  border: 0;
+  padding: 0;
+}
+
+div.tabbed-pane table {
+  border-collapse: collapse;
+}
+
+div.tabbed-pane table.tab-set {
+  margin-left: 10px;
+}
+
+div.tabbed-pane table.tab-set a {
+  text-decoration: none;
+  color: rgb(63,63,63);
+}
+
+div.tabbed-pane table.tab-set td.tab-label {
+  margin-left: 4px;
+  padding: 5px 0 3px 10px;
+ 
+  background: rgb(225,225,225) url(/css/tabbed-pane/tab-unselected.png) no-repeat;
+}
+
+div.tabbed-pane table.tab-set td.tab-end {
+  width: 10px;
+  background: url(/css/tabbed-pane/tab-unselected-end.png) no-repeat;
+}
+
+div.tabbed-pane table.tab-set td.current-tab-label {
+  margin-left: 4px;
+  padding: 5px 0 3px 10px;
+  background: rgb(162,30,30) url(/css/tabbed-pane/tab-selected.png) no-repeat;
+  color: white;
+}
+
+div.tabbed-pane table.tab-set td.current-tab-end {
+  width: 10px;
+  background: url(/css/tabbed-pane/tab-selected-end.png) no-repeat;
+}
+
+div.tabbed-pane table.tab-set td.tab-spacer {
+  width: 4px;
+}
+
+div.tabbed-pane table.rule {
+  margin-left: 10px; 
+  width: 100%;
+  background: rgb(162,30,30) url(/css/tabbed-pane/tab-bar.png) repeat-x;
+  height: 10px;
+}
+
+div.tabbed-pane div.current-pane {
+  width: 100%;
+}
+
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.xsl b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.xsl
index b7b067338..b68bf25b1 100644
--- a/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.xsl
+++ b/ccm-zes-aplaws/web/themes/static/aplaws-generic/forum-index.xsl
@@ -1,22 +1,1307 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
-  version="1.0">
+<xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
+				xmlns:bebop="http://www.arsdigita.com/bebop/1.0" 
+				xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+				xmlns:nav="http://ccm.redhat.com/london/navigation" 
+				xmlns:search="http://rhea.redhat.com/search/1.0" 
+				xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" 				
+				xmlns:cms="http://www.arsdigita.com/cms/1.0" 	
+				exclude-result-prefixes="xsl bebop nav search portal forum cms" 
+				version="1.0">
 
-  <!-- IMPORT DEFINITIONS ccm-forum installed as separate web application ccm-forum
-  <xsl:import href="../../../../ccm-forum/__ccm__/apps/forum/xsl/index.xsl"/>
-  -->
-  <!-- IMPORT DEFINITIONS ccm-ldn-shortcuts installed into the main CCM webapp
-  -->
-  <xsl:import href="../../../__ccm__/apps/forum/xsl/index.xsl"/>
+        <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
+	<xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl" />
+	<xsl:import href="../../../../ROOT/packages/ui/xsl/ui.xsl" />
+	<xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl" />
+	-->
+ 	<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
+	-->
+	<xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
+	<xsl:import href="../../../packages/ui/xsl/ui.xsl" />
+	<xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
 
-  <xsl:import href="lib/page.xsl"/>
+	<xsl:import href="lib/header.xsl" />
+	<xsl:import href="lib/lib.xsl" />
+	<xsl:import href="lib/leftNav.xsl" />
+        <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
+	<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
+	-->
+ 	<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
+	-->
+	<xsl:import href="../../../packages/bebop/xsl/dcp.xsl"/>
+  
 
-  <xsl:param name="theme-prefix" />
 
-  <xsl:template name="aplaws:headerStyleSheets">
-    <link rel="stylesheet" href="{$theme-prefix}/forum-index.css" type="text/css" media="screen"/>
-  </xsl:template>
+	<xsl:param name="theme-prefix" />
+	<xsl:param name="context-prefix" />
+	<xsl:param name="dispatcher-prefix" />
 
+	<xsl:output method="html" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" 
+		    doctype-system="http://www.w3.org/TR/html4/loose.dtd" indent="yes" />
+
+<!-- ********************* MAIN PAGE LAYOUT TEMPLATES ********************* -->
+
+	<xsl:template match="bebop:page[@class='simplePage']">
+		<html lang="en">
+			<head>
+				<title>
+					Forum
+				</title>
+				<link rel="stylesheet" href="{$theme-prefix}/forum-index.css" type="text/css" media="screen" />
+				<link rel="stylesheet" href="{$theme-prefix}/css/print.css" type="text/css" media="print" />
+				<script type="text/javascript" src="{$theme-prefix}/css/date.js"></script>
+				<xsl:call-template name="bebop:dcpJavascript"/>
+			</head>
+
+			<body>
+ 				<a name="Ptop"></a>
+				<a class="navHide" href="#startcontent" title="Go directly to main content" accesskey="S">Skip over navigation</a>
+				<span class="hide">|</span>
+				<xsl:call-template name="header" />
+				<xsl:call-template name="mainContent" />
+
+				<xsl:call-template name="footer" />
+
+			</body>
+		</html>
+	</xsl:template>
+
+
+	<xsl:template name="mainContent">
+
+		<table id="mainLayout" border="0" cellspacing="0" cellpadding="0" summary="navigation and content">
+			<tr>
+				<td>
+					<img class="lSpacer" src="{$theme-prefix}/images/spacer.gif" alt="" />
+				</td>
+				<td>
+					<img class="rSpacer" src="{$theme-prefix}/images/spacer.gif" alt="" />
+				</td>
+			</tr>
+			<tr>
+				<td id="leftNav" align="left" valign="top">
+					<!--LHS NAVIGATION -->
+
+					<xsl:call-template name="leftNav" />
+
+				</td>
+
+				<td valign="top">
+					<span class="hide">|</span>
+
+					<!--CONTENT -->
+					<a id="startcontent" class="navHide" title="Start of content"></a>
+					<span class="hide">|</span>
+					<!--<xsl:call-template name="pageContent" />-->
+					<div class="pageTitle">
+        				<h1><xsl:value-of select="/bebop:page/forum:name"/></h1>
+        			</div>        			
+					<div class="forum">
+						<xsl:apply-templates select="//forum:forum | //forum:threadDisplay | /bebop:page/bebop:form " />
+					</div>
+				</td>
+			</tr>
+		</table>
+	</xsl:template>
+	
+<!-- ******************** POST TEMPLATES ******************************* -->
+	
+	 <xsl:template name="displayPost">	
+		<xsl:param name="preview" />	
+		
+		<xsl:variable name="class">
+			<xsl:choose>
+				<xsl:when test="position() mod 2">
+					<xsl:text>postOdd</xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:text>postEven</xsl:text>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>			
+		
+		<xsl:variable name="indent">
+			<xsl:choose>					
+				<xsl:when test="$preview='true'">
+					<xsl:value-of select="'0'" />				
+				</xsl:when>
+				<xsl:otherwise>
+						<xsl:choose>					
+							<xsl:when test="count(sortKey) = 0">					
+								<xsl:value-of select="'0'" />																			
+							</xsl:when>																
+							<xsl:otherwise>
+								<xsl:value-of select="string-length(sortKey) div 3" />
+							</xsl:otherwise>
+						</xsl:choose>			
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>					
+				
+		<xsl:if test="count(sortKey) = 0 and $preview='false'">
+			<div id="topic" style="margin-left: {$indent}em;">Thread: <xsl:value-of select="subject" /></div>	
+			
+			<xsl:apply-templates select="../../forum:threadOptions" />
+		</xsl:if>									
+				
+		<div class="post" style="margin-left: {$indent}em;">			
+			<fieldset class="{$class}">									
+				<div class="clearGroup">
+					<div class="header">
+	 					<xsl:value-of select="subject" />
+						<xsl:if test="status != 'approved' and $preview = 'false'">								
+							(
+							<xsl:value-of select="status" />
+							)								
+						</xsl:if>	
+					</div>							
+				 
+				 	<xsl:if test="$preview = 'false'">
+						<div class="actions">
+							<xsl:if test="@approveURL">
+								<a href="{@approveURL}">
+									<img alt="Approve" border="0" src="{$theme-prefix}/images/forum/reward-16x16.gif" />
+								</a>
+								<!--<xsl:text>&#160;</xsl:text>
+								<a href="{@approveURL}">Approve</a>-->
+								<xsl:text>&#160;</xsl:text>
+	
+							</xsl:if>
+							<xsl:if test="@rejectURL">
+								<a href="{@rejectURL}" >
+									<img alt="Reject" border="0" src="{$theme-prefix}/images/forum/delete-16x16.gif" />
+								</a>
+								<!--<xsl:text>&#160;</xsl:text>
+								<a href="{@rejectURL}">Reject</a>-->
+								<xsl:text>&#160;</xsl:text>
+							</xsl:if>
+							<xsl:if test="@editURL">
+								<a href="{@editURL}">
+									<img alt="Edit" border="0" src="{$theme-prefix}/images/forum/edit-16x16.gif" />
+								</a>
+								<!--<xsl:text>&#160;</xsl:text>
+								<a href="{@editURL}">Edit</a>-->
+								<xsl:text>&#160;</xsl:text>
+							</xsl:if>
+							<xsl:if test="@deleteURL">
+								<a href="{@deleteURL}">
+									<img alt="Delete" border="0" src="{$theme-prefix}/images/forum/archived-16x16.gif" />
+								</a>
+								<!--<xsl:text>&#160;</xsl:text>
+								<a href="{@deleteURL}">Delete</a>-->
+								<xsl:text>&#160;</xsl:text>
+							</xsl:if>					
+							<xsl:if test="@replyURL">
+								<xsl:text>&#160;</xsl:text>
+								<xsl:text>&#160;</xsl:text>
+								<xsl:text>&#160;</xsl:text>
+								<a href="{@replyURL}">
+									<img alt="Reply" border="0" src="{$theme-prefix}/images/forum/reply-16x16.gif" />
+								</a>
+								<xsl:text>&#160;</xsl:text>
+								<a href="{@replyURL}">Reply</a>
+								<xsl:text>&#160;</xsl:text>
+							</xsl:if>						
+						</div>	
+					</xsl:if>
+				</div>				
+				
+				<div class="postDetails">
+					<xsl:text>Posted:&#160;</xsl:text>
+					<xsl:value-of select="sent" />
+					<xsl:text>&#160;by&#160;</xsl:text>
+					<a href="mailto:{sender/primaryEmail}">
+						<xsl:value-of select="sender/displayName" />
+					</a>																		
+				</div>	
+				
+				<div class="clearGroup">
+					<xsl:for-each select="files">
+						<xsl:sort select="fileOrder"/>
+						<div class="fileLink">	
+							 <xsl:variable name="encodedFileName">
+				            	<xsl:call-template name="url-encode">
+			    		     		 <xsl:with-param name="str" select="./name"/>
+				        		</xsl:call-template>
+				            </xsl:variable>						
+							<a href="{$dispatcher-prefix}/cms-service/stream/asset/?asset_id={./id}&amp;file=/{$encodedFileName}">
+							<!-- show file in new window for preview to avoid losing the form -->
+							<xsl:if test="$preview='true'">
+								<xsl:attribute name="target">_blank</xsl:attribute>
+							</xsl:if>
+							
+							<xsl:value-of select="name"/></a>
+						</div>                    
+						<div class="fileDescription">
+						
+						</div>
+					</xsl:for-each>
+				</div>
+				
+				<div class="bar">
+					<hr/>
+				</div>
+															
+				<div class="message">												
+					<xsl:value-of select="body" disable-output-escaping="yes" />						
+				</div>									
+				
+				<div id="images">					
+					<xsl:for-each select="images">						
+						<xsl:sort select="link/imageOrder"/>
+						<div class="clearGroup">															 					          				
+							<img src="{$dispatcher-prefix}/cms-service/stream/image/?image_id={./id}" alt="{./description}"/>
+						</div>							
+					</xsl:for-each>	
+				</div>				
+			</fieldset>
+		</div>				
+		<table class="data">
+			<tfoot>
+				<tr>
+					<th colspan="5">						
+						<xsl:apply-templates select="forum:paginator" mode="page-links" />
+					</th>
+				</tr>
+			</tfoot>
+		</table>
+	</xsl:template>
+
+	<xsl:template match="forum:paginator" mode="page-links">
+		<xsl:if test="@pageCount > 1">			
+			<div class="clearGroup">
+				<br/>
+				<xsl:if test="@pageNumber > 1">					
+					<a>
+						<xsl:attribute name="href">
+							<xsl:call-template name="make-url">
+								<xsl:with-param name="base-url" select="@baseURL" />
+								<xsl:with-param name="name" select="@param" />
+								<xsl:with-param name="value" select="@pageNumber - 1" />
+							</xsl:call-template>
+						</xsl:attribute>
+						<xsl:text>&lt;&lt;&lt; Previous</xsl:text>
+					</a>
+					<xsl:text>&#160;</xsl:text>
+					<xsl:text>&#160;</xsl:text>
+				</xsl:if>
+				<xsl:text>Page&#160;</xsl:text>
+				<xsl:value-of select="@pageNumber" /><xsl:text>&#160;</xsl:text>
+				<xsl:text>of&#160;</xsl:text>
+				<xsl:value-of select="@pageCount" /><xsl:text>&#160;</xsl:text>
+				<xsl:if test="@pageNumber &lt; @pageCount">
+					<xsl:text>&#160;</xsl:text>
+					<xsl:text>&#160;</xsl:text>
+					<a>
+						<xsl:attribute name="href">
+							<xsl:call-template name="make-url">
+								<xsl:with-param name="base-url" select="@baseURL" />
+								<xsl:with-param name="name" select="@param" />
+								<xsl:with-param name="value" select="@pageNumber + 1" />
+							</xsl:call-template>
+						</xsl:attribute>
+						<xsl:text>Next &gt;&gt;&gt;</xsl:text>
+					</a>
+				</xsl:if>
+			</div>
+		</xsl:if>
+	</xsl:template>
+    
+	<xsl:template match="forum:topicSelector">
+		<xsl:if test="count(forum:topic) > 0">
+			<div class="content">
+				<form action="{@baseURL}" method="get">
+	
+					<div id="selectCategory">
+						<div id="selectLabel">Filter by topic:</div>
+						<select name="{@param}" class="forumSelect">
+							<option value="{@anyTopicID}">
+								<xsl:if test="@anyTopicID = @currentTopicID">
+									<xsl:attribute name="selected">
+										<xsl:text>selected</xsl:text>
+									</xsl:attribute>
+								</xsl:if>
+								<xsl:text>All topics</xsl:text>
+							</option>
+							<xsl:for-each select="forum:topic">
+								<option value="{id}">
+									<xsl:if test="id = ../@currentTopicID">
+										<xsl:attribute name="selected">
+											<xsl:text>selected</xsl:text>
+										</xsl:attribute>
+									</xsl:if>
+									<xsl:value-of select="name" />
+								</option>
+							</xsl:for-each>
+							<option value="{@noTopicID}">
+								<xsl:if test="@noTopicID = @currentTopicID">
+									<xsl:attribute name="selected">
+										<xsl:text>selected</xsl:text>
+									</xsl:attribute>
+								</xsl:if>
+								<xsl:text>No topic</xsl:text>
+							</option>
+						</select>
+						<div class="forumButton">
+							<input type="submit" value="Apply" />
+						</div>
+					</div>	
+				</form>
+			</div>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="forum:threadList">
+		<div class="content">
+			<div id="threadHead">
+				<div class="topic">Thread</div>
+				<div class="author">Author</div>
+				<div class="replies">Replies</div>
+				<div class="lastPost">Last Post</div>
+			</div>
+			<xsl:if test="count(forum:thread) = 0">
+				<div id="noMessages">No messages have been posted yet</div>
+			</xsl:if>
+			<xsl:for-each select="forum:thread">
+
+				<div>
+					<xsl:variable name="class">
+						<xsl:choose>
+							<xsl:when test="position() mod 2">
+								<xsl:text>odd</xsl:text>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:text>even</xsl:text>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>
+
+
+					<div class="subject">
+						<a href="{@url}">
+							<xsl:value-of select="root/subject" />
+						</a>
+					</div>
+					<div class="author">
+						<xsl:value-of select="author/displayName" />
+					</div>
+					<div class="replies">
+						<xsl:value-of select="numReplies" />
+					</div>
+					<div class="lastPost">
+						<xsl:value-of select="lastUpdate" />
+					</div>
+
+				</div>
+			</xsl:for-each>
+		</div>
+
+		<xsl:apply-templates select="forum:paginator" mode="page-links" />
+
+	</xsl:template>
+
+	<xsl:template match="forum:threadAlertList">
+		<div class="clearGroup">
+			<div id="threadHead">
+				<div class="threadSubject">Subject</div>
+				<div class="replies">Replies</div>
+				<div class="author">Author</div>
+				<div class="lastPost">Last Post</div>
+				<div class="status">Status</div>
+				<div class="delete">Delete</div>
+			</div>
+		</div>	
+		<xsl:if test="count(forum:threadAlert) = 0">
+			<div>
+				<em>You are not subscribed to any threads</em>
+			</div>
+		</xsl:if>
+		<xsl:for-each select="forum:threadAlert">
+			<xsl:variable name="class">
+				<xsl:choose>
+					<xsl:when test="position() mod 2">
+						<xsl:text>postOdd</xsl:text>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:text>postEven</xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<div class="{$class}">				
+				<div class="threadSubject">
+					<a href="{@url}"><xsl:value-of select="thread/root/subject" /></a>
+				</div>						
+				<div class="replies">
+					<xsl:value-of select="thread/numReplies" />
+				</div>
+				<div class="author">
+					<xsl:value-of select="thread/author/displayName" />
+				</div>
+				<div class="lastPost">
+					<xsl:value-of select="thread/lastUpdate" />
+				</div>
+				<div class="status">
+					<xsl:value-of select="thread/root/status" />
+				</div>
+				<div class="delete">
+					<input type="checkbox" name="{@param}" value="{id}" />
+				</div>
+			</div>			
+		</xsl:for-each>		
+	</xsl:template>
+
+	<xsl:template match="forum:threadDisplay">	
+		<div class="content">			
+			<xsl:for-each select="forum:message">		
+				<xsl:call-template name="displayPost">
+					<xsl:with-param name="preview">
+						<xsl:text>false</xsl:text>
+					</xsl:with-param>
+				</xsl:call-template>
+			</xsl:for-each>	
+		</div>
+	</xsl:template>
+	
+
+
+	<xsl:template match="forum:topicList">
+		<div class="content">			
+			<div id="threadHead">	
+				<div class="threadSubject">Topic</div>
+				<div class="threads">Threads</div>
+				<div class="lastPost">Last Post</div>		
+			</div>
+					
+			<xsl:for-each select="forum:topicSummary">
+				<xsl:variable name="class">
+					<xsl:choose>
+						<xsl:when test="position() mod 2">
+							<xsl:text>postOdd</xsl:text>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:text>postEven</xsl:text>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<div class="{$class}">	
+					<div class="threadSubject">				
+						<xsl:choose>
+							<xsl:when test="numThreads > 0">														
+								<a>
+									<xsl:attribute name="href">
+										<xsl:call-template name="make-url">
+											<xsl:with-param name="base-url" select="../@baseURL" />
+											<xsl:with-param name="name" select="../@param" />
+											<xsl:with-param name="value" select="id" />
+										</xsl:call-template>
+									</xsl:attribute>
+									<xsl:value-of select="name" />
+								</a>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:value-of select="name" />
+							</xsl:otherwise>
+						</xsl:choose>
+					</div>
+					<div class="threads">
+						<xsl:value-of select="numThreads" />
+					</div>
+					<div class="lastPost">
+						<xsl:choose>
+							<xsl:when test="numThreads > 0">
+								<xsl:value-of select="latestPost" />
+							</xsl:when>
+							<xsl:otherwise>
+								<em><xsl:text>n/a</xsl:text></em>
+							</xsl:otherwise>
+						</xsl:choose>
+					</div>
+				</div>
+			</xsl:for-each>
+			<xsl:for-each select="forum:noTopicSummary">
+				<xsl:variable name="class">				
+					<xsl:choose>
+						<xsl:when test="count(../forumTopicSummary) mod 2">
+							<xsl:text>postOdd</xsl:text>
+						</xsl:when>
+						<xsl:otherwise>
+							<xsl:text>postEven</xsl:text>
+						</xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
+				<div class="{$class}">
+					<div class="threadSubject">	
+						<xsl:choose>
+							<xsl:when test="numThreads > 0">
+								<a>
+									<xsl:attribute name="href">
+										<xsl:call-template name="make-url">
+											<xsl:with-param name="base-url" select="../@baseURL" />
+											<xsl:with-param name="name" select="../@param" />
+											<xsl:with-param name="value" select="id" />
+										</xsl:call-template>
+									</xsl:attribute>
+									<em><xsl:text>None</xsl:text></em>
+								</a>
+							</xsl:when>
+							<xsl:otherwise>
+								<em><xsl:text>None</xsl:text></em>
+							</xsl:otherwise>
+						</xsl:choose>
+					</div>				
+					<div class="threads">
+						<xsl:value-of select="numThreads" />
+					</div>
+					<div class="lastPost">
+						<xsl:choose>
+							<xsl:when test="numThreads > 0">
+								<xsl:value-of select="latestPost" />
+							</xsl:when>
+							<xsl:otherwise>
+								<em><xsl:text>n/a</xsl:text></em>
+							</xsl:otherwise>
+						</xsl:choose>
+					</div>			
+				</div>
+			</xsl:for-each>
+		</div>	
+	</xsl:template>	
+
+	<xsl:template match="forum:forumAlerts">
+		<div class="content">
+			<h5>Forum Alerts</h5>
+			<br/>	
+			<xsl:apply-templates select="*" />			
+		</div>
+	</xsl:template>
+	
+<!--	<xsl:template match="bebop:form[@name='instantAlerts' or @name='dailyAlerts']//bebop:panelRow">				
+		<xsl:for-each select="bebop:cell[not(bebop:formWidget)]">
+			<xsl:apply-templates />
+		</xsl:for-each>	
+		<div class="forumButton">			
+			<xsl:apply-templates select="bebop:cell/bebop:formWidget[@name='Save' or @name='forum.ui.delete']" />
+		</div>
+	</xsl:template>-->
+
+	<xsl:template match="forum:threadAlerts">
+		<div class="content">
+			<h5>Thread Alerts</h5>
+			<br/>		
+			<xsl:apply-templates select="*" />
+		</div>
+	</xsl:template>
+
+	<xsl:template match="forum:forum">	
+			<xsl:if test="not(descendant::bebop:form/@name = 'newPostForm')">	
+				<div class="tabbed-pane">
+					<table class="tab-set">
+						<tr>				
+							<xsl:apply-templates select="forum:forumMode" />			
+						</tr>
+					</table>
+					<table class="rule">
+						<tr>
+							<td></td>
+						</tr>
+					</table>
+				</div>
+				<div>
+					<xsl:text>&#160;</xsl:text>
+				</div>
+			</xsl:if>	
+			<div class="clearGroup">
+				<div class="content">
+					<xsl:if test="forum:forumMode[@mode = 'threads' and @selected='1'] and not(bebop:form/@name='newPostForm')">
+						<xsl:call-template name="br-replace">
+							<xsl:with-param name="text" select="/bebop:page/forum:introduction"/>
+							
+						</xsl:call-template> 
+					</xsl:if>
+				</div>
+			</div>		
+			<xsl:apply-templates select="*[not(name() = 'forum:forumMode')]" />						
+	</xsl:template>
+
+	<xsl:template match="forum:forumMode">
+		<xsl:variable name="title">
+			<xsl:choose>
+				<xsl:when test="@mode = 'threads'">
+					<xsl:value-of select="'Threads'" />
+				</xsl:when>
+				<xsl:when test="@mode = 'topics'">
+					<xsl:value-of select="'Topics'" />
+				</xsl:when>
+				<xsl:when test="@mode = 'alerts'">
+					<xsl:value-of select="'Alerts'" />
+				</xsl:when>
+				<xsl:when test="@mode = 'moderation'">
+					<xsl:value-of select="'Moderation'" />
+				</xsl:when>
+				<xsl:when test="@mode = 'permissions'">
+					<xsl:value-of select="'Permissions'" />
+				</xsl:when>
+				   <xsl:when test="@mode = 'setup'">
+		          <xsl:value-of select="'Setup'"/>
+		        </xsl:when>
+		        <xsl:when test="@mode = 'categories'">
+		          <xsl:value-of select="'Categories'"/>
+		        </xsl:when>
+			</xsl:choose>
+		</xsl:variable>
+		<xsl:choose>
+			<xsl:when test="@selected = 1">
+				<td class="current-tab-label">
+					<xsl:value-of select="$title" />
+				</td>
+				<td class="current-tab-end" />
+			</xsl:when>
+			<xsl:otherwise>
+				<td class="tab-label">
+					<a href="{@url}">
+						<xsl:value-of select="$title" />
+					</a>
+				</td>
+				<td class="tab-end" />
+			</xsl:otherwise>
+		</xsl:choose>
+		<td class="tab-spacer" />				
+	</xsl:template>
+
+	<xsl:template match="forum:memberList">
+		<xsl:comment>forum member list</xsl:comment>
+		<div class="content">	
+			<fieldset>
+				<legend><xsl:value-of select="@group" /></legend>
+				<xsl:apply-templates />
+				<xsl:apply-templates select="following-sibling::bebop:form[1]" mode="show"/>							
+			</fieldset>
+			<br/>
+		</div>
+	</xsl:template>
+	
+
+	<xsl:template match="forum:forumOptions">
+		<div class="content">
+			<xsl:apply-templates select="*" />
+		</div>
+		<div>
+			<xsl:text>&#160;</xsl:text>
+		</div>
+	</xsl:template>
+
+	<xsl:template match="forum:topicOptions">
+		<div class="content">
+			<xsl:apply-templates select="*" />
+		</div>
+		<div>
+			<xsl:text>&#160;</xsl:text>
+		</div>
+	</xsl:template>
+
+	<xsl:template name="make-url">
+		<xsl:param name="base-url" />
+		<xsl:param name="name" />
+		<xsl:param name="value" />
+
+		<xsl:choose>
+			<xsl:when test="contains($base-url, '?')">
+				<xsl:value-of select="concat($base-url, '&amp;', $name, '=', $value)" />
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:value-of select="concat($base-url, '?', $name, '=', $value)" />
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>	
+
+	
+<!-- ********************** FORM TEMPLATES ********************** -->
+	
+	
+	<xsl:template name="ForumPostForm">
+		<xsl:param name="title" select="'Post message'" />
+		
+		<!--<form action="{@action}" name="{@name}" method="get">-->
+		<form action="{@action}" name="{@name}" enctype="{@enctype}">
+           <xsl:attribute name="method">
+              <xsl:choose>
+                 <xsl:when test="string-length(@method)=0">post</xsl:when>
+                 <xsl:otherwise><xsl:value-of select="@method"/></xsl:otherwise>
+              </xsl:choose>
+            </xsl:attribute>
+
+			<xsl:apply-templates select="bebop:formWidget[@type='hidden']" />
+			<xsl:apply-templates select="bebop:pageState" />
+				
+			<div id="title">
+				<h2 class="pageSubTitle"><xsl:value-of select="$title" /></h2>	
+				<!--<xsl:if test="@name = 'newPostForm'">-->
+					<br/>
+				<!--</xsl:if>-->						
+			</div>		
+			<div class="content">	
+				<xsl:apply-templates select="forum:postForm" />
+				<xsl:apply-templates select="forum:postConfirm" />	
+				<xsl:apply-templates select="forum:postFormImages" />	
+				<xsl:apply-templates select="forum:postFormFiles" />												
+				
+				<div class="clearGroup">	
+					<div class="validationError">
+						<xsl:apply-templates select="bebop:formErrors" />												
+					</div>
+				</div>
+									
+				<div class="clearGroup">	
+					<div class="forumButton">			
+						<br/>
+						<xsl:apply-templates select="bebop:boxPanel/bebop:cell/bebop:formWidget[@name = 'Cancel']" />			
+						<xsl:apply-templates select="bebop:boxPanel/bebop:cell/bebop:formWidget[@name = '&lt;&lt;_Back']" />
+						<xsl:apply-templates select="bebop:boxPanel/bebop:cell/bebop:formWidget[@name = 'Next_>>']" />
+						<xsl:apply-templates select="bebop:boxPanel/bebop:cell/bebop:formWidget[@name = 'Finish']" />
+						<br/>
+					</div>
+				</div>	
+				<br/>			
+			</div>		
+		</form>	
+	</xsl:template>
+
+	<xsl:template match="forum:postForm">
+		<xsl:apply-templates select="bebop:formWidget[@type='hidden']" />
+        
+		<div class="clearGroup">
+			<div class="columnOne">Subject:</div>
+			<div class="columnTwo">
+				<xsl:apply-templates select="bebop:formWidget[@name='subject']" />
+				<div class="validationError">
+					<xsl:apply-templates select="bebop:formErrors[@id='subject']" />												
+				</div>
+			</div>							
+		</div>				
+		<div class="clearGroup">
+			<div class="columnOne">Message:</div>
+			<div class="columnTwo">
+				<xsl:apply-templates select="bebop:*[@name='message']" />
+				<div class="validationError">
+					<xsl:value-of select="bebop:formErrors[@id='message']/@message" disable-output-escaping="yes"/>																	
+				</div>
+			</div>
+		</div>								
+		<!--<div class="clearGroup">
+			<div class="columnOne">Format:</div>
+			<div class="columnTwo">
+				<xsl:apply-templates select="bebop:select[@name='bodyType']" />
+			</div>
+		</div>-->				
+		<xsl:choose>
+			<xsl:when test="bebop:select[@name='postTopic']">
+				<div class="clearGroup">
+					<div class="columnOne">Topic:</div>
+					<div class="columnTwo">
+						<xsl:apply-templates select="bebop:select[@name='postTopic']" />						
+					</div>
+				</div>
+			</xsl:when>
+			<xsl:when test="forum:message">				
+				<div id="plainText">
+					Original Message:					
+				</div>
+				<div class="postOdd">			
+					<fieldset>							
+						<xsl:apply-templates select="forum:message" />														
+					</fieldset>
+				</div>
+			</xsl:when>	
+		</xsl:choose>		
+	
+	</xsl:template>
+	
+	<xsl:template match="bebop:formErrors">		
+		<xsl:value-of select="@message" />
+	</xsl:template>
+
+	<xsl:template match="forum:message">
+		<div class="clearGroup">
+			<div class="columnOneWide">
+				<a href="mailto:{sender/primaryEmail}">
+					<xsl:value-of select="sender/displayName" />
+				</a>							
+			</div>
+			<div class="columnTwo">
+				<xsl:value-of select="subject" />
+				<br/>
+				<xsl:text>Posted</xsl:text>				
+				<xsl:value-of select="sent" />	
+				<div class="replyBar">
+					<hr/>
+				</div>
+				<xsl:value-of select="body" disable-output-escaping="yes" />			
+			</div>
+		</div>
+	</xsl:template>
+
+	<xsl:template match="forum:postConfirm">	
+		<xsl:call-template name="displayPost">			
+			<xsl:with-param name="preview" select="'true'" />
+		</xsl:call-template>		
+	</xsl:template>
+	
+	<xsl:template match="forum:postFormImages">
+		<xsl:apply-templates select="bebop:formWidget[@type='hidden']" />	
+		<xsl:apply-templates select="forum:attachedImages" />
+		
+			
+		<div class="clearGroup">
+			<div class="columnOne">Image:</div>
+			<div class="columnTwo">
+				<xsl:apply-templates select="bebop:formWidget[@name='image']" />				
+				<div class="validationError">
+					<xsl:apply-templates select="bebop:formErrors[@id='image']" />												
+				</div>
+			</div>
+		</div>								
+		<div class="clearGroup">
+			<div class="columnOne">Description:</div>
+			<div class="columnTwo">
+				<xsl:apply-templates select="bebop:textarea" />
+				<div class="validationError">
+					<xsl:apply-templates select="bebop:formErrors[@id='imageDescription']" />												
+				</div>
+			</div>
+		</div>				
+		<div class="submit">
+			<div class="forumButton">
+				<xsl:apply-templates select="bebop:formWidget[@name='Add_Image']" />										
+			</div>						
+		</div>							
+	</xsl:template>	
+
+	<xsl:template match="forum:attachedImages">	
+	
+	
+		<xsl:choose>
+			<xsl:when test="not(forum:image)">
+				<div id="plainText">			
+					No images attached to this post												
+				</div>		
+			</xsl:when>
+			<xsl:otherwise>
+			
+				<xsl:for-each select="forum:image">
+					<xsl:variable name="class">
+						<xsl:choose>
+							<xsl:when test="position() mod 2">
+								<xsl:text>postOdd</xsl:text>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:text>postEven</xsl:text>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:variable>		
+					<div class="clearGroup">
+						<fieldset class="{$class}">									
+							<div class="image">
+								<img src="{$dispatcher-prefix}{@src}" alt="{@caption}" />
+							</div>
+							<div class="imageName">
+								<xsl:value-of select="@name"/>
+							</div>
+							<div class="imageDelete">
+								<a href="{@deleteLink}">Remove</a>
+							</div>				
+						</fieldset>
+					</div>
+				</xsl:for-each>	
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
+	<xsl:template match="forum:postFormFiles">
+		<xsl:apply-templates select="bebop:formWidget[@type='hidden']" />			
+		
+		<xsl:apply-templates select="forum:attachedFiles" />	
+		
+		<div id="plainText">			
+			<xsl:apply-templates select="bebop:label " />												
+		</div>					
+		
+		<div class="clearGroup">
+			<div class="columnOne">File:</div>
+			<div class="columnTwo">
+				<xsl:apply-templates select="bebop:formWidget[@name='file']" />
+				<div class="validationError">
+					<xsl:apply-templates select="bebop:formErrors[@id='file']" />												
+				</div>
+			</div>
+		</div>								
+		<div class="clearGroup">
+			<div class="columnOne">Description:</div>
+			<div class="columnTwo">
+				<xsl:apply-templates select="bebop:textarea" />
+				<div class="validationError">
+					<xsl:apply-templates select="bebop:formErrors[@id='fileDescription']" />												
+				</div>
+			</div>
+		</div>		
+		<div class="submit">
+			<div class="forumButton">	
+				<xsl:apply-templates select="bebop:formWidget[@name='Add_File']" />						
+			</div>
+		</div>						
+	</xsl:template>	
+	
+	<xsl:template match="forum:attachedFiles" >	
+		<xsl:choose>
+			<xsl:when test="not(forum:file)">
+				<div id="plainText">			
+					No files attached to this post												
+				</div>		
+			</xsl:when>
+			<xsl:otherwise>
+				<div class="clearGroup">
+					<table class="fileTable">
+						<tr>
+							<td><h5>File</h5></td>
+							<td><h5>Description</h5></td>					
+							<td/>
+						</tr>
+						<xsl:for-each select="forum:file">
+							<tr>
+								<td>
+									<xsl:variable name="encodedFileName">
+				            			<xsl:call-template name="url-encode">
+			    		     		 		<xsl:with-param name="str" select="@name"/>
+				        				</xsl:call-template>
+				           			 </xsl:variable>						
+									
+									<a href="{$dispatcher-prefix}{@url}&amp;file=/{$encodedFileName}" target = "_blank"><xsl:value-of select="@name"/></a></td>
+									<td>
+										<xsl:if test="not(contains(@description, 'nbsp'))">
+											<xsl:value-of select="@description"/>
+										</xsl:if>
+									</td>
+									<td><a href="{@deleteLink}">Remove</a></td>
+							</tr>
+						</xsl:for-each>	
+					</table>
+					<br/>
+				</div>	
+			</xsl:otherwise>
+		
+		</xsl:choose>
+			
+	</xsl:template>	
+	
+	<xsl:template match="threadOptions">
+		<div id="threadOptions">
+			<xsl:apply-templates />
+		</div>
+	</xsl:template>	
+    
+    <xsl:template match="bebop:form[@name='newPostForm']">
+		<xsl:call-template name="ForumPostForm">
+			<xsl:with-param name="title">
+				<xsl:choose>
+					<xsl:when test="forum:postForm">
+						<xsl:text>Post New Message</xsl:text>
+					</xsl:when>
+					<xsl:when test="forum:postFormImages">
+						<xsl:text>Add Images (optional)</xsl:text>
+					</xsl:when>
+					<xsl:when test="forum:postFormFiles">
+						<xsl:text>Add Files (optional)</xsl:text>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:text>Preview New Message</xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+
+	<xsl:template match="bebop:form[@name='editPostForm']">
+		<xsl:call-template name="ForumPostForm">
+			<xsl:with-param name="title">
+				<xsl:choose>
+					<xsl:when test="forum:postForm">
+						<xsl:text>Edit Message</xsl:text>
+					</xsl:when>	
+					<xsl:when test="forum:postFormImages">
+						<xsl:text>Edit Images</xsl:text>
+					</xsl:when>
+					<xsl:when test="forum:postFormFiles">
+						<xsl:text>Edit Files</xsl:text>
+					</xsl:when>				
+					<xsl:otherwise>
+						<xsl:text>Preview Changes</xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+
+	<xsl:template match="bebop:form[@name='replyPostForm']">
+		<xsl:call-template name="ForumPostForm">
+			<xsl:with-param name="title">
+				<xsl:choose>
+					<xsl:when test="forum:postForm">
+						<xsl:text>Post reply</xsl:text>
+					</xsl:when>
+					<xsl:when test="forum:postFormImages">
+						<xsl:text>Add Images (optional)</xsl:text>
+					</xsl:when>
+					<xsl:when test="forum:postFormFiles">
+						<xsl:text>Add Files (optional)</xsl:text>
+					</xsl:when>	
+					<xsl:otherwise>
+						<xsl:text>Preview Reply</xsl:text>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
+	<xsl:template match="bebop:form[@name='categoryAdd']">
+		<xsl:param name="title" select="'Create New Topic'" />
+		<div class="content">
+			<form action="{@action}" name="{@name}" method="get">
+				<xsl:apply-templates select="bebop:gridPanel/bebop:formWidget[@type='hidden']" />
+				<xsl:apply-templates select="bebop:pageState" />
+					
+				<div id="title">
+					<h2 class="pageSubTitle"><xsl:value-of select="$title" /></h2>			
+					<br/>
+				</div>		
+			
+				<div class="clearGroup">
+					<div class="columnOne">Name:</div>
+					<div class="columnTwo">
+						<xsl:apply-templates select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:formWidget[@name='name']" />
+						<div class="validationError">
+							<xsl:apply-templates select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:formErrors[@id='name']" />												
+						</div>
+					</div>
+				</div>								
+				<div class="clearGroup">
+					<div class="columnOne">Description:</div>
+					<div class="columnTwo">
+						<xsl:apply-templates select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:textarea" />
+						<div class="validationError">
+							<xsl:apply-templates select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:formErrors[@id='description']" />												
+						</div>
+					</div>
+				</div>					
+				<div class="submit">
+					<div class="forumButton">						
+						<xsl:apply-templates select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:formWidget[@type='submit']" />						
+						<br/>
+					</div>
+				</div>		
+			</form>	
+		</div>				
+	</xsl:template>
+	
+	<xsl:template match="bebop:form[@name='postRejectionForm']">
+		<xsl:param name="title" select="'Reject Post'" />
+		
+		<form action="{@action}" name="{@name}" method="get">
+			<xsl:apply-templates select="bebop:gridPanel/bebop:formWidget[@type='hidden']" />
+			<xsl:apply-templates select="bebop:formWidget[@type='hidden']" />
+			<xsl:apply-templates select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:formWidget[@type='hidden']" />
+			<xsl:apply-templates select="bebop:pageState" />
+				
+			<div id="title">
+				<h2 class="pageSubTitle"><xsl:value-of select="$title" /></h2>	
+				<br/>		
+			</div>					
+			<div class="content">					
+				<xsl:choose>
+					<xsl:when test="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:boxPanel/bebop:cell/bebop:textarea" >
+						<div class="clearGroup">
+							<div class="columnOne"><xsl:value-of select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:boxPanel/bebop:cell/bebop:formWidget[@name='recipient']/@metadata.label" /></div>					
+							<div class="columnTwo">
+								<xsl:apply-templates select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:boxPanel/bebop:cell/bebop:formWidget[@name='recipient']" />
+								<div class="validationError">
+									<xsl:apply-templates select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:boxPanel/bebop:cell/bebop:formErrors[@id='recipient']" />												
+								</div>
+							</div>
+						</div>	
+						<div class="clearGroup">
+							<div class="columnOne"><xsl:value-of select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:boxPanel/bebop:cell/bebop:textarea[@name='bodyText']/@metadata.label" /></div>					
+							<div class="columnTwo">
+								<xsl:apply-templates select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:boxPanel/bebop:cell/bebop:textarea[@name='bodyText']" />
+								<div class="validationError">
+									<xsl:apply-templates select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:boxPanel/bebop:cell/bebop:formErrors[@id='bodyText']" />												
+								</div>
+							</div>
+						</div>	
+					</xsl:when>	
+					<xsl:otherwise>
+						<xsl:for-each select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:boxPanel/bebop:cell/bebop:label" >
+							<div class="clearGroup">
+								<xsl:call-template name="br-replace" >
+									<xsl:with-param name="text" select=".">
+									</xsl:with-param>
+								</xsl:call-template>
+								
+							</div>
+						</xsl:for-each>											
+					</xsl:otherwise>
+				</xsl:choose>
+				
+				<div class="clearGroup">
+					<div class="forumButton">
+						<br/>	
+						<xsl:apply-templates select="bebop:gridPanel/bebop:panelRow/bebop:cell/bebop:boxPanel/bebop:cell/bebop:formWidget[@type='submit']" />												
+						<br/>
+					</div>
+				</div>	
+			</div>			
+		</form>					
+	</xsl:template>
+	
+	<xsl:template match="bebop:form[@name='setupForm']">	
+		<div class="content">
+			<form action="{@action}" name="{@name}" method="get">
+				<xsl:apply-templates select="forum:setup/bebop:formWidget[@type='hidden']" />
+				<xsl:apply-templates select="bebop:pageState" />		
+				
+				<div class="clearGroup">					
+					<xsl:value-of select="forum:setup/bebop:formWidget[@name='title']/@metadata.label"/>										
+				</div>
+				<div class="clearGroup">
+					<xsl:apply-templates select="forum:setup/bebop:formWidget[@name='title']"/>
+				</div>
+				<div class="clearGroup">
+					<xsl:value-of select="forum:setup/bebop:textarea/@metadata.label"/>				
+				</div>
+				<div class="clearGroup">
+					<xsl:apply-templates select="forum:setup/bebop:textarea"/>				
+				</div>
+				<div class="clearGroup">
+					<xsl:apply-templates select="descendant::bebop:checkbox" />
+					
+					<div class="expiry">		
+						<xsl:apply-templates select="descendant::bebop:formWidget[@name='expiry']" />
+						<xsl:value-of select="descendant::bebop:formWidget[@name='expiry']/@metadata.label"/>
+					</div>
+				</div>			
+				
+				<div class="clearGroup">
+					<div class="forumButton">								
+						<xsl:apply-templates select="forum:setup/bebop:boxPanel/bebop:cell/bebop:formWidget[@name='save']" />														
+						<br/>
+					</div>
+				</div>					
+			</form>					
+		</div>
+	</xsl:template>
+    
+    <xsl:template match="bebop:form[@id = 'adminMemberUserPicker']" mode="show">
+		<xsl:call-template name="permissionForm" />
+	</xsl:template>
+	
+	<xsl:template match="bebop:form[@id = 'adminMemberUserPicker']">				
+	</xsl:template>
+	
+	<xsl:template match="bebop:form[@id = 'memberUserPicker']" mode="show">
+		<xsl:call-template name="permissionForm" />		
+	</xsl:template>
+	
+	<xsl:template match="bebop:form[@id = 'memberUserPicker']">				
+	</xsl:template>
+		
+	<xsl:template match="bebop:form[@id = 'threadCreateMemberUserPicker']" mode="show">
+		<xsl:call-template name="permissionForm" />	
+	</xsl:template>
+	
+	<xsl:template match="bebop:form[@id = 'threadCreateMemberUserPicker']">				
+	</xsl:template>
+	
+	<xsl:template match="bebop:form[@id = 'threadReplyMemberUserPicker']" mode="show">
+		<xsl:call-template name="permissionForm" />		
+	</xsl:template>
+	
+	<xsl:template match="bebop:form[@id = 'threadReplyMemberUserPicker']">				
+	</xsl:template>
+	
+	<xsl:template match="bebop:form[@id = 'readerMemberUserPicker']" mode="show">
+		<xsl:call-template name="permissionForm" />	
+	</xsl:template>
+	
+	<xsl:template match="bebop:form[@id = 'readerMemberUserPicker']">				
+	</xsl:template>
+	
+	<xsl:template name="permissionForm">		
+		<form action="{@action}" name="{@name}" method="get">
+			<xsl:apply-templates select="bebop:formWidget[@type='hidden']" />
+			<xsl:apply-templates select="bebop:pageState" />
+			<xsl:apply-templates  />			
+		</form>		
+	</xsl:template>
+	
+
+<!-- *********************** LINK TEMPLATES ******************** -->
+	
+	
+	<xsl:template match="bebop:link[bebop:label/text() = 'New thread']">
+		<br/>
+		<div id="newTopicLink">
+			<a href="{@href}">Start New Thread</a>
+		</div>
+	</xsl:template>	
+	
+	<xsl:template match="bebop:link[bebop:label/text() = 'New topic']">
+		<div id="newTopicLink">
+			<a href="{@href}">Create New Topic</a>
+		</div>
+	</xsl:template>	
+
+	<xsl:template match="bebop:link[bebop:label/text() = 'View all threads']">
+		<div id="viewAllTopicsLink">
+			<a href="{@href}">Back to Thread List</a>
+		</div>
+	</xsl:template>
+	
+	<xsl:template match="bebop:link[bebop:label/text() = 'Subscribe to thread']">
+		<div id="watchTopicLink">
+			<a href="{@href}">Watch this Thread</a>
+		</div>
+	</xsl:template>
+	
+	<xsl:template match="bebop:link[bebop:label/text() = 'Unsubscribe to thread']">
+		<div id="info">
+			<xsl:text>You are watching this thread. To stop watching this thread, click "Stop Watching Thread" below.</xsl:text>
+		</div>		
+		<div id="watchTopicLink">
+			<a href="{@href}">Stop Watching Thread</a>			
+		</div>		
+	</xsl:template>		
+
+
+<xsl:template name="br-replace">
+    <xsl:param name="text"/>
+    <xsl:variable name="cr" select="'&#xa;'"/>
+    <xsl:choose>
+      <!-- If the value of the $text parameter contains a carriage return... -->
+      	<xsl:when test="contains($text,$cr)">
+        	<!-- Return the substring of $text before the carriage return -->
+        	<xsl:value-of select="substring-before($text,$cr)" disable-output-escaping="yes"/>
+        	<!-- And construct a <br/> element -->
+        	<br/>
+	        <!--
+	         | Then invoke this same br-replace template again, passing the
+	         | substring *after* the carriage return as the new "$text" to
+	         | consider for replacement
+	         +-->
+	        <xsl:call-template name="br-replace">
+	          	<xsl:with-param name="text" select="substring-after($text,$cr)"/>
+	        </xsl:call-template>
+      	</xsl:when>
+    	<xsl:otherwise>
+        	<xsl:value-of select="$text" disable-output-escaping="yes"/>
+    	</xsl:otherwise>
+   	</xsl:choose>
+</xsl:template>
 </xsl:stylesheet>
+
+
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif
new file mode 100644
index 000000000..2d3db34c2
Binary files /dev/null and b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/archived-16x16.gif differ
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif
new file mode 100644
index 000000000..95d374a32
Binary files /dev/null and b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/back-to-16x16.gif differ
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif
new file mode 100644
index 000000000..867d48eee
Binary files /dev/null and b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/delete-16x16.gif differ
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif
new file mode 100644
index 000000000..3e9a90a47
Binary files /dev/null and b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/edit-16x16.gif differ
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/info-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/info-16x16.gif
new file mode 100644
index 000000000..5acb95064
Binary files /dev/null and b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/info-16x16.gif differ
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/post-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/post-16x16.gif
new file mode 100644
index 000000000..07b98d107
Binary files /dev/null and b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/post-16x16.gif differ
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/read.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/read.gif
new file mode 100644
index 000000000..26d0d6fb5
Binary files /dev/null and b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/read.gif differ
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif
new file mode 100644
index 000000000..0395fca0f
Binary files /dev/null and b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/reply-16x16.gif differ
diff --git a/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif
new file mode 100644
index 000000000..01e001924
Binary files /dev/null and b/ccm-zes-aplaws/web/themes/static/aplaws-generic/images/forum/watch-16x16.gif differ