diff --git a/ccm-shp-aplaws/bundles/devel/cfg/web.xml b/ccm-shp-aplaws/bundles/devel/cfg/web.xml
index 8a942cef2..fa23cc1c9 100755
--- a/ccm-shp-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-shp-aplaws/bundles/devel/cfg/web.xml
@@ -4,6 +4,9 @@
 
 <web-app>
 
+  <display-name>CCM</display-name>
+  <description>Content and Collaboration Management</description>
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -16,7 +19,10 @@
 
   <filter-mapping>
     <filter-name>subsite</filter-name>
+    <url-pattern>/ccm/*</url-pattern>
+<!-- please check: with or w/o ccm?
     <url-pattern>/*</url-pattern>
+-->
   </filter-mapping>
 
   <filter-mapping>
@@ -24,12 +30,20 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
-<!-- The Context Listener is required and used for initializing the runtime
-     environment before any other task is performed or any servlet initialized. -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     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>
@@ -86,7 +100,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>
@@ -108,6 +125,7 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
+
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -132,17 +150,27 @@
    </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
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   -->
+  <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    -->  
 
 <!-- XXX hack -->
 
@@ -172,17 +200,130 @@
     <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-ldn-themes  -  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>
+    </init-param>
+  </servlet>
+
+  <servlet>
+     <servlet-name>ThemeDownload</servlet-name>
+     <servlet-class>com.arsdigita.london.theme.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
+    </servlet-class>
+    <init-param>
+      <param-name>prefix</param-name>
+      <param-value>/theme</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET MAPPINGS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  -->
+  <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>
@@ -193,7 +334,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-ldn-theme  -  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-ldn-themes  -  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>
@@ -230,7 +435,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>
@@ -238,13 +446,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>
@@ -262,13 +470,10 @@
      <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>
@@ -295,10 +500,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-shp-aplaws/bundles/standard/cfg/web.xml b/ccm-shp-aplaws/bundles/standard/cfg/web.xml
index 8a942cef2..fa23cc1c9 100755
--- a/ccm-shp-aplaws/bundles/standard/cfg/web.xml
+++ b/ccm-shp-aplaws/bundles/standard/cfg/web.xml
@@ -4,6 +4,9 @@
 
 <web-app>
 
+  <display-name>CCM</display-name>
+  <description>Content and Collaboration Management</description>
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -16,7 +19,10 @@
 
   <filter-mapping>
     <filter-name>subsite</filter-name>
+    <url-pattern>/ccm/*</url-pattern>
+<!-- please check: with or w/o ccm?
     <url-pattern>/*</url-pattern>
+-->
   </filter-mapping>
 
   <filter-mapping>
@@ -24,12 +30,20 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
-<!-- The Context Listener is required and used for initializing the runtime
-     environment before any other task is performed or any servlet initialized. -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     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>
@@ -86,7 +100,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>
@@ -108,6 +125,7 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
+
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -132,17 +150,27 @@
    </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
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   -->
+  <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    -->  
 
 <!-- XXX hack -->
 
@@ -172,17 +200,130 @@
     <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-ldn-themes  -  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>
+    </init-param>
+  </servlet>
+
+  <servlet>
+     <servlet-name>ThemeDownload</servlet-name>
+     <servlet-class>com.arsdigita.london.theme.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
+    </servlet-class>
+    <init-param>
+      <param-name>prefix</param-name>
+      <param-value>/theme</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET MAPPINGS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  -->
+  <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>
@@ -193,7 +334,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-ldn-theme  -  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-ldn-themes  -  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>
@@ -230,7 +435,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>
@@ -238,13 +446,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>
@@ -262,13 +470,10 @@
      <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>
@@ -295,10 +500,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-shp-aplaws/web/WEB-INF/web.xml-aplaws b/ccm-shp-aplaws/web/WEB-INF/web.xml-aplaws
index 657d23d43..fa23cc1c9 100755
--- a/ccm-shp-aplaws/web/WEB-INF/web.xml-aplaws
+++ b/ccm-shp-aplaws/web/WEB-INF/web.xml-aplaws
@@ -4,6 +4,9 @@
 
 <web-app>
 
+  <display-name>CCM</display-name>
+  <description>Content and Collaboration Management</description>
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -17,6 +20,9 @@
   <filter-mapping>
     <filter-name>subsite</filter-name>
     <url-pattern>/ccm/*</url-pattern>
+<!-- please check: with or w/o ccm?
+    <url-pattern>/*</url-pattern>
+-->
   </filter-mapping>
 
   <filter-mapping>
@@ -24,13 +30,21 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
-<!-- The Context Listener is required and used for initializing the runtime
-     environment before any other task is performed or any servlet initialized. -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     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>
 
-<servlet>
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     BASE SERVLET DECLARATIONS SECTION
+     basically requirred by ccm-core
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <servlet>
     <servlet-name>reg</servlet-name>
     <servlet-class>com.arsdigita.web.ContextRegistrationServlet</servlet-class>
     <init-param>
@@ -86,37 +100,32 @@
     <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>
     <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
   </servlet>
 
-  <servlet>
-    <servlet-name>content-item-xsl</servlet-name>
-    <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class>
-  </servlet>
-
   <servlet>
     <servlet-name>content-type-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>content-item-xsl</servlet-name>
+    <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>template-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </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>
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -141,17 +150,27 @@
    </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
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   -->
+  <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    -->  
 
 <!-- XXX hack -->
 
@@ -181,6 +200,124 @@
     <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-ldn-themes  -  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>
+    </init-param>
+  </servlet>
+
+  <servlet>
+     <servlet-name>ThemeDownload</servlet-name>
+     <servlet-class>com.arsdigita.london.theme.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
+    </servlet-class>
+    <init-param>
+      <param-name>prefix</param-name>
+      <param-value>/theme</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET MAPPINGS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  -->
+  <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>
@@ -197,7 +334,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-ldn-theme  -  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-ldn-themes  -  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>
@@ -234,7 +435,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>
@@ -256,11 +460,6 @@
     <url-pattern>/__ccm__/servlet/template/*</url-pattern>
   </servlet-mapping>
 
- <servlet-mapping>
-     <servlet-name>AxisServlet</servlet-name>
-     <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
-
  <servlet-mapping>
      <servlet-name>TextOnlyServlet</servlet-name>
      <url-pattern>/text/*</url-pattern>
@@ -271,12 +470,10 @@
      <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>
@@ -303,13 +500,20 @@
     <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>
 
-  <!-- TAGLIBS -->
+  <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>
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-admin.xsl.NotUsedForNow b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-admin.xsl.NotUsedForNow
index 54752a849..c5ca40b98 100755
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-admin.xsl.NotUsedForNow
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-admin.xsl.NotUsedForNow
@@ -4,7 +4,12 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
+  <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application
   <xsl:import href="../../../../ccm-ldn-atoz/__ccm__/apps/atoz/xsl/index.xsl"/>
+  -->
+  <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed into the main CCM webapp
+  -->
+  <xsl:import href="../../../__ccm__/apps/atoz/xsl/index.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-index.xsl.NotUsedForNow b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-index.xsl.NotUsedForNow
index 7c8801ce9..e2f6a8ace 100755
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-index.xsl.NotUsedForNow
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/atoz-index.xsl.NotUsedForNow
@@ -11,22 +11,28 @@
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz"
   version="1.0">
 
-<xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/>
-	
-<xsl:import href="lib/header.xsl"/>
-<xsl:import href="lib/lib.xsl"/>
-<xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
-   
-<xsl:param name="context-prefix"></xsl:param>
-<xsl:param name="dispatcher-prefix" />
-<xsl:param name="theme-prefix" />
+  <!-- IMPORT DEFINITIONS ccm-ldn-atoz installed as separate web application
+  <xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/>
+  -->
 
-<xsl:output 
+  <!-- IMPORT DEFINITIONS ccm-ldn-atoz  installed into the main CCM webapp
+  -->
+  <xsl:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/>
+	
+  <xsl:import href="lib/header.xsl"/>
+  <xsl:import href="lib/lib.xsl"/>
+  <xsl:import href="../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
+   
+  <xsl:param name="context-prefix"></xsl:param>
+  <xsl:param name="dispatcher-prefix" />
+  <xsl:param name="theme-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" 
-/> 
+  /> 
 	
 <xsl:template match="bebop:page[@application='atoz']">
 <html lang="en">
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/category-step.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/category-step.xsl
index 7753f1b83..fbb43497f 100755
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/category-step.xsl
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/category-step.xsl
@@ -12,13 +12,39 @@
   <xsl:param name="theme-prefix" />
 
   <xsl:template match="cms:emptyPage[@title='childCategories']">
+    <xsl:choose>
+      <xsl:when test="cms:category/@order='sortKey'">
     <xsl:apply-templates select="cms:category/cms:category" mode="cms:javascriptCat">
       <xsl:with-param name="expand" select="'none'"/>
+          <xsl:sort data-type="number" select="@sortKey"/>
     </xsl:apply-templates>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="cms:category/cms:category" mode="cms:javascriptCat">
+          <xsl:sort data-type="text" select="@name"/>
+          <xsl:with-param name="expand" select="'none'"/>
+        </xsl:apply-templates>
+      </xsl:otherwise>
+    </xsl:choose>
+    
   </xsl:template>
 
   <xsl:template match="cms:emptyPage[@title='autoCategories']">
-    <xsl:apply-templates select="cms:category" mode="cms:javascriptCat" />
+    <xsl:choose>
+      <xsl:when test="cms:category/@order='sortKey'">
+        <xsl:apply-templates select="cms:category" mode="cms:javascriptCat" >
+        <xsl:with-param name="expand" select="'none'"/>
+          <xsl:sort data-type="number" select="@sortKey"/>
+        </xsl:apply-templates>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="cms:category" mode="cms:javascriptCat" >
+          <xsl:sort data-type="text" select="@name"/>
+          <xsl:with-param name="expand" select="'none'"/>
+        </xsl:apply-templates>
+      </xsl:otherwise>
+    </xsl:choose>
+    
   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
new file mode 100644
index 000000000..026e60e21
--- /dev/null
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
@@ -0,0 +1,308 @@
+<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
+  <xsl:import href="../../../../ROOT/__ccm__/themes/aplaws/category-step.xsl"/>
+  <xsl:import href="../../../../ROOT/__ccm__/static/cms/admin/category-step/category-step.xsl"/>	
+  -->
+  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
+  -->
+  <xsl:import href="../../../__ccm__/themes/aplaws/category-step.xsl"/>
+  <xsl:import href="../../../__ccm__/static/cms/admin/category-step/category-step.xsl"/>	
+
+  <xsl:output method="html" indent="yes"/>
+
+	
+  <xsl:template match="forum:categoryStepSummary">
+   	<div class="content">
+   		
+	    <h3>Assign Categories</h3>
+		<br/>	   
+	    <xsl:for-each select="forum:categoryRoots/forum:categoryRoot">
+	      <xsl:sort  select="@name"/>
+	      <xsl:variable name="name">
+	        <xsl:value-of select="@name"/>
+	      </xsl:variable>
+	      <h5><xsl:value-of select="$name"/></h5>
+	      <br/>
+	      <xsl:if test="@addAction">
+	        <script LANGUAGE="JavaScript">
+	          <![CDATA[ <!-- begin script ]]>
+	          <![CDATA[ document.write('<a href="]]><xsl:value-of select="@addJSAction"/><![CDATA["><img src="/assets/action-add.png" border="0"/></a>')]]>
+	          <![CDATA[ document.write("\<!--") ]]>
+	          <![CDATA[ // end script --> ]]>
+	        </script>
+	        <a href="{@addAction}">
+	          <img src="/assets/action-add.png" border="0"/>
+	        </a>
+	        <script LANGUAGE="JavaScript">
+	          <![CDATA[ <!-- begin script ]]>
+	          <![CDATA[ document.write("--\>") ]]>
+	          <![CDATA[ // end script --> ]]>
+	        </script>
+	        
+	        <script LANGUAGE="JavaScript">
+	          <![CDATA[ <!-- begin script ]]>
+	          <![CDATA[ document.write('<a href="]]><xsl:value-of select="@addJSAction"/><![CDATA[">Add Categories</a>')]]>
+	          <![CDATA[ document.write("\<!--") ]]>
+	          <![CDATA[ // end script --> ]]>
+	        </script>
+	        <xsl:text>&#160;</xsl:text>
+	        <a href="{@addAction}">
+	          <xsl:text>Add categories</xsl:text>
+	        </a>
+	        <script LANGUAGE="JavaScript">
+	          <![CDATA[ <!-- begin script ]]>
+	          <![CDATA[ document.write("--\>") ]]>
+	          <![CDATA[ // end script --> ]]>
+	        </script>
+	      </xsl:if>
+	       
+	      <xsl:choose>
+	        <xsl:when test="count(../../forum:itemCategories/forum:itemCategory[starts-with(@path, $name)]) = 0">
+	          <div>
+	            There are no categories assigned in this context
+	          </div>
+	        </xsl:when>
+	        <xsl:otherwise>
+	          <ul>
+	            <xsl:for-each select="../../forum:itemCategories/forum:itemCategory[starts-with(@path, $name)]">
+	              <xsl:sort select="@path"/>
+	              <li>
+	                <xsl:value-of select="substring(@path, string-length($name) + 5)"/>&#160;
+	                <xsl:if test="@deleteAction">
+	                  <a href="{@deleteAction}"><img src="/assets/action-delete.png" border="0"/></a>
+	                  <xsl:text>&#160;</xsl:text>
+	                  <a href="{@deleteAction}">Remove</a>
+	                </xsl:if>
+	              </li>
+	            </xsl:for-each>
+	          </ul>
+	        </xsl:otherwise>
+	      </xsl:choose>
+	    </xsl:for-each>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="forum:categoryWidget">
+    <xsl:choose>
+      <xsl:when test="@mode = 'javascript'">
+        <xsl:apply-templates select="." mode="forum:javascript"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="." mode="forum:plain"/>        
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
+  <xsl:template match="forum:categoryWidget" mode="forum:javascript">
+    <script language="JavaScript">
+      <![CDATA[
+      <!-- Begin hiding
+      function catToggle(id) {
+        var elImg = document.getElementById("catTog"+id);
+        var elChildren = document.getElementById("catCh"+id);
+
+        if (elChildren.style.display != "block") {
+           elChildren.style.display = "block";
+           elImg.src = "/assets/action-delete.png";
+        } else {
+           elChildren.style.display = "none";
+           elImg.src = "/assets/action-add.png";
+        }
+        return true;
+      }
+      function catSelect(id, name, node) {
+        var elWidget = document.getElementById("catWd");
+        var elWidgetHidden = document.getElementById("catWdHd");
+        var found = 0;
+        for (var i = 0 ; i < elWidget.options.length ; i++) {
+          if (elWidget.options[i].value == id) {
+            found = 1;
+          }
+        }
+        if (!found) {
+          var opt = new Option(name, id);
+          elWidget.options[elWidget.options.length] = opt;
+
+          var optHidden = new Option(node, id, false, true);
+          elWidgetHidden.options[elWidgetHidden.options.length] = optHidden;
+        }
+
+        var elLink = document.getElementById("catLn"+node);
+        var elName = document.getElementById("catNm"+node);
+        elLink.style.display="none";
+        elName.style.display="inline";
+        return true;
+      }
+      function catDeselect() {
+      	var elWidget = document.getElementById("catWd");
+        var elWidgetHidden = document.getElementById("catWdHd");
+        var idx = elWidget.selectedIndex;
+        if (idx  != -1) {
+            //var id = elWidget.options[idx].value;
+            var node = elWidgetHidden.options[idx].text;
+            var elLink = document.getElementById("catLn"+node);
+            var elName = document.getElementById("catNm"+node);
+            elLink.style.display="inline";
+            elName.style.display="none";
+
+            elWidget.options[idx] = null;
+            elWidgetHidden.options[idx] = null;
+        }
+        return true;
+      }
+      // End hiding -->
+      ]]>
+    </script>
+    <div>
+      <xsl:apply-templates select="forum:category[@isEnabled = '1']" mode="forum:javascriptCat">
+        <xsl:with-param name="expand" select="'block'"/>
+      </xsl:apply-templates>
+    </div>
+    <br/>
+    <div class="content">    	
+	    <h4>Selected Categories</h4>
+	    <select id="catWd" size="5" onClick="catDeselect()" style="width: 400px; height=200px">
+	    </select>
+	    <select id="catWdHd" name="{@name}" size="5" multiple="multiple" style="display: none">
+	    </select>			
+  	 </div>
+  </xsl:template>
+
+  <xsl:template match="forum:category" mode="forum:javascriptCat">
+    <xsl:param name="expand" select="'none'"/>
+    <xsl:variable name="linkStyle">
+      <xsl:choose>
+        <xsl:when test="@isAbstract != '1' and @isSelected != '1'">
+          <xsl:value-of select="'inline'"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="'none'"/>        
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:variable name="nameStyle">
+      <xsl:choose>
+        <xsl:when test="@isAbstract != '1' and @isSelected != '1'">
+          <xsl:value-of select="'none'"/>        
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="'inline'"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
+    <div id="catSelf{@pid}">
+    	<div class="content">
+	      <xsl:choose>
+	        <xsl:when test="count(forum:category[@isEnabled = '1']) > 0 and $expand='none'">
+	          <a href="#" onClick="catToggle('{@nodeID}');">
+	             <img id="catTog{@nodeID}" src="/assets/action-add.png" width="14" height="14" border="0"/></a>
+	        </xsl:when>
+	        <xsl:when test="count(forum:category[@isEnabled = '1']) > 0 and $expand!='none'">
+	          <a href="#" onClick="catToggle('{@nodeID}');"><img id="catTog{@nodeID}" src="/assets/action-delete.png" 
+	                      width="14" height="14" border="0"/></a>
+	        </xsl:when>
+	        <xsl:otherwise>
+	          <img src="/assets/action-generic.png" width="14" height="14" border="0"/>
+	        </xsl:otherwise>
+	      </xsl:choose>
+	      <a id="catLn{@nodeID}" href="#" style="padding-left: 6px; display: {$linkStyle}">
+	        <xsl:attribute name="onclick">catSelect('<xsl:value-of select="@id"/>', '<xsl:call-template name="escape-apostrophes">
+	          <xsl:with-param name="text" select="@fullname"/>
+	        </xsl:call-template>', '<xsl:value-of select="@nodeID"/>')</xsl:attribute>
+	
+	        <xsl:if test="@description">
+	          <xsl:attribute name="title">
+	            <xsl:value-of select="@description"/>
+	          </xsl:attribute>
+	        </xsl:if>
+	        <xsl:value-of select="@name"/>
+	      </a>
+	      <span id="catNm{@nodeID}" style="padding-left: 6px; display: {$nameStyle}">
+	        <xsl:if test="@description">
+	          <xsl:attribute name="title">
+	            <xsl:value-of select="@description"/>
+	          </xsl:attribute>
+	        </xsl:if>
+	        <xsl:value-of select="@name"/>
+	      </span>
+      </div>
+    </div>
+    <div id="catCh{@nodeID}" style="margin-left: 20px; display: {$expand}">
+      <xsl:apply-templates select="forum:category[@isEnabled = '1']" mode="forum:javascriptCat">
+        <xsl:sort data-type="number" select="@sortKey"/>
+      </xsl:apply-templates>
+    </div>
+  </xsl:template>
+
+  <xsl:template match="forum:categoryWidget" mode="forum:plain">
+    <select name="{@name}" size="30" multiple="multiple">
+      <xsl:apply-templates select="forum:category[position() = 1]/forum:category[@isEnabled = '1' and @isAbstract = '0']" mode="forum:plainCat"/>
+    </select>
+  </xsl:template>
+
+  <xsl:template match="forum:category" mode="forum:plainCat">
+    <xsl:if test="@isSelected != '1' and @isAbstract != '1'">
+      <option value="{@sortKey}"><xsl:value-of select="@fullname"/></option>
+    </xsl:if>
+    
+    <xsl:apply-templates select="forum:category[@isEnabled = '1' and @isAbstract = '0']" mode="forum:plainCat">
+      <xsl:sort data-type="number" select="@sortKey"/>
+    </xsl:apply-templates>
+  </xsl:template>
+
+  <xsl:template name="escape-apostrophes">
+    <xsl:param name="text"/>
+    <xsl:variable name="apostrophe">'</xsl:variable>
+    <xsl:variable name="escaped-apostrophe">\'</xsl:variable>
+    <xsl:call-template name="do-replace">
+      <xsl:with-param name="text" select="$text"/>
+      <xsl:with-param name="replace" select="$apostrophe"/>
+      <xsl:with-param name="by" select="$escaped-apostrophe"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="do-replace">
+    <xsl:param name="text"/>
+    <xsl:param name="replace"/>
+    <xsl:param name="by"/>
+    <xsl:choose>
+      <xsl:when test="contains($text, $replace)">
+        <xsl:value-of select="substring-before($text, $replace)"/>
+        <xsl:value-of select="$by"/>
+        <xsl:call-template name="do-replace">
+          <xsl:with-param name="text" select="substring-after($text, $replace)"/>
+          <xsl:with-param name="replace" select="$replace"/>
+          <xsl:with-param name="by" select="$by"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$text"/>
+      </xsl:otherwise>
+    </xsl:choose>    
+  </xsl:template>
+  
+  <!--<xsl:template match="bebop:formAction[@name='category'] ">
+	<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" />
+			<xsl:apply-templates />		
+			<div class="forumButton">											
+				<xsl:apply-templates select="bebop:boxPanel/bebop:cell/bebop:boxPanel/bebop:cell/bebop:formWidget" />		
+				<br/>
+			</div>
+		</form>
+	</div>
+  </xsl:template>-->
+
+</xsl:stylesheet>
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-index.xsl
new file mode 100644
index 000000000..8562e9ee6
--- /dev/null
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-index.xsl
@@ -0,0 +1,1311 @@
+<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
+  <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/header.xsl" />
+  <xsl:import href="lib/lib.xsl" />
+  <xsl:import href="lib/leftNav.xsl" />
+  <xsl:import href="forum-categories.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: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>
+				<xsl:call-template name="metaData" />
+				<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>
+			<!--	<xsl:if test="/bebop:page/forum:forum/bebop:form[@name='newPostForm']">
+					<xsl:attribute name="onload">
+						<xsl:text>document.newPostForm.subject.focus();</xsl:text>
+					</xsl:attribute>
+				</xsl:if> -->
+ 				<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-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.css b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.css
new file mode 100644
index 000000000..31ac138af
--- /dev/null
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.css
@@ -0,0 +1,402 @@
+@import url("css/main.css");
+<--@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-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.xsl
new file mode 100644
index 000000000..95c94f2cf
--- /dev/null
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.xsl
@@ -0,0 +1,1308 @@
+<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
+	<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/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: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-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/archived-16x16.gif b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/archived-16x16.gif
new file mode 100644
index 000000000..2d3db34c2
Binary files /dev/null and b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/archived-16x16.gif differ
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/back-to-16x16.gif b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/back-to-16x16.gif
new file mode 100644
index 000000000..95d374a32
Binary files /dev/null and b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/back-to-16x16.gif differ
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/delete-16x16.gif b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/delete-16x16.gif
new file mode 100644
index 000000000..867d48eee
Binary files /dev/null and b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/delete-16x16.gif differ
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/edit-16x16.gif b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/edit-16x16.gif
new file mode 100644
index 000000000..3e9a90a47
Binary files /dev/null and b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/edit-16x16.gif differ
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/info-16x16.gif b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/info-16x16.gif
new file mode 100644
index 000000000..5acb95064
Binary files /dev/null and b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/info-16x16.gif differ
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/post-16x16.gif b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/post-16x16.gif
new file mode 100644
index 000000000..07b98d107
Binary files /dev/null and b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/post-16x16.gif differ
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/read.gif b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/read.gif
new file mode 100644
index 000000000..26d0d6fb5
Binary files /dev/null and b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/read.gif differ
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/reply-16x16.gif b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/reply-16x16.gif
new file mode 100644
index 000000000..0395fca0f
Binary files /dev/null and b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/reply-16x16.gif differ
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/watch-16x16.gif b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/watch-16x16.gif
new file mode 100644
index 000000000..01e001924
Binary files /dev/null and b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-example/images/forum/watch-16x16.gif differ
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-index.xsl
index c3d86fb8a..b7b067338 100755
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-index.xsl
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/forum-index.xsl
@@ -4,7 +4,13 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   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"/>
+
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix" />
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/search-admin.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/search-admin.xsl
index 760c4eebd..db88939c8 100755
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/search-admin.xsl
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/search-admin.xsl
@@ -11,7 +11,11 @@
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search"
 	version="1.0">
 
-<xsl:import href="../../../../ccm-ldn-search/__ccm__/apps/search/xsl/index.xsl"/>
-  
+  <!-- path if installed in its own web context ccm-ldn-search
+<xsl:import href="../../../../ccm-ldn-search/__ccm__/apps/search/xsl/index.xsl"/>  
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+         -->
+  <xsl:import href="../../../__ccm__/apps/search/xsl/index.xsl"/>
  
  </xsl:stylesheet>
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/search-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/search-index.xsl
index c356d590e..ba76bc478 100755
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/search-index.xsl
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/search-index.xsl
@@ -11,25 +11,31 @@
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search"
 	version="1.0">
 
-<xsl:import href="lib/header.xsl"/>
-<xsl:import href="lib/lib.xsl"/>
-  
-<xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
-<xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/>
+  <xsl:import href="lib/header.xsl"/>
+  <xsl:import href="lib/lib.xsl"/>
+
+  <!-- path if installed in its own web context ccm-ldn-shortcuts 
+    <xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
+    <xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+  -->
+  <xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>
+  <xsl:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/>
 
-<xsl:param name="context-prefix"/>
-<xsl:param name="dispatcher-prefix" />
-<xsl:param name="theme-prefix" />
+  <xsl:param name="context-prefix"/>
+  <xsl:param name="dispatcher-prefix" />
+  <xsl:param name="theme-prefix" />
 
-<xsl:output 
+  <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" 
-/>
+  />
 	
-<xsl:template match="bebop:page[@application='search']">
-<html lang="en">
+  <xsl:template match="bebop:page[@application='search']">
+    <html lang="en">
 	<head>
 		<title>APLAWS+: Search</title>
 		<xsl:call-template name="cssStyles"/>
@@ -43,29 +49,24 @@
 		<xsl:call-template name="searchBreadcrumb"/>
 		<xsl:call-template name="searchBody"/>
 	</body>
-</html>
-</xsl:template>
+    </html>
+  </xsl:template>
 
 
-<xsl:template name="searchBody">
-    
-
-
-<table id="mainLayout" width="100%" border="0" cellspacing="0" cellpadding="0" summary="This table is used for a three-column page layout">
-<tr>
-    <td width="20%" rowspan="2" align="left" valign="top" id="LHS">
-
+  <xsl:template name="searchBody">
+    <table id="mainLayout" width="100%" border="0" cellspacing="0" cellpadding="0" summary="This table is used for a three-column page layout">
+      <tr>
+        <td width="20%" rowspan="2" align="left" valign="top" id="LHS">
 		<!--LHS NAVIGATION -->
 		<xsl:call-template name="searchNav" />
-    </td>
-    <td colspan="2" align="left" valign="top" id="title">
-
-<!--MAIN CONTENT -->
+        </td>
+        <td colspan="2" align="left" valign="top" id="title">
+        	<!--MAIN CONTENT -->
 		<h1>Search</h1>
-		</td>
-  </tr>
-  <tr>
-    <td width="60%" align="left" valign="top" id="mainContent">
+	</td>
+      </tr>
+      <tr>
+        <td width="60%" align="left" valign="top" id="mainContent">
 		<span class="hide">|</span>
 	
 		<!--CONTENT -->
@@ -77,122 +78,101 @@
 		<div id="related">
 		<h2>Search Options</h2>
 		<xsl:choose>
-		<xsl:when test="@id='search'">
-		<a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search</a><span class="hide">|</span>
-		<a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search</a><span class="hide">|</span>
-		</xsl:when>
-			<xsl:when test="@id='advanced'">
-		<a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
-		<a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search</a><span class="hide">|</span>
-		</xsl:when>
-			<xsl:when test="@id='remote'">
-		<a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
-		<a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search</a><span class="hide">|</span>
-		</xsl:when>
-		<xsl:otherwise />
+		  <xsl:when test="@id='search'">
+		  <a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search</a><span class="hide">|</span>
+		  <a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search
+		  </a><span class="hide">|</span>
+		  </xsl:when>
+		  <xsl:when test="@id='advanced'">
+		  <a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
+		  <a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search
+		  </a><span class="hide">|</span>
+		  </xsl:when>
+		  <xsl:when test="@id='remote'">
+			<a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
+			<a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search
+			</a><span class="hide">|</span>
+		  </xsl:when>
+		  <xsl:otherwise />
 		</xsl:choose>
 		</div>
 
 		<xsl:call-template name="sponsoredLinks"/>
 
-    </td>
-  </tr>
-</table>
-<xsl:call-template name="footer"/>
-</xsl:template>
+    	</td>
+      </tr>
+    </table>
+
+    <xsl:call-template name="footer"/>
+  </xsl:template>
 
 
+  <xsl:template name="searchBreadcrumb">
+    <!--BREADCRUMB -->
 
+    <div id="bread">
+    <p>
+    <b><a href="{$dispatcher-prefix}/portal/" title="home">home</a></b>
+    <xsl:text disable-output-escaping="yes">&amp;</xsl:text>gt;
+    <span class="breadHi">
+    <xsl:choose>
+	<xsl:when test="@id='search'">Search</xsl:when>
+      	<xsl:when test="@id='advanced'">Advanced Search</xsl:when>
+      	<xsl:when test="@id='remote'">Remote Search</xsl:when>
+	<xsl:otherwise />
+    </xsl:choose>
+    </span>
+    </p>
+    </div>
+  </xsl:template>
+
 
-
-
-
-
-
-<xsl:template name="searchBreadcrumb">
-
-<!--BREADCRUMB -->
-
-<div id="bread">
-<p>
-<b><a href="{$dispatcher-prefix}/portal/" title="home">home</a></b>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>gt;
-<span class="breadHi">
-<xsl:choose>
-			<xsl:when test="@id='search'">Search</xsl:when>
-      		<xsl:when test="@id='advanced'">Advanced Search</xsl:when>
-      		<xsl:when test="@id='remote'">Remote Search</xsl:when>
-			<xsl:otherwise />
-   </xsl:choose>
-   </span>
-</p>
-</div>
-</xsl:template>
-
-
-
-
-
-
-
-
-
-
-
-<xsl:template name="searchNav">
-<div id="nav">
-<div class="navUp">
-<a href="{$dispatcher-prefix}/portal/">
-<xsl:attribute name="title">up to homepage</xsl:attribute>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>#094;
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;home</a>
-</div>
-<xsl:choose>
+  <xsl:template name="searchNav">
+    <div id="nav">
+    <div class="navUp">
+    <a href="{$dispatcher-prefix}/portal/">
+    <xsl:attribute name="title">up to homepage</xsl:attribute>
+    <xsl:text disable-output-escaping="yes">&amp;</xsl:text>#094;
+    <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;home</a>
+    </div>
+    <xsl:choose>
 	<xsl:when test="@id='search'">
 	<div class="navHere"><p>Search</p></div>		
 	</xsl:when>
-    <xsl:when test="@id='advanced'">
+    	<xsl:when test="@id='advanced'">
 	<div class="navHere"><p>Advanced search</p></div>		
 	</xsl:when>
-    <xsl:when test="@id='remote'">
+    	<xsl:when test="@id='remote'">
 	<div class="navHere"><p>Remote search</p></div>		
 	</xsl:when>
 	<xsl:otherwise />
-</xsl:choose>
-<a href="/searchhelp" class="navChild" title="Hints and tips" >Hints and Tips</a><span class="hide">|</span>
-</div>
-</xsl:template>
+    </xsl:choose>
+    <a href="/searchhelp" class="navChild" title="Hints and tips" >Hints and Tips</a><span class="hide">|</span>
+    </div>
+  </xsl:template>

 
-
-
-
-
-<xsl:template name="searchMain">
+  <xsl:template name="searchMain">
     <xsl:choose>
-			<xsl:when test="@id='search'">
-        		<xsl:call-template name="basicSearch" />
-      		</xsl:when>
-      		<xsl:when test="@id='advanced'">
-        		<xsl:call-template name="advancedSearch" />
-      		</xsl:when>
-      		<xsl:when test="@id='remote'">
-        		<xsl:call-template name="remoteSearch" />
-      		</xsl:when>
-			<xsl:when test="@id='reindex'">
-					<xsl:apply-templates/>
-			</xsl:when>
-			<xsl:otherwise />
-   </xsl:choose>
-</xsl:template>
+	<xsl:when test="@id='search'">
+        	<xsl:call-template name="basicSearch" />
+      	</xsl:when>
+      	<xsl:when test="@id='advanced'">
+        	<xsl:call-template name="advancedSearch" />
+      	</xsl:when>
+      	<xsl:when test="@id='remote'">
+        	<xsl:call-template name="remoteSearch" />
+      	</xsl:when>
+	<xsl:when test="@id='reindex'">
+		<xsl:apply-templates/>
+	</xsl:when>
+	<xsl:otherwise />
+     </xsl:choose>
+  </xsl:template>
 
 
-
-
-
-
-<xsl:template name="basicSearch">
-<xsl:for-each select="bebop:form[@name='search']">
-<div id="searchArea">
+  <xsl:template name="basicSearch">
+    <xsl:for-each select="bebop:form[@name='search']">
+      <div id="searchArea">
 		<div id="resultsInfo">
 		<xsl:choose>
 		<xsl:when test="//search:results"><xsl:apply-templates select="//search:paginator"  mode="results-summary"/></xsl:when>
@@ -212,20 +192,15 @@
 			</div>
 		 <xsl:apply-templates select="bebop:pageState" />
 		</form>
-</div>
-</xsl:for-each>
-<xsl:call-template name="searchResults" />
-</xsl:template>
+      </div>
+    </xsl:for-each>
+    <xsl:call-template name="searchResults" />
+  </xsl:template>
 
 
-
-
-
-
-
-<xsl:template name="advancedSearch">
-<xsl:for-each select="bebop:form[@name='search']">
-<div id="searchArea">
+  <xsl:template name="advancedSearch">
+    <xsl:for-each select="bebop:form[@name='search']">
+        <div id="searchArea">
 		<div id="resultsInfo">
 		<xsl:choose>
 		<xsl:when test="//search:results"><xsl:apply-templates select="//search:paginator"  mode="results-summary"/></xsl:when>
@@ -267,21 +242,15 @@
 		</div>
 		<xsl:apply-templates select="bebop:pageState" />
 		</form>
-</div>
-</xsl:for-each>
-<xsl:call-template name="searchResults" />
-</xsl:template>
+        </div>
+    </xsl:for-each>
+    <xsl:call-template name="searchResults" />
+  </xsl:template>
 
 
-
-
-
-
-
-
-<xsl:template name="remoteSearch">
-<xsl:for-each select="bebop:form[@name='search']">
-<div id="searchArea">
+  <xsl:template name="remoteSearch">
+    <xsl:for-each select="bebop:form[@name='search']">
+      <div id="searchArea">
 		<div id="resultsInfo">
 		<xsl:choose>
 		<xsl:when test="//search:results"><xsl:apply-templates select="//search:paginator"  mode="results-summary"/></xsl:when>
@@ -326,14 +295,10 @@
 		</div>
 		<xsl:apply-templates select="bebop:pageState" />
 		</form>
-</div>
-</xsl:for-each>
-<xsl:call-template name="searchResults" />
-</xsl:template>
-
-
-
-
+        </div>
+    </xsl:for-each>
+  <xsl:call-template name="searchResults" />
+  </xsl:template>
 
 
 <xsl:template name="sponsoredLinks">
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/shortcuts-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/shortcuts-index.xsl
index c49c5ccfc..c6968322c 100755
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/shortcuts-index.xsl
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/shortcuts-index.xsl
@@ -4,7 +4,12 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
-  <xsl:import href="../../../../ccm-ldn-shortcuts/__ccm__/apps/shortcuts/xsl/index.xsl"/>
+  <!-- path if installed in its own web context ccm-ldn-shortcuts
+     <xsl:import href="../../../../ccm-ldn-shortcuts/__ccm__/apps/shortcuts/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+  -->
+  <xsl:import href="../../../__ccm__/apps/shortcuts/xsl/index.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/subsite-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/subsite-index.xsl
index a46650d03..cb04a688c 100755
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/subsite-index.xsl
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/subsite-index.xsl
@@ -4,7 +4,13 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
+  <!-- path if installed in its own web context ccm-ldn-subsite
   <xsl:import href="../../../../ccm-ldn-subsite/__ccm__/apps/subsite/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+  -->
+  <xsl:import href="../../../__ccm__/apps/subsite/xsl/index.xsl"/>
+
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/terms-index.css b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/terms-index.css
index b369a874f..15fd56956 100755
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/terms-index.css
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/terms-index.css
@@ -1,2 +1,6 @@
 @import url(/css/acs-master.css);
-@import url(/ccm-ldn-terms/__ccm__/apps/terms/xsl/index.css);
+/* Following import is valid if terms is executed in its own     */
+/* web application context (ccm-ldn-terms)                       */
+/* @import url(/ccm-ldn-terms/__ccm__/apps/terms/xsl/index.css); */
+/* import if installed in the main (common) web context          */
+@import url(/__ccm__/apps/terms/xsl/index.css); 
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/terms-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/terms-index.xsl
index 9d4811bf9..0ee053d22 100755
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/terms-index.xsl
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/terms-index.xsl
@@ -4,7 +4,12 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
+  <!-- path if installed in its own web context ccm-ldn-terms
   <xsl:import href="../../../../ccm-ldn-terms/__ccm__/apps/terms/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+  -->
+  <xsl:import href="../../../__ccm__/apps/terms/xsl/index.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/theme-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/theme-index.xsl
index e1072552e..44121cbda 100755
--- a/ccm-shp-aplaws/web/__ccm__/themes/aplaws/theme-index.xsl
+++ b/ccm-shp-aplaws/web/__ccm__/themes/aplaws/theme-index.xsl
@@ -4,7 +4,13 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
+  <!-- path if installed in its own web context ccm-ldn-theme
   <xsl:import href="../../../../ccm-ldn-theme/__ccm__/apps/theme/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+  -->
+  <xsl:import href="../../../__ccm__/apps/theme/xsl/index.xsl"/>
+
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>
diff --git a/ccm-shp-aplaws/web/__ccm__/themes/shp/shortcuts-index.xsl b/ccm-shp-aplaws/web/__ccm__/themes/shp/shortcuts-index.xsl
index c49c5ccfc..a4e103c89 100755
--- a/ccm-shp-aplaws/web/__ccm__/themes/shp/shortcuts-index.xsl
+++ b/ccm-shp-aplaws/web/__ccm__/themes/shp/shortcuts-index.xsl
@@ -4,7 +4,12 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
-  <xsl:import href="../../../../ccm-ldn-shortcuts/__ccm__/apps/shortcuts/xsl/index.xsl"/>
+  <!-- path if installed in its own web context ccm-ldn-shortcuts
+    <xsl:import href="../../../../ccm-ldn-shortcuts/__ccm__/apps/shortcuts/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+  -->
+  <xsl:import href="../../../__ccm__/apps/shortcuts/xsl/index.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>
diff --git a/ccm-zes-aplaws/bundles/devel/cfg/web.xml b/ccm-zes-aplaws/bundles/devel/cfg/web.xml
index 8a942cef2..fa23cc1c9 100644
--- a/ccm-zes-aplaws/bundles/devel/cfg/web.xml
+++ b/ccm-zes-aplaws/bundles/devel/cfg/web.xml
@@ -4,6 +4,9 @@
 
 <web-app>
 
+  <display-name>CCM</display-name>
+  <description>Content and Collaboration Management</description>
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -16,7 +19,10 @@
 
   <filter-mapping>
     <filter-name>subsite</filter-name>
+    <url-pattern>/ccm/*</url-pattern>
+<!-- please check: with or w/o ccm?
     <url-pattern>/*</url-pattern>
+-->
   </filter-mapping>
 
   <filter-mapping>
@@ -24,12 +30,20 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
-<!-- The Context Listener is required and used for initializing the runtime
-     environment before any other task is performed or any servlet initialized. -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     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>
@@ -86,7 +100,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>
@@ -108,6 +125,7 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
+
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -132,17 +150,27 @@
    </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
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   -->
+  <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    -->  
 
 <!-- XXX hack -->
 
@@ -172,17 +200,130 @@
     <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-ldn-themes  -  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>
+    </init-param>
+  </servlet>
+
+  <servlet>
+     <servlet-name>ThemeDownload</servlet-name>
+     <servlet-class>com.arsdigita.london.theme.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
+    </servlet-class>
+    <init-param>
+      <param-name>prefix</param-name>
+      <param-value>/theme</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET MAPPINGS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  -->
+  <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>
@@ -193,7 +334,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-ldn-theme  -  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-ldn-themes  -  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>
@@ -230,7 +435,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>
@@ -238,13 +446,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>
@@ -262,13 +470,10 @@
      <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>
@@ -295,10 +500,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-zes-aplaws/bundles/standard/cfg/web.xml b/ccm-zes-aplaws/bundles/standard/cfg/web.xml
index 8a942cef2..fa23cc1c9 100644
--- a/ccm-zes-aplaws/bundles/standard/cfg/web.xml
+++ b/ccm-zes-aplaws/bundles/standard/cfg/web.xml
@@ -4,6 +4,9 @@
 
 <web-app>
 
+  <display-name>CCM</display-name>
+  <description>Content and Collaboration Management</description>
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -16,7 +19,10 @@
 
   <filter-mapping>
     <filter-name>subsite</filter-name>
+    <url-pattern>/ccm/*</url-pattern>
+<!-- please check: with or w/o ccm?
     <url-pattern>/*</url-pattern>
+-->
   </filter-mapping>
 
   <filter-mapping>
@@ -24,12 +30,20 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
-<!-- The Context Listener is required and used for initializing the runtime
-     environment before any other task is performed or any servlet initialized. -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     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>
@@ -86,7 +100,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>
@@ -108,6 +125,7 @@
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </servlet>
 
+
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -132,17 +150,27 @@
    </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
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   -->
+  <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    -->  
 
 <!-- XXX hack -->
 
@@ -172,17 +200,130 @@
     <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-ldn-themes  -  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>
+    </init-param>
+  </servlet>
+
+  <servlet>
+     <servlet-name>ThemeDownload</servlet-name>
+     <servlet-class>com.arsdigita.london.theme.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
+    </servlet-class>
+    <init-param>
+      <param-name>prefix</param-name>
+      <param-value>/theme</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET MAPPINGS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  -->
+  <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>
@@ -193,7 +334,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-ldn-theme  -  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-ldn-themes  -  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>
@@ -230,7 +435,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>
@@ -238,13 +446,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>
@@ -262,13 +470,10 @@
      <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>
@@ -295,10 +500,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-zes-aplaws/web/WEB-INF/web.xml-aplaws b/ccm-zes-aplaws/web/WEB-INF/web.xml-aplaws
index 7d1b5386f..fa23cc1c9 100644
--- a/ccm-zes-aplaws/web/WEB-INF/web.xml-aplaws
+++ b/ccm-zes-aplaws/web/WEB-INF/web.xml-aplaws
@@ -4,6 +4,9 @@
 
 <web-app>
 
+  <display-name>CCM</display-name>
+  <description>Content and Collaboration Management</description>
+
   <filter>
     <filter-name>shortcuts</filter-name>
     <filter-class>com.arsdigita.london.shortcuts.ShortcutFilter</filter-class>
@@ -17,6 +20,9 @@
   <filter-mapping>
     <filter-name>subsite</filter-name>
     <url-pattern>/ccm/*</url-pattern>
+<!-- please check: with or w/o ccm?
+    <url-pattern>/*</url-pattern>
+-->
   </filter-mapping>
 
   <filter-mapping>
@@ -24,12 +30,20 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
-<!-- The Context Listener is required and used for initializing the runtime
-     environment before any other task is performed or any servlet initialized. -->
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     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>
@@ -86,37 +100,32 @@
     <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>
     <servlet-class>com.arsdigita.cms.ContentSectionServlet</servlet-class>
   </servlet>
 
-  <servlet>
-    <servlet-name>content-item-xsl</servlet-name>
-    <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class>
-  </servlet>
-
   <servlet>
     <servlet-name>content-type-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.ContentTypeXSLServlet</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>content-item-xsl</servlet-name>
+    <servlet-class>com.arsdigita.cms.dispatcher.ContentItemXSLServlet</servlet-class>
+  </servlet>
+
   <servlet>
     <servlet-name>template-xsl</servlet-name>
     <servlet-class>com.arsdigita.cms.dispatcher.TemplateXSLServlet</servlet-class>
   </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>
-
  <servlet>
    <servlet-name>TextOnlyServlet</servlet-name>
    <display-name>Text Only Servlet</display-name>
@@ -141,17 +150,27 @@
    </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
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet definitions BEGIN   -->
+  <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    -->  
 
 <!-- XXX hack -->
 
@@ -181,6 +200,124 @@
     <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-ldn-themes  -  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>
+    </init-param>
+  </servlet>
+
+  <servlet>
+     <servlet-name>ThemeDownload</servlet-name>
+     <servlet-class>com.arsdigita.london.theme.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
+    </servlet-class>
+    <init-param>
+      <param-name>prefix</param-name>
+      <param-value>/theme</param-value>
+    </init-param>
+  </servlet>
+  <!-- module ccm-ldn-themes  -  servlet declarations END   -->
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+     MODULES SERVLET MAPPINGS SECTION
+     - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+  <!-- module ccm-ldn-atoz  -  servlet mappings BEGIN  -->
+  <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>
@@ -197,7 +334,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-ldn-theme  -  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-ldn-themes  -  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>
@@ -234,7 +435,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>
@@ -256,11 +460,6 @@
     <url-pattern>/__ccm__/servlet/template/*</url-pattern>
   </servlet-mapping>
 
- <servlet-mapping>
-     <servlet-name>AxisServlet</servlet-name>
-     <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
-
  <servlet-mapping>
      <servlet-name>TextOnlyServlet</servlet-name>
      <url-pattern>/text/*</url-pattern>
@@ -271,12 +470,10 @@
      <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>
@@ -303,13 +500,20 @@
     <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>
 
-  <!-- TAGLIBS -->
+  <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>
diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/category-step.xsl b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/category-step.xsl
index 7753f1b83..693fd7c38 100644
--- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/category-step.xsl
+++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/category-step.xsl
@@ -12,13 +12,39 @@
   <xsl:param name="theme-prefix" />
 
   <xsl:template match="cms:emptyPage[@title='childCategories']">
+    <xsl:choose>
+      <xsl:when test="cms:category/@order='sortKey'">
     <xsl:apply-templates select="cms:category/cms:category" mode="cms:javascriptCat">
       <xsl:with-param name="expand" select="'none'"/>
+          <xsl:sort data-type="number" select="@sortKey"/>
     </xsl:apply-templates>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="cms:category/cms:category" mode="cms:javascriptCat">
+          <xsl:sort data-type="text" select="@name"/>
+          <xsl:with-param name="expand" select="'none'"/>
+        </xsl:apply-templates>
+      </xsl:otherwise>
+    </xsl:choose>
+    
   </xsl:template>
 
   <xsl:template match="cms:emptyPage[@title='autoCategories']">
-    <xsl:apply-templates select="cms:category" mode="cms:javascriptCat" />
+    <xsl:choose>
+      <xsl:when test="cms:category/@order='sortKey'">
+        <xsl:apply-templates select="cms:category" mode="cms:javascriptCat" >
+        <xsl:with-param name="expand" select="'none'"/>
+          <xsl:sort data-type="number" select="@sortKey"/>
+        </xsl:apply-templates>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:apply-templates select="cms:category" mode="cms:javascriptCat" >
+          <xsl:sort data-type="text" select="@name"/>
+          <xsl:with-param name="expand" select="'none'"/>
+        </xsl:apply-templates>
+      </xsl:otherwise>
+    </xsl:choose>
+    
   </xsl:template>
 
 </xsl:stylesheet>
diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
index 29b1d85d0..e27aaf2c0 100644
--- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
+++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-categories.xsl
@@ -8,8 +8,14 @@
 				exclude-result-prefixes="xsl bebop nav search portal forum cms" 
 				version="1.0">
 
+  <!-- IMPORT DEFINITIONS ccm-forum installed as separate web application
 	<xsl:import href="../../../../ROOT/__ccm__/themes/aplaws/category-step.xsl"/>
   	<xsl:import href="../../../../ROOT/__ccm__/static/cms/admin/category-step/category-step.xsl"/>	
+  -->
+  <!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
+  -->
+  <xsl:import href="../../../__ccm__/themes/aplaws/category-step.xsl"/>
+  <xsl:import href="../../../__ccm__/static/cms/admin/category-step/category-step.xsl"/>	
 
   <xsl:output method="html" indent="yes"/>
 
@@ -198,10 +204,12 @@
     	<div class="content">
 	      <xsl:choose>
 	        <xsl:when test="count(forum:category[@isEnabled = '1']) > 0 and $expand='none'">
-	          <a href="#" onClick="catToggle('{@nodeID}');"><img id="catTog{@nodeID}" src="/assets/action-add.png" width="14" height="14" border="0"/></a>
+	          <a href="#" onClick="catToggle('{@nodeID}');">
+	             <img id="catTog{@nodeID}" src="/assets/action-add.png" width="14" height="14" border="0"/></a>
 	        </xsl:when>
 	        <xsl:when test="count(forum:category[@isEnabled = '1']) > 0 and $expand!='none'">
-	          <a href="#" onClick="catToggle('{@nodeID}');"><img id="catTog{@nodeID}" src="/assets/action-delete.png" width="14" height="14" border="0"/></a>
+	          <a href="#" onClick="catToggle('{@nodeID}');"><img id="catTog{@nodeID}" src="/assets/action-delete.png" 
+	                      width="14" height="14" border="0"/></a>
 	        </xsl:when>
 	        <xsl:otherwise>
 	          <img src="/assets/action-generic.png" width="14" height="14" border="0"/>
diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-index.xsl b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-index.xsl
index 2e9a02f75..ad7703bd7 100644
--- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-index.xsl
+++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-example/categorised-forum/forum-index.xsl
@@ -8,17 +8,27 @@
 				exclude-result-prefixes="xsl bebop nav search portal forum cms" 
 				version="1.0">
 
+  <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
 	<xsl:import href="../../../../ROOT/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/header.xsl" />
 	<xsl:import href="lib/lib.xsl" />
 	<xsl:import href="lib/leftNav.xsl" />
 	<xsl:import href="forum-categories.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:param name="context-prefix" />
diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.xsl b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.xsl
index 4185540ef..86e99e146 100644
--- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.xsl
+++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-example/forum-index.xsl
@@ -8,13 +8,26 @@
 				exclude-result-prefixes="xsl bebop nav search portal forum cms" 
 				version="1.0">
 
+        <!-- IMPORT DEFINITIONS ccm-forum  installed as separate web application
 	<xsl:import href="../../../../ROOT/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/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"/>
   
 
 
@@ -23,7 +36,8 @@
 	<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" />
+	<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 ********************* -->
 
diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-index.xsl b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-index.xsl
index c3d86fb8a..b7b067338 100644
--- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-index.xsl
+++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/forum-index.xsl
@@ -4,7 +4,13 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   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"/>
+
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix" />
diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/search-admin.xsl b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/search-admin.xsl
index 760c4eebd..1d143a00e 100644
--- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/search-admin.xsl
+++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/search-admin.xsl
@@ -11,7 +11,11 @@
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search"
 	version="1.0">
 
-<xsl:import href="../../../../ccm-ldn-search/__ccm__/apps/search/xsl/index.xsl"/>
-  
+  <!-- path if installed in its own web context ccm-ldn-search
+    <xsl:import href="../../../../ccm-ldn-search/__ccm__/apps/search/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+         -->
+  <xsl:import href="../../../__ccm__/apps/search/xsl/index.xsl"/>
  
- </xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/search-index.xsl b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/search-index.xsl
index c356d590e..ba76bc478 100644
--- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/search-index.xsl
+++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/search-index.xsl
@@ -11,25 +11,31 @@
   exclude-result-prefixes="xsl bebop aplaws ui cms nav search"
 	version="1.0">
 
-<xsl:import href="lib/header.xsl"/>
-<xsl:import href="lib/lib.xsl"/>
-  
-<xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
-<xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/>
+  <xsl:import href="lib/header.xsl"/>
+  <xsl:import href="lib/lib.xsl"/>
+
+  <!-- path if installed in its own web context ccm-ldn-shortcuts 
+    <xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
+    <xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+  -->
+  <xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>
+  <xsl:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/>
 
-<xsl:param name="context-prefix"/>
-<xsl:param name="dispatcher-prefix" />
-<xsl:param name="theme-prefix" />
+  <xsl:param name="context-prefix"/>
+  <xsl:param name="dispatcher-prefix" />
+  <xsl:param name="theme-prefix" />
 
-<xsl:output 
+  <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" 
-/>
+  />
 	
-<xsl:template match="bebop:page[@application='search']">
-<html lang="en">
+  <xsl:template match="bebop:page[@application='search']">
+    <html lang="en">
 	<head>
 		<title>APLAWS+: Search</title>
 		<xsl:call-template name="cssStyles"/>
@@ -43,29 +49,24 @@
 		<xsl:call-template name="searchBreadcrumb"/>
 		<xsl:call-template name="searchBody"/>
 	</body>
-</html>
-</xsl:template>
+    </html>
+  </xsl:template>
 
 
-<xsl:template name="searchBody">
-    
-
-
-<table id="mainLayout" width="100%" border="0" cellspacing="0" cellpadding="0" summary="This table is used for a three-column page layout">
-<tr>
-    <td width="20%" rowspan="2" align="left" valign="top" id="LHS">
-
+  <xsl:template name="searchBody">
+    <table id="mainLayout" width="100%" border="0" cellspacing="0" cellpadding="0" summary="This table is used for a three-column page layout">
+      <tr>
+        <td width="20%" rowspan="2" align="left" valign="top" id="LHS">
 		<!--LHS NAVIGATION -->
 		<xsl:call-template name="searchNav" />
-    </td>
-    <td colspan="2" align="left" valign="top" id="title">
-
-<!--MAIN CONTENT -->
+        </td>
+        <td colspan="2" align="left" valign="top" id="title">
+        	<!--MAIN CONTENT -->
 		<h1>Search</h1>
-		</td>
-  </tr>
-  <tr>
-    <td width="60%" align="left" valign="top" id="mainContent">
+	</td>
+      </tr>
+      <tr>
+        <td width="60%" align="left" valign="top" id="mainContent">
 		<span class="hide">|</span>
 	
 		<!--CONTENT -->
@@ -77,122 +78,101 @@
 		<div id="related">
 		<h2>Search Options</h2>
 		<xsl:choose>
-		<xsl:when test="@id='search'">
-		<a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search</a><span class="hide">|</span>
-		<a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search</a><span class="hide">|</span>
-		</xsl:when>
-			<xsl:when test="@id='advanced'">
-		<a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
-		<a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search</a><span class="hide">|</span>
-		</xsl:when>
-			<xsl:when test="@id='remote'">
-		<a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
-		<a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search</a><span class="hide">|</span>
-		</xsl:when>
-		<xsl:otherwise />
+		  <xsl:when test="@id='search'">
+		  <a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search</a><span class="hide">|</span>
+		  <a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search
+		  </a><span class="hide">|</span>
+		  </xsl:when>
+		  <xsl:when test="@id='advanced'">
+		  <a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
+		  <a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search
+		  </a><span class="hide">|</span>
+		  </xsl:when>
+		  <xsl:when test="@id='remote'">
+			<a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
+			<a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search
+			</a><span class="hide">|</span>
+		  </xsl:when>
+		  <xsl:otherwise />
 		</xsl:choose>
 		</div>
 
 		<xsl:call-template name="sponsoredLinks"/>
 
-    </td>
-  </tr>
-</table>
-<xsl:call-template name="footer"/>
-</xsl:template>
+    	</td>
+      </tr>
+    </table>
+
+    <xsl:call-template name="footer"/>
+  </xsl:template>
 
 
+  <xsl:template name="searchBreadcrumb">
+    <!--BREADCRUMB -->
 
+    <div id="bread">
+    <p>
+    <b><a href="{$dispatcher-prefix}/portal/" title="home">home</a></b>
+    <xsl:text disable-output-escaping="yes">&amp;</xsl:text>gt;
+    <span class="breadHi">
+    <xsl:choose>
+	<xsl:when test="@id='search'">Search</xsl:when>
+      	<xsl:when test="@id='advanced'">Advanced Search</xsl:when>
+      	<xsl:when test="@id='remote'">Remote Search</xsl:when>
+	<xsl:otherwise />
+    </xsl:choose>
+    </span>
+    </p>
+    </div>
+  </xsl:template>
+
 
-
-
-
-
-
-<xsl:template name="searchBreadcrumb">
-
-<!--BREADCRUMB -->
-
-<div id="bread">
-<p>
-<b><a href="{$dispatcher-prefix}/portal/" title="home">home</a></b>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>gt;
-<span class="breadHi">
-<xsl:choose>
-			<xsl:when test="@id='search'">Search</xsl:when>
-      		<xsl:when test="@id='advanced'">Advanced Search</xsl:when>
-      		<xsl:when test="@id='remote'">Remote Search</xsl:when>
-			<xsl:otherwise />
-   </xsl:choose>
-   </span>
-</p>
-</div>
-</xsl:template>
-
-
-
-
-
-
-
-
-
-
-
-<xsl:template name="searchNav">
-<div id="nav">
-<div class="navUp">
-<a href="{$dispatcher-prefix}/portal/">
-<xsl:attribute name="title">up to homepage</xsl:attribute>
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>#094;
-<xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;home</a>
-</div>
-<xsl:choose>
+  <xsl:template name="searchNav">
+    <div id="nav">
+    <div class="navUp">
+    <a href="{$dispatcher-prefix}/portal/">
+    <xsl:attribute name="title">up to homepage</xsl:attribute>
+    <xsl:text disable-output-escaping="yes">&amp;</xsl:text>#094;
+    <xsl:text disable-output-escaping="yes">&amp;</xsl:text>nbsp;home</a>
+    </div>
+    <xsl:choose>
 	<xsl:when test="@id='search'">
 	<div class="navHere"><p>Search</p></div>		
 	</xsl:when>
-    <xsl:when test="@id='advanced'">
+    	<xsl:when test="@id='advanced'">
 	<div class="navHere"><p>Advanced search</p></div>		
 	</xsl:when>
-    <xsl:when test="@id='remote'">
+    	<xsl:when test="@id='remote'">
 	<div class="navHere"><p>Remote search</p></div>		
 	</xsl:when>
 	<xsl:otherwise />
-</xsl:choose>
-<a href="/searchhelp" class="navChild" title="Hints and tips" >Hints and Tips</a><span class="hide">|</span>
-</div>
-</xsl:template>
+    </xsl:choose>
+    <a href="/searchhelp" class="navChild" title="Hints and tips" >Hints and Tips</a><span class="hide">|</span>
+    </div>
+  </xsl:template>

 
-
-
-
-
-<xsl:template name="searchMain">
+  <xsl:template name="searchMain">
     <xsl:choose>
-			<xsl:when test="@id='search'">
-        		<xsl:call-template name="basicSearch" />
-      		</xsl:when>
-      		<xsl:when test="@id='advanced'">
-        		<xsl:call-template name="advancedSearch" />
-      		</xsl:when>
-      		<xsl:when test="@id='remote'">
-        		<xsl:call-template name="remoteSearch" />
-      		</xsl:when>
-			<xsl:when test="@id='reindex'">
-					<xsl:apply-templates/>
-			</xsl:when>
-			<xsl:otherwise />
-   </xsl:choose>
-</xsl:template>
+	<xsl:when test="@id='search'">
+        	<xsl:call-template name="basicSearch" />
+      	</xsl:when>
+      	<xsl:when test="@id='advanced'">
+        	<xsl:call-template name="advancedSearch" />
+      	</xsl:when>
+      	<xsl:when test="@id='remote'">
+        	<xsl:call-template name="remoteSearch" />
+      	</xsl:when>
+	<xsl:when test="@id='reindex'">
+		<xsl:apply-templates/>
+	</xsl:when>
+	<xsl:otherwise />
+     </xsl:choose>
+  </xsl:template>
 
 
-
-
-
-
-<xsl:template name="basicSearch">
-<xsl:for-each select="bebop:form[@name='search']">
-<div id="searchArea">
+  <xsl:template name="basicSearch">
+    <xsl:for-each select="bebop:form[@name='search']">
+      <div id="searchArea">
 		<div id="resultsInfo">
 		<xsl:choose>
 		<xsl:when test="//search:results"><xsl:apply-templates select="//search:paginator"  mode="results-summary"/></xsl:when>
@@ -212,20 +192,15 @@
 			</div>
 		 <xsl:apply-templates select="bebop:pageState" />
 		</form>
-</div>
-</xsl:for-each>
-<xsl:call-template name="searchResults" />
-</xsl:template>
+      </div>
+    </xsl:for-each>
+    <xsl:call-template name="searchResults" />
+  </xsl:template>
 
 
-
-
-
-
-
-<xsl:template name="advancedSearch">
-<xsl:for-each select="bebop:form[@name='search']">
-<div id="searchArea">
+  <xsl:template name="advancedSearch">
+    <xsl:for-each select="bebop:form[@name='search']">
+        <div id="searchArea">
 		<div id="resultsInfo">
 		<xsl:choose>
 		<xsl:when test="//search:results"><xsl:apply-templates select="//search:paginator"  mode="results-summary"/></xsl:when>
@@ -267,21 +242,15 @@
 		</div>
 		<xsl:apply-templates select="bebop:pageState" />
 		</form>
-</div>
-</xsl:for-each>
-<xsl:call-template name="searchResults" />
-</xsl:template>
+        </div>
+    </xsl:for-each>
+    <xsl:call-template name="searchResults" />
+  </xsl:template>
 
 
-
-
-
-
-
-
-<xsl:template name="remoteSearch">
-<xsl:for-each select="bebop:form[@name='search']">
-<div id="searchArea">
+  <xsl:template name="remoteSearch">
+    <xsl:for-each select="bebop:form[@name='search']">
+      <div id="searchArea">
 		<div id="resultsInfo">
 		<xsl:choose>
 		<xsl:when test="//search:results"><xsl:apply-templates select="//search:paginator"  mode="results-summary"/></xsl:when>
@@ -326,14 +295,10 @@
 		</div>
 		<xsl:apply-templates select="bebop:pageState" />
 		</form>
-</div>
-</xsl:for-each>
-<xsl:call-template name="searchResults" />
-</xsl:template>
-
-
-
-
+        </div>
+    </xsl:for-each>
+  <xsl:call-template name="searchResults" />
+  </xsl:template>
 
 
 <xsl:template name="sponsoredLinks">
diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/shortcuts-index.xsl b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/shortcuts-index.xsl
index c49c5ccfc..a4e103c89 100644
--- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/shortcuts-index.xsl
+++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/shortcuts-index.xsl
@@ -4,7 +4,12 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
-  <xsl:import href="../../../../ccm-ldn-shortcuts/__ccm__/apps/shortcuts/xsl/index.xsl"/>
+  <!-- path if installed in its own web context ccm-ldn-shortcuts
+    <xsl:import href="../../../../ccm-ldn-shortcuts/__ccm__/apps/shortcuts/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+  -->
+  <xsl:import href="../../../__ccm__/apps/shortcuts/xsl/index.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>
diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/subsite-index.xsl b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/subsite-index.xsl
index a46650d03..cb04a688c 100644
--- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/subsite-index.xsl
+++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/subsite-index.xsl
@@ -4,7 +4,13 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
+  <!-- path if installed in its own web context ccm-ldn-subsite
   <xsl:import href="../../../../ccm-ldn-subsite/__ccm__/apps/subsite/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+  -->
+  <xsl:import href="../../../__ccm__/apps/subsite/xsl/index.xsl"/>
+
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>
diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/terms-index.css b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/terms-index.css
index b369a874f..15fd56956 100644
--- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/terms-index.css
+++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/terms-index.css
@@ -1,2 +1,6 @@
 @import url(/css/acs-master.css);
-@import url(/ccm-ldn-terms/__ccm__/apps/terms/xsl/index.css);
+/* Following import is valid if terms is executed in its own     */
+/* web application context (ccm-ldn-terms)                       */
+/* @import url(/ccm-ldn-terms/__ccm__/apps/terms/xsl/index.css); */
+/* import if installed in the main (common) web context          */
+@import url(/__ccm__/apps/terms/xsl/index.css); 
diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/terms-index.xsl b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/terms-index.xsl
index 9d4811bf9..0ee053d22 100644
--- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/terms-index.xsl
+++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/terms-index.xsl
@@ -4,7 +4,12 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
+  <!-- path if installed in its own web context ccm-ldn-terms
   <xsl:import href="../../../../ccm-ldn-terms/__ccm__/apps/terms/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+  -->
+  <xsl:import href="../../../__ccm__/apps/terms/xsl/index.xsl"/>
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>
diff --git a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/theme-index.xsl b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/theme-index.xsl
index e1072552e..44121cbda 100644
--- a/ccm-zes-aplaws/web/__ccm__/themes/aplaws/theme-index.xsl
+++ b/ccm-zes-aplaws/web/__ccm__/themes/aplaws/theme-index.xsl
@@ -4,7 +4,13 @@
   xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
   version="1.0">
 
+  <!-- path if installed in its own web context ccm-ldn-theme
   <xsl:import href="../../../../ccm-ldn-theme/__ccm__/apps/theme/xsl/index.xsl"/>
+  -->
+  <!-- path to xsl if installed in the main (common) web context   
+  -->
+  <xsl:import href="../../../__ccm__/apps/theme/xsl/index.xsl"/>
+
   <xsl:import href="lib/page.xsl"/>
 
   <xsl:param name="theme-prefix"/>